From 397b3ca69f862a1fee524abc6aa2de8b94e18dcd Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Mon, 29 Oct 2018 11:02:53 +0100
Subject: [PATCH 001/421] #3434 use toggle for varying by culture on property
 settings dialog in content type designer

---
 .../propertysettings.controller.js            | 13 +++++++++-
 .../propertysettings/propertysettings.html    | 25 +++++++++++++------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index 7239fd22e710..fec24a3a3196 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -29,6 +29,8 @@
         vm.submit = submit;
         vm.close = close;
 
+        vm.toggleAllowCultureVariants = toggleAllowCultureVariants;
+
         function onInit() {
 
             userService.getCurrentUser().then(function(user) {
@@ -232,10 +234,19 @@
 
         }
 
+        function toggleAllowCultureVariants() {
+            if ($scope.model.property.allowCultureVariant) {
+                $scope.model.property.allowCultureVariant = false;
+                return;
+            }
+
+            $scope.model.property.allowCultureVariant = true;
+        }
+
         onInit();
 
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.PropertySettingsController", PropertySettingsEditor);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index 610af28cb838..6862a313d10f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -106,14 +106,23 @@ <h5><localize key="validation_validation"></localize></h5>
                     
                         </div>
                         <div class="umb-control-group clearfix" ng-if="model.contentType === 'documentType' && model.contentTypeAllowCultureVariant">
-                    
-                            <h5>Property Type Variation</h5>
-                    
-                            <label class="checkbox no-indent">
-                                <input type="checkbox" ng-model="model.property.allowCultureVariant" />
-                                Allow varying by Culture
-                            </label>
-                    
+                            <div class="sub-view-columns">
+
+                                <div class="sub-view-column-left">
+                                    <h5><localize key="contentTypeEditor_variantsHeading" /></h5>
+                                    
+                                </div>
+
+                                <div class="sub-view-column-right">
+                                    <umb-toggle data-element="permissions-allow-culture-variant"
+                                                checked="model.property.allowCultureVariant"
+                                                on-click="vm.toggleAllowCultureVariants()"
+                                    >
+                                    </umb-toggle>
+                                </div>
+    
+                            </div>
+                            
                         </div>
                     
                         <div class="umb-control-group clearfix" ng-if="model.contentType === 'memberType'">

From d0908895ddd8de472b8ed64bb1fe8f1f7e1b66e1 Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Wed, 7 Nov 2018 09:48:31 +0100
Subject: [PATCH 002/421] #3434 removed usage of subview-classes

---
 .../propertysettings/propertysettings.html         | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index 6862a313d10f..dae9c2c83852 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -106,23 +106,15 @@ <h5><localize key="validation_validation"></localize></h5>
                     
                         </div>
                         <div class="umb-control-group clearfix" ng-if="model.contentType === 'documentType' && model.contentTypeAllowCultureVariant">
-                            <div class="sub-view-columns">
-
-                                <div class="sub-view-column-left">
+                           
                                     <h5><localize key="contentTypeEditor_variantsHeading" /></h5>
-                                    
-                                </div>
-
-                                <div class="sub-view-column-right">
+                             
                                     <umb-toggle data-element="permissions-allow-culture-variant"
                                                 checked="model.property.allowCultureVariant"
                                                 on-click="vm.toggleAllowCultureVariants()"
                                     >
                                     </umb-toggle>
-                                </div>
-    
-                            </div>
-                            
+
                         </div>
                     
                         <div class="umb-control-group clearfix" ng-if="model.contentType === 'memberType'">

From 110ecc5fda4864348d0f3c7a7316ae19a4dad377 Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Wed, 7 Nov 2018 10:09:04 +0100
Subject: [PATCH 003/421] #3434 use toggle for mandatory validation on property
 type settings and made a better distinction between mandatory and custom
 validation

---
 .../propertysettings/propertysettings.controller.js | 10 ++++++++++
 .../propertysettings/propertysettings.html          | 13 +++++++++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml       |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml    |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index fec24a3a3196..198f352bf153 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -30,6 +30,7 @@
         vm.close = close;
 
         vm.toggleAllowCultureVariants = toggleAllowCultureVariants;
+        vm.toggleValidation = toggleValidation;
 
         function onInit() {
 
@@ -243,6 +244,15 @@
             $scope.model.property.allowCultureVariant = true;
         }
 
+        function toggleValidation() {
+            if ($scope.model.property.validation.mandatory) {
+                $scope.model.property.validation.mandatory = false;
+                return;
+            }
+
+            $scope.model.property.validation.mandatory = true;
+        }
+
         onInit();
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index dae9c2c83852..ecdd5b203d01 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -84,10 +84,19 @@
                     
                             <h5><localize key="validation_validation"></localize></h5>
                     
-                            <label class="checkbox no-indent">
-                                <input type="checkbox" ng-model="model.property.validation.mandatory" focus-when="{{vm.focusOnMandatoryField}}" />
+                            <label>                                
                                 <localize key="validation_fieldIsMandatory"></localize>
                             </label>
+
+                            <umb-toggle data-element="validation_mandatory"
+                                        checked="model.property.validation.mandatory"
+                                        on-click="vm.toggleValidation()"
+                            >
+                            </umb-toggle>
+
+                            <label class="mt3">                                
+                                <localize key="validation_customValidation"></localize>
+                            </label>
                     
                             <select class="umb-dropdown" ng-options="validationType.name for validationType in vm.validationTypes" ng-model="vm.selectedValidationType" ng-change="vm.changeValidationType(vm.selectedValidationType)">
                                 <option value=""><localize key="validation_validation">Validation</localize></option>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 8bc9d190fa89..4ff9a347e8b4 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1812,6 +1812,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="invalidDate">Invalid date</key>
     <key alias="invalidNumber">Not a number</key>
     <key alias="invalidEmail">Invalid email</key>
+    <key alias="customValidation">Custom validation</key>
   </area>
   <area alias="healthcheck">
     <!-- The following keys get these tokens passed in:
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index a2487b2dc80d..be6b9155ab7e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1849,6 +1849,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="invalidNull">Value cannot be null</key>
     <key alias="invalidEmpty">Value cannot be empty</key>
     <key alias="invalidPattern">Value is invalid, it does not match the correct pattern</key>
+    <key alias="customValidation">Custom validation</key>
   </area>
   <area alias="healthcheck">
     <!-- The following keys get these tokens passed in:

From ecb4e0051616812f2116ace719dab2895a0ecc28 Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Wed, 7 Nov 2018 10:31:16 +0100
Subject: [PATCH 004/421] #3434 changed checkboxes on member property settings
 to toggles

---
 .../propertysettings.controller.js            | 30 ++++++++++++++
 .../propertysettings/propertysettings.html    | 39 ++++++++++++-------
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index 198f352bf153..aa19e3662969 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -31,6 +31,9 @@
 
         vm.toggleAllowCultureVariants = toggleAllowCultureVariants;
         vm.toggleValidation = toggleValidation;
+        vm.toggleShowOnMemberProfile = toggleShowOnMemberProfile;
+        vm.toggleMemberCanEdit = toggleMemberCanEdit;
+        vm.toggleIsSensitiveData = toggleIsSensitiveData;
 
         function onInit() {
 
@@ -253,6 +256,33 @@
             $scope.model.property.validation.mandatory = true;
         }
 
+        function toggleShowOnMemberProfile() {
+            if ($scope.model.property.showOnMemberProfile) {
+                $scope.model.property.showOnMemberProfile = false;
+                return;
+            }
+
+            $scope.model.property.showOnMemberProfile = true;
+        }
+
+        function toggleMemberCanEdit() {
+            if ($scope.model.property.memberCanEdit) {
+                $scope.model.property.memberCanEdit = false;
+                return;
+            }
+
+            $scope.model.property.memberCanEdit = true;
+        }
+
+        function toggleIsSensitiveData() {
+            if ($scope.model.property.isSensitiveData) {
+                $scope.model.property.isSensitiveData = false;
+                return;
+            }
+
+            $scope.model.property.isSensitiveData = true;
+        }
+
         onInit();
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index ecdd5b203d01..35e46d2ca5d0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -127,27 +127,40 @@ <h5><localize key="contentTypeEditor_variantsHeading" /></h5>
                         </div>
                     
                         <div class="umb-control-group clearfix" ng-if="model.contentType === 'memberType'">
-                    
+
                             <h5><localize key="general_options"></localize></h5>
-                    
-                            <label class="checkbox no-indent">
-                                <input type="checkbox" ng-model="model.property.showOnMemberProfile">
+
+                            <label class="mt3">
                                 <localize key="contentTypeEditor_showOnMemberProfile"></localize>
                                 <small><localize key="contentTypeEditor_showOnMemberProfileDescription"></localize></small>
                             </label>
-                    
-                            <label class="checkbox no-indent">
-                                <input type="checkbox" ng-model="model.property.memberCanEdit">
+
+                            <umb-toggle data-element="settings_show_member_on_profile"
+                                        checked="model.property.showOnMemberProfile"
+                                        on-click="vm.toggleShowOnMemberProfile()">
+                            </umb-toggle>
+
+                            <label class="mt3">
                                 <localize key="contentTypeEditor_memberCanEdit"></localize>
                                 <small><localize key="contentTypeEditor_memberCanEditDescription"></localize></small>
                             </label>
-                    
-                            <label ng-if="vm.showSensitiveData" class="checkbox no-indent">
-                                <input type="checkbox" ng-model="model.property.isSensitiveData">
-                                <localize key="contentTypeEditor_isSensitiveData"></localize>
-                                <small><localize key="contentTypeEditor_isSensitiveDataDescription"></localize></small>
+
+                            <umb-toggle data-element="settings_member_can_edit"
+                                        checked="model.property.memberCanEdit"
+                                        on-click="vm.toggleMemberCanEdit()">
+                            </umb-toggle>
+
+                            <label class="mt3" ng-if="vm.showSensitiveData">
+                                <localize key="contentTypeEditor_memberCanEdit"></localize>
+                                <small><localize key="contentTypeEditor_memberCanEditDescription"></localize></small>
                             </label>
-                    
+
+                            <umb-toggle ng-if="vm.showSensitiveData" data-element="settings_is_sensitive_data"
+                                        checked="model.property.isSensitiveData"
+                                        on-click="vm.toggleIsSensitiveData()">
+                            </umb-toggle>
+                                                      
+
                         </div>
                     </div>
 

From 7bfce6e42824bcf072b9a77d90d44348ad5caae2 Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Wed, 7 Nov 2018 10:39:11 +0100
Subject: [PATCH 005/421] #3434 refactored toggle functions

---
 .../propertysettings.controller.js            | 39 +++++--------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index aa19e3662969..f15a90e9ca13 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -238,49 +238,28 @@
 
         }
 
-        function toggleAllowCultureVariants() {
-            if ($scope.model.property.allowCultureVariant) {
-                $scope.model.property.allowCultureVariant = false;
-                return;
-            }
+        function toggleValue(settingValue) {
+            return !settingValue;
+        }
 
-            $scope.model.property.allowCultureVariant = true;
+        function toggleAllowCultureVariants() {            
+            $scope.model.property.allowCultureVariant = toggleValue($scope.model.property.allowCultureVariant);
         }
 
         function toggleValidation() {
-            if ($scope.model.property.validation.mandatory) {
-                $scope.model.property.validation.mandatory = false;
-                return;
-            }
-
-            $scope.model.property.validation.mandatory = true;
+            $scope.model.property.validation.mandatory = toggleValue($scope.model.property.validation.mandatory);            
         }
 
         function toggleShowOnMemberProfile() {
-            if ($scope.model.property.showOnMemberProfile) {
-                $scope.model.property.showOnMemberProfile = false;
-                return;
-            }
-
-            $scope.model.property.showOnMemberProfile = true;
+            $scope.model.property.showOnMemberProfile = toggleValue($scope.model.property.showOnMemberProfile);           
         }
 
         function toggleMemberCanEdit() {
-            if ($scope.model.property.memberCanEdit) {
-                $scope.model.property.memberCanEdit = false;
-                return;
-            }
-
-            $scope.model.property.memberCanEdit = true;
+            $scope.model.property.memberCanEdit = toggleValue($scope.model.property.memberCanEdit);            
         }
 
         function toggleIsSensitiveData() {
-            if ($scope.model.property.isSensitiveData) {
-                $scope.model.property.isSensitiveData = false;
-                return;
-            }
-
-            $scope.model.property.isSensitiveData = true;
+            $scope.model.property.isSensitiveData = toggleValue($scope.model.property.isSensitiveData);             
         }
 
         onInit();

From b25413abcdd8fe6038d34d584ff402ad30c4a7fa Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Wed, 7 Nov 2018 10:47:13 +0100
Subject: [PATCH 006/421] #3434 show indication on designer that property is
 varied by culture

---
 .../src/views/components/umb-groups-builder.html             | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 1e8c1f74e5df..73fc3248348b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -212,6 +212,11 @@
                                         <localize key="contentTypeEditor_isSensitiveData"></localize>
                                     </div>
 
+                                    <div class="umb-group-builder__property-tag -white" ng-if="property.allowCultureVariant">
+                                        <i class="icon-shuffle umb-group-builder__property-tag-icon"></i>
+                                        <localize key="contentTypeEditor_variantsHeading"></localize>
+                                    </div>
+
                                 </div>
 
                                 <div class="umb-group-builder__property-tags -right">

From 271e01262fb6d1d8484dd8e2af9352203386a535 Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Wed, 7 Nov 2018 10:53:23 +0100
Subject: [PATCH 007/421] #3434 set correct labels

---
 .../infiniteeditors/propertysettings/propertysettings.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index 35e46d2ca5d0..280d73e29fa0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -151,8 +151,8 @@ <h5><localize key="general_options"></localize></h5>
                             </umb-toggle>
 
                             <label class="mt3" ng-if="vm.showSensitiveData">
-                                <localize key="contentTypeEditor_memberCanEdit"></localize>
-                                <small><localize key="contentTypeEditor_memberCanEditDescription"></localize></small>
+                                <localize key="contentTypeEditor_isSensitiveData"></localize>
+                                <small><localize key="contentTypeEditor_isSensitiveDataDescription"></localize></small>
                             </label>
 
                             <umb-toggle ng-if="vm.showSensitiveData" data-element="settings_is_sensitive_data"

From ec24ebf93c67db5214c4cde2a9cb0c9508713b61 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 11 Dec 2018 17:00:43 +0100
Subject: [PATCH 008/421] Fix media type copying and move media type service
 unit tests to a separate class

---
 src/Umbraco.Core/Models/ContentType.cs        |   3 +
 src/Umbraco.Core/Models/ContentTypeBase.cs    |   4 +-
 src/Umbraco.Core/Models/MediaType.cs          |  26 +--
 ...peServiceBaseOfTRepositoryTItemTService.cs |   4 +-
 .../Services/ContentTypeServiceTests.cs       | 116 +----------
 .../Services/MediaTypeServiceTests.cs         | 195 ++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 7 files changed, 209 insertions(+), 140 deletions(-)
 create mode 100644 src/Umbraco.Tests/Services/MediaTypeServiceTests.cs

diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs
index e6439acade28..4b9831682ca4 100644
--- a/src/Umbraco.Core/Models/ContentType.cs
+++ b/src/Umbraco.Core/Models/ContentType.cs
@@ -160,5 +160,8 @@ public bool RemoveTemplate(ITemplate template)
 
             return result;
         }
+
+        /// <inheritdoc />
+        IContentType IContentType.DeepCloneWithResetIdentities(string newAlias) => (IContentType)DeepCloneWithResetIdentities(newAlias);
     }
 }
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index caa63d752652..79c2d4218b54 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -492,9 +492,9 @@ protected override void PerformDeepClone(object clone)
             }
         }
 
-        public IContentType DeepCloneWithResetIdentities(string alias)
+        public ContentTypeBase DeepCloneWithResetIdentities(string alias)
         {
-            var clone = (ContentType)DeepClone();
+            var clone = (ContentTypeBase)DeepClone();
             clone.Alias = alias;
             clone.Key = Guid.Empty;
             foreach (var propertyGroup in clone.PropertyGroups)
diff --git a/src/Umbraco.Core/Models/MediaType.cs b/src/Umbraco.Core/Models/MediaType.cs
index 4ae2fd190cd1..83e1acfbc06a 100644
--- a/src/Umbraco.Core/Models/MediaType.cs
+++ b/src/Umbraco.Core/Models/MediaType.cs
@@ -44,29 +44,7 @@ public MediaType(IMediaType parent, string alias)
         /// <inheritdoc />
         public override bool IsPublishing => IsPublishingConst;
 
-        /// <summary>
-        /// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
-        /// </summary>
-        /// <returns></returns>
-        public new IMediaType DeepCloneWithResetIdentities(string alias)
-        {
-            var clone = (MediaType)DeepClone();
-            clone.Alias = alias;
-            clone.Key = Guid.Empty;
-            foreach (var propertyGroup in clone.PropertyGroups)
-            {
-                propertyGroup.ResetIdentity();
-                propertyGroup.ResetDirtyProperties(false);
-            }
-            foreach (var propertyType in clone.PropertyTypes)
-            {
-                propertyType.ResetIdentity();
-                propertyType.ResetDirtyProperties(false);
-            }
-
-            clone.ResetIdentity();
-            clone.ResetDirtyProperties(false);
-            return clone;
-        }
+        /// <inheritdoc />
+        IMediaType IMediaType.DeepCloneWithResetIdentities(string newAlias) => (IMediaType)DeepCloneWithResetIdentities(newAlias);
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index b74abc03f7b5..feff81978c75 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -594,7 +594,7 @@ public TItem Copy(TItem original, string alias, string name, TItem parent)
             //var originalb = (ContentTypeCompositionBase)original;
             // but we *know* it has to be a ContentTypeCompositionBase anyways
             var originalb = (ContentTypeCompositionBase) (object) original;
-            var clone = (TItem) originalb.DeepCloneWithResetIdentities(alias);
+            var clone = (TItem) (object) originalb.DeepCloneWithResetIdentities(alias);
 
             clone.Name = name;
 
@@ -645,7 +645,7 @@ public Attempt<OperationResult<MoveOperationStatusType, TItem>> Copy(TItem copyi
                     //var copyingb = (ContentTypeCompositionBase) copying;
                     // but we *know* it has to be a ContentTypeCompositionBase anyways
                     var copyingb = (ContentTypeCompositionBase) (object)copying;
-                    copy = (TItem) copyingb.DeepCloneWithResetIdentities(alias);
+                    copy = (TItem) (object) copyingb.DeepCloneWithResetIdentities(alias);
 
                     copy.Name = copy.Name + " (copy)"; // might not be unique
 
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index bc0854bdb712..30067b3c5add 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -376,46 +376,6 @@ public void Change_Content_Type_From_Variant_Invariant_On_A_Composition()
             Assert.IsNull(doc2.GetValue("title", "en-US"));
         }
 
-        [Test]
-        public void Deleting_Media_Type_With_Hierarchy_Of_Media_Items_Moves_Orphaned_Media_To_Recycle_Bin()
-        {
-            IMediaType contentType1 = MockedContentTypes.CreateSimpleMediaType("test1", "Test1");
-            ServiceContext.MediaTypeService.Save(contentType1);
-            IMediaType contentType2 = MockedContentTypes.CreateSimpleMediaType("test2", "Test2");
-            ServiceContext.MediaTypeService.Save(contentType2);
-            IMediaType contentType3 = MockedContentTypes.CreateSimpleMediaType("test3", "Test3");
-            ServiceContext.MediaTypeService.Save(contentType3);
-
-            var contentTypes = new[] { contentType1, contentType2, contentType3 };
-            var parentId = -1;
-
-            var ids = new List<int>();
-
-            for (int i = 0; i < 2; i++)
-            {
-                for (var index = 0; index < contentTypes.Length; index++)
-                {
-                    var contentType = contentTypes[index];
-                    var contentItem = MockedMedia.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId);
-                    ServiceContext.MediaService.Save(contentItem);
-                    parentId = contentItem.Id;
-
-                    ids.Add(contentItem.Id);
-                }
-            }
-
-            //delete the first content type, all other content of different content types should be in the recycle bin
-            ServiceContext.MediaTypeService.Delete(contentTypes[0]);
-
-            var found = ServiceContext.MediaService.GetByIds(ids);
-
-            Assert.AreEqual(4, found.Count());
-            foreach (var content in found)
-            {
-                Assert.IsTrue(content.Trashed);
-            }
-        }
-
         [Test]
         public void Deleting_Content_Type_With_Hierarchy_Of_Content_Items_Moves_Orphaned_Content_To_Recycle_Bin()
         {
@@ -460,60 +420,6 @@ public void Deleting_Content_Type_With_Hierarchy_Of_Content_Items_Moves_Orphaned
             }
         }
 
-        [Test]
-        public void Deleting_Media_Types_With_Hierarchy_Of_Media_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items()
-        {
-            MediaService.Trashed += MediaServiceOnTrashed;
-
-            try
-            {
-                IMediaType contentType1 = MockedContentTypes.CreateSimpleMediaType("test1", "Test1");
-                ServiceContext.MediaTypeService.Save(contentType1);
-                IMediaType contentType2 = MockedContentTypes.CreateSimpleMediaType("test2", "Test2");
-                ServiceContext.MediaTypeService.Save(contentType2);
-                IMediaType contentType3 = MockedContentTypes.CreateSimpleMediaType("test3", "Test3");
-                ServiceContext.MediaTypeService.Save(contentType3);
-
-                var contentTypes = new[] { contentType1, contentType2, contentType3 };
-                var parentId = -1;
-
-                var ids = new List<int>();
-
-                for (int i = 0; i < 2; i++)
-                {
-                    for (var index = 0; index < contentTypes.Length; index++)
-                    {
-                        var contentType = contentTypes[index];
-                        var contentItem = MockedMedia.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId);
-                        ServiceContext.MediaService.Save(contentItem);
-                        parentId = contentItem.Id;
-
-                        ids.Add(contentItem.Id);
-                    }
-                }
-
-                foreach (var contentType in contentTypes.Reverse())
-                {
-                    ServiceContext.MediaTypeService.Delete(contentType);
-                }
-            }
-            finally
-            {
-                MediaService.Trashed -= MediaServiceOnTrashed;
-            }
-        }
-
-        private void MediaServiceOnTrashed(IMediaService sender, MoveEventArgs<IMedia> e)
-        {
-            foreach (var item in e.MoveInfoCollection)
-            {
-                //if this item doesn't exist then Fail!
-                var exists = ServiceContext.MediaService.GetById(item.Entity.Id);
-                if (exists == null)
-                    Assert.Fail("The item doesn't exist");
-            }
-        }
-
         [Test]
         public void Deleting_Content_Types_With_Hierarchy_Of_Content_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items_1()
         {
@@ -1078,12 +984,13 @@ public void Can_Copy_ContentType_By_Performing_Clone()
             var metaContentType = MockedContentTypes.CreateMetaContentType();
             service.Save(metaContentType);
 
-            var simpleContentType = MockedContentTypes.CreateSimpleContentType("category", "Category", metaContentType);
+            var simpleContentType = MockedContentTypes.CreateSimpleContentType("category", "Category", metaContentType) as IContentType;
             service.Save(simpleContentType);
             var categoryId = simpleContentType.Id;
 
             // Act
             var sut = simpleContentType.DeepCloneWithResetIdentities("newcategory");
+            Assert.IsNotNull(sut);
             service.Save(sut);
 
             // Assert
@@ -1115,11 +1022,12 @@ public void Can_Copy_ContentType_To_New_Parent_By_Performing_Clone()
             var parentContentType2 = MockedContentTypes.CreateSimpleContentType("parent2", "Parent2", null, true);
             service.Save(parentContentType2);
 
-            var simpleContentType = MockedContentTypes.CreateSimpleContentType("category", "Category", parentContentType1, true);
+            var simpleContentType = MockedContentTypes.CreateSimpleContentType("category", "Category", parentContentType1, true) as IContentType;
             service.Save(simpleContentType);
 
             // Act
             var clone = simpleContentType.DeepCloneWithResetIdentities("newcategory");
+            Assert.IsNotNull(clone);
             clone.RemoveContentType("parent1");
             clone.AddContentType(parentContentType2);
             clone.ParentId = parentContentType2.Id;
@@ -2068,22 +1976,6 @@ public void Empty_Description_Is_Always_Null_After_Saving_Content_Type()
             Assert.IsNull(contentType2.Description);
         }
 
-        [Test]
-        public void Empty_Description_Is_Always_Null_After_Saving_Media_Type()
-        {
-            var service = ServiceContext.MediaTypeService;
-            var mediaType = MockedContentTypes.CreateSimpleMediaType("mediaType", "Media Type");
-            mediaType.Description = null;
-            service.Save(mediaType);
-
-            var mediaType2 = MockedContentTypes.CreateSimpleMediaType("mediaType2", "Media Type 2");
-            mediaType2.Description = string.Empty;
-            service.Save(mediaType2);
-
-            Assert.IsNull(mediaType.Description);
-            Assert.IsNull(mediaType2.Description);
-        }
-
         [Test]
         public void Variations_In_Compositions()
         {
diff --git a/src/Umbraco.Tests/Services/MediaTypeServiceTests.cs b/src/Umbraco.Tests/Services/MediaTypeServiceTests.cs
new file mode 100644
index 000000000000..915dc5ceecbc
--- /dev/null
+++ b/src/Umbraco.Tests/Services/MediaTypeServiceTests.cs
@@ -0,0 +1,195 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using NUnit.Framework;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Tests.Testing;
+
+namespace Umbraco.Tests.Services
+{
+    [TestFixture]
+    [Apartment(ApartmentState.STA)]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
+    public class MediaTypeServiceTests : TestWithSomeContentBase
+    {
+        [Test]
+        public void Empty_Description_Is_Always_Null_After_Saving_Media_Type()
+        {
+            var mediaType = MockedContentTypes.CreateSimpleMediaType("mediaType", "Media Type");
+            mediaType.Description = null;
+            ServiceContext.MediaTypeService.Save(mediaType);
+
+            var mediaType2 = MockedContentTypes.CreateSimpleMediaType("mediaType2", "Media Type 2");
+            mediaType2.Description = string.Empty;
+            ServiceContext.MediaTypeService.Save(mediaType2);
+
+            Assert.IsNull(mediaType.Description);
+            Assert.IsNull(mediaType2.Description);
+        }
+
+        [Test]
+        public void Deleting_Media_Type_With_Hierarchy_Of_Media_Items_Moves_Orphaned_Media_To_Recycle_Bin()
+        {
+            IMediaType contentType1 = MockedContentTypes.CreateSimpleMediaType("test1", "Test1");
+            ServiceContext.MediaTypeService.Save(contentType1);
+            IMediaType contentType2 = MockedContentTypes.CreateSimpleMediaType("test2", "Test2");
+            ServiceContext.MediaTypeService.Save(contentType2);
+            IMediaType contentType3 = MockedContentTypes.CreateSimpleMediaType("test3", "Test3");
+            ServiceContext.MediaTypeService.Save(contentType3);
+
+            var contentTypes = new[] { contentType1, contentType2, contentType3 };
+            var parentId = -1;
+
+            var ids = new List<int>();
+
+            for (int i = 0; i < 2; i++)
+            {
+                for (var index = 0; index < contentTypes.Length; index++)
+                {
+                    var contentType = contentTypes[index];
+                    var contentItem = MockedMedia.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId);
+                    ServiceContext.MediaService.Save(contentItem);
+                    parentId = contentItem.Id;
+
+                    ids.Add(contentItem.Id);
+                }
+            }
+
+            //delete the first content type, all other content of different content types should be in the recycle bin
+            ServiceContext.MediaTypeService.Delete(contentTypes[0]);
+
+            var found = ServiceContext.MediaService.GetByIds(ids);
+
+            Assert.AreEqual(4, found.Count());
+            foreach (var content in found)
+            {
+                Assert.IsTrue(content.Trashed);
+            }
+        }
+
+        [Test]
+        public void Deleting_Media_Types_With_Hierarchy_Of_Media_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items()
+        {
+            MediaService.Trashed += MediaServiceOnTrashed;
+
+            try
+            {
+                IMediaType contentType1 = MockedContentTypes.CreateSimpleMediaType("test1", "Test1");
+                ServiceContext.MediaTypeService.Save(contentType1);
+                IMediaType contentType2 = MockedContentTypes.CreateSimpleMediaType("test2", "Test2");
+                ServiceContext.MediaTypeService.Save(contentType2);
+                IMediaType contentType3 = MockedContentTypes.CreateSimpleMediaType("test3", "Test3");
+                ServiceContext.MediaTypeService.Save(contentType3);
+
+                var contentTypes = new[] { contentType1, contentType2, contentType3 };
+                var parentId = -1;
+
+                var ids = new List<int>();
+
+                for (int i = 0; i < 2; i++)
+                {
+                    for (var index = 0; index < contentTypes.Length; index++)
+                    {
+                        var contentType = contentTypes[index];
+                        var contentItem = MockedMedia.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId);
+                        ServiceContext.MediaService.Save(contentItem);
+                        parentId = contentItem.Id;
+
+                        ids.Add(contentItem.Id);
+                    }
+                }
+
+                foreach (var contentType in contentTypes.Reverse())
+                {
+                    ServiceContext.MediaTypeService.Delete(contentType);
+                }
+            }
+            finally
+            {
+                MediaService.Trashed -= MediaServiceOnTrashed;
+            }
+        }
+
+        private void MediaServiceOnTrashed(IMediaService sender, MoveEventArgs<IMedia> e)
+        {
+            foreach (var item in e.MoveInfoCollection)
+            {
+                //if this item doesn't exist then Fail!
+                var exists = ServiceContext.MediaService.GetById(item.Entity.Id);
+                if (exists == null)
+                    Assert.Fail("The item doesn't exist");
+            }
+        }
+
+        [Test]
+        public void Can_Copy_MediaType_By_Performing_Clone()
+        {
+            // Arrange
+            var mediaType = MockedContentTypes.CreateImageMediaType("Image2") as IMediaType;
+            ServiceContext.MediaTypeService.Save(mediaType);
+
+            // Act
+            var sut = mediaType.DeepCloneWithResetIdentities("Image2_2");
+            Assert.IsNotNull(sut);
+            ServiceContext.MediaTypeService.Save(sut);
+
+            // Assert
+            Assert.That(sut.HasIdentity, Is.True);
+            Assert.AreEqual(mediaType.ParentId, sut.ParentId);
+            Assert.AreEqual(mediaType.Level, sut.Level);
+            Assert.AreEqual(mediaType.PropertyTypes.Count(), sut.PropertyTypes.Count());
+            Assert.AreNotEqual(mediaType.Id, sut.Id);
+            Assert.AreNotEqual(mediaType.Key, sut.Key);
+            Assert.AreNotEqual(mediaType.Path, sut.Path);
+            Assert.AreNotEqual(mediaType.SortOrder, sut.SortOrder);
+            Assert.AreNotEqual(mediaType.PropertyTypes.First(x => x.Alias.Equals("umbracoFile")).Id, sut.PropertyTypes.First(x => x.Alias.Equals("umbracoFile")).Id);
+            Assert.AreNotEqual(mediaType.PropertyGroups.First(x => x.Name.Equals("Media")).Id, sut.PropertyGroups.First(x => x.Name.Equals("Media")).Id);
+        }
+
+        [Test]
+        public void Can_Copy_MediaType_To_New_Parent_By_Performing_Clone()
+        {
+            // Arrange
+            var parentMediaType1 = MockedContentTypes.CreateSimpleMediaType("parent1", "Parent1");
+            ServiceContext.MediaTypeService.Save(parentMediaType1);
+            var parentMediaType2 = MockedContentTypes.CreateSimpleMediaType("parent2", "Parent2", null, true);
+            ServiceContext.MediaTypeService.Save(parentMediaType2);
+            var mediaType = MockedContentTypes.CreateImageMediaType("Image2") as IMediaType;
+            ServiceContext.MediaTypeService.Save(mediaType);
+
+            // Act
+            var clone = mediaType.DeepCloneWithResetIdentities("newcategory");
+            Assert.IsNotNull(clone);
+            clone.RemoveContentType("parent1");
+            clone.AddContentType(parentMediaType2);
+            clone.ParentId = parentMediaType2.Id;
+            ServiceContext.MediaTypeService.Save(clone);
+
+            // Assert
+            Assert.That(clone.HasIdentity, Is.True);
+
+            var clonedMediaType = ServiceContext.MediaTypeService.Get(clone.Id);
+            var originalMediaType = ServiceContext.MediaTypeService.Get(mediaType.Id);
+
+            Assert.That(clonedMediaType.CompositionAliases().Any(x => x.Equals("parent2")), Is.True);
+            Assert.That(clonedMediaType.CompositionAliases().Any(x => x.Equals("parent1")), Is.False);
+
+            Assert.AreEqual(clonedMediaType.Path, "-1," + parentMediaType2.Id + "," + clonedMediaType.Id);
+            Assert.AreEqual(clonedMediaType.PropertyTypes.Count(), originalMediaType.PropertyTypes.Count());
+
+            Assert.AreNotEqual(clonedMediaType.ParentId, originalMediaType.ParentId);
+            Assert.AreEqual(clonedMediaType.ParentId, parentMediaType2.Id);
+
+            Assert.AreNotEqual(clonedMediaType.Id, originalMediaType.Id);
+            Assert.AreNotEqual(clonedMediaType.Key, originalMediaType.Key);
+            Assert.AreNotEqual(clonedMediaType.Path, originalMediaType.Path);
+
+            Assert.AreNotEqual(clonedMediaType.PropertyTypes.First(x => x.Alias.StartsWith("umbracoFile")).Id, originalMediaType.PropertyTypes.First(x => x.Alias.StartsWith("umbracoFile")).Id);
+            Assert.AreNotEqual(clonedMediaType.PropertyGroups.First(x => x.Name.StartsWith("Media")).Id, originalMediaType.PropertyGroups.First(x => x.Name.StartsWith("Media")).Id);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 7147cc8453bc..1286248b8633 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -132,6 +132,7 @@
     <Compile Include="PublishedContent\NuCacheTests.cs" />
     <Compile Include="Services\ContentServicePublishBranchTests.cs" />
     <Compile Include="Services\ContentTypeServiceVariantsTests.cs" />
+    <Compile Include="Services\MediaTypeServiceTests.cs" />
     <Compile Include="Testing\Objects\TestDataSource.cs" />
     <Compile Include="Published\PublishedSnapshotTestObjects.cs" />
     <Compile Include="Published\ModelTypeTests.cs" />

From eda46a16d0c87f2568da6b29fb91a95117d6a36f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 3 Jan 2019 09:27:52 +0100
Subject: [PATCH 009/421] Changed IContentType on IContent to a more simple
 class with lesser properties

---
 src/Umbraco.Core/ContentExtensions.cs         | 38 +++++-----
 .../ContentVariationExtensions.cs             | 10 +++
 src/Umbraco.Core/Models/Content.cs            | 20 ++---
 src/Umbraco.Core/Models/IContent.cs           |  2 +-
 src/Umbraco.Core/Models/ISimpleContentType.cs | 76 +++++++++++++++++++
 .../Services/Implement/ContentService.cs      |  2 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../Manifest/ManifestContentAppTests.cs       |  2 +-
 src/Umbraco.Tests/Models/ContentTests.cs      | 29 ++-----
 .../Mapping/ContentWebModelMappingTests.cs    | 16 +++-
 src/Umbraco.Tests/Models/VariationTests.cs    | 10 ++-
 .../Repositories/DocumentRepositoryTest.cs    | 10 ++-
 .../PublishedContent/NuCacheTests.cs          |  3 +-
 .../Scoping/ScopedNuCacheTests.cs             |  3 +-
 .../Services/ContentServiceTests.cs           | 50 ++++++------
 .../ContentTypeServiceVariantsTests.cs        | 23 +-----
 .../UmbracoExamine/IndexInitializer.cs        |  4 +-
 .../UmbracoExamine/SearchTests.cs             |  4 +-
 .../Web/Controllers/ContentControllerTests.cs | 10 +++
 .../Umbraco/dialogs/ChangeDocType.aspx.cs     | 13 ++--
 src/Umbraco.Web/Editors/ContentController.cs  |  3 +-
 .../Editors/ContentTypeController.cs          |  9 ++-
 src/Umbraco.Web/Editors/MediaController.cs    | 20 ++---
 .../Models/Mapping/ContentMapperProfile.cs    | 33 ++++++--
 .../Mapping/ContentTypeBasicResolver.cs       | 17 +++--
 .../Models/Mapping/MediaMapperProfile.cs      |  8 +-
 .../NuCache/PublishedSnapshotService.cs       |  7 +-
 src/Umbraco.Web/umbraco.presentation/page.cs  |  5 +-
 28 files changed, 278 insertions(+), 150 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/ISimpleContentType.cs

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index b15e371e87a2..632036a21e08 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -127,7 +127,7 @@ internal static bool HasChildren(IContentBase content, ServiceContext services)
             }
             return false;
         }
-        
+
         /// <summary>
         /// Returns properties that do not belong to a group
         /// </summary>
@@ -156,15 +156,15 @@ public static IEnumerable<Property> GetPropertiesForGroup(this IContentBase cont
                                                           .Contains(property.PropertyTypeId));
         }
 
-        public static IContentTypeComposition GetContentType(this IContentBase contentBase)
-        {
-            if (contentBase == null) throw new ArgumentNullException(nameof(contentBase));
-
-            if (contentBase is IContent content) return content.ContentType;
-            if (contentBase is IMedia media) return media.ContentType;
-            if (contentBase is IMember member) return member.ContentType;
-            throw new NotSupportedException("Unsupported IContentBase implementation: " + contentBase.GetType().FullName + ".");
-        }
+//        public static IContentTypeComposition GetContentType(this IContentBase contentBase)
+//        {
+//            if (contentBase == null) throw new ArgumentNullException(nameof(contentBase));
+//
+//            if (contentBase is IContent content) return content.ContentType;
+//            if (contentBase is IMedia media) return media.ContentType;
+//            if (contentBase is IMember member) return member.ContentType;
+//            throw new NotSupportedException("Unsupported IContentBase implementation: " + contentBase.GetType().FullName + ".");
+//        }
 
         #region SetValue for setting file contents
 
@@ -174,7 +174,7 @@ public static IContentTypeComposition GetContentType(this IContentBase contentBa
         /// <remarks>This really is for FileUpload fields only, and should be obsoleted. For anything else,
         /// you need to store the file by yourself using Store and then figure out
         /// how to deal with auto-fill properties (if any) and thumbnails (if any) by yourself.</remarks>
-        public static void SetValue(this IContentBase content, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
+        public static void SetValue(this IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
         {
             if (filename == null || filestream == null) return;
 
@@ -183,24 +183,25 @@ public static void SetValue(this IContentBase content, string propertyTypeAlias,
             if (string.IsNullOrWhiteSpace(filename)) return;
             filename = filename.ToLower(); // fixme - er... why?
 
-            SetUploadFile(content, propertyTypeAlias, filename, filestream, culture, segment);
+            SetUploadFile(content,contentTypeService, propertyTypeAlias, filename, filestream, culture, segment);
         }
 
-        private static void SetUploadFile(this IContentBase content, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
+        private static void SetUploadFile(this IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
         {
-            var property = GetProperty(content, propertyTypeAlias);
+            var property = GetProperty(content, contentTypeService, propertyTypeAlias);
             var oldpath = property.GetValue(culture, segment) is string svalue ? MediaFileSystem.GetRelativePath(svalue) : null;
             var filepath = MediaFileSystem.StoreFile(content, property.PropertyType, filename, filestream, oldpath);
             property.SetValue(MediaFileSystem.GetUrl(filepath), culture, segment);
         }
 
         // gets or creates a property for a content item.
-        private static Property GetProperty(IContentBase content, string propertyTypeAlias)
+        private static Property GetProperty(IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias)
         {
             var property = content.Properties.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (property != null) return property;
 
-            var propertyType = content.GetContentType().CompositionPropertyTypes
+            var contentType = contentTypeService.Get(content.ContentTypeId);
+            var propertyType = contentType.CompositionPropertyTypes
                 .FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (propertyType == null)
                 throw new Exception("No property type exists with alias " + propertyTypeAlias + ".");
@@ -226,9 +227,10 @@ private static Property GetProperty(IContentBase content, string propertyTypeAli
         /// the "folder number" that was assigned to the previous file referenced by the property,
         /// if any.</para>
         /// </remarks>
-        public static string StoreFile(this IContentBase content, string propertyTypeAlias, string filename, Stream filestream, string filepath)
+        public static string StoreFile(this IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias, string filename, Stream filestream, string filepath)
         {
-            var propertyType = content.GetContentType()
+            var contentType = contentTypeService.Get(content.ContentTypeId);
+            var propertyType = contentType
                 .CompositionPropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (propertyType == null) throw new ArgumentException("Invalid property type alias " + propertyTypeAlias + ".");
             return MediaFileSystem.StoreFile(content, propertyType, filename, filestream, filepath);
diff --git a/src/Umbraco.Core/ContentVariationExtensions.cs b/src/Umbraco.Core/ContentVariationExtensions.cs
index 516192b905cf..d25997b5f04a 100644
--- a/src/Umbraco.Core/ContentVariationExtensions.cs
+++ b/src/Umbraco.Core/ContentVariationExtensions.cs
@@ -9,6 +9,16 @@ namespace Umbraco.Core
     /// </summary>
     public static class ContentVariationExtensions
     {
+        /// <summary>
+        /// Determines whether the content type is invariant.
+        /// </summary>
+        public static bool VariesByNothing(this ISimpleContentType contentType) => contentType.Variations.VariesByNothing();
+
+        /// <summary>
+        /// Determines whether the content type varies by culture.
+        /// </summary>
+        public static bool VariesByCulture(this ISimpleContentType contentType) => contentType.Variations.VariesByCulture();
+
         /// <summary>
         /// Determines whether the content type is invariant.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 3f6e387dec57..3ae5b4f53417 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Content : ContentBase, IContent
     {
-        private IContentType _contentType;
+        private ISimpleContentType _contentType;
         private ITemplate _template;
         private ContentScheduleCollection _schedule;
         private bool _published;
@@ -48,7 +48,8 @@ public Content(string name, IContent parent, IContentType contentType, string cu
         public Content(string name, IContent parent, IContentType contentType, PropertyCollection properties, string culture = null)
             : base(name, parent, contentType, properties, culture)
         {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
+            if (contentType == null) throw new ArgumentNullException(nameof(contentType));
+            _contentType = new SimpleContentType(contentType);
             _publishedState = PublishedState.Unpublished;
             PublishedVersionId = 0;
         }
@@ -75,7 +76,8 @@ public Content(string name, int parentId, IContentType contentType, string cultu
         public Content(string name, int parentId, IContentType contentType, PropertyCollection properties, string culture = null)
             : base(name, parentId, contentType, properties, culture)
         {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
+            if (contentType == null) throw new ArgumentNullException(nameof(contentType));
+            _contentType = new SimpleContentType(contentType);
             _publishedState = PublishedState.Unpublished;
             PublishedVersionId = 0;
         }
@@ -181,7 +183,7 @@ public PublishedState PublishedState
         /// Gets the ContentType used by this content object
         /// </summary>
         [IgnoreDataMember]
-        public IContentType ContentType => _contentType;
+        public ISimpleContentType ContentType => _contentType;
 
         /// <inheritdoc />
         [IgnoreDataMember]
@@ -423,7 +425,7 @@ public void UnpublishCulture(string culture = "*")
         public void ChangeContentType(IContentType contentType)
         {
             ContentTypeId = contentType.Id;
-            _contentType = contentType;
+            _contentType = new SimpleContentType(contentType);
             ContentTypeBase = contentType;
             Properties.EnsurePropertyTypes(PropertyTypes);
 
@@ -442,7 +444,7 @@ public void ChangeContentType(IContentType contentType, bool clearProperties)
             if(clearProperties)
             {
                 ContentTypeId = contentType.Id;
-                _contentType = contentType;
+                _contentType = new SimpleContentType(contentType);
                 ContentTypeBase = contentType;
                 Properties.EnsureCleanPropertyTypes(PropertyTypes);
 
@@ -460,8 +462,6 @@ public override void ResetDirtyProperties(bool rememberDirty)
 
             if (Template != null)
                 Template.ResetDirtyProperties(rememberDirty);
-            if (ContentType != null)
-                ContentType.ResetDirtyProperties(rememberDirty);
 
             // take care of the published state
             _publishedState = _published ? PublishedState.Published : PublishedState.Unpublished;
@@ -502,7 +502,9 @@ protected override void PerformDeepClone(object clone)
             var clonedContent = (Content)clone;
 
             //need to manually clone this since it's not settable
-            clonedContent._contentType = (IContentType) ContentType.DeepClone();
+            clonedContent._contentType = ContentType;
+
+
 
             //if culture infos exist then deal with event bindings
             if (clonedContent._publishInfos != null)
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index a414a03d2fd9..aadd92099589 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -69,7 +69,7 @@ public interface IContent : IContentBase
         /// <summary>
         /// Gets the content type of this content.
         /// </summary>
-        IContentType ContentType { get; }
+        ISimpleContentType ContentType { get; }
 
         /// <summary>
         /// Gets a value indicating whether a culture is published.
diff --git a/src/Umbraco.Core/Models/ISimpleContentType.cs b/src/Umbraco.Core/Models/ISimpleContentType.cs
new file mode 100644
index 000000000000..320913819ae8
--- /dev/null
+++ b/src/Umbraco.Core/Models/ISimpleContentType.cs
@@ -0,0 +1,76 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a ContentType, which Content is based on
+    /// </summary>
+    public interface ISimpleContentType
+    {
+        string Alias { get; }
+        int Id { get; }
+        ITemplate DefaultTemplate { get; }
+        ContentVariation Variations { get; }
+        string Icon { get; }
+        bool IsContainer { get; }
+        string Name { get; }
+        bool AllowedAsRoot { get; }
+        bool SupportsPropertyVariation(string culture, string s, bool b);
+    }
+
+    public class SimpleContentType : ISimpleContentType
+    {
+        public SimpleContentType(IContentType contentType)
+        {
+            Id = contentType.Id;
+            Alias = contentType.Alias;
+            DefaultTemplate = contentType.DefaultTemplate;
+            Variations = contentType.Variations;
+            Icon = contentType.Icon;
+            IsContainer = contentType.IsContainer;
+            Icon = contentType.Icon;
+            Name = contentType.Name;
+            AllowedAsRoot = contentType.AllowedAsRoot;
+        }
+
+        public string Alias { get; }
+        public int Id { get;  }
+        public ITemplate DefaultTemplate { get;  }
+        public ContentVariation Variations { get; }
+        public string Icon { get; }
+        public bool IsContainer { get; }
+        public string Name { get; }
+        public bool AllowedAsRoot { get; }
+
+        /// <inheritdoc />
+        public bool SupportsPropertyVariation(string culture, string segment, bool wildcards = false)
+        {
+            // non-exact validation: can accept a 'null' culture if the property type varies
+            //  by culture, and likewise for segment
+            // wildcard validation: can accept a '*' culture or segment
+            return Variations.ValidateVariation(culture, segment, false, wildcards, false);
+        }
+
+
+        protected bool Equals(SimpleContentType other)
+        {
+            return string.Equals(Alias, other.Alias) && Id == other.Id;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((SimpleContentType) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return ((Alias != null ? Alias.GetHashCode() : 0) * 397) ^ Id;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 22ff9d591710..741a483bbe25 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -2739,7 +2739,7 @@ public IContent CreateContentFromBlueprint(IContent blueprint, string name, int
         {
             if (blueprint == null) throw new ArgumentNullException(nameof(blueprint));
 
-            var contentType = blueprint.ContentType;
+            var contentType = _contentTypeRepository.Get(blueprint.ContentType.Id);
             var content = new Content(name, -1, contentType);
             content.Path = string.Concat(content.ParentId.ToString(), ",", content.Id);
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 8ef76ade37a8..d83a08483a93 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -404,6 +404,7 @@
     <Compile Include="Models\IAuditEntry.cs" />
     <Compile Include="Models\IAuditItem.cs" />
     <Compile Include="Models\IConsent.cs" />
+    <Compile Include="Models\ISimpleContentType.cs" />
     <Compile Include="Models\Identity\IdentityMapperProfile.cs" />
     <Compile Include="Models\Membership\MemberExportModel.cs" />
     <Compile Include="Models\Membership\MemberExportProperty.cs" />
diff --git a/src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs b/src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
index 016eb4113a3a..1e02f562e3d6 100644
--- a/src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
@@ -18,7 +18,7 @@ public void Test()
             var contentType = Mock.Of<IContentType>();
             Mock.Get(contentType).Setup(x => x.Alias).Returns("type1");
             var content = Mock.Of<IContent>();
-            Mock.Get(content).Setup(x => x.ContentType).Returns(contentType);
+            Mock.Get(content).Setup(x => x.ContentType).Returns(new SimpleContentType(contentType));
 
             var group1 = Mock.Of<IReadOnlyUserGroup>();
             Mock.Get(group1).Setup(x => x.Alias).Returns("group1");
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index d31fcbf74456..bec1b15e9030 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -51,7 +51,7 @@ public void Variant_Culture_Names_Track_Dirty_Changes()
             var content = new Content("content", -1, contentType) { Id = 1, VersionId = 1 };
 
             const string langFr = "fr-FR";
-            
+
             contentType.Variations = ContentVariation.Culture;
 
             Assert.IsFalse(content.IsPropertyDirty("CultureInfos"));    //hasn't been changed
@@ -69,7 +69,7 @@ public void Variant_Culture_Names_Track_Dirty_Changes()
 
             Thread.Sleep(500);                                          //The "Date" wont be dirty if the test runs too fast since it will be the same date
             content.SetCultureName("name-fr", langFr);
-            Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));       
+            Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
             Assert.IsTrue(content.IsPropertyDirty("CultureInfos"));     //it's true now since we've updated a name
         }
 
@@ -83,6 +83,8 @@ public void Variant_Published_Culture_Names_Track_Dirty_Changes()
 
             contentType.Variations = ContentVariation.Culture;
 
+            content.ChangeContentType(contentType);
+
             Assert.IsFalse(content.IsPropertyDirty("PublishCultureInfos"));    //hasn't been changed
 
             Thread.Sleep(500);                                          //The "Date" wont be dirty if the test runs too fast since it will be the same date
@@ -100,7 +102,7 @@ public void Variant_Published_Culture_Names_Track_Dirty_Changes()
             Thread.Sleep(500);                                          //The "Date" wont be dirty if the test runs too fast since it will be the same date
             content.SetCultureName("name-fr", langFr);
             content.PublishCulture(langFr);                             //we've set the name, now we're publishing it
-            Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));       
+            Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
             Assert.IsTrue(content.IsPropertyDirty("PublishCultureInfos"));     //it's true now since we've updated a name
         }
 
@@ -305,7 +307,7 @@ public void Can_Deep_Clone()
             content.UpdateDate = DateTime.Now;
             content.WriterId = 23;
 
-            
+
 
             // Act
             var clone = (Content)content.DeepClone();
@@ -315,20 +317,7 @@ public void Can_Deep_Clone()
             Assert.AreEqual(clone, content);
             Assert.AreEqual(clone.Id, content.Id);
             Assert.AreEqual(clone.VersionId, content.VersionId);
-            Assert.AreNotSame(clone.ContentType, content.ContentType);
             Assert.AreEqual(clone.ContentType, content.ContentType);
-            Assert.AreEqual(clone.ContentType.PropertyGroups.Count, content.ContentType.PropertyGroups.Count);
-            for (var index = 0; index < content.ContentType.PropertyGroups.Count; index++)
-            {
-                Assert.AreNotSame(clone.ContentType.PropertyGroups[index], content.ContentType.PropertyGroups[index]);
-                Assert.AreEqual(clone.ContentType.PropertyGroups[index], content.ContentType.PropertyGroups[index]);
-            }
-            Assert.AreEqual(clone.ContentType.PropertyTypes.Count(), content.ContentType.PropertyTypes.Count());
-            for (var index = 0; index < content.ContentType.PropertyTypes.Count(); index++)
-            {
-                Assert.AreNotSame(clone.ContentType.PropertyTypes.ElementAt(index), content.ContentType.PropertyTypes.ElementAt(index));
-                Assert.AreEqual(clone.ContentType.PropertyTypes.ElementAt(index), content.ContentType.PropertyTypes.ElementAt(index));
-            }
             Assert.AreEqual(clone.ContentTypeId, content.ContentTypeId);
             Assert.AreEqual(clone.CreateDate, content.CreateDate);
             Assert.AreEqual(clone.CreatorId, content.CreatorId);
@@ -402,7 +391,7 @@ public void Remember_Dirty_Properties()
             content.SetCultureName("Hello", "en-US");
             content.SetCultureName("World", "es-ES");
             content.PublishCulture("en-US");
-            
+
             var i = 200;
             foreach (var property in content.Properties)
             {
@@ -420,13 +409,12 @@ public void Remember_Dirty_Properties()
             {
                 Id = 88
             };
-            
+
             content.Trashed = true;
             content.UpdateDate = DateTime.Now;
             content.WriterId = 23;
 
             content.Template.UpdateDate = DateTime.Now; //update a child object
-            content.ContentType.UpdateDate = DateTime.Now;  //update a child object
 
             // Act
             content.ResetDirtyProperties();
@@ -466,7 +454,6 @@ public void Remember_Dirty_Properties()
             }
             //verify child objects were reset too
             Assert.IsTrue(content.Template.WasPropertyDirty("UpdateDate"));
-            Assert.IsTrue(content.ContentType.WasPropertyDirty("UpdateDate"));
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
index 03a59584a3d2..d2a5faa17fdb 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
@@ -27,6 +27,7 @@ protected override void Compose()
             base.Compose();
 
             Container.RegisterSingleton(f => Mock.Of<ICultureDictionaryFactory>());
+            Container.RegisterSingleton(f => Mock.Of<IContentTypeService>());
         }
 
         [DataEditor("Test.Test", "Test", "~/Test.html")]
@@ -117,7 +118,12 @@ public void To_Media_Item_Dto()
         public void To_Display_Model()
         {
             var contentType = MockedContentTypes.CreateSimpleContentType();
+            var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
+            contentTypeServiceMock.Setup(x => x.Get(contentType.Id)).Returns(() => contentType);
+
             var content = MockedContent.CreateSimpleContent(contentType);
+
+
             FixUsers(content);
 
             // need ids for tabs
@@ -146,6 +152,10 @@ public void To_Display_Model_No_Tabs()
         {
             var contentType = MockedContentTypes.CreateSimpleContentType();
             contentType.PropertyGroups.Clear();
+            var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
+            contentTypeServiceMock.Setup(x => x.Get(contentType.Id)).Returns(() => contentType);
+
+
             var content = new Content("Home", -1, contentType) { Level = 1, SortOrder = 1, CreatorId = 0, WriterId = 0 };
 
             var result = Mapper.Map<IContent, ContentItemDisplay>(content);
@@ -158,7 +168,7 @@ public void To_Display_Model_No_Tabs()
                 AssertBasicProperty(invariantContent, p);
                 AssertDisplayProperty(invariantContent, p);
             }
-            
+
             Assert.AreEqual(content.PropertyGroups.Count(), invariantContent.Tabs.Count());
         }
 
@@ -177,6 +187,10 @@ public void To_Display_Model_With_Non_Grouped_Properties()
                 p.Id = idSeed;
                 idSeed++;
             }
+            var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
+            contentTypeServiceMock.Setup(x => x.Get(contentType.Id)).Returns(() => contentType);
+
+
             var content = MockedContent.CreateSimpleContent(contentType);
             FixUsers(content);
 
diff --git a/src/Umbraco.Tests/Models/VariationTests.cs b/src/Umbraco.Tests/Models/VariationTests.cs
index e6f4e53d263b..a5b6b71b9ac8 100644
--- a/src/Umbraco.Tests/Models/VariationTests.cs
+++ b/src/Umbraco.Tests/Models/VariationTests.cs
@@ -59,7 +59,7 @@ public void SetUp()
                     if (x == typeof(ILocalizedTextService)) return serviceContext.LocalizationService;
                     throw new Exception("oops");
                 });
-            
+
         }
 
         [Test]
@@ -285,6 +285,7 @@ public void ContentPublishValues()
             // change - now we vary by culture
             contentType.Variations |= ContentVariation.Culture;
             propertyType.Variations |= ContentVariation.Culture;
+            content.ChangeContentType(contentType);
 
             // can set value
             // and get values
@@ -401,9 +402,12 @@ public void ContentPublishVariations()
             var content = new Content("content", -1, contentType) { Id = 1, VersionId = 1 };
 
             // change - now we vary by culture
+
             contentType.Variations |= ContentVariation.Culture;
             propertyType.Variations |= ContentVariation.Culture;
 
+            content.ChangeContentType(contentType);
+
             Assert.Throws<NotSupportedException>(() => content.SetValue("prop", "a")); // invariant = no
             content.SetValue("prop", "a-fr", langFr);
             content.SetValue("prop", "a-uk", langUk);
@@ -430,7 +434,7 @@ public void ContentPublishVariations()
             Assert.IsTrue(content.IsCultureAvailable(langUk));
             Assert.IsFalse(content.IsCulturePublished(langUk));
             Assert.IsNull(content.GetPublishName(langUk));
-            Assert.IsNull(content.GetPublishDate(langUk)); // not published            
+            Assert.IsNull(content.GetPublishDate(langUk)); // not published
 
             Assert.IsFalse(content.IsCultureAvailable(langEs));
             Assert.IsFalse(content.IsCultureEdited(langEs)); // not avail, so... not edited
@@ -438,7 +442,7 @@ public void ContentPublishVariations()
 
             // not published!
             Assert.IsNull(content.GetPublishName(langEs));
-            Assert.IsNull(content.GetPublishDate(langEs)); 
+            Assert.IsNull(content.GetPublishDate(langEs));
 
             // cannot test IsCultureEdited here - as that requires the content service and repository
             // see: ContentServiceTests.Can_SaveRead_Variations
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
index 9f84d9faf55f..8827766d4abd 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
@@ -302,13 +302,15 @@ public void PropertyDataAssignedCorrectly()
 
                 var emptyContentType = MockedContentTypes.CreateBasicContentType();
                 var hasPropertiesContentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
+                contentTypeRepository.Save(emptyContentType);
+                contentTypeRepository.Save(hasPropertiesContentType);
+
                 ServiceContext.FileService.SaveTemplate(hasPropertiesContentType.DefaultTemplate); // else, FK violation on contentType!
                 var content1 = MockedContent.CreateSimpleContent(hasPropertiesContentType);
                 var content2 = MockedContent.CreateBasicContent(emptyContentType);
                 var content3 = MockedContent.CreateSimpleContent(hasPropertiesContentType);
 
-                contentTypeRepository.Save(emptyContentType);
-                contentTypeRepository.Save(hasPropertiesContentType);
+
                 repository.Save(content1);
                 repository.Save(content2);
                 repository.Save(content3);
@@ -424,9 +426,9 @@ public void SaveContentWithDefaultTemplate()
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
                 contentType.AllowedTemplates = Enumerable.Empty<ITemplate>(); // because CreateSimpleContentType assigns one already
                 contentType.SetDefaultTemplate(template);
-                var textpage = MockedContent.CreateSimpleContent(contentType);
-
                 contentTypeRepository.Save(contentType);
+
+                var textpage = MockedContent.CreateSimpleContent(contentType);
                 repository.Save(textpage);
 
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 492f1f7dc048..8e3f99c5438c 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -148,7 +148,8 @@ public void StandaloneVariations()
                 new TestDefaultCultureAccessor(),
                 dataSource,
                 globalSettings,
-                new SiteDomainHelper());
+                new SiteDomainHelper(),
+                contentTypeService);
 
             // get a snapshot, get a published content
             var snapshot = snapshotService.CreatePublishedSnapshot(previewToken: null);
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 211bdc3cdba3..045a6ad147d4 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -82,6 +82,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
             var documentRepository = Mock.Of<IDocumentRepository>();
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
+            var contentTypeService = Current.Services.ContentTypeService;
 
             return new PublishedSnapshotService(
                 options,
@@ -97,7 +98,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
                 new DatabaseDataSource(),
-                Container.GetInstance<IGlobalSettings>(), new SiteDomainHelper());
+                Container.GetInstance<IGlobalSettings>(), new SiteDomainHelper(), contentTypeService);
         }
 
         protected UmbracoContext GetUmbracoContextNu(string url, int templateId = 1234, RouteData routeData = null, bool setSingleton = false, IUmbracoSettingsSection umbracoSettings = null, IEnumerable<IUrlProvider> urlProviders = null)
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index d3ebf703a595..0cd7207e6c14 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -139,29 +139,33 @@ public void Delete_Blueprint()
         [Test]
         public void Create_Content_From_Blueprint()
         {
-            var contentService = ServiceContext.ContentService;
-            var contentTypeService = ServiceContext.ContentTypeService;
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                var contentService = ServiceContext.ContentService;
+                var contentTypeService = ServiceContext.ContentTypeService;
 
-            var contentType = MockedContentTypes.CreateTextPageContentType();
-            ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
-            contentTypeService.Save(contentType);
+                var contentType = MockedContentTypes.CreateTextPageContentType();
+                ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
+                contentTypeService.Save(contentType);
 
-            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
-            blueprint.SetValue("title", "blueprint 1");
-            blueprint.SetValue("bodyText", "blueprint 2");
-            blueprint.SetValue("keywords", "blueprint 3");
-            blueprint.SetValue("description", "blueprint 4");
+                var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
+                blueprint.SetValue("title", "blueprint 1");
+                blueprint.SetValue("bodyText", "blueprint 2");
+                blueprint.SetValue("keywords", "blueprint 3");
+                blueprint.SetValue("description", "blueprint 4");
 
-            contentService.SaveBlueprint(blueprint);
+                contentService.SaveBlueprint(blueprint);
 
-            var fromBlueprint = contentService.CreateContentFromBlueprint(blueprint, "hello world");
-            contentService.Save(fromBlueprint);
+                var fromBlueprint = contentService.CreateContentFromBlueprint(blueprint, "hello world");
+                contentService.Save(fromBlueprint);
+
+                Assert.IsTrue(fromBlueprint.HasIdentity);
+                Assert.AreEqual("blueprint 1", fromBlueprint.Properties["title"].GetValue());
+                Assert.AreEqual("blueprint 2", fromBlueprint.Properties["bodyText"].GetValue());
+                Assert.AreEqual("blueprint 3", fromBlueprint.Properties["keywords"].GetValue());
+                Assert.AreEqual("blueprint 4", fromBlueprint.Properties["description"].GetValue());
+            }
 
-            Assert.IsTrue(fromBlueprint.HasIdentity);
-            Assert.AreEqual("blueprint 1", fromBlueprint.Properties["title"].GetValue());
-            Assert.AreEqual("blueprint 2", fromBlueprint.Properties["bodyText"].GetValue());
-            Assert.AreEqual("blueprint 3", fromBlueprint.Properties["keywords"].GetValue());
-            Assert.AreEqual("blueprint 4", fromBlueprint.Properties["description"].GetValue());
         }
 
         [Test]
@@ -222,7 +226,7 @@ public void Perform_Scheduled_Publishing()
                     c.ContentSchedule.Add(now.AddSeconds(5), null); //release in 5 seconds
                     var r = ServiceContext.ContentService.Save(c);
                     Assert.IsTrue(r.Success, r.Result.ToString());
-                }   
+                }
                 else
                 {
                     c.ContentSchedule.Add(null, now.AddSeconds(5)); //expire in 5 seconds
@@ -258,7 +262,7 @@ public void Perform_Scheduled_Publishing()
                 variant.Add(c);
             }
 
-            
+
             var runSched = ServiceContext.ContentService.PerformScheduledPublish(
                 now.AddMinutes(1)).ToList(); //process anything scheduled before a minute from now
 
@@ -742,7 +746,7 @@ public void Can_Unpublish_Content()
         public void Can_Unpublish_Content_Variation()
         {
             // Arrange
-            
+
             var langUk = new Language("en-GB") { IsDefault = true };
             var langFr = new Language("fr-FR");
 
@@ -1066,7 +1070,7 @@ public void Can_Publish_Content_Children()
                 foreach (var x in descendants)
                     Console.WriteLine("          ".Substring(0, x.Level) + x.Id);
             }
-            
+
             Console.WriteLine();
 
             // publish parent & its branch
@@ -1420,7 +1424,7 @@ public void Can_Move_Content_Structure_To_RecycleBin_And_Empty_RecycleBin()
             var descendants = new List<IContent>();
             while(page * pageSize < total)
                 descendants.AddRange(contentService.GetPagedDescendants(content.Id, page++, pageSize, out total));
-            
+
             Assert.AreNotEqual(-20, content.ParentId);
             Assert.IsFalse(content.Trashed);
             Assert.AreEqual(3, descendants.Count);
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index c28d4f795514..8f453c6d53f3 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -53,6 +53,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
             var documentRepository = Container.GetInstance<IDocumentRepository>();
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
+            var contentTypeService = Current.Services.ContentTypeService;
 
             return new PublishedSnapshotService(
                 options,
@@ -68,7 +69,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
                 new DatabaseDataSource(),
-                Container.GetInstance<IGlobalSettings>(), new SiteDomainHelper());
+                Container.GetInstance<IGlobalSettings>(), new SiteDomainHelper(), contentTypeService);
         }
 
         public class LocalServerMessenger : ServerMessengerBase
@@ -173,8 +174,6 @@ public void Change_Variations_SimpleContentType_VariantToInvariantAndBack()
             Assert.AreEqual("v1en", document.GetValue("value1"));
             Assert.AreEqual("v2", document.GetValue("value2"));
 
-            Assert.IsFalse(document.ContentType.PropertyTypes.First(x => x.Alias == "value1").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'','seg':'','val':'v1en'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
@@ -192,8 +191,6 @@ public void Change_Variations_SimpleContentType_VariantToInvariantAndBack()
             Assert.AreEqual("v1en", document.GetValue("value1"));
             Assert.AreEqual("v2", document.GetValue("value2"));
 
-            Assert.IsFalse(document.ContentType.PropertyTypes.First(x => x.Alias == "value1").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'','seg':'','val':'v1en'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
@@ -210,8 +207,6 @@ public void Change_Variations_SimpleContentType_VariantToInvariantAndBack()
             Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
             Assert.AreEqual("v2", document.GetValue("value2"));
 
-            Assert.IsTrue(document.ContentType.PropertyTypes.First(x => x.Alias == "value1").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
@@ -286,8 +281,6 @@ public void Change_Variations_SimpleContentType_InvariantToVariantAndBack()
             Assert.AreEqual("v1", document.GetValue("value1"));
             Assert.AreEqual("v2", document.GetValue("value2"));
 
-            Assert.IsFalse(document.ContentType.PropertyTypes.First(x => x.Alias == "value1").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'','seg':'','val':'v1'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
@@ -303,8 +296,6 @@ public void Change_Variations_SimpleContentType_InvariantToVariantAndBack()
             Assert.IsNull(document.GetValue("value1", "fr"));
             Assert.AreEqual("v2", document.GetValue("value2"));
 
-            Assert.IsTrue(document.ContentType.PropertyTypes.First(x => x.Alias == "value1").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
@@ -322,8 +313,6 @@ public void Change_Variations_SimpleContentType_InvariantToVariantAndBack()
             Assert.AreEqual("v1", document.GetValue("value1"));
             Assert.AreEqual("v2", document.GetValue("value2"));
 
-            Assert.IsFalse(document.ContentType.PropertyTypes.First(x => x.Alias == "value1").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'','seg':'','val':'v1'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
@@ -399,8 +388,6 @@ public void Change_Variations_SimpleContentType_VariantPropertyToInvariantAndBac
             Assert.AreEqual("v1en", document.GetValue("value1"));
             Assert.AreEqual("v2", document.GetValue("value2"));
 
-            Assert.IsFalse(document.ContentType.PropertyTypes.First(x => x.Alias == "value1").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'','seg':'','val':'v1en'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
@@ -417,8 +404,6 @@ public void Change_Variations_SimpleContentType_VariantPropertyToInvariantAndBac
             Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
             Assert.AreEqual("v2", document.GetValue("value2"));
 
-            Assert.IsTrue(document.ContentType.PropertyTypes.First(x => x.Alias == "value1").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'','seg':'','val':'v2'}]},'cultureData':");
@@ -437,8 +422,6 @@ public void Change_Variations_SimpleContentType_VariantPropertyToInvariantAndBac
             Assert.IsNull(document.GetValue("value2", "fr"));
             Assert.IsNull(document.GetValue("value2"));
 
-            Assert.IsTrue(document.ContentType.PropertyTypes.First(x => x.Alias == "value2").VariesByCulture());
-
             Console.WriteLine(GetJson(document.Id));
             AssertJsonStartsWith(document.Id,
                 "{'properties':{'value1':[{'culture':'en','seg':'','val':'v1en'},{'culture':'fr','seg':'','val':'v1fr'}],'value2':[{'culture':'en','seg':'','val':'v2'}]},'cultureData':");
@@ -770,4 +753,4 @@ public void Change_Variations_ComposedContentType_2()
                 "{'properties':{'value11':[{'culture':'','seg':'','val':'v11'}],'value12':[{'culture':'','seg':'','val':'v12'}],'value31':[{'culture':'','seg':'','val':'v31'}],'value32':[{'culture':'','seg':'','val':'v32'}]},'cultureData':");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index 4435a5e829e3..8565321bae1f 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -70,7 +70,7 @@ public static IContentService GetMockContentService()
                         m.GetCultureName(It.IsAny<string>()) == (string)x.Attribute("nodeName") &&
                         m.Path == (string)x.Attribute("path") &&
                         m.Properties == new PropertyCollection() &&
-                        m.ContentType == Mock.Of<IContentType>(mt =>
+                        m.ContentType == Mock.Of<ISimpleContentType>(mt =>
                             mt.Icon == "test" &&
                             mt.Alias == x.Name.LocalName &&
                             mt.Id == (int)x.Attribute("nodeType"))))
@@ -161,7 +161,7 @@ public static UmbracoContentIndex GetUmbracoIndexer(
 
             if (validator == null)
                 validator = new ContentValueSetValidator(true);
-            
+
             var i = new UmbracoContentIndex(
                 "testIndexer",
                 new UmbracoFieldDefinitionCollection(), 
diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
index 747bab3c6d0f..85100410be2d 100644
--- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
@@ -42,7 +42,7 @@ public void Test_Sort_Order_Sorting()
                         m.Path == (string)x.Attribute("path") &&
                         m.Properties == new PropertyCollection() &&
                         m.Published == true &&
-                        m.ContentType == Mock.Of<IContentType>(mt =>
+                        m.ContentType == Mock.Of<ISimpleContentType>(mt =>
                             mt.Icon == "test" &&
                             mt.Alias == x.Name.LocalName &&
                             mt.Id == (int)x.Attribute("nodeType"))))
@@ -62,7 +62,7 @@ public void Test_Sort_Order_Sorting()
             {
                 indexer.CreateIndex();
                 rebuilder.Populate(indexer);
-                
+
                 var searcher = indexer.GetSearcher();
 
                 var numberSortedCriteria = searcher.CreateQuery()
diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
index 9bd00f3d966e..2a2aa536aa8c 100644
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
@@ -82,6 +82,7 @@ protected override void ComposeApplication(bool withApplication)
             textService.Setup(x => x.Localize(It.IsAny<string>(), It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("text");
 
             Container.RegisterSingleton(f => Mock.Of<IContentService>());
+            Container.RegisterSingleton(f => Mock.Of<IContentTypeService>());
             Container.RegisterSingleton(f => userServiceMock.Object);
             Container.RegisterSingleton(f => entityService.Object);
             Container.RegisterSingleton(f => dataTypeService.Object);
@@ -308,6 +309,9 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                 contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
+                var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
+                contentTypeServiceMock.Setup(x => x.Get(content.ContentTypeId)).Returns(() => MockedContentTypes.CreateSimpleContentType());
+
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var usersController = new ContentController(propertyEditorCollection);
                 Container.InjectProperties(usersController);
@@ -340,6 +344,9 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                 contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
+                var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
+                contentTypeServiceMock.Setup(x => x.Get(content.ContentTypeId)).Returns(() => MockedContentTypes.CreateSimpleContentType());
+
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var usersController = new ContentController(propertyEditorCollection);
                 Container.InjectProperties(usersController);
@@ -376,6 +383,9 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                 contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
+                var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
+                contentTypeServiceMock.Setup(x => x.Get(content.ContentTypeId)).Returns(() => MockedContentTypes.CreateSimpleContentType());
+
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var usersController = new ContentController(propertyEditorCollection);
                 Container.InjectProperties(usersController);
diff --git a/src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs b/src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
index 8111410eddb3..cb145ee282e4 100644
--- a/src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
+++ b/src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
@@ -104,8 +104,9 @@ private IEnumerable<IContentType> RemoveInvalidByParentDocumentTypesFromAlternat
             {
                 // Below root, so only include those allowed as sub-nodes for the parent
                 var parentNode = Services.ContentService.GetById(_content.ParentId);
+                var parentContentType = Services.ContentTypeService.Get(parentNode.ContentTypeId);
                 return documentTypes
-                    .Where(x => parentNode.ContentType.AllowedContentTypes
+                    .Where(x => parentContentType.AllowedContentTypes
                         .Select(y => y.Id.Value)
                         .Contains(x.Id));
             }
@@ -149,7 +150,8 @@ private void PopulateListOfTemplates()
 
         private void PopulatePropertyMappingWithSources()
         {
-            PropertyMappingRepeater.DataSource = GetPropertiesOfContentType(_content.ContentType);
+            var contentType = Services.ContentTypeService.Get(_content.ContentTypeId);
+            PropertyMappingRepeater.DataSource = contentType.CompositionPropertyTypes;
             PropertyMappingRepeater.DataBind();
         }
 
@@ -159,7 +161,7 @@ private void PopulatePropertyMappingWithDestinations()
             var contentType = GetSelectedDocumentType();
 
             // Get properties of new document type (including any from parent types)
-            var properties = GetPropertiesOfContentType(contentType);
+            var properties = contentType.CompositionPropertyTypes;
 
             // Loop through list of source properties and populate destination options with all those of same property type
             foreach (RepeaterItem ri in PropertyMappingRepeater.Items)
@@ -193,10 +195,7 @@ private IContentType GetSelectedDocumentType()
             return Services.ContentTypeService.Get(int.Parse(NewDocumentTypeList.SelectedItem.Value));
         }
 
-        private IEnumerable<PropertyType> GetPropertiesOfContentType(IContentType contentType)
-        {
-            return contentType.CompositionPropertyTypes;
-        }
+
 
         private void DisplayNotAvailable()
         {
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 55862d14b881..d0699c4ad416 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1834,8 +1834,9 @@ private IContent ValidateMoveOrCopy(MoveOrCopy model)
                     throw new HttpResponseException(HttpStatusCode.NotFound);
                 }
 
+                var parentContentType = Services.ContentTypeService.Get(parent.ContentTypeId);
                 //check if the item is allowed under this one
-                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
+                if (parentContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
                         .Any(x => x.Value == toMove.ContentType.Id) == false)
                 {
                     throw new HttpResponseException(
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 397f6b3e9da1..703e2d1e5472 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -193,7 +193,7 @@ public HttpResponseMessage PostRenameContainer(int id, string name)
                 ? Request.CreateResponse(HttpStatusCode.OK, result.Result) //return the id
                 : Request.CreateNotificationValidationErrorResponse(result.Exception.Message);
         }
-        
+
         public CreatedContentTypeCollectionResult PostCreateCollection(int parentId, string collectionName, bool collectionCreateTemplate, string collectionItemName, bool collectionItemCreateTemplate, string collectionIcon, string collectionItemIcon)
         {
             // create item doctype
@@ -201,7 +201,7 @@ public CreatedContentTypeCollectionResult PostCreateCollection(int parentId, str
             itemDocType.Name = collectionItemName;
             itemDocType.Alias = collectionItemName.ToSafeAlias(true);
             itemDocType.Icon = collectionItemIcon;
-            
+
             // create item doctype template
             if (collectionItemCreateTemplate)
             {
@@ -222,7 +222,7 @@ public CreatedContentTypeCollectionResult PostCreateCollection(int parentId, str
             {
                 new ContentTypeSort(itemDocType.Id, 0)
             };
-            
+
             // create collection doctype template
             if (collectionCreateTemplate)
             {
@@ -382,7 +382,8 @@ public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
                     return Enumerable.Empty<ContentTypeBasic>();
                 }
 
-                var ids = contentItem.ContentType.AllowedContentTypes.Select(x => x.Id.Value).ToArray();
+                var contentType = Services.ContentTypeService.Get(contentItem.ContentTypeId);
+                var ids = contentType.AllowedContentTypes.Select(x => x.Id.Value).ToArray();
 
                 if (ids.Any() == false) return Enumerable.Empty<ContentTypeBasic>();
 
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index e0ee7c85a9be..1f73b0c629dc 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -50,9 +50,10 @@ namespace Umbraco.Web.Editors
     [MediaControllerControllerConfiguration]
     public class MediaController : ContentControllerBase
     {
-        public MediaController(PropertyEditorCollection propertyEditors)
+        public MediaController(PropertyEditorCollection propertyEditors, IContentTypeService contentTypeService)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
+            _contentTypeService = contentTypeService;
         }
 
         /// <summary>
@@ -236,6 +237,7 @@ public IEnumerable<ContentItemBasic<ContentPropertyBasic>> GetRootMedia()
 
         private int[] _userStartNodes;
         private readonly PropertyEditorCollection _propertyEditors;
+        private readonly IContentTypeService _contentTypeService;
 
         protected int[] UserStartNodes
         {
@@ -295,7 +297,7 @@ public PagedResult<ContentItemBasic<ContentPropertyBasic>> GetChildren(int id,
             else
             {
                 //better to not use this without paging where possible, currently only the sort dialog does
-                children = Services.MediaService.GetPagedChildren(id, 0, int.MaxValue, out var total).ToList();
+                children = Services.MediaService.GetPagedChildren(id,0, int.MaxValue, out var total).ToList();
                 totalChildren = children.Count;
             }
 
@@ -426,7 +428,7 @@ public HttpResponseMessage PostMove(MoveOrCopy move)
             var toMove = ValidateMoveOrCopy(move);
             var destinationParentID = move.ParentId;
             var sourceParentID = toMove.ParentId;
-            
+
             var moveResult = Services.MediaService.Move(toMove, move.ParentId);
 
             if (sourceParentID == destinationParentID)
@@ -544,7 +546,7 @@ public MediaItemDisplay PostSave(
 
             return display;
         }
-        
+
         /// <summary>
         /// Empties the recycle bin
         /// </summary>
@@ -597,11 +599,11 @@ public HttpResponseMessage PostSort(ContentSortOrder sorted)
                 throw;
             }
         }
-        
+
         public MediaItemDisplay PostAddFolder(PostedFolder folder)
         {
             var intParentId = GetParentIdAsInt(folder.ParentId, validatePermissions:true);
-            
+
             var mediaService = Services.MediaService;
 
             var f = mediaService.CreateMedia(folder.Name, intParentId, Constants.Conventions.MediaTypes.Folder);
@@ -641,10 +643,10 @@ public async Task<HttpResponseMessage> PostAddFile()
             //get the string json from the request
             string currentFolderId = result.FormData["currentFolder"];
             int parentId = GetParentIdAsInt(currentFolderId, validatePermissions: true);
-           
+
             var tempFiles = new PostedFiles();
             var mediaService = Services.MediaService;
-            
+
             //in case we pass a path with a folder in it, we will create it and upload media to it.
             if (result.FormData.ContainsKey("path"))
             {
@@ -727,7 +729,7 @@ public async Task<HttpResponseMessage> PostAddFile()
                     if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
                     using (fs)
                     {
-                        f.SetValue(Constants.Conventions.Media.File, fileName, fs);
+                        f.SetValue(_contentTypeService, Constants.Conventions.Media.File,fileName, fs);
                     }
 
                     var saveResult = mediaService.Save(f, Security.CurrentUser.Id);
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
index 6de3bdc02cb2..1f078a9990d9 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
 using Umbraco.Core;
@@ -29,7 +30,8 @@ public ContentMapperProfile(
             var creatorResolver = new CreatorResolver(userService);
             var actionButtonsResolver = new ActionButtonsResolver(userService, contentService);
             var childOfListViewResolver = new ContentChildOfListViewResolver(contentService, contentTypeService);
-            var contentTypeBasicResolver = new ContentTypeBasicResolver<IContent, ContentItemDisplay>();
+            var contentTypeBasicResolver = new ContentTypeBasicResolver<IContent, ContentItemDisplay>(contentTypeService);
+            var allowedTemplatesResolver = new AllowedTemplatesResolver(contentTypeService);
             var defaultTemplateResolver = new DefaultTemplateResolver();
             var variantResolver = new ContentVariantResolver(localizationService);
             var schedPublishReleaseDateResolver = new ScheduledPublishDateResolver(ContentScheduleAction.Release);
@@ -56,10 +58,7 @@ public ContentMapperProfile(
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Errors, opt => opt.Ignore())
                 .ForMember(dest => dest.DocumentType, opt => opt.ResolveUsing(contentTypeBasicResolver))
-                .ForMember(dest => dest.AllowedTemplates, opt =>
-                    opt.MapFrom(content => content.ContentType.AllowedTemplates
-                        .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false)
-                        .ToDictionary(t => t.Alias, t => t.Name)))                
+                .ForMember(dest => dest.AllowedTemplates, opt => opt.ResolveUsing(allowedTemplatesResolver))
                 .ForMember(dest => dest.AllowedActions, opt => opt.ResolveUsing(src => actionButtonsResolver.Resolve(src)))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
 
@@ -140,5 +139,27 @@ public string Resolve(IContent source, ContentItemBasic<ContentPropertyBasic> de
                 return source.CultureInfos.TryGetValue(culture, out var name) && !name.Name.IsNullOrWhiteSpace() ? name.Name : $"(({source.Name}))";
             }
         }
-    }    
+
+
+        private class AllowedTemplatesResolver : IValueResolver<IContent, ContentItemDisplay, IDictionary<string, string>>
+        {
+            private readonly IContentTypeService _contentTypeService;
+
+            public AllowedTemplatesResolver(IContentTypeService contentTypeService)
+            {
+                _contentTypeService = contentTypeService;
+            }
+
+            public IDictionary<string, string> Resolve(IContent source, ContentItemDisplay destination, IDictionary<string, string> destMember, ResolutionContext context)
+            {
+                var contentType = _contentTypeService.Get(source.ContentTypeId);
+
+                return contentType.AllowedTemplates
+                    .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false)
+                    .ToDictionary(t => t.Alias, t => t.Name);
+            }
+        }
+    }
+
+
 }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
index 01ff458bd53a..c219df85964d 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
@@ -4,6 +4,7 @@
 using AutoMapper;
 using Umbraco.Core;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping
@@ -15,6 +16,13 @@ namespace Umbraco.Web.Models.Mapping
     internal class ContentTypeBasicResolver<TSource, TDestination> : IValueResolver<TSource, TDestination, ContentTypeBasic>
         where TSource : IContentBase
     {
+        private readonly IContentTypeService _contentTypeService;
+
+        public ContentTypeBasicResolver(IContentTypeService contentTypeService)
+        {
+            _contentTypeService = contentTypeService;
+        }
+
         public ContentTypeBasic Resolve(TSource source, TDestination destination, ContentTypeBasic destMember, ResolutionContext context)
         {
             //TODO: We can resolve the UmbracoContext from the IValueResolver options!
@@ -22,13 +30,8 @@ public ContentTypeBasic Resolve(TSource source, TDestination destination, Conten
             if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
                 && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
             {
-                ContentTypeBasic contentTypeBasic;
-                if (source is IContent content)
-                    contentTypeBasic = Mapper.Map<IContentType, ContentTypeBasic>(content.ContentType);
-                else if (source is IMedia media)
-                    contentTypeBasic = Mapper.Map<IMediaType, ContentTypeBasic>(media.ContentType);
-                else
-                    throw new NotSupportedException($"Expected TSource to be IContent or IMedia, got {typeof(TSource).Name}.");
+                var contentType = _contentTypeService.Get(source.ContentTypeId);
+                var contentTypeBasic =  Mapper.Map<IContentType, ContentTypeBasic>(contentType);
 
                 return contentTypeBasic;
             }
diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
index dc16ed5fe411..feaa2917fea7 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
@@ -15,8 +15,7 @@ namespace Umbraco.Web.Models.Mapping
     /// </summary>
     internal class MediaMapperProfile : Profile
     {
-        public MediaMapperProfile(
-            TabsAndPropertiesResolver<IMedia, MediaItemDisplay> tabsAndPropertiesResolver,
+        public MediaMapperProfile(TabsAndPropertiesResolver<IMedia, MediaItemDisplay> tabsAndPropertiesResolver,
             ContentTreeNodeUrlResolver<IMedia, MediaTreeController> contentTreeNodeUrlResolver,
             MediaAppResolver mediaAppResolver,
             IUserService userService,
@@ -24,12 +23,13 @@ public MediaMapperProfile(
             IDataTypeService dataTypeService,
             IMediaService mediaService,
             IMediaTypeService mediaTypeService,
-            ILogger logger)
+            ILogger logger,
+            IContentTypeService contentTypeService)
         {
             // create, capture, cache
             var mediaOwnerResolver = new OwnerResolver<IMedia>(userService);
             var childOfListViewResolver = new MediaChildOfListViewResolver(mediaService, mediaTypeService);
-            var mediaTypeBasicResolver = new ContentTypeBasicResolver<IMedia, MediaItemDisplay>();
+            var mediaTypeBasicResolver = new ContentTypeBasicResolver<IMedia, MediaItemDisplay>(contentTypeService);
 
             //FROM IMedia TO MediaItemDisplay
             CreateMap<IMedia, MediaItemDisplay>()
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 4d6115f02d02..4df0cf2ae7f2 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -43,6 +43,7 @@ class PublishedSnapshotService : PublishedSnapshotServiceBase
         private readonly IMemberRepository _memberRepository;
         private readonly IGlobalSettings _globalSettings;
         private readonly ISiteDomainHelper _siteDomainHelper;
+        private readonly IContentTypeService _contentTypeService;
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
 
         // volatile because we read it with no lock
@@ -85,7 +86,7 @@ public PublishedSnapshotService(Options options, MainDom mainDom, IRuntimeState
             ILogger logger, IScopeProvider scopeProvider,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
-            IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper)
+            IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, IContentTypeService contentTypeService)
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
             //if (Interlocked.Increment(ref _singletonCheck) > 1)
@@ -102,6 +103,7 @@ public PublishedSnapshotService(Options options, MainDom mainDom, IRuntimeState
             _defaultCultureAccessor = defaultCultureAccessor;
             _globalSettings = globalSettings;
             _siteDomainHelper = siteDomainHelper;
+            _contentTypeService = contentTypeService;
 
             // we always want to handle repository events, configured or not
             // assuming no repository event will trigger before the whole db is ready
@@ -1196,7 +1198,8 @@ private ContentNuDto GetDto(IContentBase content, bool published)
             var cultureData = new Dictionary<string, CultureVariation>();
 
             // sanitize - names should be ok but ... never knows
-            if (content.GetContentType().VariesByCulture())
+            var contentType = _contentTypeService.Get(content.ContentTypeId);
+            if (contentType.VariesByCulture())
             {
                 var infos = content is IContent document
                     ? (published
diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs
index 219e2101be07..9e6c85c9eaae 100644
--- a/src/Umbraco.Web/umbraco.presentation/page.cs
+++ b/src/Umbraco.Web/umbraco.presentation/page.cs
@@ -141,7 +141,7 @@ void populatePageData(int pageID,
             _elements.Add("path", path);
             _elements.Add("splitpath", _splitpath);
         }
-        
+
         /// <summary>
         /// Puts the properties of the node into the elements table
         /// </summary>
@@ -328,7 +328,8 @@ public PagePublishedContent(IContent inner, IVariationContextAccessor variationC
                 _creatorName = _inner.GetCreatorProfile().Name;
                 _writerName = _inner.GetWriterProfile().Name;
 
-                _contentType = Current.PublishedContentTypeFactory.CreateContentType(_inner.ContentType);
+
+                _contentType = Current.PublishedContentTypeFactory.CreateContentType(Current.Services.ContentTypeService.Get(_inner.ContentTypeId));
 
                 _properties = _contentType.PropertyTypes
                     .Select(x =>

From 6490f57f70e07c9aba5b4fd3b7bdf40b1bbf73a8 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 3 Jan 2019 10:53:33 +0100
Subject: [PATCH 010/421] Removed commented out code.

---
 src/Umbraco.Core/ContentExtensions.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 632036a21e08..15ba6b1a225c 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -156,16 +156,6 @@ public static IEnumerable<Property> GetPropertiesForGroup(this IContentBase cont
                                                           .Contains(property.PropertyTypeId));
         }
 
-//        public static IContentTypeComposition GetContentType(this IContentBase contentBase)
-//        {
-//            if (contentBase == null) throw new ArgumentNullException(nameof(contentBase));
-//
-//            if (contentBase is IContent content) return content.ContentType;
-//            if (contentBase is IMedia media) return media.ContentType;
-//            if (contentBase is IMember member) return member.ContentType;
-//            throw new NotSupportedException("Unsupported IContentBase implementation: " + contentBase.GetType().FullName + ".");
-//        }
-
         #region SetValue for setting file contents
 
         /// <summary>

From 586a7a167a17d3add83e935b37203234bdabd8fe Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 11 Jan 2019 08:55:25 +0100
Subject: [PATCH 011/421] Merged v8

---
 src/Umbraco.Core/ContentExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 1431396d0175..0e119e0aeef7 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -180,7 +180,7 @@ public static void SetValue(this IContentBase content, IContentTypeService conte
 
         private static void SetUploadFile(this IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
         {
-            var property = GetProperty(content, contentTypeService propertyTypeAlias);
+            var property = GetProperty(content, contentTypeService, propertyTypeAlias);
 
             // Fixes https://github.com/umbraco/Umbraco-CMS/issues/3937 - Assigning a new file to an
             // existing IMedia with extension SetValue causes exception 'Illegal characters in path'

From 862d5227587039969f3f06c52acad9a7c9d170c9 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 14 Jan 2019 22:53:19 +0100
Subject: [PATCH 012/421] Fix the styling of the search box on the redirect url
 management dashboard

---
 .../src/views/dashboard/content/redirecturls.html             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
index 837c24cb0c83..a06984f31e19 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
@@ -29,7 +29,7 @@
 
             <umb-editor-sub-header-section ng-if="vm.dashboard.urlTrackerDisabled === false">
 
-                <form class="form-search -no-margin-bottom pull-right" novalidate>
+                <ng-form class="form-search -no-margin-bottom pull-right" novalidate>
                     <div class="inner-addon left-addon">
                         <i class="icon icon-search"></i>
                         <input
@@ -42,7 +42,7 @@
                             prevent-enter-submit
                             no-dirty-check>
                     </div>
-                </form>
+                </ng-form>
 
             </umb-editor-sub-header-section>
 

From 5f3596c7d9427d178408f011031bf36ea819668c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 16 Jan 2019 13:11:46 +0100
Subject: [PATCH 013/421] Fixes after merge of temp8

---
 src/Umbraco.Core/Models/ISimpleContentType.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Core/Models/ISimpleContentType.cs b/src/Umbraco.Core/Models/ISimpleContentType.cs
index 320913819ae8..679a69520c65 100644
--- a/src/Umbraco.Core/Models/ISimpleContentType.cs
+++ b/src/Umbraco.Core/Models/ISimpleContentType.cs
@@ -15,6 +15,7 @@ public interface ISimpleContentType
         bool IsContainer { get; }
         string Name { get; }
         bool AllowedAsRoot { get; }
+        bool IsElement { get; }
         bool SupportsPropertyVariation(string culture, string s, bool b);
     }
 
@@ -31,6 +32,7 @@ public SimpleContentType(IContentType contentType)
             Icon = contentType.Icon;
             Name = contentType.Name;
             AllowedAsRoot = contentType.AllowedAsRoot;
+            IsElement = contentType.IsElement;
         }
 
         public string Alias { get; }
@@ -41,6 +43,7 @@ public SimpleContentType(IContentType contentType)
         public bool IsContainer { get; }
         public string Name { get; }
         public bool AllowedAsRoot { get; }
+        public bool IsElement { get; }
 
         /// <inheritdoc />
         public bool SupportsPropertyVariation(string culture, string segment, bool wildcards = false)

From 4bf17c8a4e29e5ccac9f337c3aa525a3333e4cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 18 Jan 2019 13:19:16 +0100
Subject: [PATCH 014/421] V8 UI Color adjustments

---
 src/Umbraco.Web.UI.Client/src/less/buttons.less   |  4 ++--
 .../src/less/components/editor.less               | 15 ++++++++-------
 .../less/components/html/umb-expansion-panel.less |  2 +-
 src/Umbraco.Web.UI.Client/src/less/forms.less     |  5 +++--
 .../src/less/property-editors.less                |  9 +++------
 src/Umbraco.Web.UI.Client/src/less/variables.less |  5 +++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index 0b21864127de..ca048ccc9204 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -233,7 +233,7 @@ input[type="button"] {
 
 // outlined
 .btn-outline {
-  border: 1px solid @gray-8;
+  border: 1px solid @inputBorder;
   background: @white;
   color: @black;
   padding: 5px 13px;
@@ -242,7 +242,7 @@ input[type="button"] {
 .btn-outline:hover,
 .btn-outline:focus,
 .btn-outline:active {
-  border-color: @gray-7;
+  border-color: @inputBorderFocus;
   background: transparent;
   color: @black;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index d699193c240c..b91ad239dcc8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -88,8 +88,7 @@
 }
 
 input.umb-editor-header__name-input {
-	border-color: transparent;
-	background-color: @white;
+	
 	font-size: 15px;
 	color: @black;
 	margin-bottom: 0;
@@ -98,11 +97,13 @@ input.umb-editor-header__name-input {
 	height: 32px;
 	line-height: 32px;
 	width: 100%;
-	padding: 0 10px;
-	background: @white;
-	border: 1px solid @gray-8;
-	&:hover {
-		border-color: @turquoise-d1;
+	padding-left: 10px;
+    
+	background-color: @white;
+	border: 1px solid @inputBorder;
+    
+	&:focus {
+		border-color: @inputBorderFocus;
 	}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
index 26347c85010c..3612bf6958d1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
@@ -13,6 +13,7 @@
     cursor: pointer;
     justify-content: space-between;
     color: @black;
+    border-bottom: 1px solid @gray-9;
 }
 
 .umb-expansion-panel__expand {
@@ -21,5 +22,4 @@
 
 .umb-expansion-panel__content {
     padding: 20px;
-    border-top: 1px solid @gray-9;
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index e3350b4956e0..81f32987839c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -243,11 +243,12 @@ input[type="color"],
 .uneditable-input {
   background-color: @inputBackground;
   border: 1px solid @inputBorder;
+  
   .transition(~"border linear .2s, box-shadow linear .2s");
 
   // Focus state
   &:focus {
-    border-color: none;
+    border-color: @inputBorderFocus;
     outline: 0;
     outline: none \9; /* IE6-9 */
   }
@@ -817,4 +818,4 @@ legend + .control-group {
 /* User/group selector */
 .group-selector .group-selector-list { float: left; }
 .group-selector .group-selector-list div { height: 24px; }
-.group-selector .group-selector-buttons { float: left; margin: 24px 16px; }
+.group-selector .group-selector-buttons { float: left; margin: 24px 16px; }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 3ec8c383dae7..e6d3ab90e479 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -4,12 +4,9 @@
 // Container styles
 // --------------------------------------------------
 .umb-property-editor {
-    @media (max-width: 800px) {
-        width: 100%;
-    }
-    @media (min-width: 800px) {
-      min-width:66.6%;
-    }
+    
+    width: 100%;
+    max-width: 800px;
 
 	&-pull {
 		float:left;
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 513c645365ae..97d33096e64c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -278,7 +278,8 @@
 // Forms
 // -------------------------
 @inputBackground:               @white;
-@inputBorder:                   @gray-7;
+@inputBorder:                   @gray-8;
+@inputBorderFocus:              @gray-7;
 @inputBorderRadius:             0;
 @inputDisabledBackground:       @gray-10;
 @formActionsBackground:         @gray-9;
@@ -517,4 +518,4 @@
 // SORTABLE
 // --------------------------------------------------
 @sortableHelperBg: @turquoise-l2;
-@sortablePlaceholderBg : @turquoise;
+@sortablePlaceholderBg : @turquoise;
\ No newline at end of file

From 60d86354f391067606dfe3080edf7a1cd2f22c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 21 Jan 2019 09:46:00 +0100
Subject: [PATCH 015/421] Media Picker adjustments

---
 src/Umbraco.Web.UI.Client/src/less/main.less  |  3 +-
 .../src/less/property-editors.less            | 41 +++++++++++++++----
 .../src/less/variables.less                   |  3 +-
 .../mediapicker/mediapicker.html              |  2 +-
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 12a13e11ed78..43bc87ed0f93 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -120,7 +120,7 @@ h5.-black {
   margin: 20px;
 }
 .umb-control-group {
-  border-bottom: 1px solid @gray-10;
+  border-bottom: 1px solid @gray-11;
   padding-bottom: 20px;
   margin-bottom: 15px !important;
 }
@@ -671,4 +671,3 @@ input[type=checkbox]:checked + .input-label--small {
 	width: 1px !important;
 	overflow: hidden;
 }
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index e6d3ab90e479..210178e0a6df 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -4,9 +4,12 @@
 // Container styles
 // --------------------------------------------------
 .umb-property-editor {
-    
-    width: 100%;
-    max-width: 800px;
+    @media (max-width: 800px) {
+        width: 100%;
+    }
+    @media (min-width: 800px) {
+      min-width:66.6%;
+    }
 
 	&-pull {
 		float:left;
@@ -227,6 +230,18 @@
 //
 // Media picker
 // --------------------------------------------------
+
+.umb-mediapicker > div {
+    border: 1px solid @inputBorder;
+}
+.umb-mediapicker-single > div {
+    width:144px;
+}
+.umb-mediapicker-multi > div {
+    width:100%;
+}
+
+
 .umb-mediapicker .add-link {
     display: flex;
     justify-content:center;
@@ -327,19 +342,28 @@
     justify-content: center;
     align-items: center;
     flex-wrap: wrap;
-    padding: 2px;
+    padding: 5px;
     margin: 5px;
     background: @white;
-    border: 1px solid @gray-10;
+    //border: 1px solid @gray-10;
     max-width: 100%;
 }
+.umb-mediapicker {
+    
+    .umb-sortable-thumbnails li {
+        border:none;
+    }
+    
+}
+
 
 
 .umb-mediapicker .umb-sortable-thumbnails li {
     flex-direction: column;
-    margin: 0 0 5px 5px;
-    padding: 5px;
 }
+/*.umb-mediapicker .umb-sortable-thumbnails li.add-wrapper {
+    padding: 0px;
+}*/
 
 .umb-sortable-thumbnails li:hover a {
     display: flex;
@@ -442,6 +466,9 @@
     align-items: center;
     margin-left: 5px;
     text-decoration: none;
+    
+    //border-color: @inputBorder;
+    .box-shadow(0 1px 2px rgba(0,0,0,0.25));
 }
 
 .umb-sortable-thumbnails .umb-sortable-thumbnails__action.-red {
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 97d33096e64c..c9cd0f701cb8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -88,6 +88,7 @@
 @gray-8:                #D8D7D9;
 @gray-9:                #E9E9EB;
 @gray-10:               #F3F3F5;
+@gray-11:               #F6F6F7;
 
 
 // Additional Icon Colours
@@ -518,4 +519,4 @@
 // SORTABLE
 // --------------------------------------------------
 @sortableHelperBg: @turquoise-l2;
-@sortablePlaceholderBg : @turquoise;
\ No newline at end of file
+@sortablePlaceholderBg : @turquoise;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index 4e85668c0507..d2b923b17c67 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -1,4 +1,4 @@
-<div class="umb-property-editor umb-mediapicker" ng-controller="Umbraco.PropertyEditors.MediaPickerController">
+<div class="umb-property-editor umb-mediapicker" ng-class="{'umb-mediapicker-multi':isMultiPicker, 'umb-mediapicker-single':!isMultiPicker}" ng-controller="Umbraco.PropertyEditors.MediaPickerController">
 
     <p ng-if="(mediaItems|filter:{trashed:true}).length == 1"><localize key="mediaPicker_pickedTrashedItem"></localize></p>
     <p ng-if="(mediaItems|filter:{trashed:true}).length > 1"><localize key="mediaPicker_pickedTrashedItems"></localize></p>

From ad026e25d71218a624a356ea06d8bda35394bf68 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 22 Jan 2019 09:31:47 +0100
Subject: [PATCH 016/421] Cleanup trees

---
 .../Editors/BackOfficeServerVariables.cs      | 66 ++++++++--------
 .../Mvc/PluginControllerAttribute.cs          | 20 +++--
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs | 12 +--
 .../Search/SearchableTreeCollection.cs        |  2 +-
 src/Umbraco.Web/Services/ITreeService.cs      | 33 +++-----
 src/Umbraco.Web/Services/TreeService.cs       | 57 ++++----------
 .../Trees/ApplicationTreeController.cs        |  2 +-
 .../Trees/ContentBlueprintTreeController.cs   |  4 +-
 .../Trees/ContentTypeTreeController.cs        |  4 +-
 src/Umbraco.Web/Trees/CoreTreeAttribute.cs    | 13 +---
 .../Trees/DataTypeTreeController.cs           |  6 +-
 .../Trees/DictionaryTreeController.cs         |  4 +-
 src/Umbraco.Web/Trees/FilesTreeController.cs  |  9 +--
 src/Umbraco.Web/Trees/ITree.cs                |  9 ++-
 .../Trees/LanguageTreeController.cs           |  4 +-
 src/Umbraco.Web/Trees/MacrosTreeController.cs |  4 +-
 .../Trees/MediaTypeTreeController.cs          |  4 +-
 .../Trees/MemberGroupTreeController.cs        |  2 +-
 src/Umbraco.Web/Trees/MemberTreeController.cs |  2 +-
 .../Trees/MemberTypeTreeController.cs         |  4 +-
 .../Trees/PackagesTreeController.cs           |  2 +-
 .../Trees/PartialViewMacrosTreeController.cs  |  4 +-
 .../Trees/PartialViewsTreeController.cs       |  4 +-
 .../Trees/RelationTypeTreeController.cs       |  4 +-
 .../Trees/ScriptsTreeController.cs            |  4 +-
 .../Trees/StylesheetsTreeController.cs        |  4 +-
 .../Trees/TemplatesTreeController.cs          |  4 +-
 src/Umbraco.Web/Trees/Tree.cs                 | 31 ++++----
 src/Umbraco.Web/Trees/TreeAttribute.cs        | 77 +++++++++----------
 src/Umbraco.Web/Trees/TreeCollection.cs       | 12 +--
 .../Trees/TreeCollectionBuilder.cs            | 50 ++++++++++--
 src/Umbraco.Web/Trees/TreeController.cs       | 46 +++++------
 src/Umbraco.Web/Trees/TreeControllerBase.cs   | 23 +++---
 src/Umbraco.Web/Trees/UserTreeController.cs   |  2 +-
 src/Umbraco.Web/TypeLoaderExtensions.cs       | 29 +++----
 .../UI/Pages/UmbracoEnsuredPage.cs            |  2 +-
 .../Filters/UmbracoTreeAuthorizeAttribute.cs  |  2 +-
 37 files changed, 269 insertions(+), 292 deletions(-)

diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 40891efe9e10..d8d580dcd0f4 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Web;
 using System.Web.Configuration;
 using System.Web.Mvc;
@@ -348,7 +349,10 @@ internal Dictionary<string, object> GetServerVariables()
                 {
                     "umbracoPlugins", new Dictionary<string, object>
                     {
-                        {"trees", GetTreePluginsMetaData()}
+                        // for each tree that is [PluginController], get
+                        // alias -> areaName
+                        // so that routing (route.js) can look for views
+                        { "trees", GetPluginTrees().ToArray() }
                     }
                 },
                 {
@@ -389,44 +393,42 @@ internal Dictionary<string, object> GetServerVariables()
             return defaultVals;
         }
 
-        private IEnumerable<Dictionary<string, string>> GetTreePluginsMetaData()
+        private class PluginTree
         {
-            var treeTypes = TreeControllerTypes.Value;
-            //get all plugin trees with their attributes
-            var treesWithAttributes = treeTypes.Select(x => new
+            [DataMember(Name = "alias")]
+            public string Alias { get; set; }
+
+            [DataMember(Name = "packageFolder")]
+            public string PackageFolder { get; set; }
+        }
+
+        private IEnumerable<PluginTree> GetPluginTrees()
+        {
+            // used to be (cached)
+            //var treeTypes = Current.TypeLoader.GetAttributedTreeControllers();
+            //
+            // ie inheriting from TreeController and marked with TreeAttribute
+            //
+            // do this instead
+            // inheriting from TreeControllerBase and marked with TreeAttribute
+            var trees = Current.Factory.GetInstance<TreeCollection>();
+
+            foreach (var tree in trees)
             {
-                tree = x,
-                attributes =
-                x.GetCustomAttributes(false)
-            }).ToArray();
+                var treeType = tree.TreeControllerType;
 
-            var pluginTreesWithAttributes = treesWithAttributes
-                //don't resolve any tree decorated with CoreTreeAttribute
-                .Where(x => x.attributes.All(a => (a is CoreTreeAttribute) == false))
-                //we only care about trees with the PluginControllerAttribute
-                .Where(x => x.attributes.Any(a => a is PluginControllerAttribute))
-                .ToArray();
+                // exclude anything marked with CoreTreeAttribute
+                var coreTree = treeType.GetCustomAttribute<CoreTreeAttribute>(false);
+                if (coreTree != null) continue;
 
-            return (from p in pluginTreesWithAttributes
-                    let treeAttr = p.attributes.OfType<TreeAttribute>().Single()
-                    let pluginAttr = p.attributes.OfType<PluginControllerAttribute>().Single()
-                    select new Dictionary<string, string>
-                {
-                    {"alias", treeAttr.TreeAlias}, {"packageFolder", pluginAttr.AreaName}
-                }).ToArray();
+                // exclude anything not marked with PluginControllerAttribute
+                var pluginController = treeType.GetCustomAttribute<PluginControllerAttribute>(false);
+                if (pluginController == null) continue;
 
+                yield return new PluginTree { Alias = tree.TreeAlias, PackageFolder = pluginController.AreaName };
+            }
         }
 
-        /// <summary>
-        /// A lazy reference to all tree controller types
-        /// </summary>
-        /// <remarks>
-        /// We are doing this because if we constantly resolve the tree controller types from the PluginManager it will re-scan and also re-log that
-        /// it's resolving which is unecessary and annoying.
-        /// </remarks>
-        private static readonly Lazy<IEnumerable<Type>> TreeControllerTypes
-            = new Lazy<IEnumerable<Type>>(() => Current.TypeLoader.GetAttributedTreeControllers().ToArray()); // todo inject
-
         /// <summary>
         /// Returns the server variables regarding the application state
         /// </summary>
diff --git a/src/Umbraco.Web/Mvc/PluginControllerAttribute.cs b/src/Umbraco.Web/Mvc/PluginControllerAttribute.cs
index 6c8b8f19ee44..332f1fd2a9b9 100644
--- a/src/Umbraco.Web/Mvc/PluginControllerAttribute.cs
+++ b/src/Umbraco.Web/Mvc/PluginControllerAttribute.cs
@@ -4,23 +4,27 @@
 namespace Umbraco.Web.Mvc
 {
     /// <summary>
-    /// An attribute applied to a plugin controller that requires that it is routed to its own area
+    /// Indicates that a controller is a plugin tree controller and should be routed to its own area.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
     public class PluginControllerAttribute : Attribute
     {
-        public string AreaName { get; private set; }
-
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PluginControllerAttribute"/> class.
+        /// </summary>
+        /// <param name="areaName"></param>
         public PluginControllerAttribute(string areaName)
         {
-            //validate this, only letters and digits allowed.
-            if (areaName.Any(c => !Char.IsLetterOrDigit(c)))
-            {
-                throw new FormatException("The areaName specified " + areaName + " can only contains letters and digits");
-            }
+            // validate this, only letters and digits allowed.
+            if (areaName.Any(c => !char.IsLetterOrDigit(c)))
+                throw new FormatException($"Invalid area name \"{areaName}\": the area name can only contains letters and digits.");
 
             AreaName = areaName;
         }
 
+        /// <summary>
+        /// Gets the name of the area.
+        /// </summary>
+        public string AreaName { get; }
     }
 }
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 1a0bf8d1b0a8..2dda1a793cfb 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -203,14 +203,10 @@ public override void Compose(Composition composition)
                 .Append<TranslationBackOfficeSection>();
 
             // register back office trees
-            foreach (var treeControllerType in umbracoApiControllerTypes
-                .Where(x => typeof(TreeControllerBase).IsAssignableFrom(x)))
-            {
-                var attribute = treeControllerType.GetCustomAttribute<TreeAttribute>(false);
-                if (attribute == null) continue;
-                var tree = new Tree(attribute.SortOrder, attribute.ApplicationAlias, attribute.TreeAlias, attribute.TreeTitle, treeControllerType, attribute.IsSingleNodeTree);
-                composition.WithCollectionBuilder<TreeCollectionBuilder>().Trees.Add(tree);
-            }
+            // the collection builder only accepts types inheriting from TreeControllerBase
+            // and will filter out those that are not attributed with TreeAttribute
+            composition.WithCollectionBuilder<TreeCollectionBuilder>()
+                .AddTreeControllers(umbracoApiControllerTypes.Where(x => typeof(TreeControllerBase).IsAssignableFrom(x)));
         }
     }
 }
diff --git a/src/Umbraco.Web/Search/SearchableTreeCollection.cs b/src/Umbraco.Web/Search/SearchableTreeCollection.cs
index 032782b466e3..8f7c6ece0bf9 100644
--- a/src/Umbraco.Web/Search/SearchableTreeCollection.cs
+++ b/src/Umbraco.Web/Search/SearchableTreeCollection.cs
@@ -32,7 +32,7 @@ private Dictionary<string, SearchableApplicationTree> CreateDictionary(ITreeServ
                 var found = searchableTrees.FirstOrDefault(x => x.TreeAlias.InvariantEquals(appTree.TreeAlias));
                 if (found != null)
                 {
-                    dictionary[found.TreeAlias] = new SearchableApplicationTree(appTree.ApplicationAlias, appTree.TreeAlias, found);
+                    dictionary[found.TreeAlias] = new SearchableApplicationTree(appTree.SectionAlias, appTree.TreeAlias, found);
                 }
             }
             return dictionary;
diff --git a/src/Umbraco.Web/Services/ITreeService.cs b/src/Umbraco.Web/Services/ITreeService.cs
index 96787086c686..691e5a63704a 100644
--- a/src/Umbraco.Web/Services/ITreeService.cs
+++ b/src/Umbraco.Web/Services/ITreeService.cs
@@ -1,41 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.ContentEditing;
-using Umbraco.Web.Models.ContentEditing;
+using System.Collections.Generic;
 using Umbraco.Web.Trees;
 
 namespace Umbraco.Web.Services
 {
+    /// <summary>
+    /// Represents a service which manages section trees.
+    /// </summary>
     public interface ITreeService
     {
         /// <summary>
-        /// Gets an ApplicationTree by it's tree alias.
+        /// Gets a tree.
         /// </summary>
         /// <param name="treeAlias">The tree alias.</param>
-        /// <returns>An ApplicationTree instance</returns>
         Tree GetByAlias(string treeAlias);
 
         /// <summary>
-        /// Gets all applicationTrees registered in umbraco from the umbracoAppTree table..
+        /// Gets all trees.
         /// </summary>
-        /// <returns>Returns a ApplicationTree Array</returns>
         IEnumerable<Tree> GetAll();
-        
+
         /// <summary>
-        /// Gets the application tree for the applcation with the specified alias
+        /// Gets all trees for a section.
         /// </summary>
-        /// <param name="sectionAlias">The application alias.</param>
-        /// <returns>Returns a ApplicationTree Array</returns>
-        IEnumerable<Tree> GetTrees(string sectionAlias);
-        
+        IEnumerable<Tree> GetBySection(string sectionAlias);
+
         /// <summary>
-        /// Gets the grouped application trees for the application with the specified alias
+        /// Gets all trees for a section, grouped.
         /// </summary>
-        /// <param name="sectionAlias"></param>
-        /// <returns></returns>
-        IDictionary<string, IEnumerable<Tree>> GetGroupedTrees(string sectionAlias);
+        IDictionary<string, IEnumerable<Tree>> GetBySectionGrouped(string sectionAlias);
     }
-    
 }
diff --git a/src/Umbraco.Web/Services/TreeService.cs b/src/Umbraco.Web/Services/TreeService.cs
index f58dce59bc51..c697a89a6220 100644
--- a/src/Umbraco.Web/Services/TreeService.cs
+++ b/src/Umbraco.Web/Services/TreeService.cs
@@ -6,65 +6,38 @@
 
 namespace Umbraco.Web.Services
 {
+    /// <summary>
+    /// Implements <see cref="ITreeService"/>.
+    /// </summary>
     internal class TreeService : ITreeService
     {
         private readonly TreeCollection _treeCollection;
-        private readonly Lazy<IReadOnlyCollection<IGrouping<string, string>>> _groupedTrees;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TreeService"/> class.
+        /// </summary>
+        /// <param name="treeCollection"></param>
         public TreeService(TreeCollection treeCollection)
         {
             _treeCollection = treeCollection;
-            _groupedTrees = new Lazy<IReadOnlyCollection<IGrouping<string, string>>>(InitGroupedTrees);
         }
 
         /// <inheritdoc />
-        public Tree GetByAlias(string treeAlias) => _treeCollection.FirstOrDefault(t => t.TreeAlias == treeAlias);
+        public Tree GetByAlias(string treeAlias) => _treeCollection.FirstOrDefault(x => x.TreeAlias == treeAlias);
 
         /// <inheritdoc />
         public IEnumerable<Tree> GetAll() => _treeCollection;
 
         /// <inheritdoc />
-        public IEnumerable<Tree> GetTrees(string sectionAlias)
-            => GetAll().Where(x => x.ApplicationAlias.InvariantEquals(sectionAlias)).OrderBy(x => x.SortOrder).ToList();
-
-        public IDictionary<string, IEnumerable<Tree>> GetGroupedTrees(string sectionAlias)
-        {
-            var result = new Dictionary<string, IEnumerable<Tree>>();
-            var foundTrees = GetTrees(sectionAlias).ToList();
-            foreach(var treeGroup in _groupedTrees.Value)
-            {
-                List<Tree> resultGroup = null;
-                foreach(var tree in foundTrees)
-                { 
-                    foreach(var treeAliasInGroup in treeGroup)
-                    {
-                        if (tree.TreeAlias != treeAliasInGroup) continue;
-
-                        if (resultGroup == null) resultGroup = new List<Tree>();
-                        resultGroup.Add(tree);
-                    }  
-                }
-                if (resultGroup != null)
-                    result[treeGroup.Key ?? string.Empty] = resultGroup; //key cannot be null so make empty string
-            }
-            return result;
-        }
+        public IEnumerable<Tree> GetBySection(string sectionAlias)
+            => _treeCollection.Where(x => x.SectionAlias.InvariantEquals(sectionAlias)).OrderBy(x => x.SortOrder).ToList();
 
-        /// <summary>
-        /// Creates a group of all tree groups and their tree aliases
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// Used to initialize the <see cref="_groupedTrees"/> field
-        /// </remarks>
-        private IReadOnlyCollection<IGrouping<string, string>> InitGroupedTrees()
+        /// <inheritdoc />
+        public IDictionary<string, IEnumerable<Tree>> GetBySectionGrouped(string sectionAlias)
         {
-            var result = GetAll()
-                .Select(x => (treeAlias: x.TreeAlias, treeGroup: x.TreeControllerType.GetCustomAttribute<CoreTreeAttribute>(false)?.TreeGroup))
-                .GroupBy(x => x.treeGroup, x => x.treeAlias)
-                .ToList();
-            return result;
+            return GetBySection(sectionAlias).GroupBy(x => x.TreeGroup).ToDictionary(
+                x => x.Key ?? "",
+                x => (IEnumerable<Tree>) x.ToArray());
         }
-
     }
 }
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 254122153763..75ae6235809a 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -60,7 +60,7 @@ public async Task<TreeRootNode> GetApplicationTrees(string application, string t
             if (string.IsNullOrEmpty(application)) throw new HttpResponseException(HttpStatusCode.NotFound);
 
             //find all tree definitions that have the current application alias
-            var groupedTrees = _treeService.GetGroupedTrees(application);
+            var groupedTrees = _treeService.GetBySectionGrouped(application);
             var allTrees = groupedTrees.Values.SelectMany(x => x).ToList();
 
             if (string.IsNullOrEmpty(tree) == false || allTrees.Count == 1)
diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
index cce40eb047d6..e3ecef2a0dc7 100644
--- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
@@ -18,9 +18,9 @@ namespace Umbraco.Web.Trees
     /// This authorizes based on access to the content section even though it exists in the settings
     /// </remarks>
     [UmbracoApplicationAuthorize(Constants.Applications.Content)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.ContentBlueprints, null, sortOrder: 12)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.ContentBlueprints, SortOrder = 12, TreeGroup = Constants.Trees.Groups.Settings)]
     [PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
+    [CoreTree]
     public class ContentBlueprintTreeController : TreeController
     {
 
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 3c6b9c782c2f..a7544f71d2e7 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -15,9 +15,9 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DocumentTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, null, sortOrder: 0)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, SortOrder = 0, TreeGroup = Constants.Trees.Groups.Settings)]
     [Mvc.PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
+    [CoreTree]
     public class ContentTypeTreeController : TreeController, ISearchableTree
     {
         protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/CoreTreeAttribute.cs b/src/Umbraco.Web/Trees/CoreTreeAttribute.cs
index 1b485aea6a8b..2d6ffe6a15b6 100644
--- a/src/Umbraco.Web/Trees/CoreTreeAttribute.cs
+++ b/src/Umbraco.Web/Trees/CoreTreeAttribute.cs
@@ -3,19 +3,12 @@
 namespace Umbraco.Web.Trees
 {
     /// <summary>
-    /// Indicates that a tree is a core tree and shouldn't be treated as a plugin tree
+    /// Indicates that a tree is a core tree and should not be treated as a plugin tree.
     /// </summary>
     /// <remarks>
-    /// This ensures that umbraco will look in the umbraco folders for views for this tree
+    /// This ensures that umbraco will look in the umbraco folders for views for this tree.
     /// </remarks>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
     internal class CoreTreeAttribute : Attribute
-    {
-        public string TreeGroup { get; set; }
-
-        public CoreTreeAttribute()
-        {
-
-        }
-    }
+    { }
 }
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 8b38bee865ed..c3b2fd631e4c 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -17,9 +17,9 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.DataTypes, null, sortOrder:3)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.DataTypes, SortOrder = 3, TreeGroup = Constants.Trees.Groups.Settings)]
     [PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
+    [CoreTree]
     public class DataTypeTreeController : TreeController, ISearchableTree
     {
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
@@ -121,7 +121,7 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
                 });
 
                 if (container.HasChildren == false)
-                { 
+                {
                     //can delete data type
                     menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
                 }
diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
index 6c8f576732d4..6f8d4f547d1d 100644
--- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs
+++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
@@ -17,8 +17,8 @@ namespace Umbraco.Web.Trees
         // dictionary items in templates, even when we dont have authorization to manage the dictionary items
         )]
     [Mvc.PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
-    [Tree(Constants.Applications.Translation, Constants.Trees.Dictionary, null)]
+    [CoreTree]
+    [Tree(Constants.Applications.Translation, Constants.Trees.Dictionary, TreeGroup = Constants.Trees.Groups.Settings)]
     public class DictionaryTreeController : TreeController
     {
         protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/FilesTreeController.cs b/src/Umbraco.Web/Trees/FilesTreeController.cs
index 947522747d56..7e326870e3ba 100644
--- a/src/Umbraco.Web/Trees/FilesTreeController.cs
+++ b/src/Umbraco.Web/Trees/FilesTreeController.cs
@@ -1,14 +1,13 @@
-using Umbraco.Core;
-using Umbraco.Core.IO;
+using Umbraco.Core.IO;
 using Umbraco.Web.Models.Trees;
 
 namespace Umbraco.Web.Trees
 {
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Templating)]
-    [Tree(Constants.Applications.Settings, "files", "Files", "icon-folder", "icon-folder", sortOrder: 13, initialize: false)]
+    // this is not a section tree - do not mark with [Tree]
+    [CoreTree]
     public class FilesTreeController : FileSystemTreeController
     {
-        protected override IFileSystem FileSystem => new PhysicalFileSystem("~/"); // fixme inject
+        protected override IFileSystem FileSystem => new PhysicalFileSystem("~/");
 
         private static readonly string[] ExtensionsStatic = { "*" };
 
diff --git a/src/Umbraco.Web/Trees/ITree.cs b/src/Umbraco.Web/Trees/ITree.cs
index 867beda20e15..3427e4c40e70 100644
--- a/src/Umbraco.Web/Trees/ITree.cs
+++ b/src/Umbraco.Web/Trees/ITree.cs
@@ -1,7 +1,7 @@
 namespace Umbraco.Web.Trees
 {
     //fixme - we don't really use this, it is nice to have the treecontroller, attribute and ApplicationTree streamlined to implement this but it's not used
-    //leave as internal for now, maybe we'll use in the future, means we could pass around ITree 
+    //leave as internal for now, maybe we'll use in the future, means we could pass around ITree
     internal interface ITree
     {
         /// <summary>
@@ -13,7 +13,12 @@ internal interface ITree
         /// <summary>
         /// Gets the section alias.
         /// </summary>
-        string ApplicationAlias { get; }
+        string SectionAlias { get; }
+
+        /// <summary>
+        /// Gets the tree group.
+        /// </summary>
+        string TreeGroup { get; }
 
         /// <summary>
         /// Gets the tree alias.
diff --git a/src/Umbraco.Web/Trees/LanguageTreeController.cs b/src/Umbraco.Web/Trees/LanguageTreeController.cs
index 5b0ed8701f2b..ac2c0571e057 100644
--- a/src/Umbraco.Web/Trees/LanguageTreeController.cs
+++ b/src/Umbraco.Web/Trees/LanguageTreeController.cs
@@ -7,9 +7,9 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.Languages)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Languages, null, sortOrder: 11)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Languages, SortOrder = 11, TreeGroup = Constants.Trees.Groups.Settings)]
     [PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
+    [CoreTree]
     public class LanguageTreeController : TreeController
     {
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/MacrosTreeController.cs b/src/Umbraco.Web/Trees/MacrosTreeController.cs
index 0300dbd6c653..77b13416ff43 100644
--- a/src/Umbraco.Web/Trees/MacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/MacrosTreeController.cs
@@ -12,9 +12,9 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.Macros)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Macros, "Macros", sortOrder: 4)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Macros, TreeTitle = "Macros", SortOrder = 4, TreeGroup = Constants.Trees.Groups.Settings)]
     [PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
+    [CoreTree]
     public class MacrosTreeController : TreeController
     {
         protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index b93c1ac9e3fb..4a5ace0aeb27 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -16,9 +16,9 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.MediaTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, null, sortOrder:1)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, SortOrder = 1, TreeGroup = Constants.Trees.Groups.Settings)]
     [Mvc.PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
+    [CoreTree]
     public class MediaTypeTreeController : TreeController, ISearchableTree
     {
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/MemberGroupTreeController.cs b/src/Umbraco.Web/Trees/MemberGroupTreeController.cs
index 9c8c8ea4e0f3..ea2412e4bd68 100644
--- a/src/Umbraco.Web/Trees/MemberGroupTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberGroupTreeController.cs
@@ -8,7 +8,7 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.MemberGroups)]
-    [Tree(Constants.Applications.Members, Constants.Trees.MemberGroups, null, sortOrder: 1)]
+    [Tree(Constants.Applications.Members, Constants.Trees.MemberGroups, SortOrder = 1)]
     [Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
     public class MemberGroupTreeController : MemberTypeAndGroupTreeControllerBase
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index d1219da46666..03c68dd67a97 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Web.Trees
         Constants.Applications.Content,
         Constants.Applications.Media,
         Constants.Applications.Members)]
-    [Tree(Constants.Applications.Members, Constants.Trees.Members, null, sortOrder: 0)]
+    [Tree(Constants.Applications.Members, Constants.Trees.Members, SortOrder = 0)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
     [SearchableTree("searchResultFormatter", "configureMemberResult")]
diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
index 7bf04010f2af..3a72460963f3 100644
--- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
@@ -7,9 +7,9 @@
 
 namespace Umbraco.Web.Trees
 {
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
+    [CoreTree]
     [UmbracoTreeAuthorize(Constants.Trees.MemberTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.MemberTypes, null, sortOrder: 2)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.MemberTypes, SortOrder = 2, TreeGroup = Constants.Trees.Groups.Settings)]
     public class MemberTypeTreeController : MemberTypeAndGroupTreeControllerBase
     {
         protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs
index 68b67f9fe225..9b1bf98823cd 100644
--- a/src/Umbraco.Web/Trees/PackagesTreeController.cs
+++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs
@@ -8,7 +8,7 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.Packages)]
-    [Tree(Constants.Applications.Packages, Constants.Trees.Packages, null, sortOrder: 0, isSingleNodeTree: true)]
+    [Tree(Constants.Applications.Packages, Constants.Trees.Packages, SortOrder = 0, IsSingleNodeTree = true)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
     public class PackagesTreeController : TreeController
diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
index c874b01244dd..dc107ad3033d 100644
--- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
@@ -10,10 +10,10 @@ namespace Umbraco.Web.Trees
     /// <summary>
     /// Tree for displaying partial view macros in the developer app
     /// </summary>
-    [Tree(Constants.Applications.Settings, Constants.Trees.PartialViewMacros, null, sortOrder: 8)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.PartialViewMacros, SortOrder = 8, TreeGroup = Constants.Trees.Groups.Templating)]
     [UmbracoTreeAuthorize(Constants.Trees.PartialViewMacros)]
     [PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Templating)]
+    [CoreTree]
     public class PartialViewMacrosTreeController : PartialViewsTreeController
     {
         protected override IFileSystem FileSystem => Current.FileSystems.MacroPartialsFileSystem;
diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
index a7aa8f134ecc..60805d4daca1 100644
--- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
@@ -10,10 +10,10 @@ namespace Umbraco.Web.Trees
     /// <summary>
     /// Tree for displaying partial views in the settings app
     /// </summary>
-    [Tree(Constants.Applications.Settings, Constants.Trees.PartialViews, null, sortOrder: 7)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.PartialViews, SortOrder = 7, TreeGroup = Constants.Trees.Groups.Templating)]
     [UmbracoTreeAuthorize(Constants.Trees.PartialViews)]
     [PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Templating)]
+    [CoreTree]
     public class PartialViewsTreeController : FileSystemTreeController
     {
         protected override IFileSystem FileSystem => Current.FileSystems.PartialViewsFileSystem;
diff --git a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
index 1888044d8d25..82e07c522688 100644
--- a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
@@ -9,9 +9,9 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.RelationTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.RelationTypes, null, sortOrder: 5)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.RelationTypes, SortOrder = 5, TreeGroup = Constants.Trees.Groups.Settings)]
     [Mvc.PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
+    [CoreTree]
     public class RelationTypeTreeController : TreeController
     {
         protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/ScriptsTreeController.cs b/src/Umbraco.Web/Trees/ScriptsTreeController.cs
index cd56cc479075..bb002c7dda17 100644
--- a/src/Umbraco.Web/Trees/ScriptsTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptsTreeController.cs
@@ -5,8 +5,8 @@
 
 namespace Umbraco.Web.Trees
 {
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Templating)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Scripts, "Scripts", "icon-folder", "icon-folder", sortOrder: 10)]
+    [CoreTree]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Scripts, TreeTitle = "Scripts", IconOpen = "icon-folder", IconClosed = "icon-folder", SortOrder = 10, TreeGroup = Constants.Trees.Groups.Templating)]
     public class ScriptsTreeController : FileSystemTreeController
     {
         protected override IFileSystem FileSystem => Current.FileSystems.ScriptsFileSystem; // fixme inject
diff --git a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
index 548e8ae928ab..b47c225b2f99 100644
--- a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
+++ b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
@@ -4,8 +4,8 @@
 
 namespace Umbraco.Web.Trees
 {
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Templating)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Stylesheets, "Stylesheets", "icon-folder", "icon-folder", sortOrder: 9)]
+    [CoreTree]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Stylesheets, TreeTitle = "Stylesheets", IconOpen = "icon-folder", IconClosed = "icon-folder", SortOrder = 9, TreeGroup = Constants.Trees.Groups.Templating)]
     public class StylesheetsTreeController : FileSystemTreeController
     {
         protected override IFileSystem FileSystem => Current.FileSystems.StylesheetsFileSystem; // fixme inject
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index c074f828d436..5db8c4b7cb09 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -16,9 +16,9 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.Templates)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Templates, null, sortOrder:6)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Templates, SortOrder = 6, TreeGroup = Constants.Trees.Groups.Templating)]
     [PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Templating)]
+    [CoreTree]
     public class TemplatesTreeController : TreeController, ISearchableTree
     {
         protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/Tree.cs b/src/Umbraco.Web/Trees/Tree.cs
index 39f5cec1eb8b..b0a24e3b2b5e 100644
--- a/src/Umbraco.Web/Trees/Tree.cs
+++ b/src/Umbraco.Web/Trees/Tree.cs
@@ -1,46 +1,44 @@
 using System;
 using System.Diagnostics;
 using Umbraco.Core.Services;
-using Umbraco.Web.Models.Trees;
 
 namespace Umbraco.Web.Trees
 {
-    [DebuggerDisplay("Tree - {TreeAlias} ({ApplicationAlias})")]
+    [DebuggerDisplay("Tree - {TreeAlias} ({SectionAlias})")]
     public class Tree : ITree
     {
-        public Tree(int sortOrder, string applicationAlias, string alias, string title, Type treeControllerType, bool isSingleNodeTree)
+        public Tree(int sortOrder, string applicationAlias, string group, string alias, string title, Type treeControllerType, bool isSingleNodeTree)
         {
             SortOrder = sortOrder;
-            ApplicationAlias = applicationAlias;
+            SectionAlias = applicationAlias;
+            TreeGroup = group;
             TreeAlias = alias;
             TreeTitle = title;
             TreeControllerType = treeControllerType;
             IsSingleNodeTree = isSingleNodeTree;
         }
-        
+
         /// <inheritdoc />
-        /// <summary>
-        /// Gets or sets the sort order.
-        /// </summary>
         public int SortOrder { get; set; }
 
-        /// <summary>
-        /// Gets the application alias.
-        /// </summary>
-        public string ApplicationAlias { get; set; }
+        /// <inheritdoc />
+        public string SectionAlias { get; set; }
+
+        /// <inheritdoc />
+        public string TreeGroup { get; }
 
         /// <inheritdoc />
         public string TreeAlias { get; }
 
         /// <inheritdoc />
-        /// <summary>
-        /// Gets or sets the tree title (fallback if the tree alias isn't localized)
-        /// </summary>
-        /// <value>The title.</value>
         public string TreeTitle { get; set; }
 
+        /// <inheritdoc />
         public bool IsSingleNodeTree { get; }
 
+        /// <summary>
+        /// Gets the tree controller type.
+        /// </summary>
         public Type TreeControllerType { get; }
 
         internal static string GetRootNodeDisplayName(ITree tree, ILocalizedTextService textService)
@@ -64,6 +62,5 @@ internal static string GetRootNodeDisplayName(ITree tree, ILocalizedTextService
 
             return label;
         }
-
     }
 }
diff --git a/src/Umbraco.Web/Trees/TreeAttribute.cs b/src/Umbraco.Web/Trees/TreeAttribute.cs
index dd63f8c17201..bfd7b53f4a66 100644
--- a/src/Umbraco.Web/Trees/TreeAttribute.cs
+++ b/src/Umbraco.Web/Trees/TreeAttribute.cs
@@ -1,10 +1,9 @@
 using System;
-using Umbraco.Web.Models.Trees;
 
 namespace Umbraco.Web.Trees
 {
     /// <summary>
-    /// Identifies an application tree
+    /// Identifies a section tree.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
     public class TreeAttribute : Attribute, ITree
@@ -12,54 +11,50 @@ public class TreeAttribute : Attribute, ITree
         /// <summary>
         /// Initializes a new instance of the <see cref="TreeAttribute"/> class.
         /// </summary>
-        /// <param name="appAlias">The app alias.</param>
-        /// <param name="treeAlias"></param>
-        public TreeAttribute(string appAlias,
-            string treeAlias) : this(appAlias, treeAlias, null)
+        public TreeAttribute(string sectionAlias, string treeAlias)
         {
+            SectionAlias = sectionAlias;
+            TreeAlias = treeAlias;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="TreeAttribute"/> class.
+        /// Gets the section alias.
         /// </summary>
-        /// <param name="appAlias">The app alias.</param>
-        /// <param name="treeAlias"></param>
-        /// <param name="treeTitle"></param>
-        /// <param name="iconClosed">The icon closed.</param>
-        /// <param name="iconOpen">The icon open.</param>
-        /// <param name="initialize">if set to <c>true</c> [initialize].</param>
-        /// <param name="sortOrder">The sort order.</param>
-        /// <param name="isSingleNodeTree">Flag to define if this tree is a single node tree (will never contain child nodes, full screen app)</param>
-        public TreeAttribute(string appAlias,
-            string treeAlias,
-            string treeTitle,
-            string iconClosed = "icon-folder",
-            string iconOpen = "icon-folder-open",
-            bool initialize = true,
-            int sortOrder = 0,
-            bool isSingleNodeTree = false)
-        {
-            ApplicationAlias = appAlias;
-            TreeAlias = treeAlias;
-            TreeTitle = treeTitle;
-            IconClosed = iconClosed;
-            IconOpen = iconOpen;
-            Initialize = initialize;
-            SortOrder = sortOrder;
-            IsSingleNodeTree = isSingleNodeTree;
-        }
+        public string SectionAlias { get; }
 
-        public string ApplicationAlias { get; }
+        /// <summary>
+        /// Gets the tree alias.
+        /// </summary>
         public string TreeAlias { get; }
-        public string TreeTitle { get; }
-        public string IconClosed { get; }
-        public string IconOpen { get; }
-        public bool Initialize { get; }
-        public int SortOrder { get; }
 
         /// <summary>
-        /// Flag to define if this tree is a single node tree (will never contain child nodes, full screen app)
+        /// Gets or sets the tree title.
+        /// </summary>
+        public string TreeTitle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the group of the tree.
+        /// </summary>
+        public string TreeGroup { get; set; }
+
+        /// <summary>
+        /// Gets or sets the tree icon when closed.
+        /// </summary>
+        public string IconClosed { get; set; } = "icon-folder";
+
+        /// <summary>
+        /// Gets or sets the tree icon when open.
+        /// </summary>
+        public string IconOpen { get; set; } = "icon-folder-open";
+
+        /// <summary>
+        /// Gets or sets the tree sort order.
+        /// </summary>
+        public int SortOrder { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the tree is a single-node tree (no child nodes, full screen app).
         /// </summary>
-        public bool IsSingleNodeTree { get; }
+        public bool IsSingleNodeTree { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/Trees/TreeCollection.cs b/src/Umbraco.Web/Trees/TreeCollection.cs
index a7bfe52295b8..76404d4ac569 100644
--- a/src/Umbraco.Web/Trees/TreeCollection.cs
+++ b/src/Umbraco.Web/Trees/TreeCollection.cs
@@ -1,15 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.ContentEditing;
-using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Trees
 {
+    /// <summary>
+    /// Represents the collection of section trees.
+    /// </summary>
     public class TreeCollection : BuilderCollectionBase<Tree>
     {
         public TreeCollection(IEnumerable<Tree> items)
diff --git a/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs b/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
index ae2675bac977..ad2a99a6c70d 100644
--- a/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
+++ b/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
@@ -1,17 +1,55 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.Trees
 {
+    // todo
+    // this is a weird collection builder because it actually contains trees, not types
+    // and it does not really rely on DI to instantiate anything - but meh
+    // can we have trees that don't have a controller, or something? looks like, no
+    // and then, we should not register trees here, and only create them when creating
+    // the collection!
+
+    /// <summary>
+    /// Builds a <see cref="TreeCollection"/>.
+    /// </summary>
     public class TreeCollectionBuilder : ICollectionBuilder<TreeCollection, Tree>
     {
-        /// <summary>
-        /// expose the list of trees which developers can manipulate before the collection is created
-        /// </summary>
-        public List<Tree> Trees { get; } = new List<Tree>();
+        private readonly List<Tree> _trees = new List<Tree>();
 
-        public TreeCollection CreateCollection(IFactory factory) => new TreeCollection(Trees);
+        public TreeCollection CreateCollection(IFactory factory) => new TreeCollection(_trees);
 
         public void RegisterWith(IRegister register) => register.Register(CreateCollection, Lifetime.Singleton);
+
+        public void AddTreeController<TController>()
+            where TController : TreeControllerBase
+            => AddTreeController(typeof(TController));
+
+        public void AddTreeController(Type controllerType)
+        {
+            if (!typeof(TreeControllerBase).IsAssignableFrom(controllerType))
+                throw new ArgumentException($"Type {controllerType} does not inherit from {typeof(TreeControllerBase).FullName}.");
+
+            var attribute = controllerType.GetCustomAttribute<TreeAttribute>(false);
+            if (attribute == null) return; // todo - shouldn't we throw or at least log?
+            var tree = new Tree(attribute.SortOrder, attribute.SectionAlias, attribute.TreeGroup, attribute.TreeAlias, attribute.TreeTitle, controllerType, attribute.IsSingleNodeTree);
+            _trees.Add(tree);
+        }
+
+        public void AddTreeControllers(IEnumerable<Type> controllerTypes)
+        {
+            foreach (var controllerType in controllerTypes)
+                AddTreeController(controllerType);
+        }
+
+        // todo - do we want to support this?
+        public void AddTree(Tree tree)
+            => _trees.Add(tree);
+
+        // todo - do we want to support this?
+        public void AddTrees(IEnumerable<Tree> tree)
+            => _trees.AddRange(tree);
     }
 }
diff --git a/src/Umbraco.Web/Trees/TreeController.cs b/src/Umbraco.Web/Trees/TreeController.cs
index 733c526331fc..bc9345eb1d47 100644
--- a/src/Umbraco.Web/Trees/TreeController.cs
+++ b/src/Umbraco.Web/Trees/TreeController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -15,53 +14,50 @@ namespace Umbraco.Web.Trees
     /// </summary>
     public abstract class TreeController : TreeControllerBase
     {
-        private TreeAttribute _attribute;
+        private static readonly ConcurrentDictionary<Type, TreeAttribute> TreeAttributeCache = new ConcurrentDictionary<Type, TreeAttribute>();
+
+        private readonly TreeAttribute _treeAttribute;
 
-        protected TreeController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        protected TreeController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
         {
-            Initialize();
+            _treeAttribute = GetTreeAttribute();
         }
 
         protected TreeController()
         {
-            Initialize();
+            _treeAttribute = GetTreeAttribute();
         }
 
         /// <inheritdoc />
         public override string RootNodeDisplayName => Tree.GetRootNodeDisplayName(this, Services.TextService);
 
         /// <inheritdoc />
-        public override string TreeAlias => _attribute.TreeAlias;
-        /// <inheritdoc />
-        public override string TreeTitle => _attribute.TreeTitle;
+        public override string TreeGroup => _treeAttribute.TreeGroup;
+
         /// <inheritdoc />
-        public override string ApplicationAlias => _attribute.ApplicationAlias;
+        public override string TreeAlias => _treeAttribute.TreeAlias;
+
         /// <inheritdoc />
-        public override int SortOrder => _attribute.SortOrder;
+        public override string TreeTitle => _treeAttribute.TreeTitle;
+
         /// <inheritdoc />
-        public override bool IsSingleNodeTree => _attribute.IsSingleNodeTree;
+        public override string SectionAlias => _treeAttribute.SectionAlias;
 
-        private void Initialize()
-        {
-            _attribute = GetTreeAttribute();
-        }
+        /// <inheritdoc />
+        public override int SortOrder => _treeAttribute.SortOrder;
 
-        private static readonly ConcurrentDictionary<Type, TreeAttribute> TreeAttributeCache = new ConcurrentDictionary<Type, TreeAttribute>();
+        /// <inheritdoc />
+        public override bool IsSingleNodeTree => _treeAttribute.IsSingleNodeTree;
 
         private TreeAttribute GetTreeAttribute()
         {
             return TreeAttributeCache.GetOrAdd(GetType(), type =>
             {
-                //Locate the tree attribute
-                var treeAttributes = type
-                    .GetCustomAttributes<TreeAttribute>(false)
-                    .ToArray();
-
-                if (treeAttributes.Length == 0)
+                var treeAttribute = type.GetCustomAttribute<TreeAttribute>(false);
+                if (treeAttribute == null)
                     throw new InvalidOperationException("The Tree controller is missing the " + typeof(TreeAttribute).FullName + " attribute");
-
-                //assign the properties of this object to those of the metadata attribute
-                return treeAttributes[0];
+                return treeAttribute;
             });
         }
     }
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index d06d768f2d43..e2e9c21c660c 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Net.Http.Formatting;
-using System.Web.Http.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -19,7 +18,7 @@
 namespace Umbraco.Web.Trees
 {
     /// <summary>
-    /// A base controller reference for non-attributed trees (un-registered). 
+    /// A base controller reference for non-attributed trees (un-registered).
     /// </summary>
     /// <remarks>
     /// Developers should generally inherit from TreeController.
@@ -28,13 +27,11 @@ namespace Umbraco.Web.Trees
     public abstract class TreeControllerBase : UmbracoAuthorizedApiController, ITree
     {
         protected TreeControllerBase()
-        {
-        }
-
-        protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
-        {
-        }
+        { }
 
+        protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        { }
 
         /// <summary>
         /// The method called to render the contents of the tree structure
@@ -62,14 +59,21 @@ protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbr
         /// </summary>
         public abstract string RootNodeDisplayName { get; }
 
+        /// <inheritdoc />
+        public abstract string TreeGroup { get; }
+
         /// <inheritdoc />
         public abstract string TreeAlias { get; }
+
         /// <inheritdoc />
         public abstract string TreeTitle { get; }
+
         /// <inheritdoc />
-        public abstract string ApplicationAlias { get; }
+        public abstract string SectionAlias { get; }
+
         /// <inheritdoc />
         public abstract int SortOrder { get; }
+
         /// <inheritdoc />
         public abstract bool IsSingleNodeTree { get; }
 
@@ -402,5 +406,4 @@ private static void OnMenuRendering(TreeControllerBase instance, MenuRenderingEv
             handler?.Invoke(instance, e);
         }
     }
-
 }
diff --git a/src/Umbraco.Web/Trees/UserTreeController.cs b/src/Umbraco.Web/Trees/UserTreeController.cs
index 95f041cac5ac..91078b2be85c 100644
--- a/src/Umbraco.Web/Trees/UserTreeController.cs
+++ b/src/Umbraco.Web/Trees/UserTreeController.cs
@@ -7,7 +7,7 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.Users)]
-    [Tree(Constants.Applications.Users, Constants.Trees.Users, null, sortOrder: 0, isSingleNodeTree: true)]
+    [Tree(Constants.Applications.Users, Constants.Trees.Users, SortOrder = 0, IsSingleNodeTree = true)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
     public class UserTreeController : TreeController
diff --git a/src/Umbraco.Web/TypeLoaderExtensions.cs b/src/Umbraco.Web/TypeLoaderExtensions.cs
index 4d09783ca967..1cf8bc124c2b 100644
--- a/src/Umbraco.Web/TypeLoaderExtensions.cs
+++ b/src/Umbraco.Web/TypeLoaderExtensions.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Core.Media;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
 using Umbraco.Core.Composing;
 
@@ -10,29 +8,20 @@
 namespace Umbraco.Web
 {
     /// <summary>
-    /// Extension methods for the PluginTypemgr
+    /// Provides extension methods for the <see cref="TypeLoader"/> class.
     /// </summary>
     public static class TypeLoaderExtensions
     {
         /// <summary>
-        /// Returns all available TreeApiController's in application that are attribute with TreeAttribute
+        /// Gets all types implementing <see cref="SurfaceController"/>.
         /// </summary>
-        /// <param name="mgr"></param>
-        /// <returns></returns>
-        internal static IEnumerable<Type> GetAttributedTreeControllers(this TypeLoader mgr)
-        {
-            return mgr.GetTypesWithAttribute<TreeController, TreeAttribute>();
-        }
+        internal static IEnumerable<Type> GetSurfaceControllers(this TypeLoader typeLoader)
+            => typeLoader.GetTypes<SurfaceController>();
 
-        internal static IEnumerable<Type> GetSurfaceControllers(this TypeLoader mgr)
-        {
-            return mgr.GetTypes<SurfaceController>();
-        }
-
-        internal static IEnumerable<Type> GetUmbracoApiControllers(this TypeLoader mgr)
-        {
-            return mgr.GetTypes<UmbracoApiController>();
-        }
-        
+        /// <summary>
+        /// Gets all types implementing <see cref="UmbracoApiController"/>.
+        /// </summary>
+        internal static IEnumerable<Type> GetUmbracoApiControllers(this TypeLoader typeLoader)
+            => typeLoader.GetTypes<UmbracoApiController>();
     }
 }
diff --git a/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs b/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
index cafdfb0e042a..f1b2cda36818 100644
--- a/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
+++ b/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
@@ -33,7 +33,7 @@ public UmbracoEnsuredPage()
                     .GetByAlias(treeAuth.TreeAlias);
                 if (treeByAlias != null)
                 {
-                    CurrentApp = treeByAlias.ApplicationAlias;
+                    CurrentApp = treeByAlias.SectionAlias;
                 }
             }
         }
diff --git a/src/Umbraco.Web/WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs
index 5ad3da7f4d00..1bea963ee1b5 100644
--- a/src/Umbraco.Web/WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/UmbracoTreeAuthorizeAttribute.cs
@@ -44,7 +44,7 @@ protected override bool IsAuthorized(HttpActionContext actionContext)
             var apps = _treeAliases.Select(x => Current.TreeService
                 .GetByAlias(x))
                 .WhereNotNull()
-                .Select(x => x.ApplicationAlias)
+                .Select(x => x.SectionAlias)
                 .Distinct()
                 .ToArray();
 

From e651d5917a69ec874c9242026203d169eca6c9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 22 Jan 2019 14:38:10 +0100
Subject: [PATCH 017/421] Finds and set the active ContentApp when running
 init, fixing the issue of retuning to a node after editing the DocType in
 infinity editing. Fixes #4185

---
 .../components/content/edit.controller.js     |  63 ++++++---
 .../src/views/media/edit.html                 |   2 +-
 .../src/views/media/media.edit.controller.js  | 133 ++++++++++++------
 .../src/views/mediatypes/edit.controller.js   |   5 +-
 4 files changed, 140 insertions(+), 63 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 89c8b541d138..ecaf8b3ad3e2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -26,20 +26,43 @@
         $scope.allowOpen = true;
         $scope.app = null;
 
-        function init(content) {
-            if (!$scope.app) {
-                // set first app to active
-                content.apps[0].active = true;
-                $scope.app = content.apps[0];
+        function init() {
+            
+            var content = $scope.content;
+            
+            // we need to check wether an app is present in the current data, if not we will present the default app.
+            var isAppPresent = false;
+            
+            // on first init, we dont have any apps. but if we are re-initializing, we do, but ...
+            if ($scope.app) {
+                
+                // lets check if it still exists as part of our apps array. (if not we have made a change to our docType, even just a re-save of the docType it will turn into new Apps.)
+                _.forEach(content.apps, function(app) {
+                    if (app === $scope.app) {
+                        isAppPresent = true;
+                    }
+                });
+                
+                // if we did reload our DocType, but still have the same app we will try to find it by the alias.
+                if (isAppPresent === false) {
+                    _.forEach(content.apps, function(app) {
+                        if (app.alias === $scope.app.alias) {
+                            isAppPresent = true;
+                            app.active = true;
+                            $scope.appChanged(app);
+                        }
+                    });
+                }
+                
             }
-
-            if (infiniteMode) {
-                createInfiniteModeButtons(content);
-            } else {
-                createButtons(content);
+            
+            // if we still dont have a app, lets show the first one:
+            if (isAppPresent === false) {
+                content.apps[0].active = true;
+                $scope.appChanged(content.apps[0]);
             }
-
-            editorState.set($scope.content);
+            
+            editorState.set(content);
 
             //We fetch all ancestors of the node to generate the footer breadcrumb navigation
             if (!$scope.page.isNew) {
@@ -129,7 +152,7 @@
                             "/content/content/edit/" + data.parentId;
                     }
 
-                    init($scope.content);
+                    init();
 
                     syncTreeNode($scope.content, $scope.content.path, true);
 
@@ -337,7 +360,7 @@
                 showNotifications: args.showNotifications
             }).then(function (data) {
                 //success
-                init($scope.content);
+                init();
                 syncTreeNode($scope.content, data.path);
 
                 eventsService.emit("content.saved", { content: $scope.content, action: args.action });
@@ -439,7 +462,7 @@
 
                     $scope.content = data;
 
-                    init($scope.content);
+                    init();
 
                     resetLastListPageNumber($scope.content);
 
@@ -478,7 +501,7 @@
                             .then(function (data) {
                                 formHelper.resetForm({ scope: $scope });
                                 contentEditingHelper.reBindChangedProperties($scope.content, data);
-                                init($scope.content);
+                                init();
                                 syncTreeNode($scope.content, data.path);
                                 $scope.page.buttonGroupState = "success";
                                 eventsService.emit("content.unpublished", { content: $scope.content });
@@ -915,8 +938,14 @@
          * @param {any} app
          */
         $scope.appChanged = function (app) {
+            
             $scope.app = app;
-            createButtons($scope.content);
+            
+            if (infiniteMode) {
+                createInfiniteModeButtons($scope.content);
+            } else {
+                createButtons($scope.content);
+            }
         };
 
         // methods for infinite editing
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index be1219f05280..35f9a6f7ff7a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -14,7 +14,7 @@
                                hide-description="true"
                                hide-alias="true"
                                navigation="content.apps"
-                               on-select-navigation-item="appChanged(app)">
+                               on-select-navigation-item="appChanged(item)">
             </umb-editor-header>
 
             <umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index 19932887fde6..af7184c82f96 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -6,7 +6,10 @@
  * @description
  * The controller for the media editor
  */
-function mediaEditController($scope, $routeParams, $q, appState, mediaResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, editorState, umbRequestHelper, $http, eventsService) {
+function mediaEditController($scope, $routeParams, $q, appState, mediaResource, 
+    entityResource, navigationService, notificationsService, angularHelper, 
+    serverValidationManager, contentEditingHelper, fileManager, formHelper, 
+    editorState, umbRequestHelper, $http, eventsService) {
     
     var evts = [];
     var nodeId = null;
@@ -41,33 +44,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
     $scope.page.listViewPath = null;
     $scope.page.saveButtonState = "init";
     $scope.page.submitButtonLabel = "Save";
-
-    /** Syncs the content item to it's tree node - this occurs on first load and after saving */
-    function syncTreeNode(content, path, initialLoad) {
-
-        if (infiniteMode) {
-            return;
-        }
-
-        if (!$scope.content.isChildOfListView) {
-            navigationService.syncTree({ tree: "media", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
-                $scope.page.menu.currentNode = syncArgs.node;
-            });
-        }
-        else if (initialLoad === true) {
-
-            //it's a child item, just sync the ui node to the parent
-            navigationService.syncTree({ tree: "media", path: path.substring(0, path.lastIndexOf(",")).split(","), forceReload: initialLoad !== true });
-
-            //if this is a child of a list view and it's the initial load of the editor, we need to get the tree node 
-            // from the server so that we can load in the actions menu.
-            umbRequestHelper.resourcePromise(
-                $http.get(content.treeNodeUrl),
-                'Failed to retrieve data for child node ' + content.id).then(function (node) {
-                    $scope.page.menu.currentNode = node;
-                });
-        }
-    }
+    $scope.app = null;
 
     if (create) {
 
@@ -77,8 +54,6 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
             .then(function (data) {
                 $scope.content = data;
 
-                editorState.set($scope.content);
-
                 init();
 
                 $scope.page.loading = false;
@@ -94,18 +69,90 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
     }
 
     function init() {
+        
+        var content = $scope.content;
+        
+        // we need to check wether an app is present in the current data, if not we will present the default app.
+        var isAppPresent = false;
+        
+        // on first init, we dont have any apps. but if we are re-initializing, we do, but ...
+        if ($scope.app) {
+            
+            // lets check if it still exists as part of our apps array. (if not we have made a change to our docType, even just a re-save of the docType it will turn into new Apps.)
+            _.forEach(content.apps, function(app) {
+                if (app === $scope.app) {
+                    isAppPresent = true;
+                }
+            });
+            
+            // if we did reload our DocType, but still have the same app we will try to find it by the alias.
+            if (isAppPresent === false) {
+                _.forEach(content.apps, function(app) {
+                    if (app.alias === $scope.app.alias) {
+                        isAppPresent = true;
+                        app.active = true;
+                        $scope.appChanged(app);
+                    }
+                });
+            }
+            
+        }
+        
+        // if we still dont have a app, lets show the first one:
+        if (isAppPresent === false) {
+            content.apps[0].active = true;
+            $scope.appChanged(content.apps[0]);
+        }
+        
+
+        editorState.set($scope.content);
+        
+        bindEvents();
 
-        if (!$scope.app) {
-            // set first app to active
-            $scope.content.apps[0].active = true;
-            $scope.app = $scope.content.apps[0];
+    }
+    
+    function bindEvents() {
+        //bindEvents can be called more than once and we don't want to have multiple bound events
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
         }
+        
+        evts.push(eventsService.on("editors.mediaType.saved", function(name, args) {
+            // if this media item uses the updated media type we need to reload the media item
+            if(args && args.mediaType && args.mediaType.key === $scope.content.contentType.key) {
+                $scope.page.loading = true;
+                loadMedia().then(function() {
+                    $scope.page.loading = false;
+                });
+            }
+        }));
+    }
+    
+    /** Syncs the content item to it's tree node - this occurs on first load and after saving */
+    function syncTreeNode(content, path, initialLoad) {
 
-        // setup infinite mode
-        if(infiniteMode) {
-            $scope.page.submitButtonLabel = "Save and Close";
+        if (infiniteMode) {
+            return;
         }
 
+        if (!$scope.content.isChildOfListView) {
+            navigationService.syncTree({ tree: "media", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
+                $scope.page.menu.currentNode = syncArgs.node;
+            });
+        }
+        else if (initialLoad === true) {
+
+            //it's a child item, just sync the ui node to the parent
+            navigationService.syncTree({ tree: "media", path: path.substring(0, path.lastIndexOf(",")).split(","), forceReload: initialLoad !== true });
+
+            //if this is a child of a list view and it's the initial load of the editor, we need to get the tree node 
+            // from the server so that we can load in the actions menu.
+            umbRequestHelper.resourcePromise(
+                $http.get(content.treeNodeUrl),
+                'Failed to retrieve data for child node ' + content.id).then(function (node) {
+                    $scope.page.menu.currentNode = node;
+                });
+        }
     }
     
     $scope.save = function () {
@@ -212,14 +259,12 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
 
     $scope.appChanged = function (app) {
         $scope.app = app;
-    }
-
-    evts.push(eventsService.on("editors.mediaType.saved", function(name, args) {
-        // if this media item uses the updated media type we need to reload the media item
-        if(args && args.mediaType && args.mediaType.key === $scope.content.contentType.key) {
-            loadMedia();
+        
+        // setup infinite mode
+        if(infiniteMode) {
+            $scope.page.submitButtonLabel = "Save and Close";
         }
-    }));
+    }
 
     //ensure to unregister from all events!
     $scope.$on('$destroy', function () {
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
index c8aba53cf548..0740f7866f4d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
@@ -9,7 +9,10 @@
 (function () {
     "use strict";
 
-    function MediaTypesEditController($scope, $routeParams, mediaTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter, $q, localizationService, overlayHelper, eventsService) {
+    function MediaTypesEditController($scope, $routeParams, mediaTypeResource, 
+        dataTypeResource, editorState, contentEditingHelper, formHelper, 
+        navigationService, iconHelper, contentTypeHelper, notificationsService, 
+        $filter, $q, localizationService, overlayHelper, eventsService) {
 
         var vm = this;
         var evts = [];

From d8f0af1a94d14fc9b79882e11be4bddcf79b3fb1 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 22 Jan 2019 20:37:47 +0100
Subject: [PATCH 018/421] Fix plural localization

---
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index b4ab08422efd..3223478dd72b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -1458,9 +1458,9 @@ Mange hilsner fra Umbraco robotten
     <key alias="macros">Makroer</key>
     <key alias="mediaTypes">Medietyper</key>
     <key alias="member">Medlemmer</key>
-    <key alias="memberGroups">Medlemsgruppe</key>
+    <key alias="memberGroups">Medlemsgrupper</key>
     <key alias="memberRoles">Roller</key>
-    <key alias="memberTypes">Medlemstype</key>
+    <key alias="memberTypes">Medlemstyper</key>
     <key alias="documentTypes">Dokumenttyper</key>
     <key alias="relationTypes">Relationstyper</key>
     <key alias="packager">Pakker</key>

From 832ec68140026c8256af00ac5991a36356ba25aa Mon Sep 17 00:00:00 2001
From: Paul Seal <paul@moriyama.co.uk>
Date: Mon, 21 Jan 2019 23:38:38 +0000
Subject: [PATCH 019/421] - tls check to check if the site is set up to use at
 least TLS 1.2 for outgoing connections. - added translations for all
 languages which have a healthcheck section in the language file.

---
 .../Umbraco/config/lang/zh_tw.xml             |  5 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  3 ++
 .../umbraco/config/lang/en_us.xml             |  3 ++
 src/Umbraco.Web.UI/umbraco/config/lang/es.xml |  3 ++
 src/Umbraco.Web.UI/umbraco/config/lang/fr.xml |  3 ++
 src/Umbraco.Web.UI/umbraco/config/lang/nl.xml |  3 ++
 src/Umbraco.Web.UI/umbraco/config/lang/pl.xml |  3 ++
 src/Umbraco.Web.UI/umbraco/config/lang/ru.xml |  3 ++
 src/Umbraco.Web.UI/umbraco/config/lang/zh.xml |  3 ++
 .../HealthCheck/Checks/Security/TlsCheck.cs   | 51 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 11 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 src/Umbraco.Web/HealthCheck/Checks/Security/TlsCheck.cs

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index 16387728b1c1..ba30581267dd 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -1331,6 +1331,9 @@
     <key alias="smtpMailSettingsConnectionFail">SMTP伺服器 %0% : %1% 無法連接。請確認在Web.config 檔案中 system.net/mailsettings 設定正確。</key>
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[提醒郵件已經設為 <strong>%0%</strong>。]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[提醒郵件仍為預設值<strong>%0%</strong>。]]></key>
+
+    <key alias="tlsHealthCheckSuccess">您的網站設置為使用TLS 1.2或更高版本進行傳出連接。</key>
+    <key alias="tlsHealthCheckWarn">來自您網站的傳出連接通過舊協議提供。您應該考慮將其更新為使用TLS 1.2或更高版本。</key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">停止網址追蹤器</key>
@@ -1350,4 +1353,4 @@
     <key alias="enabledConfirm">轉址追蹤器已開啟。</key>
     <key alias="enableError">啟動轉址追蹤器錯誤，更多資訊請參閱您的紀錄檔。</key>
   </area>
-</language>
\ No newline at end of file
+</language>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 7d3bfa7c997c..06a7fbb109b2 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -2206,6 +2206,9 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
         <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
         <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
+
+        <key alias="tlsHealthCheckSuccess">Your website is set up to use TLS 1.2 or greater for outgoing connections.</key>
+        <key alias="tlsHealthCheckWarn">Outgoing connections from your website are being served over an old protocol. You should consider updating it to use TLS 1.2 or higher.</key>
     </area>
     <area alias="redirectUrls">
         <key alias="disableUrlTracker">Disable URL tracker</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 0a1756038f2e..766d2eec9e58 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -2199,6 +2199,9 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
         <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
         <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
+
+        <key alias="tlsHealthCheckSuccess">Your website is set up to use TLS 1.2 or greater for outgoing connections.</key>
+        <key alias="tlsHealthCheckWarn">Outgoing connections from your website are being served over an old protocol. You should consider updating it to use TLS 1.2 or higher.</key>
     </area>
     <area alias="redirectUrls">
         <key alias="disableUrlTracker">Disable URL tracker</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
index ba0027aef01f..607050c23563 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
@@ -1856,6 +1856,9 @@
         <key alias="notificationEmailsCheckErrorMessage"><![CDATA[El email de notificación está todavía configurado en tuvalor por defecto: <strong>%0%</strong>.]]></key>
         <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Los resultados de los Chequeos de Salud de Umbraco programados para ejecutarse el %0% a las %1% son:</p>%2%</body></html>]]></key>
         <key alias="scheduledHealthCheckEmailSubject">Status de los Chequeos de Salud de Umbraco: %0%</key>
+
+        <key alias="tlsHealthCheckSuccess">Su sitio web está configurado para usar TLS 1.2 o superior para las conexiones salientes.</key>
+        <key alias="tlsHealthCheckWarn">Las conexiones salientes de su sitio web están siendo servidas a través de un protocolo antiguo. Deberías considerar actualizarlo para usar TLS 1.2 o superior.</key>
     </area>
     <area alias="redirectUrls">
         <key alias="disableUrlTracker">Desactivar URL tracker</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index fd2b4c53a8af..dab9f49120b3 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -2170,6 +2170,9 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[L'adresse email de notification est toujours à sa valeur par défaut : <strong>%0%</strong>.]]></key>
     <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Les résultats de l'exécution du Umbraco Health Checks planifiée le %0% à %1% sont les suivants :</p>%2%</body></html>]]></key>
     <key alias="scheduledHealthCheckEmailSubject">Statut du Umbraco Health Check: %0%</key>
+
+    <key alias="tlsHealthCheckSuccess">Votre site Web est configuré pour utiliser TLS version 1.2 ou supérieure pour les connexions sortantes.</key>
+    <key alias="tlsHealthCheckWarn">Les connexions sortantes de votre site Web sont servies via un ancien protocole. Vous devriez envisager de le mettre à jour pour utiliser TLS 1.2 ou supérieur.</key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">Désactiver URL tracker</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index 26b057e49f16..4680d0dfc51d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -1623,6 +1623,9 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op de
 
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notificatie email is verzonden naar <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notificatie email staat nog steeds op de default waarde van <strong>%0%</strong>.]]></key>
+
+    <key alias="tlsHealthCheckSuccess">Uw website is ingesteld om TLS 1.2 of hoger te gebruiken voor uitgaande verbindingen.</key>
+    <key alias="tlsHealthCheckWarn">Uitgaande verbindingen van uw website worden via een oud protocol bediend. U zou moeten overwegen om het bij te werken om TLS 1.2 of hoger te gebruiken.</key>
   </area>
 	<area alias="redirectUrls">
     <key alias="disableUrlTracker">URL tracker uitzetten</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index 9affa43727d8..bb36628757e4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -1674,6 +1674,9 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
 
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[E-mail z powiadomieniem został wysłany do <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[E-mail do powiadomień jest nadal ustawiony na domyślną wartość <strong>%0%</strong>.]]></key>
+
+    <key alias="tlsHealthCheckSuccess">Twoja strona internetowa jest skonfigurowana do używania protokołu TLS 1.2 lub nowszego dla połączeń wychodzących.</key>
+    <key alias="tlsHealthCheckWarn">Połączenia wychodzące z Twojej witryny są obsługiwane przez stary protokół. Należy rozważyć zaktualizowanie go do korzystania z TLS w wersji 1.2 lub nowszej.</key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">Wyłącz śledzenie URL</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index fd33e647adc5..37a4613d435d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -870,6 +870,9 @@
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Адрес для отправки уведомлений все еще установлен в значение по-умолчанию <strong>%0%</strong>.]]></key>
     <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Зафиксированы следующие результаты автоматической проверки состояния Umbraco по расписанию, запущенной на %0% в %1%:</p>%2%</body></html>]]></key>
     <key alias="scheduledHealthCheckEmailSubject">Результат проверки состояния Umbraco: %0%</key>
+
+    <key alias="tlsHealthCheckSuccess">Ваш веб-сайт настроен на использование TLS 1.2 или выше для исходящих соединений.</key>
+    <key alias="tlsHealthCheckWarn">Исходящие соединения с вашего сайта обслуживаются по старому протоколу. Вы должны рассмотреть возможность его обновления для использования TLS 1.2 или выше.</key>
   </area>
   <area alias="help">
     <key alias="goTo">перейти к</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
index a918b78f95c2..471925ccd5dd 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
@@ -1598,6 +1598,9 @@
     <key alias="smtpMailSettingsConnectionFail">The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct.</key>
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
+
+    <key alias="tlsHealthCheckSuccess">您的网站设置为使用TLS 1.2或更高版本进行传出连接。</key>
+    <key alias="tlsHealthCheckWarn">来自您网站的传出连接通过旧协议提供。您应该考虑将其更新为使用TLS 1.2或更高版本。</key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">禁用 url 跟踪程序</key>
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/TlsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/TlsCheck.cs
new file mode 100644
index 000000000000..8d4196539567
--- /dev/null
+++ b/src/Umbraco.Web/HealthCheck/Checks/Security/TlsCheck.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Web.HealthCheck.Checks.Security
+{
+    [HealthCheck("6D7D4E11-758E-4697-BA72-7E02A530CBD4",
+        "TLS Check",
+        Description = "Checks that your site is set up to use at least TLS 1.2 for outgoing connections.",
+        Group = "Security")]
+    public class TlsCheck : HealthCheck
+    {
+        private readonly ILocalizedTextService _textService;
+
+        public TlsCheck(HealthCheckContext healthCheckContext) : base(healthCheckContext)
+        {
+            _textService = healthCheckContext.ApplicationContext.Services.TextService;
+        }
+
+        public override IEnumerable<HealthCheckStatus> GetStatus()
+        {
+            return new[] { CheckTls() };
+        }
+
+        public override HealthCheckStatus ExecuteAction(HealthCheckAction action)
+        {
+            throw new InvalidOperationException("TlsCheck has no executable actions");
+        }
+
+        public HealthCheckStatus CheckTls()
+        {
+            bool success = (int)ServicePointManager.SecurityProtocol >= (int)SecurityProtocolType.Tls12;
+
+            string message = success
+                ? _textService.Localize("healthcheck/tlsHealthCheckSuccess")
+                : _textService.Localize("healthcheck/tlsHealthCheckWarn");
+
+            var actions = new List<HealthCheckAction>();
+
+            return
+                new HealthCheckStatus(message)
+                {
+                    ResultType = success
+                        ? StatusResultType.Success
+                        : StatusResultType.Warning,
+                    Actions = actions
+                };
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 1b668b06c8b0..a66e960e97be 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -338,6 +338,7 @@
     <Compile Include="Editors\CodeFileController.cs" />
     <Compile Include="Editors\TourController.cs" />
     <Compile Include="Features\EnabledFeatures.cs" />
+    <Compile Include="HealthCheck\Checks\Security\TlsCheck.cs" />
     <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
     <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
     <Compile Include="Models\BackOfficeTourFilter.cs" />

From 9eb2b28232772532cc74686cd4d01efdf13905f6 Mon Sep 17 00:00:00 2001
From: Alkaersig <ca@biltorvet.dk>
Date: Thu, 17 Jan 2019 12:08:53 +0100
Subject: [PATCH 020/421] Added (Doctype) Name and Description to
 PublishedContentType

---
 .../Models/PublishedContent/PublishedContentType.cs    | 10 ++++++++--
 src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs |  4 ++--
 src/Umbraco.Tests/LibraryTests.cs                      |  2 +-
 .../Membership/DynamicMemberContentTests.cs            |  2 +-
 .../PublishedContent/DynamicDocumentTestsBase.cs       |  4 ++--
 .../PublishedContent/PublishedContentDataTableTests.cs |  4 ++--
 .../PublishedContent/PublishedContentMoreTests.cs      |  6 +++---
 .../PublishedContent/PublishedContentTestBase.cs       |  4 ++--
 .../PublishedContent/PublishedContentTestElements.cs   |  8 ++++----
 .../PublishedContent/PublishedContentTests.cs          |  2 +-
 src/Umbraco.Tests/TestHelpers/BaseWebTest.cs           |  2 +-
 src/Umbraco.Tests/Views/site1/template2.cshtml         |  4 ++++
 12 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 src/Umbraco.Tests/Views/site1/template2.cshtml

diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
index 63164cf27170..4ca32bb718e4 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
@@ -25,6 +25,8 @@ internal PublishedContentType(IContentTypeComposition contentType)
         {
             Id = contentType.Id;
             Alias = contentType.Alias;
+            Name = contentType.Name;
+            Description = contentType.Description;
             _compositionAliases = new HashSet<string>(contentType.CompositionAliases(), StringComparer.InvariantCultureIgnoreCase);
             _propertyTypes = contentType.CompositionPropertyTypes
                 .Select(x => new PublishedPropertyType(this, x))
@@ -33,10 +35,12 @@ internal PublishedContentType(IContentTypeComposition contentType)
         }
 
         // internal so it can be used for unit tests
-        internal PublishedContentType(int id, string alias, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
+        internal PublishedContentType(int id, string alias, string name, string description, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
         {
             Id = id;
             Alias = alias;
+            Name = name;
+            Description = description;
             _compositionAliases = new HashSet<string>(compositionAliases, StringComparer.InvariantCultureIgnoreCase);
             _propertyTypes = propertyTypes.ToArray();
             foreach (var propertyType in _propertyTypes)
@@ -46,7 +50,7 @@ internal PublishedContentType(int id, string alias, IEnumerable<string> composit
 
         // create detached content type - ie does not match anything in the DB
         internal PublishedContentType(string alias, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
-            : this(0, alias, compositionAliases, propertyTypes)
+            : this(0, alias, string.Empty, string.Empty, compositionAliases, propertyTypes)
         { }
 
         private void InitializeIndexes()
@@ -63,6 +67,8 @@ private void InitializeIndexes()
 
         public int Id { get; private set; }
         public string Alias { get; private set; }
+        public string Name { get; private set; }
+        public string Description { get; private set; }
         public HashSet<string> CompositionAliases { get { return _compositionAliases; } }
 
         #endregion
diff --git a/src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs b/src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
index 5fe2efaa2c43..6f64ef8b6918 100644
--- a/src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
+++ b/src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
@@ -83,7 +83,7 @@ public override void Initialize()
                     new PublishedPropertyType("articleDate", 0, "?"), 
                     new PublishedPropertyType("pageTitle", 0, "?"), 
                 };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
             PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
             Debug.Print("INIT STRONG {0}",
                 PublishedContentType.Get(PublishedItemType.Content, "anything")
@@ -148,4 +148,4 @@ internal IPublishedContent GetNode(int id)
         }
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/LibraryTests.cs b/src/Umbraco.Tests/LibraryTests.cs
index 086395f456f6..42e218835c28 100644
--- a/src/Umbraco.Tests/LibraryTests.cs
+++ b/src/Umbraco.Tests/LibraryTests.cs
@@ -43,7 +43,7 @@ public override void Initialize()
                     // AutoPublishedContentType will auto-generate other properties
                     new PublishedPropertyType("content", 0, "?"), 
                 };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
             PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
             Debug.Print("INIT LIB {0}",
                 PublishedContentType.Get(PublishedItemType.Content, "anything")
diff --git a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
index 4c1272550d2d..7bfe75f9aaba 100644
--- a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
+++ b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
@@ -41,7 +41,7 @@ public override void Initialize()
                     new PublishedPropertyType("bodyText", 0, "?"), 
                     new PublishedPropertyType("author", 0, "?")
                 };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
             PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
 
         }
diff --git a/src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs b/src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs
index 07787d8e2ceb..fd736f0700eb 100644
--- a/src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs
@@ -50,7 +50,7 @@ public override void Initialize()
                     new PublishedPropertyType("creatorName", 0, "?"), 
                     new PublishedPropertyType("blah", 0, "?"), // ugly error when that one is missing...
                 };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
             PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
 
         }
@@ -729,4 +729,4 @@ public static bool ContainsValue(this string s, int val)
 			return s.Contains(val.ToString());
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs
index 8efe6efd7239..c57bacad29e8 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs
@@ -24,7 +24,7 @@ public override void Initialize()
 
             // need to specify a custom callback for unit tests
             // AutoPublishedContentTypes generates properties automatically
-            var type = new AutoPublishedContentType(0, "anything", new PublishedPropertyType[] {});
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", new PublishedPropertyType[] {});
             PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
 
             // need to specify a different callback for testing
@@ -251,4 +251,4 @@ public PublishedContentType ContentType
             }
 	    }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
index 1c83691d04b8..1f2f43de8ba8 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
@@ -234,9 +234,9 @@ static SolidPublishedCaches CreatePublishedContent()
                         new PublishedPropertyType("prop1", 1, "?"), 
                     };
 
-            var contentType1 = new PublishedContentType(1, "ContentType1", Enumerable.Empty<string>(), props);
-            var contentType2 = new PublishedContentType(2, "ContentType2", Enumerable.Empty<string>(), props);
-            var contentType2s = new PublishedContentType(3, "ContentType2Sub", Enumerable.Empty<string>(), props);
+            var contentType1 = new PublishedContentType(1, "ContentType1", "ContentType1", "ContentType1", Enumerable.Empty<string>(), props);
+            var contentType2 = new PublishedContentType(2, "ContentType2", "ContentType2", "ContentType2", Enumerable.Empty<string>(), props);
+            var contentType2s = new PublishedContentType(3, "ContentType2Sub", "ContentType2Sub", "ContentType2Sub", Enumerable.Empty<string>(), props);
 
             cache.Add(new SolidPublishedContent(contentType1)
                 {
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index 789d9f7218b0..c0fff5f8da6d 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -29,7 +29,7 @@ public override void Initialize()
                     // AutoPublishedContentType will auto-generate other properties
                     new PublishedPropertyType("content", 0, Constants.PropertyEditors.TinyMCEAlias), 
                 };
-            var type = new AutoPublishedContentType(0, "anything", propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", propertyTypes);
             PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
 
             var rCtx = GetRoutingContext("/test", 1234);
@@ -65,4 +65,4 @@ public override void TearDown()
             UmbracoContext.Current = null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
index 82115d670e04..2ebc8c2e4b1c 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
@@ -354,12 +354,12 @@ class AutoPublishedContentType : PublishedContentType
     {
         private static readonly PublishedPropertyType Default = new PublishedPropertyType("*", 0, "?");
 
-        public AutoPublishedContentType(int id, string alias, IEnumerable<PublishedPropertyType> propertyTypes)
-            : base(id, alias, Enumerable.Empty<string>(), propertyTypes)
+        public AutoPublishedContentType(int id, string alias, string name, string description, IEnumerable<PublishedPropertyType> propertyTypes)
+            : base(id, alias, name, description, Enumerable.Empty<string>(), propertyTypes)
         { }
 
-        public AutoPublishedContentType(int id, string alias, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
-            : base(id, alias, compositionAliases, propertyTypes)
+        public AutoPublishedContentType(int id, string alias, string name, string description, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
+            : base(id, alias, name, description, compositionAliases, propertyTypes)
         { }
 
         public override PublishedPropertyType GetPropertyType(string alias)
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index 5ec34ea78166..4358f5de47d8 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -49,7 +49,7 @@ public override void Initialize()
                     new PublishedPropertyType("testRecursive", 0, "?"),
                 };
             var compositionAliases = new[] { "MyCompositionAlias" };
-            var type = new AutoPublishedContentType(0, "anything", compositionAliases, propertyTypes);
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", compositionAliases, propertyTypes);
             PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
         }
 
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index dfc6317d32ac..c7fe2d01680c 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -15,7 +15,7 @@ public override void Initialize()
 
             // need to specify a custom callback for unit tests
             // AutoPublishedContentTypes generates properties automatically
-            var type = new AutoPublishedContentType(0, "anything", new PublishedPropertyType[] {});
+            var type = new AutoPublishedContentType(0, "anything", "anything", "anything", new PublishedPropertyType[] {});
             PublishedContentType.GetPublishedContentTypeCallback = (alias) => type;
         }
         
diff --git a/src/Umbraco.Tests/Views/site1/template2.cshtml b/src/Umbraco.Tests/Views/site1/template2.cshtml
new file mode 100644
index 000000000000..3e82f2f0d21f
--- /dev/null
+++ b/src/Umbraco.Tests/Views/site1/template2.cshtml
@@ -0,0 +1,4 @@
+@inherits Umbraco.Web.Mvc.UmbracoTemplatePage
+@{
+	Layout = null;
+}
\ No newline at end of file

From 7acafe67a48f8b30cbeb75a965be616a1e228adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Alk=C3=A6rsig?= <ca@biltorvet.dk>
Date: Thu, 17 Jan 2019 13:23:35 +0100
Subject: [PATCH 021/421] Delete template2.cshtml

Auto-generated test file
---
 src/Umbraco.Tests/Views/site1/template2.cshtml | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/Umbraco.Tests/Views/site1/template2.cshtml

diff --git a/src/Umbraco.Tests/Views/site1/template2.cshtml b/src/Umbraco.Tests/Views/site1/template2.cshtml
deleted file mode 100644
index 3e82f2f0d21f..000000000000
--- a/src/Umbraco.Tests/Views/site1/template2.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@inherits Umbraco.Web.Mvc.UmbracoTemplatePage
-@{
-	Layout = null;
-}
\ No newline at end of file

From f10b35780cdd1a15a0030786eee69353e9558a47 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 23 Jan 2019 10:22:29 +0100
Subject: [PATCH 022/421] - Removed PostFilterParams - Handling of PostFilter
 using Expression trees

---
 .../src/common/resources/entity.resource.js   |  15 +-
 src/Umbraco.Web/Editors/EntityController.cs   | 131 ++++++++++++++----
 .../Editors/TemplateQueryController.cs        |   2 +-
 .../Models/TemplateQuery/OperatorFactory.cs   |  32 +++++
 .../Models/TemplateQuery/QueryCondition.cs    |  12 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 6 files changed, 147 insertions(+), 46 deletions(-)
 create mode 100644 src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index f8646968731b..753d18088001 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -254,22 +254,13 @@ function entityResource($q, $http, umbRequestHelper) {
          * 
          * @param {string} type Object type name        
          * @param {string} postFilter optional filter expression which will execute a dynamic where clause on the server
-         * @param {string} postFilterParams optional parameters for the postFilter expression
          * @returns {Promise} resourcePromise object containing the entity.
          *
          */
-        getAll: function (type, postFilter, postFilterParams) {            
-
+        getAll: function (type, postFilter) {
             //need to build the query string manually
-            var query = "type=" + type + "&postFilter=" + (postFilter ? postFilter : "");
-            if (postFilter && postFilterParams) {
-                var counter = 0;
-                _.each(postFilterParams, function(val, key) {
-                    query += "&postFilterParams[" + counter + "].key=" + key + "&postFilterParams[" + counter + "].value=" + val;
-                    counter++;
-                });
-            } 
-
+            var query = "type=" + type + "&postFilter=" + (postFilter ? encodeURIComponent(postFilter) : "");
+         
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index b25f3f5af157..19f7158c5d52 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Net;
 using System.Web.Http;
 using AutoMapper;
@@ -11,11 +10,10 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Formatting;
+using System.Reflection;
 using Umbraco.Core.Models;
-using Constants = Umbraco.Core.Constants;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using System.Web.Http.Controllers;
-using Examine;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
@@ -24,12 +22,14 @@
 using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
 using Umbraco.Web.Models.Mapping;
+using Umbraco.Web.Models.TemplateQuery;
 using Umbraco.Web.Search;
 using Umbraco.Web.Services;
 using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 
+using Constants = Umbraco.Core.Constants;
 namespace Umbraco.Web.Editors
 {
     /// <summary>
@@ -242,7 +242,7 @@ public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
             };
         }
 
-     
+
         /// <summary>
         /// Gets an entity by a xpath query
         /// </summary>
@@ -863,9 +863,15 @@ private EntityBasic GetResultForId(int id, UmbracoEntityTypes entityType)
             }
         }
 
-        public IEnumerable<EntityBasic> GetAll(UmbracoEntityTypes type, string postFilter, [FromUri]IDictionary<string, object> postFilterParams)
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="type">The type of entity.</param>
+        /// <param name="postFilter">Optional filter - Format like: "BoolVariable==true&IntVariable>=6". Invalid filters are ignored.</param>
+        /// <returns></returns>
+        public IEnumerable<EntityBasic> GetAll(UmbracoEntityTypes type, string postFilter)
         {
-            return GetResultForAll(type, postFilter, postFilterParams);
+            return GetResultForAll(type, postFilter);
         }
 
         /// <summary>
@@ -873,29 +879,28 @@ public IEnumerable<EntityBasic> GetAll(UmbracoEntityTypes type, string postFilte
         /// </summary>
         /// <param name="entityType"></param>
         /// <param name="postFilter">A string where filter that will filter the results dynamically with linq - optional</param>
-        /// <param name="postFilterParams">the parameters to fill in the string where filter - optional</param>
         /// <returns></returns>
-        private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType, string postFilter = null, IDictionary<string, object> postFilterParams = null)
+        private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType, string postFilter = null)
         {
             var objectType = ConvertToObjectType(entityType);
             if (objectType.HasValue)
             {
                 //TODO: Should we order this by something ?
                 var entities = Services.EntityService.GetAll(objectType.Value).WhereNotNull().Select(Mapper.Map<EntityBasic>);
-                return ExecutePostFilter(entities, postFilter, postFilterParams);
+                return ExecutePostFilter(entities, postFilter);
             }
             //now we need to convert the unknown ones
             switch (entityType)
             {
                 case UmbracoEntityTypes.Template:
                     var templates = Services.FileService.GetTemplates();
-                    var filteredTemplates = ExecutePostFilter(templates, postFilter, postFilterParams);
+                    var filteredTemplates = ExecutePostFilter(templates, postFilter);
                     return filteredTemplates.Select(Mapper.Map<EntityBasic>);
 
                 case UmbracoEntityTypes.Macro:
                     //Get all macros from the macro service
                     var macros = Services.MacroService.GetAll().WhereNotNull().OrderBy(x => x.Name);
-                    var filteredMacros = ExecutePostFilter(macros, postFilter, postFilterParams);
+                    var filteredMacros = ExecutePostFilter(macros, postFilter);
                     return filteredMacros.Select(Mapper.Map<EntityBasic>);
 
                 case UmbracoEntityTypes.PropertyType:
@@ -906,7 +911,7 @@ private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType,
                                                 .ToArray()
                                                 .SelectMany(x => x.PropertyTypes)
                                                 .DistinctBy(composition => composition.Alias);
-                    var filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter, postFilterParams);
+                    var filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter);
                     return Mapper.Map<IEnumerable<PropertyType>, IEnumerable<EntityBasic>>(filteredPropertyTypes);
 
                 case UmbracoEntityTypes.PropertyGroup:
@@ -917,32 +922,32 @@ private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType,
                                                 .ToArray()
                                                 .SelectMany(x => x.PropertyGroups)
                                                 .DistinctBy(composition => composition.Name);
-                    var filteredpropertyGroups = ExecutePostFilter(propertyGroups, postFilter, postFilterParams);
+                    var filteredpropertyGroups = ExecutePostFilter(propertyGroups, postFilter);
                     return Mapper.Map<IEnumerable<PropertyGroup>, IEnumerable<EntityBasic>>(filteredpropertyGroups);
 
                 case UmbracoEntityTypes.User:
 
                     var users = Services.UserService.GetAll(0, int.MaxValue, out _);
-                    var filteredUsers = ExecutePostFilter(users, postFilter, postFilterParams);
+                    var filteredUsers = ExecutePostFilter(users, postFilter);
                     return Mapper.Map<IEnumerable<IUser>, IEnumerable<EntityBasic>>(filteredUsers);
 
                 case UmbracoEntityTypes.Stylesheet:
 
-                    if (!postFilter.IsNullOrWhiteSpace() || (postFilterParams != null && postFilterParams.Count > 0))
+                    if (!postFilter.IsNullOrWhiteSpace())
                         throw new NotSupportedException("Filtering on stylesheets is not currently supported");
 
                     return Services.FileService.GetStylesheets().Select(Mapper.Map<EntityBasic>);
-                
+
                 case UmbracoEntityTypes.Language:
 
-                    if (!postFilter.IsNullOrWhiteSpace() || (postFilterParams != null && postFilterParams.Count > 0))
+                    if (!postFilter.IsNullOrWhiteSpace() )
                         throw new NotSupportedException("Filtering on languages is not currently supported");
 
                     return Services.LocalizationService.GetAllLanguages().Select(Mapper.Map<EntityBasic>);
                 case UmbracoEntityTypes.DictionaryItem:
 
-                    if (!postFilter.IsNullOrWhiteSpace() || (postFilterParams != null && postFilterParams.Count > 0))
-                        throw new NotSupportedException("Filtering on languages is not currently supported");
+                    if (!postFilter.IsNullOrWhiteSpace())
+                        throw new NotSupportedException("Filtering on dictionary items is not currently supported");
 
                     return GetAllDictionaryItems();
 
@@ -952,20 +957,90 @@ private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType,
             }
         }
 
-        private IEnumerable<T> ExecutePostFilter<T>(IEnumerable<T> entities, string postFilter, IDictionary<string, object> postFilterParams)
+        private IEnumerable<T> ExecutePostFilter<T>(IEnumerable<T> entities, string postFilter)
         {
-            // if a post filter is assigned then try to execute it
-            if (postFilter.IsNullOrWhiteSpace() == false)
+            if (postFilter.IsNullOrWhiteSpace()) return entities;
+
+            var postFilterConditions = postFilter.Split('&');
+
+            foreach (var postFilterCondition in postFilterConditions)
             {
-                // fixme/task/critical - trouble is, we've killed the dynamic Where thing!
-                throw new NotImplementedException("oops");
-                //return postFilterParams == null
-                //               ? entities.AsQueryable().Where(postFilter).ToArray()
-                //               : entities.AsQueryable().Where(postFilter, postFilterParams).ToArray();
+                var queryCondition = BuildQueryCondition<T>(postFilterCondition);
+
+                if (queryCondition != null)
+                {
+                    var whereClauseExpression = queryCondition.BuildCondition<T>("x");
+
+                    entities = entities.Where(whereClauseExpression.Compile());
+                }
+
             }
             return entities;
         }
 
+        private static QueryCondition BuildQueryCondition<T>(string postFilter)
+        {
+            var postFilterParts = postFilter.Split(new[]
+            {
+                "=",
+                "==",
+                "!=",
+                "<>",
+                ">",
+                "<",
+                ">=",
+                "<="
+            }, 2, StringSplitOptions.RemoveEmptyEntries);
+
+            if (postFilterParts.Length != 2)
+            {
+                return null;
+            }
+
+            var propertyName = postFilterParts[0];
+            var constraintValue = postFilterParts[1];
+            var stringOperator = postFilter.Substring(propertyName.Length,
+                postFilter.Length - propertyName.Length - constraintValue.Length);
+            Operator binaryOperator;
+
+            try
+            {
+                binaryOperator = OperatorFactory.FromString(stringOperator);
+            }
+            catch (ArgumentException)
+            {
+                // unsupported operators are ignored
+                return null;
+            }
+
+            var type = typeof(T);
+            var property = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance);
+
+            if (property == null)
+            {
+                return null;
+            }
+
+            var queryCondition = new QueryCondition()
+            {
+                Term = new OperatorTerm()
+                {
+                    Operator = binaryOperator
+                },
+                ConstraintValue = constraintValue,
+                Property = new PropertyModel()
+                {
+                    Alias = propertyName,
+                    Name = propertyName,
+                    Type = property.PropertyType.Name
+                }
+            };
+
+            return queryCondition;
+        }
+
+
+
 
         #region Methods to get all dictionary items
         private IEnumerable<EntityBasic> GetAllDictionaryItems()
@@ -993,7 +1068,7 @@ private void GetChildItemsForList(IDictionaryItem dictionaryItem, ICollection<En
 
                 GetChildItemsForList(childItem, list);
             }
-        } 
+        }
         #endregion
 
     }
diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs
index 73ebdf3bc5d0..2483446ec26e 100644
--- a/src/Umbraco.Web/Editors/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs
@@ -118,7 +118,7 @@ private IEnumerable<IPublishedContent> PostTemplateValue(QueryModel model, Strin
             foreach (var condition in model.Filters.Where(x => !x.ConstraintValue.IsNullOrWhiteSpace()))
             {
                 //x is passed in as the parameter alias for the linq where statement clause
-                var operation = condition.BuildCondition("x", contents, Properties);
+                var operation = condition.BuildCondition<IPublishedContent>("x");
 
                 contents = contents.Where(operation.Compile());
                 queryExpression.Append(indent);
diff --git a/src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs b/src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs
new file mode 100644
index 000000000000..0b595723f154
--- /dev/null
+++ b/src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace Umbraco.Web.Models.TemplateQuery
+{
+    public static class OperatorFactory
+    {
+        public static Operator FromString(string stringOperator)
+        {
+            if (stringOperator == null) throw new ArgumentNullException(nameof(stringOperator));
+
+            switch (stringOperator)
+            {
+                case "=":
+                case "==":
+                    return Operator.Equals;
+                case "!=":
+                case "<>":
+                    return Operator.NotEquals;
+                case "<":
+                    return Operator.LessThan;
+                case "<=":
+                    return Operator.LessThanEqualTo;
+                case ">":
+                    return Operator.GreaterThan;
+                case ">=":
+                    return Operator.GreaterThanEqualTo;
+                default:
+                    throw new ArgumentException($"A operator cannot be created from the specified string '{stringOperator}'", nameof(stringOperator));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs b/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
index 009b56855623..a58badcf2cf4 100644
--- a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
+++ b/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
@@ -18,11 +18,10 @@ internal static class QueryConditionExtensions
         private static Lazy<MethodInfo> StringContainsMethodInfo =>
             new Lazy<MethodInfo>(() => typeof(string).GetMethod("Contains", new[] {typeof(string)}));
 
-        public static Expression<Func<IPublishedContent, bool>> BuildCondition(this QueryCondition condition,
-            string parameterAlias, IEnumerable<IPublishedContent> contents, IEnumerable<PropertyModel> properties)
+        public static Expression<Func<T, bool>> BuildCondition<T>(this QueryCondition condition, string parameterAlias)
         {
             object constraintValue;
-            switch (condition.Property.Type)
+            switch (condition.Property.Type.ToLowerInvariant())
             {
                 case "string":
                     constraintValue = condition.ConstraintValue;
@@ -30,12 +29,15 @@ public static Expression<Func<IPublishedContent, bool>> BuildCondition(this Quer
                 case "datetime":
                     constraintValue = DateTime.Parse(condition.ConstraintValue);
                     break;
+                case "boolean":
+                    constraintValue = Boolean.Parse(condition.ConstraintValue);
+                    break;
                 default:
                     constraintValue = Convert.ChangeType(condition.ConstraintValue, typeof(int));
                     break;
             }
 
-            var parameterExpression = Expression.Parameter(typeof(IPublishedContent), parameterAlias);
+            var parameterExpression = Expression.Parameter(typeof(T), parameterAlias);
             var propertyExpression = Expression.Property(parameterExpression, condition.Property.Alias);
 
             var valueExpression = Expression.Constant(constraintValue);
@@ -73,7 +75,7 @@ public static Expression<Func<IPublishedContent, bool>> BuildCondition(this Quer
             }
 
             var predicate =
-                Expression.Lambda<Func<IPublishedContent, bool>>(bodyExpression.Reduce(), parameterExpression);
+                Expression.Lambda<Func<T, bool>>(bodyExpression.Reduce(), parameterExpression);
 
             return predicate;
         }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 6736f7512bfc..d2913dd22881 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -172,6 +172,7 @@
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
     <Compile Include="Models\Link.cs" />
     <Compile Include="Models\LinkType.cs" />
+    <Compile Include="Models\TemplateQuery\OperatorFactory.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />

From f8b52a57c3cbdf99ab497b9018fb5c34073e085a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 23 Jan 2019 14:16:42 +0100
Subject: [PATCH 023/421] Injecting Umbraco Context Accessor and not saving the
 url on the class

---
 .../PublishedContentCacheTests.cs             |  7 ++--
 .../PublishedMediaCacheTests.cs               | 18 ++++++----
 .../Published/NestedContentTests.cs           |  7 ++--
 .../PublishedContent/NuCacheTests.cs          |  1 +
 .../PublishedContent/PublishedMediaTests.cs   |  6 ++--
 .../Scoping/ScopedNuCacheTests.cs             |  1 +
 .../ContentTypeServiceVariantsTests.cs        |  2 ++
 .../TestHelpers/TestWithDatabaseBase.cs       |  1 +
 .../Web/Mvc/UmbracoViewPageTests.cs           |  8 +++--
 .../Models/PublishedContentBase.cs            | 34 +++++++++----------
 .../PublishedCache/NuCache/ContentNode.cs     | 29 +++++++++-------
 .../PublishedCache/NuCache/ContentNodeKit.cs  |  9 +++--
 .../PublishedCache/NuCache/ContentStore.cs    | 19 +++++++----
 .../PublishedCache/NuCache/MemberCache.cs     | 14 +++++---
 .../NuCache/PublishedContent.cs               | 22 +++++++++---
 .../PublishedCache/NuCache/PublishedMember.cs | 21 +++++++++---
 .../NuCache/PublishedSnapshotService.cs       | 14 ++++----
 .../PublishedCache/PublishedMember.cs         |  6 +++-
 .../DictionaryPublishedContent.cs             |  4 ++-
 .../PublishedContentCache.cs                  |  7 ++--
 .../XmlPublishedCache/PublishedMediaCache.cs  |  9 +++--
 .../XmlPublishedCache/PublishedMemberCache.cs | 15 ++++----
 .../PublishedSnapshotService.cs               | 18 ++++++----
 .../XmlPublishedCache/XmlPublishedContent.cs  | 22 ++++++++----
 24 files changed, 194 insertions(+), 100 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
index 147a159d5fa2..e868e32b0710 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
@@ -59,6 +59,7 @@ protected override void Initialize()
 
             var umbracoSettings = Factory.GetInstance<IUmbracoSettingsSection>();
             var globalSettings = Factory.GetInstance<IGlobalSettings>();
+            var umbracoContextAccessor = Factory.GetInstance<IUmbracoContextAccessor>();
 
             _xml = new XmlDocument();
             _xml.LoadXml(GetXml());
@@ -66,9 +67,9 @@ protected override void Initialize()
             var appCache = new DictionaryAppCache();
             var domainCache = new DomainCache(ServiceContext.DomainService, DefaultCultureAccessor);
             var publishedShapshot = new Umbraco.Web.PublishedCache.XmlPublishedCache.PublishedSnapshot(
-                new PublishedContentCache(xmlStore, domainCache, appCache, globalSettings, new SiteDomainHelper(), ContentTypesCache, null, null),
-                new PublishedMediaCache(xmlStore, ServiceContext.MediaService, ServiceContext.UserService, appCache, ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>()),
-                new PublishedMemberCache(null, appCache, Current.Services.MemberService, ContentTypesCache),
+                new PublishedContentCache(xmlStore, domainCache, appCache, globalSettings, new SiteDomainHelper(), umbracoContextAccessor, ContentTypesCache, null, null),
+                new PublishedMediaCache(xmlStore, ServiceContext.MediaService, ServiceContext.UserService, appCache, ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>(), umbracoContextAccessor),
+                new PublishedMemberCache(null, appCache, Current.Services.MemberService, ContentTypesCache, umbracoContextAccessor),
                 domainCache);
             var publishedSnapshotService = new Mock<IPublishedSnapshotService>();
             publishedSnapshotService.Setup(x => x.CreatePublishedSnapshot(It.IsAny<string>())).Returns(publishedShapshot);
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
index bd4f1610cd6f..07a6a6ee8212 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
@@ -17,6 +17,7 @@
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 using Umbraco.Tests.PublishedContent;
+using Umbraco.Web;
 
 namespace Umbraco.Tests.Cache.PublishedCache
 {
@@ -26,6 +27,7 @@ public class PublishMediaCacheTests : BaseWebTest
     {
         private Dictionary<string, PublishedContentType> _mediaTypes;
 
+        private IUmbracoContextAccessor _umbracoContextAccessor;
         protected override void Compose()
         {
             base.Compose();
@@ -33,6 +35,8 @@ protected override void Compose()
             Composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>()
                 .Clear()
                 .Append<DefaultUrlSegmentProvider>();
+
+            _umbracoContextAccessor = Current.UmbracoContextAccessor;
         }
 
         protected override void Initialize()
@@ -75,7 +79,7 @@ public void Get_Root_Docs()
             var mChild2 = MakeNewMedia("Child2", mType, user, mRoot2.Id);
 
             var ctx = GetUmbracoContext("/test");
-            var cache = new PublishedMediaCache(new XmlStore((XmlDocument) null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>());
+            var cache = new PublishedMediaCache(new XmlStore((XmlDocument) null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>(), Factory.GetInstance<IUmbracoContextAccessor>());
             var roots = cache.GetAtRoot();
             Assert.AreEqual(2, roots.Count());
             Assert.IsTrue(roots.Select(x => x.Id).ContainsAll(new[] {mRoot1.Id, mRoot2.Id}));
@@ -93,7 +97,7 @@ public void Get_Item_Without_Examine()
 
             //var publishedMedia = PublishedMediaTests.GetNode(mRoot.Id, GetUmbracoContext("/test", 1234));
             var umbracoContext = GetUmbracoContext("/test");
-            var cache = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), Current.Services.MediaService, Current.Services.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>());
+            var cache = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), Current.Services.MediaService, Current.Services.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>(), Factory.GetInstance<IUmbracoContextAccessor>());
             var publishedMedia = cache.GetById(mRoot.Id);
             Assert.IsNotNull(publishedMedia);
 
@@ -204,7 +208,7 @@ public void Convert_From_Search_Result()
 
             var result = new SearchResult("1234", 1, () => fields.ToDictionary(x => x.Key, x => new List<string> { x.Value }));
 
-            var store = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>());
+            var store = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>(), Factory.GetInstance<IUmbracoContextAccessor>());
             var doc = store.CreateFromCacheValues(store.ConvertFromSearchResult(result));
 
             DoAssert(doc, 1234, key, null, 0, "/media/test.jpg", "Image", 23, "Shannon", "Shannon", 0, 0, "-1,1234", DateTime.Parse("2012-07-17T10:34:09"), DateTime.Parse("2012-07-16T10:34:09"), 2);
@@ -220,7 +224,7 @@ public void Convert_From_XPath_Navigator()
             var xmlDoc = GetMediaXml();
             ((XmlElement)xmlDoc.DocumentElement.FirstChild).SetAttribute("key", key.ToString());
             var navigator = xmlDoc.SelectSingleNode("/root/Image").CreateNavigator();
-            var cache = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>());
+            var cache = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>(), Factory.GetInstance<IUmbracoContextAccessor>());
             var doc = cache.CreateFromCacheValues(cache.ConvertFromXPathNavigator(navigator, true));
 
             DoAssert(doc, 2000, key, null, 2, "image1", "Image", 23, "Shannon", "Shannon", 33, 33, "-1,2000", DateTime.Parse("2012-06-12T14:13:17"), DateTime.Parse("2012-07-20T18:50:43"), 1);
@@ -319,7 +323,8 @@ private DictionaryPublishedContent GetDictionaryDocument(
                 // no xpath
                 null,
                 // not from examine
-                false),
+                false,
+                _umbracoContextAccessor),
             //callback to get the children
             (dd, n) => children,
             // callback to get a property
@@ -329,7 +334,8 @@ private DictionaryPublishedContent GetDictionaryDocument(
             // no xpath
             null,
             // not from examine
-            false);
+            false,
+            _umbracoContextAccessor);
             return dicDoc;
         }
 
diff --git a/src/Umbraco.Tests/Published/NestedContentTests.cs b/src/Umbraco.Tests/Published/NestedContentTests.cs
index b5d6182c2888..375fb5ee0f8c 100644
--- a/src/Umbraco.Tests/Published/NestedContentTests.cs
+++ b/src/Umbraco.Tests/Published/NestedContentTests.cs
@@ -161,7 +161,7 @@ public void SingleNestedTest()
                 new TestPublishedProperty(contentType1.GetPropertyType("property1"), $@"[
                     {{ ""key"": ""{keyA}"", ""propertyN1"": ""foo"", ""ncContentTypeAlias"": ""contentN1"" }}
                 ]")
-            });
+            }, Mock.Of<IUmbracoContextAccessor>());
             var value = content.Value("property1");
 
             // nested single converter returns proper TestModel value
@@ -189,7 +189,8 @@ public void ManyNestedTest()
                     {{ ""key"": ""{keyA}"", ""propertyN1"": ""foo"", ""ncContentTypeAlias"": ""contentN1"" }},
                     {{ ""key"": ""{keyB}"", ""propertyN1"": ""bar"", ""ncContentTypeAlias"": ""contentN1"" }}
                 ]")
-            });
+            },
+                Mock.Of<IUmbracoContextAccessor>());
             var value = content.Value("property2");
 
             // nested many converter returns proper IEnumerable<TestModel> value
@@ -249,7 +250,7 @@ internal void SetOwner(IPublishedElement owner)
 
         class TestPublishedContent : PublishedContentBase
         {
-            public TestPublishedContent(PublishedContentType contentType, Guid key, IEnumerable<TestPublishedProperty> properties)
+            public TestPublishedContent(PublishedContentType contentType, Guid key, IEnumerable<TestPublishedProperty> properties, IUmbracoContextAccessor umbracoContextAccessor): base(umbracoContextAccessor)
             {
                 ContentType = contentType;
                 Key = key;
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index ef37a822c1ac..9130161d3a92 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -144,6 +144,7 @@ public void StandaloneVariations()
                 null,
                 new TestPublishedSnapshotAccessor(),
                 variationAccessor,
+                Mock.Of<IUmbracoContextAccessor>(),
                 Mock.Of<ILogger>(),
                 scopeProvider,
                 Mock.Of<IDocumentRepository>(),
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index dfb51e83fb0e..bc1d8c2b70d8 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -69,7 +69,7 @@ internal IPublishedContent GetNode(int id, UmbracoContext umbracoContext)
         {
             var cache = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null),
                 ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache,
-                Factory.GetInstance<IEntityXmlSerializer>());
+                Factory.GetInstance<IEntityXmlSerializer>(), Factory.GetInstance<IUmbracoContextAccessor>());
             var doc = cache.GetById(id);
             Assert.IsNotNull(doc);
             return doc;
@@ -482,7 +482,7 @@ public void Convert_From_Standard_Xml()
             </Image>");
             var node = xml.DescendantsAndSelf("Image").Single(x => (int)x.Attribute("id") == nodeId);
 
-            var publishedMedia = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>());
+            var publishedMedia = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>(), Factory.GetInstance<IUmbracoContextAccessor>());
 
             var nav = node.CreateNavigator();
 
@@ -502,7 +502,7 @@ public void Detects_Error_In_Xml()
             var errorXml = new XElement("error", string.Format("No media is maching '{0}'", 1234));
             var nav = errorXml.CreateNavigator();
 
-            var publishedMedia = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>());
+            var publishedMedia = new PublishedMediaCache(new XmlStore((XmlDocument)null, null, null, null), ServiceContext.MediaService, ServiceContext.UserService, new DictionaryAppCache(), ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>(), Factory.GetInstance<IUmbracoContextAccessor>());
             var converted = publishedMedia.ConvertFromXPathNodeIterator(nav.Select("/"), 1234);
 
             Assert.IsNull(converted);
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index e8f3463ca7f7..eb545fdb4faa 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -90,6 +90,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
                 null,
                 publishedSnapshotAccessor,
                 Mock.Of<IVariationContextAccessor>(),
+                Mock.Of<IUmbracoContextAccessor>(),
                 Logger,
                 ScopeProvider,
                 documentRepository, mediaRepository, memberRepository,
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index d0c0b93b48c3..3d9a36ca80ed 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -17,6 +17,7 @@
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 using Umbraco.Tests.Testing;
+using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.PublishedCache.NuCache;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
@@ -62,6 +63,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
                 null,
                 publishedSnapshotAccessor,
                 Mock.Of<IVariationContextAccessor>(),
+                Mock.Of<IUmbracoContextAccessor>(),
                 Logger,
                 ScopeProvider,
                 documentRepository, mediaRepository, memberRepository,
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 2deb30bbdd56..b312bc160705 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -264,6 +264,7 @@ protected virtual IPublishedSnapshotService CreatePublishedSnapshotService()
                 Factory.GetInstance<IPublishedContentTypeFactory>(),
                 ScopeProvider,
                 cache, publishedSnapshotAccessor, variationContextAccessor,
+                Factory.GetInstance<IUmbracoContextAccessor>(),
                 Factory.GetInstance<IDocumentRepository>(), Factory.GetInstance<IMediaRepository>(), Factory.GetInstance<IMemberRepository>(),
                 DefaultCultureAccessor,
                 Logger,
diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
index 133cbb2ee79d..fee18cb3822e 100644
--- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
@@ -419,13 +419,15 @@ protected UmbracoContext GetUmbracoContext(ILogger logger, IUmbracoSettingsSecti
             //var provider = new ScopeUnitOfWorkProvider(databaseFactory, new RepositoryFactory(Mock.Of<IServiceContainer>()));
             var scopeProvider = TestObjects.GetScopeProvider(Mock.Of<ILogger>());
             var factory = Mock.Of<IPublishedContentTypeFactory>();
-            _service = new PublishedSnapshotService(svcCtx, factory, scopeProvider, cache, 
+            var umbracoContextAccessor = Mock.Of<IUmbracoContextAccessor>();
+            _service = new PublishedSnapshotService(svcCtx, factory, scopeProvider, cache,
                 null, null,
-                null, null, null,
+                umbracoContextAccessor, null, null, null,
                 new TestDefaultCultureAccessor(),
                 Current.Logger, TestObjects.GetGlobalSettings(), new SiteDomainHelper(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
-                null, true, false); // no events
+                null, true, false
+                ); // no events
 
             var http = GetHttpContextFactory(url, routeData).HttpContext;
 
diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index c772f6ca85a8..d165209f0d3f 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -15,7 +15,12 @@ namespace Umbraco.Web.Models
     [DebuggerDisplay("Content Id: {Id}, Name: {Name}")]
     public abstract class PublishedContentBase : IPublishedContent
     {
-        private string _url; // fixme/task - cannot cache urls, they depends on the current request
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+
+        protected PublishedContentBase(IUmbracoContextAccessor umbracoContextAccessor)
+        {
+            _umbracoContextAccessor = umbracoContextAccessor;
+        }
 
         #region ContentType
 
@@ -81,24 +86,21 @@ public abstract class PublishedContentBase : IPublishedContent
         /// </remarks>
         public virtual string GetUrl(string culture = null) // todo - consider .GetCulture("fr-FR").Url
         {
+            var umbracoContext = _umbracoContextAccessor.UmbracoContext;
                 switch (ItemType)
                 {
                     case PublishedItemType.Content:
-                        // todo - consider injecting an umbraco context accessor
-                        if (UmbracoContext.Current == null)
-                            throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext.Current is null.");
-                        if (UmbracoContext.Current.UrlProvider == null)
-                            throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext.Current.UrlProvider is null.");
-                        return UmbracoContext.Current.UrlProvider.GetUrl(this, culture);
+                        if (umbracoContext == null)
+                            throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext is null.");
+                        if (umbracoContext.UrlProvider == null)
+                            throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext.UrlProvider is null.");
+                        return umbracoContext.UrlProvider.GetUrl(this, culture);
 
                     case PublishedItemType.Media:
-                        if (_url != null) return _url; // assume it will not depend on current uri/culture
-
                         var prop = GetProperty(Constants.Conventions.Media.File);
                         if (prop?.GetValue() == null)
                         {
-                            _url = string.Empty;
-                            return _url;
+                            return string.Empty;
                         }
 
                         var propType = ContentType.GetPropertyType(Constants.Conventions.Media.File);
@@ -110,7 +112,7 @@ public virtual string GetUrl(string culture = null) // todo - consider .GetCultu
                         switch (propType.EditorAlias)
                         {
                             case Constants.PropertyEditors.Aliases.UploadField:
-                                _url = prop.GetValue().ToString();
+                                return prop.GetValue().ToString();
                                 break;
                             case Constants.PropertyEditors.Aliases.ImageCropper:
                                 //get the url from the json format
@@ -118,14 +120,12 @@ public virtual string GetUrl(string culture = null) // todo - consider .GetCultu
                                 var stronglyTyped = prop.GetValue() as ImageCropperValue;
                                 if (stronglyTyped != null)
                                 {
-                                    _url = stronglyTyped.Src;
-                                    break;
+                                    return stronglyTyped.Src;
                                 }
-                                _url = prop.GetValue()?.ToString();
-                                break;
+                                return prop.GetValue()?.ToString();
                         }
 
-                        return _url;
+                        return string.Empty;
 
                     default:
                         throw new NotSupportedException();
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index 647adaad916c..d6e72b03d5b1 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -34,10 +34,11 @@ public ContentNode(int id, Guid uid, PublishedContentType contentType,
             DateTime createDate, int creatorId,
             ContentData draftData, ContentData publishedData,
             IPublishedSnapshotAccessor publishedSnapshotAccessor,
-            IVariationContextAccessor variationContextAccessor)
+            IVariationContextAccessor variationContextAccessor,
+            IUmbracoContextAccessor umbracoContextAccessor)
             : this(id, uid, level, path, sortOrder, parentContentId, createDate, creatorId)
         {
-            SetContentTypeAndData(contentType, draftData, publishedData, publishedSnapshotAccessor, variationContextAccessor);
+            SetContentTypeAndData(contentType, draftData, publishedData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor);
         }
 
         // 2-phases ctor, phase 1
@@ -59,7 +60,7 @@ public ContentNode(int id, Guid uid,
         }
 
         // two-phase ctor, phase 2
-        public void SetContentTypeAndData(PublishedContentType contentType, ContentData draftData, ContentData publishedData, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor)
+        public void SetContentTypeAndData(PublishedContentType contentType, ContentData draftData, ContentData publishedData, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, IUmbracoContextAccessor umbracoContextAccessor)
         {
             ContentType = contentType;
 
@@ -67,13 +68,13 @@ public void SetContentTypeAndData(PublishedContentType contentType, ContentData
                 throw new ArgumentException("Both draftData and publishedData cannot be null at the same time.");
 
             if (draftData != null)
-                Draft = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+                Draft = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor).CreateModel();
             if (publishedData != null)
-                Published = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+                Published = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor).CreateModel();
         }
 
         // clone parent
-        private ContentNode(ContentNode origin)
+        private ContentNode(ContentNode origin, IUmbracoContextAccessor umbracoContextAccessor)
         {
             // everything is the same, except for the child items
             // list which is a clone of the original list
@@ -91,14 +92,14 @@ private ContentNode(ContentNode origin)
             var originDraft = origin.Draft == null ? null : PublishedContent.UnwrapIPublishedContent(origin.Draft);
             var originPublished = origin.Published == null ? null : PublishedContent.UnwrapIPublishedContent(origin.Published);
 
-            Draft = originDraft == null ? null : new PublishedContent(this, originDraft).CreateModel();
-            Published = originPublished == null ? null : new PublishedContent(this, originPublished).CreateModel();
+            Draft = originDraft == null ? null : new PublishedContent(this, originDraft, umbracoContextAccessor).CreateModel();
+            Published = originPublished == null ? null : new PublishedContent(this, originPublished, umbracoContextAccessor).CreateModel();
 
             ChildContentIds = new List<int>(origin.ChildContentIds); // needs to be *another* list
         }
 
         // clone with new content type
-        public ContentNode(ContentNode origin, PublishedContentType contentType, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor)
+        public ContentNode(ContentNode origin, PublishedContentType contentType, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, IUmbracoContextAccessor umbracoContextAccessor)
         {
             Id = origin.Id;
             Uid = origin.Uid;
@@ -113,8 +114,8 @@ public ContentNode(ContentNode origin, PublishedContentType contentType, IPublis
             var originDraft = origin.Draft == null ? null : PublishedContent.UnwrapIPublishedContent(origin.Draft);
             var originPublished = origin.Published == null ? null : PublishedContent.UnwrapIPublishedContent(origin.Published);
 
-            Draft = originDraft == null ? null : new PublishedContent(this, originDraft._contentData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
-            Published = originPublished == null ? null : new PublishedContent(this, originPublished._contentData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+            Draft = originDraft == null ? null : new PublishedContent(this, originDraft._contentData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor).CreateModel();
+            Published = originPublished == null ? null : new PublishedContent(this, originPublished._contentData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor).CreateModel();
 
             ChildContentIds = origin.ChildContentIds; // can be the *same* list
         }
@@ -137,9 +138,11 @@ public ContentNode(ContentNode origin, PublishedContentType contentType, IPublis
         public IPublishedContent Draft;
         public IPublishedContent Published;
 
-        public ContentNode CloneParent(IPublishedSnapshotAccessor publishedSnapshotAccessor)
+        public ContentNode CloneParent(
+            IPublishedSnapshotAccessor publishedSnapshotAccessor,
+            IUmbracoContextAccessor umbracoContextAccessor)
         {
-            return new ContentNode(this);
+            return new ContentNode(this, umbracoContextAccessor);
         }
 
         public ContentNodeKit ToKit()
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNodeKit.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNodeKit.cs
index 5a47b9938275..739a6141be67 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNodeKit.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNodeKit.cs
@@ -17,9 +17,14 @@ internal struct ContentNodeKit
 
         public static ContentNodeKit Null { get; } = new ContentNodeKit { ContentTypeId = -1 };
 
-        public void Build(PublishedContentType contentType, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, bool canBePublished)
+        public void Build(
+            PublishedContentType contentType,
+            IPublishedSnapshotAccessor publishedSnapshotAccessor,
+            IVariationContextAccessor variationContextAccessor,
+            bool canBePublished,
+            IUmbracoContextAccessor umbracoContextAccessor)
         {
-            Node.SetContentTypeAndData(contentType, DraftData, canBePublished ? PublishedData : null, publishedSnapshotAccessor, variationContextAccessor);
+            Node.SetContentTypeAndData(contentType, DraftData, canBePublished ? PublishedData : null, publishedSnapshotAccessor, variationContextAccessor,umbracoContextAccessor);
         }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 0cf2c231b500..aaf1ce29a3ac 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -20,6 +20,7 @@ internal class ContentStore
 
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
         private readonly IVariationContextAccessor _variationContextAccessor;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly ConcurrentDictionary<int, LinkedNode<ContentNode>> _contentNodes;
         private readonly ConcurrentDictionary<int, LinkedNode<object>> _contentRootNodes;
         private readonly ConcurrentDictionary<int, LinkedNode<PublishedContentType>> _contentTypesById;
@@ -44,10 +45,16 @@ internal class ContentStore
 
         #region Ctor
 
-        public ContentStore(IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, ILogger logger, BPlusTree<int, ContentNodeKit> localDb = null)
+        public ContentStore(
+            IPublishedSnapshotAccessor publishedSnapshotAccessor,
+            IVariationContextAccessor variationContextAccessor,
+            IUmbracoContextAccessor umbracoContextAccessor,
+            ILogger logger,
+            BPlusTree<int, ContentNodeKit> localDb = null)
         {
             _publishedSnapshotAccessor = publishedSnapshotAccessor;
             _variationContextAccessor = variationContextAccessor;
+            _umbracoContextAccessor = umbracoContextAccessor;
             _logger = logger;
             _localDb = localDb;
 
@@ -279,7 +286,7 @@ public void UpdateContentTypes(IEnumerable<PublishedContentType> types)
                     if (node == null) continue;
                     var contentTypeId = node.ContentType.Id;
                     if (index.TryGetValue(contentTypeId, out PublishedContentType contentType) == false) continue;
-                    SetValueLocked(_contentNodes, node.Id, new ContentNode(node, contentType, _publishedSnapshotAccessor, _variationContextAccessor));
+                    SetValueLocked(_contentNodes, node.Id, new ContentNode(node, contentType, _publishedSnapshotAccessor, _variationContextAccessor, _umbracoContextAccessor));
                 }
             }
             finally
@@ -393,7 +400,7 @@ public void UpdateDataTypes(IEnumerable<int> dataTypeIds, Func<int, PublishedCon
                         _contentNodes.TryGetValue(id, out LinkedNode<ContentNode> link);
                         if (link?.Value == null)
                             continue;
-                        var node = new ContentNode(link.Value, contentType, _publishedSnapshotAccessor, _variationContextAccessor);
+                        var node = new ContentNode(link.Value, contentType, _publishedSnapshotAccessor, _variationContextAccessor, _umbracoContextAccessor);
                         SetValueLocked(_contentNodes, id, node);
                         if (_localDb != null) RegisterChange(id, node.ToKit());
                     }
@@ -419,7 +426,7 @@ private bool BuildKit(ContentNodeKit kit)
             var canBePublished = ParentPublishedLocked(kit);
 
             // and use
-            kit.Build(link.Value, _publishedSnapshotAccessor, _variationContextAccessor, canBePublished);
+            kit.Build(link.Value, _publishedSnapshotAccessor, _variationContextAccessor, canBePublished, _umbracoContextAccessor);
 
             return true;
         }
@@ -631,7 +638,7 @@ private void RemoveFromParentLocked(ContentNode content)
                 var link = GetParentLink(content);
                 var parent = link.Value;
                 if (link.Gen < _liveGen)
-                    parent = parent.CloneParent(_publishedSnapshotAccessor);
+                    parent = parent.CloneParent(_publishedSnapshotAccessor, _umbracoContextAccessor);
                 parent.ChildContentIds.Remove(content.Id);
                 if (link.Gen < _liveGen)
                     SetValueLocked(_contentNodes, parent.Id, parent);
@@ -670,7 +677,7 @@ private void AddToParentLocked(ContentNode content)
                 var link = GetParentLink(content);
                 var parent = link.Value;
                 if (link.Gen < _liveGen)
-                    parent = parent.CloneParent(_publishedSnapshotAccessor);
+                    parent = parent.CloneParent(_publishedSnapshotAccessor, _umbracoContextAccessor);
                 parent.ChildContentIds.Add(content.Id);
                 if (link.Gen < _liveGen)
                     SetValueLocked(_contentNodes, parent.Id, parent);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs
index ecf099f90b2d..f7ffe731094c 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs
@@ -17,18 +17,22 @@ namespace Umbraco.Web.PublishedCache.NuCache
     internal class MemberCache : IPublishedMemberCache, INavigableData
     {
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+
         public readonly IVariationContextAccessor VariationContextAccessor;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IEntityXmlSerializer _entitySerializer;
         private readonly IAppCache _snapshotCache;
         private readonly IMemberService _memberService;
         private readonly PublishedContentTypeCache _contentTypeCache;
         private readonly bool _previewDefault;
 
-        public MemberCache(bool previewDefault, IAppCache snapshotCache, IMemberService memberService, PublishedContentTypeCache contentTypeCache, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, IEntityXmlSerializer entitySerializer)
+        public MemberCache(bool previewDefault, IAppCache snapshotCache, IMemberService memberService, PublishedContentTypeCache contentTypeCache,
+            IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, IUmbracoContextAccessor umbracoContextAccessor, IEntityXmlSerializer entitySerializer)
         {
             _snapshotCache = snapshotCache;
             _publishedSnapshotAccessor = publishedSnapshotAccessor;
             VariationContextAccessor = variationContextAccessor;
+            _umbracoContextAccessor = umbracoContextAccessor;
             _entitySerializer = entitySerializer;
             _memberService = memberService;
             _previewDefault = previewDefault;
@@ -64,14 +68,14 @@ public IPublishedContent GetById(bool preview, int memberId)
                     var member = _memberService.GetById(memberId);
                     return member == null
                         ? null
-                        : PublishedMember.Create(member, GetContentType(member.ContentTypeId), _previewDefault, _publishedSnapshotAccessor, VariationContextAccessor);
+                        : PublishedMember.Create(member, GetContentType(member.ContentTypeId), _previewDefault, _publishedSnapshotAccessor, VariationContextAccessor, _umbracoContextAccessor);
                 });
         }
 
         private IPublishedContent /*IPublishedMember*/ GetById(IMember member, bool previewing)
         {
             return GetCacheItem(CacheKeys.MemberCacheMember("ById", _previewDefault, member.Id), () =>
-                PublishedMember.Create(member, GetContentType(member.ContentTypeId), previewing, _publishedSnapshotAccessor, VariationContextAccessor));
+                PublishedMember.Create(member, GetContentType(member.ContentTypeId), previewing, _publishedSnapshotAccessor, VariationContextAccessor, _umbracoContextAccessor));
         }
 
         public IPublishedContent /*IPublishedMember*/ GetByProviderKey(object key)
@@ -106,7 +110,7 @@ public IPublishedContent GetById(bool preview, int memberId)
 
         public IPublishedContent /*IPublishedMember*/ GetByMember(IMember member)
         {
-            return PublishedMember.Create(member, GetContentType(member.ContentTypeId), _previewDefault, _publishedSnapshotAccessor, VariationContextAccessor);
+            return PublishedMember.Create(member, GetContentType(member.ContentTypeId), _previewDefault, _publishedSnapshotAccessor, VariationContextAccessor, _umbracoContextAccessor);
         }
 
         public IEnumerable<IPublishedContent> GetAtRoot(bool preview)
@@ -114,7 +118,7 @@ public IEnumerable<IPublishedContent> GetAtRoot(bool preview)
             // because members are flat (not a tree) everything is at root
             // because we're loading everything... let's just not cache?
             var members = _memberService.GetAllMembers();
-            return members.Select(m => PublishedMember.Create(m, GetContentType(m.ContentTypeId), preview, _publishedSnapshotAccessor, VariationContextAccessor));
+            return members.Select(m => PublishedMember.Create(m, GetContentType(m.ContentTypeId), preview, _publishedSnapshotAccessor, VariationContextAccessor, _umbracoContextAccessor));
         }
 
         public XPathNavigator CreateNavigator()
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index d1e1d6363030..5228c3f876ae 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -14,6 +14,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
     internal class PublishedContent : PublishedContentBase
     {
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly ContentNode _contentNode;
         // ReSharper disable once InconsistentNaming
         internal readonly ContentData _contentData; // internal for ContentNode cloning
@@ -22,11 +23,17 @@ internal class PublishedContent : PublishedContentBase
 
         #region Constructors
 
-        public PublishedContent(ContentNode contentNode, ContentData contentData, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor)
+        public PublishedContent(
+            ContentNode contentNode,
+            ContentData contentData,
+            IPublishedSnapshotAccessor publishedSnapshotAccessor,
+            IVariationContextAccessor variationContextAccessor,
+            IUmbracoContextAccessor umbracoContextAccessor) :base(umbracoContextAccessor)
         {
             _contentNode = contentNode;
             _contentData = contentData;
             _publishedSnapshotAccessor = publishedSnapshotAccessor;
+            _umbracoContextAccessor = umbracoContextAccessor;
             VariationContextAccessor = variationContextAccessor;
 
             _urlSegment = _contentData.Name.ToUrlSegment();
@@ -66,7 +73,10 @@ private static string GetProfileNameByIdNoCache(int id)
         }
 
         // (see ContentNode.CloneParent)
-        public PublishedContent(ContentNode contentNode, PublishedContent origin)
+        public PublishedContent(
+            ContentNode contentNode,
+            PublishedContent origin,
+            IUmbracoContextAccessor umbracoContextAccessor) :base(umbracoContextAccessor)
         {
             _contentNode = contentNode;
             _publishedSnapshotAccessor = origin._publishedSnapshotAccessor;
@@ -83,7 +93,9 @@ public PublishedContent(ContentNode contentNode, PublishedContent origin)
         }
 
         // clone for previewing as draft a published content that is published and has no draft
-        private PublishedContent(PublishedContent origin)
+        private PublishedContent(
+            PublishedContent origin,
+            IUmbracoContextAccessor umbracoContextAccessor) :base(umbracoContextAccessor)
         {
             _publishedSnapshotAccessor = origin._publishedSnapshotAccessor;
             VariationContextAccessor = origin.VariationContextAccessor;
@@ -433,8 +445,8 @@ internal IPublishedContent AsDraft()
                 return this;
 
             var cache = GetAppropriateCache();
-            if (cache == null) return new PublishedContent(this).CreateModel();
-            return (IPublishedContent)cache.Get(AsPreviewingCacheKey, () => new PublishedContent(this).CreateModel());
+            if (cache == null) return new PublishedContent(this, _umbracoContextAccessor).CreateModel();
+            return (IPublishedContent)cache.Get(AsPreviewingCacheKey, () => new PublishedContent(this, _umbracoContextAccessor).CreateModel());
         }
 
         // used by Navigable.Source,...
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedMember.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedMember.cs
index 47c8d738f1e5..db50fc3fe64b 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedMember.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedMember.cs
@@ -15,13 +15,26 @@ internal class PublishedMember : PublishedContent //, IPublishedMember
     {
         private readonly IMember _member;
 
-        private PublishedMember(IMember member, ContentNode contentNode, ContentData contentData, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor)
-            : base(contentNode, contentData, publishedSnapshotAccessor, variationContextAccessor)
+        private PublishedMember(
+            IMember member,
+            ContentNode contentNode,
+            ContentData contentData,
+            IPublishedSnapshotAccessor publishedSnapshotAccessor,
+            IVariationContextAccessor variationContextAccessor,
+            IUmbracoContextAccessor umbracoContextAccessor
+            )
+            : base(contentNode, contentData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor)
         {
             _member = member;
         }
 
-        public static IPublishedContent Create(IMember member, PublishedContentType contentType, bool previewing, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor)
+        public static IPublishedContent Create(
+            IMember member,
+            PublishedContentType contentType,
+            bool previewing,
+            IPublishedSnapshotAccessor publishedSnapshotAccessor,
+            IVariationContextAccessor variationContextAccessor,
+            IUmbracoContextAccessor umbracoContextAccessor)
         {
             var d = new ContentData
             {
@@ -37,7 +50,7 @@ public static IPublishedContent Create(IMember member, PublishedContentType cont
                 member.Level, member.Path, member.SortOrder,
                 member.ParentId,
                 member.CreateDate, member.CreatorId);
-            return new PublishedMember(member, n, d, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+            return new PublishedMember(member, n, d, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor).CreateModel();
         }
 
         private static Dictionary<string, PropertyData[]> GetPropertyValues(PublishedContentType contentType, IMember member)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 8675aefd1a62..34c495ece99b 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -32,6 +32,7 @@ class PublishedSnapshotService : PublishedSnapshotServiceBase
     {
         private readonly ServiceContext _serviceContext;
         private readonly IPublishedContentTypeFactory _publishedContentTypeFactory;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IScopeProvider _scopeProvider;
         private readonly IDataSource _dataSource;
         private readonly ILogger _logger;
@@ -80,7 +81,7 @@ class PublishedSnapshotService : PublishedSnapshotServiceBase
         public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState runtime,
             ServiceContext serviceContext, IPublishedContentTypeFactory publishedContentTypeFactory, IdkMap idkMap,
             IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor,
-            ILogger logger, IScopeProvider scopeProvider,
+            IUmbracoContextAccessor umbracoContextAccessor, ILogger logger, IScopeProvider scopeProvider,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
             IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper,
@@ -92,6 +93,7 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
 
             _serviceContext = serviceContext;
             _publishedContentTypeFactory = publishedContentTypeFactory;
+            _umbracoContextAccessor = umbracoContextAccessor;
             _dataSource = dataSource;
             _logger = logger;
             _scopeProvider = scopeProvider;
@@ -148,13 +150,13 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
                 // stores are created with a db so they can write to it, but they do not read from it,
                 // stores need to be populated, happens in OnResolutionFrozen which uses _localDbExists to
                 // figure out whether it can read the dbs or it should populate them from sql
-                _contentStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger, _localContentDb);
-                _mediaStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger, _localMediaDb);
+                _contentStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, _umbracoContextAccessor, logger, _localContentDb);
+                _mediaStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, _umbracoContextAccessor, logger, _localMediaDb);
             }
             else
             {
-                _contentStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger);
-                _mediaStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger);
+                _contentStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, _umbracoContextAccessor, logger);
+                _mediaStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, _umbracoContextAccessor, logger);
             }
 
             _domainStore = new SnapDictionary<int, Domain>();
@@ -1015,7 +1017,7 @@ public PublishedSnapshot.PublishedSnapshotElements GetElements(bool previewDefau
             {
                 ContentCache = new ContentCache(previewDefault, contentSnap, snapshotCache, elementsCache, domainHelper, _globalSettings, _serviceContext.LocalizationService),
                 MediaCache = new MediaCache(previewDefault, mediaSnap, snapshotCache, elementsCache),
-                MemberCache = new MemberCache(previewDefault, snapshotCache, _serviceContext.MemberService, memberTypeCache, PublishedSnapshotAccessor, VariationContextAccessor, _entitySerializer),
+                MemberCache = new MemberCache(previewDefault, snapshotCache, _serviceContext.MemberService, memberTypeCache, PublishedSnapshotAccessor, VariationContextAccessor, _umbracoContextAccessor, _entitySerializer),
                 DomainCache = domainCache,
                 SnapshotCache = snapshotCache,
                 ElementsCache = elementsCache
diff --git a/src/Umbraco.Web/PublishedCache/PublishedMember.cs b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
index ef95b2846c77..56a0110f4561 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedMember.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
@@ -19,7 +19,11 @@ public sealed class PublishedMember : PublishedContentBase
         private readonly IPublishedProperty[] _properties;
         private readonly PublishedContentType _publishedMemberType;
 
-        public PublishedMember(IMember member, PublishedContentType publishedMemberType)
+        public PublishedMember(
+            IMember member,
+            PublishedContentType publishedMemberType,
+            IUmbracoContextAccessor umbracoContextAccessor)
+            :base(umbracoContextAccessor)
         {
             _member = member ?? throw new ArgumentNullException(nameof(member));
             _membershipUser = member;
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
index 83bd84dab60c..24b3ed6ab5a1 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
@@ -38,7 +38,9 @@ public DictionaryPublishedContent(
             IAppCache appCache,
             PublishedContentTypeCache contentTypeCache,
             XPathNavigator nav,
-            bool fromExamine)
+            bool fromExamine,
+            IUmbracoContextAccessor umbracoContextAccessor)
+            :base(umbracoContextAccessor)
         {
             if (valueDictionary == null) throw new ArgumentNullException(nameof(valueDictionary));
             if (getParent == null) throw new ArgumentNullException(nameof(getParent));
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
index d8c7c41ea1a0..6fd9f1da2ba3 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
@@ -17,6 +17,7 @@ internal class PublishedContentCache : PublishedCacheBase, IPublishedContentCach
     {
         private readonly IAppCache _appCache;
         private readonly IGlobalSettings _globalSettings;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly RoutesCache _routesCache;
         private readonly IDomainCache _domainCache;
         private readonly DomainHelper _domainHelper;
@@ -33,6 +34,7 @@ public PublishedContentCache(
             IAppCache appCache, // an IAppCache that should be at request-level
             IGlobalSettings globalSettings,
             ISiteDomainHelper siteDomainHelper,
+            IUmbracoContextAccessor umbracoContextAccessor,
             PublishedContentTypeCache contentTypeCache, // a PublishedContentType cache
             RoutesCache routesCache, // a RoutesCache
             string previewToken) // a preview token string (or null if not previewing)
@@ -40,6 +42,7 @@ public PublishedContentCache(
         {
             _appCache = appCache;
             _globalSettings = globalSettings;
+            _umbracoContextAccessor = umbracoContextAccessor;
             _routesCache = routesCache; // may be null for unit-testing
             _contentTypeCache = contentTypeCache;
             _domainCache = domainCache;
@@ -315,13 +318,13 @@ static class XPathStrings
 
         private IPublishedContent ConvertToDocument(XmlNode xmlNode, bool isPreviewing)
         {
-            return xmlNode == null ? null : XmlPublishedContent.Get(xmlNode, isPreviewing, _appCache, _contentTypeCache);
+            return xmlNode == null ? null : XmlPublishedContent.Get(xmlNode, isPreviewing, _appCache, _contentTypeCache,_umbracoContextAccessor);
         }
 
         private IEnumerable<IPublishedContent> ConvertToDocuments(XmlNodeList xmlNodes, bool isPreviewing)
         {
             return xmlNodes.Cast<XmlNode>()
-                .Select(xmlNode => XmlPublishedContent.Get(xmlNode, isPreviewing, _appCache, _contentTypeCache));
+                .Select(xmlNode => XmlPublishedContent.Get(xmlNode, isPreviewing, _appCache, _contentTypeCache, _umbracoContextAccessor));
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
index dadf40a33b5a..85a9725f1734 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -41,11 +41,14 @@ internal class PublishedMediaCache : PublishedCacheBase, IPublishedMediaCache
         private readonly XmlStore _xmlStore;
         private readonly PublishedContentTypeCache _contentTypeCache;
         private readonly IEntityXmlSerializer _entitySerializer;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
         // must be specified by the ctor
         private readonly IAppCache _appCache;
 
-        public PublishedMediaCache(XmlStore xmlStore, IMediaService mediaService, IUserService userService, IAppCache appCache, PublishedContentTypeCache contentTypeCache, IEntityXmlSerializer entitySerializer)
+        public PublishedMediaCache(XmlStore xmlStore, IMediaService mediaService, IUserService userService,
+            IAppCache appCache, PublishedContentTypeCache contentTypeCache, IEntityXmlSerializer entitySerializer,
+            IUmbracoContextAccessor umbracoContextAccessor)
             : base(false)
         {
             _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService));
@@ -55,6 +58,7 @@ public PublishedMediaCache(XmlStore xmlStore, IMediaService mediaService, IUserS
             _xmlStore = xmlStore;
             _contentTypeCache = contentTypeCache;
             _entitySerializer = entitySerializer;
+            _umbracoContextAccessor = umbracoContextAccessor;
         }
 
         /// <summary>
@@ -666,7 +670,8 @@ internal IPublishedContent CreateFromCacheValues(CacheValues cacheValues)
                 _appCache,
                 _contentTypeCache,
                 cacheValues.XPath, // though, outside of tests, that should be null
-                cacheValues.FromExamine
+                cacheValues.FromExamine,
+                _umbracoContextAccessor
             );
             return content.CreateModel();
         }
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMemberCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMemberCache.cs
index 816eb3c5452a..db6d85fb2d1d 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMemberCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMemberCache.cs
@@ -16,13 +16,16 @@ class PublishedMemberCache : IPublishedMemberCache
         private readonly IAppCache _requestCache;
         private readonly XmlStore _xmlStore;
         private readonly PublishedContentTypeCache _contentTypeCache;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
-        public PublishedMemberCache(XmlStore xmlStore, IAppCache requestCache, IMemberService memberService, PublishedContentTypeCache contentTypeCache)
+        public PublishedMemberCache(XmlStore xmlStore, IAppCache requestCache, IMemberService memberService,
+            PublishedContentTypeCache contentTypeCache, IUmbracoContextAccessor umbracoContextAccessor)
         {
             _requestCache = requestCache;
             _memberService = memberService;
             _xmlStore = xmlStore;
             _contentTypeCache = contentTypeCache;
+            _umbracoContextAccessor = umbracoContextAccessor;
         }
 
         public IPublishedContent GetByProviderKey(object key)
@@ -39,7 +42,7 @@ public IPublishedContent GetByProviderKey(object key)
                     var result = _memberService.GetByProviderKey(key);
                     if (result == null) return null;
                     var type = _contentTypeCache.Get(PublishedItemType.Member, result.ContentTypeId);
-                    return new PublishedMember(result, type).CreateModel();
+                    return new PublishedMember(result, type, _umbracoContextAccessor).CreateModel();
                 });
         }
 
@@ -57,7 +60,7 @@ public IPublishedContent GetById(int memberId)
                     var result = _memberService.GetById(memberId);
                     if (result == null) return null;
                     var type = _contentTypeCache.Get(PublishedItemType.Member, result.ContentTypeId);
-                    return new PublishedMember(result, type).CreateModel();
+                    return new PublishedMember(result, type, _umbracoContextAccessor).CreateModel();
                 });
         }
 
@@ -75,7 +78,7 @@ public IPublishedContent GetByUsername(string username)
                     var result = _memberService.GetByUsername(username);
                     if (result == null) return null;
                     var type = _contentTypeCache.Get(PublishedItemType.Member, result.ContentTypeId);
-                    return new PublishedMember(result, type).CreateModel();
+                    return new PublishedMember(result, type, _umbracoContextAccessor).CreateModel();
                 });
         }
 
@@ -93,14 +96,14 @@ public IPublishedContent GetByEmail(string email)
                     var result = _memberService.GetByEmail(email);
                     if (result == null) return null;
                     var type = _contentTypeCache.Get(PublishedItemType.Member, result.ContentTypeId);
-                    return new PublishedMember(result, type).CreateModel();
+                    return new PublishedMember(result, type, _umbracoContextAccessor).CreateModel();
                 });
         }
 
         public IPublishedContent GetByMember(IMember member)
         {
             var type = _contentTypeCache.Get(PublishedItemType.Member, member.ContentTypeId);
-            return new PublishedMember(member, type).CreateModel();
+            return new PublishedMember(member, type, _umbracoContextAccessor).CreateModel();
         }
 
         public XPathNavigator CreateNavigator()
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs
index c4ce05c9a969..d96bfd8a0a20 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs
@@ -35,6 +35,7 @@ internal class PublishedSnapshotService : PublishedSnapshotServiceBase
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
         private readonly ISiteDomainHelper _siteDomainHelper;
         private readonly IEntityXmlSerializer _entitySerializer;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
         #region Constructors
 
@@ -44,6 +45,7 @@ public PublishedSnapshotService(ServiceContext serviceContext,
             IScopeProvider scopeProvider,
             IAppCache requestCache,
             IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor,
+            IUmbracoContextAccessor umbracoContextAccessor,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
             ILogger logger,
@@ -52,12 +54,14 @@ public PublishedSnapshotService(ServiceContext serviceContext,
             IEntityXmlSerializer entitySerializer,
             MainDom mainDom,
             bool testing = false, bool enableRepositoryEvents = true)
-            : this(serviceContext, publishedContentTypeFactory, scopeProvider, requestCache, 
-                publishedSnapshotAccessor, variationContextAccessor,
+            : this(serviceContext, publishedContentTypeFactory, scopeProvider, requestCache,
+                publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor,
                 documentRepository, mediaRepository, memberRepository,
                 defaultCultureAccessor,
                 logger, globalSettings, siteDomainHelper, entitySerializer, null, mainDom, testing, enableRepositoryEvents)
-        { }
+        {
+            _umbracoContextAccessor = umbracoContextAccessor;
+        }
 
         // used in some tests
         internal PublishedSnapshotService(ServiceContext serviceContext,
@@ -65,6 +69,7 @@ internal PublishedSnapshotService(ServiceContext serviceContext,
             IScopeProvider scopeProvider,
             IAppCache requestCache,
             IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor,
+            IUmbracoContextAccessor umbracoContextAccessor,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
             ILogger logger,
@@ -92,6 +97,7 @@ internal PublishedSnapshotService(ServiceContext serviceContext,
             _defaultCultureAccessor = defaultCultureAccessor;
 
             _requestCache = requestCache;
+            _umbracoContextAccessor = umbracoContextAccessor;
             _globalSettings = globalSettings;
             _siteDomainHelper = siteDomainHelper;
             _entitySerializer = entitySerializer;
@@ -138,9 +144,9 @@ public override IPublishedSnapshot CreatePublishedSnapshot(string previewToken)
             var domainCache = new DomainCache(_domainService, _defaultCultureAccessor);
 
             return new PublishedSnapshot(
-                new PublishedContentCache(_xmlStore, domainCache, _requestCache, _globalSettings, _siteDomainHelper, _contentTypeCache, _routesCache, previewToken),
-                new PublishedMediaCache(_xmlStore, _mediaService, _userService, _requestCache, _contentTypeCache, _entitySerializer),
-                new PublishedMemberCache(_xmlStore, _requestCache, _memberService, _contentTypeCache),
+                new PublishedContentCache(_xmlStore, domainCache, _requestCache, _globalSettings, _siteDomainHelper,_umbracoContextAccessor, _contentTypeCache, _routesCache, previewToken),
+                new PublishedMediaCache(_xmlStore, _mediaService, _userService, _requestCache, _contentTypeCache, _entitySerializer, _umbracoContextAccessor),
+                new PublishedMemberCache(_xmlStore, _requestCache, _memberService, _contentTypeCache, _umbracoContextAccessor),
                 domainCache);
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
index 2b3bc3945208..00919e6a87f0 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
@@ -20,21 +20,29 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
     [XmlType(Namespace = "http://umbraco.org/webservices/")]
     internal class XmlPublishedContent : PublishedContentBase
     {
-        private XmlPublishedContent(XmlNode xmlNode, bool isPreviewing, IAppCache appCache, PublishedContentTypeCache contentTypeCache)
+        private XmlPublishedContent(
+            XmlNode xmlNode,
+            bool isPreviewing,
+            IAppCache appCache,
+            PublishedContentTypeCache contentTypeCache,
+            IUmbracoContextAccessor umbracoContextAccessor)
+            :base(umbracoContextAccessor)
         {
             _xmlNode = xmlNode;
             _isPreviewing = isPreviewing;
 
             _appCache = appCache;
             _contentTypeCache = contentTypeCache;
+            _umbracoContextAccessor = umbracoContextAccessor;
         }
 
         private readonly XmlNode _xmlNode;
         private readonly bool _isPreviewing;
         private readonly IAppCache _appCache; // at snapshot/request level (see PublishedContentCache)
         private readonly PublishedContentTypeCache _contentTypeCache;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
-	    private readonly object _initializeLock = new object();
+        private readonly object _initializeLock = new object();
 
         private bool _nodeInitialized;
         private bool _parentInitialized;
@@ -252,7 +260,7 @@ private void InitializeParent()
             if (parent == null) return;
 
             if (parent.Attributes?.GetNamedItem("isDoc") != null)
-                _parent = Get(parent, _isPreviewing, _appCache, _contentTypeCache);
+                _parent = Get(parent, _isPreviewing, _appCache, _contentTypeCache, _umbracoContextAccessor);
 
             _parentInitialized = true;
         }
@@ -409,7 +417,7 @@ private void InitializeChildren()
             var iterator = nav.Select(expr);
 
             _children = iterator.Cast<XPathNavigator>()
-                .Select(n => Get(((IHasXmlNode) n).GetNode(), _isPreviewing, _appCache, _contentTypeCache))
+                .Select(n => Get(((IHasXmlNode) n).GetNode(), _isPreviewing, _appCache, _contentTypeCache, _umbracoContextAccessor))
                 .OrderBy(x => x.SortOrder)
                 .ToList();
 
@@ -423,11 +431,13 @@ private void InitializeChildren()
         /// <param name="isPreviewing">A value indicating whether we are previewing or not.</param>
         /// <param name="appCache">A cache.</param>
         /// <param name="contentTypeCache">A content type cache.</param>
+        /// <param name="umbracoContextAccessor">A umbraco context accessor</param>
         /// <returns>The IPublishedContent corresponding to the Xml cache node.</returns>
         /// <remarks>Maintains a per-request cache of IPublishedContent items in order to make
         /// sure that we create only one instance of each for the duration of a request. The
         /// returned IPublishedContent is a model, if models are enabled.</remarks>
-        public static IPublishedContent Get(XmlNode node, bool isPreviewing, IAppCache appCache, PublishedContentTypeCache contentTypeCache)
+        public static IPublishedContent Get(XmlNode node, bool isPreviewing, IAppCache appCache,
+            PublishedContentTypeCache contentTypeCache, IUmbracoContextAccessor umbracoContextAccessor)
         {
             // only 1 per request
 
@@ -435,7 +445,7 @@ public static IPublishedContent Get(XmlNode node, bool isPreviewing, IAppCache a
             var id = attrs?.GetNamedItem("id").Value;
             if (id.IsNullOrWhiteSpace()) throw new InvalidOperationException("Node has no ID attribute.");
             var key = CacheKeyPrefix + id; // dont bother with preview, wont change during request in Xml cache
-            return (IPublishedContent) appCache.Get(key, () => (new XmlPublishedContent(node, isPreviewing, appCache, contentTypeCache)).CreateModel());
+            return (IPublishedContent) appCache.Get(key, () => (new XmlPublishedContent(node, isPreviewing, appCache, contentTypeCache, umbracoContextAccessor)).CreateModel());
         }
 
         public static void ClearRequest()

From d16aa91a5e364f986ba48a1394e145f0d0721cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 23 Jan 2019 15:13:42 +0100
Subject: [PATCH 024/421] remove extra border from MCE-edit-area

---
 src/Umbraco.Web.UI.Client/src/less/rte.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index 4d3a68052319..9aae9840d1b7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -42,7 +42,6 @@
 }
 
 .umb-rte .mce-tinymce .mce-edit-area {
-    border: 1px solid @gray-8 !important;
     border-radius: 0px !important;
 }
 

From f8b9fb039f1538156d6adf041c4fe2fad03fe536 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 23 Jan 2019 15:35:20 +0100
Subject: [PATCH 025/421] Handle culture not set in HasCulture.

---
 src/Umbraco.Web/PublishedContentExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 530c9bd9b438..7b0b7e44a3a4 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -228,7 +228,7 @@ public static T Value<T>(this IPublishedContent content, string alias, string cu
         /// </summary>
         /// <remarks>Culture is case-insensitive.</remarks>
         public static bool HasCulture(this IPublishedContent content, string culture)
-            => content.Cultures.ContainsKey(culture);
+            => content.Cultures.ContainsKey(culture ?? string.Empty);
 
         /// <summary>
         /// Filters a sequence of <see cref="IPublishedContent"/> to return invariant items, and items that are published for the specified culture.

From 69a3c85bbc07ed4697dd484b37433b8fd6940822 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 23 Jan 2019 14:37:33 +0000
Subject: [PATCH 026/421] Refactor of dashboards * Remove dashboards from
 Configs().Dashboards * Remove dashboard.config XML file & associated code
 reading from XML * Load Dashboards from TypeLoader into a CollectionBuilder *
 Load merge/concat C# Dashboard Types with package.manifest * Add
 buildercolletion to an extension method on Composition

---
 src/Umbraco.Core/ConfigsExtensions.cs         |   5 -
 .../Configuration/Dashboard/AccessElement.cs  |  30 ---
 .../Configuration/Dashboard/AreaCollection.cs |  32 ---
 .../Configuration/Dashboard/AreaElement.cs    |  12 -
 .../Configuration/Dashboard/AreasElement.cs   |  15 --
 .../Dashboard/ControlCollection.cs            |  37 ---
 .../Configuration/Dashboard/ControlElement.cs |  44 ----
 .../Dashboard/DashboardSection.cs             |  24 --
 .../Configuration/Dashboard/IAccess.cs        |   9 -
 .../Configuration/Dashboard/IArea.cs          |   7 -
 .../Dashboard/IDashboardControl.cs            |  11 -
 .../Dashboard/IDashboardSection.cs            |   9 -
 .../Configuration/Dashboard/IDashboardTab.cs  |  13 -
 .../Configuration/Dashboard/ISection.cs       |  15 --
 .../Dashboard/SectionCollection.cs            |  37 ---
 .../Configuration/Dashboard/SectionElement.cs |  50 ----
 .../Configuration/Dashboard/TabCollection.cs  |  37 ---
 .../Configuration/Dashboard/TabElement.cs     |  38 ---
 .../Dashboard => Dashboards}/AccessRule.cs    |   2 +-
 .../AccessRuleType.cs                         |   2 +-
 .../Dashboard => Dashboards}/IAccessRule.cs   |   2 +-
 .../Dashboards/IDashboardSection.cs           |  30 +++
 .../Manifest/DashboardAccessRuleConverter.cs  |   2 +-
 .../Manifest/ManifestDashboardDefinition.cs   |   5 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |  24 +-
 .../DashboardSettingsTests.cs                 | 231 +++++++++---------
 .../Manifest/ManifestParserTests.cs           |   2 +-
 src/Umbraco.Web.UI.Client/package-lock.json   |  96 ++++----
 .../src/views/common/dashboard.html           |  13 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |   2 +
 src/Umbraco.Web.UI/config/Dashboard.config    |   1 +
 src/Umbraco.Web/CompositionExtensions.cs      |   8 +
 .../Dashboards/ContentDashboard.cs            |  38 +++
 .../Dashboards/DashboardCollection.cs         |  13 +
 .../Dashboards/DashboardCollectionBuilder.cs  |  24 ++
 .../Dashboards/ExamineDashboard.cs            |  29 +++
 src/Umbraco.Web/Dashboards/FormsDashboard.cs  |  27 ++
 .../Dashboards/HealthCheckDashboard.cs        |  29 +++
 src/Umbraco.Web/Dashboards/MediaDashboard.cs  |  27 ++
 .../Dashboards/MembersDashboard.cs            |  27 ++
 .../Dashboards/ModelsBuilderDashboard.cs      |  29 +++
 .../Dashboards/PublishedStatusDashboard.cs    |  29 +++
 .../Dashboards/RedirectUrlDashboard.cs        |  27 ++
 .../Dashboards/SettingsDashboards.cs          |  27 ++
 .../Editors/DashboardController.cs            |  16 +-
 src/Umbraco.Web/Editors/Dashboards.cs         | 160 ------------
 .../Editors/EditorModelEventManager.cs        |   9 +-
 src/Umbraco.Web/Editors/SectionController.cs  |   8 +-
 .../Models/ContentEditing/DashboardControl.cs |  19 --
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  28 ++-
 .../DashboardService.cs}                      | 107 ++++----
 src/Umbraco.Web/Services/IDashboardService.cs |  27 ++
 src/Umbraco.Web/Umbraco.Web.csproj            |  17 +-
 53 files changed, 698 insertions(+), 864 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/AccessElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/AreaCollection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/AreaElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/AreasElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/ControlCollection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/ControlElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/DashboardSection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/IAccess.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/IArea.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/IDashboardControl.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/IDashboardSection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/IDashboardTab.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/ISection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/SectionCollection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/SectionElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/TabCollection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/Dashboard/TabElement.cs
 rename src/Umbraco.Core/{Configuration/Dashboard => Dashboards}/AccessRule.cs (85%)
 rename src/Umbraco.Core/{Configuration/Dashboard => Dashboards}/AccessRuleType.cs (93%)
 rename src/Umbraco.Core/{Configuration/Dashboard => Dashboards}/IAccessRule.cs (88%)
 create mode 100644 src/Umbraco.Core/Dashboards/IDashboardSection.cs
 create mode 100644 src/Umbraco.Web/Dashboards/ContentDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/DashboardCollection.cs
 create mode 100644 src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
 create mode 100644 src/Umbraco.Web/Dashboards/ExamineDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/FormsDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/MediaDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/MembersDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
 create mode 100644 src/Umbraco.Web/Dashboards/SettingsDashboards.cs
 delete mode 100644 src/Umbraco.Web/Editors/Dashboards.cs
 delete mode 100644 src/Umbraco.Web/Models/ContentEditing/DashboardControl.cs
 rename src/Umbraco.Web/{Editors/DashboardSecurity.cs => Services/DashboardService.cs} (62%)
 create mode 100644 src/Umbraco.Web/Services/IDashboardService.cs

diff --git a/src/Umbraco.Core/ConfigsExtensions.cs b/src/Umbraco.Core/ConfigsExtensions.cs
index 0fcea5f4305c..6fdf7ea3b9e1 100644
--- a/src/Umbraco.Core/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/ConfigsExtensions.cs
@@ -2,7 +2,6 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.Dashboard;
 using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -22,9 +21,6 @@ public static IGlobalSettings Global(this Configs configs)
         public static IUmbracoSettingsSection Settings(this Configs configs)
             => configs.GetConfig<IUmbracoSettingsSection>();
 
-        public static IDashboardSection Dashboards(this Configs configs)
-            => configs.GetConfig<IDashboardSection>();
-
         public static IHealthChecks HealthChecks(this Configs configs)
             => configs.GetConfig<IHealthChecks>();
 
@@ -40,7 +36,6 @@ public static void AddCoreConfigs(this Configs configs)
 
             configs.Add<IGlobalSettings>(() => new GlobalSettings());
             configs.Add<IUmbracoSettingsSection>("umbracoConfiguration/settings");
-            configs.Add<IDashboardSection>("umbracoConfiguration/dashBoard");
             configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
 
             configs.Add(() => new CoreDebug());
diff --git a/src/Umbraco.Core/Configuration/Dashboard/AccessElement.cs b/src/Umbraco.Core/Configuration/Dashboard/AccessElement.cs
deleted file mode 100644
index 01538c8e0bfc..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/AccessElement.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AccessElement : RawXmlConfigurationElement, IAccess
-    {
-        public AccessElement()
-        { }
-
-        public AccessElement(XElement rawXml)
-            : base(rawXml)
-        { }
-
-        public IEnumerable<IAccessRule> Rules
-        {
-            get
-            {
-                var result = new List<AccessRule>();
-                if (RawXml == null) return result;
-
-                result.AddRange(RawXml.Elements("deny").Select(x => new AccessRule {Type = AccessRuleType.Deny, Value = x.Value }));
-                result.AddRange(RawXml.Elements("grant").Select(x => new AccessRule { Type = AccessRuleType.Grant, Value = x.Value }));
-                result.AddRange(RawXml.Elements("grantBySection").Select(x => new AccessRule { Type = AccessRuleType.GrantBySection, Value = x.Value }));
-                return result;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/AreaCollection.cs b/src/Umbraco.Core/Configuration/Dashboard/AreaCollection.cs
deleted file mode 100644
index 31cc3eaec8e4..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/AreaCollection.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AreaCollection : ConfigurationElementCollection, IEnumerable<IArea>
-    {
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new AreaElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((AreaElement) element).Value;
-        }
-
-        IEnumerator<IArea> IEnumerable<IArea>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IArea;
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/AreaElement.cs b/src/Umbraco.Core/Configuration/Dashboard/AreaElement.cs
deleted file mode 100644
index 20393f89d80f..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/AreaElement.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AreaElement : InnerTextConfigurationElement<string>, IArea
-    {
-        string IArea.AreaName
-        {
-            get { return Value; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/AreasElement.cs b/src/Umbraco.Core/Configuration/Dashboard/AreasElement.cs
deleted file mode 100644
index 92e51c9b73d1..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/AreasElement.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AreasElement : ConfigurationElement
-    {
-        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "area")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public AreaCollection AreaCollection
-        {
-            get { return (AreaCollection)base[""]; }
-            set { base[""] = value; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/ControlCollection.cs b/src/Umbraco.Core/Configuration/Dashboard/ControlCollection.cs
deleted file mode 100644
index b8aa40da7fc7..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/ControlCollection.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class ControlCollection : ConfigurationElementCollection, IEnumerable<IDashboardControl>
-    {
-        internal void Add(ControlElement c)
-        {
-            BaseAdd(c);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new ControlElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((ControlElement)element).ControlPath;
-        }
-
-        IEnumerator<IDashboardControl> IEnumerable<IDashboardControl>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IDashboardControl;
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/ControlElement.cs b/src/Umbraco.Core/Configuration/Dashboard/ControlElement.cs
deleted file mode 100644
index 20dac7460ef2..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/ControlElement.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Configuration;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-
-    internal class ControlElement : RawXmlConfigurationElement, IDashboardControl
-    {
-        public string PanelCaption
-        {
-            get
-            {
-                var panelCaption = RawXml.Attribute("panelCaption");
-                return panelCaption == null ? "" : panelCaption.Value;
-            }
-        }
-
-        public AccessElement Access
-        {
-            get
-            {
-                var access = RawXml.Element("access");
-                return access == null ? new AccessElement() : new AccessElement(access);
-            }
-        }
-
-        public string ControlPath
-        {
-            get
-            {
-                //we need to return the first (and only) text element of the children (wtf... who designed this configuration ! :P )
-                var txt = RawXml.Nodes().OfType<XText>().FirstOrDefault();
-                if (txt == null)
-                {
-                    throw new ConfigurationErrorsException("The control element must contain a text node indicating the control path");
-                }
-                return txt.Value.Trim();
-            }
-        }
-
-        IAccess IDashboardControl.AccessRights => Access;
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/DashboardSection.cs b/src/Umbraco.Core/Configuration/Dashboard/DashboardSection.cs
deleted file mode 100644
index 12bf0522e066..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/DashboardSection.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class DashboardSection : ConfigurationSection, IDashboardSection
-    {
-        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "section")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public SectionCollection SectionCollection
-        {
-            get { return (SectionCollection)base[""]; }
-            set { base[""] = value; }
-        }
-
-        IEnumerable<ISection> IDashboardSection.Sections
-        {
-            get { return SectionCollection; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/IAccess.cs b/src/Umbraco.Core/Configuration/Dashboard/IAccess.cs
deleted file mode 100644
index 8ac1b18ccab3..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/IAccess.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IAccess
-    {
-        IEnumerable<IAccessRule> Rules { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/IArea.cs b/src/Umbraco.Core/Configuration/Dashboard/IArea.cs
deleted file mode 100644
index 25401db408f6..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/IArea.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IArea
-    {
-        string AreaName { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/IDashboardControl.cs b/src/Umbraco.Core/Configuration/Dashboard/IDashboardControl.cs
deleted file mode 100644
index cdf05af1ecc2..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/IDashboardControl.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IDashboardControl
-    {
-        string PanelCaption { get; }
-
-        string ControlPath { get; }
-
-        IAccess AccessRights { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/IDashboardSection.cs b/src/Umbraco.Core/Configuration/Dashboard/IDashboardSection.cs
deleted file mode 100644
index 32dfc6653d27..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/IDashboardSection.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IDashboardSection
-    {
-        IEnumerable<ISection> Sections { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/IDashboardTab.cs b/src/Umbraco.Core/Configuration/Dashboard/IDashboardTab.cs
deleted file mode 100644
index 914b22626547..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/IDashboardTab.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface IDashboardTab
-    {
-        string Caption { get; }
-
-        IEnumerable<IDashboardControl> Controls { get; }
-
-        IAccess AccessRights { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/ISection.cs b/src/Umbraco.Core/Configuration/Dashboard/ISection.cs
deleted file mode 100644
index 1005c0750de6..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/ISection.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public interface ISection
-    {
-        string Alias { get; }
-
-        IEnumerable<string> Areas { get; }
-
-        IEnumerable<IDashboardTab> Tabs { get; }
-
-        IAccess AccessRights { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/SectionCollection.cs b/src/Umbraco.Core/Configuration/Dashboard/SectionCollection.cs
deleted file mode 100644
index 5717bd28c36c..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/SectionCollection.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class SectionCollection : ConfigurationElementCollection, IEnumerable<ISection>
-    {
-        internal void Add(SectionElement c)
-        {
-            BaseAdd(c);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new SectionElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((SectionElement)element).Alias;
-        }
-
-        IEnumerator<ISection> IEnumerable<ISection>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as ISection;
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/SectionElement.cs b/src/Umbraco.Core/Configuration/Dashboard/SectionElement.cs
deleted file mode 100644
index 09049c13db71..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/SectionElement.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class SectionElement : ConfigurationElement, ISection
-    {
-        [ConfigurationProperty("alias", IsRequired = true)]
-        public string Alias
-        {
-            get { return (string) this["alias"]; }
-        }
-
-        [ConfigurationProperty("areas", IsRequired = true)]
-        public AreasElement Areas
-        {
-            get { return (AreasElement)this["areas"]; }
-        }
-
-        [ConfigurationProperty("access")]
-        public AccessElement Access
-        {
-            get { return (AccessElement)this["access"]; }
-        }
-
-        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "tab")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public TabCollection TabCollection
-        {
-            get { return (TabCollection)base[""]; }
-            set { base[""] = value; }
-        }
-
-        IEnumerable<IDashboardTab> ISection.Tabs
-        {
-            get { return TabCollection; }
-        }
-
-        IEnumerable<string> ISection.Areas
-        {
-            get { return Areas.AreaCollection.Cast<AreaElement>().Select(x => x.Value); }
-        }
-
-        IAccess ISection.AccessRights
-        {
-            get { return Access; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/TabCollection.cs b/src/Umbraco.Core/Configuration/Dashboard/TabCollection.cs
deleted file mode 100644
index 1b77ffd3fb19..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/TabCollection.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class TabCollection : ConfigurationElementCollection, IEnumerable<IDashboardTab>
-    {
-        internal void Add(TabElement c)
-        {
-            BaseAdd(c);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new TabElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((TabElement)element).Caption;
-        }
-
-        IEnumerator<IDashboardTab> IEnumerable<IDashboardTab>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IDashboardTab;
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/TabElement.cs b/src/Umbraco.Core/Configuration/Dashboard/TabElement.cs
deleted file mode 100644
index b92394596e5c..000000000000
--- a/src/Umbraco.Core/Configuration/Dashboard/TabElement.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class TabElement : ConfigurationElement, IDashboardTab
-    {
-        [ConfigurationProperty("caption", IsRequired = true)]
-        public string Caption
-        {
-            get { return (string)this["caption"]; }
-        }
-
-        [ConfigurationProperty("access")]
-        public AccessElement Access
-        {
-            get { return (AccessElement)this["access"]; }
-        }
-
-        [ConfigurationCollection(typeof(ControlCollection), AddItemName = "control")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        public ControlCollection ControlCollection
-        {
-            get { return (ControlCollection)base[""]; }
-            set { base[""] = value; }
-        }
-
-        IEnumerable<IDashboardControl> IDashboardTab.Controls
-        {
-            get { return ControlCollection; }
-        }
-
-        IAccess IDashboardTab.AccessRights
-        {
-            get { return Access; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Dashboard/AccessRule.cs b/src/Umbraco.Core/Dashboards/AccessRule.cs
similarity index 85%
rename from src/Umbraco.Core/Configuration/Dashboard/AccessRule.cs
rename to src/Umbraco.Core/Dashboards/AccessRule.cs
index fe6840ff6408..70f9da8fa90a 100644
--- a/src/Umbraco.Core/Configuration/Dashboard/AccessRule.cs
+++ b/src/Umbraco.Core/Dashboards/AccessRule.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Configuration.Dashboard
+namespace Umbraco.Core.Dashboards
 {
     /// <summary>
     /// Implements <see cref="IAccessRule"/>.
diff --git a/src/Umbraco.Core/Configuration/Dashboard/AccessRuleType.cs b/src/Umbraco.Core/Dashboards/AccessRuleType.cs
similarity index 93%
rename from src/Umbraco.Core/Configuration/Dashboard/AccessRuleType.cs
rename to src/Umbraco.Core/Dashboards/AccessRuleType.cs
index cb9ce983fe8b..efed361f6ccd 100644
--- a/src/Umbraco.Core/Configuration/Dashboard/AccessRuleType.cs
+++ b/src/Umbraco.Core/Dashboards/AccessRuleType.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Configuration.Dashboard
+namespace Umbraco.Core.Dashboards
 {
     /// <summary>
     /// Defines dashboard access rules type.
diff --git a/src/Umbraco.Core/Configuration/Dashboard/IAccessRule.cs b/src/Umbraco.Core/Dashboards/IAccessRule.cs
similarity index 88%
rename from src/Umbraco.Core/Configuration/Dashboard/IAccessRule.cs
rename to src/Umbraco.Core/Dashboards/IAccessRule.cs
index 8b51b1b73a28..f44a846248fb 100644
--- a/src/Umbraco.Core/Configuration/Dashboard/IAccessRule.cs
+++ b/src/Umbraco.Core/Dashboards/IAccessRule.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Configuration.Dashboard
+namespace Umbraco.Core.Dashboards
 {
     /// <summary>
     /// Represents an access rule.
diff --git a/src/Umbraco.Core/Dashboards/IDashboardSection.cs b/src/Umbraco.Core/Dashboards/IDashboardSection.cs
new file mode 100644
index 000000000000..90d351bcd2f7
--- /dev/null
+++ b/src/Umbraco.Core/Dashboards/IDashboardSection.cs
@@ -0,0 +1,30 @@
+namespace Umbraco.Core.Dashboards
+{
+    public interface IDashboardSection
+    {
+        /// <summary>
+        /// Display name of the dashboard tab
+        /// </summary>
+        string Name { get; }
+
+        /// <summary>
+        /// Alias to refer to this dashboard via code
+        /// </summary>
+        string Alias { get; }
+
+        /// <summary>
+        /// A collection of sections/application aliases that this dashboard will appear on
+        /// </summary>
+        string[] Sections { get; }
+
+        /// <summary>
+        /// The HTML view to load for the dashboard
+        /// </summary>
+        string View { get; }
+
+        /// <summary>
+        /// Dashboards can be shown/hidden based on access rights
+        /// </summary>
+        IAccessRule[] AccessRules { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Manifest/DashboardAccessRuleConverter.cs b/src/Umbraco.Core/Manifest/DashboardAccessRuleConverter.cs
index c627728a3243..67c5a5824e77 100644
--- a/src/Umbraco.Core/Manifest/DashboardAccessRuleConverter.cs
+++ b/src/Umbraco.Core/Manifest/DashboardAccessRuleConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Dashboards;
 using Umbraco.Core.Serialization;
 
 namespace Umbraco.Core.Manifest
diff --git a/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs b/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs
index 83f047b2648f..b2b3fd5dfb7f 100644
--- a/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs
+++ b/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs
@@ -1,12 +1,12 @@
 using System;
 using System.ComponentModel;
 using Newtonsoft.Json;
-using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Dashboards;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Core.Manifest
 {
-    public class ManifestDashboardDefinition
+    public class ManifestDashboardDefinition : IDashboardSection
     {
         private string _view;
 
@@ -32,5 +32,6 @@ public string View
 
         [JsonProperty("access")]
         public IAccessRule[] AccessRules { get; set; } = Array.Empty<IAccessRule>();
+
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 0ff88da2f3a9..993797392f76 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -211,26 +211,6 @@
     <Compile Include="ConfigsExtensions.cs" />
     <Compile Include="Configuration\Configs.cs" />
     <Compile Include="Configuration\CoreDebug.cs" />
-    <Compile Include="Configuration\Dashboard\AccessElement.cs" />
-    <Compile Include="Configuration\Dashboard\AccessRule.cs" />
-    <Compile Include="Configuration\Dashboard\AccessRuleType.cs" />
-    <Compile Include="Configuration\Dashboard\AreaCollection.cs" />
-    <Compile Include="Configuration\Dashboard\AreaElement.cs" />
-    <Compile Include="Configuration\Dashboard\AreasElement.cs" />
-    <Compile Include="Configuration\Dashboard\ControlCollection.cs" />
-    <Compile Include="Configuration\Dashboard\ControlElement.cs" />
-    <Compile Include="Configuration\Dashboard\DashboardSection.cs" />
-    <Compile Include="Configuration\Dashboard\IAccess.cs" />
-    <Compile Include="Configuration\Dashboard\IAccessRule.cs" />
-    <Compile Include="Configuration\Dashboard\IArea.cs" />
-    <Compile Include="Configuration\Dashboard\IDashboardControl.cs" />
-    <Compile Include="Configuration\Dashboard\IDashboardSection.cs" />
-    <Compile Include="Configuration\Dashboard\IDashboardTab.cs" />
-    <Compile Include="Configuration\Dashboard\ISection.cs" />
-    <Compile Include="Configuration\Dashboard\SectionCollection.cs" />
-    <Compile Include="Configuration\Dashboard\SectionElement.cs" />
-    <Compile Include="Configuration\Dashboard\TabCollection.cs" />
-    <Compile Include="Configuration\Dashboard\TabElement.cs" />
     <Compile Include="Configuration\FileSystemProviderElement.cs" />
     <Compile Include="Configuration\FileSystemProviderElementCollection.cs" />
     <Compile Include="Configuration\FileSystemProvidersSection.cs" />
@@ -331,6 +311,10 @@
     <Compile Include="Constants.cs" />
     <Compile Include="Composing\RegisterExtensions.cs" />
     <Compile Include="ContentVariationExtensions.cs" />
+    <Compile Include="Dashboards\AccessRule.cs" />
+    <Compile Include="Dashboards\AccessRuleType.cs" />
+    <Compile Include="Dashboards\IAccessRule.cs" />
+    <Compile Include="Dashboards\IDashboardSection.cs" />
     <Compile Include="DisposableObjectSlim.cs" />
     <Compile Include="Events\ExportedMemberEventArgs.cs" />
     <Compile Include="Events\RolesEventArgs.cs" />
diff --git a/src/Umbraco.Tests/Configurations/DashboardSettings/DashboardSettingsTests.cs b/src/Umbraco.Tests/Configurations/DashboardSettings/DashboardSettingsTests.cs
index 920de683b488..219e6092d20a 100644
--- a/src/Umbraco.Tests/Configurations/DashboardSettings/DashboardSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/DashboardSettings/DashboardSettingsTests.cs
@@ -1,123 +1,124 @@
-using System.Configuration;
+using System;
+using System.Configuration;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
-using Umbraco.Core.Configuration.Dashboard;
-using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Dashboards;
 using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Configurations.DashboardSettings
 {
-    [TestFixture]
-    public class DashboardSettingsTests
-    {
-        [SetUp]
-        public void Init()
-        {
-            var config = new FileInfo(TestHelper.MapPathForTest("~/Configurations/DashboardSettings/web.config"));
-
-            var fileMap = new ExeConfigurationFileMap() { ExeConfigFilename = config.FullName };
-            var configuration = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None);
-
-            SettingsSection = configuration.GetSection("umbracoConfiguration/dashBoard") as DashboardSection;
-
-            Assert.IsNotNull(SettingsSection);
-        }
-
-        protected IDashboardSection SettingsSection { get; private set; }
-
-        [Test]
-        public void Test_Sections()
-        {
-            Assert.AreEqual(5, SettingsSection.Sections.Count());
-
-            Assert.AreEqual("StartupSettingsDashboardSection", SettingsSection.Sections.ElementAt(0).Alias);
-            Assert.AreEqual("StartupDeveloperDashboardSection", SettingsSection.Sections.ElementAt(1).Alias);
-            Assert.AreEqual("StartupMediaDashboardSection", SettingsSection.Sections.ElementAt(2).Alias);
-            Assert.AreEqual("StartupDashboardSection", SettingsSection.Sections.ElementAt(3).Alias);
-            Assert.AreEqual("StartupMemberDashboardSection", SettingsSection.Sections.ElementAt(4).Alias);
-        }
-
-        [Test]
-        public void Test_Section_Area()
-        {
-            Assert.AreEqual("settings", SettingsSection.Sections.ElementAt(0).Areas.First());
-            Assert.AreEqual("developer", SettingsSection.Sections.ElementAt(1).Areas.First());
-            Assert.AreEqual("media", SettingsSection.Sections.ElementAt(2).Areas.First());
-            Assert.AreEqual("content", SettingsSection.Sections.ElementAt(3).Areas.First());
-            Assert.AreEqual("default", SettingsSection.Sections.ElementAt(4).Areas.First());
-            Assert.AreEqual("member", SettingsSection.Sections.ElementAt(4).Areas.Last());
-        }
-
-        [Test]
-        public void Test_Section_Access()
-        {
-
-            Assert.AreEqual(3, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.Count());
-
-            Assert.AreEqual("translator", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(0).Value);
-            Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(0).Type);
-            Assert.AreEqual("hello", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(1).Value);
-            Assert.AreEqual(AccessRuleType.Grant, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(1).Type);
-            Assert.AreEqual("world", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(2).Value);
-            Assert.AreEqual(AccessRuleType.GrantBySection, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(2).Type);
-        }
-
-        [Test]
-        public void Test_Section_Tabs()
-        {
-            //Element 0 Alias "StartupSettingsDashboardSection"
-            Assert.AreEqual(2, SettingsSection.Sections.ElementAt(0).Tabs.Count());
-
-            //Element 1 Alias "StartupDeveloperDashboardSection"
-            Assert.AreEqual(1, SettingsSection.Sections.ElementAt(1).Tabs.Count());
-
-            //Element 2 Alias "StartupMediaDashboardSection"
-            Assert.AreEqual(2, SettingsSection.Sections.ElementAt(2).Tabs.Count());
-
-            //Element 3 Alias "StartupDashboardSection"
-            Assert.AreEqual(3, SettingsSection.Sections.ElementAt(3).Tabs.Count());
-
-            //Element 4 Alias "StartupMemberDashboardSection"
-            Assert.AreEqual(1, SettingsSection.Sections.ElementAt(4).Tabs.Count());
-
-        }
-
-        [Test]
-        public void Test_Tab()
-        {
-            Assert.AreEqual("Get Started", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Caption);
-            Assert.AreEqual(2, SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.Count());
-        }
-
-        [Test]
-        public void Test_Tab_Access()
-        {
-            Assert.AreEqual(1, SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.Count());
-            Assert.AreEqual(AccessRuleType.Grant, SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.ElementAt(0).Type);
-            Assert.AreEqual("admin", SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.ElementAt(0).Value);
-        }
-
-        [Test]
-        public void Test_Control()
-        {
-            Assert.AreEqual("hello", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(0).PanelCaption);
-            Assert.AreEqual("views/dashboard/settings/settingsdashboardintro.html",
-                SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(0).ControlPath);
-
-            Assert.AreEqual("", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(1).PanelCaption);
-            Assert.AreEqual("views/dashboard/settings/settingsdashboardvideos.html",
-                SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(1).ControlPath);
-        }
-
-        [Test]
-        public void Test_Control_Access()
-        {
-            Assert.AreEqual(2, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.Count());
-            Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(0).Type);
-            Assert.AreEqual("editor", SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(0).Value);
-            Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(1).Type);
-            Assert.AreEqual("writer", SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(1).Value);
-        }
-    }
+    //[Obsolete("Dashboard tests not in config/XML", true)]
+    //[TestFixture]
+    //public class DashboardSettingsTests
+    //{
+    //    [SetUp]
+    //    public void Init()
+    //    {
+    //        var config = new FileInfo(TestHelper.MapPathForTest("~/Configurations/DashboardSettings/web.config"));
+
+    //        var fileMap = new ExeConfigurationFileMap() { ExeConfigFilename = config.FullName };
+    //        var configuration = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None);
+
+    //        SettingsSection = configuration.GetSection("umbracoConfiguration/dashBoard") as DashboardSection;
+
+    //        Assert.IsNotNull(SettingsSection);
+    //    }
+
+    //    protected IDashboardSection SettingsSection { get; private set; }
+
+    //    [Test]
+    //    public void Test_Sections()
+    //    {
+    //        Assert.AreEqual(5, SettingsSection.Sections.Count());
+
+    //        Assert.AreEqual("StartupSettingsDashboardSection", SettingsSection.Sections.ElementAt(0).Alias);
+    //        Assert.AreEqual("StartupDeveloperDashboardSection", SettingsSection.Sections.ElementAt(1).Alias);
+    //        Assert.AreEqual("StartupMediaDashboardSection", SettingsSection.Sections.ElementAt(2).Alias);
+    //        Assert.AreEqual("StartupDashboardSection", SettingsSection.Sections.ElementAt(3).Alias);
+    //        Assert.AreEqual("StartupMemberDashboardSection", SettingsSection.Sections.ElementAt(4).Alias);
+    //    }
+
+    //    [Test]
+    //    public void Test_Section_Area()
+    //    {
+    //        Assert.AreEqual("settings", SettingsSection.Sections.ElementAt(0).Areas.First());
+    //        Assert.AreEqual("developer", SettingsSection.Sections.ElementAt(1).Areas.First());
+    //        Assert.AreEqual("media", SettingsSection.Sections.ElementAt(2).Areas.First());
+    //        Assert.AreEqual("content", SettingsSection.Sections.ElementAt(3).Areas.First());
+    //        Assert.AreEqual("default", SettingsSection.Sections.ElementAt(4).Areas.First());
+    //        Assert.AreEqual("member", SettingsSection.Sections.ElementAt(4).Areas.Last());
+    //    }
+
+    //    [Test]
+    //    public void Test_Section_Access()
+    //    {
+
+    //        Assert.AreEqual(3, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.Count());
+
+    //        Assert.AreEqual("translator", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(0).Value);
+    //        Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(0).Type);
+    //        Assert.AreEqual("hello", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(1).Value);
+    //        Assert.AreEqual(AccessRuleType.Grant, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(1).Type);
+    //        Assert.AreEqual("world", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(2).Value);
+    //        Assert.AreEqual(AccessRuleType.GrantBySection, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(2).Type);
+    //    }
+
+    //    [Test]
+    //    public void Test_Section_Tabs()
+    //    {
+    //        //Element 0 Alias "StartupSettingsDashboardSection"
+    //        Assert.AreEqual(2, SettingsSection.Sections.ElementAt(0).Tabs.Count());
+
+    //        //Element 1 Alias "StartupDeveloperDashboardSection"
+    //        Assert.AreEqual(1, SettingsSection.Sections.ElementAt(1).Tabs.Count());
+
+    //        //Element 2 Alias "StartupMediaDashboardSection"
+    //        Assert.AreEqual(2, SettingsSection.Sections.ElementAt(2).Tabs.Count());
+
+    //        //Element 3 Alias "StartupDashboardSection"
+    //        Assert.AreEqual(3, SettingsSection.Sections.ElementAt(3).Tabs.Count());
+
+    //        //Element 4 Alias "StartupMemberDashboardSection"
+    //        Assert.AreEqual(1, SettingsSection.Sections.ElementAt(4).Tabs.Count());
+
+    //    }
+
+    //    [Test]
+    //    public void Test_Tab()
+    //    {
+    //        Assert.AreEqual("Get Started", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Caption);
+    //        Assert.AreEqual(2, SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.Count());
+    //    }
+
+    //    [Test]
+    //    public void Test_Tab_Access()
+    //    {
+    //        Assert.AreEqual(1, SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.Count());
+    //        Assert.AreEqual(AccessRuleType.Grant, SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.ElementAt(0).Type);
+    //        Assert.AreEqual("admin", SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.ElementAt(0).Value);
+    //    }
+
+    //    [Test]
+    //    public void Test_Control()
+    //    {
+    //        Assert.AreEqual("hello", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(0).PanelCaption);
+    //        Assert.AreEqual("views/dashboard/settings/settingsdashboardintro.html",
+    //            SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(0).ControlPath);
+
+    //        Assert.AreEqual("", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(1).PanelCaption);
+    //        Assert.AreEqual("views/dashboard/settings/settingsdashboardvideos.html",
+    //            SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(1).ControlPath);
+    //    }
+
+    //    [Test]
+    //    public void Test_Control_Access()
+    //    {
+    //        Assert.AreEqual(2, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.Count());
+    //        Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(0).Type);
+    //        Assert.AreEqual("editor", SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(0).Value);
+    //        Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(1).Type);
+    //        Assert.AreEqual("writer", SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(1).Value);
+    //    }
+    //}
 }
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index 4e791c016905..a12f90c4eb99 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -7,12 +7,12 @@
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration.Dashboard;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;
 using Umbraco.Core.Services;
+using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Tests.Manifest
 {
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index ed28a93caf03..fe657ae4700e 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -937,7 +937,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -955,7 +955,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1170,7 +1170,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
       "dev": true
     },
     "array-sort": {
@@ -1216,7 +1216,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
       "dev": true
     },
     "asap": {
@@ -1269,7 +1269,7 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
       "dev": true
     },
     "asynckit": {
@@ -2379,7 +2379,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2459,7 +2459,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
     "continuable-cache": {
@@ -2502,7 +2502,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
       "dev": true
     },
     "core-util-is": {
@@ -3425,7 +3425,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3953,7 +3953,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -3989,7 +3989,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4153,7 +4153,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
           "optional": true
         }
@@ -4248,7 +4248,7 @@
     "eslint-scope": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4258,13 +4258,13 @@
     "eslint-utils": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
       "dev": true
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
       "dev": true
     },
     "espree": {
@@ -4287,7 +4287,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4296,7 +4296,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4356,7 +4356,7 @@
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
       "dev": true
     },
     "exec-buffer": {
@@ -4571,7 +4571,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -5891,7 +5891,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6461,7 +6461,7 @@
     "gulp-eslint": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
+      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
       "dev": true,
       "requires": {
         "eslint": "^5.0.1",
@@ -7415,7 +7415,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7566,7 +7566,7 @@
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
         "eventemitter3": "^3.0.0",
@@ -7860,7 +7860,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -8155,7 +8155,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -8164,7 +8164,7 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
     "is-retry-allowed": {
@@ -8212,7 +8212,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8369,7 +8369,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -8496,7 +8496,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -9146,7 +9146,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -9327,7 +9327,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
     "minimatch": {
@@ -12855,7 +12855,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
       "dev": true
     },
     "posix-character-classes": {
@@ -13345,7 +13345,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
       "dev": true
     },
     "qs": {
@@ -13541,7 +13541,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14039,7 +14039,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
     "sax": {
@@ -14226,7 +14226,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true
     },
     "shebang-command": {
@@ -14516,7 +14516,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14796,7 +14796,7 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
+      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
       "dev": true
     },
     "stream-shift": {
@@ -14808,7 +14808,7 @@
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -14835,7 +14835,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -14850,7 +14850,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -14867,7 +14867,7 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
@@ -15409,7 +15409,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15573,7 +15573,7 @@
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -15615,7 +15615,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
       "dev": true
     },
     "unc-path-regex": {
@@ -15777,13 +15777,13 @@
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -16218,7 +16218,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
index 6453963670f8..c3b60e2f0ace 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
@@ -17,16 +17,15 @@
             <div class="umb-dashboard__content">
 
                 <umb-tab-content ng-repeat="tab in dashboard.tabs" ng-if="tab.active" tab="tab" class="row-fluid">
-    
+
                     <div ng-repeat="property in tab.properties">
-    
+
                         <div class="clearfix">
-                            <h3 ng-show="property.caption">{{property.caption}}</h3>
-                            <div ng-include="property.path"></div>
+                            <div ng-include="property.view"></div>
                         </div>
-    
+
                     </div>
-                    
+
                 </umb-tab-content>
 
             </div>
@@ -34,5 +33,5 @@ <h3 ng-show="property.caption">{{property.caption}}</h3>
         </div>
 
     </form>
-    
+
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 0ff158dadb46..c7b6540b3d9b 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -178,6 +178,7 @@
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.htm" />
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
+    <Content Include="App_Plugins\Test\test.html" />
     <Content Include="Config\grid.editors.config.js" />
     <Content Include="Config\Lang\cs-CZ.user.xml" />
     <Content Include="Config\Lang\da-DK.user.xml" />
@@ -205,6 +206,7 @@
     <Content Include="Config\Splashes\noNodes.aspx" />
     <Content Include="Umbraco\Install\Views\Web.config" />
     <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
+    <Content Include="App_Plugins\Test\package.manifest" />
     <None Include="Config\404handlers.Release.config">
       <DependentUpon>404handlers.config</DependentUpon>
     </None>
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index fec6ab34ae3a..94325913df44 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -94,6 +94,7 @@
             </control>
         </tab>
     </section>
+    
     <section alias="RedirectUrlManagement">
         <areas>
             <area>content</area>
diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index 246127b312f8..783c991ab43b 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -10,6 +10,7 @@
 using Umbraco.Web.ContentApps;
 using Umbraco.Web.Tour;
 using Umbraco.Web.Trees;
+using Umbraco.Web.Dashboards;
 
 // the namespace here is intentional -  although defined in Umbraco.Web assembly,
 // this class should be visible when using Umbraco.Core.Components, alongside
@@ -92,6 +93,13 @@ public static UrlProviderCollectionBuilder UrlProviders(this Composition composi
         public static BackOfficeSectionCollectionBuilder Sections(this Composition composition)
             => composition.WithCollectionBuilder<BackOfficeSectionCollectionBuilder>();
 
+        /// <summary>
+        /// Gets the backoffice dashboards collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static DashboardCollectionBuilder Dashboards(this Composition composition)
+            => composition.WithCollectionBuilder<DashboardCollectionBuilder>();
+
         #endregion
 
         #region Uniques
diff --git a/src/Umbraco.Web/Dashboards/ContentDashboard.cs b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
new file mode 100644
index 000000000000..c184e593aace
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(10)]
+    //[HideFromTypeFinder]
+    [DataContract]
+    public class ContentDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Get Started";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "contentIntro";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "content" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/default/startupdashboardintro.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules
+        {
+            get
+            {
+                //TODO: WB Not convinced these rules work correctly?!
+                var rules = new List<IAccessRule>();
+                rules.Add(new AccessRule { Type = AccessRuleType.Deny, Value = "translator" });
+                rules.Add(new AccessRule { Type = AccessRuleType.Grant, Value = "admin" });
+                return rules.ToArray();
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Dashboards/DashboardCollection.cs b/src/Umbraco.Web/Dashboards/DashboardCollection.cs
new file mode 100644
index 000000000000..8d3bde622ea7
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/DashboardCollection.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    public class DashboardCollection : BuilderCollectionBase<IDashboardSection>
+    {
+        public DashboardCollection(IEnumerable<IDashboardSection> items)
+            : base(items)
+        { }
+    }
+}
diff --git a/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs b/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
new file mode 100644
index 000000000000..d4a89a61b2a6
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+using Umbraco.Core.Manifest;
+
+namespace Umbraco.Web.Dashboards
+{
+    public class DashboardCollectionBuilder : WeightedCollectionBuilderBase<DashboardCollectionBuilder, DashboardCollection, IDashboardSection>
+    {
+        protected override DashboardCollectionBuilder This => this;        
+
+        protected override IEnumerable<IDashboardSection> CreateItems(IFactory factory)
+        {
+            // get the manifest parser just-in-time - injecting it in the ctor would mean that
+            // simply getting the builder in order to configure the collection, would require
+            // its dependencies too, and that can create cycles or other oddities
+            var manifestParser = factory.GetInstance<ManifestParser>();
+
+            //TODO WB: We will need to re-sort items from package manifest with the C# Types
+            return base.CreateItems(factory).Concat(manifestParser.Manifest.Dashboards);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Dashboards/ExamineDashboard.cs b/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
new file mode 100644
index 000000000000..5f04a4b78d55
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(20)]
+    [DataContract]
+    public class ExamineDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Examine Management";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "settingsExamine";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "settings" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/settings/examinemanagement.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+
+
+}
diff --git a/src/Umbraco.Web/Dashboards/FormsDashboard.cs b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
new file mode 100644
index 000000000000..c9e8e06b7dd5
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(10)]
+    [DataContract]
+    public class FormsDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Install Umbraco Forms";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "formsInstall";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "forms" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/forms/formsdashboardintro.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+}
diff --git a/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs b/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
new file mode 100644
index 000000000000..808dc099e8ea
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(50)]
+    [DataContract]
+    public class HealthCheckDashboard : IDashboardSection
+    {
+        [DataMember(Name="name")]
+        public string Name => "Health Check";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "settingsHealthCheck";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "settings" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/settings/healthcheck.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+
+
+}
diff --git a/src/Umbraco.Web/Dashboards/MediaDashboard.cs b/src/Umbraco.Web/Dashboards/MediaDashboard.cs
new file mode 100644
index 000000000000..c122ba1f7fde
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/MediaDashboard.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(10)]
+    [DataContract]
+    public class MediaDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Content";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "mediaFolderBrowser";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "media" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/media/mediafolderbrowser.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+}
diff --git a/src/Umbraco.Web/Dashboards/MembersDashboard.cs b/src/Umbraco.Web/Dashboards/MembersDashboard.cs
new file mode 100644
index 000000000000..9da6f591081f
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/MembersDashboard.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(10)]
+    [DataContract]
+    public class MembersDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Get Started";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "memberIntro";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "member" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/members/membersdashboardvideos.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+}
diff --git a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
new file mode 100644
index 000000000000..f25a9f7ea0e0
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(40)]
+    [DataContract]
+    public class ModelsBuilderDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Models Builder";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "settingsModelsBuilder";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "settings" };
+
+        [DataMember(Name = "view")]
+        public string View => "/App_Plugins/ModelsBuilder/modelsbuilder.htm";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+
+
+}
diff --git a/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs b/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
new file mode 100644
index 000000000000..d2fa5b217ba2
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(30)]
+    [DataContract]
+    public class PublishedStatusDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Published Status";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "settingsPublishedStatus";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "settings" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/settings/publishedstatus.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+
+
+}
diff --git a/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs b/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
new file mode 100644
index 000000000000..731d259d3958
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(20)]
+    [DataContract]
+    public class RedirectUrlDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Redirect URL Management";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "contentRedirectManager";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "content" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/content/redirecturls.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+}
diff --git a/src/Umbraco.Web/Dashboards/SettingsDashboards.cs b/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
new file mode 100644
index 000000000000..47c172307567
--- /dev/null
+++ b/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Web.Dashboards
+{
+    [Weight(10)]
+    [DataContract]
+    public class SettingsDashboard : IDashboardSection
+    {
+        [DataMember(Name = "name")]
+        public string Name => "Welcome";
+
+        [DataMember(Name = "alias")]
+        public string Alias => "settingsWelcome";
+
+        [IgnoreDataMember]
+        public string[] Sections => new string[] { "settings" };
+
+        [DataMember(Name = "view")]
+        public string View => "views/dashboard/settings/settingsdashboardintro.html";
+
+        [IgnoreDataMember]
+        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
+    }
+}
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index c6e0049865fa..11d31a86b400 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -16,6 +16,8 @@
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
+using Umbraco.Core.Dashboards;
+using Umbraco.Web.Services;
 
 namespace Umbraco.Web.Editors
 {
@@ -27,7 +29,7 @@ namespace Umbraco.Web.Editors
     [WebApi.UmbracoAuthorize]
     public class DashboardController : UmbracoApiController
     {
-        private readonly Dashboards _dashboards;
+        private readonly IDashboardService _dashboardService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardController"/> with auto dependencies.
@@ -38,10 +40,10 @@ public DashboardController()
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardController"/> with all its dependencies.
         /// </summary>
-        public DashboardController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, Dashboards dashboards)
+        public DashboardController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, IDashboardService dashboardService)
             : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
         {
-            _dashboards = dashboards;
+            _dashboardService = dashboardService;
         }
 
         //we have just one instance of HttpClient shared for the entire application
@@ -79,7 +81,7 @@ public async Task<JObject> GetRemoteDashboardContent(string section, string base
                 }
                 catch (HttpRequestException ex)
                 {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard content from '{Url}'", url);
+                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard content from {Url}", url);
 
                     //it's still new JObject() - we return it like this to avoid error codes which triggers UI warnings
                     AppCaches.RuntimeCache.InsertCacheItem<JObject>(key, () => result, new TimeSpan(0, 5, 0));
@@ -117,7 +119,7 @@ public async Task<HttpResponseMessage> GetRemoteDashboardCss(string section, str
                 }
                 catch (HttpRequestException ex)
                 {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard CSS from '{Url}'", url);
+                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard CSS from {Url}", url);
 
                     //it's still string.Empty - we return it like this to avoid error codes which triggers UI warnings
                     AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 5, 0));
@@ -132,9 +134,9 @@ public async Task<HttpResponseMessage> GetRemoteDashboardCss(string section, str
 
         [ValidateAngularAntiForgeryToken]
         [OutgoingEditorModelEvent]
-        public IEnumerable<Tab<DashboardControl>> GetDashboard(string section)
+        public IEnumerable<Tab<IDashboardSection>> GetDashboard(string section)
         {
-            return _dashboards.GetDashboards(section, Security.CurrentUser);
+            return _dashboardService.GetDashboards(section, Security.CurrentUser);
         }
     }
 }
diff --git a/src/Umbraco.Web/Editors/Dashboards.cs b/src/Umbraco.Web/Editors/Dashboards.cs
deleted file mode 100644
index c837cbbf331c..000000000000
--- a/src/Umbraco.Web/Editors/Dashboards.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Configuration.Dashboard;
-using Umbraco.Core.IO;
-using Umbraco.Core.Manifest;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Services;
-
-namespace Umbraco.Web.Editors
-{
-    public class Dashboards
-    {
-        private readonly ISectionService _sectionService;
-        private readonly IDashboardSection _dashboardSection;
-        private readonly ManifestParser _manifestParser;
-
-        public Dashboards(ISectionService sectionService, IDashboardSection dashboardSection, ManifestParser manifestParser)
-        {
-            _sectionService = sectionService ?? throw new ArgumentNullException(nameof(sectionService));
-            _dashboardSection = dashboardSection;
-            _manifestParser = manifestParser;
-        }
-
-        /// <summary>
-        /// Gets all dashboards, organized by section, for a user.
-        /// </summary>
-        public IDictionary<string, IEnumerable<Tab<DashboardControl>>> GetDashboards(IUser currentUser)
-        {
-            return _sectionService.GetSections().ToDictionary(x => x.Alias, x => GetDashboards(x.Alias, currentUser));
-        }
-
-        /// <summary>
-        /// Returns dashboards for a specific section, for a user.
-        /// </summary>
-        public IEnumerable<Tab<DashboardControl>> GetDashboards(string section, IUser currentUser)
-        {
-            var tabId = 1;
-            var configDashboards = GetDashboardsFromConfig(ref tabId, section, currentUser);
-            var pluginDashboards = GetDashboardsFromPlugins(ref tabId, section, currentUser);
-
-            // merge dashboards
-            // both collections contain tab.alias -> controls
-            var dashboards = configDashboards;
-
-            // until now, it was fine to have duplicate tab.aliases in configDashboard
-            // so... the rule should be - just merge whatever we get, don't be clever
-            dashboards.AddRange(pluginDashboards);
-
-            // re-sort by id
-            dashboards.Sort((tab1, tab2) => tab1.Id > tab2.Id ? 1 : 0);
-
-            // re-assign ids (why?)
-            var i = 1;
-            foreach (var tab in dashboards)
-            {
-                tab.Id = i++;
-                tab.IsActive = tab.Id == 1;
-            }
-
-            return configDashboards;
-        }
-
-        // note:
-        // in dashboard.config we have 'sections' which define 'tabs' for 'areas'
-        // and 'areas' are the true UI sections - and each tab can have more than
-        // one control
-        // in a manifest, we directly have 'dashboards' which map to a unique
-        // control in a tab
-
-        // gets all tabs & controls from the config file
-        private List<Tab<DashboardControl>> GetDashboardsFromConfig(ref int tabId, string section, IUser currentUser)
-        {
-            var tabs = new List<Tab<DashboardControl>>();
-
-            // disable packages section dashboard
-            if (section == "packages") return tabs;
-
-            foreach (var dashboardSection in _dashboardSection.Sections.Where(x => x.Areas.InvariantContains(section)))
-            {
-                // validate access to this section
-                if (!DashboardSecurity.AuthorizeAccess(dashboardSection, currentUser, _sectionService))
-                    continue;
-
-                foreach (var tab in dashboardSection.Tabs)
-                {
-                    // validate access to this tab
-                    if (!DashboardSecurity.AuthorizeAccess(tab, currentUser, _sectionService))
-                        continue;
-
-                    var dashboardControls = new List<DashboardControl>();
-
-                    foreach (var control in tab.Controls)
-                    {
-                        // validate access to this control
-                        if (!DashboardSecurity.AuthorizeAccess(control, currentUser, _sectionService))
-                            continue;
-
-                        // create and add control
-                        var dashboardControl = new DashboardControl
-                        {
-                            Caption = control.PanelCaption,
-                            Path = IOHelper.FindFile(control.ControlPath.Trim())
-                        };
-
-                        if (dashboardControl.Path.InvariantEndsWith(".ascx"))
-                            throw new NotSupportedException("Legacy UserControl (.ascx) dashboards are no longer supported.");
-
-                        dashboardControls.Add(dashboardControl);
-                    }
-
-                    // create and add tab
-                    tabs.Add(new Tab<DashboardControl>
-                    {
-                        Id = tabId++,
-                        Alias = tab.Caption.ToSafeAlias(),
-                        Label = tab.Caption,
-                        Properties = dashboardControls
-                    });
-                }
-            }
-
-            return tabs;
-        }
-
-        private List<Tab<DashboardControl>> GetDashboardsFromPlugins(ref int tabId, string section, IUser currentUser)
-        {
-            var tabs = new List<Tab<DashboardControl>>();
-
-            foreach (var dashboard in _manifestParser.Manifest.Dashboards.Where(x => x.Sections.InvariantContains(section)).OrderBy(x => x.Weight))
-            {
-                // validate access
-                if (!DashboardSecurity.CheckUserAccessByRules(currentUser, _sectionService, dashboard.AccessRules))
-                    continue;
-
-                var dashboardControl = new DashboardControl
-                {
-                    Caption = "",
-                    Path = IOHelper.FindFile(dashboard.View.Trim())
-                };
-
-                if (dashboardControl.Path.InvariantEndsWith(".ascx"))
-                    throw new NotSupportedException("Legacy UserControl (.ascx) dashboards are no longer supported.");
-
-                tabs.Add(new Tab<DashboardControl>
-                {
-                    Id = tabId++,
-                    Alias = dashboard.Alias.ToSafeAlias(),
-                    Label = dashboard.Name,
-                    Properties = new[] { dashboardControl }
-                });
-            }
-
-            return tabs;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Editors/EditorModelEventManager.cs b/src/Umbraco.Web/Editors/EditorModelEventManager.cs
index 2225f5c577bb..dd5282d7243d 100644
--- a/src/Umbraco.Web/Editors/EditorModelEventManager.cs
+++ b/src/Umbraco.Web/Editors/EditorModelEventManager.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Web.Http.Filters;
+using Umbraco.Core.Dashboards;
 using Umbraco.Core.Events;
 using Umbraco.Web.Models.ContentEditing;
 
@@ -14,9 +15,9 @@ public sealed class EditorModelEventManager
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<MediaItemDisplay>> SendingMediaModel;
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<MemberDisplay>> SendingMemberModel;
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<UserDisplay>> SendingUserModel;
-        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<DashboardControl>>>> SendingDashboardModel;
+        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboardSection>>>> SendingDashboardModel;
 
-        private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs<IEnumerable<Tab<DashboardControl>>> e)
+        private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs<IEnumerable<Tab<IDashboardSection>>> e)
         {
             var handler = SendingDashboardModel;
             handler?.Invoke(sender, e);
@@ -65,8 +66,8 @@ internal static void EmitEvent(HttpActionExecutedContext sender, EditorModelEven
             if (e.Model is UserDisplay)
                 OnSendingUserModel(sender, new EditorModelEventArgs<UserDisplay>(e));
 
-            if (e.Model is IEnumerable<Tab<DashboardControl>>)
-                OnSendingDashboardModel(sender, new EditorModelEventArgs<IEnumerable<Tab<DashboardControl>>>(e));
+            if (e.Model is IEnumerable<IDashboardSection>)
+                OnSendingDashboardModel(sender, new EditorModelEventArgs<IEnumerable<Tab<IDashboardSection>>>(e));
         }
     }
 }
diff --git a/src/Umbraco.Web/Editors/SectionController.cs b/src/Umbraco.Web/Editors/SectionController.cs
index 74a06d714925..f6973fcbb94c 100644
--- a/src/Umbraco.Web/Editors/SectionController.cs
+++ b/src/Umbraco.Web/Editors/SectionController.cs
@@ -22,15 +22,15 @@ namespace Umbraco.Web.Editors
     [PluginController("UmbracoApi")]
     public class SectionController : UmbracoAuthorizedJsonController
     {
-        private readonly Dashboards _dashboards;
+        private readonly IDashboardService _dashboardService;
         private readonly ISectionService _sectionService;
         private readonly ITreeService _treeService;
 
         public SectionController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState,
-            Dashboards dashboards, ISectionService sectionService, ITreeService treeService)
+            IDashboardService dashboardService, ISectionService sectionService, ITreeService treeService)
             : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
         {
-            _dashboards = dashboards;
+            _dashboardService = dashboardService;
             _sectionService = sectionService;
             _treeService = treeService;
         }
@@ -48,7 +48,7 @@ public IEnumerable<Section> GetSections()
                 ControllerContext = ControllerContext
             };
 
-            var dashboards = _dashboards.GetDashboards(Security.CurrentUser);
+            var dashboards = _dashboardService.GetDashboards(Security.CurrentUser);
 
             //now we can add metadata for each section so that the UI knows if there's actually anything at all to render for
             //a dashboard for a given section, then the UI can deal with it accordingly (i.e. redirect to the first tree)
diff --git a/src/Umbraco.Web/Models/ContentEditing/DashboardControl.cs b/src/Umbraco.Web/Models/ContentEditing/DashboardControl.cs
deleted file mode 100644
index aad6bf2d6447..000000000000
--- a/src/Umbraco.Web/Models/ContentEditing/DashboardControl.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Web.Models.ContentEditing
-{
-    [DataContract(Name = "control", Namespace = "")]
-    public class DashboardControl
-    {
-        [DataMember(Name = "path")]
-        public string Path { get; set; }
-
-        [DataMember(Name = "caption")]
-        public string Caption { get; set; }
-    }
-}
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 832699b5d7d1..d165559024eb 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -6,6 +6,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Components;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Dashboards;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models.PublishedContent;
@@ -17,6 +18,7 @@
 using Umbraco.Web.Cache;
 using Umbraco.Web.Composing.Composers;
 using Umbraco.Web.ContentApps;
+using Umbraco.Web.Dashboards;
 using Umbraco.Web.Dictionary;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Features;
@@ -95,14 +97,13 @@ public override void Compose(Composition composition)
             composition.RegisterUnique<ITreeService, TreeService>();
             composition.RegisterUnique<ISectionService, SectionService>();
 
+            composition.RegisterUnique<IDashboardService, DashboardService>();
+
             composition.RegisterUnique<IExamineManager>(factory => ExamineManager.Instance);
 
             // configure the container for web
             composition.ConfigureForWeb();
-
-
-            composition.RegisterUnique<Dashboards>();
-
+            
             composition
                 .ComposeUmbracoControllers(GetType().Assembly)
                 .SetDefaultRenderMvcController<RenderMvcController>(); // default controller for template views
@@ -202,6 +203,25 @@ public override void Compose(Composition composition)
                 .Append<MembersBackOfficeSection>()
                 .Append<TranslationBackOfficeSection>();
 
+
+            // register core CMS dashboards as types - will be ordered by weight attribute & merged with package.manifest dashboards
+            // TODO WB Maybe use typeloader?!
+
+            composition.WithCollectionBuilder<DashboardCollectionBuilder>()
+                .Add(composition.TypeLoader.GetTypes<IDashboardSection>());
+
+                //.Add<ContentDashboard>()
+                //.Add<RedirectUrlDashboard>()
+                //.Add<MediaDashboard>()
+                //.Add<SettingsDashboard>()
+                //.Add<ExamineDashboard>()
+                //.Add<PublishedStatusDashboard>()
+                //.Add<ModelsBuilderDashboard>()
+                //.Add<HealthCheckDashboard>()
+                //.Add<MembersDashboard>()
+                //.Add<FormsDashboard>();
+                
+
             // register back office trees
             foreach (var treeControllerType in umbracoApiControllerTypes
                 .Where(x => typeof(TreeControllerBase).IsAssignableFrom(x)))
diff --git a/src/Umbraco.Web/Editors/DashboardSecurity.cs b/src/Umbraco.Web/Services/DashboardService.cs
similarity index 62%
rename from src/Umbraco.Web/Editors/DashboardSecurity.cs
rename to src/Umbraco.Web/Services/DashboardService.cs
index fdbf5af7d92b..9f70f876a38f 100644
--- a/src/Umbraco.Web/Editors/DashboardSecurity.cs
+++ b/src/Umbraco.Web/Services/DashboardService.cs
@@ -1,65 +1,63 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using Umbraco.Core;
-using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Dashboards;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Services;
-using Umbraco.Web.Services;
+using Umbraco.Web.Dashboards;
+using Umbraco.Web.Models.ContentEditing;
 
-namespace Umbraco.Web.Editors
+namespace Umbraco.Web.Services
 {
-    /// <summary>
-    /// A utility class for determine dashboard security
-    /// </summary>
-    internal class DashboardSecurity
+    internal class DashboardService : IDashboardService
     {
-        //TODO: Unit test all this!!! :/
+        private readonly ISectionService _sectionService;
+        private readonly DashboardCollection _dashboardCollection;
 
-        public static bool AuthorizeAccess(ISection dashboardSection, IUser user, ISectionService sectionService)
+        public DashboardService(ISectionService sectionService, DashboardCollection dashboardCollection)
         {
-            return CheckUserAccessByRules(user, sectionService, dashboardSection.AccessRights.Rules);
+            _sectionService = sectionService ?? throw new ArgumentNullException(nameof(sectionService));
+            _dashboardCollection = dashboardCollection ?? throw new ArgumentNullException(nameof(dashboardCollection));
         }
 
-        public static bool AuthorizeAccess(IDashboardTab dashboardTab, IUser user, ISectionService sectionService)
+        
+        /// <inheritdoc />
+        public IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser currentUser)
         {
-            return CheckUserAccessByRules(user, sectionService, dashboardTab.AccessRights.Rules);
-        }
+            var tabs = new List<Tab<IDashboardSection>>();
+            var tabId = 0;
 
-        public static bool AuthorizeAccess(IDashboardControl dashboardControl, IUser user, ISectionService sectionService)
-        {
-            return CheckUserAccessByRules(user, sectionService, dashboardControl.AccessRights.Rules);
-        }
+            foreach (var dashboard in _dashboardCollection.Where(x => x.Sections.InvariantContains(section)))
+            {
+                // validate access
+                if (!CheckUserAccessByRules(currentUser, _sectionService, dashboard.AccessRules))
+                    continue;
+                
+                if (dashboard.View.InvariantEndsWith(".ascx"))
+                    throw new NotSupportedException("Legacy UserControl (.ascx) dashboards are no longer supported.");
 
-        private static (IAccessRule[], IAccessRule[], IAccessRule[]) GroupRules(IEnumerable<IAccessRule> rules)
-        {
-            IAccessRule[] denyRules = null, grantRules = null, grantBySectionRules = null;
+                var dashboards = new List<IDashboardSection>();
+                dashboards.Add(dashboard);
 
-            var groupedRules = rules.GroupBy(x => x.Type);
-            foreach (var group in groupedRules)
-            {
-                var a = group.ToArray();
-                switch (group.Key)
+                tabs.Add(new Tab<IDashboardSection>()
                 {
-                    case AccessRuleType.Deny:
-                        denyRules = a;
-                        break;
-                    case AccessRuleType.Grant:
-                        grantRules = a;
-                        break;
-                    case AccessRuleType.GrantBySection:
-                        grantBySectionRules = a;
-                        break;
-                    default:
-                        throw new Exception("panic");
-                }
+                    Id = tabId++,
+                    Label = dashboard.Name,
+                    Alias = dashboard.Alias,
+                    Properties = dashboards
+                });                
             }
 
-            return (denyRules ?? Array.Empty<IAccessRule>(), grantRules ?? Array.Empty<IAccessRule>(), grantBySectionRules ?? Array.Empty<IAccessRule>());
+            return tabs;
         }
 
-        public static bool CheckUserAccessByRules(IUser user, ISectionService sectionService, IEnumerable<IAccessRule> rules)
+        /// <inheritdoc />
+        public IDictionary<string, IEnumerable<Tab<IDashboardSection>>> GetDashboards(IUser currentUser)
+        {
+            return _sectionService.GetSections().ToDictionary(x => x.Alias, x => GetDashboards(x.Alias, currentUser));
+        }
+        
+        private bool CheckUserAccessByRules(IUser user, ISectionService sectionService, IEnumerable<IAccessRule> rules)
         {
             if (user.Id == Constants.Security.SuperUserId)
                 return true;
@@ -111,5 +109,32 @@ public static bool CheckUserAccessByRules(IUser user, ISectionService sectionSer
 
             return hasAccess;
         }
+
+        private (IAccessRule[], IAccessRule[], IAccessRule[]) GroupRules(IEnumerable<IAccessRule> rules)
+        {
+            IAccessRule[] denyRules = null, grantRules = null, grantBySectionRules = null;
+
+            var groupedRules = rules.GroupBy(x => x.Type);
+            foreach (var group in groupedRules)
+            {
+                var a = group.ToArray();
+                switch (group.Key)
+                {
+                    case AccessRuleType.Deny:
+                        denyRules = a;
+                        break;
+                    case AccessRuleType.Grant:
+                        grantRules = a;
+                        break;
+                    case AccessRuleType.GrantBySection:
+                        grantBySectionRules = a;
+                        break;
+                    default:
+                        throw new Exception("panic");
+                }
+            }
+
+            return (denyRules ?? Array.Empty<IAccessRule>(), grantRules ?? Array.Empty<IAccessRule>(), grantBySectionRules ?? Array.Empty<IAccessRule>());
+        }
     }
 }
diff --git a/src/Umbraco.Web/Services/IDashboardService.cs b/src/Umbraco.Web/Services/IDashboardService.cs
new file mode 100644
index 000000000000..a86715c83d43
--- /dev/null
+++ b/src/Umbraco.Web/Services/IDashboardService.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using Umbraco.Core.Dashboards;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Services
+{
+    public interface IDashboardService
+    {
+        /// <summary>
+        /// Gets dashboard for a specific section/application
+        /// For a specific backoffice user
+        /// </summary>
+        /// <param name="section"></param>
+        /// <param name="currentUser"></param>
+        /// <returns></returns>
+        IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser currentUser);
+
+        /// <summary>
+        /// Gets all dashboards, organized by section, for a user.
+        /// </summary>
+        /// <param name="currentUser"></param>
+        /// <returns></returns>
+        IDictionary<string, IEnumerable<Tab<IDashboardSection>>> GetDashboards(IUser currentUser);
+
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index a6f380b0dd44..bd3ff8910b0e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -122,6 +122,18 @@
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Components\BackOfficeUserAuditEventsComponent.cs" />
     <Compile Include="ContentApps\ListViewContentAppFactory.cs" />
+    <Compile Include="Dashboards\ContentDashboard.cs" />
+    <Compile Include="Dashboards\DashboardCollection.cs" />
+    <Compile Include="Dashboards\DashboardCollectionBuilder.cs" />
+    <Compile Include="Dashboards\ExamineDashboard.cs" />
+    <Compile Include="Dashboards\FormsDashboard.cs" />
+    <Compile Include="Dashboards\HealthCheckDashboard.cs" />
+    <Compile Include="Dashboards\MediaDashboard.cs" />
+    <Compile Include="Dashboards\MembersDashboard.cs" />
+    <Compile Include="Dashboards\ModelsBuilderDashboard.cs" />
+    <Compile Include="Dashboards\PublishedStatusDashboard.cs" />
+    <Compile Include="Dashboards\RedirectUrlDashboard.cs" />
+    <Compile Include="Dashboards\SettingsDashboards.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
     <Compile Include="Editors\PackageController.cs" />
     <Compile Include="Editors\KeepAliveController.cs" />
@@ -169,6 +181,8 @@
     <Compile Include="Media\UploadAutoFillProperties.cs" />
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
+    <Compile Include="Services\DashboardService.cs" />
+    <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Trees\BackOfficeSectionCollectionBuilder.cs" />
     <Compile Include="Trees\MediaBackOfficeSection.cs" />
     <Compile Include="Trees\MembersBackOfficeSection.cs" />
@@ -244,7 +258,6 @@
     <Compile Include="WebApi\SerializeVersionAttribute.cs" />
     <Compile Include="WebApi\TrimModelBinder.cs" />
     <Compile Include="Editors\CodeFileController.cs" />
-    <Compile Include="Editors\Dashboards.cs" />
     <Compile Include="Editors\DictionaryController.cs" />
     <Compile Include="Editors\EditorModelEventArgs.cs" />
     <Compile Include="Editors\EditorValidatorCollection.cs" />
@@ -705,7 +718,6 @@
     <Compile Include="Editors\Filters\ContentSaveValidationAttribute.cs" />
     <Compile Include="Editors\ContentTypeControllerBase.cs" />
     <Compile Include="Editors\DashboardController.cs" />
-    <Compile Include="Editors\DashboardSecurity.cs" />
     <Compile Include="Editors\DataTypeController.cs" />
     <Compile Include="Editors\DataTypeValidateAttribute.cs" />
     <Compile Include="Editors\ImagesController.cs" />
@@ -826,7 +838,6 @@
     <Compile Include="Editors\EntityController.cs" />
     <Compile Include="Editors\MemberController.cs" />
     <Compile Include="Editors\CurrentUserController.cs" />
-    <Compile Include="Models\ContentEditing\DashboardControl.cs" />
     <Compile Include="Models\ContentEditing\DataTypeDisplay.cs" />
     <Compile Include="Models\ContentEditing\DataTypeSave.cs" />
     <Compile Include="Models\ContentEditing\DataTypeConfigurationFieldDisplay.cs" />

From 5d34ee271cc6ee57568db49fe0d379e95c885e52 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 23 Jan 2019 14:42:49 +0000
Subject: [PATCH 027/421] Forgot to remove my test App_Plugin Dashboard

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

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index c7b6540b3d9b..0ff158dadb46 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -178,7 +178,6 @@
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.htm" />
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
-    <Content Include="App_Plugins\Test\test.html" />
     <Content Include="Config\grid.editors.config.js" />
     <Content Include="Config\Lang\cs-CZ.user.xml" />
     <Content Include="Config\Lang\da-DK.user.xml" />
@@ -206,7 +205,6 @@
     <Content Include="Config\Splashes\noNodes.aspx" />
     <Content Include="Umbraco\Install\Views\Web.config" />
     <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
-    <Content Include="App_Plugins\Test\package.manifest" />
     <None Include="Config\404handlers.Release.config">
       <DependentUpon>404handlers.config</DependentUpon>
     </None>

From f2cc0eebf5a79f0b9283e6e64d512810174788be Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 23 Jan 2019 14:43:05 +0000
Subject: [PATCH 028/421] Remove the dashboard XML config file

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |   7 --
 .../config/Dashboard.Release.config           | 107 -----------------
 src/Umbraco.Web.UI/config/Dashboard.config    | 108 ------------------
 3 files changed, 222 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/config/Dashboard.Release.config
 delete mode 100644 src/Umbraco.Web.UI/config/Dashboard.config

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 0ff158dadb46..65b56912419c 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -251,10 +251,6 @@
     <None Include="Config\feedProxy.Release.config">
       <DependentUpon>feedProxy.config</DependentUpon>
     </None>
-    <None Include="Config\Dashboard.Release.config">
-      <DependentUpon>Dashboard.config</DependentUpon>
-      <SubType>Designer</SubType>
-    </None>
     <Content Include="Umbraco\Install\Views\Index.cshtml" />
     <Content Include="Media\Web.config" />
     <Content Include="Properties\Settings.settings">
@@ -361,9 +357,6 @@
       <SubType>Designer</SubType>
     </None>
     <Content Include="Config\404handlers.config" />
-    <Content Include="Config\Dashboard.config">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="Config\tinyMceConfig.config">
       <SubType>Designer</SubType>
     </Content>
diff --git a/src/Umbraco.Web.UI/config/Dashboard.Release.config b/src/Umbraco.Web.UI/config/Dashboard.Release.config
deleted file mode 100644
index fec6ab34ae3a..000000000000
--- a/src/Umbraco.Web.UI/config/Dashboard.Release.config
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dashBoard>
-
-    <section alias="StartupSettingsDashboardSection">
-        <areas>
-            <area>settings</area>
-        </areas>
-        <tab caption="Welcome">
-            <control panelCaption="">
-                views/dashboard/settings/settingsdashboardintro.html
-            </control>
-        </tab>
-        <tab caption="Examine Management">
-            <control>
-              views/dashboard/settings/examinemanagement.html
-          </control>
-        </tab>
-        <tab caption="Published Status">
-            <control>
-              views/dashboard/settings/publishedstatus.html
-          </control>
-        </tab>
-    </section>
-
-    <section alias="StartupFormsDashboardSection">
-        <areas>
-            <area>forms</area>
-        </areas>
-        <tab caption="Install Umbraco Forms">
-            <control panelCaption="">
-                views/dashboard/forms/formsdashboardintro.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupMediaDashboardSection">
-        <areas>
-            <area>media</area>
-        </areas>
-        <tab caption="Content">
-            <control panelCaption="">
-                views/dashboard/media/mediafolderbrowser.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupDashboardSection">
-        <access>
-            <deny>translator</deny>
-        </access>
-        <areas>
-            <area>content</area>
-        </areas>
-        <tab caption="Get Started">
-            <access>
-                <grant>admin</grant>
-            </access>
-
-            <control panelCaption="">
-                views/dashboard/default/startupdashboardintro.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupMemberDashboardSection">
-        <areas>
-            <area>member</area>
-        </areas>
-        <tab caption="Get Started">
-            <control panelCaption="">
-                views/dashboard/members/membersdashboardvideos.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="UmbracoModelsBuilder">
-        <areas>
-            <area>settings</area>
-        </areas>
-        <tab caption="Models Builder">
-            <control>
-                /App_Plugins/ModelsBuilder/modelsbuilder.htm
-            </control>
-        </tab>
-    </section>
-
-    <section alias="UmbracoHealthCheck">
-        <areas>
-            <area>settings</area>
-        </areas>
-        <tab caption="Health Check">
-            <control>
-                views/dashboard/settings/healthcheck.html
-            </control>
-        </tab>
-    </section>
-    <section alias="RedirectUrlManagement">
-        <areas>
-            <area>content</area>
-        </areas>
-        <tab caption="Redirect URL Management">
-            <control>
-                views/dashboard/content/redirecturls.html
-            </control>
-        </tab>
-    </section>
-</dashBoard>
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
deleted file mode 100644
index 94325913df44..000000000000
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dashBoard>
-
-    <section alias="StartupSettingsDashboardSection">
-        <areas>
-            <area>settings</area>
-        </areas>
-        <tab caption="Welcome">
-            <control panelCaption="">
-                views/dashboard/settings/settingsdashboardintro.html
-            </control>
-        </tab>
-        <tab caption="Examine Management">
-            <control>
-              views/dashboard/settings/examinemanagement.html
-          </control>
-        </tab>
-        <tab caption="Published Status">
-            <control>
-              views/dashboard/settings/publishedstatus.html
-          </control>
-        </tab>
-    </section>
-
-    <section alias="StartupFormsDashboardSection">
-        <areas>
-            <area>forms</area>
-        </areas>
-        <tab caption="Install Umbraco Forms">
-            <control panelCaption="">
-                views/dashboard/forms/formsdashboardintro.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupMediaDashboardSection">
-        <areas>
-            <area>media</area>
-        </areas>
-        <tab caption="Content">
-            <control panelCaption="">
-                views/dashboard/media/mediafolderbrowser.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupDashboardSection">
-        <access>
-            <deny>translator</deny>
-        </access>
-        <areas>
-            <area>content</area>
-        </areas>
-        <tab caption="Get Started">
-            <access>
-                <grant>admin</grant>
-            </access>
-
-            <control panelCaption="">
-                views/dashboard/default/startupdashboardintro.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupMemberDashboardSection">
-        <areas>
-            <area>member</area>
-        </areas>
-        <tab caption="Get Started">
-            <control panelCaption="">
-                views/dashboard/members/membersdashboardvideos.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="UmbracoModelsBuilder">
-        <areas>
-            <area>settings</area>
-        </areas>
-        <tab caption="Models Builder">
-            <control>
-                /App_Plugins/ModelsBuilder/modelsbuilder.htm
-            </control>
-        </tab>
-    </section>
-
-    <section alias="UmbracoHealthCheck">
-        <areas>
-            <area>settings</area>
-        </areas>
-        <tab caption="Health Check">
-            <control>
-                views/dashboard/settings/healthcheck.html
-            </control>
-        </tab>
-    </section>
-    
-    <section alias="RedirectUrlManagement">
-        <areas>
-            <area>content</area>
-        </areas>
-        <tab caption="Redirect URL Management">
-            <control>
-                views/dashboard/content/redirecturls.html
-            </control>
-        </tab>
-    </section>
-</dashBoard>

From 5e9f8619912d6edffe2d1274836e6e2cc287593d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 23 Jan 2019 15:09:31 +0000
Subject: [PATCH 029/421] Cleanup of WebRuntimeComposer

---
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index d165559024eb..22595d795c5a 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -204,23 +204,9 @@ public override void Compose(Composition composition)
                 .Append<TranslationBackOfficeSection>();
 
 
-            // register core CMS dashboards as types - will be ordered by weight attribute & merged with package.manifest dashboards
-            // TODO WB Maybe use typeloader?!
-
+            // register core CMS dashboards and 3rd party types - will be ordered by weight attribute & merged with package.manifest dashboards
             composition.WithCollectionBuilder<DashboardCollectionBuilder>()
-                .Add(composition.TypeLoader.GetTypes<IDashboardSection>());
-
-                //.Add<ContentDashboard>()
-                //.Add<RedirectUrlDashboard>()
-                //.Add<MediaDashboard>()
-                //.Add<SettingsDashboard>()
-                //.Add<ExamineDashboard>()
-                //.Add<PublishedStatusDashboard>()
-                //.Add<ModelsBuilderDashboard>()
-                //.Add<HealthCheckDashboard>()
-                //.Add<MembersDashboard>()
-                //.Add<FormsDashboard>();
-                
+                .Add(composition.TypeLoader.GetTypes<IDashboardSection>());                
 
             // register back office trees
             foreach (var treeControllerType in umbracoApiControllerTypes

From 03498b3c616851e53ccbb785b63bba8e47f06186 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 23 Jan 2019 17:56:44 +0000
Subject: [PATCH 030/421] Update comment about this Interface usage - maybe we
 can remove this later on

---
 src/Umbraco.Web/UI/IAssignedApp.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/UI/IAssignedApp.cs b/src/Umbraco.Web/UI/IAssignedApp.cs
index ef8c0fabcb97..b70dafa50efc 100644
--- a/src/Umbraco.Web/UI/IAssignedApp.cs
+++ b/src/Umbraco.Web/UI/IAssignedApp.cs
@@ -5,7 +5,7 @@
     /// </summary>
     /// <remarks>
     /// Currently things that need to be assigned to an app in order for user security to work are:
-    /// dialogs, ITasks, editors
+    /// LegacyDialogTask
     /// </remarks>
     public interface IAssignedApp
     {

From fcb3f8e791e18c9dfc5fb672ef3c0d9c4fbd67cb Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 23 Jan 2019 17:57:20 +0000
Subject: [PATCH 031/421] Remove Umbraco.Web.UI.Controls folder & classes -
 Controis reek of WebForms era

---
 src/Umbraco.Web/UI/Controls/ProgressBar.cs    |  17 ---
 src/Umbraco.Web/UI/Controls/UmbracoControl.cs |  67 ------------
 .../UI/Controls/UmbracoUserControl.cs         | 103 ------------------
 src/Umbraco.Web/Umbraco.Web.csproj            |   5 -
 4 files changed, 192 deletions(-)
 delete mode 100644 src/Umbraco.Web/UI/Controls/ProgressBar.cs
 delete mode 100644 src/Umbraco.Web/UI/Controls/UmbracoControl.cs
 delete mode 100644 src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs

diff --git a/src/Umbraco.Web/UI/Controls/ProgressBar.cs b/src/Umbraco.Web/UI/Controls/ProgressBar.cs
deleted file mode 100644
index 3e87da1d6f76..000000000000
--- a/src/Umbraco.Web/UI/Controls/ProgressBar.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Umbraco.Core.IO;
-
-namespace Umbraco.Web.UI.Controls
-{
-    public class ProgressBar : System.Web.UI.WebControls.Image
-    {
-        public string Title { get; set; }
-
-        protected override void Render(System.Web.UI.HtmlTextWriter writer)
-        {
-            base.ImageUrl = "/images/progressBar.gif";
-            base.AlternateText = Title;
-
-            base.Render(writer);
-        }
-    }
-}
diff --git a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
deleted file mode 100644
index c56e4fe07ff1..000000000000
--- a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Web.Mvc;
-using System.Web.UI;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
-
-namespace Umbraco.Web.UI.Controls
-{
-    /// <summary>
-    /// A control that exposes the helpful Umbraco context objects
-    /// </summary>
-    public abstract class UmbracoControl : Control
-    {
-        private UrlHelper _url;
-
-        protected UmbracoControl(UmbracoContext umbracoContext, ServiceContext services)
-        {
-            UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
-            Umbraco = new UmbracoHelper(umbracoContext, services);
-
-            // todo inject somehow
-            Logger = Current.Logger;
-            ProfilingLogger = Current.ProfilingLogger;
-            Services = Current.Services;
-        }
-
-        /// <summary>
-        /// Empty constructor, uses Singleton to resolve the UmbracoContext.
-        /// </summary>
-        protected UmbracoControl()
-            : this(Current.UmbracoContext, Current.Services)
-        { }
-
-        /// <summary>
-        /// Returns an UmbracoHelper object
-        /// </summary>
-        public UmbracoHelper Umbraco { get; }
-
-        /// <summary>
-        /// Gets the logger.
-        /// </summary>
-        public ILogger Logger { get; }
-
-        /// <summary>
-        /// Gets the profiling logger.
-        /// </summary>
-        public IProfilingLogger ProfilingLogger { get; }
-
-        /// <summary>
-        /// Gets the Umbraco context.
-        /// </summary>
-        public UmbracoContext UmbracoContext { get; }
-
-        /// <summary>
-        /// Gets the services context.
-        /// </summary>
-        protected ServiceContext Services { get; }
-
-        /// <summary>
-        /// Gets a Url helper.
-        /// </summary>
-        /// <remarks>This URL helper is created without any route data and an empty request context.</remarks>
-        public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext));
-    }
-}
diff --git a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
deleted file mode 100644
index f4cd7f1b509d..000000000000
--- a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Web.Mvc;
-using System.Web.UI;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Services;
-using Umbraco.Web.Security;
-using Umbraco.Web.UI.Pages;
-using Current = Umbraco.Web.Composing.Current;
-
-namespace Umbraco.Web.UI.Controls
-{
-    /// <summary>
-    /// A base class for all Presentation UserControls to inherit from
-    /// </summary>
-    public abstract class UmbracoUserControl : UserControl
-    {
-        private ClientTools _clientTools;
-        private UrlHelper _url;
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="umbracoContext"></param>
-        /// <param name="services"></param>
-        protected UmbracoUserControl(UmbracoContext umbracoContext, ServiceContext services)
-        {
-            if (umbracoContext == null) throw new ArgumentNullException(nameof(umbracoContext));
-            UmbracoContext = umbracoContext;
-            Umbraco = new UmbracoHelper(umbracoContext, services);
-            Members = Current.Factory.GetInstance<MembershipHelper>();
-
-            // todo inject somehow
-            Logger = Current.Logger;
-            ProfilingLogger = Current.ProfilingLogger;
-            Services = Current.Services;
-        }
-
-        /// <summary>
-        /// Empty constructor, uses Singleton to resolve the UmbracoContext
-        /// </summary>
-        protected UmbracoUserControl()
-            : this(Current.UmbracoContext, Current.Services)
-        { }
-
-        // for debugging purposes
-        internal Guid InstanceId { get; } = Guid.NewGuid();
-
-        /// <summary>
-        /// Gets the Umbraco helper.
-        /// </summary>
-        public UmbracoHelper Umbraco { get; }
-
-        /// <summary>
-        /// Gets the membership helper;
-        /// </summary>
-        public MembershipHelper Members { get; }
-
-        /// <summary>
-        /// Gets the web security helper.
-        /// </summary>
-        public WebSecurity Security => UmbracoContext.Security;
-
-        /// <summary>
-        /// Gets the logger.
-        /// </summary>
-        public ILogger Logger { get; }
-
-        /// <summary>
-        /// Gets the ProfilingLogger.
-        /// </summary>
-        public IProfilingLogger ProfilingLogger { get; }
-
-        /// <summary>
-        /// Gets the Umbraco context.
-        /// </summary>
-        public UmbracoContext UmbracoContext { get; }
-
-        /// <summary>
-        /// Gets the services context.
-        /// </summary>
-        public ServiceContext Services { get; }
-
-        /// <summary>
-        /// Gets an instance of ClientTools for access to the pages client API.
-        /// </summary>
-        public ClientTools ClientTools
-        {
-            get
-            {
-                var page = Page as BasePage;
-                return _clientTools ?? (_clientTools = page != null ? page.ClientTools : new ClientTools(Page));
-            }
-        }
-
-        /// <summary>
-        /// Gets a Url helper.
-        /// </summary>
-        /// <remarks>This URL helper is created without any route data and an empty request context.</remarks>
-        public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext));
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 64a60d824a23..bf919337453d 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1145,11 +1145,6 @@
     <Compile Include="_Legacy\UI\ITaskReturnUrl.cs" />
     <Compile Include="_Legacy\UI\LegacyDialogHandler.cs" />
     <Compile Include="_Legacy\UI\LegacyDialogTask.cs" />
-    <Compile Include="UI\Controls\ProgressBar.cs" />
-    <Compile Include="UI\Controls\UmbracoControl.cs" />
-    <Compile Include="UI\Controls\UmbracoUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="UI\Pages\BasePage.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>

From 31509beb1cb500c77e91650f3d6ddb6525f4e0cb Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 23 Jan 2019 18:17:10 +0000
Subject: [PATCH 032/421] =?UTF-8?q?=F0=9F=99=88=20WOW=20this=20was=20super?=
 =?UTF-8?q?=20old=20Umbraco=20V3=20days=20of=20<umbraco:item=20runat=3D"se?=
 =?UTF-8?q?rver"=20/>=20WebForms=20days?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../umbraco/templateControls/ContentType.cs   |  31 --
 .../DisableEventValidation.cs                 |  27 --
 .../umbraco/templateControls/Item.cs          | 314 ------------------
 .../umbraco/templateControls/ItemRenderer.cs  | 226 -------------
 .../umbraco/templateControls/Macro.cs         | 223 -------------
 5 files changed, 821 deletions(-)
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ContentType.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ContentType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ContentType.cs
deleted file mode 100644
index cfccac7f39e6..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ContentType.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Web;
-using System.ComponentModel;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace umbraco.presentation.templateControls
-{
-    [DefaultProperty("MimeType")]
-    [ToolboxData("<{0}:ContentType runat=server></{0}:ContentType>")]
-    public class ContentType : WebControl
-    {
-        [Category("Umbraco")]
-        [DefaultValue("")]
-        public string MimeType { get; set; }
-
-        protected override void OnPreRender(EventArgs e)
-        {
-            if (!String.IsNullOrEmpty(MimeType))
-            {
-                Page.Response.ContentType = MimeType;
-            }
-        }
-
-        protected override void Render(HtmlTextWriter writer)
-        {
-
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs
deleted file mode 100644
index 1672053023db..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.ComponentModel;
-
-namespace umbraco.presentation.templateControls
-{
-    /// <summary>
-    /// This control disables request validation (equalevant of setting validateRequest to false in page directive)
-    /// </summary>
-    [ToolboxData("<{0}:DisableRequestValidation runat=\"server\"></{0}:Item>")]
-    [Designer("umbraco.presentation.templateControls.ItemDesigner, Umbraco.Web")]
-    public class DisableRequestValidation : System.Web.UI.WebControls.WebControl
-    {
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-            ((UmbracoDefault)base.Page).ValidateRequest = false;
-        }
-
-        protected override void Render(System.Web.UI.HtmlTextWriter writer)
-        {
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs
deleted file mode 100644
index 8473341ca8cb..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Globalization;
-using System.Web;
-using System.Linq;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Umbraco.Core;
-using Umbraco.Core.Services;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web;
-using Umbraco.Web.Actions;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Macros;
-
-
-namespace umbraco.presentation.templateControls
-{
-    /// <summary>
-    /// Control that renders an Umbraco item on a page.
-    /// </summary>
-    [DefaultProperty("Field")]
-    [ToolboxData("<{0}:Item runat=\"server\"></{0}:Item>")]
-    [Designer("umbraco.presentation.templateControls.ItemDesigner, Umbraco.Web")]
-    public class Item : CompositeControl
-    {
-
-        #region Private Fields
-
-        /// <summary>The item's unique ID on the page.</summary>
-        private readonly int m_ItemId;
-        public AttributeCollectionAdapter LegacyAttributes;
-        #endregion
-
-        /// <summary>
-        /// Used by the UmbracoHelper to assign an IPublishedContent to the Item which allows us to pass this in
-        /// to the 'item' ctor so that it renders with the new API instead of the old one.
-        /// </summary>
-        internal IPublishedContent ContentItem { get; private set; }
-
-        #region Public Control Properties
-
-        /// <summary>
-        /// Gets or sets the field name.
-        /// </summary>
-        /// <value>The field name.</value>
-        [Bindable(true)]
-        [Category("Umbraco")]
-        [DefaultValue("")]
-        [Localizable(true)]
-        public string Field
-        {
-            get { return (string)ViewState["Field"] ?? String.Empty; }
-            set { ViewState["Field"] = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the node id expression.
-        /// </summary>
-        /// <value>The node id expression.</value>
-        [Bindable(true)]
-        [Category("Umbraco")]
-        [DefaultValue("")]
-        [Localizable(true)]
-        public string NodeId
-        {
-            get { return (string)ViewState["NodeId"] ?? String.Empty; }
-            set { ViewState["NodeId"] = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the text to display if the control is empty.
-        /// </summary>
-        /// <value>The text to display if the control is empty.</value>
-        [Bindable(true)]
-        [Category("Umbraco")]
-        [DefaultValue("")]
-        [Localizable(true)]
-        public string TextIfEmpty
-        {
-            get { return (string)ViewState["TextIfEmpty"] ?? String.Empty; }
-            set { ViewState["TextIfEmpty"] = value; }
-        }
-        
-        [Bindable(true)]
-        [Category("Umbraco")]
-        [DefaultValue("")]
-        [Localizable(true)]
-        public bool DebugMode
-        {
-            get { return ((ViewState["DebugMode"] == null) ? false : (bool)ViewState["DebugMode"]); }
-            set { ViewState["DebugMode"] = value; }
-        }
-
-        public ItemRenderer Renderer { get; set; }
-
-        #endregion
-
-        #region Public Readonly Properties
-
-        /// <summary>
-        /// Gets the item's unique ID on the page.
-        /// </summary>
-        /// <value>The item id.</value>
-        public int ItemId
-        {
-            get { return m_ItemId; }
-        }
-
-        /// <summary>
-        /// Gets the Umbraco page elements.
-        /// </summary>
-        /// <value>The Umbraco page elements.</value>
-        public Hashtable PageElements
-        {
-            get
-            {
-                return Context.Items["pageElements"] as Hashtable;
-            }
-        }
-
-        #endregion
-
-        #region Public Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Item"/> class.
-        /// </summary>
-        public Item()
-        {
-            Renderer = ItemRenderer.Instance;
-        }
-
-        /// <summary>
-        /// Internal ctor used to assign an IPublishedContent object.
-        /// </summary>
-        /// <param name="contentItem"></param>
-        internal Item(IPublishedContent contentItem)
-            :this()
-        {
-            ContentItem = contentItem;
-        }
-
-        #endregion
-
-        #region Overriden Control Methods
-
-        /// <summary>
-        /// Raises the <see cref="E:System.Web.UI.Control.Init"/> event.
-        /// </summary>
-        /// <param name="e">An <see cref="T:System.EventArgs"/> object that contains the event data.</param>
-        protected override void OnInit(EventArgs e)
-        {
-            Attributes.Add("field", Field);
-            LegacyAttributes = new AttributeCollectionAdapter(Attributes);
-            Renderer.Init(this);
-
-            base.OnInit(e);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="E:System.Web.UI.Control.Load"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="T:System.EventArgs"/> object that contains the event data.</param>
-        protected override void OnLoad(EventArgs e)
-        {
-            Renderer.Load(this);
-
-            base.OnLoad(e);
-        }
-
-        /// <summary>
-        /// Writes the <see cref="T:System.Web.UI.WebControls.CompositeControl"/> content
-        /// to the specified <see cref="T:System.Web.UI.HtmlTextWriter"/> object, for display on the client.
-        /// </summary>
-        /// <param name="writer">
-        ///     An <see cref="T:System.Web.UI.HtmlTextWriter"/> that represents
-        ///     the output stream to render HTML content on the client.
-        /// </param>
-        protected override void Render(HtmlTextWriter writer)
-        {
-            Renderer.Render(this, writer);
-        }
-
-        #endregion
-
-        #region Helper Functions
-
-        /// <summary>
-        /// Gets the parsed node id. As a nodeid on a item element can be null, an integer or even a squarebracket syntax, this helper method
-        /// is handy for getting the exact parsed nodeid back.
-        /// </summary>
-        /// <returns>The parsed nodeid, the id of the current page OR null if it's not specified</returns>
-        public int? GetParsedNodeId()
-        {
-            if (!String.IsNullOrEmpty(NodeId))
-            {
-                string tempNodeId = MacroRenderer.ParseAttribute(PageElements, NodeId);
-                int nodeIdInt = 0;
-                if (int.TryParse(tempNodeId, out nodeIdInt))
-                {
-                    return nodeIdInt;
-                }
-            }
-            else if (UmbracoContext.Current.PageId != null)
-            {
-                return UmbracoContext.Current.PageId.Value;
-            }
-            return null;
-        }
-
-
-        /// <summary>
-        /// Gets a value indicating whether this control is inside the form tag.
-        /// </summary>
-        /// <returns><c>true</c> if this control is inside the form tag; otherwise, <c>false</c>.</returns>
-        protected virtual bool IsInsideFormTag()
-        {
-            // check if this control has an ancestor that is the page form
-            for (Control parent = this.Parent; parent != null; parent = parent.Parent)
-                if (parent == Page.Form)
-                    return true;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Returns a <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
-        /// </returns>
-        public override string ToString()
-        {
-            return String.Format("Item {0} (NodeId '{1}' : {2})", ItemId, NodeId, Field);
-        }
-
-        #endregion
-
-        #region Field Information Functions
-
-        static string FindAttribute(IDictionary attributes, string key)
-        {
-            key = key.ToLowerInvariant();
-            var attributeValue = attributes.Contains(key) ? attributes[key].ToString() : string.Empty;
-            return MacroRenderer.ParseAttribute(null, attributeValue);
-        }
-
-        /// <summary>
-        /// Determines whether the field is a dictionary item.
-        /// </summary>
-        /// <returns><c>true</c> if the field is a dictionary item; otherwise, <c>false</c>.</returns>
-        protected virtual bool FieldIsDictionaryItem()
-        {
-            return FindAttribute(new AttributeCollectionAdapter(Attributes), "field").StartsWith("#");
-        }
-
-        /// <summary>
-        /// Determines whether the field is recursive.
-        /// </summary>
-        /// <returns><c>true</c> if the field is recursive; otherwise, <c>false</c>.</returns>
-        protected virtual bool FieldIsRercursive()
-        {
-            return FindAttribute(new AttributeCollectionAdapter(Attributes), "recursive") == "true";
-        }
-
-
-        /// <summary>
-        /// Gets a value indicating whether the current item is editable by the current user.
-        /// </summary>
-        /// <value><c>true</c> if the current item is editable by the current user; otherwise, <c>false</c>.</value>
-        protected virtual bool FieldEditableWithUserPermissions()
-        {
-            var u = UmbracoContext.Current.Security.CurrentUser;
-            if (u == null) return false;
-            var permission = Current.Services.UserService.GetPermissions(u, PageElements["path"].ToString());
-
-            return permission.AssignedPermissions.Contains(ActionUpdate.ActionLetter.ToString(CultureInfo.InvariantCulture), StringComparer.Ordinal);
-        }
-
-        #endregion
-    }
-
-    public class ItemDesigner : System.Web.UI.Design.ControlDesigner {
-
-        private Item m_control;
-
-        public override string GetDesignTimeHtml()
-        {
-            m_control =  this.Component as Item;
-            return returnMarkup(String.Format("Getting '{0}'", m_control.Field));
-        }
-
-        private string returnMarkup(string message)
-        {
-            return "<span style=\"background-color: #DDD; padding: 2px;\">" + message  + "</span>";
-        }
-
-        protected override string GetErrorDesignTimeHtml(Exception e)
-        {
-            if (this.Component != null) {
-                m_control = this.Component as Item;
-            }
-
-            if (m_control != null && !String.IsNullOrEmpty(m_control.Field))
-            {
-                return returnMarkup(String.Format("Getting '{0}'", m_control.Field));
-            }
-            else { return returnMarkup("<em>Please add a Field property</em>"); }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
deleted file mode 100644
index 67e82b382230..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.UI;
-using System.Xml;
-using Umbraco.Core.Macros;
-using Umbraco.Web.Templates;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Macros;
-
-namespace umbraco.presentation.templateControls
-{
-    public class ItemRenderer
-    {
-        public readonly static ItemRenderer Instance = new ItemRenderer();
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ItemRenderer"/> class.
-        /// </summary>
-        protected ItemRenderer()
-        { }
-
-        /// <summary>
-        /// Renders the specified item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="writer">The writer.</param>
-        public virtual void Render(Item item, HtmlTextWriter writer)
-        {
-            if (item.DebugMode)
-            {
-                writer.AddAttribute(HtmlTextWriterAttribute.Title, string.Format("Field Tag: '{0}'", item.Field));
-                writer.AddAttribute("style", "border: 1px solid #fc6;");
-                writer.RenderBeginTag(HtmlTextWriterTag.Div);
-            }
-
-            try
-            {
-                StringWriter renderOutputWriter = new StringWriter();
-                HtmlTextWriter htmlWriter = new HtmlTextWriter(renderOutputWriter);
-                foreach (Control control in item.Controls)
-                {
-                    try
-                    {
-                        control.RenderControl(htmlWriter);
-                    }
-                    catch (Exception renderException)
-                    {
-                        // TODO: Validate that the current control is within the scope of a form control
-                        // Even controls that are inside this scope, can produce this error in async postback.
-                        HttpContext.Current.Trace.Warn("ItemRenderer",
-                            String.Format("Error rendering control {0} of {1}.", control.ClientID, item), renderException);
-                    }
-                }
-
-                // parse macros and execute the XSLT transformation on the result if not empty
-                string renderOutput = renderOutputWriter.ToString();
-                renderOutput = renderOutput.Trim().Length == 0 ? string.Empty : renderOutput;
-                // handle text before/after
-                renderOutput = AddBeforeAfterText(renderOutput, FindAttribute(item.LegacyAttributes, "insertTextBefore"), FindAttribute(item.LegacyAttributes, "insertTextAfter"));
-                string finalResult = renderOutput.Trim().Length > 0 ? renderOutput : GetEmptyText(item);
-
-                //Don't parse urls if a content item is assigned since that is taken care
-                // of with the value converters
-                if (item.ContentItem == null)
-                {
-                    writer.Write(TemplateUtilities.ResolveUrlsFromTextString(finalResult));
-                }
-                else
-                {
-                    writer.Write(finalResult);
-                }
-
-            }
-            catch (Exception renderException)
-            {
-                HttpContext.Current.Trace.Warn("ItemRenderer", String.Format("Error rendering {0}.", item), renderException);
-            }
-            finally
-            {
-                if (item.DebugMode)
-                {
-                    writer.RenderEndTag();
-                }
-            }
-        }
-
-        static string FindAttribute(IDictionary attributes, string key)
-        {
-            key = key.ToLowerInvariant();
-            var attributeValue = attributes.Contains(key) ? attributes[key].ToString() : string.Empty;
-            return MacroRenderer.ParseAttribute(null, attributeValue);
-        }
-
-        /// <summary>
-        /// Renders the field contents.
-        /// Checks via the NodeId attribute whether to fetch data from another page than the current one.
-        /// </summary>
-        /// <returns>A string of field contents (macros not parsed)</returns>
-        protected virtual string GetFieldContents(Item item)
-        {
-            var tempElementContent = string.Empty;
-
-            // if a nodeId is specified we should get the data from another page than the current one
-            if (string.IsNullOrEmpty(item.NodeId) == false)
-            {
-                var tempNodeId = item.GetParsedNodeId();
-                if (tempNodeId != null && tempNodeId.Value != 0)
-                {
-                    //moved the following from the catch block up as this will allow fallback options alt text etc to work
-                    // stop using GetXml
-                    //var cache = Umbraco.Web.UmbracoContext.Current.ContentCache.InnerCache as PublishedContentCache;
-                    //if (cache == null) throw new InvalidOperationException("Unsupported IPublishedContentCache, only the Xml one is supported.");
-                    //var xml = cache.GetXml(Umbraco.Web.UmbracoContext.Current, Umbraco.Web.UmbracoContext.Current.InPreviewMode);
-                    //var itemPage = new page(xml.GetElementById(tempNodeId.ToString()));
-                    var c = Umbraco.Web.UmbracoContext.Current.ContentCache.GetById(tempNodeId.Value);
-                    var itemPage = new page(c);
-
-                    tempElementContent =
-                        new item(item.ContentItem, itemPage.Elements, item.LegacyAttributes).FieldContent;
-                }
-            }
-            else
-            {
-                // gets the field content from the current page (via the PageElements collection)
-                tempElementContent =
-                    new item(item.ContentItem, item.PageElements, item.LegacyAttributes).FieldContent;
-            }
-
-            return tempElementContent;
-        }
-
-        /// <summary>
-        /// Inits the specified item. To be called from the OnInit method of Item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        public virtual void Init(Item item)
-        { }
-
-        /// <summary>
-        /// Loads the specified item. To be called from the OnLoad method of Item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        public virtual void Load(Item item)
-        {
-            using (Current.ProfilingLogger.DebugDuration<ItemRenderer>(string.Format("Item: {0}", item.Field)))
-            {
-                ParseMacros(item);
-            }
-        }
-
-        /// <summary>
-        /// Parses the macros inside the text, by creating child elements for each item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        protected virtual void ParseMacros(Item item)
-        {
-            // do nothing if the macros have already been rendered
-            if (item.Controls.Count > 0)
-                return;
-
-            var elementText = GetFieldContents(item);
-
-            //Don't parse macros if there's a content item assigned since the content value
-            // converters take care of that, just add the already parsed text
-            if (item.ContentItem != null)
-            {
-                item.Controls.Add(new LiteralControl(elementText));
-            }
-            else
-            {
-                using (Current.ProfilingLogger.DebugDuration<ItemRenderer>("Parsing Macros"))
-                {
-
-                    MacroTagParser.ParseMacros(
-                        elementText,
-
-                        //callback for when a text block is parsed
-                        textBlock => item.Controls.Add(new LiteralControl(textBlock)),
-
-                        //callback for when a macro is parsed:
-                        (macroAlias, attributes) =>
-                        {
-                            var macroControl = new Macro
-                            {
-                                Alias = macroAlias
-                            };
-                            foreach (var i in attributes.Where(i => macroControl.Attributes[i.Key] == null))
-                            {
-                                macroControl.Attributes.Add(i.Key, i.Value);
-                            }
-                            item.Controls.Add(macroControl);
-                        });
-                }
-            }
-
-        }
-
-        protected string AddBeforeAfterText(string text, string before, string after)
-        {
-            if (!String.IsNullOrEmpty(text))
-            {
-                if (!String.IsNullOrEmpty(before))
-                    text = String.Format("{0}{1}", HttpContext.Current.Server.HtmlDecode(before), text);
-                if (!String.IsNullOrEmpty(after))
-                    text = String.Format("{0}{1}", text, HttpContext.Current.Server.HtmlDecode(after));
-            }
-
-            return text;
-        }
-
-        /// <summary>
-        /// Gets the text to display if the field contents are empty.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>The text to display.</returns>
-        protected virtual string GetEmptyText(Item item)
-        {
-            return item.TextIfEmpty;
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs
deleted file mode 100644
index 0d54ce2a02c3..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Collections;
-using System.Web;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Models;
-using Umbraco.Web;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Macros;
-
-namespace umbraco.presentation.templateControls
-{
-
-    [DefaultProperty("Alias")]
-    [ToolboxData("<{0}:Macro runat=server></{0}:Macro>")]
-    [PersistChildren(false)]
-    [ParseChildren(true, "Text")]
-    public class Macro : WebControl, ITextControl
-    {
-        public Hashtable MacroAttributes { get; set; } = new Hashtable();
-
-        [Bindable(true)]
-        [Category("Umbraco")]
-        [DefaultValue("")]
-        [Localizable(true)]
-        public string Alias
-        {
-            get
-            {
-                var s = (string)ViewState["Alias"];
-                return s ?? string.Empty;
-            }
-
-            set
-            {
-                ViewState["Alias"] = value;
-            }
-        }
-
-        [Bindable(true)]
-        [Category("Umbraco")]
-        [DefaultValue("")]
-        [Localizable(true)]
-        public string Language {
-            get {
-                var s = (string)ViewState["Language"];
-                return s ?? string.Empty;
-            }
-            set {
-                ViewState["Language"] = value.ToLower();
-            }
-        }
-
-        [Bindable(true)]
-        [Category("Umbraco")]
-        [DefaultValue("")]
-        [Localizable(true)]
-        public string FileLocation {
-            get {
-                var s = (string)ViewState["FileLocation"];
-                return s ?? string.Empty;
-            }
-            set {
-                ViewState["FileLocation"] = value.ToLower();
-            }
-        }
-        [Bindable(true)]
-        [Category("Umbraco")]
-        [DefaultValue(RenderEvents.Init)]
-        [Localizable(true)]
-        public RenderEvents RenderEvent
-        {
-            get
-            {
-                var renderEvent = RenderEvents.Init;
-                if (ViewState["RenderEvent"] != null)
-                    renderEvent = (RenderEvents)ViewState["RenderEvent"];
-                return renderEvent;
-            }
-            set
-            {
-                ViewState["RenderEvent"] = value;
-            }
-        }
-
-        // Indicates where to run EnsureChildControls and effectively render the macro
-        public enum RenderEvents
-        {
-            Init,
-            PreRender,
-            Render
-        }
-
-        public IList<Exception> Exceptions = new List<Exception>();
-
-        /// <summary>
-        /// Raises the <see cref="E:System.Web.UI.Control.Init"/> event.
-        /// </summary>
-        /// <param name="e">An <see cref="T:System.EventArgs"/> object that contains the event data.</param>
-        protected override void OnInit(EventArgs e) {
-            base.OnInit(e);
-
-            // Create child controls when told to - this is the default
-            if (RenderEvent == RenderEvents.Init)
-                EnsureChildControls();
-        }
-
-        // Create child controls when told to - new option to render at PreRender
-        protected override void OnPreRender(EventArgs e)
-        {
-            base.OnPreRender(e);
-
-            if (RenderEvent == RenderEvents.PreRender)
-                EnsureChildControls();
-        }
-
-        /// <summary>
-        /// Called by the ASP.NET page framework to notify server controls that use composition-based implementation to create any child controls they contain in preparation for posting back or rendering.
-        /// </summary>
-        protected override void CreateChildControls() {
-            // collect all attributes set on the control
-            var keys = Attributes.Keys;
-            foreach (string key in keys)
-                MacroAttributes.Add(key.ToLower(), HttpUtility.HtmlDecode(Attributes[key]));
-
-            if (MacroAttributes.ContainsKey("macroalias") == false && MacroAttributes.ContainsKey("macroAlias") == false)
-                MacroAttributes.Add("macroalias", Alias);
-
-            // set pageId to int.MinValue if no pageID was found,
-            // e.g. if the macro was rendered on a custom (non-Umbraco) page
-            var pageId = UmbracoContext.Current.PageId == null ? int.MinValue : UmbracoContext.Current.PageId.Value;
-
-            if ((string.IsNullOrEmpty(Language) == false && Text != "") || string.IsNullOrEmpty(FileLocation) == false) {
-                var tempMacro = new MacroModel();
-                MacroRenderer.GenerateMacroModelPropertiesFromAttributes(tempMacro, MacroAttributes);
-
-                // executing an inline macro?
-                // ie the code of the macro is in the control's text body
-                // ok, this is not supported in v8 anymore
-                if (string.IsNullOrEmpty(FileLocation))
-                    throw new NotSupportedException("Inline macros are not supported anymore.");
-
-                // executing an on-disk macro
-                // it has to be a partial (cshtml or vbhtml) macro in v8
-                var extension = System.IO.Path.GetExtension(FileLocation);
-                if (extension.InvariantEndsWith(".cshtml") == false && extension.InvariantEndsWith(".vbhtml") == false)
-                    throw new NotSupportedException("");
-
-                tempMacro.MacroSource = FileLocation;
-                tempMacro.MacroType = MacroTypes.PartialView;
-
-                if (string.IsNullOrEmpty(Attributes["Cache"]) == false)
-                {
-                    int cacheDuration;
-                    if (int.TryParse(Attributes["Cache"], out cacheDuration))
-                        tempMacro.CacheDuration = cacheDuration;
-                    else
-                        Context.Trace.Warn("Template", "Cache attribute is in incorect format (should be an integer).");
-                }
-
-                var renderer = new MacroRenderer(Current.ProfilingLogger);
-                var c = renderer.Render(tempMacro, (Hashtable) Context.Items["pageElements"], pageId).GetAsControl();
-                if (c != null)
-                {
-                    Exceptions = renderer.Exceptions;
-                    Controls.Add(c);
-                }
-                else
-                {
-                    Context.Trace.Warn("Template", "Result of inline macro scripting is null");
-                }
-            }
-            else
-            {
-                var m = Current.Services.MacroService.GetByAlias(Alias);
-                if (m == null) return;
-
-                var tempMacro = new MacroModel(m);
-                try
-                {
-                    var renderer = new MacroRenderer(Current.ProfilingLogger);
-                    var c = renderer.Render(tempMacro, (Hashtable)Context.Items["pageElements"], pageId, MacroAttributes).GetAsControl();
-                    if (c != null)
-                        Controls.Add(c);
-                    else
-                        Context.Trace.Warn("Template", "Result of macro " + tempMacro.Name + " is null");
-                }
-                catch (Exception ee)
-                {
-                    Context.Trace.Warn("Template", "Error adding macro " + tempMacro.Name, ee);
-                    throw;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Renders the control to the specified HTML writer.
-        /// </summary>
-        /// <param name="writer">The <see cref="T:System.Web.UI.HtmlTextWriter"/> object that receives the control content.</param>
-        protected override void Render(HtmlTextWriter writer)
-        {
-            // Create child controls when told to - do it here anyway as it has to be done
-            EnsureChildControls();
-
-            var isDebug = GlobalSettings.DebugMode && (Context.Request.GetItemAsString("umbdebugshowtrace") != "" || Context.Request.GetItemAsString("umbdebug") != "");
-            if (isDebug)
-            {
-                writer.Write("<div title=\"Macro Tag: '{0}'\" style=\"border: 1px solid #009;\">", Alias);
-            }
-            RenderChildren(writer);
-            if (isDebug)
-            {
-                writer.Write("</div>");
-            }
-        }
-
-        public string Text { get; set; } = string.Empty;
-    }
-}

From 0480242532498af5f7f79d0e028ff5f1ff4f91b7 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 23 Jan 2019 18:56:33 +0000
Subject: [PATCH 033/421] =?UTF-8?q?Some=20sneaky=20MasterPages=20kill=20th?=
 =?UTF-8?q?e=20last=20of=20them=20off=20with=20fire=20=F0=9F=94=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Umbraco/masterpages/Default.Master.cs     |  11 -
 .../masterpages/Default.Master.designer.cs    |  15 --
 .../masterpages/UmbracoDialog.master.cs       |  11 -
 .../UmbracoDialog.master.designer.cs          |  24 --
 .../Umbraco/masterpages/UmbracoPage.master.cs |  11 -
 .../UmbracoPage.master.designer.cs            |  24 --
 .../Umbraco/masterpages/umbracoDialog.Master  |  35 ---
 .../Umbraco/masterpages/umbracoPage.Master    |  40 ---
 .../umbraco/masterpages/default.Master.cs     |  35 ---
 .../masterpages/umbracoDialog.Master.cs       | 161 ------------
 .../umbraco/masterpages/umbracoPage.Master.cs | 239 ------------------
 11 files changed, 606 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.designer.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.designer.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.designer.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/umbracoDialog.Master
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/umbracoPage.Master
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs

diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.cs
deleted file mode 100644
index 33daac7b3243..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Web.UI.Umbraco.Masterpages
-{
-    public partial class Default : global::umbraco.presentation.masterpages._default
-    {
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.designer.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.designer.cs
deleted file mode 100644
index 68f54a4fabd9..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/Default.Master.designer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco.Masterpages {
-
-
-    public partial class Default {
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.cs
deleted file mode 100644
index 33d1c9f79b75..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Web.UI.Umbraco.Masterpages
-{
-    public partial class UmbracoDialog : global::umbraco.presentation.masterpages.umbracoDialog
-    {
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.designer.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.designer.cs
deleted file mode 100644
index 38f9e1f6bc58..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoDialog.master.designer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco.Masterpages {
-
-
-    public partial class UmbracoDialog {
-
-        /// <summary>
-        /// DocType control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder DocType;
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.cs
deleted file mode 100644
index e45cf3e68bb2..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Web.UI.Umbraco.Masterpages
-{
-    public partial class UmbracoPage : global::umbraco.presentation.masterpages.umbracoPage
-    {
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.designer.cs b/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.designer.cs
deleted file mode 100644
index 7a24953c3fa4..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/UmbracoPage.master.designer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco.Masterpages {
-
-
-    public partial class UmbracoPage {
-
-        /// <summary>
-        /// DocType control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder DocType;
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/umbracoDialog.Master b/src/Umbraco.Web.UI/Umbraco/masterpages/umbracoDialog.Master
deleted file mode 100644
index d74a41d63792..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/umbracoDialog.Master
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ Master Language="C#" AutoEventWireup="True" CodeBehind="UmbracoDialog.master.cs" Inherits="Umbraco.Web.UI.Umbraco.Masterpages.UmbracoDialog" %>
-
-<asp:contentplaceholder id="DocType" runat="server">
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-</asp:contentplaceholder>
-
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="Umbraco.Web" %>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title></title>
-
-    <cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
-
-    <!-- Default script and style -->
-    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="assets/css/umbraco.css" PathNameAlias="UmbracoRoot" />
-
-    <umbClient:JsApplicationLib runat="server" />
-    <umbClient:JsJQueryCore runat="server" />
-    <umbClient:JsUmbracoApplicationCore runat="server" />
-    
-    <asp:ContentPlaceHolder ID="head" runat="server"></asp:ContentPlaceHolder>
-</head>
-
-<body class="umbracoDialog umb-dialog">
-    <form id="form1" runat="server">
-        <asp:ScriptManager ID="ScriptManager1" EnablePartialRendering="true" runat="server"></asp:ScriptManager>
-        <asp:ContentPlaceHolder ID="body" runat="server">
-        </asp:ContentPlaceHolder>
-    </form>
-    <asp:ContentPlaceHolder ID="footer" runat="server"></asp:ContentPlaceHolder>
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/umbracoPage.Master b/src/Umbraco.Web.UI/Umbraco/masterpages/umbracoPage.Master
deleted file mode 100644
index 380ed3d89849..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/umbracoPage.Master
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ Master Language="C#" AutoEventWireup="True" CodeBehind="UmbracoPage.master.cs" Inherits="Umbraco.Web.UI.Umbraco.Masterpages.UmbracoPage" %>
-
-<asp:ContentPlaceHolder ID="DocType" runat="server">
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-</asp:ContentPlaceHolder>
-
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="Umbraco.Web" %>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title></title>
-    <cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
-
-    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="assets/css/umbraco.css" PathNameAlias="UmbracoRoot" />
-
-    <umbClient:JsApplicationLib runat="server"/>
-    <umbClient:JsJQueryCore runat="server"/>
-    <umbClient:JsUmbracoApplicationCore runat="server"/>
-    <umbClient:JsJQueryPlugins runat="server"/>
-
-
-    <umb:JsInclude runat="server" FilePath="lib/bootstrap/js/bootstrap.2.3.2.min.js" PathNameAlias="UmbracoRoot" Priority="10" />
-    <umb:JsInclude runat="server" FilePath="lib/umbraco/compat.js" PathNameAlias="UmbracoRoot" Priority="10" />
-
-    <asp:ContentPlaceHolder ID="head" runat="server">
-    </asp:ContentPlaceHolder>
-</head>
-<body class="umbracoPage">
-    <form id="form1" runat="server">
-    <asp:ScriptManager ID="ScriptManager1" EnablePartialRendering="true" runat="server">
-    </asp:ScriptManager>
-    <asp:ContentPlaceHolder ID="body" runat="server">
-    </asp:ContentPlaceHolder>
-    </form>
-    <asp:ContentPlaceHolder ID="footer" runat="server">
-    </asp:ContentPlaceHolder>
-</body>
-</html>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master.cs
deleted file mode 100644
index c28a21824649..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/default.Master.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Web.Mvc;
-using System.Web.UI;
-using Umbraco.Web;
-using System.IO;
-
-namespace umbraco.presentation.masterpages
-{
-    public partial class _default : MasterPage
-    {
-
-        protected override void Render(HtmlTextWriter writer)
-        {
-            // get base output
-            StringWriter baseWriter = new StringWriter();
-            base.Render(new HtmlTextWriter(baseWriter));
-            string baseOutput = baseWriter.ToString();
-
-            // add custom umbraco namespace (required for events on custom tags in IE)
-            baseOutput = baseOutput.Replace("<html", "<html xmlns:umbraco=\"http://umbraco.org\"");
-
-            // write modified output
-            writer.Write(baseOutput);
-        }
-
-        /// <summary>
-        /// ContentPlaceHolderDefault control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolderDefault;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs
deleted file mode 100644
index b7ec63576b95..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Umbraco.Core.IO;
-using Umbraco.Web.UI.JavaScript;
-
-namespace umbraco.presentation.masterpages
-{
-    public partial class umbracoDialog : System.Web.UI.MasterPage
-    {
-
-        public bool reportModalSize { get; set; }
-        public static new event MasterPageLoadHandler Load;
-        public new static event MasterPageLoadHandler Init;
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            ClientLoader.DataBind();
-            ScriptManager.RegisterStartupScript(Page, Page.GetType(), "setRoot", "UmbClientMgr.setUmbracoPath(\"" + IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "\");", true);
-            FireOnLoad(e);
-        }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            if (Init != null)
-            {
-                Init(this, e);
-            }
-        }
-
-
-        protected virtual void FireOnLoad(EventArgs e)
-        {
-            if (Load != null)
-            {
-                Load(this, e);
-            }
-        }
-
-        /// <summary>
-        /// Head1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
-        /// <summary>
-        /// ClientLoader control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected UmbracoClientDependencyLoader ClientLoader;
-
-        /// <summary>
-        /// CssInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-
-        /// <summary>
-        /// JsInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
-        /// <summary>
-        /// JsInclude3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
-
-        /// <summary>
-        /// JsInclude6 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude6;
-
-        /// <summary>
-        /// JsInclude4 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude4;
-
-        /// <summary>
-        /// JsInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-
-        /// <summary>
-        /// head control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder head;
-
-        /// <summary>
-        /// form1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
-        /// <summary>
-        /// ScriptManager1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.ScriptManager ScriptManager1;
-
-        /// <summary>
-        /// body control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder body;
-
-        /// <summary>
-        /// footer control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder footer;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs
deleted file mode 100644
index 584ad4ca7f19..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-//This is only in case an upgrade goes wrong and the the /masterpages/ files are not copied over
-//which would result in an error. so we have kept the old namespaces intact with references to new ones
-using StackExchange.Profiling;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Profiling;
-using Umbraco.Web;
-using Umbraco.Web.UI.JavaScript;
-using mp = umbraco.presentation.masterpages;
-namespace umbraco.presentation.umbraco.masterpages
-{
-    public class umbracoPage : mp.umbracoPage { }
-    public class umbracoDialog : mp.umbracoDialog { }
-}
-
-namespace umbraco.presentation.masterpages
-{
-    public delegate void MasterPageLoadHandler(object sender, System.EventArgs e);
-
-    public partial class umbracoPage : System.Web.UI.MasterPage
-    {
-
-        public new static event MasterPageLoadHandler Load;
-        public new static event MasterPageLoadHandler Init;
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            ClientLoader.DataBind();
-            FireOnLoad(e);
-        }
-
-
-        protected override void Render(HtmlTextWriter writer)
-        {
-            // get base output
-            var baseWriter = new StringWriter();
-            base.Render(new HtmlTextWriter(baseWriter));
-            var baseOutput = baseWriter.ToString();
-
-            // profiling
-            if (string.IsNullOrEmpty(Request.QueryString["umbDebug"]) == false && GlobalSettings.DebugMode)
-            {
-                var htmlHelper = new HtmlHelper(new ViewContext(), new ViewPage());
-                baseOutput = baseOutput.Replace("</body>", htmlHelper.RenderProfiler() + "</body>");
-            }
-
-            // write modified output
-            writer.Write(baseOutput);
-        }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            if (Init != null)
-            {
-                Init(this, e);
-            }
-        }
-
-
-        protected virtual void FireOnLoad(EventArgs e)
-        {
-            if (Load != null)
-            {
-                Load(this, e);
-            }
-        }
-
-        /// <summary>
-        /// ClientLoader control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected UmbracoClientDependencyLoader ClientLoader;
-
-        /// <summary>
-        /// CssInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-
-        /// <summary>
-        /// CssInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude2;
-
-        /// <summary>
-        /// JsInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
-        /// <summary>
-        /// JsInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-
-        /// <summary>
-        /// JsInclude8 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude8;
-
-        /// <summary>
-        /// JsInclude9 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude9;
-
-        /// <summary>
-        /// JsInclude4 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude4;
-
-        /// <summary>
-        /// JsInclude5 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude5;
-
-        /// <summary>
-        /// JsInclude6 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude6;
-
-        /// <summary>
-        /// JsInclude7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude7;
-
-        /// <summary>
-        /// JsInclude3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
-
-        /// <summary>
-        /// JsIncludeHotkeys control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsIncludeHotkeys;
-
-        /// <summary>
-        /// head control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder head;
-
-        /// <summary>
-        /// form1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
-        /// <summary>
-        /// ScriptManager1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.ScriptManager ScriptManager1;
-
-        /// <summary>
-        /// body control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder body;
-
-        /// <summary>
-        /// footer control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ContentPlaceHolder footer;
-    }
-}

From b389e6c07feb13de540762e87265fa5808056400 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 24 Jan 2019 08:16:55 +0100
Subject: [PATCH 034/421] 3396 - don't let user determine whether to publish
 mandatory languages on first publish. All mandatory languages with data is
 saved. If a mandatory language does not have data we cannot publish anything.

---
 .../src/views/content/overlays/publish.controller.js           | 3 ++-
 .../src/views/content/overlays/publish.html                    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
index 9074834ee631..74d80b6ab9ce 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
@@ -109,8 +109,9 @@
                     if (!vm.hasPristineVariants) {
                         vm.hasPristineVariants = pristineVariantFilter(variant);
                     }
-
+                    
                     if(vm.isNew && hasAnyData(variant)){
+                        variant.publish = true;
                         variant.save = true;
                     }
                 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index b33b7ccbfc52..3fd3015de22d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -18,6 +18,7 @@
                            type="checkbox"
                            ng-model="variant.publish"
                            ng-change="vm.changeSelection(variant)"
+                           ng-disabled="vm.isNew && variant.language.isMandatory"
                            style="margin-right: 8px;"
                            val-server-field="{{variant.htmlId}}" />
                     <div>

From cc897285c9a9a4786108930b6df8ea378c8357f6 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 24 Jan 2019 08:31:42 +0100
Subject: [PATCH 035/421] 3396 - Force publish for all mandatory langauges that
 has not yet beed published

---
 .../src/views/content/overlays/publish.controller.js | 12 +++++++++---
 .../src/views/content/overlays/publish.html          |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
index 74d80b6ab9ce..a86a636e9e1b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
@@ -110,9 +110,15 @@
                         vm.hasPristineVariants = pristineVariantFilter(variant);
                     }
                     
-                    if(vm.isNew && hasAnyData(variant)){
-                        variant.publish = true;
-                        variant.save = true;
+                    if(hasAnyData(variant)){
+                        if(vm.isNew || variant.publishDate == null){
+                            variant.publish = true;
+                            variant.save = true;
+                        }
+                    }else{
+                        variant.publish = false;
+                        variant.save = false;
+                        variant.canSave = false;
                     }
                 });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 3fd3015de22d..364ed47361e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -18,7 +18,7 @@
                            type="checkbox"
                            ng-model="variant.publish"
                            ng-change="vm.changeSelection(variant)"
-                           ng-disabled="vm.isNew && variant.language.isMandatory"
+                           ng-disabled="(vm.isNew && variant.language.isMandatory) || !variant.canSave"
                            style="margin-right: 8px;"
                            val-server-field="{{variant.htmlId}}" />
                     <div>

From 5842337d02385ce07c958f827f93c538a587e420 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 24 Jan 2019 09:42:49 +0100
Subject: [PATCH 036/421] 3396 - Fix for when clearing the name again

---
 .../src/views/content/overlays/publish.controller.js      | 8 ++++++--
 .../src/views/content/overlays/save.controller.js         | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
index a86a636e9e1b..1c8b302e520c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
@@ -55,7 +55,11 @@
         }
 
         function hasAnyData(variant) {
-            var result = variant.isDirty != null || (variant.name != null && variant.name.length > 0);
+            
+            if(variant.name == null || variant.name.length === 0) {
+                return false;
+            }
+            var result = variant.isDirty != null;
 
             if(result) return true;
 
@@ -109,7 +113,7 @@
                     if (!vm.hasPristineVariants) {
                         vm.hasPristineVariants = pristineVariantFilter(variant);
                     }
-                    
+
                     if(hasAnyData(variant)){
                         if(vm.isNew || variant.publishDate == null){
                             variant.publish = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
index 8d21234aee15..9d3a8a87e5d5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
@@ -32,7 +32,10 @@
         }
 
         function hasAnyData(variant) {
-            var result = variant.isDirty != null || (variant.name != null && variant.name.length > 0);
+            if(variant.name == null || variant.name.length === 0) {
+                return false;
+            }
+            var result = variant.isDirty != null;
 
             if(result) return true;
 

From ec8c455635e410203f7149bfe56f6df8467bbcf8 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 24 Jan 2019 11:28:27 +0100
Subject: [PATCH 037/421] Fixes for search of members + Removed fixme in member
 that apparently are not necessary after tags refactoring

---
 .../MemberValueSetValidator.cs                |  4 ++--
 src/Umbraco.Web/Editors/EntityController.cs   | 21 +++++++------------
 src/Umbraco.Web/Editors/MemberController.cs   |  5 -----
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Examine/MemberValueSetValidator.cs b/src/Umbraco.Examine/MemberValueSetValidator.cs
index 71de6001ce40..0c585854e945 100644
--- a/src/Umbraco.Examine/MemberValueSetValidator.cs
+++ b/src/Umbraco.Examine/MemberValueSetValidator.cs
@@ -23,10 +23,10 @@ public MemberValueSetValidator(IEnumerable<string> includeItemTypes, IEnumerable
         /// <summary>
         /// By default these are the member fields we index
         /// </summary>
-        public static readonly string[] DefaultMemberIndexFields = { "id", "nodeName", "updateDate", "loginName", "email" };
+        public static readonly string[] DefaultMemberIndexFields = { "id", "nodeName", "updateDate", "loginName", "email", UmbracoExamineIndex.NodeKeyFieldName };
 
         private static readonly IEnumerable<string> ValidCategories = new[] { IndexTypes.Member };
         protected override IEnumerable<string> ValidIndexCategories => ValidCategories;
-        
+
     }
 }
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index b25f3f5af157..392ad7a8dfd0 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -43,12 +43,16 @@ namespace Umbraco.Web.Editors
     public class EntityController : UmbracoAuthorizedJsonController
     {
         private readonly ITreeService _treeService;
+        private readonly UmbracoTreeSearcher _treeSearcher;
+        private readonly SearchableTreeCollection _searchableTreeCollection;
 
         public EntityController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState,
-            ITreeService treeService)
+            ITreeService treeService, SearchableTreeCollection searchableTreeCollection, UmbracoTreeSearcher treeSearcher)
             : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
         {
             _treeService = treeService;
+            _searchableTreeCollection = searchableTreeCollection;
+            _treeSearcher = treeSearcher;
         }
 
         /// <summary>
@@ -69,15 +73,6 @@ public void Initialize(HttpControllerSettings controllerSettings, HttpController
             }
         }
 
-        private readonly UmbracoTreeSearcher _treeSearcher;
-        private readonly SearchableTreeCollection _searchableTreeCollection;
-
-        public EntityController(SearchableTreeCollection searchableTreeCollection, UmbracoTreeSearcher treeSearcher)
-        {
-            _searchableTreeCollection = searchableTreeCollection;
-            _treeSearcher = treeSearcher;
-        }
-
         /// <summary>
         /// Returns an Umbraco alias given a string
         /// </summary>
@@ -242,7 +237,7 @@ public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
             };
         }
 
-     
+
         /// <summary>
         /// Gets an entity by a xpath query
         /// </summary>
@@ -932,7 +927,7 @@ private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType,
                         throw new NotSupportedException("Filtering on stylesheets is not currently supported");
 
                     return Services.FileService.GetStylesheets().Select(Mapper.Map<EntityBasic>);
-                
+
                 case UmbracoEntityTypes.Language:
 
                     if (!postFilter.IsNullOrWhiteSpace() || (postFilterParams != null && postFilterParams.Count > 0))
@@ -993,7 +988,7 @@ private void GetChildItemsForList(IDictionaryItem dictionaryItem, ICollection<En
 
                 GetChildItemsForList(childItem, list);
             }
-        } 
+        }
         #endregion
 
     }
diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs
index 92ca648c3f03..399cb13360e8 100644
--- a/src/Umbraco.Web/Editors/MemberController.cs
+++ b/src/Umbraco.Web/Editors/MemberController.cs
@@ -592,11 +592,6 @@ private void RefetchMemberData(MemberSave contentItem, LookupType lookup)
                 if (builtInAliases.Contains(p.Alias) == false && valueMapped != null)
                 {
                     p.SetValue(valueMapped.GetValue());
-
-                    // fixme/task - ok, I give up, at that point tags are dead here, until we figure it out
-                    //p.TagChanges.Behavior = valueMapped.TagChanges.Behavior;
-                    //p.TagChanges.Enable = valueMapped.TagChanges.Enable;
-                    //p.TagChanges.Tags = valueMapped.TagChanges.Tags;
                 }
             }
         }

From c7bbad3c0ce208eeddf43ea7fff04d19ee5455a6 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 24 Jan 2019 13:58:16 +0000
Subject: [PATCH 038/421] Lots or removal & tidy up - still WIP & may break
 build

---
 .../Services/MemberTypeServiceTests.cs        |   3 -
 src/Umbraco.Tests/UI/LegacyDialogTests.cs     |  12 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  51 +--
 src/Umbraco.Web.UI/Umbraco/Create.aspx.cs     |  34 --
 .../Umbraco/Create.aspx.designer.cs           |  25 --
 .../Umbraco/config/create/UI.Release.xml      |  18 -
 .../Umbraco/config/create/UI.xml              |  18 -
 src/Umbraco.Web.UI/Umbraco/create.aspx        |  43 ---
 src/Umbraco.Web.UI/Umbraco/create/simple.ascx |  22 --
 .../developer/Macros/EditMacro.aspx.cs        | 363 ------------------
 .../Macros/EditMacro.aspx.designer.cs         | 222 -----------
 .../Umbraco/developer/Macros/editMacro.aspx   | 190 ---------
 .../Umbraco/masterpages/default.Master        |   3 -
 src/Umbraco.Web.UI/default.aspx               |   2 -
 .../Actions/ActionChangeDocType.cs            |   7 +-
 src/Umbraco.Web/Actions/ActionCopy.cs         |   3 -
 src/Umbraco.Web/Actions/ActionDelete.cs       |   3 -
 src/Umbraco.Web/Actions/ActionMove.cs         |   3 -
 src/Umbraco.Web/Actions/ActionNew.cs          |   3 -
 src/Umbraco.Web/Actions/ActionProtect.cs      |   3 -
 src/Umbraco.Web/Actions/ActionRights.cs       |   3 -
 src/Umbraco.Web/Actions/ActionRollback.cs     |   3 -
 src/Umbraco.Web/Actions/ActionToPublish.cs    |   3 -
 src/Umbraco.Web/Actions/ActionUpdate.cs       |   3 -
 src/Umbraco.Web/Cache/MacroCacheRefresher.cs  |   2 +
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  22 +-
 src/Umbraco.Web/Mvc/UmbracoPageResult.cs      |  10 +-
 src/Umbraco.Web/Mvc/UrlHelperExtensions.cs    |   9 +-
 src/Umbraco.Web/Templates/TemplateRenderer.cs |   7 +-
 src/Umbraco.Web/UI/Pages/BasePage.cs          |  82 ----
 src/Umbraco.Web/UI/Pages/ClientTools.cs       | 347 -----------------
 .../UI/Pages/UmbracoEnsuredPage.cs            | 151 --------
 src/Umbraco.Web/Umbraco.Web.csproj            |  41 +-
 .../AttributeCollectionAdapter.cs             | 312 ---------------
 .../umbraco.presentation/MacroCacheContent.cs |   4 +-
 .../umbraco.presentation/default.aspx.cs      | 183 ---------
 src/Umbraco.Web/umbraco.presentation/item.cs  | 237 ------------
 src/Umbraco.Web/umbraco.presentation/page.cs  |   1 +
 .../umbraco/create.aspx.cs                    |  49 ---
 .../umbraco/create/macroTasks.cs              |  36 --
 .../umbraco/create/simple.ascx.cs             | 100 -----
 .../umbraco.presentation/umbracoPageHolder.cs | 114 ------
 42 files changed, 20 insertions(+), 2727 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/Create.aspx.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/Create.aspx.designer.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/config/create/UI.Release.xml
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/config/create/UI.xml
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/create.aspx
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/create/simple.ascx
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.designer.cs
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/masterpages/default.Master
 delete mode 100644 src/Umbraco.Web.UI/default.aspx
 delete mode 100644 src/Umbraco.Web/UI/Pages/BasePage.cs
 delete mode 100644 src/Umbraco.Web/UI/Pages/ClientTools.cs
 delete mode 100644 src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/AttributeCollectionAdapter.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/default.aspx.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/item.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbracoPageHolder.cs

diff --git a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
index b607290c5e3f..459daa3da659 100644
--- a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using NUnit.Framework;
-using umbraco.cms.presentation.create.controls;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
diff --git a/src/Umbraco.Tests/UI/LegacyDialogTests.cs b/src/Umbraco.Tests/UI/LegacyDialogTests.cs
index 5c8a621e1098..9f1e474bd91c 100644
--- a/src/Umbraco.Tests/UI/LegacyDialogTests.cs
+++ b/src/Umbraco.Tests/UI/LegacyDialogTests.cs
@@ -23,12 +23,12 @@ public void Ensure_All_Tasks_Are_Secured()
             }
         }
         
-        [TestCase(typeof(macroTasks), Constants.Applications.Settings)]
-        public void Check_Assigned_Apps_For_Tasks(Type taskType, string app)
-        {
-            var task = (LegacyDialogTask)Activator.CreateInstance(taskType);
-            Assert.AreEqual(task.AssignedApp, app);
-        }
+        //[TestCase(typeof(macroTasks), Constants.Applications.Settings)]
+        //public void Check_Assigned_Apps_For_Tasks(Type taskType, string app)
+        //{
+        //    var task = (LegacyDialogTask)Activator.CreateInstance(taskType);
+        //    Assert.AreEqual(task.AssignedApp, app);
+        //}
 
     }
 }
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 0ff158dadb46..d51c2f781489 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -80,7 +80,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Umbraco\Translation\" />
     <Folder Include="Views\MacroPartials\" />
   </ItemGroup>
   <ItemGroup>
@@ -134,7 +133,6 @@
     </Compile>
     <Compile Include="Config\splashes\NoNodes.aspx.designer.cs">
       <DependentUpon>noNodes.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
@@ -142,39 +140,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="Umbraco\Create.aspx.cs">
-      <DependentUpon>create.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Create.aspx.designer.cs">
-      <DependentUpon>create.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Umbraco\Developer\Macros\EditMacro.aspx.cs">
-      <DependentUpon>editMacro.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Developer\Macros\EditMacro.aspx.designer.cs">
-      <DependentUpon>editMacro.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Umbraco\Masterpages\Default.Master.cs">
-      <DependentUpon>default.Master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Masterpages\Default.Master.designer.cs">
-      <DependentUpon>default.Master</DependentUpon>
-    </Compile>
-    <Compile Include="Umbraco\Masterpages\UmbracoDialog.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Masterpages\UmbracoDialog.master.designer.cs">
-      <DependentUpon>umbracoDialog.Master</DependentUpon>
-    </Compile>
-    <Compile Include="Umbraco\Masterpages\UmbracoPage.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Masterpages\UmbracoPage.master.designer.cs">
-      <DependentUpon>umbracoPage.Master</DependentUpon>
-    </Compile>
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.htm" />
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
@@ -197,12 +162,11 @@
     <Content Include="Config\Lang\ru-RU.user.xml" />
     <Content Include="Config\Lang\sv-SE.user.xml" />
     <Content Include="Config\Lang\zh-CN.user.xml" />
+    <Content Include="Config\splashes\booting.aspx" />
+    <Content Include="Config\splashes\noNodes.aspx" />
     <Content Include="Umbraco\Config\Lang\cs.xml" />
     <Content Include="Umbraco\Config\Lang\tr.xml" />
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
-    <Content Include="Umbraco\create.aspx" />
-    <Content Include="Config\Splashes\booting.aspx" />
-    <Content Include="Config\Splashes\noNodes.aspx" />
     <Content Include="Umbraco\Install\Views\Web.config" />
     <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
     <None Include="Config\404handlers.Release.config">
@@ -261,10 +225,6 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </Content>
-    <None Include="Umbraco\Config\Create\UI.Release.xml">
-      <DependentUpon>UI.xml</DependentUpon>
-      <SubType>Designer</SubType>
-    </None>
     <Content Include="Global.asax" />
     <Content Include="Umbraco\Config\Lang\en_us.xml">
       <SubType>Designer</SubType>
@@ -277,7 +237,6 @@
     <Content Include="Umbraco\Config\Lang\zh.xml" />
     <Content Include="Umbraco\Config\Lang\ko.xml" />
     <Content Include="Umbraco\Dashboard\FeedProxy.aspx" />
-    <Content Include="default.aspx" />
     <Content Include="Umbraco\Config\Lang\da.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -288,7 +247,6 @@
     <Content Include="Umbraco\Config\Lang\nl.xml" />
     <Content Include="Umbraco\Config\Lang\nb.xml" />
     <Content Include="Umbraco\Config\Lang\sv.xml" />
-    <Content Include="Umbraco\Config\Create\UI.xml" />
     <Content Include="Umbraco\Config\Lang\en.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -348,15 +306,10 @@
       <DependentUpon>Web.Template.config</DependentUpon>
       <SubType>Designer</SubType>
     </None>
-    <Content Include="Umbraco\Masterpages\umbracoPage.Master" />
-    <Content Include="Umbraco\Masterpages\umbracoDialog.Master" />
-    <Content Include="Umbraco\Create\simple.ascx" />
-    <Content Include="Umbraco\Developer\Macros\editMacro.aspx" />
     <Content Include="Umbraco\Js\dualSelectBox.js" />
     <Content Include="Umbraco\Js\guiFunctions.js" />
     <Content Include="Umbraco\Js\umbracoCheckKeys.js" />
     <!--<Content Include="Umbraco\users\PermissionEditor.aspx" />-->
-    <Content Include="Umbraco\Masterpages\default.Master" />
     <None Include="web.Template.config">
       <SubType>Designer</SubType>
     </None>
diff --git a/src/Umbraco.Web.UI/Umbraco/Create.aspx.cs b/src/Umbraco.Web.UI/Umbraco/Create.aspx.cs
deleted file mode 100644
index 7848a5976b98..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/Create.aspx.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Web;
-using Umbraco.Web._Legacy.UI;
-
-namespace Umbraco.Web.UI.Umbraco
-{
-    public partial class CreateDialog : global::umbraco.cms.presentation.Create
-    {
-
-        protected override void OnLoad(EventArgs e)
-        {
-            if (SecurityCheck(Request.QueryString["nodeType"]))
-            {
-                //if we're allowed, then continue
-                base.OnLoad(e);
-            }
-            else
-            {
-                //otherwise show an error
-                UI.Visible = false;
-                AccessError.Visible = true;
-            }
-        }
-
-        private bool SecurityCheck(string nodeTypeAlias)
-        {
-            return LegacyDialogHandler.UserHasCreateAccess(
-                new HttpContextWrapper(Context),
-                Security.CurrentUser,
-                nodeTypeAlias);
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/Create.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/Create.aspx.designer.cs
deleted file mode 100644
index c17aadcbf284..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/Create.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco {
-
-
-    public partial class CreateDialog
-    {
-
-        /// <summary>
-        /// AccessError control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.PlaceHolder AccessError;
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/config/create/UI.Release.xml b/src/Umbraco.Web.UI/Umbraco/config/create/UI.Release.xml
deleted file mode 100644
index 635174b9da79..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/config/create/UI.Release.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<createUI>
-    <nodeType alias="initmacros">
-        <header>Macro</header>
-        <usercontrol>/create/simple.ascx</usercontrol>
-        <tasks>
-            <create assembly="Umbraco.Web" type="macroTasks" />
-        </tasks>
-    </nodeType>
-    <nodeType alias="macros">
-        <header>Macro</header>
-        <usercontrol>/create/simple.ascx</usercontrol>
-        <tasks>
-            <create assembly="Umbraco.Web" type="macroTasks" />
-            <delete assembly="Umbraco.Web" type="macroTasks" />
-        </tasks>
-    </nodeType>
-</createUI>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/create/UI.xml b/src/Umbraco.Web.UI/Umbraco/config/create/UI.xml
deleted file mode 100644
index c075a0b8b9ae..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/config/create/UI.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<createUI>
-    <nodeType alias="initmacros">
-        <header>Macro</header>
-        <usercontrol>/create/simple.ascx</usercontrol>
-        <tasks>
-            <create assembly="Umbraco.Web" type="macroTasks" />
-        </tasks>
-    </nodeType>
-    <nodeType alias="macros">
-        <header>Macro</header>
-        <usercontrol>/create/simple.ascx</usercontrol>
-        <tasks>
-            <create assembly="Umbraco.Web" type="macroTasks" />
-            <delete assembly="Umbraco.Web" type="macroTasks" />
-        </tasks>
-    </nodeType>
-</createUI>
diff --git a/src/Umbraco.Web.UI/Umbraco/create.aspx b/src/Umbraco.Web.UI/Umbraco/create.aspx
deleted file mode 100644
index d69bffc4b3db..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/create.aspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="masterpages/umbracoDialog.Master" Codebehind="CreateDialog.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.CreateDialog" %>
-<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="Umbraco.Web" %>
-
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-  <script type="text/javascript">
-    var preExecute;
-    function doSubmit() { document.forms[0].submit(); }
-
-    var functionsFrame = this;
-    var tabFrame = this;
-    var isDialog = true;
-    var submitOnEnter = true;
-  </script>
-</asp:Content>
-
-<asp:Content runat="server" ContentPlaceHolderID="body">
-    <asp:PlaceHolder ID="UI" runat="server"></asp:PlaceHolder>
-    <asp:PlaceHolder runat="server" Visible="False" ID="AccessError">
-        <div class="error">
-            <p>
-                The current user does not have access to create this type of object
-            </p>
-        </div>
-    </asp:PlaceHolder>
-</asp:Content>
-
-<asp:Content runat="server" ContentPlaceHolderID="footer">
-  <script type="text/javascript">
-    function setFocusOnText() {
-          for (var i = 0; i < document.forms[0].length; i++) {
-            if (document.forms[0][i].type == 'text') {
-              document.forms[0][i].focus();
-              break;
-            }
-          }
-    }
-    
-    <%if (!IsPostBack) { %>
-    setTimeout("setFocusOnText()", 100);
-    <%} %>
-  </script>
-</asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/create/simple.ascx b/src/Umbraco.Web.UI/Umbraco/create/simple.ascx
deleted file mode 100644
index df8056019d1e..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/create/simple.ascx
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="umbraco.cms.presentation.create.controls.simple" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
-
-
-<cc1:Pane runat="server">
-        <cc1:PropertyPanel runat="server" Text="Name">
-             <asp:TextBox id="rename" CssClass="bigInput input-large-type input-block-level" Runat="server"></asp:TextBox><asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
-        </cc1:PropertyPanel>
-</cc1:Pane>
-
-<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
-     <asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
-</cc1:Pane>
-
-
-
-<!-- added to support missing postback on enter in IE -->
-<asp:TextBox runat="server" style="visibility:hidden;display:none;" ID="Textbox1"/>
-<asp:CustomValidator runat="server" ID="CustomValidation" ForeColor="red" style="display:block;"></asp:CustomValidator>
-<input type="hidden" name="nodeType">
-
diff --git a/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs b/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs
deleted file mode 100644
index 478c14b5c4be..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.IO;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using System.Linq;
-using Umbraco.Web.UI.Pages;
-using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
-using Umbraco.Web._Legacy.Controls;
-
-namespace Umbraco.Web.UI.Umbraco.Developer.Macros
-{
-    public partial class EditMacro : UmbracoEnsuredPage
-    {
-        public EditMacro()
-        {
-            CurrentApp = Constants.Applications.Packages.ToString();
-        }
-
-        protected PlaceHolder Buttons;
-        protected Table MacroElements;
-
-        public TabPage InfoTabPage;
-        public TabPage Parameters;
-
-        private IMacro _macro;
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            _macro = Services.MacroService.GetById(Convert.ToInt32(Request.QueryString["macroID"]));
-
-            if (IsPostBack == false)
-            {
-                ClientTools
-                    .SyncTree("-1," + _macro.Id, false);
-
-                PopulateFieldsOnLoad(_macro);
-
-                // Load elements from macro
-                MacroPropertyBind();
-
-                PopulatePartialViewFiles();
-
-                // Load usercontrols
-                PopulateUserControls(IOHelper.MapPath(SystemDirectories.UserControls));
-                userControlList.Items.Insert(0, new ListItem("Browse usercontrols on server...", string.Empty));
-
-            }
-        }
-
-        /// <summary>
-        /// Populates the control (textbox) values on page load
-        /// </summary>
-        /// <param name="macro"></param>
-        protected void PopulateFieldsOnLoad(IMacro macro)
-        {
-            macroName.Text = macro.Name;
-            macroAlias.Text = macro.Alias;
-            macroKey.Text = macro.Key.ToString();
-            cachePeriod.Text = macro.CacheDuration.ToInvariantString();
-            macroRenderContent.Checked = macro.DontRender == false;
-            macroEditor.Checked = macro.UseInEditor;
-            cacheByPage.Checked = macro.CacheByPage;
-            cachePersonalized.Checked = macro.CacheByMember;
-            macroUserControl.Text = macro.MacroType == MacroTypes.UserControl ? macro.MacroSource : null;
-            SelectedPartialView.Text = macro.MacroType == MacroTypes.PartialView ? macro.MacroSource : null;
-        }
-
-        /// <summary>
-        /// Sets the values on the Macro object from the values posted back before saving the macro
-        /// </summary>
-        protected void SetMacroValuesFromPostBack(IMacro macro, int macroCachePeriod, string userControlValue, string partialViewValue)
-        {
-            macro.UseInEditor = macroEditor.Checked;
-            macro.DontRender = macroRenderContent.Checked == false;
-            macro.CacheByPage = cacheByPage.Checked;
-            macro.CacheByMember = cachePersonalized.Checked;
-            macro.CacheDuration = macroCachePeriod;
-            macro.Alias = macroAlias.Text;
-            macro.Name = macroName.Text;
-            macro.MacroSource = !userControlValue.IsNullOrWhiteSpace() ? userControlValue : partialViewValue;
-            macro.MacroType = !userControlValue.IsNullOrWhiteSpace() ? MacroTypes.UserControl : !partialViewValue.IsNullOrWhiteSpace() ? MacroTypes.PartialView : MacroTypes.Unknown;
-        }
-
-        public void DeleteMacroProperty(object sender, EventArgs e)
-        {
-            var macroPropertyId = (HtmlInputHidden)((Control)sender).Parent.FindControl("macroPropertyID");
-
-            var property = _macro.Properties.Values.Single(x => x.Id == int.Parse(macroPropertyId.Value));
-            _macro.Properties.Remove(property);
-
-            Services.MacroService.Save(_macro);
-
-            MacroPropertyBind();
-        }
-
-        public void MacroPropertyBind()
-        {
-            macroProperties.DataSource = _macro.Properties.Values.OrderBy(x => x.SortOrder);
-            macroProperties.DataBind();
-        }
-
-        public object CheckNull(object test)
-        {
-            return Convert.IsDBNull(test) ? 0 : test;
-        }
-
-        protected IEnumerable<IDataEditor> GetMacroParameterEditors()
-        {
-            return Current.ParameterEditors;
-        }
-
-        public void macroPropertyCreate(object sender, EventArgs e)
-        {
-            //enable add validators
-            var val1 = (RequiredFieldValidator)((Control)sender).Parent.FindControl("RequiredFieldValidator1");
-            var val2 = (RequiredFieldValidator)((Control)sender).Parent.FindControl("RequiredFieldValidator4");
-            var val3 = (RequiredFieldValidator)((Control)sender).Parent.FindControl("RequiredFieldValidator5");
-            val1.Enabled = true;
-            val2.Enabled = true;
-            val3.Enabled = true;
-
-            Page.Validate();
-
-            if (Page.IsValid == false)
-            {
-                return;
-            }
-
-            var macroPropertyAliasNew = (TextBox)((Control)sender).Parent.FindControl("macroPropertyAliasNew");
-            var macroPropertyNameNew = (TextBox)((Control)sender).Parent.FindControl("macroPropertyNameNew");
-            var macroPropertyTypeNew = (DropDownList)((Control)sender).Parent.FindControl("macroPropertyTypeNew");
-
-            if (macroPropertyAliasNew.Text != Services.TextService.Localize("general/new") + " " + Services.TextService.Localize("general/alias"))
-            {
-                if (_macro.Properties.ContainsKey(macroPropertyAliasNew.Text.Trim()))
-                {
-                    //don't continue
-                    return;
-                }
-
-                _macro.Properties.Add(new MacroProperty(
-                                          macroPropertyAliasNew.Text.Trim(),
-                                          macroPropertyNameNew.Text.Trim(),
-                                          _macro.Properties.Values.Any() ? _macro.Properties.Values.Max(x => x.SortOrder) + 1 : 0,
-                                          macroPropertyTypeNew.SelectedValue));
-
-                Services.MacroService.Save(_macro);
-
-                MacroPropertyBind();
-            }
-        }
-
-        public bool macroIsVisible(object isChecked)
-        {
-            return Convert.ToBoolean(isChecked);
-        }
-
-        public void AddChooseList(object sender, EventArgs e)
-        {
-            if (IsPostBack == false)
-            {
-                var dropDown = (DropDownList)sender;
-                dropDown.Items.Insert(0, new ListItem("Choose...", string.Empty));
-            }
-        }
-
-        private void PopulateUserControls(string path)
-        {
-            var directoryInfo = new DirectoryInfo(path);
-            if (directoryInfo.Exists == false) return;
-
-            var rootDir = IOHelper.MapPath(SystemDirectories.UserControls);
-
-            foreach (var uc in directoryInfo.GetFiles("*.ascx"))
-            {
-                userControlList.Items.Add(
-                    new ListItem(SystemDirectories.UserControls +
-                                 uc.FullName.Substring(rootDir.Length).Replace(IOHelper.DirSepChar, '/')));
-
-            }
-            foreach (var dir in directoryInfo.GetDirectories())
-                PopulateUserControls(dir.FullName);
-        }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-            EnsureChildControls();
-        }
-
-        protected override void CreateChildControls()
-        {
-            base.CreateChildControls();
-
-            // Tab setup
-            InfoTabPage = TabView1.NewTabPage("Macro Properties");
-            InfoTabPage.Controls.Add(Pane1);
-            InfoTabPage.Controls.Add(Pane1_2);
-            InfoTabPage.Controls.Add(Pane1_3);
-            InfoTabPage.Controls.Add(Pane1_4);
-
-            Parameters = TabView1.NewTabPage("Parameters");
-            Parameters.Controls.Add(Panel2);
-
-            //var save = TabView1.Menu.NewButton();
-            //save.ButtonType = MenuButtonType.Primary;
-            //save.Text = Services.TextService.Localize("save");
-            //save.ID = "save";
-            //save.Click += Save_Click;
-        }
-
-        void Save_Click(object sender, EventArgs e)
-        {
-
-            Page.Validate();
-
-            ClientTools
-                .SyncTree("-1," + _macro.Id.ToInvariantString(), true); //true forces the reload
-
-
-            var tempCachePeriod = cachePeriod.Text;
-            if (tempCachePeriod == string.Empty)
-                tempCachePeriod = "0";
-            
-            SetMacroValuesFromPostBack(_macro, Convert.ToInt32(tempCachePeriod), macroUserControl.Text, SelectedPartialView.Text);
-
-            // save elements
-            // this is oh so completely broken
-            var aliases = new Dictionary<string, string>();
-            foreach (RepeaterItem item in macroProperties.Items)
-            {
-                var macroPropertyId = (HtmlInputHidden)item.FindControl("macroPropertyID");
-                var macroElementName = (TextBox)item.FindControl("macroPropertyName");
-                var macroElementAlias = (TextBox)item.FindControl("macroPropertyAlias");
-                var macroElementSortOrder = (TextBox)item.FindControl("macroPropertySortOrder");
-                var macroElementType = (DropDownList)item.FindControl("macroPropertyType");
-
-                var prop = _macro.Properties.Values.Single(x => x.Id == int.Parse(macroPropertyId.Value));
-                var sortOrder = 0;
-                int.TryParse(macroElementSortOrder.Text, out sortOrder);
-
-                var alias = macroElementAlias.Text.Trim();
-                if (prop.Alias != alias) // changing the alias
-                {
-                    // use a temp alias to avoid collision if eg swapping aliases
-                    var tempAlias = Guid.NewGuid().ToString("N").Substring(0, 8);
-                    aliases[tempAlias] = alias;
-                    alias = tempAlias;
-                }
-
-                _macro.Properties.UpdateProperty(
-                    prop.Alias,
-                    macroElementName.Text.Trim(),
-                    sortOrder,
-                    macroElementType.SelectedValue,
-                    alias);
-            }
-
-            // now apply the real aliases, should not collide
-            foreach (var kvp in aliases)
-                _macro.Properties.UpdateProperty(kvp.Key, newAlias: kvp.Value);
-
-            Services.MacroService.Save(_macro);
-
-            ClientTools.ShowSpeechBubble(SpeechBubbleIcon.Save, "Macro saved", "");
-
-            MacroPropertyBind();
-        }
-        
-        /// <summary>
-        /// Populate the drop down list for partial view files
-        /// </summary>
-        private void PopulatePartialViewFiles()
-        {
-            var partialsDir = IOHelper.MapPath(SystemDirectories.MvcViews + "/MacroPartials");
-            //get all the partials in the normal /MacroPartials folder
-            var foundMacroPartials = GetPartialViewFiles(partialsDir, partialsDir, SystemDirectories.MvcViews + "/MacroPartials");
-            //now try to find all of them int he App_Plugins/[PackageName]/Views/MacroPartials folder
-            var appPluginsFolder = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.AppPlugins));
-            if (appPluginsFolder.Exists)
-            {
-                foreach (var d in appPluginsFolder.GetDirectories())
-                {
-                    var viewsFolder = d.GetDirectories("Views");
-                    if (viewsFolder.Any())
-                    {
-                        var macroPartials = viewsFolder.First().GetDirectories("MacroPartials");
-                        if (macroPartials.Any())
-                        {
-                            foundMacroPartials = foundMacroPartials.Concat(
-                                GetPartialViewFiles(macroPartials.First().FullName, macroPartials.First().FullName, SystemDirectories.AppPlugins + "/" + d.Name + "/Views/MacroPartials"));
-                        }
-                    }
-                }
-            }
-
-
-            PartialViewList.DataSource = foundMacroPartials;
-            PartialViewList.DataBind();
-            PartialViewList.Items.Insert(0, new ListItem("Browse partial view files on server...", string.Empty));
-        }
-
-        /// <summary>
-        /// Get the list of partial view files in the ~/Views/MacroPartials folder and in all
-        /// folders of ~/App_Plugins/[PackageName]/Views/MacroPartials
-        /// </summary>
-        /// <param name="orgPath"></param>
-        /// <param name="path"></param>
-        /// <param name="prefixVirtualPath"> </param>
-        /// <returns></returns>
-        private IEnumerable<string> GetPartialViewFiles(string orgPath, string path, string prefixVirtualPath)
-        {
-            var files = new List<string>();
-            var dirInfo = new DirectoryInfo(path);
-
-            // Populate subdirectories
-            var dirInfos = dirInfo.GetDirectories();
-            foreach (var dir in dirInfos)
-            {
-                files.AddRange(GetPartialViewFiles(orgPath, path + "/" + dir.Name, prefixVirtualPath));
-            }
-
-            var fileInfo = dirInfo.GetFiles("*.*");
-
-            files.AddRange(
-                fileInfo.Select(file =>
-                    prefixVirtualPath.TrimEnd('/') + "/" + (path.Replace(orgPath, string.Empty).Trim('/') + "/" + file.Name).Trim('/')));
-            return files;
-        }
-
-        /// <summary>
-        /// Binds the drop down list but ensures that the macro param type exists if it doesn't the drop down will be left blank
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void MacroPropertiesOnItemDataBound(object sender, RepeaterItemEventArgs e)
-        {
-            if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
-            {
-                var propertyTypes = (DropDownList)e.Item.FindControl("macroPropertyType");
-
-                var editors = GetMacroParameterEditors();
-                propertyTypes.DataSource = editors;
-                propertyTypes.DataBind();
-                var macroProp = (IMacroProperty)e.Item.DataItem;
-                if (editors.Any(x => x.Alias == macroProp.EditorAlias))
-                {
-                    propertyTypes.SelectedValue = macroProp.EditorAlias;
-                }
-            }
-
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.designer.cs
deleted file mode 100644
index 8a9e86710e23..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.designer.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco.Developer.Macros {
-    
-    
-    public partial class EditMacro {
-        
-        /// <summary>
-        /// CssInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-        
-        /// <summary>
-        /// SelectedPartialView control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox SelectedPartialView;
-        
-        /// <summary>
-        /// PartialViewList control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList PartialViewList;
-
-        /// <summary>
-        /// TabView1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.TabView TabView1;
-
-        /// <summary>
-        /// Pane1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.Pane Pane1;
-
-        /// <summary>
-        /// macroPane control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTable macroPane;
-
-        /// <summary>
-        /// macroName control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox macroName;
-
-        /// <summary>
-        /// macroAlias control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox macroAlias;
-
-        /// <summary>
-        /// macroAlias control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label macroKey;
-
-        /// <summary>
-        /// Pane1_2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_2;
-
-        /// <summary>
-        /// macroUserControl control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox macroUserControl;
-
-        /// <summary>
-        /// userControlList control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList userControlList;
-
-        /// <summary>
-        /// Pane1_3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_3;
-
-        /// <summary>
-        /// Table1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTable Table1;
-
-        /// <summary>
-        /// macroEditor control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.CheckBox macroEditor;
-
-        /// <summary>
-        /// macroRenderContent control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.CheckBox macroRenderContent;
-
-        /// <summary>
-        /// Pane1_4 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_4;
-
-        /// <summary>
-        /// Table3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlTable Table3;
-
-        /// <summary>
-        /// cachePeriod control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox cachePeriod;
-
-        /// <summary>
-        /// cacheByPage control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.CheckBox cacheByPage;
-
-        /// <summary>
-        /// cachePersonalized control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.CheckBox cachePersonalized;
-
-        /// <summary>
-        /// Panel2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.Pane Panel2;
-
-        /// <summary>
-        /// macroProperties control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Repeater macroProperties;
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
deleted file mode 100644
index ccdb593287c4..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
+++ /dev/null
@@ -1,190 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Edit macro"
-    CodeBehind="EditMacro.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Developer.Macros.EditMacro" %>
-
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
-<%@ Register TagPrefix="CD" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-
-    <CD:CssInclude ID="CssInclude1" runat="server" FilePath="Editors/EditMacro.css" PathNameAlias="UmbracoClient" />
-
-    <script type="text/javascript">
-
-        //handles the change selection of the drop downs to populate the text box
-        (function($) {
-            $(document).ready(function () {
-
-                //on drop down change, update the text box and clear other text boxes
-                $(".fileChooser select").change(function () {
-                    //update the txt box
-                    var txt = $(this).prev("input[type='text']");
-                    txt.val($(this).val());
-                    //clear other text boxes
-                    $(".fileChooser input[type='text']").not(txt).val("");
-                    //reset other drop downs
-                    $(".fileChooser select").not($(this)).val("");
-                });
-
-                UmbClientMgr.appActions().bindSaveShortCut();
-
-                // U4-667: Make the "Render content in editor" checkbox dependent on the "Use in editor checkbox"
-                var useInEditorCheckBox = $("#<%= macroEditor.ClientID %>");
-                var renderInEditorCheckBox = $("#<%= macroRenderContent.ClientID %>");
-
-                function toggle() {
-                    var disabled = useInEditorCheckBox.is(":checked") == false;
-                    renderInEditorCheckBox.prop("disabled", disabled);
-                }
-
-                toggle();
-
-                useInEditorCheckBox.on("change", function () {
-                    toggle();
-                });
-
-
-            });
-        })(jQuery);
-
-    </script>
-</asp:Content>
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <cc1:TabView ID="TabView1" runat="server"></cc1:TabView>
-
-    <cc1:Pane ID="Pane1" runat="server">
-        <cc1:PropertyPanel runat="server" Text="Name">
-            <asp:TextBox ID="macroName" runat="server" CssClass="guiInputText"></asp:TextBox>
-        </cc1:PropertyPanel>
-        <cc1:PropertyPanel runat="server" Text="Alias">
-            <asp:TextBox ID="macroAlias" runat="server" CssClass="guiInputText"></asp:TextBox>
-        </cc1:PropertyPanel>
-        <cc1:PropertyPanel runat="server" Text="Key">
-            <asp:Label ID="macroKey" runat="server" CssClass="guiLabel"></asp:Label>
-        </cc1:PropertyPanel>
-    </cc1:Pane>
-
-
-    <cc1:Pane ID="Pane1_2" runat="server" title="Choose a file to render" CssClass="fileChooser">
-
-        <cc1:PropertyPanel runat="server" Text="MVC Partial view">
-             <asp:TextBox ID="SelectedPartialView" runat="server" CssClass="guiInputText"></asp:TextBox>
-                    <asp:DropDownList ID="PartialViewList" runat="server" >
-                    </asp:DropDownList>
-        </cc1:PropertyPanel>
-        
-        <cc1:PropertyPanel runat="server" Text="usercontrol">
-             <asp:TextBox ID="macroUserControl" runat="server" CssClass="guiInputText"></asp:TextBox>
-                    <asp:DropDownList ID="userControlList" runat="server">
-                    </asp:DropDownList>
-        </cc1:PropertyPanel>
-    </cc1:Pane>
-
-    <cc1:Pane ID="Pane1_3" runat="server" Title="Editor settings">
-
-        <cc1:PropertyPanel runat="server" Text="Use in rich text editor and the grid">
-            <asp:CheckBox ID="macroEditor" runat="server" Text="Yes"></asp:CheckBox>
-        </cc1:PropertyPanel>
-
-        <cc1:PropertyPanel runat="server" Text="Render in rich text editor and the grid">
-             <asp:CheckBox ID="macroRenderContent" runat="server" Text="Yes"></asp:CheckBox>
-        </cc1:PropertyPanel>
-    </cc1:Pane>
-    <cc1:Pane ID="Pane1_4" runat="server" Title="Cache settings">
-
-        <cc1:PropertyPanel runat="server" Text="Cache period">
-            <asp:TextBox ID="cachePeriod" runat="server" CssClass="guiInputText input-small" type="number" min="0"></asp:TextBox>&nbsp;Seconds
-        </cc1:PropertyPanel>
-
-        <cc1:PropertyPanel runat="server" Text="Cache by page">
-            <asp:CheckBox ID="cacheByPage" runat="server" Text="Yes"></asp:CheckBox>
-        </cc1:PropertyPanel>
-
-        <cc1:PropertyPanel runat="server" Text="Cache personalized">
-             <asp:CheckBox ID="cachePersonalized" runat="server" Text="Yes"></asp:CheckBox>
-        </cc1:PropertyPanel>
-    </cc1:Pane>
-
-    <cc1:Pane ID="Panel2" runat="server">
-        <asp:Repeater ID="macroProperties" runat="server" OnItemDataBound="MacroPropertiesOnItemDataBound">
-            <HeaderTemplate>
-                <table class="table">
-                    <thead>
-                        <tr>
-                            <th>
-                                <%=Services.TextService.Localize("general/alias")%>
-                            </th>
-                            <th>
-                                <%=Services.TextService.Localize("general/name")%>
-                            </th>
-                            <th>
-                                <%=Services.TextService.Localize("general/type")%>
-                            </th>
-                            <th>
-                                <%=Services.TextService.Localize("general/sort")%>
-                            </th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-            </HeaderTemplate>
-            <ItemTemplate>
-                <tr>
-                    <td>
-                        <input type="hidden" id="macroPropertyID" runat="server" value='<%#Eval("Id")%>'
-                            name="macroPropertyID" />
-                        <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="macroPropertyAlias" Display="Dynamic"  ForeColor="#b94a48">Required<br/></asp:RequiredFieldValidator>
-                        <asp:TextBox runat="server" ID="macroPropertyAlias" CLASS="-full-width-input" Text='<%#Eval("Alias")%>' />
-                    </td>
-                    <td>
-                        <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="macroPropertyName" Display="Dynamic" ForeColor="#b94a48">Required<br/></asp:RequiredFieldValidator>
-                        <asp:TextBox runat="server" ID="macroPropertyName" CssClass="-full-width-input" Text='<%#Eval("Name")%>' />
-                    </td>
-                    <td>
-
-                        <asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" ControlToValidate="macroPropertyType" Display="Dynamic" ForeColor="#b94a48">Required<br/></asp:RequiredFieldValidator>
-                        <asp:DropDownList OnPreRender="AddChooseList" runat="server" ID="macroPropertyType"
-                            DataTextFormatString="" DataTextField='Name' DataValueField="Alias">
-                        </asp:DropDownList>
-                    </td>
-                    <td>
-                        <asp:RequiredFieldValidator ID="RequiredFieldValidator6" runat="server" ControlToValidate="macroPropertySortOrder" Display="Dynamic" ForeColor="#b94a48">Required<br/></asp:RequiredFieldValidator>
-                         <asp:RegularExpressionValidator ID="RegularExpressionValidator1" runat="server" ControlToValidate="macroPropertySortOrder" Display="Dynamic" ForeColor="#b94a48" ValidationExpression="^\d+$">Numbers only<br/></asp:RegularExpressionValidator>
-                        <asp:TextBox runat="server" ID="macroPropertySortOrder" CssClass="-full-width-input" Text='<%#Eval("SortOrder")%>' type="number" />
-                    </td>
-                    <td>
-                        <asp:Button OnClick="DeleteMacroProperty" ID="delete" Text="Delete" runat="server" CssClass="btn btn-default btn-danger delete-button" />
-                    </td>
-                </tr>
-            </ItemTemplate>
-            <FooterTemplate>
-                        <tr>
-                            <td>
-                                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" EnableViewState="false" Enabled="false" EnableClientScript="false" runat="server" ControlToValidate="macroPropertyAliasNew" Display="Dynamic" ForeColor="#b94a48">Required<br/></asp:RequiredFieldValidator>
-                                <asp:TextBox runat="server" ID="macroPropertyAliasNew" CssClass="-full-width-input" PlaceHolder='New Alias'  />
-                            </td>
-                            <td>
-                                <asp:RequiredFieldValidator ID="RequiredFieldValidator4" EnableViewState="false" Enabled="false" EnableClientScript="false" runat="server" ControlToValidate="macroPropertyNameNew" Display="Dynamic" ForeColor="#b94a48">Required<br/></asp:RequiredFieldValidator>
-                                <asp:TextBox runat="server" ID="macroPropertyNameNew" CssClass="-full-width-input" PlaceHolder='New Name' />
-                            </td>
-                            <td>
-                                <asp:RequiredFieldValidator ID="RequiredFieldValidator5" EnableViewState="false" Enabled="false" EnableClientScript="false" runat="server" ControlToValidate="macroPropertyTypeNew" Display="Dynamic" ForeColor="#b94a48">Required<br/></asp:RequiredFieldValidator>
-                                <asp:DropDownList OnPreRender="AddChooseList" runat="server" ID="macroPropertyTypeNew"
-                                    DataTextField="Name"
-                                    DataValueField="Alias"
-                                    DataSource='<%# GetMacroParameterEditors()%>'>
-                                </asp:DropDownList>
-                            </td>
-                            <td>
-                                <%-- The macro parameter will automatically get sort order when created. --%>
-                            </td>
-                            <td>
-                                <asp:Button ID="createNew" Text="Add" runat="server" CssClass="btn btn-default btn-info add-button" OnClick="macroPropertyCreate" />
-                            </td>
-                        </tr>
-                </tbody>
-                </table>
-            </FooterTemplate>
-        </asp:Repeater>
-    </cc1:Pane>
-
-</asp:Content>
diff --git a/src/Umbraco.Web.UI/Umbraco/masterpages/default.Master b/src/Umbraco.Web.UI/Umbraco/masterpages/default.Master
deleted file mode 100644
index ebbc708d809d..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/masterpages/default.Master
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ Master Language="C#" AutoEventWireup="True" CodeBehind="Default.master.cs" Inherits="Umbraco.Web.UI.Umbraco.Masterpages.Default" %>
-<asp:ContentPlaceHolder ID="ContentPlaceHolderDefault" runat="server">
-</asp:ContentPlaceHolder>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/default.aspx b/src/Umbraco.Web.UI/default.aspx
deleted file mode 100644
index a41d1eccf74a..000000000000
--- a/src/Umbraco.Web.UI/default.aspx
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ Page language="c#" AutoEventWireup="True" Inherits="umbraco.UmbracoDefault" trace="true" validateRequest="false" %>
-
diff --git a/src/Umbraco.Web/Actions/ActionChangeDocType.cs b/src/Umbraco.Web/Actions/ActionChangeDocType.cs
index 56868e9fb03b..edae1bc84c39 100644
--- a/src/Umbraco.Web/Actions/ActionChangeDocType.cs
+++ b/src/Umbraco.Web/Actions/ActionChangeDocType.cs
@@ -1,9 +1,4 @@
-using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Web.Actions
 {
     //TODO: Add this back in when we support this functionality again
     ///// <summary>
diff --git a/src/Umbraco.Web/Actions/ActionCopy.cs b/src/Umbraco.Web/Actions/ActionCopy.cs
index 3e4b2ddc3183..477156d4ae81 100644
--- a/src/Umbraco.Web/Actions/ActionCopy.cs
+++ b/src/Umbraco.Web/Actions/ActionCopy.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Actions/ActionDelete.cs b/src/Umbraco.Web/Actions/ActionDelete.cs
index 0cf2e60c5a8b..470f1453d655 100644
--- a/src/Umbraco.Web/Actions/ActionDelete.cs
+++ b/src/Umbraco.Web/Actions/ActionDelete.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Actions/ActionMove.cs b/src/Umbraco.Web/Actions/ActionMove.cs
index 7ae847496597..74c783aab938 100644
--- a/src/Umbraco.Web/Actions/ActionMove.cs
+++ b/src/Umbraco.Web/Actions/ActionMove.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Actions/ActionNew.cs b/src/Umbraco.Web/Actions/ActionNew.cs
index c07580b42afd..ab208a79a3a9 100644
--- a/src/Umbraco.Web/Actions/ActionNew.cs
+++ b/src/Umbraco.Web/Actions/ActionNew.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Actions/ActionProtect.cs b/src/Umbraco.Web/Actions/ActionProtect.cs
index cd8b883ca84f..dc6c7ff4e74e 100644
--- a/src/Umbraco.Web/Actions/ActionProtect.cs
+++ b/src/Umbraco.Web/Actions/ActionProtect.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Actions/ActionRights.cs b/src/Umbraco.Web/Actions/ActionRights.cs
index 0d9ace918e1b..b76f3b7800e2 100644
--- a/src/Umbraco.Web/Actions/ActionRights.cs
+++ b/src/Umbraco.Web/Actions/ActionRights.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Actions/ActionRollback.cs b/src/Umbraco.Web/Actions/ActionRollback.cs
index 96ce1e776701..18d9efdb8d9b 100644
--- a/src/Umbraco.Web/Actions/ActionRollback.cs
+++ b/src/Umbraco.Web/Actions/ActionRollback.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Actions/ActionToPublish.cs b/src/Umbraco.Web/Actions/ActionToPublish.cs
index 518c82ab8780..61475c81f5a9 100644
--- a/src/Umbraco.Web/Actions/ActionToPublish.cs
+++ b/src/Umbraco.Web/Actions/ActionToPublish.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Actions/ActionUpdate.cs b/src/Umbraco.Web/Actions/ActionUpdate.cs
index a2fba0fd895f..2241c759559d 100644
--- a/src/Umbraco.Web/Actions/ActionUpdate.cs
+++ b/src/Umbraco.Web/Actions/ActionUpdate.cs
@@ -1,7 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-using Umbraco.Web.UI.Pages;
-
 
 namespace Umbraco.Web.Actions
 {
diff --git a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
index 6b739b4f4915..b224a071519d 100644
--- a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
@@ -37,6 +37,7 @@ public override void RefreshAll()
 
             ClearAllIsolatedCacheByEntityType<IMacro>();
 
+            //TODO: WB Was I too aggresive with cleanup?
             AppCaches.RuntimeCache.ClearOfType<MacroCacheContent>();
 
             base.RefreshAll();
@@ -112,6 +113,7 @@ internal static string[] GetCacheKeysForAlias(string alias)
 
         public static void ClearMacroContentCache(AppCaches appCaches)
         {
+            //TODO: WB Was I too aggresive with cleanup?
             appCaches.RuntimeCache.ClearOfType<MacroCacheContent>();
         }
 
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index c9123175b15f..818355987169 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -347,10 +347,6 @@ internal IHttpHandler GetHandlerOnMissingTemplate(PublishedRequest request)
                 // to Mvc since Mvc can't do much
                 return new PublishedContentNotFoundHandler("In addition, no template exists to render the custom 404.");
 
-            // so we have a template, so we should have a rendering engine
-            if (request.RenderingEngine == RenderingEngine.WebForms) // back to webforms ?
-                return GetWebFormsHandler();
-
             if (request.RenderingEngine != RenderingEngine.Mvc) // else ?
                 return new PublishedContentNotFoundHandler("In addition, no rendering engine exists to render the custom 404.");
 
@@ -376,13 +372,6 @@ internal IHttpHandler GetHandlerForRoute(RequestContext requestContext, Publishe
                 return HandlePostedValues(requestContext, postedInfo);
             }
 
-            //Now we can check if we are supposed to render WebForms when the route has not been hijacked
-            if (request.RenderingEngine == RenderingEngine.WebForms
-                && request.HasTemplate
-                && routeDef.HasHijackedRoute == false)
-            {
-                return GetWebFormsHandler();
-            }
 
             //Here we need to check if there is no hijacked route and no template assigned,
             //if this is the case we want to return a blank page, but we'll leave that up to the NoTemplateHandler.
@@ -434,16 +423,7 @@ internal IHttpHandler GetHandlerForRoute(RequestContext requestContext, Publishe
 
             return new UmbracoMvcHandler(requestContext);
         }
-
-        /// <summary>
-        /// Returns the handler for webforms requests
-        /// </summary>
-        /// <returns></returns>
-        internal static IHttpHandler GetWebFormsHandler()
-        {
-            return (umbraco.UmbracoDefault) BuildManager.CreateInstanceFromVirtualPath("~/default.aspx", typeof(umbraco.UmbracoDefault));
-        }
-
+        
         private SessionStateBehavior GetSessionStateBehavior(RequestContext requestContext, string controllerName)
         {
             return _controllerFactory.GetControllerSessionBehavior(requestContext, controllerName);
diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
index 9769945f371c..fc6daada3eba 100644
--- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
@@ -30,15 +30,7 @@ public override void ExecuteResult(ControllerContext context)
 
             var routeDef = (RouteDefinition)context.RouteData.DataTokens[Umbraco.Core.Constants.Web.UmbracoRouteDefinitionDataToken];
 
-            //Special case, if it is webforms but we're posting to an MVC surface controller, then we
-            // need to return the webforms result instead
-            if (routeDef.PublishedRequest.RenderingEngine == RenderingEngine.WebForms)
-            {
-                EnsureViewContextForWebForms(context);
-                var webFormsHandler = RenderRouteHandler.GetWebFormsHandler();
-                webFormsHandler.ProcessRequest(HttpContext.Current);
-            }
-            else
+            if (routeDef.PublishedRequest.RenderingEngine == RenderingEngine.Mvc)
             {
                 var factory = ControllerBuilder.Current.GetControllerFactory();
                 context.RouteData.Values["action"] = routeDef.ActionName;
diff --git a/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
index 6eb568c6af82..9c583e4f88f6 100644
--- a/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
@@ -19,6 +19,7 @@ public static class UrlHelperExtensions
         /// <param name="url">The url to validate</param>
         /// <param name="callerUrl">The url of the current local domain (to ensure we can validate if the requested url is local without dependency on the request)</param>
         /// <returns>True if it's an allowed url</returns>
+        [Obsolete("This looks OLD & unused", true)]
         public static bool ValidateProxyUrl(this UrlHelper urlHelper, string url, string callerUrl)
         {
             if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false)
@@ -60,14 +61,6 @@ public static bool ValidateProxyUrl(this UrlHelper urlHelper, string url, string
                 {
                     return false;
                 }
-
-                // check for valid proxy urls
-                var feedProxyXml = XmlHelper.OpenAsXmlDocument(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
-                if (feedProxyXml != null &&
-                    feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null)
-                {
-                    return true;
-                }
             }
             else
             {
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index db786655b489..a10bdbb3c3d8 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -158,12 +158,7 @@ private void ExecuteTemplateRendering(TextWriter sw, PublishedRequest request)
                     break;
                 case RenderingEngine.WebForms:
                 default:
-                    var webFormshandler = (UmbracoDefault) BuildManager
-                        .CreateInstanceFromVirtualPath("~/default.aspx", typeof(UmbracoDefault));
-                    //the 'true' parameter will ensure that the current query strings are carried through, we don't have
-                    // to build up the url again, it will just work.
-                    _umbracoContext.HttpContext.Server.Execute(webFormshandler, sw, true);
-                    break;
+                    throw new Exception("We no longer support WebForms in Umbraco");
             }
 
         }
diff --git a/src/Umbraco.Web/UI/Pages/BasePage.cs b/src/Umbraco.Web/UI/Pages/BasePage.cs
deleted file mode 100644
index a8fbc92722db..000000000000
--- a/src/Umbraco.Web/UI/Pages/BasePage.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Web;
-using System.Web.Mvc;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Services;
-using Umbraco.Web.Security;
-using System.Web.UI;
-using Umbraco.Core;
-using Umbraco.Web.Composing;
-
-namespace Umbraco.Web.UI.Pages
-{
-    /// <summary>
-    /// umbraco.BasePages.BasePage is the default page type for the umbraco backend.
-    /// The basepage keeps track of the current user and the page context. But does not
-    /// Restrict access to the page itself.
-    /// The keep the page secure, the umbracoEnsuredPage class should be used instead
-    /// </summary>
-    public class BasePage : Page
-    {
-        private UrlHelper _url;
-        private HtmlHelper _html;
-        private ClientTools _clientTools;
-
-        /// <summary>
-        /// Gets the logger.
-        /// </summary>
-        public ILogger Logger => Current.Logger;
-
-        /// <summary>
-        /// Gets the profiling helper.
-        /// </summary>
-        public IProfilingLogger ProfilingLogger => Current.ProfilingLogger;
-
-        /// <summary>
-        /// Gets the Url helper.
-        /// </summary>
-        /// <remarks>This URL helper is created without any route data and an empty request context.</remarks>
-        public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext));
-
-        /// <summary>
-        /// Gets the Html helper.
-        /// </summary>
-        /// <remarks>This html helper is created with an empty context and page so it may not have all of the functionality expected.</remarks>
-        public HtmlHelper Html => _html ?? (_html = new HtmlHelper(new ViewContext(), new ViewPage()));
-
-        /// <summary>
-        /// Gets the Umbraco context.
-        /// </summary>
-        public UmbracoContext UmbracoContext => Current.UmbracoContext;
-
-        /// <summary>
-        /// Gets the web security helper.
-        /// </summary>
-        public WebSecurity Security => UmbracoContext.Security;
-
-        /// <summary>
-        /// Gets the services context.
-        /// </summary>
-        public ServiceContext Services => Current.Services;
-
-        /// <summary>
-        /// Gets an instance of ClientTools for access to the pages client API.
-        /// </summary>
-        public ClientTools ClientTools => _clientTools ?? (_clientTools = new ClientTools(this));
-
-        /// <summary>
-        /// Raises the <see cref="E:System.Web.UI.Control.Load"></see> event.
-        /// </summary>
-        /// <param name="e">The <see cref="T:System.EventArgs"></see> object that contains the event data.</param>
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            if (Request.IsSecureConnection || Current.Configs.Global().UseHttps == false) return;
-
-            var serverName = HttpUtility.UrlEncode(Request.ServerVariables["SERVER_NAME"]);
-            Response.Redirect($"https://{serverName}{Request.FilePath}");
-        }
-    }
-}
diff --git a/src/Umbraco.Web/UI/Pages/ClientTools.cs b/src/Umbraco.Web/UI/Pages/ClientTools.cs
deleted file mode 100644
index 6988877fa25c..000000000000
--- a/src/Umbraco.Web/UI/Pages/ClientTools.cs
+++ /dev/null
@@ -1,347 +0,0 @@
-using Umbraco.Core.IO;
-using System.Web.UI;
-using Umbraco.Core;
-
-namespace Umbraco.Web.UI.Pages
-{
-
-    /// <summary>
-    /// Renders the client side code necessary to interact with the Umbraco client side API.
-    /// Each method returns an instance of this class so you can chain calls together.
-    /// </summary>
-    public sealed class ClientTools
-    {
-
-        public ClientTools(Page page)
-        {
-            _page = page;
-        }
-
-        /// <summary>
-        /// Returns the string markup for the JavaScript that is rendered.
-        /// If referencing JavaScript scripts in the backend, this class should be used
-        /// in case future changes to the client code is change, this will remain intact.
-        /// </summary>
-        public static class Scripts
-        {
-            internal const string ClientMgrScript = "UmbClientMgr";
-            public static string GetAppActions { get { return string.Format("{0}.appActions()", ClientMgrScript); } }
-            public static string GetMainWindow { get { return string.Format("{0}.mainWindow()", ClientMgrScript); } }
-            public static string GetMainTree { get { return string.Format("{0}.mainTree()", ClientMgrScript); } }
-            public static string GetContentFrame() { return string.Format("{0}.contentFrame()", ClientMgrScript); }
-            public static string ShiftApp(string appAlias)
-            {
-                return string.Format(ClientMgrScript + ".historyManager().addHistory('{0}')", appAlias);
-            }
-            public static string OpenDashboard(string app)
-            {
-                return string.Format(GetAppActions + ".openDashboard('{0}');", app);
-            }
-            public static string RefreshAdmin { get { return "setTimeout('" + GetMainWindow + ".location.reload()', {0});"; } }
-            public static string ShowSpeechBubble { get { return GetMainWindow + ".UmbSpeechBubble.ShowMessage('{0}','{1}', '{2}');"; } }
-            public static string ChangeContentFrameUrl(string url) {
-                return string.Format(ClientMgrScript + ".contentFrame('{0}');", url);
-            }
-            public static string ReloadContentFrameUrlIfPathLoaded(string url)
-            {
-                return string.Format(ClientMgrScript + ".reloadContentFrameUrlIfPathLoaded('{0}');", url);
-            }
-            public static string ReloadLocation { get { return ClientMgrScript + ".reloadLocation();"; } }
-            public static string ReloadLocationIfMatched { get { return ClientMgrScript + ".reloadLocation('{0}');"; } }
-            public static string ChildNodeCreated = GetMainTree + ".childNodeCreated();";
-            public static string SyncTree { get { return GetMainTree + ".syncTree('{0}', {1});"; } }
-            public static string ClearTreeCache { get { return GetMainTree + ".clearTreeCache();"; } }
-            public static string CopyNode { get { return GetMainTree + ".copyNode('{0}', '{1}');"; } }
-            public static string MoveNode { get { return GetMainTree + ".moveNode('{0}', '{1}');"; } }
-            public static string ReloadActionNode { get { return GetMainTree + ".reloadActionNode({0}, {1}, null);"; } }
-            public static string RefreshTree { get { return GetMainTree + ".refreshTree();"; } }
-            public static string RefreshTreeType { get { return GetMainTree + ".refreshTree('{0}');"; } }
-            public static string CloseModalWindow()
-            {
-                return string.Format("{0}.closeModalWindow();", ClientMgrScript);
-            }
-            public static string CloseModalWindow(string rVal)
-            {
-                return string.Format("{0}.closeModalWindow('{1}');", ClientMgrScript, rVal);
-            }
-            public static string OpenModalWindow(string url, string name, int width, int height)
-            {
-                return OpenModalWindow(url, name, true, width, height, 0, 0, "", "");
-            }
-            public static string OpenModalWindow(string url, string name, bool showHeader, int width, int height, int top, int leftOffset, string closeTriggers, string onCloseCallback)
-            {
-                return string.Format("{0}.openModalWindow('{1}', '{2}', {3}, {4}, {5}, {6}, {7}, '{8}', '{9}');",
-                    new object[] { ClientMgrScript, url, name, showHeader.ToString().ToLower(), width, height, top, leftOffset, closeTriggers, onCloseCallback });
-            }
-        }
-
-        private readonly Page _page;
-
-        /// <summary>
-        /// This removes all tree JSON data cached in the client browser.
-        /// Useful when you want to ensure that the tree is reloaded from live data.
-        /// </summary>
-        /// <returns></returns>
-        public ClientTools ClearClientTreeCache()
-        {
-            RegisterClientScript(Scripts.ClearTreeCache);
-            return this;
-        }
-
-        /// <summary>
-        /// Change applications
-        /// </summary>
-        /// <returns></returns>
-        public ClientTools ShiftApp(string appAlias)
-        {
-            RegisterClientScript(Scripts.ShiftApp(appAlias));
-            return this;
-        }
-
-        /// <summary>
-        /// Refresh the entire administration console after a specified amount of time.
-        /// </summary>
-        /// <param name="seconds"></param>
-        /// <returns></returns>
-        public ClientTools RefreshAdmin(int seconds)
-        {
-            RegisterClientScript(string.Format(Scripts.RefreshAdmin, seconds * 1000));
-            return this;
-        }
-
-        /// <summary>
-        /// Refreshes the entire current tree
-        /// </summary>
-        /// <returns></returns>
-        public ClientTools RefreshTree()
-        {
-            RegisterClientScript(Scripts.RefreshTree);
-            return this;
-        }
-
-        public ClientTools RefreshTree(string treeType)
-        {
-            RegisterClientScript(string.Format(Scripts.RefreshTreeType, treeType));
-            return this;
-        }
-
-        /// <summary>
-        /// A reference to the umbraco UI component "speechbubble". The speechbubble appears in the lower right corner of the screen, notifying users of events
-        /// </summary>
-        /// <param name="i">The speechbubble icon.</param>
-        /// <param name="header">The speechbubble header.</param>
-        /// <param name="body">The body text</param>
-        public ClientTools ShowSpeechBubble(SpeechBubbleIcon i, string header, string body)
-        {
-            RegisterClientScript(string.Format(Scripts.ShowSpeechBubble, i.ToString(), header.Replace("'", "\\'"), body.Replace("'", "\\'")));
-            return this;
-        }
-
-        /// <summary>
-        /// Changes the content in the content frame to the specified URL
-        /// </summary>
-        /// <param name="url"></param>
-        public ClientTools ChangeContentFrameUrl(string url)
-        {
-            //don't load if there is no url
-            if (string.IsNullOrEmpty(url)) return this;
-
-            url = EnsureUmbracoUrl(url);
-
-            RegisterClientScript(Scripts.ChangeContentFrameUrl(url));
-
-            return this;
-        }
-
-        /// <summary>
-        /// Reloads the content in the content frame if the specified URL is currently loaded
-        /// </summary>
-        /// <param name="url"></param>
-        public ClientTools ReloadContentFrameUrlIfPathLoaded(string url)
-        {
-            if (string.IsNullOrEmpty(url)) return this;
-
-            url = EnsureUmbracoUrl(url);
-
-            RegisterClientScript(Scripts.ReloadContentFrameUrlIfPathLoaded(url));
-
-            return this;
-        }
-
-        public ClientTools ReloadLocationIfMatched(string routePath)
-        {
-            RegisterClientScript(string.Format(Scripts.ReloadLocationIfMatched, routePath));
-            return this;
-        }
-
-        public ClientTools ReloadLocation()
-        {
-            RegisterClientScript(Scripts.ReloadLocation);
-            return this;
-        }
-
-
-        private string EnsureUmbracoUrl(string url)
-        {
-            if (url.StartsWith("/") && url.StartsWith(IOHelper.ResolveUrl(SystemDirectories.Umbraco)) == false)
-            {
-                url = IOHelper.ResolveUrl(SystemDirectories.Umbraco).EnsureEndsWith('/') + url;
-            }
-
-            if (url.Trim().StartsWith("~"))
-                url = IOHelper.ResolveUrl(url);
-
-            return url;
-        }
-
-        /// <summary>
-        /// Shows the dashboard for the given application
-        /// </summary>
-        /// <param name="app"></param>
-        /// <returns></returns>
-        public ClientTools ShowDashboard(string app)
-        {
-            return ChangeContentFrameUrl(SystemDirectories.Umbraco + string.Format("/dashboard.aspx?app={0}", app));
-        }
-
-        /// <summary>
-        /// Reloads the children of the current action node and selects the node that didn't exist there before.
-        /// If the client side system cannot determine which node is new, then no node is selected.
-        /// </summary>
-        /// <remarks>
-        /// This is used by many create dialogs, however the sync method should be used based on the full path of the
-        /// node but because the current Umbraco implementation of ITask only returns a url to load, there's no way
-        /// to determine what the full path of the new child is.
-        /// </remarks>
-        /// <returns></returns>
-        public ClientTools ChildNodeCreated()
-        {
-            RegisterClientScript(Scripts.ChildNodeCreated);
-            return this;
-        }
-
-        /// <summary>
-        /// Synchronizes the tree to the path specified.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="forceReload">
-        /// If set to true, will ensure that the node to be synced has it's data
-        /// reloaded from the server. Otherwise, if the node already exists, the tree will simply sync to the node
-        /// that is already there.
-        /// </param>
-        /// <remarks>
-        /// This will work for any tree, however you would need to know the path of the node. Currently, media and content
-        /// are the only trees that store a path, however, if you were working in the template tree for example, a path to a
-        /// node could be "init,1090" and this method would still work.
-        ///
-        /// Sync tree will works by syncing the active tree type. This can be specified explicitly by calling SetActiveTreeType.
-        /// This will allow developers to sync many trees in one application at one time if needed.
-        /// </remarks>
-        /// <example>
-        /// <![CDATA[
-        /// //if you had both the media and content trees in the same app, you could sync both at the same
-        /// //time by doing:
-        /// BasePage.Current.ClientTools
-        ///        .SetActiveTreeType("content")
-        ///            .SyncTree("-1,100,200")
-        ///        .SetActiveTreeType("media")
-        ///            .SyncTree("-1,323,355");
-        /// ]]>
-        /// </example>
-        public ClientTools SyncTree(string path, bool forceReload)
-        {
-            RegisterClientScript(string.Format(Scripts.SyncTree, path, forceReload.ToString().ToLower()));
-            return this;
-        }
-
-        public ClientTools CopyNode(string currNodeId, string newParentPath)
-        {
-            RegisterClientScript(string.Format(Scripts.CopyNode, currNodeId, newParentPath));
-            return this;
-        }
-
-        public ClientTools MoveNode(string currNodeId, string newParentPath)
-        {
-            RegisterClientScript(string.Format(Scripts.MoveNode, currNodeId, newParentPath));
-            return this;
-        }
-
-        /// <summary>
-        /// Reloads only the last node that the user interacted with via the context menu. To reload a specify node, use SyncTree.
-        /// </summary>
-        /// <param name="reselect"></param>
-        /// <param name="reloadChildren"></param>
-        /// <remarks>
-        /// If for whatever reason the client side system cannot just refresh the one node, the system will use jsTree's built in
-        /// refresh tool, this however won't allow for reselect or reloadChildren. Most trees will work with the single node
-        /// refresh but 3rd party tools may have poorly built tree data models.
-        /// </remarks>
-        public ClientTools ReloadActionNode(bool reselect, bool reloadChildren)
-        {
-            RegisterClientScript(string.Format(Scripts.ReloadActionNode, (!reselect).ToString().ToLower(), (!reloadChildren).ToString().ToLower()));
-            return this;
-        }
-
-        /// <summary>
-        /// Closes the Umbraco dialog window if it is open
-        /// </summary>
-        /// <param name="returnVal">specify a value to return to add to the onCloseCallback method if one was specified in the OpenModalWindow method</param>
-        /// <returns></returns>
-        public ClientTools CloseModalWindow(string returnVal)
-        {
-            RegisterClientScript(Scripts.CloseModalWindow(returnVal));
-            return this;
-        }
-        /// <summary>
-        /// Closes the umbraco dialog window if it is open
-        /// </summary>
-        /// <returns></returns>
-        public ClientTools CloseModalWindow()
-        {
-            return CloseModalWindow("");
-        }
-
-
-        /// <summary>
-        /// Opens a modal window
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="name"></param>
-        /// <param name="height"></param>
-        /// <param name="showHeader"></param>
-        /// <param name="width"></param>
-        /// <param name="top"></param>
-        /// <param name="leftOffset"></param>
-        /// <param name="closeTriggers"></param>
-        /// <param name="onCloseCallback"></param>
-        /// <returns></returns>
-        public ClientTools OpenModalWindow(string url, string name, bool showHeader, int width, int height, int top, int leftOffset, string closeTriggers, string onCloseCallback)
-        {
-            RegisterClientScript(Scripts.OpenModalWindow(url, name, showHeader, width, height, top, leftOffset, closeTriggers, onCloseCallback));
-            return this;
-        }
-
-        /// <summary>
-        /// This will use the ScriptManager to register the script if one is available, otherwise will default to the ClientScript
-        /// class of the page.
-        /// </summary>
-        /// <param name="script"></param>
-        private void RegisterClientScript(string script)
-        {
-            //use the hash code of the script to generate the key, this way, the exact same script won't be
-            //inserted more than once.
-            if (ScriptManager.GetCurrent(_page) != null)
-            {
-                ScriptManager.RegisterStartupScript(_page, _page.GetType(), script.GetHashCode().ToString(), script, true);
-            }
-            else
-            {
-                _page.ClientScript.RegisterStartupScript(_page.GetType(), script.GetHashCode().ToString(), script, true);
-            }
-        }
-
-
-
-
-    }
-}
diff --git a/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs b/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
deleted file mode 100644
index cafdfb0e042a..000000000000
--- a/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Security;
-using System.Web;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Security;
-using Umbraco.Web.Actions;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Security;
-
-
-namespace Umbraco.Web.UI.Pages
-{
-    /// <summary>
-    /// UmbracoEnsuredPage is the standard protected page in the umbraco backend, and forces authentication.
-    /// </summary>
-    public class UmbracoEnsuredPage : BasePage
-    {
-        public UmbracoEnsuredPage()
-        {
-            //Assign security automatically if the attribute is found
-            var treeAuth = this.GetType().GetCustomAttribute<WebformsPageTreeAuthorizeAttribute>(true);
-            if (treeAuth != null)
-            {
-                var treeByAlias = Current.TreeService
-                    .GetByAlias(treeAuth.TreeAlias);
-                if (treeByAlias != null)
-                {
-                    CurrentApp = treeByAlias.ApplicationAlias;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Performs an authorization check for the user against the requested entity/path and permission set, this is only relevant to content and media
-        /// </summary>
-        /// <param name="entityId"></param>
-        /// <param name="objectType"></param>
-        /// <param name="actionToCheck"></param>
-        protected void CheckPathAndPermissions(int entityId, UmbracoObjectTypes objectType, IAction actionToCheck)
-        {
-            if (objectType != UmbracoObjectTypes.Document && objectType != UmbracoObjectTypes.Media)
-                return;
-
-            //check path access
-
-            var entity = entityId == Constants.System.Root
-                ? EntitySlim.Root
-                : Services.EntityService.Get(entityId, objectType);
-            var hasAccess = objectType == UmbracoObjectTypes.Document
-                ? Security.CurrentUser.HasContentPathAccess(entity, Services.EntityService)
-                : Security.CurrentUser.HasMediaPathAccess(entity, Services.EntityService);
-            if (hasAccess == false)
-                throw new AuthorizationException($"The current user doesn't have access to the path '{entity.Path}'");
-
-            //only documents have action permissions
-            if (objectType == UmbracoObjectTypes.Document)
-            {
-                var allActions = Current.Actions;
-                var perms = Security.CurrentUser.GetPermissions(entity.Path, Services.UserService);
-                var actions = perms
-                    .Select(x => allActions.FirstOrDefault(y => y.Letter.ToString(CultureInfo.InvariantCulture) == x))
-                    .WhereNotNull();
-                if (actions.Contains(actionToCheck) == false)
-                    throw new AuthorizationException($"The current user doesn't have permission to {actionToCheck.Alias} on the path '{entity.Path}'");
-            }
-        }
-
-        private bool _hasValidated = false;
-
-        /// <summary>
-        /// Authorizes the user
-        /// </summary>
-        /// <param name="e"></param>
-        /// <remarks>
-        /// Checks if the page exists outside of the /umbraco route, in which case the request will not have been authenticated for the back office
-        /// so we'll force authentication.
-        /// </remarks>
-        protected override void OnPreInit(EventArgs e)
-        {
-            base.OnPreInit(e);
-
-            //If this is not a back office request, then the module won't have authenticated it, in this case we
-            // need to do the auth manually and since this is an UmbracoEnsuredPage, this is the anticipated behavior
-            // TODO: When we implement Identity, this process might not work anymore, will be an interesting challenge
-            if (Context.Request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, Current.Configs.Global()) == false)
-            {
-                var http = new HttpContextWrapper(Context);
-                var ticket = http.GetUmbracoAuthTicket();
-                http.AuthenticateCurrentRequest(ticket, true);
-            }
-
-            try
-            {
-                Security.ValidateCurrentUser(true);
-                _hasValidated = true;
-
-                if (!Security.ValidateUserApp(CurrentApp))
-                {
-                    var ex = new SecurityException(String.Format("The current user doesn't have access to the section/app '{0}'", CurrentApp));
-                    Current.Logger.Error<UmbracoEnsuredPage>(ex, "Tried to access '{CurrentApp}'", CurrentApp);
-                    throw ex;
-                }
-
-            }
-            catch
-            {
-                // Clear content as .NET transfers rendered content.
-                Response.Clear();
-
-                // Ensure the person is definitely logged out
-                UmbracoContext.Current.Security.ClearCurrentLogin();
-
-                // Redirect to the login page
-                Response.Redirect(SystemDirectories.Umbraco + "#/login", true);
-            }
-        }
-
-        /// <summary>
-        /// Gets/sets the app that this page is assigned to
-        /// </summary>
-        protected string CurrentApp { get; set; }
-
-        /// <summary>
-        /// If true then umbraco will force any window/frame to reload umbraco in the main window
-        /// </summary>
-        protected bool RedirectToUmbraco { get; set; }
-
-        /// <summary>
-        /// Used to assign a webforms page's security to a specific tree which will in turn check to see
-        /// if the current user has access to the specified tree's registered section
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Class)]
-        public sealed class WebformsPageTreeAuthorizeAttribute : Attribute
-        {
-            public string TreeAlias { get; private set; }
-
-            public WebformsPageTreeAuthorizeAttribute(string treeAlias)
-            {
-                TreeAlias = treeAlias;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ca5d242d5ffa..3843c3d1d380 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -247,6 +247,7 @@
     <Compile Include="Trees\TreeCollection.cs" />
     <Compile Include="UI\JavaScript\ClientDependencyConfiguration.cs" />
     <Compile Include="Editors\Binders\BlueprintItemBinder.cs" />
+    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
     <Compile Include="UmbracoApplicationBase.cs" />
     <Compile Include="WebApi\HttpActionContextExtensions.cs" />
     <Compile Include="Models\ContentEditing\IContentSave.cs" />
@@ -894,9 +895,6 @@
     <Compile Include="UI\JavaScript\AssetInitialization.cs" />
     <Compile Include="UI\JavaScript\CssInitialization.cs" />
     <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="UmbracoComponentRenderer.cs" />
     <Compile Include="Web References\org.umbraco.our\Reference.cs">
       <AutoGen>True</AutoGen>
@@ -1049,9 +1047,6 @@
     <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
     <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
     <Compile Include="UI\CdfLogger.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\simple.ascx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="Controllers\UmbLoginController.cs" />
     <Compile Include="UrlHelperExtensions.cs" />
     <Compile Include="Editors\MediaController.cs" />
@@ -1149,35 +1144,13 @@
     <Compile Include="_Legacy\Controls\PropertyPanel.cs" />
     <Compile Include="_Legacy\Controls\TabPage.cs" />
     <Compile Include="_Legacy\Controls\TabView.cs" />
-    <Compile Include="_Legacy\PackageActions\addProxyFeedHost.cs" />
     <Compile Include="_Legacy\PackageActions\allowDoctype.cs" />
     <Compile Include="_Legacy\PackageActions\publishRootDocument.cs" />
     <Compile Include="_Legacy\UI\ITask.cs" />
     <Compile Include="_Legacy\UI\ITaskReturnUrl.cs" />
     <Compile Include="_Legacy\UI\LegacyDialogHandler.cs" />
     <Compile Include="_Legacy\UI\LegacyDialogTask.cs" />
-    <Compile Include="UI\Pages\BasePage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="UI\Pages\ClientTools.cs" />
-    <Compile Include="UI\Pages\UmbracoEnsuredPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="UI\SpeechBubbleIcon.cs" />
-    <Compile Include="umbraco.presentation\AttributeCollectionAdapter.cs" />
-    <Compile Include="umbraco.presentation\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
-    <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoPage.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="UmbracoHelper.cs" />
     <Compile Include="Mvc\ViewContextExtensions.cs" />
     <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
@@ -1213,9 +1186,6 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\item.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\page.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -1224,10 +1194,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
       <DependentUpon>FeedProxy.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1235,11 +1201,6 @@
     <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
       <DependentUpon>FeedProxy.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\templateControls\DisableEventValidation.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Item.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ItemRenderer.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\Macro.cs" />
-    <Compile Include="umbraco.presentation\umbraco\templateControls\ContentType.cs" />
     <Compile Include="UmbracoApplication.cs" />
     <Compile Include="UmbracoContext.cs" />
     <Compile Include="UmbracoInjectedModule.cs" />
diff --git a/src/Umbraco.Web/umbraco.presentation/AttributeCollectionAdapter.cs b/src/Umbraco.Web/umbraco.presentation/AttributeCollectionAdapter.cs
deleted file mode 100644
index 6b8ce5f1a7c2..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/AttributeCollectionAdapter.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-using System;
-using System.Collections;
-using System.Web.UI;
-
-namespace umbraco
-{
-    /// <summary>
-    /// Class that adapts an <see cref="AttributeCollection"/> to the <see cref="IDictionary"/> interface.
-    /// </summary>
-    public class AttributeCollectionAdapter : IDictionary
-    {
-        private readonly AttributeCollection _collection;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AttributeCollectionAdapter"/> class.
-        /// </summary>
-        /// <param name="collection">The collection.</param>
-        public AttributeCollectionAdapter(AttributeCollection collection)
-        {
-            _collection = collection;
-        }
-
-        #region IDictionary Members
-
-        /// <summary>
-        /// Adds an element with the provided key and value to the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </summary>
-        /// <param name="key">The <see cref="T:System.Object"/> to use as the key of the element to add.</param>
-        /// <param name="value">The <see cref="T:System.Object"/> to use as the value of the element to add.</param>
-        public void Add(object key, object value)
-        {
-            _collection.Add(key.ToString(), value.ToString());
-        }
-
-        /// <summary>
-        /// Removes all elements from the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </summary>
-        /// <exception cref="T:System.NotSupportedException">
-        /// The <see cref="T:System.Collections.IDictionary"/> object is read-only.
-        /// </exception>
-        public void Clear()
-        {
-            _collection.Clear();
-        }
-
-        /// <summary>
-        /// Determines whether the <see cref="T:System.Collections.IDictionary"/> object contains an element with the specified key.
-        /// </summary>
-        /// <param name="key">The key to locate in the <see cref="T:System.Collections.IDictionary"/> object.</param>
-        /// <returns>
-        /// true if the <see cref="T:System.Collections.IDictionary"/> contains an element with the key; otherwise, false.
-        /// </returns>
-        public bool Contains(object key)
-        {
-            return _collection[key.ToString()] != null;
-        }
-
-        /// <summary>
-        /// Returns an <see cref="T:System.Collections.IDictionaryEnumerator"/> object for the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.IDictionaryEnumerator"/> object for the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </returns>
-        public IDictionaryEnumerator GetEnumerator()
-        {
-            return new AttributeCollectionAdapterEnumerator(this);
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the <see cref="T:System.Collections.IDictionary"/> object has a fixed size.
-        /// </summary>
-        /// <value></value>
-        /// <returns>true if the <see cref="T:System.Collections.IDictionary"/> object has a fixed size; otherwise, false.
-        /// </returns>
-        public bool IsFixedSize
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the <see cref="T:System.Collections.IDictionary"/> object is read-only.
-        /// </summary>
-        /// <value></value>
-        /// <returns>true if the <see cref="T:System.Collections.IDictionary"/> object is read-only; otherwise, false.
-        /// </returns>
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets an <see cref="T:System.Collections.ICollection"/> object containing the keys of the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </summary>
-        /// <value></value>
-        /// <returns>
-        /// An <see cref="T:System.Collections.ICollection"/> object containing the keys of the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </returns>
-        public ICollection Keys
-        {
-            get { return _collection.Keys; }
-        }
-
-        /// <summary>
-        /// Removes the element with the specified key from the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </summary>
-        /// <param name="key">The key of the element to remove.</param>
-        public void Remove(object key)
-        {
-            _collection.Remove(key.ToString());
-        }
-
-        /// <summary>
-        /// Gets an <see cref="T:System.Collections.ICollection"/> object containing the values in the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </summary>
-        /// <value></value>
-        /// <returns>
-        /// An <see cref="T:System.Collections.ICollection"/> object containing the values in the <see cref="T:System.Collections.IDictionary"/> object.
-        /// </returns>
-        public ICollection Values
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="System.Object"/> with the specified key.
-        /// </summary>
-        /// <value></value>
-        public object this[object key]
-        {
-            get { return _collection[key.ToString()]; }
-            set { _collection[key.ToString()] = value.ToString(); }
-        }
-
-        #endregion
-
-        #region ICollection Members
-
-        /// <summary>Not implemented.</summary>
-        /// <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param>
-        /// <param name="index">The zero-based index in <paramref name="array"/> at which copying begins.</param>
-        public void CopyTo(Array array, int index)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
-        /// </summary>
-        /// <value></value>
-        /// <returns>
-        /// The number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
-        /// </returns>
-        public int Count
-        {
-            get { return _collection.Count; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread safe).
-        /// </summary>
-        /// <value></value>
-        /// <returns>true if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread safe); otherwise, false.
-        /// </returns>
-        public bool IsSynchronized
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
-        /// </summary>
-        /// <value></value>
-        /// <returns>
-        /// An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
-        /// </returns>
-        public object SyncRoot
-        {
-            get { return _collection; }
-        }
-
-        #endregion
-
-        #region IEnumerable Members
-
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
-        /// </returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            foreach (object key in _collection.Keys)
-                yield return _collection[(string)key];
-        }
-
-        #endregion
-
-
-        /// <summary>
-        /// <see cref="IDictionaryEnumerator"/> for the <see cref="AttributeCollectionAdapter"/> class.
-        /// </summary>
-        private class AttributeCollectionAdapterEnumerator : IDictionaryEnumerator
-        {
-            private readonly AttributeCollectionAdapter _adapter;
-            private readonly IEnumerator _enumerator;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="AttributeCollectionAdapterEnumerator"/> class.
-            /// </summary>
-            /// <param name="adapter">The adapter.</param>
-            public AttributeCollectionAdapterEnumerator(AttributeCollectionAdapter adapter)
-            {
-                _adapter = adapter;
-                _enumerator = ((IEnumerable)adapter).GetEnumerator();
-            }
-
-            #region IDictionaryEnumerator Members
-
-            /// <summary>
-            /// Gets both the key and the value of the current dictionary entry.
-            /// </summary>
-            /// <value></value>
-            /// <returns>
-            /// A <see cref="T:System.Collections.DictionaryEntry"/> containing both the key and the value of the current dictionary entry.
-            /// </returns>
-            /// <exception cref="T:System.InvalidOperationException">
-            /// The <see cref="T:System.Collections.IDictionaryEnumerator"/> is positioned before the first entry of the dictionary or after the last entry.
-            /// </exception>
-            public DictionaryEntry Entry
-            {
-                get { return new DictionaryEntry(Key, Value); }
-            }
-
-            /// <summary>
-            /// Gets the key of the current dictionary entry.
-            /// </summary>
-            /// <value></value>
-            /// <returns>
-            /// The key of the current element of the enumeration.
-            /// </returns>
-            /// <exception cref="T:System.InvalidOperationException">
-            /// The <see cref="T:System.Collections.IDictionaryEnumerator"/> is positioned before the first entry of the dictionary or after the last entry.
-            /// </exception>
-            public object Key
-            {
-                get { return _enumerator.Current; }
-            }
-
-            /// <summary>
-            /// Gets the value of the current dictionary entry.
-            /// </summary>
-            /// <value></value>
-            /// <returns>
-            /// The value of the current element of the enumeration.
-            /// </returns>
-            /// <exception cref="T:System.InvalidOperationException">
-            /// The <see cref="T:System.Collections.IDictionaryEnumerator"/> is positioned before the first entry of the dictionary or after the last entry.
-            /// </exception>
-            public object Value
-            {
-                get { return _adapter[_enumerator.Current]; }
-            }
-
-            #endregion
-
-            #region IEnumerator Members
-
-            /// <summary>
-            /// Gets the current element in the collection.
-            /// </summary>
-            /// <value></value>
-            /// <returns>
-            /// The current element in the collection.
-            /// </returns>
-            /// <exception cref="T:System.InvalidOperationException">
-            /// The enumerator is positioned before the first element of the collection or after the last element.
-            /// </exception>
-            public object Current
-            {
-                get { return _enumerator.Current; }
-            }
-
-            /// <summary>
-            /// Advances the enumerator to the next element of the collection.
-            /// </summary>
-            /// <returns>
-            /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
-            /// </returns>
-            /// <exception cref="T:System.InvalidOperationException">
-            /// The collection was modified after the enumerator was created.
-            /// </exception>
-            public bool MoveNext()
-            {
-                return _enumerator.MoveNext();
-            }
-
-            /// <summary>
-            /// Sets the enumerator to its initial position, which is before the first element in the collection.
-            /// </summary>
-            /// <exception cref="T:System.InvalidOperationException">
-            /// The collection was modified after the enumerator was created.
-            /// </exception>
-            public void Reset()
-            {
-                _enumerator.Reset();
-            }
-
-            #endregion
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs b/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs
index 287f75c769f0..38fa4deca83f 100644
--- a/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs
+++ b/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs
@@ -1,4 +1,5 @@
-using System.Web.UI;
+using System;
+using System.Web.UI;
 
 namespace umbraco
 {
@@ -7,6 +8,7 @@ public class MacroCacheContent
         private readonly Control _control;
         private readonly string _id;
 
+        [Obsolete("TODO: WB This seems legacy as we reference WebForms Control type", false)]
         public MacroCacheContent(Control control, string ID)
         {
             _control = control;
diff --git a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
deleted file mode 100644
index 56d596e24d67..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
-using System.Web.UI;
-using System.IO;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Web;
-using Umbraco.Web.Routing;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Web.Templates;
-using Umbraco.Web.Composing;
-
-namespace umbraco
-{
-    /// <summary>
-    /// The codebehind class for the main default.aspx page that does the webforms rendering in Umbraco
-    /// </summary>
-    /// <remarks>
-    /// We would move this to the UI project but there is a public API property and some protected properties which people may be using so
-    /// we cannot move it.
-    /// </remarks>
-    public class UmbracoDefault : Page
-    {
-        /// <summary>
-        /// Simply used to clear temp data
-        /// </summary>
-        private class TempDataController : Controller
-        {
-        }
-
-        private page _upage;
-        private PublishedRequest _frequest;
-
-        /// <summary>
-        /// To turn off request validation set this to false before the PageLoad event. This equivalent to the validateRequest page directive
-        /// and has nothing to do with "normal" validation controls. Default value is true.
-        /// </summary>
-        public bool ValidateRequest { get; set; } = true;
-
-        protected override void OnPreInit(EventArgs e)
-        {
-            base.OnPreInit(e);
-            using (Current.ProfilingLogger.DebugDuration<UmbracoDefault>("PreInit"))
-            {
-                // handle the infamous umbDebugShowTrace, etc
-                Page.Trace.IsEnabled &= GlobalSettings.DebugMode && string.IsNullOrWhiteSpace(Request["umbDebugShowTrace"]) == false;
-
-                // get the document request and the page
-                _frequest = UmbracoContext.Current.PublishedRequest;
-                _upage = _frequest.UmbracoPage;
-
-                var args = new RequestInitEventArgs()
-                {
-                    Page = _upage,
-                    PageId = _upage.PageID,
-                    Context = Context
-                };
-                FireBeforeRequestInit(args);
-
-                //if we are cancelling then return and don't proceed
-                if (args.Cancel) return;
-
-                // reset the friendly path so it's used by forms, etc.
-                Context.RewritePath(UmbracoContext.Current.OriginalRequestUrl.PathAndQuery);
-
-                //fire the init finished event
-                FireAfterRequestInit(args);
-            }
-        }
-
-        protected override void OnInit(EventArgs e)
-        {
-            using (Current.ProfilingLogger.DebugDuration<UmbracoDefault>("Init"))
-            {
-                base.OnInit(e);
-
-                //This is a special case for webforms since in some cases we may be POSTing to an MVC controller, adding TempData there and then redirecting
-                // to a webforms handler. In that case we need to manually clear out the tempdata ourselves since this is normally the function of the base
-                // MVC controller instance and since that is not executing, we'll deal with that here.
-                //Unfortunately for us though, we can never know which TempDataProvider was used for the previous controller, by default it is the sessionstateprovider
-                // but since the tempdataprovider is not a global mvc thing, it is only a per-controller thing, we can only just assume it will be the sessionstateprovider
-                var provider = new SessionStateTempDataProvider();
-                //We create a custom controller context, the only thing that is referenced from this controller context in the sessionstateprovider is the HttpContext.Session
-                // so we just need to ensure that is set
-                var ctx = new ControllerContext(new HttpContextWrapper(Context), new RouteData(), new TempDataController());
-                provider.LoadTempData(ctx);
-            }
-        }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            using (Current.ProfilingLogger.DebugDuration<UmbracoDefault>("Load"))
-            {
-                base.OnLoad(e);
-
-                if (ValidateRequest)
-                    Request.ValidateInput();
-            }
-        }
-
-        protected override void Render(HtmlTextWriter writer)
-        {
-            using (Current.ProfilingLogger.DebugDuration<UmbracoDefault>("Render"))
-            {
-
-                // do the original rendering
-                TextWriter sw = new StringWriter();
-                base.Render(new HtmlTextWriter(sw));
-                string text = sw.ToString();
-
-                // filter / parse internal links - although this should be done elsewhere!
-                text = TemplateUtilities.ParseInternalLinks(text, UmbracoContext.Current.UrlProvider);
-
-                // filter / add preview banner
-                if (UmbracoContext.Current.InPreviewMode)
-                {
-                    Current.Logger.Debug<UmbracoDefault>("Umbraco is running in preview mode.");
-
-                    if (Response.ContentType.InvariantEquals("text/html")) // ASP.NET default value
-                    {
-                        int pos = text.ToLower().IndexOf("</body>");
-                        if (pos > -1)
-                        {
-                            string htmlBadge =
-                                string.Format(Current.Configs.Settings().Content.PreviewBadge,
-                                              IOHelper.ResolveUrl(SystemDirectories.Umbraco),
-                                              Server.UrlEncode(UmbracoContext.Current.HttpContext.Request.Path));
-
-                            text = text.Substring(0, pos) + htmlBadge + text.Substring(pos, text.Length - pos);
-                        }
-                    }
-                }
-
-                // render
-                writer.Write(text);
-            }
-        }
-
-        /// <summary>
-        /// The preinit event handler
-        /// </summary>
-        public delegate void RequestInitEventHandler(object sender, RequestInitEventArgs e);
-        /// <summary>
-        /// occurs before the umbraco page is initialized for rendering.
-        /// </summary>
-        public static event RequestInitEventHandler BeforeRequestInit;
-        /// <summary>
-        /// Raises the <see cref="BeforeRequestInit"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected internal virtual void FireBeforeRequestInit(RequestInitEventArgs e)
-        {
-            if (BeforeRequestInit != null)
-                BeforeRequestInit(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [after save].
-        /// </summary>
-        public static event RequestInitEventHandler AfterRequestInit;
-        /// <summary>
-        /// Raises the <see cref="AfterRequestInit"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireAfterRequestInit(RequestInitEventArgs e)
-        {
-            if (AfterRequestInit != null)
-                AfterRequestInit(this, e);
-
-        }
-    }
-
-    public class RequestInitEventArgs : System.ComponentModel.CancelEventArgs
-    {
-        public page Page { get; internal set; }
-        public HttpContext Context { get; internal set; }
-        public string Url { get; internal set; }
-        public int PageId { get; internal set; }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/item.cs b/src/Umbraco.Web/umbraco.presentation/item.cs
deleted file mode 100644
index 74cfb9bf2571..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/item.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-using System;
-using System.Collections;
-using System.Web;
-using System.Xml;
-using StackExchange.Profiling;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web;
-using Umbraco.Core.Profiling;
-using Umbraco.Core.Strings;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Macros;
-
-namespace umbraco
-{
-    /// <summary>
-    ///
-    /// </summary>
-    public class item
-    {
-        private string _fieldContent = "";
-        private readonly string _fieldName;
-
-        public string FieldContent
-        {
-            get { return _fieldContent; }
-        }
-
-        public item(string itemValue, IDictionary attributes)
-        {
-            _fieldContent = itemValue;
-            ParseItem(attributes);
-        }
-
-        /// <summary>
-        /// Creates a new Legacy item
-        /// </summary>
-        /// <param name="elements"></param>
-        /// <param name="attributes"></param>
-        public item(IDictionary elements, IDictionary attributes)
-            : this(null, elements, attributes)
-        {
-        }
-
-        /// <summary>
-        /// Creates an Item with a publishedContent item in order to properly recurse and return the value.
-        /// </summary>
-        /// <param name="publishedContent"></param>
-        /// <param name="elements"></param>
-        /// <param name="attributes"></param>
-        /// <remarks>
-        /// THIS ENTIRE CLASS WILL BECOME LEGACY, THE FIELD RENDERING NEEDS TO BE REPLACES SO THAT IS WHY THIS
-        /// CTOR IS INTERNAL.
-        /// </remarks>
-        internal item(IPublishedContent publishedContent, IDictionary elements, IDictionary attributes)
-        {
-            _fieldName = FindAttribute(attributes, "field");
-
-            if (_fieldName.StartsWith("#"))
-            {
-                var umbHelper = new UmbracoHelper(Current.UmbracoContext, Current.Services);
-
-                _fieldContent = umbHelper.GetDictionaryValue(_fieldName.Substring(1, _fieldName.Length - 1));
-            }
-            else
-            {
-                // Loop through XML children we need to find the fields recursive
-                var recursive = FindAttribute(attributes, "recursive") == "true";
-
-                if (publishedContent == null)
-                {
-                    if (recursive)
-                    {
-                        var recursiveVal = GetRecursiveValueLegacy(elements);
-                        _fieldContent = recursiveVal.IsNullOrWhiteSpace() ? _fieldContent : recursiveVal;
-                    }
-                   
-                }
-
-                //check for published content and get its value using that
-                if (publishedContent != null && (publishedContent.HasProperty(_fieldName) || recursive))
-                {
-                    var pval = publishedContent.Value(_fieldName, fallback: Fallback.ToAncestors);
-                    var rval = pval == null ? string.Empty : pval.ToString();
-                    _fieldContent = rval.IsNullOrWhiteSpace() ? _fieldContent : rval;
-                }
-                else
-                {
-                    //get the vaue the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent)
-                    var elt = elements[_fieldName];
-                    if (elt != null && string.IsNullOrEmpty(elt.ToString()) == false)
-                        _fieldContent = elt.ToString().Trim();
-                }
-
-                //now we check if the value is still empty and if so we'll check useIfEmpty
-                if (string.IsNullOrEmpty(_fieldContent))
-                {
-                    var altFieldName = FindAttribute(attributes, "useIfEmpty");
-                    if (string.IsNullOrEmpty(altFieldName) == false)
-                    {
-                        if (publishedContent != null && (publishedContent.HasProperty(altFieldName) || recursive))
-                        {
-                            var pval = publishedContent.Value(altFieldName, fallback: Fallback.ToAncestors);
-                            var rval = pval == null ? string.Empty : pval.ToString();
-                            _fieldContent = rval.IsNullOrWhiteSpace() ? _fieldContent : rval;
-                        }
-                        else
-                        {
-                            //get the vaue the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent)
-                            var elt = elements[altFieldName];
-                            if (elt != null && string.IsNullOrEmpty(elt.ToString()) == false)
-                                _fieldContent = elt.ToString().Trim();
-                        }
-                    }
-                }
-
-            }
-
-            ParseItem(attributes);
-        }
-
-        static string FindAttribute(IDictionary attributes, string key)
-        {
-            key = key.ToLowerInvariant();
-            var attributeValue = attributes.Contains(key) ? attributes[key].ToString() : string.Empty;
-            return MacroRenderer.ParseAttribute(null, attributeValue);
-        }
-
-        /// <summary>
-        /// Returns the recursive value using a legacy strategy of looking at the xml cache and the splitPath in the elements collection
-        /// </summary>
-        /// <param name="elements"></param>
-        /// <returns></returns>
-        private string GetRecursiveValueLegacy(IDictionary elements)
-        {
-            using (Current.ProfilingLogger.DebugDuration<item>("Checking recusively"))
-            {
-                var content = "";
-
-                var umbracoContext = UmbracoContext.Current;
-                var cache = umbracoContext.ContentCache as Umbraco.Web.PublishedCache.XmlPublishedCache.PublishedContentCache;
-                if (cache == null)
-                    throw new InvalidOperationException("Unsupported IPublishedContentCache, only the Xml one is supported.");
-                var umbracoXml = cache.GetXml(umbracoContext.InPreviewMode);
-
-                var splitpath = (string[])elements["splitpath"];
-                for (int i = 0; i < splitpath.Length - 1; i++)
-                {
-                    XmlNode element = umbracoXml.GetElementById(splitpath[splitpath.Length - i - 1]);
-
-                    if (element == null)
-                        continue;
-
-                    var xpath = "./{0}";
-                    var currentNode = element.SelectSingleNode(string.Format(xpath, _fieldName));
-
-                    //continue if all is null
-                    if (currentNode == null || currentNode.FirstChild == null || string.IsNullOrEmpty(currentNode.FirstChild.Value) || string.IsNullOrEmpty(currentNode.FirstChild.Value.Trim()))
-                        continue;
-
-                    HttpContext.Current.Trace.Write("item.recursive", "Item loaded from " + splitpath[splitpath.Length - i - 1]);
-                    content = currentNode.FirstChild.Value;
-                    break;
-                }
-
-                return content;
-            }
-        }
-
-        private void ParseItem(IDictionary attributes)
-        {
-            using (Current.ProfilingLogger.DebugDuration<item>("Start parsing " + _fieldName))
-            {
-                HttpContext.Current.Trace.Write("item", "Start parsing '" + _fieldName + "'");
-                if (FindAttribute(attributes, "textIfEmpty") != "" && _fieldContent == "")
-                    _fieldContent = FindAttribute(attributes, "textIfEmpty");
-
-                _fieldContent = _fieldContent.Trim();
-
-                // DATE FORMATTING FUNCTIONS
-                if (FindAttribute(attributes, "formatAsDateWithTime") == "true")
-                {
-                    if (_fieldContent == "")
-                        _fieldContent = DateTime.Now.ToString();
-                    _fieldContent = Convert.ToDateTime(_fieldContent).ToLongDateString() +
-                                    FindAttribute(attributes, "formatAsDateWithTimeSeparator") +
-                                    Convert.ToDateTime(_fieldContent).ToShortTimeString();
-                }
-                else if (FindAttribute(attributes, "formatAsDate") == "true")
-                {
-                    if (_fieldContent == "")
-                        _fieldContent = DateTime.Now.ToString();
-                    _fieldContent = Convert.ToDateTime(_fieldContent).ToLongDateString();
-                }
-
-
-                // TODO: Needs revision to check if parameter-tags has attributes
-                if (FindAttribute(attributes, "stripParagraph") == "true" && _fieldContent.Length > 5)
-                {
-                    _fieldContent = _fieldContent.Trim();
-                    string fieldContentLower = _fieldContent.ToLower();
-
-                    // the field starts with an opening p tag
-                    if (fieldContentLower.Substring(0, 3) == "<p>"
-                        // it ends with a closing p tag
-                        && fieldContentLower.Substring(_fieldContent.Length - 4, 4) == "</p>"
-                        // it doesn't contain multiple p-tags
-                        && fieldContentLower.IndexOf("<p>", 1) < 0)
-                    {
-                        _fieldContent = _fieldContent.Substring(3, _fieldContent.Length - 7);
-                    }
-                }
-
-                // CASING
-                if (FindAttribute(attributes, "case") == "lower")
-                    _fieldContent = _fieldContent.ToLower();
-                else if (FindAttribute(attributes, "case") == "upper")
-                    _fieldContent = _fieldContent.ToUpper();
-                else if (FindAttribute(attributes, "case") == "title")
-                    _fieldContent = _fieldContent.ToCleanString(CleanStringType.Ascii | CleanStringType.Alias | CleanStringType.PascalCase);
-
-                // OTHER FORMATTING FUNCTIONS
-                
-                if (FindAttribute(attributes, "urlEncode") == "true")
-                    _fieldContent = HttpUtility.UrlEncode(_fieldContent);
-                if (FindAttribute(attributes, "htmlEncode") == "true")
-                    _fieldContent = HttpUtility.HtmlEncode(_fieldContent);
-                if (FindAttribute(attributes, "convertLineBreaks") == "true")
-                    _fieldContent = _fieldContent.Replace("\n", "<br/>\n");
-
-                HttpContext.Current.Trace.Write("item", "Done parsing '" + _fieldName + "'");
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs
index 0c9b0c6ff370..e4c2fad24a36 100644
--- a/src/Umbraco.Web/umbraco.presentation/page.cs
+++ b/src/Umbraco.Web/umbraco.presentation/page.cs
@@ -17,6 +17,7 @@ namespace umbraco
     /// <summary>
     /// Summary description for page.
     /// </summary>
+    [Obsolete("TODO: WB This seems legacy", false)]
     public class page
     {
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.cs
deleted file mode 100644
index d1e5f05e1c94..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Web.UI.WebControls;
-
-using System.Xml;
-using Umbraco.Core.IO;
-using Umbraco.Web.UI.Pages;
-
-namespace umbraco.cms.presentation
-{
-    public class Create : UmbracoEnsuredPage
-    {
-        protected Label helpText;
-        protected TextBox rename;
-        protected Label Label1;
-        protected ListBox nodeType;
-        protected PlaceHolder UI;
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            // Load create definitions
-            var nodeType = Request.QueryString["nodeType"];
-
-            var createDef = new XmlDocument();
-            var defReader = new XmlTextReader(IOHelper.MapPath(SystemFiles.CreateUiXml));
-            createDef.Load(defReader);
-            defReader.Close();
-
-            // Find definition for current nodeType
-            var def = createDef.SelectSingleNode("//nodeType [@alias = '" + nodeType + "']");
-            if (def == null)
-            {
-                throw new ArgumentException("The create dialog for \"" + nodeType + "\" does not match anything defined in the \"" + SystemFiles.CreateUiXml + "\". This could mean an incorrectly installed package or a corrupt UI file");
-            }
-
-            try
-            {
-                var virtualPath = SystemDirectories.Umbraco + def.SelectSingleNode("./usercontrol").FirstChild.Value;
-                var mainControl = LoadControl(virtualPath);
-                UI.Controls.Add(mainControl);
-            }
-            catch (Exception ex)
-            {
-                throw new ArgumentException("ERROR CREATING CONTROL FOR NODETYPE: " + nodeType, ex);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
deleted file mode 100644
index 16811aaa2fa6..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Web.Composing;
-using Umbraco.Web._Legacy.UI;
-
-namespace Umbraco.Web
-{
-    public class macroTasks : LegacyDialogTask
-    {
-        public override bool PerformSave()
-        {
-            var macro = Current.Services.MacroService.GetByAlias(Alias);
-            if (macro == null)
-            {
-                macro = new Macro(Alias, Alias, string.Empty, MacroTypes.Unknown);
-                Current.Services.MacroService.Save(macro);
-            }
-            _returnUrl = $"developer/Macros/editMacro.aspx?macroID={macro.Id}";
-            return true;
-        }
-
-        public override bool PerformDelete()
-        {
-            var macro = Current.Services.MacroService.GetById(ParentID);
-            if (macro != null)
-                Current.Services.MacroService.Delete(macro);
-            return true;
-        }
-
-        private string _returnUrl = "";
-
-        public override string ReturnUrl => _returnUrl;
-
-        public override string AssignedApp => Constants.Applications.Settings;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
deleted file mode 100644
index 94264fa8b683..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using Umbraco.Core.Services;
-using System;
-using System.Linq;
-using System.Web;
-using System.Web.UI.WebControls;
-using ClientDependency.Core;
-using Umbraco.Core;
-using Umbraco.Web;
-using Umbraco.Web.UI;
-using Umbraco.Web._Legacy.UI;
-using UmbracoUserControl = Umbraco.Web.UI.Controls.UmbracoUserControl;
-
-namespace umbraco.cms.presentation.create.controls
-{
-    /// <summary>
-    ///        Summary description for simple.
-    /// </summary>
-    public partial class simple : UmbracoUserControl
-    {
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            sbmt.Text = Services.TextService.Localize("create");
-            rename.Attributes["placeholder"] = Services.TextService.Localize("name");
-
-            // Put user code to initialize the page here
-        }
-
-        protected void sbmt_Click(object sender, EventArgs e)
-        {
-            if (Page.IsValid)
-            {
-                int nodeId;
-                if (int.TryParse(Request.QueryString["nodeId"], out nodeId) == false)
-                    nodeId = -1;
-
-                try
-                {
-
-                    var returnUrl = LegacyDialogHandler.Create(
-                        new HttpContextWrapper(Context),
-                        Security.CurrentUser,
-                        Request.GetItemAsString("nodeType"),
-                            nodeId,
-                            rename.Text.Trim(),
-                            Request.QueryString.AsEnumerable().ToDictionary(x => x.Key, x => (object)x.Value));
-
-                    ClientTools
-                    .ChangeContentFrameUrl(returnUrl)
-                    .ReloadActionNode(false, true)
-                    .CloseModalWindow();
-                }
-                catch (Exception ex)
-                {
-                    CustomValidation.ErrorMessage = "* " + ex.Message;
-                    CustomValidation.IsValid = false;
-                }
-            }
-
-        }
-
-        protected CustomValidator CustomValidation;
-
-        /// <summary>
-        /// RequiredFieldValidator1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
-
-        /// <summary>
-        /// rename control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox rename;
-
-        /// <summary>
-        /// Textbox1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox Textbox1;
-
-        /// <summary>
-        /// sbmt control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button sbmt;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbracoPageHolder.cs b/src/Umbraco.Web/umbraco.presentation/umbracoPageHolder.cs
deleted file mode 100644
index 8f7423b1b580..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbracoPageHolder.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.ComponentModel;
-using System.Text;
-using System.Collections;
-
-namespace umbraco.layoutControls
-{
-    /// <summary>
-    /// Summary description for umbracoPageHolder.
-    /// </summary>
-    [DefaultProperty("Text"),
-        ToolboxData("<{0}:umbracoPageHolder runat=server></{0}:umbracoPageHolder>")]
-    public class umbracoPageHolder : System.Web.UI.WebControls.PlaceHolder
-    {
-        #region private properties
-
-        private String _pageName;
-        private String _writerName;
-        private DateTime _createDate;
-        private DateTime _updateDate;
-        private int _pageID;
-        private int _pageVersion;
-        private int _templateID;
-        private Hashtable _elements = new Hashtable();
-        private StringBuilder _pageContent = new StringBuilder();
-
-        #endregion
-
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public string PageName
-        {
-            get {return _pageName;}
-            set {_pageName = value;}
-        }
-
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public string WriterName
-        {
-            get {return _writerName;}
-            set {_writerName = value;}
-        }
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public DateTime CreateDate
-        {
-            get {return _createDate;}
-            set {_createDate = value;}
-        }
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public DateTime updateDate
-        {
-            get {return _updateDate;}
-            set {_updateDate = value;}
-        }
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public int pageID
-        {
-            get {return _pageID;}
-            set {_pageID = value;}
-        }
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public int pageVersion
-        {
-            get {return _pageVersion;}
-            set {_pageVersion = value;}
-        }
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public int templateID
-        {
-            get {return _templateID;}
-            set {_templateID = value;}
-        }
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public Hashtable Elements
-        {
-            get {return _elements;}
-            set {_elements = value;}
-        }
-        [Bindable(true), Category("umbraco"), DefaultValue("")]
-        public StringBuilder PageContent
-        {
-            get {return _pageContent;}
-            set {_pageContent = value;}
-        }
-
-        public void Populate(page Page) {
-            if (Page != null)
-            {
-                _pageID = Page.PageID;
-                _templateID = Page.Template;
-
-                _createDate = Page.CreateDate;
-                _updateDate = Page.UpdateDate;
-
-                _writerName = Page.WriterName;
-                _pageName = Page.PageName;
-                _elements = Page.Elements;
-
-                _pageContent.Append(Page.PageContent);
-                this.Controls.Add(Page.PageContentControl);
-            }
-        }
-
-        /// <summary>
-        /// Render this control to the output parameter specified.
-        /// </summary>
-        /// <param name="output"> The HTML writer to write out to </param>
-        protected override void Render(HtmlTextWriter output)
-        {
-            base.Render(output);
-        }
-    }
-}

From ba098f49c4e9f0b236e712ffad3b3b5ab9093f86 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 24 Jan 2019 13:59:17 +0000
Subject: [PATCH 039/421] =?UTF-8?q?=E2=98=A0=EF=B8=8F=E2=98=A0=EF=B8=8F=20?=
 =?UTF-8?q?Bye=20bye=20feedproxy.config=20=E2=98=A0=EF=B8=8F=E2=98=A0?=
 =?UTF-8?q?=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Core/IO/SystemFiles.cs            |  4 +-
 .../common/resources/dashboard.resource.js    | 18 +++--
 .../src/common/services/help.service.js       | 21 +++---
 .../dashboard/dashboard.tabs.controller.js    | 18 +++--
 .../members/membersdashboardvideos.html       |  6 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  5 --
 .../Umbraco/dashboard/FeedProxy.aspx          |  2 -
 .../config/feedProxy.Release.config           | 12 ---
 src/Umbraco.Web.UI/config/feedProxy.config    | 12 ---
 .../Editors/DashboardController.cs            | 73 ++++++++++++++++++-
 src/Umbraco.Web/Umbraco.Web.csproj            |  8 --
 .../umbraco/dashboard/FeedProxy.aspx          |  2 -
 .../umbraco/dashboard/FeedProxy.aspx.cs       | 65 -----------------
 .../dashboard/FeedProxy.aspx.designer.cs      | 15 ----
 14 files changed, 111 insertions(+), 150 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/dashboard/FeedProxy.aspx
 delete mode 100644 src/Umbraco.Web.UI/config/feedProxy.Release.config
 delete mode 100644 src/Umbraco.Web.UI/config/feedProxy.config
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.designer.cs

diff --git a/src/Umbraco.Core/IO/SystemFiles.cs b/src/Umbraco.Core/IO/SystemFiles.cs
index 511c39c98bb6..7d0b31b578d1 100644
--- a/src/Umbraco.Core/IO/SystemFiles.cs
+++ b/src/Umbraco.Core/IO/SystemFiles.cs
@@ -12,9 +12,7 @@ public class SystemFiles
         public static string TinyMceConfig => SystemDirectories.Config + "/tinyMceConfig.config";
 
         public static string NotFoundhandlersConfig => SystemDirectories.Config + "/404handlers.config";
-
-        public static string FeedProxyConfig => string.Concat(SystemDirectories.Config, "/feedProxy.config");
-
+        
         public static string GetContentCacheXml(IGlobalSettings globalSettings)
         {
             switch (globalSettings.LocalTempStorageLocation)
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/dashboard.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/dashboard.resource.js
index c48b2dd2a713..1459822c9696 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/dashboard.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/dashboard.resource.js
@@ -14,7 +14,7 @@ function dashboardResource($q, $http, umbRequestHelper) {
          *
          * @description
          * Retrieves the dashboard configuration for a given section
-         * 
+         *
          * @param {string} section Alias of section to retrieve dashboard configuraton for
          * @returns {Promise} resourcePromise object containing the user array.
          *
@@ -36,7 +36,7 @@ function dashboardResource($q, $http, umbRequestHelper) {
         *
         * @description
         * Retrieves dashboard content from a remote source for a given section
-        * 
+        *
         * @param {string} section Alias of section to retrieve dashboard content for
         * @returns {Promise} resourcePromise object containing the user array.
         *
@@ -70,10 +70,18 @@ function dashboardResource($q, $http, umbRequestHelper) {
                         "dashboardApiBaseUrl",
                         "GetRemoteDashboardCss",
                         values);
-        }
-
-
+        },
 
+        getRemoteXmlData: function (site, url) {
+            //build request values with optional params
+            var values = { site: site, url: url };
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                umbRequestHelper.getApiUrl(
+                    "dashboardApiBaseUrl",
+                    "GetRemoteXml",
+                    values)), "Failed to get remote xml");
+        }
     };
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
index ff8d487bb7e7..cd727ac32bb4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
@@ -1,9 +1,9 @@
 angular.module('umbraco.services')
-	.factory('helpService', function ($http, $q, umbRequestHelper) {
+	.factory('helpService', function ($http, $q, umbRequestHelper, dashboardResource) {
 		var helpTopics = {};
 
-		var defaultUrl = "https://our.umbraco.com/rss/help";
-		var tvUrl = "https://umbraco.tv/feeds/help";
+		var defaultUrl = "rss/help";
+		var tvUrl = "feeds/help";
 
 		function getCachedHelp(url){
 			if(helpTopics[url]){
@@ -17,16 +17,14 @@ angular.module('umbraco.services')
 			helpTopics[url] = data;
 		}
 
-		function fetchUrl(url){
+		function fetchUrl(site, url){
 			var deferred = $q.defer();
 			var found = getCachedHelp(url);
 
 			if(found){
 				deferred.resolve(found);
 			}else{
-
-				var proxyUrl = "dashboard/feedproxy.aspx?url=" + url; 
-				$http.get(proxyUrl).then(function(data){
+				dashboardResource.getRemoteXmlData(site, url).then(function (data) {
 					var feed = $(data.data);
 					var topics = [];
 
@@ -41,7 +39,12 @@ angular.module('umbraco.services')
 
 					setCachedHelp(topics);
 					deferred.resolve(topics);
+
+				},
+				function (exception) {
+					console.error('ex from remote data', exception);
 				});
+
 			}
 
 			return deferred.promise;
@@ -50,12 +53,12 @@ angular.module('umbraco.services')
 		var service = {
 			findHelp: function (args) {
 				var url = service.getUrl(defaultUrl, args);
-				return fetchUrl(url);
+				return fetchUrl('OUR', url);
 			},
 
 			findVideos: function (args) {
 				var url = service.getUrl(tvUrl, args);
-				return fetchUrl(url);
+				return fetchUrl('TV', url);
 			},
 
 			getContextHelpForPage: function (section, tree, baseurl) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index 877135c10503..ed3d6ded33fa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -1,9 +1,9 @@
-function startUpVideosDashboardController($scope, xmlhelper, $log, $http) {
+function startUpVideosDashboardController($scope, dashboardResource) {
     $scope.videos = [];
     $scope.init = function(url){
-        var proxyUrl = "dashboard/feedproxy.aspx?url=" + url;
-        $http.get(proxyUrl).then(function(data){
-              var feed = $(data.data);
+
+        dashboardResource.getRemoteXmlData('COM', url).then(function (data) {
+            var feed = $(data.data);
               $('item', feed).each(function (i, item) {
                   var video = {};
                   video.thumbnail = $(item).find('thumbnail').attr('url');
@@ -11,6 +11,10 @@ function startUpVideosDashboardController($scope, xmlhelper, $log, $http) {
                   video.link = $("guid", item).text();
                   $scope.videos.push(video);
               });
+
+        },
+        function (exception) {
+            console.error('ex from remote data', exception);
         });
     };
 }
@@ -24,7 +28,7 @@ function startUpDynamicContentController($timeout, $scope, dashboardResource, as
 
     vm.loading = true;
     vm.showDefault = false;
-    
+
     vm.startTour = startTour;
 
     function onInit() {
@@ -93,7 +97,7 @@ function startUpDynamicContentController($timeout, $scope, dashboardResource, as
             });
         });
     }));
-    
+
     //proxy remote css through the local server
     assetsService.loadCss(dashboardResource.getRemoteDashboardCssUrl("content"), $scope);
     dashboardResource.getRemoteDashboardContent("content").then(
@@ -117,7 +121,7 @@ function startUpDynamicContentController($timeout, $scope, dashboardResource, as
             vm.showDefault = true;
         });
 
-    
+
     onInit();
 
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
index a403e6186a25..83f3fb2f7a84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
@@ -1,5 +1,5 @@
-<div class="row-fluid" 
-	ng-init="init('https://umbraco.com/feeds/videos/members')" 
+<div class="row-fluid"
+	ng-init="init('feeds/videos/members')"
 	ng-controller="Umbraco.Dashboard.StartupVideosController">
 
 	<umb-box>
@@ -8,7 +8,7 @@ <h3>Hours of Umbraco training videos are only a click away</h3>
 			<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="https://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
 		</umb-box-content>
 	</umb-box>
-	
+
 	<div ng-show="videos.length">
           <h4>To get you started:</h4>
             <ul class="thumbnails" >
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index d51c2f781489..e414b0521d4e 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -212,9 +212,6 @@
     <None Include="Config\scripting.Release.config">
       <DependentUpon>scripting.config</DependentUpon>
     </None>
-    <None Include="Config\feedProxy.Release.config">
-      <DependentUpon>feedProxy.config</DependentUpon>
-    </None>
     <None Include="Config\Dashboard.Release.config">
       <DependentUpon>Dashboard.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -236,7 +233,6 @@
     <Content Include="Umbraco\Config\Lang\ru.xml" />
     <Content Include="Umbraco\Config\Lang\zh.xml" />
     <Content Include="Umbraco\Config\Lang\ko.xml" />
-    <Content Include="Umbraco\Dashboard\FeedProxy.aspx" />
     <Content Include="Umbraco\Config\Lang\da.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -255,7 +251,6 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="Config\scripting.config" />
-    <Content Include="Config\feedProxy.config" />
     <Content Include="Umbraco\Views\Default.cshtml" />
     <Content Include="Umbraco\PartialViewMacros\Templates\EditProfile.cshtml" />
     <Content Include="Umbraco\PartialViewMacros\Templates\Empty.cshtml" />
diff --git a/src/Umbraco.Web.UI/Umbraco/dashboard/FeedProxy.aspx b/src/Umbraco.Web.UI/Umbraco/dashboard/FeedProxy.aspx
deleted file mode 100644
index 22fbd78837ee..000000000000
--- a/src/Umbraco.Web.UI/Umbraco/dashboard/FeedProxy.aspx
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FeedProxy.aspx.cs" Inherits="dashboardUtilities.FeedProxy" %>
-<%@ OutputCache Duration="1800" VaryByParam="url" %>
diff --git a/src/Umbraco.Web.UI/config/feedProxy.Release.config b/src/Umbraco.Web.UI/config/feedProxy.Release.config
deleted file mode 100644
index 38e7d27acf9f..000000000000
--- a/src/Umbraco.Web.UI/config/feedProxy.Release.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<feedProxy>
-  <!-- To enable the FeedProxy to access other domains, please add the hostname to an 'allow' element. -->
-  <!-- <allow host="domain.com" /> -->
-
-  <!-- The following hostnames are used by on the dashboards, please do not delete these. -->
-  <allow host="umbraco.com" />
-  <allow host="umbraco.org" />
-  <allow host="umbraco.tv" />
-  <allow host="our.umbraco.org" />
-  <allow host="our.umbraco.com" />
-</feedProxy>
diff --git a/src/Umbraco.Web.UI/config/feedProxy.config b/src/Umbraco.Web.UI/config/feedProxy.config
deleted file mode 100644
index 38e7d27acf9f..000000000000
--- a/src/Umbraco.Web.UI/config/feedProxy.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<feedProxy>
-  <!-- To enable the FeedProxy to access other domains, please add the hostname to an 'allow' element. -->
-  <!-- <allow host="domain.com" /> -->
-
-  <!-- The following hostnames are used by on the dashboards, please do not delete these. -->
-  <allow host="umbraco.com" />
-  <allow host="umbraco.org" />
-  <allow host="umbraco.tv" />
-  <allow host="our.umbraco.org" />
-  <allow host="our.umbraco.com" />
-</feedProxy>
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index c6e0049865fa..44fe04ef9277 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -79,7 +79,7 @@ public async Task<JObject> GetRemoteDashboardContent(string section, string base
                 }
                 catch (HttpRequestException ex)
                 {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard content from '{Url}'", url);
+                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard content from {Url}", url);
 
                     //it's still new JObject() - we return it like this to avoid error codes which triggers UI warnings
                     AppCaches.RuntimeCache.InsertCacheItem<JObject>(key, () => result, new TimeSpan(0, 5, 0));
@@ -117,7 +117,7 @@ public async Task<HttpResponseMessage> GetRemoteDashboardCss(string section, str
                 }
                 catch (HttpRequestException ex)
                 {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard CSS from '{Url}'", url);
+                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard CSS from {Url}", url);
 
                     //it's still string.Empty - we return it like this to avoid error codes which triggers UI warnings
                     AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 5, 0));
@@ -130,6 +130,75 @@ public async Task<HttpResponseMessage> GetRemoteDashboardCss(string section, str
             };
         }
 
+        public async Task<HttpResponseMessage> GetRemoteXml(string site, string url)
+        {
+            // This is used in place of the old feedproxy.config
+            // Which was used to grab data from our.umbraco.com, umbraco.com or umbraco.tv
+            // for certain dashboards or the help drawer
+            var urlPrefix = string.Empty;
+            switch (site.ToUpper())
+            {
+                case "TV":
+                    urlPrefix = "https://umbraco.tv/";
+                    break;
+
+                case "OUR":
+                    urlPrefix = "https://our.umbraco.org/";
+                    break;
+
+                case "COM":
+                    urlPrefix = "https://umbraco.com/";
+                    break;
+
+                default:
+                    //Throw error
+                    return new HttpResponseMessage(HttpStatusCode.Unauthorized)
+                    {
+                        Content = new StringContent($"The Site {site} and {url} is not on the whitelist"),
+                    };
+            }
+
+
+            //Make remote call to fetch videos or remote dashboard feed data            
+            var key = $"umbraco-XML-feed-{site}-{url.ToCleanString(Core.Strings.CleanStringType.UrlSegment)}";
+
+            var content = AppCaches.RuntimeCache.GetCacheItem<string>(key);
+            var result = string.Empty;
+
+            if (content != null)
+            {
+                result = content;
+            }
+            else
+            {
+                //content is null, go get it
+                try
+                {
+                    //fetch remote css
+                    content = await HttpClient.GetStringAsync($"{urlPrefix}{url}");
+
+                    //can't use content directly, modified closure problem
+                    result = content;
+
+                    //save server content for 30 mins
+                    AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 30, 0));
+                }
+                catch (HttpRequestException ex)
+                {
+                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting remote dashboard data from {UrlPrefix}{Url}", urlPrefix, url);
+
+                    //it's still string.Empty - we return it like this to avoid error codes which triggers UI warnings
+                    AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 5, 0));
+                }
+            }
+
+            return new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent(result, Encoding.UTF8, "text/xml")
+            };
+
+        }
+
         [ValidateAngularAntiForgeryToken]
         [OutgoingEditorModelEvent]
         public IEnumerable<Tab<DashboardControl>> GetDashboard(string section)
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3843c3d1d380..ec19acb00df9 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1194,13 +1194,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx.designer.cs">
-      <DependentUpon>FeedProxy.aspx</DependentUpon>
-    </Compile>
     <Compile Include="UmbracoApplication.cs" />
     <Compile Include="UmbracoContext.cs" />
     <Compile Include="UmbracoInjectedModule.cs" />
@@ -1240,7 +1233,6 @@
     <EmbeddedResource Include="UI\JavaScript\PreviewInitialize.js" />
     <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
     <Content Include="PublishedCache\NuCache\notes.txt" />
-    <Content Include="umbraco.presentation\umbraco\dashboard\FeedProxy.aspx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx
deleted file mode 100644
index 22fbd78837ee..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FeedProxy.aspx.cs" Inherits="dashboardUtilities.FeedProxy" %>
-<%@ OutputCache Duration="1800" VaryByParam="url" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
deleted file mode 100644
index 58d219e0c6b6..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System.Net.Http;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Web;
-using Umbraco.Web.UI.Pages;
-using System;
-using System.Linq;
-using System.Net.Mime;
-using Umbraco.Core.IO;
-using Umbraco.Core.Xml;
-using Umbraco.Web.Composing;
-
-namespace dashboardUtilities
-{
-
-
-    public partial class FeedProxy : UmbracoEnsuredPage
-    {
-        private static HttpClient _httpClient;
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                if (Request.QueryString.AllKeys.Contains("url") == false || Request.QueryString["url"] == null)
-                    return;
-
-                var url = Request.QueryString["url"];
-                if (string.IsNullOrWhiteSpace(url) || url.StartsWith("/"))
-                    return;
-
-                if (Uri.TryCreate(url, UriKind.Absolute, out var requestUri) == false)
-                    return;
-
-                var feedProxyXml = XmlHelper.OpenAsXmlDocument(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
-                if (feedProxyXml?.SelectSingleNode($"//allow[@host = '{requestUri.Host}']") != null && (requestUri.Port == 80 || requestUri.Port == 443))
-                {
-                    if (_httpClient == null)
-                        _httpClient = new HttpClient();
-
-                    using (var request = new HttpRequestMessage(HttpMethod.Get, requestUri))
-                    {
-                        var response = _httpClient.SendAsync(request).Result;
-                        var result = response.Content.ReadAsStringAsync().Result;
-
-                        if (string.IsNullOrEmpty(result))
-                            return;
-
-                        Response.Clear();
-                        Response.ContentType = Request.CleanForXss("type") ?? MediaTypeNames.Text.Xml;
-                        Response.Write(result);
-                    }
-                }
-                else
-                {
-                                Current.Logger.Debug<FeedProxy>("Access to unallowed feedproxy attempted: {RequestUrl}", requestUri);
-                }
-            }
-            catch (Exception ex)
-            {
-                Current.Logger.Error<FeedProxy>(ex, "Exception occurred");
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.designer.cs
deleted file mode 100644
index 1996437167d5..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.designer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace dashboardUtilities {
-
-
-    public partial class FeedProxy {
-    }
-}

From 85da2a94b92a8f527843f30b5191e959cb75bebe Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 24 Jan 2019 14:09:28 +0000
Subject: [PATCH 040/421] Bye 404Handlers XML config file - add/remove
 IContentFinders in your own composer/component

---
 src/Umbraco.Core/IO/SystemFiles.cs                   |  2 --
 src/Umbraco.Tests/Routing/UmbracoModuleTests.cs      | 12 ------------
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj             |  4 ----
 src/Umbraco.Web.UI/config/404handlers.Release.config |  7 -------
 src/Umbraco.Web.UI/config/404handlers.config         |  7 -------
 5 files changed, 32 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/config/404handlers.Release.config
 delete mode 100644 src/Umbraco.Web.UI/config/404handlers.config

diff --git a/src/Umbraco.Core/IO/SystemFiles.cs b/src/Umbraco.Core/IO/SystemFiles.cs
index 7d0b31b578d1..449d5bdad634 100644
--- a/src/Umbraco.Core/IO/SystemFiles.cs
+++ b/src/Umbraco.Core/IO/SystemFiles.cs
@@ -10,8 +10,6 @@ public class SystemFiles
         public static string CreateUiXml => SystemDirectories.Umbraco + "/config/create/UI.xml";
 
         public static string TinyMceConfig => SystemDirectories.Config + "/tinyMceConfig.config";
-
-        public static string NotFoundhandlersConfig => SystemDirectories.Config + "/404handlers.config";
         
         public static string GetContentCacheXml(IGlobalSettings globalSettings)
         {
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index c87a02f43a7d..659c7aa2dbc2 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -54,18 +54,6 @@ public override void SetUp()
             //SettingsForTests.ReservedPaths = "~/umbraco,~/install/";
             //SettingsForTests.ReservedUrls = "~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd";
 
-            Directory.CreateDirectory(Path.GetDirectoryName(IOHelper.MapPath(SystemFiles.NotFoundhandlersConfig, false)));
-
-            //create the not found handlers config
-            using (var sw = File.CreateText(IOHelper.MapPath(SystemFiles.NotFoundhandlersConfig, false)))
-            {
-                sw.Write(@"<NotFoundHandlers>
-    <notFound assembly='umbraco' type='SearchForAlias' />
-    <notFound assembly='umbraco' type='SearchForTemplate'/>
-    <notFound assembly='umbraco' type='SearchForProfile'/>
-    <notFound assembly='umbraco' type='handle404'/>
-</NotFoundHandlers>");
-            }
         }
 
         public override void TearDown()
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e414b0521d4e..045c56764ad7 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -169,9 +169,6 @@
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
     <Content Include="Umbraco\Install\Views\Web.config" />
     <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
-    <None Include="Config\404handlers.Release.config">
-      <DependentUpon>404handlers.config</DependentUpon>
-    </None>
     <None Include="Config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -308,7 +305,6 @@
     <None Include="web.Template.config">
       <SubType>Designer</SubType>
     </None>
-    <Content Include="Config\404handlers.config" />
     <Content Include="Config\Dashboard.config">
       <SubType>Designer</SubType>
     </Content>
diff --git a/src/Umbraco.Web.UI/config/404handlers.Release.config b/src/Umbraco.Web.UI/config/404handlers.Release.config
deleted file mode 100644
index 8da3c8dbf9eb..000000000000
--- a/src/Umbraco.Web.UI/config/404handlers.Release.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<NotFoundHandlers>
-  <notFound assembly="Umbraco.Web" type="SearchForAlias" />
-  <notFound assembly="Umbraco.Web" type="SearchForTemplate"/>
-  <notFound assembly="Umbraco.Web" type="SearchForProfile"/>
-  <notFound assembly="Umbraco.Web" type="handle404"/>
-</NotFoundHandlers>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/404handlers.config b/src/Umbraco.Web.UI/config/404handlers.config
deleted file mode 100644
index 3233f00a04a6..000000000000
--- a/src/Umbraco.Web.UI/config/404handlers.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<NotFoundHandlers>
-	<notFound assembly="Umbraco.Web" type="SearchForAlias" />
-	<notFound assembly="Umbraco.Web" type="SearchForTemplate"/>
-	<notFound assembly="Umbraco.Web" type="SearchForProfile"/>
-	<notFound assembly="Umbraco.Web" type="handle404"/>
-</NotFoundHandlers>
\ No newline at end of file

From 74bd8fa0db5ad5dd4bafe2495a2596de36b84c14 Mon Sep 17 00:00:00 2001
From: Niels Lyngsoe <nsl@umbraco.dk>
Date: Thu, 24 Jan 2019 15:11:34 +0100
Subject: [PATCH 041/421] added 2019 brand colors

---
 .../application/umb-app-header.less           |  2 +-
 .../src/less/sections.less                    |  4 ++--
 .../src/less/variables.less                   | 20 ++++++++++++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
index a033e8abefe8..1e3aa332faf1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
@@ -1,5 +1,5 @@
 .umb-app-header {
-    background: @purple;
+    background: @blueNight;
     display: flex;
     align-items: center;
     justify-content: space-between;
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index ac41f69998f4..a639d06d5a55 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -36,7 +36,7 @@ ul.sections>li>a::after {
 	content: "";
 	height: 4px;
 	width: 100%;
-	background-color: @turquoise;
+	background-color: @ui-active;
 	position: absolute;
 	bottom: -4px;
 	border-radius: 3px 3px 0 0;
@@ -93,7 +93,7 @@ ul.sections-tray>li>a::after {
 	content: "";
 	width: 4px;
 	height: 100%;
-	background-color: @turquoise;
+	background-color: @ui-active;
 	position: absolute;
 	border-radius: 0 3px 3px 0;
 	opacity: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 513c645365ae..a7360148a947 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -27,13 +27,27 @@
 
 
 @blue:                  #2E8AEA;
-@blueDark:              #0064CD;
+@blueDark:              #3544b1;// updated 2019
+@blueExtraDark:         #1b264f;// added 2019
 @blueLight:             #ADD8E6;
+@blueNight:             #162335;// added 2019
 @green:                 #46A546;
 @red:                   #9D261D;
-@yellow:                #FFC40D;
-@orange:                #DF7F48;
+@yellow:                #fad634;// updated 2019
+@orange:                #f79c37;// updated 2019
 @pink:                  #C3325F;
+@pinkLight:             #f5c1bc;// added 2019
+@brown:                 #9d8057;// added 2019
+
+@u-grey:                #f2ebe6;// added 2019
+@u-white:               #f9f7f4;// added 2019
+
+
+// Accent colors
+// -------------------------
+
+@ui-active:             @pinkLight;
+@ui-selected:           @pinkLight;
 
 
 // Colors

From 38ec97bbe34f2408a40ef9f70e35d4baf79f739d Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 24 Jan 2019 15:22:20 +0100
Subject: [PATCH 042/421] Need to refactor IsPublished

---
 .../Models/PublishedContent/IPublishedContent.cs      | 11 +++++++++--
 .../PublishedContent/PublishedContentWrapped.cs       |  1 -
 src/Umbraco.Web/Models/PublishedContentBase.cs        |  1 +
 .../PublishedCache/NuCache/PublishedContent.cs        |  5 +++--
 .../XmlPublishedCache/XmlPublishedContent.cs          |  4 ++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
index e50fb2c39684..f613f926e90e 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
@@ -156,10 +156,17 @@ public interface IPublishedContent : IPublishedElement
         /// <summary>
         /// Gets a value indicating whether the content is published.
         /// </summary>
-        /// <param name="culture"></param>
+        /// <remarks>
+        /// <para>A content is published when it has a published version.</para>
+        /// <para>When retrieving documents from cache in non-preview mode, IsPublished is always
+        /// true, as only published documents are returned. When retrieving in draft mode, IsPublished
+        /// can either be true (document has a published version) or false (document has no
+        /// published version).</para>
+        /// <para>It is therefore possible for both IsDraft and IsPublished to be true at the same
+        /// time, meaning that the content is the draft version, and a published version exists.</para>
+        /// </remarks>
         bool IsPublished(string culture = null);
 
-
         #endregion
 
         #region Tree
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
index 42ff16bae597..8bf8cec24420 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
@@ -114,7 +114,6 @@ protected PublishedContentWrapped(IPublishedContent content)
         /// <inheritdoc />
         public virtual bool IsPublished(string culture = null) => _content.IsPublished(culture);
 
-
         #endregion
 
         #region Tree
diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index 12acb6b0c8b5..45243b86e63e 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -144,6 +144,7 @@ public virtual string GetUrl(string culture = null) // todo - consider .GetCultu
         /// <inheritdoc />
         public abstract bool IsDraft(string culture = null);
 
+        /// <inheritdoc />
         public abstract bool IsPublished(string culture = null);
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index 69c672ab98d2..3f57bf334028 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -293,8 +293,11 @@ public override bool IsDraft(string culture = null)
             return _contentData.CultureInfos.TryGetValue(culture, out var cvar) && cvar.IsDraft;
         }
 
+        /// <inheritdoc />
         public override bool IsPublished(string culture = null)
         {
+            // fixme I don't understand this - and it does probably not do what's expected
+
             if (!ContentType.VariesByCulture())
             {
                 return _contentData.Published;
@@ -302,9 +305,7 @@ public override bool IsPublished(string culture = null)
 
             // handle context culture
             if (culture == null)
-            {
                 culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
-            }
 
             //If the current culture is not a draft, it must be the published version
             return _contentData.CultureInfos.TryGetValue(culture, out var cvar) && !cvar.IsDraft;
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
index c3cf22559dcf..f601114ffd6a 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
@@ -232,7 +232,7 @@ public override bool IsDraft(string culture = null)
         public override bool IsPublished(string culture = null)
         {
             EnsureNodeInitialized();
-            return _isPublished;
+            return _isPublished; // bah
         }
 
         public override IEnumerable<IPublishedProperty> Properties
@@ -309,7 +309,7 @@ internal static void InitializeNode(XmlPublishedContent node, XmlNode xmlNode, b
             name = writerName = urlName = creatorName = docTypeAlias = path = null;
             createDate = updateDate = default(DateTime);
             isDraft = false;
-            isPublished = false;
+            isPublished = false; // fixme not implemented?
             contentType = null;
             properties = null;
 

From 1f79d9e635f6cf7385390d0a0c93dd0ffd041555 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 24 Jan 2019 14:29:00 +0000
Subject: [PATCH 043/421] =?UTF-8?q?=F0=9F=94=AA=F0=9F=94=AANext=20on=20the?=
 =?UTF-8?q?=20chobbing=20block=20is=20config/create/ui.xml=20&=20reference?=
 =?UTF-8?q?s=20back=20to=20it=20which=20was=20Legacy=20Controller,=20Dialo?=
 =?UTF-8?q?gTask=20etc=F0=9F=94=AA=F0=9F=94=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Core/IO/SystemFiles.cs            |   2 -
 src/Umbraco.Tests/UI/LegacyDialogTests.cs     |  34 ---
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 -
 .../src/common/resources/legacy.resource.js   |  29 ---
 .../common/overlays/ysod/ysod.controller.js   |   2 +-
 .../Editors/BackOfficeServerVariables.cs      |   6 +-
 src/Umbraco.Web/Editors/LegacyController.cs   |  59 -----
 src/Umbraco.Web/Umbraco.Web.csproj            |   5 -
 src/Umbraco.Web/_Legacy/UI/ITask.cs           |  18 --
 src/Umbraco.Web/_Legacy/UI/ITaskReturnUrl.cs  |  10 -
 .../_Legacy/UI/LegacyDialogHandler.cs         | 228 ------------------
 .../_Legacy/UI/LegacyDialogTask.cs            |  94 --------
 12 files changed, 2 insertions(+), 486 deletions(-)
 delete mode 100644 src/Umbraco.Tests/UI/LegacyDialogTests.cs
 delete mode 100644 src/Umbraco.Web.UI.Client/src/common/resources/legacy.resource.js
 delete mode 100644 src/Umbraco.Web/Editors/LegacyController.cs
 delete mode 100644 src/Umbraco.Web/_Legacy/UI/ITask.cs
 delete mode 100644 src/Umbraco.Web/_Legacy/UI/ITaskReturnUrl.cs
 delete mode 100644 src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
 delete mode 100644 src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs

diff --git a/src/Umbraco.Core/IO/SystemFiles.cs b/src/Umbraco.Core/IO/SystemFiles.cs
index 449d5bdad634..0e5ae8388bfe 100644
--- a/src/Umbraco.Core/IO/SystemFiles.cs
+++ b/src/Umbraco.Core/IO/SystemFiles.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Core.IO
 {
     public class SystemFiles
     {
-        public static string CreateUiXml => SystemDirectories.Umbraco + "/config/create/UI.xml";
-
         public static string TinyMceConfig => SystemDirectories.Config + "/tinyMceConfig.config";
         
         public static string GetContentCacheXml(IGlobalSettings globalSettings)
diff --git a/src/Umbraco.Tests/UI/LegacyDialogTests.cs b/src/Umbraco.Tests/UI/LegacyDialogTests.cs
deleted file mode 100644
index 9f1e474bd91c..000000000000
--- a/src/Umbraco.Tests/UI/LegacyDialogTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using NUnit.Framework;
-using umbraco;
-using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Web;
-using Umbraco.Web._Legacy.UI;
-
-namespace Umbraco.Tests.UI
-{
-    [TestFixture]
-    public class LegacyDialogTests
-    {
-
-        [Test]
-        public void Ensure_All_Tasks_Are_Secured()
-        {
-            var allTasks = TypeFinder.FindClassesOfType<ITask>();
-
-            foreach (var t in allTasks)
-            {
-                Assert.IsTrue(TypeHelper.IsTypeAssignableFrom<LegacyDialogTask>(t), "The type " + t + " is not of type " + typeof(LegacyDialogTask));
-            }
-        }
-        
-        //[TestCase(typeof(macroTasks), Constants.Applications.Settings)]
-        //public void Check_Assigned_Apps_For_Tasks(Type taskType, string app)
-        //{
-        //    var task = (LegacyDialogTask)Activator.CreateInstance(taskType);
-        //    Assert.AreEqual(task.AssignedApp, app);
-        //}
-
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 11f5527a8cf1..61d0672d7fb9 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -470,7 +470,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>TestFiles.resx</DependentUpon>
     </Compile>
-    <Compile Include="UI\LegacyDialogTests.cs" />
     <Compile Include="UmbracoExamine\ExamineDemoDataMediaService.cs" />
     <Compile Include="UmbracoExamine\ExamineDemoDataContentService.cs" />
     <Compile Include="CoreThings\UriExtensionsTests.cs" />
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/legacy.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/legacy.resource.js
deleted file mode 100644
index b42d80408f1a..000000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/legacy.resource.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.legacyResource
-    * @description Handles legacy dialog requests
-    **/
-function legacyResource($q, $http, umbRequestHelper) {
-   
-    //the factory object returned
-    return {
-        /** Loads in the data to display the section list */
-        deleteItem: function (args) {
-            
-            if (!args.nodeId || !args.nodeType || !args.alias) {
-                throw "The args parameter is not formatted correct, it requires properties: nodeId, nodeType, alias";
-            } 
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "legacyApiBaseUrl",
-                        "DeleteLegacyItem",
-                        [{ nodeId: args.nodeId }, { nodeType: args.nodeType }, { alias: args.alias }])),
-                'Failed to delete item ' + args.nodeId);
-
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('legacyResource', legacyResource);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
index f632547bfc2e..f3c220075d56 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
@@ -1,5 +1,5 @@
 angular.module("umbraco")
-    .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService, localizationService) {
+    .controller("Umbraco.Overlays.YsodController", function ($scope, localizationService) {
 
         function onInit() {
 
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index d6a6947eba41..14853d97d897 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -183,11 +183,7 @@ internal Dictionary<string, object> GetServerVariables()
                         {
                             "currentUserApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<CurrentUserController>(
                                 controller => controller.PostChangePassword(null))
-                        },
-                        {
-                            "legacyApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<LegacyController>(
-                                controller => controller.DeleteLegacyItem(null, null, null))
-                        },
+                        },                        
                         {
                             "entityApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<EntityController>(
                                 controller => controller.GetById(0, UmbracoEntityTypes.Media))
diff --git a/src/Umbraco.Web/Editors/LegacyController.cs b/src/Umbraco.Web/Editors/LegacyController.cs
deleted file mode 100644
index e2e22457c11a..000000000000
--- a/src/Umbraco.Web/Editors/LegacyController.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Web;
-using System.Web.Http;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi.Filters;
-using Umbraco.Web._Legacy.UI;
-
-namespace Umbraco.Web.Editors
-{
-    /// <summary>
-    /// The API controller used for dealing with legacy content
-    /// </summary>
-    [PluginController("UmbracoApi")]
-    [ValidationFilter]
-    public class LegacyController : UmbracoAuthorizedJsonController
-    {
-        /// <summary>
-        /// This will perform the delete operation for legacy items which include any item that
-        /// has functionality included in the ui.xml structure.
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public HttpResponseMessage DeleteLegacyItem(string nodeId, string alias, string nodeType)
-        {
-            //U4-2686 - alias is html encoded, make sure to decode
-            alias = HttpUtility.HtmlDecode(alias);
-
-            //In order to process this request we MUST have an HttpContext available
-            var httpContextAttempt = TryGetHttpContext();
-            if (httpContextAttempt.Success)
-            {
-                //this is a hack check based on legacy
-                if (nodeType == "memberGroups")
-                {
-                    LegacyDialogHandler.Delete(httpContextAttempt.Result, Security.CurrentUser, nodeType, 0, alias);
-                    return Request.CreateResponse(HttpStatusCode.OK);
-                }
-
-                int id;
-                if (int.TryParse(nodeId, out id))
-                {
-                    LegacyDialogHandler.Delete(httpContextAttempt.Result, Security.CurrentUser, nodeType, id, alias);
-                    return Request.CreateResponse(HttpStatusCode.OK);
-                }
-
-                //the way this legacy stuff used to work is that if the node id didn't parse, we would
-                //pass the node id as the alias with an id of zero = sure whatevs.
-                LegacyDialogHandler.Delete(httpContextAttempt.Result, Security.CurrentUser, nodeType, 0, nodeId);
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-
-            //We must have an HttpContext available for this to work.
-            return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, new InvalidOperationException("No HttpContext found in the current request"));
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ec19acb00df9..86772c13c47e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -921,7 +921,6 @@
     <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
     <Compile Include="Editors\ContentControllerBase.cs" />
     <Compile Include="Editors\ContentTypeController.cs" />
-    <Compile Include="Editors\LegacyController.cs" />
     <Compile Include="Controllers\UmbRegisterController.cs" />
     <Compile Include="Models\ProfileModel.cs" />
     <Compile Include="Models\LoginStatusModel.cs" />
@@ -1146,10 +1145,6 @@
     <Compile Include="_Legacy\Controls\TabView.cs" />
     <Compile Include="_Legacy\PackageActions\allowDoctype.cs" />
     <Compile Include="_Legacy\PackageActions\publishRootDocument.cs" />
-    <Compile Include="_Legacy\UI\ITask.cs" />
-    <Compile Include="_Legacy\UI\ITaskReturnUrl.cs" />
-    <Compile Include="_Legacy\UI\LegacyDialogHandler.cs" />
-    <Compile Include="_Legacy\UI\LegacyDialogTask.cs" />
     <Compile Include="UI\SpeechBubbleIcon.cs" />
     <Compile Include="UmbracoHelper.cs" />
     <Compile Include="Mvc\ViewContextExtensions.cs" />
diff --git a/src/Umbraco.Web/_Legacy/UI/ITask.cs b/src/Umbraco.Web/_Legacy/UI/ITask.cs
deleted file mode 100644
index 62ce4c92c833..000000000000
--- a/src/Umbraco.Web/_Legacy/UI/ITask.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Umbraco.Web._Legacy.UI
-{
-    /// <summary>
-    /// Summary description for ITask.
-    /// </summary>
-    [Obsolete("ITask is used for legacy webforms back office editors, change to using the v7 angular approach")]
-    public interface ITask
-    {
-        int ParentID {set; get;}
-        int TypeID {set; get;}
-        string Alias {set; get;}
-        bool Save();
-        bool Delete();
-        int UserId {set;}
-    }
-}
diff --git a/src/Umbraco.Web/_Legacy/UI/ITaskReturnUrl.cs b/src/Umbraco.Web/_Legacy/UI/ITaskReturnUrl.cs
deleted file mode 100644
index c42ad9dbdb17..000000000000
--- a/src/Umbraco.Web/_Legacy/UI/ITaskReturnUrl.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace Umbraco.Web._Legacy.UI
-{
-    [Obsolete("ITask is used for legacy webforms back office editors, change to using the v7 angular approach")]
-    public interface ITaskReturnUrl : ITask
-    {
-        string ReturnUrl {get;}
-    }
-}
diff --git a/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs b/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
deleted file mode 100644
index cfa93dc0f6c1..000000000000
--- a/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Web;
-using System.Xml;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models.Membership;
-
-namespace Umbraco.Web._Legacy.UI
-{
-    /// <summary>
-    /// This is used to replace the old umbraco.presentation.create.dialogHandler_temp class which is used
-    /// to handle sections create/delete actions.
-    /// </summary>
-    /// <remarks>
-    /// We need to overhaul how all of this is handled which is why this is a legacy class
-    /// http://issues.umbraco.org/issue/U4-1373
-    /// </remarks>
-    public static class LegacyDialogHandler
-    {
-        private enum Operation
-        {
-            Create,
-            Delete
-        }
-
-        private const string ContextKeyCreate = "LegacyDialogHandler-Create-";
-        private const string ContextKeyDelete = "LegacyDialogHandler-Delete-";
-
-        /// <summary>
-        /// Gets the ITask for the operation for the node Type
-        /// </summary>
-        /// <param name="umbracoUser"></param>
-        /// <param name="op"></param>
-        /// <param name="nodeType"></param>
-        /// <param name="httpContext"></param>
-        /// <returns>
-        /// Returns the ITask if one is found and can be made, otherwise null
-        /// </returns>
-        /// <remarks>
-        /// This will first check if we've already created the ITask in the current Http request
-        /// </remarks>
-        private static ITask GetTaskForOperation(HttpContextBase httpContext, IUser umbracoUser, Operation op, string nodeType)
-        {
-            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
-            if (umbracoUser == null) throw new ArgumentNullException(nameof(umbracoUser));
-            if (nodeType == null) throw new ArgumentNullException(nameof(nodeType));
-
-            var ctxKey = op == Operation.Create ? ContextKeyCreate : ContextKeyDelete;
-
-            //check contextual cache
-            if (httpContext.Items[ctxKey] != null)
-            {
-                return (ITask) httpContext.Items[ctxKey];
-            }
-
-            var operationNode = op == Operation.Create ? "create" : "delete";
-            var createDef = GetXmlDoc();
-            var def = createDef.SelectSingleNode("//nodeType [@alias = '" + nodeType + "']");
-            if (def == null)
-            {
-                return null;
-            }
-            var del = def.SelectSingleNode("./tasks/" + operationNode);
-            if (del == null)
-            {
-                return null;
-            }
-            if (!del.Attributes.HasAttribute("assembly"))
-            {
-                return null;
-            }
-            var taskAssembly = del.AttributeValue<string>("assembly");
-
-            if (!del.Attributes.HasAttribute("type"))
-            {
-                return null;
-            }
-            var taskType = del.AttributeValue<string>("type");
-
-            var assembly = Assembly.LoadFrom(IOHelper.MapPath(SystemDirectories.Bin + "/" + taskAssembly + ".dll"));
-            var type = assembly.GetType(taskAssembly + "." + taskType);
-            var typeInstance = Activator.CreateInstance(type) as ITask;
-            if (typeInstance == null)
-            {
-                return null;
-            }
-
-            //set the user/user id for the instance
-            var dialogTask = typeInstance as LegacyDialogTask;
-            if (dialogTask != null)
-            {
-                dialogTask.User = umbracoUser;
-            }
-            else
-            {
-                typeInstance.UserId = umbracoUser.Id;
-            }
-
-            //put in contextual cache
-            httpContext.Items[ctxKey] = typeInstance;
-
-            return typeInstance;
-        }
-
-        /// <summary>
-        /// Checks if the user has access to launch the ITask that matches the node type based on the app assigned
-        /// </summary>
-        /// <param name="httpContext"></param>
-        /// <param name="umbracoUser"></param>
-        /// <param name="nodeType"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// If the ITask doesn't implement LegacyDialogTask then we will return 'true' since we cannot validate
-        /// the application assigned.
-        ///
-        /// TODO: Create an API to assign a nodeType to an app so developers can manually secure it
-        /// </remarks>
-        internal static bool UserHasCreateAccess(HttpContextBase httpContext, IUser umbracoUser, string nodeType)
-        {
-            var task = GetTaskForOperation(httpContext, umbracoUser, Operation.Create, nodeType);
-
-            //if no task was found it will use the default task and we cannot validate the application assigned so return true
-            if (task == null)
-                return true;
-
-            return task is LegacyDialogTask ltask ? ltask.ValidateUserForApplication() : true;
-        }
-
-        /// <summary>
-        /// Checks if the user has access to launch the ITask that matches the node type based on the app assigned
-        /// </summary>
-        /// <param name="httpContext"></param>
-        /// <param name="umbracoUser"></param>
-        /// <param name="nodeType"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// If the ITask doesn't implement LegacyDialogTask then we will return 'true' since we cannot validate
-        /// the application assigned.
-        ///
-        /// TODO: Create an API to assign a nodeType to an app so developers can manually secure it
-        /// </remarks>
-        internal static bool UserHasDeleteAccess(HttpContextBase httpContext, User umbracoUser, string nodeType)
-        {
-            var task = GetTaskForOperation(httpContext, umbracoUser, Operation.Delete, nodeType);
-
-            //if no task was found it will use the default task and we cannot validate the application assigned so return true
-            if (task == null)
-                return true;
-
-            return task is LegacyDialogTask ltask ? ltask.ValidateUserForApplication() : true;
-        }
-
-        public static void Delete(HttpContextBase httpContext, IUser umbracoUser, string nodeType, int nodeId, string text)
-        {
-            var typeInstance = GetTaskForOperation(httpContext, umbracoUser, Operation.Delete, nodeType);
-            if (typeInstance == null)
-                throw new InvalidOperationException($"Could not task for operation {Operation.Delete} for node type {nodeType}");
-
-            typeInstance.ParentID = nodeId;
-            typeInstance.Alias = text;
-
-            typeInstance.Delete();
-        }
-
-        public static string Create(HttpContextBase httpContext, IUser umbracoUser, string nodeType, int nodeId, string text, int typeId = 0)
-        {
-            var typeInstance = GetTaskForOperation(httpContext, umbracoUser, Operation.Create, nodeType);
-            if (typeInstance == null)
-                throw new InvalidOperationException($"Could not task for operation {Operation.Create} for node type {nodeType}");
-
-            typeInstance.TypeID = typeId;
-            typeInstance.ParentID = nodeId;
-            typeInstance.Alias = text;
-
-            typeInstance.Save();
-
-            // check for returning url
-            var returnUrlTask = typeInstance as ITaskReturnUrl;
-            return returnUrlTask != null
-                ? returnUrlTask.ReturnUrl
-                : "";
-        }
-
-        internal static string Create(HttpContextBase httpContext, IUser umbracoUser, string nodeType, int nodeId, string text, IDictionary<string, object> additionalValues, int typeId = 0)
-        {
-            var typeInstance = GetTaskForOperation(httpContext, umbracoUser, Operation.Create, nodeType);
-            if (typeInstance == null)
-                throw new InvalidOperationException($"Could not task for operation {Operation.Create} for node type {nodeType}");
-
-            typeInstance.TypeID = typeId;
-            typeInstance.ParentID = nodeId;
-            typeInstance.Alias = text;
-
-            // check for returning url
-            ITaskReturnUrl returnUrlTask = typeInstance as LegacyDialogTask;
-            if (returnUrlTask != null)
-            {
-                // if castable to LegacyDialogTask: add in additionalValues
-                ((LegacyDialogTask) returnUrlTask).AdditionalValues = additionalValues;
-            }
-            else
-            {
-                // otherwise cast to returnUrl interface
-                returnUrlTask = typeInstance as ITaskReturnUrl;
-            }
-
-            typeInstance.Save();
-
-            return returnUrlTask != null
-                ? returnUrlTask.ReturnUrl
-                : "";
-        }
-
-        private static XmlDocument GetXmlDoc()
-        {
-            // Load task settings
-            var createDef = new XmlDocument();
-            using (var defReader = new XmlTextReader(IOHelper.MapPath(SystemFiles.CreateUiXml)))
-            {
-                createDef.Load(defReader);
-                defReader.Close();
-                return createDef;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs b/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs
deleted file mode 100644
index 1b040970dddd..000000000000
--- a/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Authentication;
-using Umbraco.Core;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Web.Composing;
-using Umbraco.Web.UI;
-
-namespace Umbraco.Web._Legacy.UI
-{
-    /// <summary>
-    /// An abstract class that is used to implement all secure ITasks
-    /// </summary>
-    /// <remarks>
-    /// In the near future we will overhaul how create dialogs work and how deletions work as well. In the meantime
-    /// if you ever need to create an ITask you should just inherit from this class and do not manually implement
-    /// ITask or ITaskReturnUrl. If you do, you MUST also implement IAppTask which associates an ITask to an app
-    /// so we can validate the current user's security with the implementation. If you do not do this then your
-    /// implementation will not be secure. It means that if someone is logged in and doesn't have access to a
-    /// specific app, they'd still be able to execute code to create/delete for any ITask regardless of what app
-    /// they have access to.
-    /// </remarks>
-    [Obsolete("ITask is used for legacy webforms back office editors, change to using the v7 angular approach")]
-    public abstract class LegacyDialogTask : ITaskReturnUrl, IAssignedApp
-    {
-        public virtual int ParentID { get; set; }
-        public int TypeID { get; set; }
-        public string Alias { get; set; }
-
-        /// <summary>
-        /// Base class first performs authentication for the current app before proceeding
-        /// </summary>
-        /// <returns></returns>
-        public bool Save()
-        {
-            if (ValidateUserForApplication())
-            {
-                return PerformSave();
-            }
-            throw new AuthenticationException("The current user does not have access to the required application that this task belongs to");
-        }
-
-        public abstract bool PerformSave();
-
-        /// <summary>
-        /// Base class first performs authentication for the current app before proceeding
-        /// </summary>
-        /// <returns></returns>
-        public bool Delete()
-        {
-            if (ValidateUserForApplication())
-            {
-                return PerformDelete();
-            }
-            throw new AuthenticationException("The current user does not have access to the required application that this task belongs to");
-        }
-
-        public abstract bool PerformDelete();
-
-        /// <summary>
-        /// Gets/sets the user object for this Task
-        /// </summary>
-        /// <remarks>
-        /// accessible by inheritors but can only be set internally
-        /// </remarks>
-        protected internal IUser User { get; internal set; }
-
-        /// <summary>
-        /// Implemented explicitly as we don't want to expose this
-        /// </summary>
-        int ITask.UserId
-        {
-            set { User = Current.Services.UserService.GetUserById(value); }
-        }
-
-        /// <summary>
-        /// Checks if the currently assigned user has access to the assigned app
-        /// </summary>
-        /// <returns></returns>
-        protected internal bool ValidateUserForApplication()
-        {
-            if (User == null)
-                throw new InvalidOperationException("Cannot authenticate, no User object assigned");
-
-            return User.AllowedSections.Any(app => app.InvariantEquals(AssignedApp));
-        }
-
-        public abstract string ReturnUrl { get; }
-        public abstract string AssignedApp { get; }
-
-        public IDictionary<string, object> AdditionalValues { get; set; }
-    }
-}

From 1ad0c8873174611563dcd62094e729b1ea23ba88 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 24 Jan 2019 14:34:18 +0000
Subject: [PATCH 044/421] =?UTF-8?q?=F0=9F=91=BB=F0=9F=91=BB=20Nightmares?=
 =?UTF-8?q?=20of=20writing=20WebForms=20controls=20with=20CSS=20markup=20&?=
 =?UTF-8?q?=20attributes=20in=20a=20.cs=20file=20=F0=9F=91=BB=F0=9F=91=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Web/Umbraco.Web.csproj            |   5 -
 src/Umbraco.Web/_Legacy/Controls/Panel.cs     | 108 -------------
 .../_Legacy/Controls/PropertyPanel.cs         |  73 ---------
 src/Umbraco.Web/_Legacy/Controls/TabPage.cs   |  96 ------------
 src/Umbraco.Web/_Legacy/Controls/TabView.cs   | 145 ------------------
 src/Umbraco.Web/_Legacy/Controls/pane.cs      | 117 --------------
 6 files changed, 544 deletions(-)
 delete mode 100644 src/Umbraco.Web/_Legacy/Controls/Panel.cs
 delete mode 100644 src/Umbraco.Web/_Legacy/Controls/PropertyPanel.cs
 delete mode 100644 src/Umbraco.Web/_Legacy/Controls/TabPage.cs
 delete mode 100644 src/Umbraco.Web/_Legacy/Controls/TabView.cs
 delete mode 100644 src/Umbraco.Web/_Legacy/Controls/pane.cs

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 86772c13c47e..fb5401c13739 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1138,11 +1138,6 @@
     <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
     <Compile Include="Trees\PartialViewsTreeController.cs" />
     <Compile Include="UI\IAssignedApp.cs" />
-    <Compile Include="_Legacy\Controls\pane.cs" />
-    <Compile Include="_Legacy\Controls\Panel.cs" />
-    <Compile Include="_Legacy\Controls\PropertyPanel.cs" />
-    <Compile Include="_Legacy\Controls\TabPage.cs" />
-    <Compile Include="_Legacy\Controls\TabView.cs" />
     <Compile Include="_Legacy\PackageActions\allowDoctype.cs" />
     <Compile Include="_Legacy\PackageActions\publishRootDocument.cs" />
     <Compile Include="UI\SpeechBubbleIcon.cs" />
diff --git a/src/Umbraco.Web/_Legacy/Controls/Panel.cs b/src/Umbraco.Web/_Legacy/Controls/Panel.cs
deleted file mode 100644
index bb14d934825c..000000000000
--- a/src/Umbraco.Web/_Legacy/Controls/Panel.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace Umbraco.Web._Legacy.Controls
-{
-    public class UmbracoPanel : Panel
-    {
-
-        private bool _hasMenu = false;
-        private string _StatusBarText = "";
-        private string _text;
-        private bool _autoResize = true;
-
-        public bool hasMenu
-        {
-            get { return _hasMenu; }
-            set { _hasMenu = value; }
-        }
-
-        public bool AutoResize
-        {
-            get { return _autoResize; }
-            set { _autoResize = value; }
-        }
-
-        public string Text
-        {
-            get
-            {
-                if (_text == "")
-                    _text = "&nbsp;";
-
-                return _text;
-            }
-            set { _text = value; }
-        }
-
-        public string StatusBarText
-        {
-            get { return _StatusBarText; }
-            set { _StatusBarText = value; }
-        }
-
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-            EnsureChildControls();
-        }
-
-
-        internal HtmlGenericControl header = new HtmlGenericControl();
-        internal HtmlGenericControl row = new HtmlGenericControl();
-        internal HtmlGenericControl leftcol = new HtmlGenericControl();
-        internal HtmlGenericControl rightcol = new HtmlGenericControl();
-        internal HtmlGenericControl title = new HtmlGenericControl();
-
-        internal HtmlGenericControl body = new HtmlGenericControl();
-
-        protected override void CreateChildControls()
-        {
-            //fucking webforms controls and their rendering..
-            CssClass = "umb-panel form-horizontal umb-panel-nobody";
-           ID = base.ClientID + "_container";
-
-            header.TagName = "div";
-            header.ID = base.ClientID + "_header";
-            header.Attributes.Add("class","umb-panel-header");
-
-            row.TagName = "div";
-            row.Attributes.Add("class", "row-fluid");
-            header.Controls.Add(row);
-
-            leftcol.TagName = "span";
-            leftcol.Attributes.Add("class", "span8");
-
-            title.TagName = "h1";
-            title.Attributes.Add("class", "headline");
-            leftcol.Controls.Add(title);
-
-            row.Controls.Add(leftcol);
-
-            rightcol.TagName = "span";
-            rightcol.Attributes.Add("class", "span4");
-            row.Controls.Add(rightcol);
-
-            body.TagName = "div";
-            body.Attributes.Add("class", "umb-panel-body row-fluid");
-
-            Width = Unit.Empty;
-            Height = Unit.Empty;
-
-            Controls.AddAt(0,header);
-
-
-            base.CreateChildControls();
-        }
-
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            title.InnerHtml = Text;
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web/_Legacy/Controls/PropertyPanel.cs b/src/Umbraco.Web/_Legacy/Controls/PropertyPanel.cs
deleted file mode 100644
index 6ce9c40b4625..000000000000
--- a/src/Umbraco.Web/_Legacy/Controls/PropertyPanel.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.UI;
-
-namespace Umbraco.Web._Legacy.Controls
-{
-    public class PropertyPanel : System.Web.UI.WebControls.Panel
-    {
-        private Control _control;
-        private string _text = string.Empty;
-
-        public string Text
-        {
-            get { return _text; }
-            set { _text = value; }
-        }
-
-        protected override void OnLoad(EventArgs eventArguments)
-        {
-        }
-
-        protected override void Render(HtmlTextWriter writer)
-        {
-            ViewStateMode = ViewStateMode.Disabled;
-            CreateChildControls();
-
-
-            if (string.IsNullOrEmpty(_text))
-                CssClass += " hidelabel";
-
-
-            writer.WriteLine("<div class=\"umb-el-wrap " + CssClass + "\">");
-
-
-            if (_text != string.Empty)
-            {
-                if (_control == null)
-                {
-                    _control = Controls.OfType<Control>().FirstOrDefault(c => c.Visible && (c.GetType().Name.Contains("Literal") == false));
-                }
-
-                if (_control == null)
-                {
-                    writer.WriteLine("<span class=\"control-label\">{0}</span>", _text);
-                }
-                else
-                {
-                    writer.WriteLine("<label class=\"control-label\" for=\"{0}\">{1}</label>", _control != null ? _control.ClientID : "", _text);
-                }
-
-            }
-
-            writer.WriteLine("<div class=\"controls controls-row\">");
-
-            try
-            {
-                this.RenderChildren(writer);
-            }
-            catch (Exception ex)
-            {
-                writer.WriteLine("Error creating control <br />");
-                writer.WriteLine(ex.ToString());
-            }
-
-            writer.WriteLine("</div></div>");
-
-        }
-
-    }
-
-}
diff --git a/src/Umbraco.Web/_Legacy/Controls/TabPage.cs b/src/Umbraco.Web/_Legacy/Controls/TabPage.cs
deleted file mode 100644
index 4a5be34d7c50..000000000000
--- a/src/Umbraco.Web/_Legacy/Controls/TabPage.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace Umbraco.Web._Legacy.Controls
-{
-
-    public class TabPage : WebControl
-    {
-        // Ensure that a TabPage cannot be instatiated outside
-        // this assembly -> New instances of a tabpage can only be retrieved through the tabview
-        private bool _hasMenu = true;
-        protected LiteralControl ErrorHeaderControl = new LiteralControl();
-        private LiteralControl _closeButtonControl = new LiteralControl();
-        private readonly ValidationSummary _vs = new ValidationSummary();
-        private readonly Control _tempErr = new Control();
-        internal TabView parent;
-
-
-        public string Text { get; set; }
-
-        internal TabPage()
-        {
-
-        }
-
-        public ValidationSummary ValidationSummaryControl
-        {
-            get { return _vs; }
-        }
-
-        public string ErrorHeader { get; set; }
-        public string CloseCaption { get; set; }
-        public bool Active { get; set; }
-
-        public Control ErrorControl
-        {
-            get { return _tempErr; }
-        }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            _vs.ShowSummary = true;
-            _vs.Attributes.Remove("style");
-            _vs.Style.Clear();
-            _vs.ForeColor = new Color();
-            _vs.ID = String.Format("{0}_validationSummary", this.ID);
-
-            // Add error pane
-            _tempErr.Visible = false;
-            _tempErr.ID = String.Format("{0}_errorPaneContainer", this.ID);
-            _tempErr.Controls.Add(_closeButtonControl);
-            _tempErr.Controls.Add(ErrorHeaderControl);
-            _tempErr.Controls.Add(new LiteralControl("</h3><p>"));
-            _tempErr.Controls.Add(_vs);
-            _tempErr.Controls.Add(new LiteralControl("</p></div>"));
-
-            this.Controls.Add(_tempErr);
-        }
-
-
-        public bool HasMenu
-        {
-            get { return _hasMenu; }
-            set { _hasMenu = value; }
-        }
-
-        protected override void Render(System.Web.UI.HtmlTextWriter writer)
-        {
-            _closeButtonControl.Text = "<div id=\"errorPane_" + this.ClientID + "\" style='margin: 10px 0px 10px 0px; text-align: left;' class=\"error\"><div style=\"float: right; padding: 5px;\"><a href=\"#\" onClick=\"javascript:document.getElementById('errorPane_" + this.ClientID + "').style.display = 'none'; return false;\">" + CloseCaption + "</a></div><h3>";
-            ErrorHeaderControl.Text = ErrorHeader;
-
-            var activeClass = string.Empty;
-
-            if (this.ID == parent.ActiveTabId)
-                activeClass = "active";
-
-            writer.WriteLine("<div id='" + this.ID + "' class='umb-tab-pane tab-pane form-horizontal " + activeClass + " " + parent.ActiveTabId + "'>");
-            writer.WriteLine("<div class='umb-tab-pane-inner' id='" + this.ClientID + "_contentlayer'>");
-
-            this.RenderChildren(writer);
-
-            writer.WriteLine("</div>");
-            writer.WriteLine("</div>");
-        }
-    }
-}
diff --git a/src/Umbraco.Web/_Legacy/Controls/TabView.cs b/src/Umbraco.Web/_Legacy/Controls/TabView.cs
deleted file mode 100644
index 9d2657dad5d0..000000000000
--- a/src/Umbraco.Web/_Legacy/Controls/TabView.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using ClientDependency.Core;
-using System.Web.UI.HtmlControls;
-
-namespace Umbraco.Web._Legacy.Controls
-{
-
-    public class TabView : Umbraco.Web._Legacy.Controls.UmbracoPanel
-    {
-        public readonly ArrayList Tabs = new ArrayList();
-        protected ArrayList Panels = new ArrayList();
-        protected Dictionary<string, TabPage> TabPages = new Dictionary<string, TabPage>();
-
-        private string _status = "";
-
-        private HtmlGenericControl _tabList = new HtmlGenericControl();
-        private HtmlGenericControl _body = new HtmlGenericControl();
-        private HtmlGenericControl _tabsHolder = new HtmlGenericControl();
-
-        private HiddenField _activeTabHolder = new HiddenField();
-
-        protected override void CreateChildControls()
-        {
-            base.CreateChildControls();
-
-            _tabList.TagName = "ul";
-            _tabList.Attributes.Add("class", "nav nav-tabs umb-nav-tabs -padding-left");
-            base.row.Controls.Add(_tabList);
-
-            _body.TagName = "div";
-            _body.Attributes.Add("class", "umb-panel-body umb-scrollable row-fluid");
-            base.Controls.Add(_body);
-
-            _tabsHolder.TagName = "div";
-            _tabsHolder.Attributes.Add("class", "tab-content form-horizontal");
-            _tabsHolder.ID = this.ID + "_content";
-            _body.Controls.Add(_tabsHolder);
-
-            for (int i = 0; i < Tabs.Count; i++)
-            {
-                var tabPage = TabPages.ElementAt(i).Value;
-                tabPage.Active = false || tabPage.ID == ActiveTabId;
-
-                _tabsHolder.Controls.Add(tabPage);
-            }
-
-            _activeTabHolder.ID = "activeTabHolder";
-            _body.Controls.Add(_activeTabHolder);
-
-        }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-            base.CssClass = "umb-panel tabbable";
-        }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            if (string.IsNullOrEmpty(Text))
-                Text = " ";
-
-
-            for (int i = 0; i < Tabs.Count; i++)
-            {
-                var tabPage = TabPages.ElementAt(i).Value;
-                string tabPageCaption = tabPage.Text;
-                string tabId = tabPage.ID;
-
-                HtmlGenericControl li = new HtmlGenericControl();
-                li.TagName = "li";
-                if (tabId == ActiveTabId)
-                    li.Attributes.Add("class", "active");
-                _tabList.Controls.Add(li);
-
-                HtmlGenericControl a = new HtmlGenericControl();
-                a.TagName = "a";
-                a.Attributes.Add("href", "#"+tabId);
-                a.Attributes.Add("onclick", "$('#" + _activeTabHolder.ClientID + "').val('" + tabId + "');");
-                a.Attributes.Add("data-toggle", "tab");
-                a.InnerText = tabPageCaption;
-                li.Controls.Add(a);
-            }
-        }
-
-        public ArrayList GetPanels()
-        {
-            return Panels;
-        }
-
-        public TabPage NewTabPage(string text)
-        {
-            Tabs.Add(text);
-            TabPage tp = new TabPage();
-            tp.Width = this.Width;
-            tp.ID = "tab0" + (TabPages.Count + 1);
-            tp.Text = text;
-            tp.parent = this;
-
-            Panels.Add(tp);
-            TabPages.Add(tp.ID, tp);
-
-            _tabsHolder.Controls.Add(tp);
-            return tp;
-        }
-
-
-        public string Status
-        {
-            get { return _status; }
-            set { _status = value; }
-        }
-
-
-
-        public string ActiveTabId
-        {
-            get
-            {
-
-                if (_activeTabHolder.Value != "")
-                    return _activeTabHolder.Value;
-
-                if (TabPages.Count > 0)
-                    return TabPages.ElementAt(0).Value.ID;
-
-
-
-                return "tab01";
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/_Legacy/Controls/pane.cs b/src/Umbraco.Web/_Legacy/Controls/pane.cs
deleted file mode 100644
index 2d37a2c09910..000000000000
--- a/src/Umbraco.Web/_Legacy/Controls/pane.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using ClientDependency.Core;
-
-namespace Umbraco.Web._Legacy.Controls
-{
-
-    public class Pane : System.Web.UI.WebControls.Panel
-    {
-
-
-        public Pane()
-        {
-
-        }
-
-        private string m_Text = string.Empty;
-        public string Text
-        {
-            get { return m_Text; }
-            set { m_Text = value; }
-        }
-
-        private string m_title = string.Empty;
-        public string Title
-        {
-            get { return m_title; }
-            set { m_title = value; }
-        }
-
-        public void addProperty(string Caption, Control C, params BaseValidator[] validators)
-        {
-
-            PropertyPanel pp = new PropertyPanel();
-            pp.Controls.Add(C);
-
-            foreach (var validator in validators)
-            {
-                validator.Display = ValidatorDisplay.Dynamic;
-                pp.Controls.Add(validator);
-            }
-            pp.Text = Caption;
-
-            this.Controls.Add(pp);
-        }
-
-        public void addProperty(string Caption, Control C)
-        {
-
-            PropertyPanel pp = new PropertyPanel();
-            pp.Controls.Add(C);
-            pp.Text = Caption;
-
-            this.Controls.Add(pp);
-        }
-
-        public void addProperty(Control ctrl)
-        {
-
-            PropertyPanel pp = new PropertyPanel();
-            pp.Controls.Add(ctrl);
-            this.Controls.Add(pp);
-        }
-
-
-        protected override void OnLoad(System.EventArgs EventArguments)
-        {
-
-        }
-
-        protected override void Render(System.Web.UI.HtmlTextWriter writer)
-        {
-            this.ViewStateMode = ViewStateMode.Disabled;
-            this.CreateChildControls();
-
-            string styleString = "";
-
-            foreach (string key in this.Style.Keys)
-            {
-                styleString += key + ":" + this.Style[key] + ";";
-            }
-
-
-            writer.WriteLine("<div class=\"umb-pane " + this.CssClass +  "\" style='" + styleString + "'>");
-            if (!string.IsNullOrEmpty(m_title))
-                writer.WriteLine("<h5 class='umb-pane-title'>" + m_title + "</h5>");
-            writer.WriteLine("<div class=\"control-group umb-control-group\" style='" + styleString + "'>");
-
-            if (!string.IsNullOrEmpty(m_Text))
-                writer.WriteLine("<p class=\"umb-abstract\">" + m_Text + "</p>");
-
-            try
-            {
-                this.RenderChildren(writer);
-            }
-            catch (Exception ex)
-            {
-                writer.WriteLine("Error creating control <br />");
-                writer.WriteLine(ex.ToString());
-            }
-
-            writer.WriteLine("</div>");
-            writer.WriteLine("</div>");
-
-        }
-
-    }
-
-}

From 874c89656c2f29da8bad9b3c19e5486cee6825f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 24 Jan 2019 15:57:28 +0100
Subject: [PATCH 045/421] action colors

---
 .../src/less/components/editor.less              |  3 ---
 .../src/less/components/tree/umb-tree-item.less  | 16 ++++++++--------
 .../less/components/umb-editor-navigation.less   |  6 +++---
 .../src/less/components/umb-flatpickr.less       |  6 +++---
 .../src/less/components/umb-iconpicker.less      |  2 +-
 .../less/components/umb-list-view-settings.less  |  5 +++--
 .../src/less/components/umb-node-preview.less    | 12 +++++++-----
 .../src/less/variables.less                      | 10 +++++++++-
 8 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index d699193c240c..f193561ff373 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -101,9 +101,6 @@ input.umb-editor-header__name-input {
 	padding: 0 10px;
 	background: @white;
 	border: 1px solid @gray-8;
-	&:hover {
-		border-color: @turquoise-d1;
-	}
 }
 
 input.umb-editor-header__name-input:disabled {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 002d076461c8..39facb1f486e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -42,13 +42,13 @@
 
 .umb-tree-item.current > .umb-tree-item__inner {
 
-    background: @turquoise-d1; 
+    background: @ui-active; 
     
     // override small icon color. TODO => check usage 
-//    &:before {
-//        color: @turquoise-l2;
-//    }
-
+    &:before {
+        color: @turquoise-l2;
+    }
+    
     .umb-options {
 
         &:hover i {
@@ -57,7 +57,7 @@
 
         i {
             background: @white;
-            border-color: @turquoise-d1;
+            border-color: @ui-active;
             transition: opacity 120ms ease;
         }
     }
@@ -66,7 +66,7 @@
     .umb-tree-icon,
     ins {
         color: @white !important;
-        background-color: @turquoise-d1;
-        border-color: @turquoise-d1;
+        background-color: @ui-active;
+        border-color: @ui-active;
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
index d8b83af67a5d..db24210e300b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
@@ -32,8 +32,8 @@
 }
 
 .umb-sub-views-nav-item.is-active {
-  color: @turquoise-d1;
-  border-bottom-color: @turquoise-d1;
+  color: @ui-active;
+  border-bottom-color: @ui-active;
 }
 
 .show-validation .umb-sub-views-nav-item.-has-error {
@@ -98,7 +98,7 @@
 
 // make dots green the an item is active
 .umb-sub-views-nav-item.is-active .umb-sub-views-nav-item__more i {
-  background-color: @turquoise-d1;
+  background-color: @ui-active;
 }
 
 .umb-sub-views-nav__dropdown.umb-sub-views-nav__dropdown {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less
index 1848d55d96ee..8cdcc8b8774f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-flatpickr.less
@@ -13,9 +13,9 @@ span.flatpickr-day:hover {
 }
 
 span.flatpickr-day.selected {
-    background-color: @turquoise;
+    background-color: @ui-selected;
 }
 
 span.flatpickr-day.selected:hover {
-    background-color: @turquoise-d1;
-}
\ No newline at end of file
+    background-color: @ui-selected-hover;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
index 6b03d8021463..34070256ced4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
@@ -34,7 +34,7 @@
 
 .umb-iconpicker-item.-selected {
     background: @gray-10;
-    border: solid 1px @turquoise-d1;
+    border: solid 1px @ui-active;
     border-radius: @baseBorderRadius;
     box-sizing: border-box;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
index 4fb20f5c686d..b23a9d14b8cb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
@@ -34,11 +34,12 @@
 
 .umb-list-view-settings__create-new {
   font-size: 13px;
-  color: @turquoise-d1;
+  color: @ui-action;
 }
 
 .umb-list-view-settings__create-new:hover {
-  color: @turquoise-d1;
+  color: @ui-action-hover;
+  border-color: @ui-action-hover;
 }
 
 .umb-list-view-settings__remove-new {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 07bc32d79ab7..3d1af014c718 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -71,12 +71,12 @@
     margin-right: 5px;
     font-size: 13px;
     font-weight: bold;
-    color: @gray-5;
+    color: @ui-action-disgrete;
     cursor: pointer;
 }
 
 .umb-node-preview__action:hover {
-    color: @turquoise;
+    color: @ui-action-disgrete-hover;
     text-decoration: none;
     opacity: 1;
 }
@@ -90,14 +90,16 @@
     align-items: center;
     justify-content: center;
     border: 1px dashed @gray-7;
-    color: @turquoise-d1;
+    color: @ui-action;
     font-weight: bold;
     padding: 5px 15px;
     box-sizing: border-box;
 }
 
 .umb-node-preview-add:hover {
-    color: @turquoise-d1;
+    color: @ui-action-hover;
+    border-color: @ui-action-hover;
+    text-decoration: none;
 }
 
 .umb-editor-wrapper .umb-node-preview-add {
@@ -112,4 +114,4 @@
     .umb-node-preview-add {
         max-width: none;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index a7360148a947..be9276bf3579 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -39,7 +39,7 @@
 @pinkLight:             #f5c1bc;// added 2019
 @brown:                 #9d8057;// added 2019
 
-@u-grey:                #f2ebe6;// added 2019
+@u-greyLight:           #f2ebe6;// added 2019
 @u-white:               #f9f7f4;// added 2019
 
 
@@ -47,7 +47,15 @@
 // -------------------------
 
 @ui-active:             @pinkLight;
+@ui-active-hover:       @pinkLight;
 @ui-selected:           @pinkLight;
+@ui-selected-hover:     @pinkLight;
+
+@ui-action:             @orange;
+@ui-action-hover:       @orange;
+
+@ui-action-disgrete:             @gray-4;
+@ui-action-disgrete-hover:       @orange;
 
 
 // Colors

From 37b614a577c895769cb988c2d9ceef17ec5c295c Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 24 Jan 2019 15:41:38 +0000
Subject: [PATCH 046/421] Another file that can be gone as was used by
 LegacyDialogTask

---
 src/Umbraco.Web/UI/IAssignedApp.cs | 17 -----------------
 src/Umbraco.Web/Umbraco.Web.csproj |  1 -
 2 files changed, 18 deletions(-)
 delete mode 100644 src/Umbraco.Web/UI/IAssignedApp.cs

diff --git a/src/Umbraco.Web/UI/IAssignedApp.cs b/src/Umbraco.Web/UI/IAssignedApp.cs
deleted file mode 100644
index b70dafa50efc..000000000000
--- a/src/Umbraco.Web/UI/IAssignedApp.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Umbraco.Web.UI
-{
-    /// <summary>
-    /// This is used for anything that is assigned to an app
-    /// </summary>
-    /// <remarks>
-    /// Currently things that need to be assigned to an app in order for user security to work are:
-    /// LegacyDialogTask
-    /// </remarks>
-    public interface IAssignedApp
-    {
-        /// <summary>
-        /// Returns the app alias that this element belongs to
-        /// </summary>
-        string AssignedApp { get; }
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index fb5401c13739..47c3c24de454 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1137,7 +1137,6 @@
     <Compile Include="Templates\TemplateUtilities.cs" />
     <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
     <Compile Include="Trees\PartialViewsTreeController.cs" />
-    <Compile Include="UI\IAssignedApp.cs" />
     <Compile Include="_Legacy\PackageActions\allowDoctype.cs" />
     <Compile Include="_Legacy\PackageActions\publishRootDocument.cs" />
     <Compile Include="UI\SpeechBubbleIcon.cs" />

From 79eaeef25892298e7ad2ff20c9ae188a3fba8d13 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 24 Jan 2019 15:44:47 +0000
Subject: [PATCH 047/421] Fixup NuSpec as we no longer ship with default.aspx

---
 build/NuSpecs/UmbracoCms.nuspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index a188377c19a7..678037a84a45 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -33,7 +33,6 @@
         <!-- files -->
         <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
         <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
-        <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
         <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
         <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
         <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />

From 3e69ceb4871769682cea28089733022d0dd76083 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 24 Jan 2019 15:52:56 +0000
Subject: [PATCH 048/421] Remove dashboard from web.config

---
 src/Umbraco.Web.UI/web.Template.config | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 2371282a1423..e7399f600be6 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -14,7 +14,6 @@
         <sectionGroup name="umbracoConfiguration">
             <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
             <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
-            <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
             <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" />
         </sectionGroup>
 
@@ -28,7 +27,6 @@
     <umbracoConfiguration>
         <settings configSource="config\umbracoSettings.config" />
         <FileSystemProviders configSource="config\FileSystemProviders.config" />
-        <dashBoard configSource="config\Dashboard.config" />
         <HealthChecks configSource="config\HealthChecks.config" />
     </umbracoConfiguration>
 

From 585abf2902f26d555e418441fb400f7a361af721 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 22 Jan 2019 17:23:30 +0100
Subject: [PATCH 049/421] Cleanup trees

---
 .../components/tree/umbtree.directive.js      |   2 +-
 .../src/common/resources/tree.resource.js     |  15 +-
 .../treepicker/treepicker.controller.js       |   2 -
 .../treepicker/treepicker.html                |   1 -
 .../src/views/packages/edit.controller.js     |   2 +-
 .../Editors/BackOfficeServerVariables.cs      |   2 +-
 src/Umbraco.Web/Services/ITreeService.cs      |   6 +-
 src/Umbraco.Web/Services/TreeService.cs       |  10 +-
 .../Trees/ApplicationTreeController.cs        | 336 ++++++++----------
 src/Umbraco.Web/Trees/FilesTreeController.cs  |   5 +-
 src/Umbraco.Web/Trees/ITree.cs                |   5 +
 .../Trees/LogViewerTreeController.cs          |   3 +-
 src/Umbraco.Web/Trees/Tree.cs                 |   8 +-
 src/Umbraco.Web/Trees/TreeAttribute.cs        |  27 ++
 .../Trees/TreeCollectionBuilder.cs            |   2 +-
 src/Umbraco.Web/Trees/TreeController.cs       |   3 +
 src/Umbraco.Web/Trees/TreeControllerBase.cs   |   3 +
 .../WebApi/HttpControllerContextExtensions.cs |  52 ++-
 18 files changed, 239 insertions(+), 245 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index 052f497ee9d2..4f57319b366a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -235,7 +235,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
                     $scope.loading = true;
                     
                     //default args
-                    var args = { section: $scope.section, tree: $scope.treealias, cacheKey: $scope.cachekey, isDialog: $scope.isdialog ? $scope.isdialog : false, onlyinitialized: $scope.onlyInitialized };
+                    var args = { section: $scope.section, tree: $scope.treealias, cacheKey: $scope.cachekey, isDialog: $scope.isdialog ? $scope.isdialog : false };
 
                     //add the extra query string params if specified
                     if ($scope.customtreeparams) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js
index 0e08ac6518f8..73db2c97772b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js
@@ -12,7 +12,7 @@ function treeResource($q, $http, umbRequestHelper) {
         }
         return node.childNodesUrl;
     }
-        
+
     /** internal method to get the tree menu url */
     function getTreeMenuUrl(node) {
         if (!node.menuUrl) {
@@ -23,7 +23,7 @@ function treeResource($q, $http, umbRequestHelper) {
 
     //the factory object returned
     return {
-        
+
         /** Loads in the data to display the nodes menu */
         loadMenu: function (node) {
             var treeMenuUrl = getTreeMenuUrl(node);
@@ -53,12 +53,9 @@ function treeResource($q, $http, umbRequestHelper) {
             }
 
             //create the query string for the tree request, these are the mandatory options:
-            var query = "application=" + options.section + "&tree=" + options.tree + "&isDialog=" + options.isDialog;
-
-            //if you need to load a not initialized tree set this value to false - default is true
-            if (options.onlyinitialized) {
-                query += "&onlyInitialized=" + options.onlyinitialized;
-            }
+            var query = "application=" + options.section
+                        + "&tree=" + options.tree
+                        + "&use=" + (options.isDialog ? "dialog" : "main");
 
             //the options can contain extra query string parameters
             if (options.queryString) {
@@ -73,7 +70,7 @@ function treeResource($q, $http, umbRequestHelper) {
                             query)),
                 'Failed to retrieve data for application tree ' + options.section);
         },
-        
+
         /** Loads in the data to display the child nodes for a given node */
         loadNodes: function (options) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
index 346bddf00f30..0628af1118a3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
@@ -28,8 +28,6 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
         vm.treeAlias = $scope.model.treeAlias;
         vm.multiPicker = $scope.model.multiPicker;
         vm.hideHeader = (typeof $scope.model.hideHeader) === "boolean" ? $scope.model.hideHeader : true;
-        // if you need to load a not initialized tree set this value to false - default is true
-        vm.onlyInitialized = $scope.model.onlyInitialized;
         vm.searchInfo = {
             searchFromId: $scope.model.startNodeId,
             searchFromName: null,
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
index da81d48c7846..c592b4ec3b9d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
@@ -56,7 +56,6 @@
                                         hideheader="{{vm.hideHeader}}"
                                         hideoptions="true"
                                         isdialog="true"
-                                        only-initialized="{{vm.onlyInitialized}}"
                                         customtreeparams="{{vm.customTreeParams}}"
                                         enablelistviewsearch="true"
                                         enablelistviewexpand="true"
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
index 282fd0472c44..b6026edf0358 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
@@ -198,7 +198,7 @@
                 treeAlias: "files",
                 entityType: "file",
                 multiPicker: true,
-                onlyInitialized: false,
+                isDialog: true,
                 select: function(node) {
                     node.selected = !node.selected;
 
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 7fe279d9c7bd..eac6852684dc 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -159,7 +159,7 @@ internal Dictionary<string, object> GetServerVariables()
                         },
                         {
                             "treeApplicationApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<ApplicationTreeController>(
-                                controller => controller.GetApplicationTrees(null, null, null))
+                                controller => controller.GetApplicationTrees(null, null, null, TreeUse.None))
                         },
                         {
                             "contentTypeApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<ContentTypeController>(
diff --git a/src/Umbraco.Web/Services/ITreeService.cs b/src/Umbraco.Web/Services/ITreeService.cs
index 691e5a63704a..f9ed522e71dc 100644
--- a/src/Umbraco.Web/Services/ITreeService.cs
+++ b/src/Umbraco.Web/Services/ITreeService.cs
@@ -17,16 +17,16 @@ public interface ITreeService
         /// <summary>
         /// Gets all trees.
         /// </summary>
-        IEnumerable<Tree> GetAll();
+        IEnumerable<Tree> GetAll(TreeUse use = TreeUse.Main);
 
         /// <summary>
         /// Gets all trees for a section.
         /// </summary>
-        IEnumerable<Tree> GetBySection(string sectionAlias);
+        IEnumerable<Tree> GetBySection(string sectionAlias, TreeUse use = TreeUse.Main);
 
         /// <summary>
         /// Gets all trees for a section, grouped.
         /// </summary>
-        IDictionary<string, IEnumerable<Tree>> GetBySectionGrouped(string sectionAlias);
+        IDictionary<string, IEnumerable<Tree>> GetBySectionGrouped(string sectionAlias, TreeUse use = TreeUse.Main);
     }
 }
diff --git a/src/Umbraco.Web/Services/TreeService.cs b/src/Umbraco.Web/Services/TreeService.cs
index c697a89a6220..a5574946a673 100644
--- a/src/Umbraco.Web/Services/TreeService.cs
+++ b/src/Umbraco.Web/Services/TreeService.cs
@@ -26,16 +26,16 @@ public TreeService(TreeCollection treeCollection)
         public Tree GetByAlias(string treeAlias) => _treeCollection.FirstOrDefault(x => x.TreeAlias == treeAlias);
 
         /// <inheritdoc />
-        public IEnumerable<Tree> GetAll() => _treeCollection;
+        public IEnumerable<Tree> GetAll(TreeUse use = TreeUse.Main) => _treeCollection.Where(x => x.TreeUse.HasAny(use));
 
         /// <inheritdoc />
-        public IEnumerable<Tree> GetBySection(string sectionAlias)
-            => _treeCollection.Where(x => x.SectionAlias.InvariantEquals(sectionAlias)).OrderBy(x => x.SortOrder).ToList();
+        public IEnumerable<Tree> GetBySection(string sectionAlias, TreeUse use = TreeUse.Main)
+            => _treeCollection.Where(x => x.SectionAlias.InvariantEquals(sectionAlias) && x.TreeUse.HasAny(use)).OrderBy(x => x.SortOrder).ToList();
 
         /// <inheritdoc />
-        public IDictionary<string, IEnumerable<Tree>> GetBySectionGrouped(string sectionAlias)
+        public IDictionary<string, IEnumerable<Tree>> GetBySectionGrouped(string sectionAlias, TreeUse use = TreeUse.Main)
         {
-            return GetBySection(sectionAlias).GroupBy(x => x.TreeGroup).ToDictionary(
+            return GetBySection(sectionAlias, use).GroupBy(x => x.TreeGroup).ToDictionary(
                 x => x.Key ?? "",
                 x => (IEnumerable<Tree>) x.ToArray());
         }
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 61d09cd3f227..28bc464d550c 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -14,11 +14,8 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.ContentEditing;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Services;
@@ -50,262 +47,235 @@ public ApplicationTreeController(IGlobalSettings globalSettings, UmbracoContext
         /// </summary>
         /// <param name="application">The application to load tree for</param>
         /// <param name="tree">An optional single tree alias, if specified will only load the single tree for the request app</param>
-        /// <param name="queryStrings"></param>
+        /// <param name="querystring"></param>
+        /// <param name="use">Tree use.</param>
         /// <returns></returns>
         [HttpQueryStringFilter("queryStrings")]
-        public async Task<TreeRootNode> GetApplicationTrees(string application, string tree, FormDataCollection queryStrings)
+        public async Task<TreeRootNode> GetApplicationTrees(string application, string tree, FormDataCollection querystring, TreeUse use = TreeUse.Main)
         {
             application = application.CleanForXss();
 
-            if (string.IsNullOrEmpty(application)) throw new HttpResponseException(HttpStatusCode.NotFound);
+            if (string.IsNullOrEmpty(application))
+                throw new HttpResponseException(HttpStatusCode.NotFound);
 
             //find all tree definitions that have the current application alias
-            var groupedTrees = _treeService.GetBySectionGrouped(application);
+            var groupedTrees = _treeService.GetBySectionGrouped(application, use);
             var allTrees = groupedTrees.Values.SelectMany(x => x).ToList();
 
-            if (string.IsNullOrEmpty(tree) == false || allTrees.Count == 1)
+            if (allTrees.Count == 0)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            // handle request for a specific tree / or when there is only one tree
+            if (!tree.IsNullOrWhiteSpace() || allTrees.Count == 1)
             {
-                var apptree = !tree.IsNullOrWhiteSpace()
-                    ? allTrees.FirstOrDefault(x => x.TreeAlias == tree)
-                    : allTrees.FirstOrDefault();
+                var t = tree.IsNullOrWhiteSpace()
+                    ? allTrees[0]
+                    : allTrees.FirstOrDefault(x => x.TreeAlias == tree);
 
-                if (apptree == null) throw new HttpResponseException(HttpStatusCode.NotFound);
+                if (t == null)
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
 
-                var result = await GetRootForSingleAppTree(
-                    apptree,
-                    Constants.System.Root.ToString(CultureInfo.InvariantCulture),
-                    queryStrings,
-                    application);
+                var treeRootNode = await GetTreeRootNode(t, Constants.System.Root, querystring);
+                if (treeRootNode != null)
+                    return treeRootNode;
 
-                //this will be null if it cannot convert to a single root section
-                if (result != null)
-                {
-                    return result;
-                }
+                throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
-            //Don't apply fancy grouping logic futher down, if we only have one group of items
-            var hasGroups = groupedTrees.Count > 1;
-            if (!hasGroups)
+            // handle requests for all trees
+            // for only 1 group
+            if (groupedTrees.Count == 1)
             {
-                var collection = new TreeNodeCollection();
-                foreach (var apptree in allTrees)
+                var nodes = new TreeNodeCollection();
+                foreach (var t in allTrees)
                 {
-                    //return the root nodes for each tree in the app
-                    var rootNode = await GetRootForMultipleAppTree(apptree, queryStrings);
-                    //This could be null if the tree decides not to return it's root (i.e. the member type tree does this when not in umbraco membership mode)
-                    if (rootNode != null)
-                    {
-                        collection.Add(rootNode);
-                    }
+                    var node = await TryGetRootNode(t, querystring);
+                    if (node != null)
+                        nodes.Add(node);
                 }
 
-                if(collection.Count > 0)
-                {
-                    var multiTree = TreeRootNode.CreateMultiTreeRoot(collection);
-                    multiTree.Name = Services.TextService.Localize("sections/" + application);
+                var name = Services.TextService.Localize("sections/" + application);
 
-                    return multiTree;
+                if (nodes.Count > 0)
+                {
+                    var treeRootNode = TreeRootNode.CreateMultiTreeRoot(nodes);
+                    treeRootNode.Name = name;
+                    return treeRootNode;
                 }
 
-                //Otherwise its a application/section with no trees (aka a full screen app)
-                //For example we do not have a Forms tree defined in C# & can not attribute with [Tree(isSingleNodeTree:true0]
-                var rootId = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
-                var section = Services.TextService.Localize("sections/" + application);
-
-                return TreeRootNode.CreateSingleTreeRoot(rootId, null, null, section, TreeNodeCollection.Empty, true);
+                // otherwise it's a section with no tree, aka a fullscreen section
+                // todo is this true? what if we just failed to TryGetRootNode on all of them?
+                return TreeRootNode.CreateSingleTreeRoot(Constants.System.Root.ToInvariantString(), null, null, name, TreeNodeCollection.Empty, true);
             }
 
-            var rootNodeGroups = new List<TreeRootNode>();
-
-            //Group trees by [CoreTree] attribute with a TreeGroup property
-            foreach (var treeSectionGroup in groupedTrees)
+            // for many groups
+            var treeRootNodes = new List<TreeRootNode>();
+            foreach (var (groupName, trees) in groupedTrees)
             {
-                var treeGroupName = treeSectionGroup.Key;
-
-                var groupNodeCollection = new TreeNodeCollection();
-                foreach (var appTree in treeSectionGroup.Value)
+                var nodes = new TreeNodeCollection();
+                foreach (var t in trees)
                 {
-                    var rootNode = await GetRootForMultipleAppTree(appTree, queryStrings);
-                    if (rootNode != null)
-                    {
-                        //Add to a new list/collection
-                        groupNodeCollection.Add(rootNode);
-                    }
+                    var node = await TryGetRootNode(t, querystring);
+                    if (node != null)
+                        nodes.Add(node);
                 }
 
-                //If treeGroupName == null then its third party
-                if (treeGroupName.IsNullOrWhiteSpace())
-                {
-                    //This is used for the localisation key
-                    //treeHeaders/thirdPartyGroup
-                    treeGroupName = "thirdPartyGroup";
-                }
+                if (nodes.Count == 0)
+                    continue;
 
-                if (groupNodeCollection.Count > 0)
-                {
-                    var groupRoot = TreeRootNode.CreateGroupNode(groupNodeCollection, application);
-                    groupRoot.Name = Services.TextService.Localize("treeHeaders/" + treeGroupName);
+                // no name => third party
+                // use localization key treeHeaders/thirdPartyGroup
+                // todo this is an odd convention
+                var name = groupName.IsNullOrWhiteSpace() ? "thirdPartyGroup" : groupName;
 
-                    rootNodeGroups.Add(groupRoot);
-                }
+                var groupRootNode = TreeRootNode.CreateGroupNode(nodes, application);
+                groupRootNode.Name = Services.TextService.Localize("treeHeaders/" + name);
+                treeRootNodes.Add(groupRootNode);
             }
 
-            return TreeRootNode.CreateGroupedMultiTreeRoot(new TreeNodeCollection(rootNodeGroups.OrderBy(x => x.Name)));
+            return TreeRootNode.CreateGroupedMultiTreeRoot(new TreeNodeCollection(treeRootNodes.OrderBy(x => x.Name)));
         }
 
         /// <summary>
-        /// Get the root node for an application with multiple trees
+        /// Tries to get the root node of a tree.
         /// </summary>
-        /// <param name="tree"></param>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        private async Task<TreeNode> GetRootForMultipleAppTree(Tree tree, FormDataCollection queryStrings)
+        /// <remarks>
+        /// <para>Returns null if the root node could not be obtained due to an HttpResponseException,
+        /// which probably indicates that the user isn't authorized to view that tree.</para>
+        /// </remarks>
+        private async Task<TreeNode> TryGetRootNode(Tree tree, FormDataCollection querystring)
         {
             if (tree == null) throw new ArgumentNullException(nameof(tree));
+
             try
             {
-                var byControllerAttempt = await TryGetRootNodeFromControllerTree(tree, queryStrings, ControllerContext);
-                if (byControllerAttempt.Success)
-                {
-                    return byControllerAttempt.Result;
-                }
+                return await GetRootNode(tree, querystring);
             }
             catch (HttpResponseException)
             {
-                //if this occurs its because the user isn't authorized to view that tree, in this case since we are loading multiple trees we
-                //will just return null so that it's not added to the list.
+                // if this occurs its because the user isn't authorized to view that tree,
+                // in this case since we are loading multiple trees we will just return
+                // null so that it's not added to the list.
                 return null;
             }
-
-            throw new ApplicationException("Could not get root node for tree type " + tree.TreeAlias);
         }
 
         /// <summary>
-        /// Get the root node for an application with one tree
+        /// Get the tree root node of a tree.
         /// </summary>
-        /// <param name="tree"></param>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="application"></param>
-        /// <returns></returns>
-        private async Task<TreeRootNode> GetRootForSingleAppTree(Tree tree, string id, FormDataCollection queryStrings, string application)
+        private async Task<TreeRootNode> GetTreeRootNode(Tree tree, int id, FormDataCollection querystring)
         {
-            var rootId = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
             if (tree == null) throw new ArgumentNullException(nameof(tree));
-            var byControllerAttempt = TryLoadFromControllerTree(tree, id, queryStrings, ControllerContext);
-            if (!byControllerAttempt.Success)
-                throw new ApplicationException("Could not render a tree for type " + tree.TreeAlias);
 
-            var rootNode = await TryGetRootNodeFromControllerTree(tree, queryStrings, ControllerContext);
-            if (rootNode.Success == false)
-            {
-                //This should really never happen if we've successfully got the children above.
-                throw new InvalidOperationException("Could not create root node for tree " + tree.TreeAlias);
-            }
+            var children = await GetChildren(tree, id, querystring);
+            var rootNode = await GetRootNode(tree, querystring);
 
             var sectionRoot = TreeRootNode.CreateSingleTreeRoot(
-                rootId,
-                rootNode.Result.ChildNodesUrl,
-                rootNode.Result.MenuUrl,
-                rootNode.Result.Name,
-                byControllerAttempt.Result,
+                Constants.System.Root.ToInvariantString(),
+                rootNode.ChildNodesUrl,
+                rootNode.MenuUrl,
+                rootNode.Name,
+                children,
                 tree.IsSingleNodeTree);
 
-            //assign the route path based on the root node, this means it will route there when the section is navigated to
-            //and no dashboards will be available for this section
-            sectionRoot.RoutePath = rootNode.Result.RoutePath;
-            sectionRoot.Path = rootNode.Result.Path;
+            // assign the route path based on the root node, this means it will route there when the
+            // section is navigated to and no dashboards will be available for this section
+            sectionRoot.RoutePath = rootNode.RoutePath;
+            sectionRoot.Path = rootNode.Path;
 
-            foreach (var d in rootNode.Result.AdditionalData)
-            {
+            foreach (var d in rootNode.AdditionalData)
                 sectionRoot.AdditionalData[d.Key] = d.Value;
-            }
-            return sectionRoot;
 
+            return sectionRoot;
         }
 
         /// <summary>
-        /// Proxies a request to the destination tree controller to get it's root tree node
+        /// Gets the root node of a tree.
         /// </summary>
-        /// <param name="appTree"></param>
-        /// <param name="formCollection"></param>
-        /// <param name="controllerContext"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// This ensures that authorization filters are applied to the sub request
-        /// </remarks>
-        private async Task<Attempt<TreeNode>> TryGetRootNodeFromControllerTree(Tree appTree, FormDataCollection formCollection, HttpControllerContext controllerContext)
+        private async Task<TreeNode> GetRootNode(Tree tree, FormDataCollection querystring)
         {
-            //instantiate it, since we are proxying, we need to setup the instance with our current context
-            var instance = (TreeController)DependencyResolver.Current.GetService(appTree.TreeControllerType);
-
-            //NOTE: This is all required in order to execute the auth-filters for the sub request, we
-            // need to "trick" web-api into thinking that it is actually executing the proxied controller.
+            if (tree == null) throw new ArgumentNullException(nameof(tree));
 
-            var urlHelper = controllerContext.Request.GetUrlHelper();
-            //create the proxied URL for the controller action
-            var proxiedUrl = controllerContext.Request.RequestUri.GetLeftPart(UriPartial.Authority) +
-                urlHelper.GetUmbracoApiService("GetRootNode", instance.GetType());
-            //add the query strings to it
-            proxiedUrl += "?" + formCollection.ToQueryString();
-            //create proxy route data specifying the action / controller to execute
-            var proxiedRouteData = new HttpRouteData(
-                controllerContext.RouteData.Route,
-                new HttpRouteValueDictionary(new { action = "GetRootNode", controller = ControllerExtensions.GetControllerName(instance.GetType()) }));
-
-            //create a proxied controller context
-            var proxiedControllerContext = new HttpControllerContext(
-                controllerContext.Configuration,
-                proxiedRouteData,
-                new HttpRequestMessage(HttpMethod.Get, proxiedUrl))
-            {
-                ControllerDescriptor = new HttpControllerDescriptor(controllerContext.ControllerDescriptor.Configuration, ControllerExtensions.GetControllerName(instance.GetType()), instance.GetType()),
-                RequestContext = controllerContext.RequestContext
-            };
+            var controller = (TreeController) await GetApiControllerProxy(tree.TreeControllerType, "GetRootNode", querystring);
+            var rootNode = controller.GetRootNode(querystring);
+            if (rootNode == null)
+                throw new InvalidOperationException($"Failed to get root node for tree \"{tree.TreeAlias}\".");
+            return rootNode;
+        }
 
-            instance.ControllerContext = proxiedControllerContext;
-            instance.Request = controllerContext.Request;
-            instance.RequestContext.RouteData = proxiedRouteData;
+        /// <summary>
+        /// Get the child nodes of a tree node.
+        /// </summary>
+        private async Task<TreeNodeCollection> GetChildren(Tree tree, int id, FormDataCollection querystring)
+        {
+            if (tree == null) throw new ArgumentNullException(nameof(tree));
 
-            //invoke auth filters for this sub request
-            var result = await instance.ControllerContext.InvokeAuthorizationFiltersForRequest();
-            //if a result is returned it means they are unauthorized, just throw the response.
-            if (result != null)
-            {
-                throw new HttpResponseException(result);
-            }
+            // the method we proxy has an 'id' parameter which is *not* in the querystring,
+            // we need to add it for the proxy to work (else, it does not find the method,
+            // when trying to run auth filters etc).
+            var d = querystring?.ToDictionary(x => x.Key, x => x.Value) ?? new Dictionary<string, string>();
+            d["id"] = null;
+            var proxyQuerystring = new FormDataCollection(d);
 
-            //return the root
-            var node = instance.GetRootNode(formCollection);
-            return node == null
-                ? Attempt<TreeNode>.Fail(new InvalidOperationException("Could not return a root node for tree " + appTree.TreeAlias))
-                : Attempt<TreeNode>.Succeed(node);
+            var controller = (TreeController) await GetApiControllerProxy(tree.TreeControllerType, "GetNodes", proxyQuerystring);
+            return controller.GetNodes(id.ToInvariantString(), querystring);
         }
 
         /// <summary>
-        /// Proxies a request to the destination tree controller to get it's tree node collection
+        /// Gets a proxy to a controller for a specified action.
         /// </summary>
-        /// <param name="appTree"></param>
-        /// <param name="id"></param>
-        /// <param name="formCollection"></param>
-        /// <param name="controllerContext"></param>
-        /// <returns></returns>
-        private Attempt<TreeNodeCollection> TryLoadFromControllerTree(Tree appTree, string id, FormDataCollection formCollection, HttpControllerContext controllerContext)
+        /// <param name="controllerType">The type of the controller.</param>
+        /// <param name="action">The action.</param>
+        /// <param name="querystring">The querystring.</param>
+        /// <returns>An instance of the controller.</returns>
+        /// <remarks>
+        /// <para>Creates an instance of the <paramref name="controllerType"/> and initializes it with a route
+        /// and context etc. so it can execute the specified <paramref name="action"/>. Runs the authorization
+        /// filters for that action, to ensure that the user has permission to execute it.</para>
+        /// </remarks>
+        private async Task<object> GetApiControllerProxy(Type controllerType, string action, FormDataCollection querystring)
         {
-            // instantiate it, since we are proxying, we need to setup the instance with our current context
-            var instance = (TreeController)DependencyResolver.Current.GetService(appTree.TreeControllerType);
-            if (instance == null)
-                throw new Exception("Failed to create tree " + appTree.TreeControllerType + ".");
+            // note: this is all required in order to execute the auth-filters for the sub request, we
+            // need to "trick" web-api into thinking that it is actually executing the proxied controller.
 
-            //TODO: Shouldn't we be applying the same proxying logic as above so that filters work? seems like an oversight
+            var context = ControllerContext;
 
-            instance.ControllerContext = controllerContext;
-            instance.Request = controllerContext.Request;
+            // get the controller
+            var controller = (ApiController) DependencyResolver.Current.GetService(controllerType)
+                             ?? throw new Exception($"Failed to create controller of type {controllerType.FullName}.");
 
-            // return its data
-            return Attempt.Succeed(instance.GetNodes(id, formCollection));
-        }
+            // create the proxy URL for the controller action
+            var proxyUrl = context.Request.RequestUri.GetLeftPart(UriPartial.Authority)
+                      + context.Request.GetUrlHelper().GetUmbracoApiService(action, controllerType)
+                      + "?" + querystring.ToQueryString();
+
+            // create proxy route data specifying the action & controller to execute
+            var proxyRoute = new HttpRouteData(
+                context.RouteData.Route,
+                new HttpRouteValueDictionary(new { action, controller = ControllerExtensions.GetControllerName(controllerType) }));
+
+            // create a proxy request
+            var proxyRequest = new HttpRequestMessage(HttpMethod.Get, proxyUrl);
 
+            // create a proxy controller context
+            var proxyContext = new HttpControllerContext(context.Configuration, proxyRoute, proxyRequest)
+            {
+                ControllerDescriptor = new HttpControllerDescriptor(context.ControllerDescriptor.Configuration, ControllerExtensions.GetControllerName(controllerType), controllerType),
+                RequestContext = context.RequestContext,
+                Controller = controller
+            };
+
+            // wire everything
+            controller.ControllerContext = proxyContext;
+            controller.Request = proxyContext.Request;
+            controller.RequestContext.RouteData = proxyRoute;
+
+            // auth
+            var authResult = await controller.ControllerContext.InvokeAuthorizationFiltersForRequest();
+            if (authResult != null)
+                throw new HttpResponseException(authResult);
+
+            return controller;
+        }
     }
 }
diff --git a/src/Umbraco.Web/Trees/FilesTreeController.cs b/src/Umbraco.Web/Trees/FilesTreeController.cs
index 7e326870e3ba..ce31b0978fc8 100644
--- a/src/Umbraco.Web/Trees/FilesTreeController.cs
+++ b/src/Umbraco.Web/Trees/FilesTreeController.cs
@@ -1,9 +1,10 @@
-using Umbraco.Core.IO;
+using Umbraco.Core;
+using Umbraco.Core.IO;
 using Umbraco.Web.Models.Trees;
 
 namespace Umbraco.Web.Trees
 {
-    // this is not a section tree - do not mark with [Tree]
+    [Tree(Constants.Applications.Settings, "files", TreeTitle = "Files", IconOpen = "icon-folder", IconClosed = "icon-folder", TreeUse = TreeUse.Dialog)]
     [CoreTree]
     public class FilesTreeController : FileSystemTreeController
     {
diff --git a/src/Umbraco.Web/Trees/ITree.cs b/src/Umbraco.Web/Trees/ITree.cs
index 4546ddce4f52..8672c467bc7d 100644
--- a/src/Umbraco.Web/Trees/ITree.cs
+++ b/src/Umbraco.Web/Trees/ITree.cs
@@ -30,6 +30,11 @@ internal interface ITree
         /// </summary>
         string TreeTitle { get; }
 
+        /// <summary>
+        /// Gets the tree use.
+        /// </summary>
+        TreeUse TreeUse { get; }
+
         /// <summary>
         /// Flag to define if this tree is a single node tree (will never contain child nodes, full screen app)
         /// </summary>
diff --git a/src/Umbraco.Web/Trees/LogViewerTreeController.cs b/src/Umbraco.Web/Trees/LogViewerTreeController.cs
index 22a1c799d60e..3d9490b9a060 100644
--- a/src/Umbraco.Web/Trees/LogViewerTreeController.cs
+++ b/src/Umbraco.Web/Trees/LogViewerTreeController.cs
@@ -7,9 +7,8 @@
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.LogViewer)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.LogViewer, null, sortOrder: 9)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.LogViewer, SortOrder= 9, TreeGroup = Constants.Trees.Groups.Settings)]
     [PluginController("UmbracoTrees")]
-    [CoreTree(TreeGroup = Constants.Trees.Groups.Settings)]
     public class LogViewerTreeController : TreeController
     {
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/Tree.cs b/src/Umbraco.Web/Trees/Tree.cs
index b0a24e3b2b5e..37b379e29282 100644
--- a/src/Umbraco.Web/Trees/Tree.cs
+++ b/src/Umbraco.Web/Trees/Tree.cs
@@ -4,16 +4,17 @@
 
 namespace Umbraco.Web.Trees
 {
-    [DebuggerDisplay("Tree - {TreeAlias} ({SectionAlias})")]
+    [DebuggerDisplay("Tree - {SectionAlias}/{TreeAlias}")]
     public class Tree : ITree
     {
-        public Tree(int sortOrder, string applicationAlias, string group, string alias, string title, Type treeControllerType, bool isSingleNodeTree)
+        public Tree(int sortOrder, string applicationAlias, string group, string alias, string title, TreeUse use, Type treeControllerType, bool isSingleNodeTree)
         {
             SortOrder = sortOrder;
             SectionAlias = applicationAlias;
             TreeGroup = group;
             TreeAlias = alias;
             TreeTitle = title;
+            TreeUse = use;
             TreeControllerType = treeControllerType;
             IsSingleNodeTree = isSingleNodeTree;
         }
@@ -33,6 +34,9 @@ public Tree(int sortOrder, string applicationAlias, string group, string alias,
         /// <inheritdoc />
         public string TreeTitle { get; set; }
 
+        /// <inheritdoc />
+        public TreeUse TreeUse { get; set; }
+
         /// <inheritdoc />
         public bool IsSingleNodeTree { get; }
 
diff --git a/src/Umbraco.Web/Trees/TreeAttribute.cs b/src/Umbraco.Web/Trees/TreeAttribute.cs
index bfd7b53f4a66..2102bd4bfc09 100644
--- a/src/Umbraco.Web/Trees/TreeAttribute.cs
+++ b/src/Umbraco.Web/Trees/TreeAttribute.cs
@@ -2,6 +2,28 @@
 
 namespace Umbraco.Web.Trees
 {
+    // fixme move
+    [Flags]
+    public enum TreeUse
+    {
+        None = 0,
+        Main = 1,
+        Dialog = 2,
+    }
+
+    public static class TreeUseExtensions
+    {
+        public static bool Has(this TreeUse use, TreeUse uses)
+        {
+            return use == uses;
+        }
+
+        public static bool HasAny(this TreeUse use, TreeUse uses)
+        {
+            return (use & uses) > 0;
+        }
+    }
+
     /// <summary>
     /// Identifies a section tree.
     /// </summary>
@@ -37,6 +59,11 @@ public TreeAttribute(string sectionAlias, string treeAlias)
         /// </summary>
         public string TreeGroup { get; set; }
 
+        /// <summary>
+        /// Gets the usage of the tree.
+        /// </summary>
+        public TreeUse TreeUse { get; set; } = TreeUse.Main;
+
         /// <summary>
         /// Gets or sets the tree icon when closed.
         /// </summary>
diff --git a/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs b/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
index ad2a99a6c70d..438971ac41d8 100644
--- a/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
+++ b/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
@@ -34,7 +34,7 @@ public void AddTreeController(Type controllerType)
 
             var attribute = controllerType.GetCustomAttribute<TreeAttribute>(false);
             if (attribute == null) return; // todo - shouldn't we throw or at least log?
-            var tree = new Tree(attribute.SortOrder, attribute.SectionAlias, attribute.TreeGroup, attribute.TreeAlias, attribute.TreeTitle, controllerType, attribute.IsSingleNodeTree);
+            var tree = new Tree(attribute.SortOrder, attribute.SectionAlias, attribute.TreeGroup, attribute.TreeAlias, attribute.TreeTitle, attribute.TreeUse, controllerType, attribute.IsSingleNodeTree);
             _trees.Add(tree);
         }
 
diff --git a/src/Umbraco.Web/Trees/TreeController.cs b/src/Umbraco.Web/Trees/TreeController.cs
index bc9345eb1d47..e6d948e19a3d 100644
--- a/src/Umbraco.Web/Trees/TreeController.cs
+++ b/src/Umbraco.Web/Trees/TreeController.cs
@@ -41,6 +41,9 @@ protected TreeController()
         /// <inheritdoc />
         public override string TreeTitle => _treeAttribute.TreeTitle;
 
+        /// <inheritdoc />
+        public override TreeUse TreeUse => _treeAttribute.TreeUse;
+
         /// <inheritdoc />
         public override string SectionAlias => _treeAttribute.SectionAlias;
 
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index e2e9c21c660c..12cf423c7d49 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -68,6 +68,9 @@ protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbr
         /// <inheritdoc />
         public abstract string TreeTitle { get; }
 
+        /// <inheritdoc />
+        public abstract TreeUse TreeUse { get; }
+
         /// <inheritdoc />
         public abstract string SectionAlias { get; }
 
diff --git a/src/Umbraco.Web/WebApi/HttpControllerContextExtensions.cs b/src/Umbraco.Web/WebApi/HttpControllerContextExtensions.cs
index fee1f25adae3..323e52eb3687 100644
--- a/src/Umbraco.Web/WebApi/HttpControllerContextExtensions.cs
+++ b/src/Umbraco.Web/WebApi/HttpControllerContextExtensions.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using System.Runtime.Remoting.Contexts;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web.Http;
@@ -15,52 +13,42 @@ namespace Umbraco.Web.WebApi
     internal static class HttpControllerContextExtensions
     {
         /// <summary>
-        /// This method will go an execute the authorization filters for the controller action, if any fail
-        /// it will return their response, otherwise we'll return null.
+        /// Invokes the authorization filters for the controller action.
         /// </summary>
-        /// <param name="controllerContext"></param>
+        /// <returns>The response of the first filter returning a result, if any, otherwise null (authorized).</returns>
         internal static async Task<HttpResponseMessage> InvokeAuthorizationFiltersForRequest(this HttpControllerContext controllerContext)
         {
             var controllerDescriptor = controllerContext.ControllerDescriptor;
             var controllerServices = controllerDescriptor.Configuration.Services;
             var actionDescriptor = controllerServices.GetActionSelector().SelectAction(controllerContext);
-            var actionContext = new HttpActionContext(controllerContext, actionDescriptor);
+
             var filters = actionDescriptor.GetFilterPipeline();
             var filterGrouping = new FilterGrouping(filters);
-            var actionFilters = filterGrouping.ActionFilters;
-            // Because the continuation gets built from the inside out we need to reverse the filter list
+
+            // because the continuation gets built from the inside out we need to reverse the filter list
             // so that least specific filters (Global) get run first and the most specific filters (Action) get run last.
-            var authorizationFilters = filterGrouping.AuthorizationFilters.Reverse().ToArray();
+            var authorizationFilters = filterGrouping.AuthorizationFilters.Reverse().ToList();
+
+            if (authorizationFilters.Count == 0)
+                return null;
 
-            if (authorizationFilters.Any())
-            {
-                var cancelToken = new CancellationToken();
-                var filterResult = await FilterContinuation(actionContext, cancelToken, authorizationFilters, 0);
-                if (filterResult != null)
-                {
-                    //this means that the authorization filter has returned a result - unauthorized so we cannot continue
-                    return filterResult;
-                }
-            }
-            return null;
+            // if the authorization filter returns a result, it means it failed to authorize
+            var actionContext = new HttpActionContext(controllerContext, actionDescriptor);
+            return await ExecuteAuthorizationFiltersAsync(actionContext, CancellationToken.None, authorizationFilters);
         }
 
         /// <summary>
-        /// This method is how you execute a chain of filters, it needs to recursively call in to itself as the continuation for the next filter in the chain
+        /// Executes a chain of filters.
         /// </summary>
-        /// <param name="actionContext"></param>
-        /// <param name="token"></param>
-        /// <param name="filters"></param>
-        /// <param name="index"></param>
-        /// <returns></returns>
-        private static async Task<HttpResponseMessage> FilterContinuation(HttpActionContext actionContext, CancellationToken token, IList<IAuthorizationFilter> filters, int index)
+        /// <remarks>
+        /// Recursively calls in to itself as its continuation for the next filter in the chain.
+        /// </remarks>
+        private static async Task<HttpResponseMessage> ExecuteAuthorizationFiltersAsync(HttpActionContext actionContext, CancellationToken token, IList<IAuthorizationFilter> filters, int index = 0)
         {
             return await filters[index].ExecuteAuthorizationFilterAsync(actionContext, token,
-                () => (index + 1) == filters.Count
+                () => ++index == filters.Count
                     ? Task.FromResult<HttpResponseMessage>(null)
-                    : FilterContinuation(actionContext, token, filters, ++index));
+                    : ExecuteAuthorizationFiltersAsync(actionContext, token, filters, index));
         }
-
-
     }
 }

From 5f80faa7256534390c0c60241871c6a6ee21e1e9 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 25 Jan 2019 09:52:18 +0100
Subject: [PATCH 050/421] Review fix suggestions for dashboards.

---
 src/Umbraco.Core/Dashboards/IAccessRule.cs    |   5 +-
 .../Dashboards/IDashboardSection.cs           |  12 +-
 ...gnoreDataMemberWhenSerializingAttribute.cs |  15 +
 src/Umbraco.Core/Manifest/ManifestParser.cs   | 374 +++++++++---------
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 .../Dashboards/ContentDashboard.cs            |  23 +-
 .../Dashboards/DashboardCollectionBuilder.cs  |  30 +-
 .../Dashboards/ExamineDashboard.cs            |   9 +-
 src/Umbraco.Web/Dashboards/FormsDashboard.cs  |   9 +-
 .../Dashboards/HealthCheckDashboard.cs        |   9 +-
 src/Umbraco.Web/Dashboards/MediaDashboard.cs  |   9 +-
 .../Dashboards/MembersDashboard.cs            |   9 +-
 .../Dashboards/ModelsBuilderDashboard.cs      |   9 +-
 .../Dashboards/PublishedStatusDashboard.cs    |   9 +-
 .../Dashboards/RedirectUrlDashboard.cs        |   9 +-
 .../Dashboards/SettingsDashboards.cs          |   9 +-
 .../Editors/DashboardController.cs            |   2 +
 src/Umbraco.Web/Services/DashboardService.cs  |  19 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 ...taMemberWhenSerializingContractResolver.cs |  31 ++
 .../WebApi/JsonCamelCaseFormatter.cs          |   3 +-
 21 files changed, 310 insertions(+), 287 deletions(-)
 create mode 100644 src/Umbraco.Core/Manifest/IgnoreDataMemberWhenSerializingAttribute.cs
 create mode 100644 src/Umbraco.Web/WebApi/CamelCaseAndDataMemberWhenSerializingContractResolver.cs

diff --git a/src/Umbraco.Core/Dashboards/IAccessRule.cs b/src/Umbraco.Core/Dashboards/IAccessRule.cs
index f44a846248fb..e3ac5833794d 100644
--- a/src/Umbraco.Core/Dashboards/IAccessRule.cs
+++ b/src/Umbraco.Core/Dashboards/IAccessRule.cs
@@ -1,4 +1,7 @@
-namespace Umbraco.Core.Dashboards
+using Newtonsoft.Json;
+using Umbraco.Core.Manifest;
+
+namespace Umbraco.Core.Dashboards
 {
     /// <summary>
     /// Represents an access rule.
diff --git a/src/Umbraco.Core/Dashboards/IDashboardSection.cs b/src/Umbraco.Core/Dashboards/IDashboardSection.cs
index 90d351bcd2f7..7b5963c9f54e 100644
--- a/src/Umbraco.Core/Dashboards/IDashboardSection.cs
+++ b/src/Umbraco.Core/Dashboards/IDashboardSection.cs
@@ -1,30 +1,40 @@
-namespace Umbraco.Core.Dashboards
+using System.Runtime.Serialization;
+using Umbraco.Core.Manifest;
+
+namespace Umbraco.Core.Dashboards
 {
     public interface IDashboardSection
     {
         /// <summary>
         /// Display name of the dashboard tab
         /// </summary>
+        [DataMember(Name="name")]
         string Name { get; }
 
         /// <summary>
         /// Alias to refer to this dashboard via code
         /// </summary>
+        [DataMember(Name = "alias")]
         string Alias { get; }
 
         /// <summary>
         /// A collection of sections/application aliases that this dashboard will appear on
         /// </summary>
+        [DataMember(Name = "sections")]
+        [IgnoreDataMemberWhenSerializing]
         string[] Sections { get; }
 
         /// <summary>
         /// The HTML view to load for the dashboard
         /// </summary>
+        [DataMember(Name = "view")]
         string View { get; }
 
         /// <summary>
         /// Dashboards can be shown/hidden based on access rights
         /// </summary>
+        [DataMember(Name = "access")]
+        [IgnoreDataMemberWhenSerializing]
         IAccessRule[] AccessRules { get; }
     }
 }
diff --git a/src/Umbraco.Core/Manifest/IgnoreDataMemberWhenSerializingAttribute.cs b/src/Umbraco.Core/Manifest/IgnoreDataMemberWhenSerializingAttribute.cs
new file mode 100644
index 000000000000..8486e1b6a990
--- /dev/null
+++ b/src/Umbraco.Core/Manifest/IgnoreDataMemberWhenSerializingAttribute.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Manifest
+{
+    /// <summary>
+    /// When applied to the member of a type, specifies that the member is not part of a data contract when
+    /// serialized but still when deserialized as opposite to <see cref="IgnoreDataMemberAttribute"/>.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+    public class IgnoreDataMemberWhenSerializingAttribute : Attribute
+    {
+
+    }
+}
diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs
index 01bc0b1983c4..674449c4f086 100644
--- a/src/Umbraco.Core/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/ManifestParser.cs
@@ -1,184 +1,190 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.ContentEditing;
-using Umbraco.Core.Models.Trees;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Core.Manifest
-{
-    /// <summary>
-    /// Parses the Main.js file and replaces all tokens accordingly.
-    /// </summary>
-    public class ManifestParser
-    {
-        private static readonly string Utf8Preamble = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
-
-        private readonly IAppPolicyCache _cache;
-        private readonly ILogger _logger;
-        private readonly ManifestValueValidatorCollection _validators;
-
-        private string _path;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ManifestParser"/> class.
-        /// </summary>
-        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ILogger logger)
-            : this(appCaches, validators, "~/App_Plugins", logger)
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ManifestParser"/> class.
-        /// </summary>
-        private ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, string path, ILogger logger)
-        {
-            if (appCaches == null) throw new ArgumentNullException(nameof(appCaches));
-            _cache = appCaches.RuntimeCache;
-            _validators = validators ?? throw new ArgumentNullException(nameof(validators));
-            if (string.IsNullOrWhiteSpace(path)) throw new ArgumentNullOrEmptyException(nameof(path));
-            Path = path;
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
-        public string Path
-        {
-            get => _path;
-            set => _path = value.StartsWith("~/") ? IOHelper.MapPath(value) : value;
-        }
-
-        /// <summary>
-        /// Gets all manifests, merged into a single manifest object.
-        /// </summary>
-        /// <returns></returns>
-        public PackageManifest Manifest
-            => _cache.GetCacheItem<PackageManifest>("Umbraco.Core.Manifest.ManifestParser::Manifests", () =>
-            {
-                var manifests = GetManifests();
-                return MergeManifests(manifests);
-            }, new TimeSpan(0, 4, 0));
-
-        /// <summary>
-        /// Gets all manifests.
-        /// </summary>
-        private IEnumerable<PackageManifest> GetManifests()
-        {
-            var manifests = new List<PackageManifest>();
-
-            foreach (var path in GetManifestFiles())
-            {
-                try
-                {
-                    var text = File.ReadAllText(path);
-                    text = TrimPreamble(text);
-                    if (string.IsNullOrWhiteSpace(text))
-                        continue;
-                    var manifest = ParseManifest(text);
-                    manifests.Add(manifest);
-                }
-                catch (Exception e)
-                {
-                    _logger.Error<ManifestParser>(e, "Failed to parse manifest at '{Path}', ignoring.", path);
-                }
-            }
-
-            return manifests;
-        }
-
-        /// <summary>
-        /// Merges all manifests into one.
-        /// </summary>
-        private static PackageManifest MergeManifests(IEnumerable<PackageManifest> manifests)
-        {
-            var scripts = new HashSet<string>();
-            var stylesheets = new HashSet<string>();
-            var propertyEditors = new List<IDataEditor>();
-            var parameterEditors = new List<IDataEditor>();
-            var gridEditors = new List<GridEditor>();
-            var contentApps = new List<ManifestContentAppDefinition>();
-            var dashboards = new List<ManifestDashboardDefinition>();
-            var sections = new List<ManifestBackOfficeSection>();
-
-            foreach (var manifest in manifests)
-            {
-                if (manifest.Scripts != null) foreach (var script in manifest.Scripts) scripts.Add(script);
-                if (manifest.Stylesheets != null) foreach (var stylesheet in manifest.Stylesheets) stylesheets.Add(stylesheet);
-                if (manifest.PropertyEditors != null) propertyEditors.AddRange(manifest.PropertyEditors);
-                if (manifest.ParameterEditors != null) parameterEditors.AddRange(manifest.ParameterEditors);
-                if (manifest.GridEditors != null) gridEditors.AddRange(manifest.GridEditors);
-                if (manifest.ContentApps != null) contentApps.AddRange(manifest.ContentApps);
-                if (manifest.Dashboards != null) dashboards.AddRange(manifest.Dashboards);
-                if (manifest.Sections != null) sections.AddRange(manifest.Sections.DistinctBy(x => x.Alias.ToLowerInvariant()));
-            }
-
-            return new PackageManifest
-            {
-                Scripts = scripts.ToArray(),
-                Stylesheets = stylesheets.ToArray(),
-                PropertyEditors = propertyEditors.ToArray(),
-                ParameterEditors = parameterEditors.ToArray(),
-                GridEditors = gridEditors.ToArray(),
-                ContentApps = contentApps.ToArray(),
-                Dashboards = dashboards.ToArray(),
-                Sections = sections.ToArray()
-            };
-        }
-
-        // gets all manifest files (recursively)
-        private IEnumerable<string> GetManifestFiles()
-        {
-            if (Directory.Exists(_path) == false)
-                return new string[0];
-            return Directory.GetFiles(_path, "package.manifest", SearchOption.AllDirectories);
-        }
-
-        private static string TrimPreamble(string text)
-        {
-            // strangely StartsWith(preamble) would always return true
-            if (text.Substring(0, 1) == Utf8Preamble)
-                text = text.Remove(0, Utf8Preamble.Length);
-
-            return text;
-        }
-
-        /// <summary>
-        /// Parses a manifest.
-        /// </summary>
-        internal PackageManifest ParseManifest(string text)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-                throw new ArgumentNullOrEmptyException(nameof(text));
-
-            var manifest = JsonConvert.DeserializeObject<PackageManifest>(text,
-                new DataEditorConverter(_logger),
-                new ValueValidatorConverter(_validators),
-                new DashboardAccessRuleConverter());
-
-            // scripts and stylesheets are raw string, must process here
-            for (var i = 0; i < manifest.Scripts.Length; i++)
-                manifest.Scripts[i] = IOHelper.ResolveVirtualUrl(manifest.Scripts[i]);
-            for (var i = 0; i < manifest.Stylesheets.Length; i++)
-                manifest.Stylesheets[i] = IOHelper.ResolveVirtualUrl(manifest.Stylesheets[i]);
-
-            // add property editors that are also parameter editors, to the parameter editors list
-            // (the manifest format is kinda legacy)
-            var ppEditors = manifest.PropertyEditors.Where(x => (x.Type & EditorType.MacroParameter) > 0).ToList();
-            if (ppEditors.Count > 0)
-                manifest.ParameterEditors = manifest.ParameterEditors.Union(ppEditors).ToArray();
-
-            return manifest;
-        }
-
-        // purely for tests
-        internal IEnumerable<GridEditor> ParseGridEditors(string text)
-        {
-            return JsonConvert.DeserializeObject<IEnumerable<GridEditor>>(text);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.ContentEditing;
+using Umbraco.Core.Models.Trees;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Manifest
+{
+    /// <summary>
+    /// Parses the Main.js file and replaces all tokens accordingly.
+    /// </summary>
+    public class ManifestParser
+    {
+        private static readonly string Utf8Preamble = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
+
+        private readonly IAppPolicyCache _cache;
+        private readonly ILogger _logger;
+        private readonly ManifestValueValidatorCollection _validators;
+
+        private string _path;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ManifestParser"/> class.
+        /// </summary>
+        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ILogger logger)
+            : this(appCaches, validators, "~/App_Plugins", logger)
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ManifestParser"/> class.
+        /// </summary>
+        private ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, string path, ILogger logger)
+        {
+            if (appCaches == null) throw new ArgumentNullException(nameof(appCaches));
+            _cache = appCaches.RuntimeCache;
+            _validators = validators ?? throw new ArgumentNullException(nameof(validators));
+            if (string.IsNullOrWhiteSpace(path)) throw new ArgumentNullOrEmptyException(nameof(path));
+            Path = path;
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public string Path
+        {
+            get => _path;
+            set => _path = value.StartsWith("~/") ? IOHelper.MapPath(value) : value;
+        }
+
+        /// <summary>
+        /// Gets all manifests, merged into a single manifest object.
+        /// </summary>
+        /// <returns></returns>
+        public PackageManifest Manifest
+            => _cache.GetCacheItem<PackageManifest>("Umbraco.Core.Manifest.ManifestParser::Manifests", () =>
+            {
+                var manifests = GetManifests();
+                return MergeManifests(manifests);
+            }, new TimeSpan(0, 4, 0));
+
+        /// <summary>
+        /// Gets all manifests.
+        /// </summary>
+        private IEnumerable<PackageManifest> GetManifests()
+        {
+            var manifests = new List<PackageManifest>();
+
+            foreach (var path in GetManifestFiles())
+            {
+                try
+                {
+                    var text = File.ReadAllText(path);
+                    text = TrimPreamble(text);
+                    if (string.IsNullOrWhiteSpace(text))
+                        continue;
+                    var manifest = ParseManifest(text);
+                    manifests.Add(manifest);
+                }
+                catch (Exception e)
+                {
+                    _logger.Error<ManifestParser>(e, "Failed to parse manifest at '{Path}', ignoring.", path);
+                }
+            }
+
+            return manifests;
+        }
+
+        /// <summary>
+        /// Merges all manifests into one.
+        /// </summary>
+        private static PackageManifest MergeManifests(IEnumerable<PackageManifest> manifests)
+        {
+            var scripts = new HashSet<string>();
+            var stylesheets = new HashSet<string>();
+            var propertyEditors = new List<IDataEditor>();
+            var parameterEditors = new List<IDataEditor>();
+            var gridEditors = new List<GridEditor>();
+            var contentApps = new List<ManifestContentAppDefinition>();
+            var dashboards = new List<ManifestDashboardDefinition>();
+            var sections = new List<ManifestBackOfficeSection>();
+
+            foreach (var manifest in manifests)
+            {
+                if (manifest.Scripts != null) foreach (var script in manifest.Scripts) scripts.Add(script);
+                if (manifest.Stylesheets != null) foreach (var stylesheet in manifest.Stylesheets) stylesheets.Add(stylesheet);
+                if (manifest.PropertyEditors != null) propertyEditors.AddRange(manifest.PropertyEditors);
+                if (manifest.ParameterEditors != null) parameterEditors.AddRange(manifest.ParameterEditors);
+                if (manifest.GridEditors != null) gridEditors.AddRange(manifest.GridEditors);
+                if (manifest.ContentApps != null) contentApps.AddRange(manifest.ContentApps);
+                if (manifest.Dashboards != null) dashboards.AddRange(manifest.Dashboards);
+                if (manifest.Sections != null) sections.AddRange(manifest.Sections.DistinctBy(x => x.Alias.ToLowerInvariant()));
+            }
+
+            return new PackageManifest
+            {
+                Scripts = scripts.ToArray(),
+                Stylesheets = stylesheets.ToArray(),
+                PropertyEditors = propertyEditors.ToArray(),
+                ParameterEditors = parameterEditors.ToArray(),
+                GridEditors = gridEditors.ToArray(),
+                ContentApps = contentApps.ToArray(),
+                Dashboards = dashboards.ToArray(),
+                Sections = sections.ToArray()
+            };
+        }
+
+        // gets all manifest files (recursively)
+        private IEnumerable<string> GetManifestFiles()
+        {
+            if (Directory.Exists(_path) == false)
+                return new string[0];
+            return Directory.GetFiles(_path, "package.manifest", SearchOption.AllDirectories);
+        }
+
+        private static string TrimPreamble(string text)
+        {
+            // strangely StartsWith(preamble) would always return true
+            if (text.Substring(0, 1) == Utf8Preamble)
+                text = text.Remove(0, Utf8Preamble.Length);
+
+            return text;
+        }
+
+        /// <summary>
+        /// Parses a manifest.
+        /// </summary>
+        internal PackageManifest ParseManifest(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+                throw new ArgumentNullOrEmptyException(nameof(text));
+
+            var manifest = JsonConvert.DeserializeObject<PackageManifest>(text, new JsonSerializerSettings()
+            {
+                Converters = new JsonConverter[]
+                {
+                    new DataEditorConverter(_logger),
+                    new ValueValidatorConverter(_validators),
+                    new DashboardAccessRuleConverter()
+                },
+            }
+             );
+
+            // scripts and stylesheets are raw string, must process here
+            for (var i = 0; i < manifest.Scripts.Length; i++)
+                manifest.Scripts[i] = IOHelper.ResolveVirtualUrl(manifest.Scripts[i]);
+            for (var i = 0; i < manifest.Stylesheets.Length; i++)
+                manifest.Stylesheets[i] = IOHelper.ResolveVirtualUrl(manifest.Stylesheets[i]);
+
+            // add property editors that are also parameter editors, to the parameter editors list
+            // (the manifest format is kinda legacy)
+            var ppEditors = manifest.PropertyEditors.Where(x => (x.Type & EditorType.MacroParameter) > 0).ToList();
+            if (ppEditors.Count > 0)
+                manifest.ParameterEditors = manifest.ParameterEditors.Union(ppEditors).ToArray();
+
+            return manifest;
+        }
+
+        // purely for tests
+        internal IEnumerable<GridEditor> ParseGridEditors(string text)
+        {
+            return JsonConvert.DeserializeObject<IEnumerable<GridEditor>>(text);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1f6141d834ea..ebd0e2735b02 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -354,6 +354,7 @@
     <Compile Include="Logging\Viewer\MessageTemplateFilter.cs" />
     <Compile Include="Logging\Viewer\SavedLogSearch.cs" />
     <Compile Include="Manifest\DashboardAccessRuleConverter.cs" />
+    <Compile Include="Manifest\IgnoreDataMemberWhenSerializingAttribute.cs" />
     <Compile Include="Manifest\ManifestBackOfficeSection.cs" />
     <Compile Include="Manifest\ManifestContentAppDefinition.cs" />
     <Compile Include="Manifest\ManifestContentAppFactory.cs" />
diff --git a/src/Umbraco.Web/Dashboards/ContentDashboard.cs b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
index c184e593aace..6a41b07c2cd9 100644
--- a/src/Umbraco.Web/Dashboards/ContentDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
@@ -1,37 +1,30 @@
-using System.Collections.Generic;
-using System.Runtime.Serialization;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    //[HideFromTypeFinder]
-    [DataContract]
     public class ContentDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Get Started";
 
-        [DataMember(Name = "alias")]
         public string Alias => "contentIntro";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "content" };
+        public string[] Sections => new [] { "content" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/default/startupdashboardintro.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules
         {
             get
             {
-                //TODO: WB Not convinced these rules work correctly?!
-                var rules = new List<IAccessRule>();
-                rules.Add(new AccessRule { Type = AccessRuleType.Deny, Value = "translator" });
-                rules.Add(new AccessRule { Type = AccessRuleType.Grant, Value = "admin" });
-                return rules.ToArray();
+                var rules = new IAccessRule[]
+                {
+                    new AccessRule {Type = AccessRuleType.Deny, Value = Constants.Security.TranslatorGroupAlias},
+                    new AccessRule {Type = AccessRuleType.Grant, Value = Constants.Security.AdminGroupAlias}
+                };
+                return rules;
             }
         }
     }
diff --git a/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs b/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
index d4a89a61b2a6..336625c415e5 100644
--- a/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
+++ b/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Dashboards
 {
     public class DashboardCollectionBuilder : WeightedCollectionBuilderBase<DashboardCollectionBuilder, DashboardCollection, IDashboardSection>
     {
-        protected override DashboardCollectionBuilder This => this;        
+        protected override DashboardCollectionBuilder This => this;
 
         protected override IEnumerable<IDashboardSection> CreateItems(IFactory factory)
         {
@@ -17,8 +17,32 @@ protected override IEnumerable<IDashboardSection> CreateItems(IFactory factory)
             // its dependencies too, and that can create cycles or other oddities
             var manifestParser = factory.GetInstance<ManifestParser>();
 
-            //TODO WB: We will need to re-sort items from package manifest with the C# Types
-            return base.CreateItems(factory).Concat(manifestParser.Manifest.Dashboards);
+            var dashboardSections = Merge(base.CreateItems(factory).ToArray(), manifestParser.Manifest.Dashboards);
+
+            return dashboardSections;
+        }
+
+        private IEnumerable<IDashboardSection> Merge(IReadOnlyList<IDashboardSection> dashboardsFromCode, IReadOnlyList<ManifestDashboardDefinition> dashboardFromManifest)
+        {
+            var list = dashboardsFromCode.Concat(dashboardFromManifest)
+                .Where(x=>!string.IsNullOrEmpty(x.Alias))
+                .Select(x => (Weight: GetWeight(x), DashboardSection: x))
+                .OrderBy(x=>x.Weight);
+
+            return list.Select(x => x.DashboardSection);
+        }
+
+        private static int GetWeight(IDashboardSection dashboardSection)
+        {
+            switch (dashboardSection)
+            {
+                case ManifestDashboardDefinition danifestDashboardDefinition:
+                    return danifestDashboardDefinition.Weight;
+                default:
+                    var weightAttribute = dashboardSection.GetType().GetCustomAttributes(typeof(WeightAttribute), false)
+                        .Cast<WeightAttribute>().FirstOrDefault();
+                    return weightAttribute.Weight;
+            }
         }
     }
 }
diff --git a/src/Umbraco.Web/Dashboards/ExamineDashboard.cs b/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
index 5f04a4b78d55..e686545b51c6 100644
--- a/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(20)]
-    [DataContract]
     public class ExamineDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Examine Management";
 
-        [DataMember(Name = "alias")]
         public string Alias => "settingsExamine";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "settings" };
+        public string[] Sections => new [] { "settings" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/settings/examinemanagement.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 
diff --git a/src/Umbraco.Web/Dashboards/FormsDashboard.cs b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
index c9e8e06b7dd5..3592c88d131b 100644
--- a/src/Umbraco.Web/Dashboards/FormsDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    [DataContract]
     public class FormsDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Install Umbraco Forms";
 
-        [DataMember(Name = "alias")]
         public string Alias => "formsInstall";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "forms" };
+        public string[] Sections => new [] { "forms" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/forms/formsdashboardintro.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 }
diff --git a/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs b/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
index 808dc099e8ea..b7373a6d44c9 100644
--- a/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(50)]
-    [DataContract]
     public class HealthCheckDashboard : IDashboardSection
     {
-        [DataMember(Name="name")]
         public string Name => "Health Check";
 
-        [DataMember(Name = "alias")]
         public string Alias => "settingsHealthCheck";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "settings" };
+        public string[] Sections => new [] { "settings" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/settings/healthcheck.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 
diff --git a/src/Umbraco.Web/Dashboards/MediaDashboard.cs b/src/Umbraco.Web/Dashboards/MediaDashboard.cs
index c122ba1f7fde..c72046388ef2 100644
--- a/src/Umbraco.Web/Dashboards/MediaDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/MediaDashboard.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    [DataContract]
     public class MediaDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Content";
 
-        [DataMember(Name = "alias")]
         public string Alias => "mediaFolderBrowser";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "media" };
+        public string[] Sections => new [] { "media" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/media/mediafolderbrowser.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 }
diff --git a/src/Umbraco.Web/Dashboards/MembersDashboard.cs b/src/Umbraco.Web/Dashboards/MembersDashboard.cs
index 9da6f591081f..44aa6c4de622 100644
--- a/src/Umbraco.Web/Dashboards/MembersDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/MembersDashboard.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    [DataContract]
     public class MembersDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Get Started";
 
-        [DataMember(Name = "alias")]
         public string Alias => "memberIntro";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "member" };
+        public string[] Sections => new [] { "member" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/members/membersdashboardvideos.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 }
diff --git a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
index f25a9f7ea0e0..431e12984023 100644
--- a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(40)]
-    [DataContract]
     public class ModelsBuilderDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Models Builder";
 
-        [DataMember(Name = "alias")]
         public string Alias => "settingsModelsBuilder";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "settings" };
+        public string[] Sections => new [] { "settings" };
 
-        [DataMember(Name = "view")]
         public string View => "/App_Plugins/ModelsBuilder/modelsbuilder.htm";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 
diff --git a/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs b/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
index d2fa5b217ba2..5feca943249d 100644
--- a/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(30)]
-    [DataContract]
     public class PublishedStatusDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Published Status";
 
-        [DataMember(Name = "alias")]
         public string Alias => "settingsPublishedStatus";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "settings" };
+        public string[] Sections => new [] { "settings" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/settings/publishedstatus.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 
diff --git a/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs b/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
index 731d259d3958..748db64658a8 100644
--- a/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(20)]
-    [DataContract]
     public class RedirectUrlDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Redirect URL Management";
 
-        [DataMember(Name = "alias")]
         public string Alias => "contentRedirectManager";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "content" };
+        public string[] Sections => new [] { "content" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/content/redirecturls.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 }
diff --git a/src/Umbraco.Web/Dashboards/SettingsDashboards.cs b/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
index 47c172307567..b5ab56c31943 100644
--- a/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
+++ b/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
@@ -1,27 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    [DataContract]
     public class SettingsDashboard : IDashboardSection
     {
-        [DataMember(Name = "name")]
         public string Name => "Welcome";
 
-        [DataMember(Name = "alias")]
         public string Alias => "settingsWelcome";
 
-        [IgnoreDataMember]
-        public string[] Sections => new string[] { "settings" };
+        public string[] Sections => new [] { "settings" };
 
-        [DataMember(Name = "view")]
         public string View => "views/dashboard/settings/settingsdashboardintro.html";
 
-        [IgnoreDataMember]
         public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
     }
 }
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index 11d31a86b400..00635d852fe1 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -27,6 +27,8 @@ namespace Umbraco.Web.Editors
     [AngularJsonOnlyConfiguration]
     [IsBackOffice]
     [WebApi.UmbracoAuthorize]
+    [JsonCamelCaseFormatter]
+
     public class DashboardController : UmbracoApiController
     {
         private readonly IDashboardService _dashboardService;
diff --git a/src/Umbraco.Web/Services/DashboardService.cs b/src/Umbraco.Web/Services/DashboardService.cs
index 9f70f876a38f..89f241252fbf 100644
--- a/src/Umbraco.Web/Services/DashboardService.cs
+++ b/src/Umbraco.Web/Services/DashboardService.cs
@@ -20,7 +20,7 @@ public DashboardService(ISectionService sectionService, DashboardCollection dash
             _dashboardCollection = dashboardCollection ?? throw new ArgumentNullException(nameof(dashboardCollection));
         }
 
-        
+
         /// <inheritdoc />
         public IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser currentUser)
         {
@@ -32,20 +32,19 @@ public IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser c
                 // validate access
                 if (!CheckUserAccessByRules(currentUser, _sectionService, dashboard.AccessRules))
                     continue;
-                
+
                 if (dashboard.View.InvariantEndsWith(".ascx"))
                     throw new NotSupportedException("Legacy UserControl (.ascx) dashboards are no longer supported.");
 
-                var dashboards = new List<IDashboardSection>();
-                dashboards.Add(dashboard);
+                var dashboards = new List<IDashboardSection> {dashboard};
 
-                tabs.Add(new Tab<IDashboardSection>()
+                tabs.Add(new Tab<IDashboardSection>
                 {
                     Id = tabId++,
                     Label = dashboard.Name,
                     Alias = dashboard.Alias,
                     Properties = dashboards
-                });                
+                });
             }
 
             return tabs;
@@ -56,7 +55,7 @@ public IDictionary<string, IEnumerable<Tab<IDashboardSection>>> GetDashboards(IU
         {
             return _sectionService.GetSections().ToDictionary(x => x.Alias, x => GetDashboards(x.Alias, currentUser));
         }
-        
+
         private bool CheckUserAccessByRules(IUser user, ISectionService sectionService, IEnumerable<IAccessRule> rules)
         {
             if (user.Id == Constants.Security.SuperUserId)
@@ -97,7 +96,7 @@ private bool CheckUserAccessByRules(IUser user, ISectionService sectionService,
             }
 
             if (!hasAccess || denyRules.Length == 0)
-                return false;
+                return true;
 
             // check if this item has any deny arguments, if so check if the user is in one of the denied user groups, if so they will
             // be denied to see it no matter what
@@ -110,7 +109,7 @@ private bool CheckUserAccessByRules(IUser user, ISectionService sectionService,
             return hasAccess;
         }
 
-        private (IAccessRule[], IAccessRule[], IAccessRule[]) GroupRules(IEnumerable<IAccessRule> rules)
+        private static (IAccessRule[], IAccessRule[], IAccessRule[]) GroupRules(IEnumerable<IAccessRule> rules)
         {
             IAccessRule[] denyRules = null, grantRules = null, grantBySectionRules = null;
 
@@ -130,7 +129,7 @@ private bool CheckUserAccessByRules(IUser user, ISectionService sectionService,
                         grantBySectionRules = a;
                         break;
                     default:
-                        throw new Exception("panic");
+                        throw new NotSupportedException($"The '{group.Key.ToString()}'-AccessRuleType is not supported.");
                 }
             }
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f81eff75ad8e..c3ff7d47da19 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -262,6 +262,7 @@
     <Compile Include="UI\JavaScript\ClientDependencyConfiguration.cs" />
     <Compile Include="Editors\Binders\BlueprintItemBinder.cs" />
     <Compile Include="UmbracoApplicationBase.cs" />
+    <Compile Include="WebApi\CamelCaseAndDataMemberWhenSerializingContractResolver.cs" />
     <Compile Include="WebApi\HttpActionContextExtensions.cs" />
     <Compile Include="Models\ContentEditing\IContentSave.cs" />
     <Compile Include="WebApi\SerializeVersionAttribute.cs" />
diff --git a/src/Umbraco.Web/WebApi/CamelCaseAndDataMemberWhenSerializingContractResolver.cs b/src/Umbraco.Web/WebApi/CamelCaseAndDataMemberWhenSerializingContractResolver.cs
new file mode 100644
index 000000000000..49ab02a12e28
--- /dev/null
+++ b/src/Umbraco.Web/WebApi/CamelCaseAndDataMemberWhenSerializingContractResolver.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Newtonsoft.Json.Serialization;
+using Umbraco.Core.Manifest;
+
+namespace Umbraco.Web.WebApi
+{
+
+    public class CamelCaseAndDataMemberWhenSerializingContractResolver : CamelCasePropertyNamesContractResolver
+    {
+        /// <inheritdoc/>
+        protected override List<MemberInfo> GetSerializableMembers(Type objectType)
+        {
+            return base.GetSerializableMembers(objectType)
+                .Where(HasNotTheIgnoreDataMemberWhenSerializingAttribute)
+                .ToList();
+        }
+
+        private bool HasNotTheIgnoreDataMemberWhenSerializingAttribute(MemberInfo member)
+        {
+            if (member.GetCustomAttributes(typeof(IgnoreDataMemberWhenSerializingAttribute), true).Any())
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs b/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
index 19683f7f861a..5803afc81986 100644
--- a/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
+++ b/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
@@ -4,6 +4,7 @@
 using System.Web.Http.Controllers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using Umbraco.Core.Manifest;
 
 namespace Umbraco.Web.WebApi
 {
@@ -25,7 +26,7 @@ public void Initialize(HttpControllerSettings controllerSettings, HttpController
             {
                 SerializerSettings =
                 {
-                    ContractResolver = new CamelCasePropertyNamesContractResolver()
+                    ContractResolver = new CamelCaseAndDataMemberWhenSerializingContractResolver() 
                 }
             };
             controllerSettings.Formatters.Add(jsonFormatter);

From 6626edbfa8aab59ce4a090d2982d8796a4b8faef Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 25 Jan 2019 10:04:18 +0100
Subject: [PATCH 051/421] unused using

---
 .../Editors/DashboardController.cs            | 240 ++++++++++--------
 1 file changed, 139 insertions(+), 101 deletions(-)

diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index 00635d852fe1..825ffb7314d3 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -1,144 +1,182 @@
-using System.Collections.Generic;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Mvc;
-using Newtonsoft.Json.Linq;
-using System.Threading.Tasks;
-using System.Net.Http;
-using System.Web.Http;
-using System;
-using System.Net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Text;
+using Newtonsoft.Json;
 using Umbraco.Core.Cache;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Services;
-using Umbraco.Core.Dashboards;
-using Umbraco.Web.Services;
+using Umbraco.Core.PropertyEditors;
 
-namespace Umbraco.Web.Editors
+namespace Umbraco.Core.Manifest
 {
-    //we need to fire up the controller like this to enable loading of remote css directly from this controller
-    [PluginController("UmbracoApi")]
-    [ValidationFilter]
-    [AngularJsonOnlyConfiguration]
-    [IsBackOffice]
-    [WebApi.UmbracoAuthorize]
-    [JsonCamelCaseFormatter]
-
-    public class DashboardController : UmbracoApiController
+    /// <summary>
+    /// Parses the Main.js file and replaces all tokens accordingly.
+    /// </summary>
+    public class ManifestParser
     {
-        private readonly IDashboardService _dashboardService;
+        private static readonly string Utf8Preamble = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
+
+        private readonly IAppPolicyCache _cache;
+        private readonly ILogger _logger;
+        private readonly ManifestValueValidatorCollection _validators;
+
+        private string _path;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DashboardController"/> with auto dependencies.
+        /// Initializes a new instance of the <see cref="ManifestParser"/> class.
         /// </summary>
-        public DashboardController()
+        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ILogger logger)
+            : this(appCaches, validators, "~/App_Plugins", logger)
         { }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DashboardController"/> with all its dependencies.
+        /// Initializes a new instance of the <see cref="ManifestParser"/> class.
         /// </summary>
-        public DashboardController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, IDashboardService dashboardService)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        private ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, string path, ILogger logger)
         {
-            _dashboardService = dashboardService;
+            if (appCaches == null) throw new ArgumentNullException(nameof(appCaches));
+            _cache = appCaches.RuntimeCache;
+            _validators = validators ?? throw new ArgumentNullException(nameof(validators));
+            if (string.IsNullOrWhiteSpace(path)) throw new ArgumentNullOrEmptyException(nameof(path));
+            Path = path;
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
-        //we have just one instance of HttpClient shared for the entire application
-        private static readonly HttpClient HttpClient = new HttpClient();
-
-        //we have baseurl as a param to make previewing easier, so we can test with a dev domain from client side
-        [ValidateAngularAntiForgeryToken]
-        public async Task<JObject> GetRemoteDashboardContent(string section, string baseUrl = "https://dashboard.umbraco.org/")
+        public string Path
         {
-            var user = Security.CurrentUser;
-            var allowedSections = string.Join(",", user.AllowedSections);
-            var language = user.Language;
-            var version = UmbracoVersion.SemanticVersion.ToSemanticString();
-
-            var url = string.Format(baseUrl + "{0}?section={0}&allowed={1}&lang={2}&version={3}", section, allowedSections, language, version);
-            var key = "umbraco-dynamic-dashboard-" + language + allowedSections.Replace(",", "-") + section;
+            get => _path;
+            set => _path = value.StartsWith("~/") ? IOHelper.MapPath(value) : value;
+        }
 
-            var content = AppCaches.RuntimeCache.GetCacheItem<JObject>(key);
-            var result = new JObject();
-            if (content != null)
+        /// <summary>
+        /// Gets all manifests, merged into a single manifest object.
+        /// </summary>
+        /// <returns></returns>
+        public PackageManifest Manifest
+            => _cache.GetCacheItem<PackageManifest>("Umbraco.Core.Manifest.ManifestParser::Manifests", () =>
             {
-                result = content;
-            }
-            else
+                var manifests = GetManifests();
+                return MergeManifests(manifests);
+            }, new TimeSpan(0, 4, 0));
+
+        /// <summary>
+        /// Gets all manifests.
+        /// </summary>
+        private IEnumerable<PackageManifest> GetManifests()
+        {
+            var manifests = new List<PackageManifest>();
+
+            foreach (var path in GetManifestFiles())
             {
-                //content is null, go get it
                 try
                 {
-                    //fetch dashboard json and parse to JObject
-                    var json = await HttpClient.GetStringAsync(url);
-                    content = JObject.Parse(json);
-                    result = content;
-
-                    AppCaches.RuntimeCache.InsertCacheItem<JObject>(key, () => result, new TimeSpan(0, 30, 0));
+                    var text = File.ReadAllText(path);
+                    text = TrimPreamble(text);
+                    if (string.IsNullOrWhiteSpace(text))
+                        continue;
+                    var manifest = ParseManifest(text);
+                    manifests.Add(manifest);
                 }
-                catch (HttpRequestException ex)
+                catch (Exception e)
                 {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard content from {Url}", url);
-
-                    //it's still new JObject() - we return it like this to avoid error codes which triggers UI warnings
-                    AppCaches.RuntimeCache.InsertCacheItem<JObject>(key, () => result, new TimeSpan(0, 5, 0));
+                    _logger.Error<ManifestParser>(e, "Failed to parse manifest at '{Path}', ignoring.", path);
                 }
             }
 
-            return result;
+            return manifests;
         }
 
-        public async Task<HttpResponseMessage> GetRemoteDashboardCss(string section, string baseUrl = "https://dashboard.umbraco.org/")
+        /// <summary>
+        /// Merges all manifests into one.
+        /// </summary>
+        private static PackageManifest MergeManifests(IEnumerable<PackageManifest> manifests)
         {
-            var url = string.Format(baseUrl + "css/dashboard.css?section={0}", section);
-            var key = "umbraco-dynamic-dashboard-css-" + section;
-
-            var content = AppCaches.RuntimeCache.GetCacheItem<string>(key);
-            var result = string.Empty;
-
-            if (content != null)
+            var scripts = new HashSet<string>();
+            var stylesheets = new HashSet<string>();
+            var propertyEditors = new List<IDataEditor>();
+            var parameterEditors = new List<IDataEditor>();
+            var gridEditors = new List<GridEditor>();
+            var contentApps = new List<ManifestContentAppDefinition>();
+            var dashboards = new List<ManifestDashboardDefinition>();
+            var sections = new List<ManifestBackOfficeSection>();
+
+            foreach (var manifest in manifests)
             {
-                result = content;
+                if (manifest.Scripts != null) foreach (var script in manifest.Scripts) scripts.Add(script);
+                if (manifest.Stylesheets != null) foreach (var stylesheet in manifest.Stylesheets) stylesheets.Add(stylesheet);
+                if (manifest.PropertyEditors != null) propertyEditors.AddRange(manifest.PropertyEditors);
+                if (manifest.ParameterEditors != null) parameterEditors.AddRange(manifest.ParameterEditors);
+                if (manifest.GridEditors != null) gridEditors.AddRange(manifest.GridEditors);
+                if (manifest.ContentApps != null) contentApps.AddRange(manifest.ContentApps);
+                if (manifest.Dashboards != null) dashboards.AddRange(manifest.Dashboards);
+                if (manifest.Sections != null) sections.AddRange(manifest.Sections.DistinctBy(x => x.Alias.ToLowerInvariant()));
             }
-            else
+
+            return new PackageManifest
             {
-                //content is null, go get it
-                try
-                {
-                    //fetch remote css
-                    content = await HttpClient.GetStringAsync(url);
+                Scripts = scripts.ToArray(),
+                Stylesheets = stylesheets.ToArray(),
+                PropertyEditors = propertyEditors.ToArray(),
+                ParameterEditors = parameterEditors.ToArray(),
+                GridEditors = gridEditors.ToArray(),
+                ContentApps = contentApps.ToArray(),
+                Dashboards = dashboards.ToArray(),
+                Sections = sections.ToArray()
+            };
+        }
 
-                    //can't use content directly, modified closure problem
-                    result = content;
+        // gets all manifest files (recursively)
+        private IEnumerable<string> GetManifestFiles()
+        {
+            if (Directory.Exists(_path) == false)
+                return new string[0];
+            return Directory.GetFiles(_path, "package.manifest", SearchOption.AllDirectories);
+        }
 
-                    //save server content for 30 mins
-                    AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 30, 0));
-                }
-                catch (HttpRequestException ex)
-                {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard CSS from {Url}", url);
+        private static string TrimPreamble(string text)
+        {
+            // strangely StartsWith(preamble) would always return true
+            if (text.Substring(0, 1) == Utf8Preamble)
+                text = text.Remove(0, Utf8Preamble.Length);
 
-                    //it's still string.Empty - we return it like this to avoid error codes which triggers UI warnings
-                    AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 5, 0));
-                }
-            }
+            return text;
+        }
 
-            return new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent(result, Encoding.UTF8, "text/css")
-            };
+        /// <summary>
+        /// Parses a manifest.
+        /// </summary>
+        internal PackageManifest ParseManifest(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+                throw new ArgumentNullOrEmptyException(nameof(text));
+
+            var manifest = JsonConvert.DeserializeObject<PackageManifest>(text,
+                new DataEditorConverter(_logger),
+                new ValueValidatorConverter(_validators),
+                new DashboardAccessRuleConverter());
+
+            // scripts and stylesheets are raw string, must process here
+            for (var i = 0; i < manifest.Scripts.Length; i++)
+                manifest.Scripts[i] = IOHelper.ResolveVirtualUrl(manifest.Scripts[i]);
+            for (var i = 0; i < manifest.Stylesheets.Length; i++)
+                manifest.Stylesheets[i] = IOHelper.ResolveVirtualUrl(manifest.Stylesheets[i]);
+
+            // add property editors that are also parameter editors, to the parameter editors list
+            // (the manifest format is kinda legacy)
+            var ppEditors = manifest.PropertyEditors.Where(x => (x.Type & EditorType.MacroParameter) > 0).ToList();
+            if (ppEditors.Count > 0)
+                manifest.ParameterEditors = manifest.ParameterEditors.Union(ppEditors).ToArray();
+
+            return manifest;
         }
 
-        [ValidateAngularAntiForgeryToken]
-        [OutgoingEditorModelEvent]
-        public IEnumerable<Tab<IDashboardSection>> GetDashboard(string section)
+        // purely for tests
+        internal IEnumerable<GridEditor> ParseGridEditors(string text)
         {
-            return _dashboardService.GetDashboards(section, Security.CurrentUser);
+            return JsonConvert.DeserializeObject<IEnumerable<GridEditor>>(text);
         }
     }
 }

From 8926e28706333b5c47b098db9e072a073f0e9cfa Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 25 Jan 2019 10:08:52 +0100
Subject: [PATCH 052/421] revert

---
 .../Editors/DashboardController.cs            | 239 ++++++++----------
 1 file changed, 100 insertions(+), 139 deletions(-)

diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index 825ffb7314d3..b166a8b4bf3e 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -1,182 +1,143 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.Collections.Generic;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Mvc;
+using Newtonsoft.Json.Linq;
+using System.Threading.Tasks;
+using System.Net.Http;
+using System;
+using System.Net;
 using System.Text;
-using Newtonsoft.Json;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
 using Umbraco.Core.Logging;
-using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Services;
+using Umbraco.Core.Dashboards;
+using Umbraco.Web.Services;
 
-namespace Umbraco.Core.Manifest
+namespace Umbraco.Web.Editors
 {
-    /// <summary>
-    /// Parses the Main.js file and replaces all tokens accordingly.
-    /// </summary>
-    public class ManifestParser
+    //we need to fire up the controller like this to enable loading of remote css directly from this controller
+    [PluginController("UmbracoApi")]
+    [ValidationFilter]
+    [AngularJsonOnlyConfiguration]
+    [IsBackOffice]
+    [WebApi.UmbracoAuthorize]
+    [JsonCamelCaseFormatter]
+
+    public class DashboardController : UmbracoApiController
     {
-        private static readonly string Utf8Preamble = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
-
-        private readonly IAppPolicyCache _cache;
-        private readonly ILogger _logger;
-        private readonly ManifestValueValidatorCollection _validators;
-
-        private string _path;
+        private readonly IDashboardService _dashboardService;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ManifestParser"/> class.
+        /// Initializes a new instance of the <see cref="DashboardController"/> with auto dependencies.
         /// </summary>
-        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ILogger logger)
-            : this(appCaches, validators, "~/App_Plugins", logger)
+        public DashboardController()
         { }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ManifestParser"/> class.
+        /// Initializes a new instance of the <see cref="DashboardController"/> with all its dependencies.
         /// </summary>
-        private ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, string path, ILogger logger)
-        {
-            if (appCaches == null) throw new ArgumentNullException(nameof(appCaches));
-            _cache = appCaches.RuntimeCache;
-            _validators = validators ?? throw new ArgumentNullException(nameof(validators));
-            if (string.IsNullOrWhiteSpace(path)) throw new ArgumentNullOrEmptyException(nameof(path));
-            Path = path;
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
-        public string Path
+        public DashboardController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, IDashboardService dashboardService)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
         {
-            get => _path;
-            set => _path = value.StartsWith("~/") ? IOHelper.MapPath(value) : value;
+            _dashboardService = dashboardService;
         }
 
-        /// <summary>
-        /// Gets all manifests, merged into a single manifest object.
-        /// </summary>
-        /// <returns></returns>
-        public PackageManifest Manifest
-            => _cache.GetCacheItem<PackageManifest>("Umbraco.Core.Manifest.ManifestParser::Manifests", () =>
-            {
-                var manifests = GetManifests();
-                return MergeManifests(manifests);
-            }, new TimeSpan(0, 4, 0));
+        //we have just one instance of HttpClient shared for the entire application
+        private static readonly HttpClient HttpClient = new HttpClient();
 
-        /// <summary>
-        /// Gets all manifests.
-        /// </summary>
-        private IEnumerable<PackageManifest> GetManifests()
+        //we have baseurl as a param to make previewing easier, so we can test with a dev domain from client side
+        [ValidateAngularAntiForgeryToken]
+        public async Task<JObject> GetRemoteDashboardContent(string section, string baseUrl = "https://dashboard.umbraco.org/")
         {
-            var manifests = new List<PackageManifest>();
+            var user = Security.CurrentUser;
+            var allowedSections = string.Join(",", user.AllowedSections);
+            var language = user.Language;
+            var version = UmbracoVersion.SemanticVersion.ToSemanticString();
 
-            foreach (var path in GetManifestFiles())
+            var url = string.Format(baseUrl + "{0}?section={0}&allowed={1}&lang={2}&version={3}", section, allowedSections, language, version);
+            var key = "umbraco-dynamic-dashboard-" + language + allowedSections.Replace(",", "-") + section;
+
+            var content = AppCaches.RuntimeCache.GetCacheItem<JObject>(key);
+            var result = new JObject();
+            if (content != null)
+            {
+                result = content;
+            }
+            else
             {
+                //content is null, go get it
                 try
                 {
-                    var text = File.ReadAllText(path);
-                    text = TrimPreamble(text);
-                    if (string.IsNullOrWhiteSpace(text))
-                        continue;
-                    var manifest = ParseManifest(text);
-                    manifests.Add(manifest);
+                    //fetch dashboard json and parse to JObject
+                    var json = await HttpClient.GetStringAsync(url);
+                    content = JObject.Parse(json);
+                    result = content;
+
+                    AppCaches.RuntimeCache.InsertCacheItem<JObject>(key, () => result, new TimeSpan(0, 30, 0));
                 }
-                catch (Exception e)
+                catch (HttpRequestException ex)
                 {
-                    _logger.Error<ManifestParser>(e, "Failed to parse manifest at '{Path}', ignoring.", path);
+                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard content from {Url}", url);
+
+                    //it's still new JObject() - we return it like this to avoid error codes which triggers UI warnings
+                    AppCaches.RuntimeCache.InsertCacheItem<JObject>(key, () => result, new TimeSpan(0, 5, 0));
                 }
             }
 
-            return manifests;
+            return result;
         }
 
-        /// <summary>
-        /// Merges all manifests into one.
-        /// </summary>
-        private static PackageManifest MergeManifests(IEnumerable<PackageManifest> manifests)
+        public async Task<HttpResponseMessage> GetRemoteDashboardCss(string section, string baseUrl = "https://dashboard.umbraco.org/")
         {
-            var scripts = new HashSet<string>();
-            var stylesheets = new HashSet<string>();
-            var propertyEditors = new List<IDataEditor>();
-            var parameterEditors = new List<IDataEditor>();
-            var gridEditors = new List<GridEditor>();
-            var contentApps = new List<ManifestContentAppDefinition>();
-            var dashboards = new List<ManifestDashboardDefinition>();
-            var sections = new List<ManifestBackOfficeSection>();
-
-            foreach (var manifest in manifests)
+            var url = string.Format(baseUrl + "css/dashboard.css?section={0}", section);
+            var key = "umbraco-dynamic-dashboard-css-" + section;
+
+            var content = AppCaches.RuntimeCache.GetCacheItem<string>(key);
+            var result = string.Empty;
+
+            if (content != null)
             {
-                if (manifest.Scripts != null) foreach (var script in manifest.Scripts) scripts.Add(script);
-                if (manifest.Stylesheets != null) foreach (var stylesheet in manifest.Stylesheets) stylesheets.Add(stylesheet);
-                if (manifest.PropertyEditors != null) propertyEditors.AddRange(manifest.PropertyEditors);
-                if (manifest.ParameterEditors != null) parameterEditors.AddRange(manifest.ParameterEditors);
-                if (manifest.GridEditors != null) gridEditors.AddRange(manifest.GridEditors);
-                if (manifest.ContentApps != null) contentApps.AddRange(manifest.ContentApps);
-                if (manifest.Dashboards != null) dashboards.AddRange(manifest.Dashboards);
-                if (manifest.Sections != null) sections.AddRange(manifest.Sections.DistinctBy(x => x.Alias.ToLowerInvariant()));
+                result = content;
             }
-
-            return new PackageManifest
+            else
             {
-                Scripts = scripts.ToArray(),
-                Stylesheets = stylesheets.ToArray(),
-                PropertyEditors = propertyEditors.ToArray(),
-                ParameterEditors = parameterEditors.ToArray(),
-                GridEditors = gridEditors.ToArray(),
-                ContentApps = contentApps.ToArray(),
-                Dashboards = dashboards.ToArray(),
-                Sections = sections.ToArray()
-            };
-        }
+                //content is null, go get it
+                try
+                {
+                    //fetch remote css
+                    content = await HttpClient.GetStringAsync(url);
 
-        // gets all manifest files (recursively)
-        private IEnumerable<string> GetManifestFiles()
-        {
-            if (Directory.Exists(_path) == false)
-                return new string[0];
-            return Directory.GetFiles(_path, "package.manifest", SearchOption.AllDirectories);
-        }
+                    //can't use content directly, modified closure problem
+                    result = content;
 
-        private static string TrimPreamble(string text)
-        {
-            // strangely StartsWith(preamble) would always return true
-            if (text.Substring(0, 1) == Utf8Preamble)
-                text = text.Remove(0, Utf8Preamble.Length);
+                    //save server content for 30 mins
+                    AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 30, 0));
+                }
+                catch (HttpRequestException ex)
+                {
+                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard CSS from {Url}", url);
 
-            return text;
-        }
+                    //it's still string.Empty - we return it like this to avoid error codes which triggers UI warnings
+                    AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 5, 0));
+                }
+            }
 
-        /// <summary>
-        /// Parses a manifest.
-        /// </summary>
-        internal PackageManifest ParseManifest(string text)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-                throw new ArgumentNullOrEmptyException(nameof(text));
-
-            var manifest = JsonConvert.DeserializeObject<PackageManifest>(text,
-                new DataEditorConverter(_logger),
-                new ValueValidatorConverter(_validators),
-                new DashboardAccessRuleConverter());
-
-            // scripts and stylesheets are raw string, must process here
-            for (var i = 0; i < manifest.Scripts.Length; i++)
-                manifest.Scripts[i] = IOHelper.ResolveVirtualUrl(manifest.Scripts[i]);
-            for (var i = 0; i < manifest.Stylesheets.Length; i++)
-                manifest.Stylesheets[i] = IOHelper.ResolveVirtualUrl(manifest.Stylesheets[i]);
-
-            // add property editors that are also parameter editors, to the parameter editors list
-            // (the manifest format is kinda legacy)
-            var ppEditors = manifest.PropertyEditors.Where(x => (x.Type & EditorType.MacroParameter) > 0).ToList();
-            if (ppEditors.Count > 0)
-                manifest.ParameterEditors = manifest.ParameterEditors.Union(ppEditors).ToArray();
-
-            return manifest;
+            return new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent(result, Encoding.UTF8, "text/css")
+            };
         }
 
-        // purely for tests
-        internal IEnumerable<GridEditor> ParseGridEditors(string text)
+        [ValidateAngularAntiForgeryToken]
+        [OutgoingEditorModelEvent]
+        public IEnumerable<Tab<IDashboardSection>> GetDashboard(string section)
         {
-            return JsonConvert.DeserializeObject<IEnumerable<GridEditor>>(text);
+            return _dashboardService.GetDashboards(section, Security.CurrentUser);
         }
     }
 }

From 1c55f4ed4fa4ad6b3de48d89d76d1716e0427ede Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 25 Jan 2019 10:09:28 +0100
Subject: [PATCH 053/421] changed correct file

---
 src/Umbraco.Core/Manifest/ManifestParser.cs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs
index 674449c4f086..825ffb7314d3 100644
--- a/src/Umbraco.Core/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/ManifestParser.cs
@@ -8,8 +8,6 @@
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models.ContentEditing;
-using Umbraco.Core.Models.Trees;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Manifest
@@ -155,16 +153,10 @@ internal PackageManifest ParseManifest(string text)
             if (string.IsNullOrWhiteSpace(text))
                 throw new ArgumentNullOrEmptyException(nameof(text));
 
-            var manifest = JsonConvert.DeserializeObject<PackageManifest>(text, new JsonSerializerSettings()
-            {
-                Converters = new JsonConverter[]
-                {
-                    new DataEditorConverter(_logger),
-                    new ValueValidatorConverter(_validators),
-                    new DashboardAccessRuleConverter()
-                },
-            }
-             );
+            var manifest = JsonConvert.DeserializeObject<PackageManifest>(text,
+                new DataEditorConverter(_logger),
+                new ValueValidatorConverter(_validators),
+                new DashboardAccessRuleConverter());
 
             // scripts and stylesheets are raw string, must process here
             for (var i = 0; i < manifest.Scripts.Length; i++)

From bee2776035e5ebd2b1b92574adeca1fbb25712af Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 25 Jan 2019 09:10:49 +0000
Subject: [PATCH 054/421] Bye bye FileSystemProvider.config - we no longer use
 you

---
 .../FileSystemProviderElement.cs              | 67 -------------------
 .../FileSystemProviderElementCollection.cs    | 43 ------------
 .../FileSystemProvidersSection.cs             | 30 ---------
 .../IFileSystemProviderElement.cs             | 11 ---
 .../IFileSystemProvidersSection.cs            |  9 ---
 src/Umbraco.Core/Umbraco.Core.csproj          |  5 --
 .../Configurations/FileSystemProviderTests.cs | 25 -------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 -
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  4 --
 .../config/FileSystemProviders.Release.config | 11 ---
 .../config/FileSystemProviders.config         | 11 ---
 11 files changed, 217 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/FileSystemProviderElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs
 delete mode 100644 src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs
 delete mode 100644 src/Umbraco.Web.UI/config/FileSystemProviders.Release.config
 delete mode 100644 src/Umbraco.Web.UI/config/FileSystemProviders.config

diff --git a/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs b/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs
deleted file mode 100644
index 1085439b9ec5..000000000000
--- a/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.Configuration
-{
-    public class FileSystemProviderElement : ConfigurationElement, IFileSystemProviderElement
-    {
-        private const string ALIAS_KEY = "alias";
-        private const string TYPE_KEY = "type";
-        private const string PARAMETERS_KEY = "Parameters";
-
-        [ConfigurationProperty(ALIAS_KEY, IsKey = true, IsRequired = true)]
-        public string Alias
-        {
-            get
-            {
-                return ((string)(base[ALIAS_KEY]));
-            }
-        }
-
-        [ConfigurationProperty(TYPE_KEY, IsKey = false, IsRequired = true)]
-        public string Type
-        {
-            get
-            {
-                return ((string)(base[TYPE_KEY]));
-            }
-        }
-
-        [ConfigurationProperty(PARAMETERS_KEY, IsDefaultCollection = true, IsRequired = false)]
-        public KeyValueConfigurationCollection Parameters
-        {
-            get
-            {
-                return ((KeyValueConfigurationCollection)(base[PARAMETERS_KEY]));
-            }
-        }
-
-        string IFileSystemProviderElement.Alias
-        {
-            get { return Alias; }
-        }
-
-        string IFileSystemProviderElement.Type
-        {
-            get { return Type; }
-        }
-
-        private IDictionary<string, string> _params;
-        IDictionary<string, string> IFileSystemProviderElement.Parameters
-        {
-            get
-            {
-                if (_params != null) return _params;
-                _params = new Dictionary<string, string>();
-                foreach (KeyValueConfigurationElement element in Parameters)
-                {
-                    _params.Add(element.Key, element.Value);
-                }
-                return _params;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs b/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs
deleted file mode 100644
index 8d1fdb017eea..000000000000
--- a/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.Configuration
-{
-    [ConfigurationCollection(typeof(FileSystemProviderElement), AddItemName = "Provider")]
-    public class FileSystemProviderElementCollection : ConfigurationElementCollection, IEnumerable<IFileSystemProviderElement>
-    {
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new FileSystemProviderElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((FileSystemProviderElement)(element)).Alias;
-        }
-
-        public new FileSystemProviderElement this[string key]
-        {
-            get
-            {
-                return (FileSystemProviderElement)BaseGet(key);
-            }
-        }
-
-        IEnumerator<IFileSystemProviderElement> IEnumerable<IFileSystemProviderElement>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IFileSystemProviderElement;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs b/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs
deleted file mode 100644
index 7c6c552ddd85..000000000000
--- a/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.Configuration
-{
-    public class FileSystemProvidersSection : ConfigurationSection, IFileSystemProvidersSection
-    {
-
-        [ConfigurationProperty("", IsDefaultCollection = true, IsRequired = true)]
-        public FileSystemProviderElementCollection Providers
-        {
-            get { return ((FileSystemProviderElementCollection)(base[""])); }
-        }
-
-        private IDictionary<string, IFileSystemProviderElement> _providers;
-
-        IDictionary<string, IFileSystemProviderElement> IFileSystemProvidersSection.Providers
-        {
-            get
-            {
-                if (_providers != null) return _providers;
-                _providers = Providers.ToDictionary(x => x.Alias, x => x);
-                return _providers;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs b/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs
deleted file mode 100644
index 438e6f2b81e5..000000000000
--- a/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration
-{
-    public interface IFileSystemProviderElement
-    {
-        string Alias { get; }
-        string Type { get; }
-        IDictionary<string, string> Parameters { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs b/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs
deleted file mode 100644
index f87ba383a93b..000000000000
--- a/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration
-{
-    public interface IFileSystemProvidersSection
-    {
-        IDictionary<string, IFileSystemProviderElement> Providers { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1a978650f079..1faa913d75d1 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -231,9 +231,6 @@
     <Compile Include="Configuration\Dashboard\SectionElement.cs" />
     <Compile Include="Configuration\Dashboard\TabCollection.cs" />
     <Compile Include="Configuration\Dashboard\TabElement.cs" />
-    <Compile Include="Configuration\FileSystemProviderElement.cs" />
-    <Compile Include="Configuration\FileSystemProviderElementCollection.cs" />
-    <Compile Include="Configuration\FileSystemProvidersSection.cs" />
     <Compile Include="Configuration\GlobalSettings.cs" />
     <Compile Include="Configuration\GlobalSettingsExtensions.cs" />
     <Compile Include="Configuration\Grid\GridConfig.cs" />
@@ -255,8 +252,6 @@
     <Compile Include="Configuration\HealthChecks\NotificationMethodsElementCollection.cs" />
     <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElement.cs" />
     <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElementCollection.cs" />
-    <Compile Include="Configuration\IFileSystemProviderElement.cs" />
-    <Compile Include="Configuration\IFileSystemProvidersSection.cs" />
     <Compile Include="Configuration\IGlobalSettings.cs" />
     <Compile Include="Configuration\InnerTextConfigurationElement.cs" />
     <Compile Include="Configuration\LocalTempStorage.cs" />
diff --git a/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs b/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs
deleted file mode 100644
index c65980e763bd..000000000000
--- a/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Configuration;
-using System.Linq;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-
-namespace Umbraco.Tests.Configurations
-{
-
-    [TestFixture]
-    public class FileSystemProviderTests
-    {
-        [Test]
-        public void Can_Get_Media_Provider()
-        {
-            var config = (FileSystemProvidersSection)ConfigurationManager.GetSection("umbracoConfiguration/FileSystemProviders");
-            var providerConfig = config.Providers["media"];
-
-            Assert.That(providerConfig, Is.Not.Null);
-            Assert.That(providerConfig.Parameters.AllKeys.Any(), Is.True);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 61d0672d7fb9..0db92db58b09 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -293,7 +293,6 @@
     <Compile Include="Cache\WebCachingAppCacheTests.cs" />
     <Compile Include="Cache\RuntimeAppCacheTests.cs" />
     <Compile Include="Configurations\DashboardSettings\DashboardSettingsTests.cs" />
-    <Compile Include="Configurations\FileSystemProviderTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\LoggingElementDefaultTests.cs" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 045c56764ad7..2b257b4a5146 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -178,9 +178,6 @@
     <Content Include="Config\imageprocessor\cache.config">
       <SubType>Designer</SubType>
     </Content>
-    <None Include="Config\FileSystemProviders.Release.config">
-      <DependentUpon>FileSystemProviders.config</DependentUpon>
-    </None>
     <None Include="Config\EmbeddedMedia.Release.config">
       <DependentUpon>EmbeddedMedia.config</DependentUpon>
     </None>
@@ -314,7 +311,6 @@
     <Content Include="Config\umbracoSettings.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\FileSystemProviders.config" />
     <Content Include="Config\EmbeddedMedia.config" />
     <Content Include="Config\BackOfficeTours\getting-started.json" />
   </ItemGroup>
diff --git a/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config b/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config
deleted file mode 100644
index 1f038f61c5e8..000000000000
--- a/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<FileSystemProviders>
-  
-  <!-- Media -->
-  <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-    <Parameters>
-      <add key="virtualRoot" value="~/media/" />
-    </Parameters>
-  </Provider>
-   
-</FileSystemProviders>
diff --git a/src/Umbraco.Web.UI/config/FileSystemProviders.config b/src/Umbraco.Web.UI/config/FileSystemProviders.config
deleted file mode 100644
index 1f038f61c5e8..000000000000
--- a/src/Umbraco.Web.UI/config/FileSystemProviders.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<FileSystemProviders>
-  
-  <!-- Media -->
-  <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-    <Parameters>
-      <add key="virtualRoot" value="~/media/" />
-    </Parameters>
-  </Provider>
-   
-</FileSystemProviders>

From b88ca1db49a75db2fdb93222d3616c07b589dbd7 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 25 Jan 2019 09:22:02 +0000
Subject: [PATCH 055/421] Remove FIleSystemProviders.config from web.config XML
 files

---
 build/NuSpecs/tools/Web.config.install.xdt |  5 ---
 src/Umbraco.Tests/App.config               | 50 ----------------------
 src/Umbraco.Web.UI/web.Template.config     |  2 -
 3 files changed, 57 deletions(-)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index e3ba6b27dffe..2f6fb8f61c0c 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -2,7 +2,6 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <configSections xdt:Transform="InsertIfMissing" />
   <configSections>
-    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
 
     <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
@@ -11,7 +10,6 @@
     <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
       <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
       <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
       <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
     </sectionGroup>
@@ -27,13 +25,10 @@
 
   <umbracoConfiguration xdt:Transform="InsertIfMissing">
     <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
     <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
     <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
   </umbracoConfiguration>
 
-  <FileSystemProviders xdt:Transform="Remove" />
-
   <system.data xdt:Transform="InsertIfMissing">
     <DbProviderFactories xdt:Transform="InsertIfMissing">
       <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index fdb18c598d13..4c5bb57aa25e 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -1,58 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-
-    <sectionGroup name="umbracoConfiguration">
-      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false"/>
-    </sectionGroup>
-
   </configSections>
 
-  <umbracoConfiguration>
-    <FileSystemProviders>
-      <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="Media\"/>
-          <add key="rootUrl" value="/Media/"/>
-        </Parameters>
-      </Provider>
-      <!-- Macros -->
-      <Provider alias="macros" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="App_Data\Macros"/>
-          <add key="rootUrl" value="/Macros/"/>
-        </Parameters>
-      </Provider>
-      <!-- Scripts -->
-      <Provider alias="scripts" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="scripts\"/>
-          <add key="rootUrl" value="/scripts/"/>
-        </Parameters>
-      </Provider>
-      <!-- Stylesheets -->
-      <Provider alias="stylesheets" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="css\"/>
-          <add key="rootUrl" value="/css/"/>
-        </Parameters>
-      </Provider>
-      <!-- Templates -->
-      <Provider alias="masterpages" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="masterpages\"/>
-          <add key="rootUrl" value="/masterpages/"/>
-        </Parameters>
-      </Provider>
-      <Provider alias="views" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="views\"/>
-          <add key="rootUrl" value="/views/"/>
-        </Parameters>
-      </Provider>
-    </FileSystemProviders>
-  </umbracoConfiguration>
-
   <appSettings>
     <add key="umbracoConfigurationStatus" value="6.0.0"/>
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 2371282a1423..749fa0b500a3 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -13,7 +13,6 @@
 
         <sectionGroup name="umbracoConfiguration">
             <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
-            <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
             <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
             <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" />
         </sectionGroup>
@@ -27,7 +26,6 @@
 
     <umbracoConfiguration>
         <settings configSource="config\umbracoSettings.config" />
-        <FileSystemProviders configSource="config\FileSystemProviders.config" />
         <dashBoard configSource="config\Dashboard.config" />
         <HealthChecks configSource="config\HealthChecks.config" />
     </umbracoConfiguration>

From 15c197abd3398d77a9e195c0c52db1476ad3c9ba Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 25 Jan 2019 11:04:56 +0100
Subject: [PATCH 056/421] public AccessRule.cs, to let third party create
 dashboards from code without having to implement there own

---
 src/Umbraco.Core/Dashboards/AccessRule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Dashboards/AccessRule.cs b/src/Umbraco.Core/Dashboards/AccessRule.cs
index 70f9da8fa90a..4f725e32f0cb 100644
--- a/src/Umbraco.Core/Dashboards/AccessRule.cs
+++ b/src/Umbraco.Core/Dashboards/AccessRule.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// Implements <see cref="IAccessRule"/>.
     /// </summary>
-    internal class AccessRule : IAccessRule
+    public class AccessRule : IAccessRule
     {
         /// <inheritdoc />
         public AccessRuleType Type { get; set; }

From a8e8832a759a2b9dee260e0a08e0da864b4bd3dc Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 25 Jan 2019 10:17:40 +0000
Subject: [PATCH 057/421] Bye bye dashboard.config.install XDT transform as
 part of NuGet install

---
 build/NuSpecs/UmbracoCms.nuspec               |  1 -
 .../tools/Dashboard.config.install.xdt        | 95 -------------------
 src/umbraco.sln                               |  1 -
 3 files changed, 97 deletions(-)
 delete mode 100644 build/NuSpecs/tools/Dashboard.config.install.xdt

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index a188377c19a7..622671dd9dbc 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -53,7 +53,6 @@
         <!-- beware! config transforms not supported by PackageReference -->
         <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
         <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
-        <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
         <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
         <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME Content\ !! and then... transform?! -->
 
diff --git a/build/NuSpecs/tools/Dashboard.config.install.xdt b/build/NuSpecs/tools/Dashboard.config.install.xdt
deleted file mode 100644
index a81af8c365a4..000000000000
--- a/build/NuSpecs/tools/Dashboard.config.install.xdt
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Welcome"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
-      <control panelCaption="" xdt:Transform="InsertIfMissing">
-        views/dashboard/settings/settingsdashboardintro.html
-      </control>
-    </tab>
-  </section>
-
-  <section alias="StartupFormsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <areas>
-      <area>forms</area>
-    </areas>
-    <tab caption="Install Umbraco Forms">
-      <control panelCaption="">
-        views/dashboard/forms/formsdashboardintro.html
-      </control>
-    </tab>
-  </section>
-
-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <areas xdt:Transform="InsertIfMissing">
-      <area xdt:Transform="InsertIfMissing">developer</area>
-    </areas>  
-  </section>
-  
-  <section alias="StartupDeveloperDashboardSection">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
-      <control panelCaption="">
-        views/dashboard/developer/developerdashboardvideos.html
-      </control>
-    </tab>
-    <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-  </section>
-  
-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-	<tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
-      <control>
-        views/dashboard/developer/examinemanagement.html
-      </control>
-    </tab>
-  </section>
-  
-  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
-    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="Replace">
-      <control panelCaption="">
-        views/dashboard/media/mediafolderbrowser.html
-      </control>
-    </tab>
-  </section>
-  
-  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Get Started" xdt:Transform="Insert">
-      <control panelCaption="">
-        views/dashboard/members/membersdashboardvideos.html
-      </control>
-    </tab>
-  </section>
-  
-  <section alias="uGoLiveDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
-  
-  <section alias="ExamineManagement" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
-    
-  <section alias="StartupDashboardSection">
-	<tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-	<tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-  </section>
-
-  <section alias="RedirectUrlManagement" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <areas>
-      <area>content</area>
-    </areas>
-    <tab caption="Redirect URL Management">
-      <control>
-        views/dashboard/developer/redirecturls.html
-      </control>
-    </tab>
-  </section>
-
-  <section alias="UmbracoHealthCheck" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <areas>
-      <area>developer</area>
-    </areas>
-    <tab caption="Health Check">
-      <control>
-        views/dashboard/developer/healthcheck.html
-      </control>
-    </tab>
-  </section>
-</dashBoard>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 0bdcb53d9940..c02a5ba85c2e 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -70,7 +70,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E3F9F378
 	ProjectSection(SolutionItems) = preProject
 		..\build\NuSpecs\tools\applications.config.install.xdt = ..\build\NuSpecs\tools\applications.config.install.xdt
 		..\build\NuSpecs\tools\ClientDependency.config.install.xdt = ..\build\NuSpecs\tools\ClientDependency.config.install.xdt
-		..\build\NuSpecs\tools\Dashboard.config.install.xdt = ..\build\NuSpecs\tools\Dashboard.config.install.xdt
 		..\build\NuSpecs\tools\install.core.ps1 = ..\build\NuSpecs\tools\install.core.ps1
 		..\build\NuSpecs\tools\install.ps1 = ..\build\NuSpecs\tools\install.ps1
 		..\build\NuSpecs\tools\Readme.txt = ..\build\NuSpecs\tools\Readme.txt

From 66959baabee4803e2dc4004a9d6ec8b3890ce030 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 25 Jan 2019 12:56:53 +0100
Subject: [PATCH 058/421] Reimplemented IsPublished on PublishedContent

---
 .../NuCache/DataSource/CultureVariation.cs    |  3 +++
 .../NuCache/PublishedContent.cs               | 14 ++++++++++---
 .../NuCache/PublishedSnapshotService.cs       | 21 +++++++++++++------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
index c6e603f5a972..27bae6bf3963 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
@@ -16,5 +16,8 @@ internal class CultureVariation
 
         [JsonProperty("isDraft")]
         public bool IsDraft { get; set; }
+
+        [JsonProperty("isPublished")]
+        public bool IsPublished { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index 3f57bf334028..e145f8922000 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -296,7 +296,10 @@ public override bool IsDraft(string culture = null)
         /// <inheritdoc />
         public override bool IsPublished(string culture = null)
         {
-            // fixme I don't understand this - and it does probably not do what's expected
+            if (!IsDraft(culture))
+            {
+                return true;
+            }
 
             if (!ContentType.VariesByCulture())
             {
@@ -307,8 +310,13 @@ public override bool IsPublished(string culture = null)
             if (culture == null)
                 culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
 
-            //If the current culture is not a draft, it must be the published version
-            return _contentData.CultureInfos.TryGetValue(culture, out var cvar) && !cvar.IsDraft;
+            if (_contentData.CultureInfos.TryGetValue(culture, out var variant))
+            {
+                return variant.IsPublished;
+            }
+
+            return false;
+
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 8675aefd1a62..ff0d330a3c69 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1202,16 +1202,25 @@ private ContentNuDto GetDto(IContentBase content, bool published)
             // sanitize - names should be ok but ... never knows
             if (content.GetContentType().VariesByCulture())
             {
-                var infos = content is IContent document
-                    ? (published
-                        ? document.PublishCultureInfos
-                        : document.CultureInfos)
-                    : content.CultureInfos;
+
+                IReadOnlyDictionary<string, ContentCultureInfos> infos =  content.CultureInfos;
+                var publishedCultures = new HashSet<string>();
+
+                if (content is IContent document)
+                {
+                    if (published)
+                    {
+                        infos = document.PublishCultureInfos;
+                    }
+
+                    publishedCultures = new HashSet<string>(document.PublishedCultures);
+                }
+
 
                 foreach (var (culture, info) in infos)
                 {
                     var cultureIsDraft = !published && content is IContent d && d.IsCultureEdited(culture);
-                    cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft };
+                    cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft, IsPublished = publishedCultures.Contains(culture)};
                 }
             }
 

From 19d084e0863183012057ad17e699a95e716af54b Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 25 Jan 2019 12:11:07 +0000
Subject: [PATCH 059/421] Localize dashboard tabs with a convention of
 dashboardsTabs_dashboardAlias as the localization key

---
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml    | 12 ++++++++++++
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml | 12 ++++++++++++
 src/Umbraco.Web/Services/DashboardService.cs     | 10 +++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 2e63acd3c3cf..3dcbfcded202 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2016,4 +2016,16 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="tabRelationType">Relation Type</key>
     <key alias="tabRelations">Relations</key>
   </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Getting Started</key>
+    <key alias="contentRedirectManager">Redirect URL Management</key>
+    <key alias="mediaFolderBrowser">Content</key>
+    <key alias="settingsWelcome">Welcome</key>
+    <key alias="settingsExamine">Examine Management</key>
+    <key alias="settingsPublishedStatus">Published Status</key>
+    <key alias="settingsModelsBuilder">Models Builder</key>
+    <key alias="settingsHealthCheck">Health Check</key>
+    <key alias="memberIntro">Getting Started</key>
+    <key alias="formsInstall">Install Umbraco Forms</key>
+  </area>>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 86484b1393fb..8c8a405e298b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2049,4 +2049,16 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="tabRelationType">Relation Type</key>
     <key alias="tabRelations">Relations</key>
   </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Getting Started</key>
+    <key alias="contentRedirectManager">Redirect URL Management</key>
+    <key alias="mediaFolderBrowser">Content</key>
+    <key alias="settingsWelcome">Welcome</key>
+    <key alias="settingsExamine">Examine Management</key>
+    <key alias="settingsPublishedStatus">Published Status</key>
+    <key alias="settingsModelsBuilder">Models Builder</key>
+    <key alias="settingsHealthCheck">Health Check</key>
+    <key alias="memberIntro">Getting Started</key>
+    <key alias="formsInstall">Install Umbraco Forms</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web/Services/DashboardService.cs b/src/Umbraco.Web/Services/DashboardService.cs
index 89f241252fbf..e33bdb800a9b 100644
--- a/src/Umbraco.Web/Services/DashboardService.cs
+++ b/src/Umbraco.Web/Services/DashboardService.cs
@@ -2,8 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
 using Umbraco.Web.Dashboards;
 using Umbraco.Web.Models.ContentEditing;
 
@@ -13,11 +16,13 @@ internal class DashboardService : IDashboardService
     {
         private readonly ISectionService _sectionService;
         private readonly DashboardCollection _dashboardCollection;
+        private readonly ILocalizedTextService _localizedText;
 
-        public DashboardService(ISectionService sectionService, DashboardCollection dashboardCollection)
+        public DashboardService(ISectionService sectionService, DashboardCollection dashboardCollection, ILocalizedTextService localizedText)
         {
             _sectionService = sectionService ?? throw new ArgumentNullException(nameof(sectionService));
             _dashboardCollection = dashboardCollection ?? throw new ArgumentNullException(nameof(dashboardCollection));
+            _localizedText = localizedText ?? throw new ArgumentNullException(nameof(localizedText));
         }
 
 
@@ -37,11 +42,10 @@ public IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser c
                     throw new NotSupportedException("Legacy UserControl (.ascx) dashboards are no longer supported.");
 
                 var dashboards = new List<IDashboardSection> {dashboard};
-
                 tabs.Add(new Tab<IDashboardSection>
                 {
                     Id = tabId++,
-                    Label = dashboard.Name,
+                    Label = _localizedText.Localize("dashboardTabs", dashboard.Alias),
                     Alias = dashboard.Alias,
                     Properties = dashboards
                 });

From 4b3cd9118883680f3fd315e3589c70dcc9c8786d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 25 Jan 2019 12:17:52 +0000
Subject: [PATCH 060/421] Remove Name property from IDashboardSection & the C#
 types (We use localization of dashboardTabs_alias)

---
 src/Umbraco.Core/Dashboards/IDashboardSection.cs       | 6 ------
 src/Umbraco.Web/Dashboards/ContentDashboard.cs         | 2 --
 src/Umbraco.Web/Dashboards/ExamineDashboard.cs         | 2 --
 src/Umbraco.Web/Dashboards/FormsDashboard.cs           | 2 --
 src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs     | 2 --
 src/Umbraco.Web/Dashboards/MediaDashboard.cs           | 2 --
 src/Umbraco.Web/Dashboards/MembersDashboard.cs         | 2 --
 src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs   | 2 --
 src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs | 2 --
 src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs     | 2 --
 src/Umbraco.Web/Dashboards/SettingsDashboards.cs       | 2 --
 11 files changed, 26 deletions(-)

diff --git a/src/Umbraco.Core/Dashboards/IDashboardSection.cs b/src/Umbraco.Core/Dashboards/IDashboardSection.cs
index 7b5963c9f54e..73cf8513f96b 100644
--- a/src/Umbraco.Core/Dashboards/IDashboardSection.cs
+++ b/src/Umbraco.Core/Dashboards/IDashboardSection.cs
@@ -5,12 +5,6 @@ namespace Umbraco.Core.Dashboards
 {
     public interface IDashboardSection
     {
-        /// <summary>
-        /// Display name of the dashboard tab
-        /// </summary>
-        [DataMember(Name="name")]
-        string Name { get; }
-
         /// <summary>
         /// Alias to refer to this dashboard via code
         /// </summary>
diff --git a/src/Umbraco.Web/Dashboards/ContentDashboard.cs b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
index 6a41b07c2cd9..1ff741b7e466 100644
--- a/src/Umbraco.Web/Dashboards/ContentDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(10)]
     public class ContentDashboard : IDashboardSection
     {
-        public string Name => "Get Started";
-
         public string Alias => "contentIntro";
 
         public string[] Sections => new [] { "content" };
diff --git a/src/Umbraco.Web/Dashboards/ExamineDashboard.cs b/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
index e686545b51c6..8363e8079c3c 100644
--- a/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(20)]
     public class ExamineDashboard : IDashboardSection
     {
-        public string Name => "Examine Management";
-
         public string Alias => "settingsExamine";
 
         public string[] Sections => new [] { "settings" };
diff --git a/src/Umbraco.Web/Dashboards/FormsDashboard.cs b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
index 3592c88d131b..0121fcd2c1b8 100644
--- a/src/Umbraco.Web/Dashboards/FormsDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(10)]
     public class FormsDashboard : IDashboardSection
     {
-        public string Name => "Install Umbraco Forms";
-
         public string Alias => "formsInstall";
 
         public string[] Sections => new [] { "forms" };
diff --git a/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs b/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
index b7373a6d44c9..a8347f180661 100644
--- a/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(50)]
     public class HealthCheckDashboard : IDashboardSection
     {
-        public string Name => "Health Check";
-
         public string Alias => "settingsHealthCheck";
 
         public string[] Sections => new [] { "settings" };
diff --git a/src/Umbraco.Web/Dashboards/MediaDashboard.cs b/src/Umbraco.Web/Dashboards/MediaDashboard.cs
index c72046388ef2..ae8f8343ceaa 100644
--- a/src/Umbraco.Web/Dashboards/MediaDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/MediaDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(10)]
     public class MediaDashboard : IDashboardSection
     {
-        public string Name => "Content";
-
         public string Alias => "mediaFolderBrowser";
 
         public string[] Sections => new [] { "media" };
diff --git a/src/Umbraco.Web/Dashboards/MembersDashboard.cs b/src/Umbraco.Web/Dashboards/MembersDashboard.cs
index 44aa6c4de622..57183ab6a6dd 100644
--- a/src/Umbraco.Web/Dashboards/MembersDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/MembersDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(10)]
     public class MembersDashboard : IDashboardSection
     {
-        public string Name => "Get Started";
-
         public string Alias => "memberIntro";
 
         public string[] Sections => new [] { "member" };
diff --git a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
index 431e12984023..5e284ee0c2d5 100644
--- a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(40)]
     public class ModelsBuilderDashboard : IDashboardSection
     {
-        public string Name => "Models Builder";
-
         public string Alias => "settingsModelsBuilder";
 
         public string[] Sections => new [] { "settings" };
diff --git a/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs b/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
index 5feca943249d..17e99bdf5b96 100644
--- a/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(30)]
     public class PublishedStatusDashboard : IDashboardSection
     {
-        public string Name => "Published Status";
-
         public string Alias => "settingsPublishedStatus";
 
         public string[] Sections => new [] { "settings" };
diff --git a/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs b/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
index 748db64658a8..76cc03202ded 100644
--- a/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(20)]
     public class RedirectUrlDashboard : IDashboardSection
     {
-        public string Name => "Redirect URL Management";
-
         public string Alias => "contentRedirectManager";
 
         public string[] Sections => new [] { "content" };
diff --git a/src/Umbraco.Web/Dashboards/SettingsDashboards.cs b/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
index b5ab56c31943..1fd32bee1428 100644
--- a/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
+++ b/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Web.Dashboards
     [Weight(10)]
     public class SettingsDashboard : IDashboardSection
     {
-        public string Name => "Welcome";
-
         public string Alias => "settingsWelcome";
 
         public string[] Sections => new [] { "settings" };

From b1f94c66dca390d04e6625335e5454957bacaa5e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 25 Jan 2019 12:18:15 +0000
Subject: [PATCH 061/421] Remove name property from dashboard package.manifest
 collection

---
 src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs | 3 ---
 src/Umbraco.Tests/Manifest/ManifestParserTests.cs        | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs b/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs
index b2b3fd5dfb7f..879f78e19cf8 100644
--- a/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs
+++ b/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs
@@ -10,9 +10,6 @@ public class ManifestDashboardDefinition : IDashboardSection
     {
         private string _view;
 
-        [JsonProperty("name", Required = Required.Always)]
-        public string Name { get; set; }
-
         [JsonProperty("alias", Required = Required.Always)]
         public string Alias { get; set; }
 
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index a12f90c4eb99..546831974cb5 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -387,7 +387,6 @@ public void CanParseManifest_Dashboards()
         {
             const string json = @"{'dashboards': [
     {
-        'name': 'First One',
         'alias': 'something',
         'view': '~/App_Plugins/MyPackage/Dashboards/one.html',
         'sections': [ 'content' ],
@@ -395,7 +394,6 @@ public void CanParseManifest_Dashboards()
 
     },
     {
-        'name': 'Second-One',
         'alias': 'something.else',
         'weight': -1,
         'view': '~/App_Plugins/MyPackage/Dashboards/two.html',
@@ -409,7 +407,6 @@ public void CanParseManifest_Dashboards()
             Assert.IsInstanceOf<ManifestDashboardDefinition>(manifest.Dashboards[0]);
             var db0 = manifest.Dashboards[0];
             Assert.AreEqual("something", db0.Alias);
-            Assert.AreEqual("First One", db0.Name);
             Assert.AreEqual(100, db0.Weight);
             Assert.AreEqual("/App_Plugins/MyPackage/Dashboards/one.html", db0.View);
             Assert.AreEqual(1, db0.Sections.Length);
@@ -423,7 +420,6 @@ public void CanParseManifest_Dashboards()
             Assert.IsInstanceOf<ManifestDashboardDefinition>(manifest.Dashboards[1]);
             var db1 = manifest.Dashboards[1];
             Assert.AreEqual("something.else", db1.Alias);
-            Assert.AreEqual("Second-One", db1.Name);
             Assert.AreEqual(-1, db1.Weight);
             Assert.AreEqual("/App_Plugins/MyPackage/Dashboards/two.html", db1.View);
             Assert.AreEqual(1, db1.Sections.Length);

From 2c6b5f21b0cbfadb07a1d1998154798c07e97f57 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 25 Jan 2019 16:06:32 +0100
Subject: [PATCH 062/421] Migrates RelatedLink data to MultiUrlPicker and
 changes all RelatedLink datatypes to MultiUrlPicker ones

---
 .../Migrations/Upgrade/UmbracoPlan.cs         |   1 +
 .../ConvertRelatedLinksToMultiUrlPicker.cs    | 142 ++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 .../MultiUrlPickerPropertyEditor.cs           |   2 +-
 4 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 833955ee6ace..f4732acc4ba2 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -124,6 +124,7 @@ protected void DefinePlan()
             To<MakeRedirectUrlVariant>("{64EBCE53-E1F0-463A-B40B-E98EFCCA8AE2}");
             To<AddContentTypeIsElementColumn>("{0009109C-A0B8-4F3F-8FEB-C137BBDDA268}");
             To<UpdateMemberGroupPickerData>("{8A027815-D5CD-4872-8B88-9A51AB5986A6}"); // from 7.14.0
+            To<ConvertRelatedLinksToMultiUrlPicker>("{ED28B66A-E248-4D94-8CDB-9BDF574023F0}");
 
 
             //FINAL
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
new file mode 100644
index 000000000000..7e7f398791e8
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class ConvertRelatedLinksToMultiUrlPicker : MigrationBase
+    {
+        public ConvertRelatedLinksToMultiUrlPicker(IMigrationContext context) : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            var sqlDataTypes = Sql()
+                .Select<DataTypeDto>()
+                .From<DataTypeDto>()
+                .Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.RelatedLinks"
+                                         || x.EditorAlias == "Umbraco.RelatedLinks2");
+
+            var dataTypes = Database.Fetch<DataTypeDto>(sqlDataTypes);
+            var dataTypeIds = dataTypes.Select(x => x.NodeId).ToList();
+
+            var sqlPropertyTpes = Sql()
+                .Select<PropertyTypeDto>()
+                .From<PropertyTypeDto>()
+                .Where<PropertyTypeDto>(x => dataTypeIds.Contains(x.DataTypeId));
+
+            var propertyTypeIds = Database.Fetch<PropertyTypeDto>(sqlPropertyTpes).Select(x => x.Id);
+
+            var sqlPropertyData = Sql()
+                .Select<PropertyDataDto>()
+                .From<PropertyDataDto>()
+                .Where<PropertyDataDto>(x => propertyTypeIds.Contains(x.PropertyTypeId));
+
+            var properties = Database.Fetch<PropertyDataDto>(sqlPropertyData);
+
+            // Create a Multi URL Picker datatype for the converted RelatedLinks data
+            if (properties.Any() == false)
+                return;
+
+            foreach (var property in properties)
+            {
+                var value = property.Value.ToString();
+                if (string.IsNullOrWhiteSpace(value))
+                    continue;
+
+                var relatedLinks = JsonConvert.DeserializeObject<List<RelatedLink>>(value);
+                var links = new List<LinkDto>();
+                foreach (var relatedLink in relatedLinks)
+                {
+                    GuidUdi udi = null;
+                    if (relatedLink.IsInternal)
+                    {
+                        var linkIsUdi = GuidUdi.TryParse(relatedLink.Link, out udi);
+                        if (linkIsUdi == false)
+                        {
+                            // oh no.. probably an integer, yikes!
+                            if (int.TryParse(relatedLink.Link, out var intId))
+                            {
+                                var sqlNodeData = Sql()
+                                    .Select<NodeDto>()
+                                    .Where<NodeDto>(x => x.NodeId == intId);
+
+                                var node = Database.Fetch<NodeDto>(sqlNodeData).FirstOrDefault();
+                                if (node != null)
+                                    // Note: RelatedLinks did not allow for picking media items,
+                                    // so if there's a value this will be a content item - hence
+                                    // the hardcoded "document" here
+                                    udi = new GuidUdi("document", node.UniqueId);
+                            }
+                        }
+                    }
+
+                    var link = new LinkDto
+                    {
+                        Name = relatedLink.Caption,
+                        Target = relatedLink.NewWindow ? "_blank" : null,
+                        Udi = udi,
+                        // Should only have a URL if it's an external link otherwise it wil be a UDI 
+                        Url = relatedLink.IsInternal == false ? relatedLink.Link : null
+                    };
+                    
+                    links.Add(link);
+                }
+
+                var json = JsonConvert.SerializeObject(links);
+
+                // Update existing data
+                property.TextValue = json;
+                Database.Update(property);
+            }
+
+            foreach (var dataType in dataTypes)
+            {
+                // Change existing datatypes from RelatedLinks to MultiUrlPicker
+                var dataTypeResult = Database.Fetch<DataTypeDto>(Sql()
+                        .Select<DataTypeDto>()
+                        .From<DataTypeDto>()
+                        .Where<DataTypeDto>(x => x.NodeId == dataType.NodeId)).First();
+
+                dataTypeResult.EditorAlias = Constants.PropertyEditors.Aliases.MultiUrlPicker;
+                Database.Update(dataTypeResult);
+            }
+        }
+    }
+
+    internal class RelatedLink
+    {
+        public int? Id { get; internal set; }
+        internal bool IsDeleted { get; set; }
+        [JsonProperty("caption")]
+        public string Caption { get; set; }
+        [JsonProperty("link")]
+        public string Link { get; set; }
+        [JsonProperty("newWindow")]
+        public bool NewWindow { get; set; }
+        [JsonProperty("isInternal")]
+        public bool IsInternal { get; set; }
+    }
+
+    [DataContract]
+    internal class LinkDto
+    {
+        [DataMember(Name = "name")]
+        public string Name { get; set; }
+
+        [DataMember(Name = "target")]
+        public string Target { get; set; }
+
+        [DataMember(Name = "udi")]
+        public GuidUdi Udi { get; set; }
+
+        [DataMember(Name = "url")]
+        public string Url { get; set; }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 9a52cb8dc5b3..723c9c4c22d8 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -393,6 +393,7 @@
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoAuditTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoConsentTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\CreateSensitiveDataUserGroup.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\ConvertRelatedLinksToMultiUrlPicker.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddLogTableColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddTypedLabels.cs" />
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
index 54bf5c4d15ae..1648b816238f 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
@@ -7,7 +7,7 @@
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [DataEditor(Constants.PropertyEditors.Aliases.MultiUrlPicker, EditorType.PropertyValue|EditorType.MacroParameter, "Multi Url Picker", "multiurlpicker", ValueType = "JSON", Group = "pickers", Icon = "icon-link")]
+    [DataEditor(Constants.PropertyEditors.Aliases.MultiUrlPicker, EditorType.PropertyValue|EditorType.MacroParameter, "Multi Url Picker", "multiurlpicker", ValueType = ValueTypes.Json, Group = "pickers", Icon = "icon-link")]
     public class MultiUrlPickerPropertyEditor : DataEditor
     {
         private readonly IEntityService _entityService;

From 5a896e74171b1b6c38dd7ee86119ea60d80317ca Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 23 Jan 2019 08:56:20 +0100
Subject: [PATCH 063/421] Remove obsoleted RelatedLinks picker (replaced by
 Multi URL Picker)

(cherry picked from commit fedf0c78de6d2ad365db1c112c22af13abd7b9fb)
---
 src/Umbraco.Core/Constants-PropertyEditors.cs |   7 +-
 .../Migrations/Install/DatabaseDataCreator.cs |   4 +-
 .../V_8_0_0/PropertyEditorsMigration.cs       |   1 -
 .../Composing/TypeLoaderTests.cs              |   2 +-
 .../Services/ContentServiceTests.cs           |   2 +-
 .../TestHelpers/Entities/MockedContent.cs     |   2 +-
 .../Entities/MockedContentTypes.cs            |   2 +-
 .../Mvc/HtmlHelperExtensionMethodsTests.cs    |  25 ---
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |  34 ----
 src/Umbraco.Web/Models/RelatedLink.cs         |  11 --
 src/Umbraco.Web/Models/RelatedLinkBase.cs     |  18 --
 src/Umbraco.Web/Models/RelatedLinkType.cs     |  27 ---
 src/Umbraco.Web/Models/RelatedLinks.cs        |  42 -----
 .../RelatedLinksConfiguration.cs              |  13 --
 .../RelatedLinksConfigurationEditor.cs        |  18 --
 .../RelatedLinksPropertyEditor.cs             |  16 --
 .../RelatedLinksLegacyValueConverter.cs       | 132 --------------
 .../RelatedLinksValueConverter.cs             | 169 ------------------
 src/Umbraco.Web/RelatedLinksTypeConverter.cs  |  98 ----------
 src/Umbraco.Web/Umbraco.Web.csproj            |  10 --
 20 files changed, 7 insertions(+), 626 deletions(-)
 delete mode 100644 src/Umbraco.Web/Models/RelatedLink.cs
 delete mode 100644 src/Umbraco.Web/Models/RelatedLinkBase.cs
 delete mode 100644 src/Umbraco.Web/Models/RelatedLinkType.cs
 delete mode 100644 src/Umbraco.Web/Models/RelatedLinks.cs
 delete mode 100644 src/Umbraco.Web/PropertyEditors/RelatedLinksConfiguration.cs
 delete mode 100644 src/Umbraco.Web/PropertyEditors/RelatedLinksConfigurationEditor.cs
 delete mode 100644 src/Umbraco.Web/PropertyEditors/RelatedLinksPropertyEditor.cs
 delete mode 100644 src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksLegacyValueConverter.cs
 delete mode 100644 src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksValueConverter.cs
 delete mode 100644 src/Umbraco.Web/RelatedLinksTypeConverter.cs

diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index b9f20fb449ad..8b637fe90eda 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -118,12 +118,7 @@ public static class Aliases
                 /// RadioButton list.
                 /// </summary>
                 public const string RadioButtonList = "Umbraco.RadioButtonList";
-
-                /// <summary>
-                /// Related Links.
-                /// </summary>
-                public const string RelatedLinks = "Umbraco.RelatedLinks";
-
+                
                 /// <summary>
                 /// Slider.
                 /// </summary>
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index f32ea1cb6f7f..4e0b5dfa0f86 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -135,7 +135,7 @@ void InsertDataTypeNodeDto(int id, int sortOrder, string uniqueId, string text)
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1047, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1047", SortOrder = 2, UniqueId = new Guid("1EA2E01F-EBD8-4CE1-8D71-6B1149E63548"), Text = "Member Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1048, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1048", SortOrder = 2, UniqueId = new Guid("135D60E0-64D9-49ED-AB08-893C9BA44AE5"), Text = "Media Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1049, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1049", SortOrder = 2, UniqueId = new Guid("9DBBCBBB-2327-434A-B355-AF1B84E5010A"), Text = "Multiple Media Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = new Guid("B4E3535A-1753-47E2-8568-602CF8CFEE6F"), Text = "Related Links", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = new Guid("B4E3535A-1753-47E2-8568-602CF8CFEE6F"), Text = "Multi URL Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
         }
 
         private void CreateLockData()
@@ -301,7 +301,7 @@ void InsertDataTypeDto(int id, string editorAlias, string dbType, string configu
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1048, EditorAlias = Constants.PropertyEditors.Aliases.MediaPicker, DbType = "Ntext" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1049, EditorAlias = Constants.PropertyEditors.Aliases.MediaPicker, DbType = "Ntext",
                 Configuration = "{\"multiPicker\":1}" });
-            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1050, EditorAlias = Constants.PropertyEditors.Aliases.RelatedLinks, DbType = "Ntext" });
+            _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1050, EditorAlias = Constants.PropertyEditors.Aliases.MultiUrlPicker, DbType = "Ntext" });
         }
 
         private void CreateRelationTypeData()
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
index ee439088be87..064ffc7228e5 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
@@ -16,7 +16,6 @@ public override void Migrate()
             RenameDataType(Constants.PropertyEditors.Aliases.MediaPicker + "2", Constants.PropertyEditors.Aliases.MediaPicker);
             RenameDataType(Constants.PropertyEditors.Aliases.MemberPicker + "2", Constants.PropertyEditors.Aliases.MemberPicker);
             RenameDataType(Constants.PropertyEditors.Aliases.MultiNodeTreePicker + "2", Constants.PropertyEditors.Aliases.MultiNodeTreePicker);
-            RenameDataType(Constants.PropertyEditors.Aliases.RelatedLinks + "2", Constants.PropertyEditors.Aliases.RelatedLinks);
             RenameDataType("Umbraco.TextboxMultiple", Constants.PropertyEditors.Aliases.TextArea, false);
             RenameDataType("Umbraco.Textbox", Constants.PropertyEditors.Aliases.TextBox, false);
         }
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 6b3ce3eb4e74..add3424599a0 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -279,7 +279,7 @@ public void Resolves_Types()
         public void GetDataEditors()
         {
             var types = _typeLoader.GetDataEditors();
-            Assert.AreEqual(40, types.Count());
+            Assert.AreEqual(39, types.Count());
         }
 
         /// <summary>
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 039bcaed244a..9490213d629f 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -2215,7 +2215,7 @@ public void Can_Verify_Property_Types_On_Content()
             Assert.That(sut.GetValue<Udi>("contentPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Document, new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C"))));
             Assert.That(sut.GetValue<Udi>("mediaPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Media, new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691"))));
             Assert.That(sut.GetValue<Udi>("memberPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Member, new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D"))));
-            Assert.That(sut.GetValue<string>("relatedLinks"), Is.EqualTo("<links><link title=\"google\" link=\"http://google.com\" type=\"external\" newwindow=\"0\" /></links>"));
+            Assert.That(sut.GetValue<string>("multiUrlPicker"), Is.EqualTo("[{\"name\":\"https://test.com\",\"url\":\"https://test.com\"}]"));
             Assert.That(sut.GetValue<string>("tags"), Is.EqualTo("this,is,tags"));
         }
 
diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs
index faf4acf8a4a1..19a57d7775bd 100644
--- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs
+++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs
@@ -132,7 +132,7 @@ public static Content CreateAllTypesContent(IContentType contentType, string nam
             content.SetValue("contentPicker", Udi.Create(Constants.UdiEntityType.Document, new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C")).ToString());
             content.SetValue("mediaPicker", Udi.Create(Constants.UdiEntityType.Media, new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691")).ToString());
             content.SetValue("memberPicker", Udi.Create(Constants.UdiEntityType.Member, new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D")).ToString());
-            content.SetValue("relatedLinks", "<links><link title=\"google\" link=\"http://google.com\" type=\"external\" newwindow=\"0\" /></links>");
+            content.SetValue("multiUrlPicker", "[{\"name\":\"https://test.com\",\"url\":\"https://test.com\"}]");
             content.SetValue("tags", "this,is,tags");
 
             return content;
diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
index 14b967b1c9b2..d7dcf8e79a64 100644
--- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
+++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
@@ -370,7 +370,7 @@ public static ContentType CreateAllTypesContentType(string alias, string name)
             contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.ContentPicker, ValueStorageType.Integer) { Alias = "contentPicker", Name = "Content Picker", Mandatory = false, SortOrder = 16, DataTypeId = 1046 });
             contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.MediaPicker, ValueStorageType.Integer) { Alias = "mediaPicker", Name = "Media Picker", Mandatory = false, SortOrder = 17, DataTypeId = 1048 });
             contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.MemberPicker, ValueStorageType.Integer) { Alias = "memberPicker", Name = "Member Picker", Mandatory = false, SortOrder = 18, DataTypeId = 1047 });
-            contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.RelatedLinks, ValueStorageType.Ntext) { Alias = "relatedLinks", Name = "Related Links", Mandatory = false, SortOrder = 21, DataTypeId = 1050 });
+            contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.MultiUrlPicker, ValueStorageType.Nvarchar) { Alias = "multiUrlPicker", Name = "Multi URL Picker", Mandatory = false, SortOrder = 21, DataTypeId = 1050 });
             contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.Tags, ValueStorageType.Ntext) { Alias = "tags", Name = "Tags", Mandatory = false, SortOrder = 22, DataTypeId = 1041 });
 
             contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
diff --git a/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs b/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
index cc83dcb1c938..ba19f41e74d2 100644
--- a/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
@@ -29,30 +29,5 @@ public void Wrap_Object_Attributes()
             var output = _htmlHelper.Wrap("div", "hello world", new {style = "color:red;", onclick = "void();"});
             Assert.AreEqual("<div style=\"color:red;\" onclick=\"void();\">hello world</div>", output.ToHtmlString());
         }
-
-        [Test]
-        public void GetRelatedLinkHtml_Simple()
-        {
-            var relatedLink = new Umbraco.Web.Models.RelatedLink {
-                Caption = "Link Caption",
-                NewWindow = true,
-                Link = "https://www.google.com/"
-            };
-            var output = _htmlHelper.GetRelatedLinkHtml(relatedLink);
-            Assert.AreEqual("<a href=\"https://www.google.com/\" target=\"_blank\">Link Caption</a>", output.ToHtmlString());
-	}
-
-        [Test]
-        public void GetRelatedLinkHtml_HtmlAttributes()
-        {
-            var relatedLink = new Umbraco.Web.Models.RelatedLink
-            {
-                Caption = "Link Caption",
-                NewWindow = true,
-                Link = "https://www.google.com/"
-            };
-            var output = _htmlHelper.GetRelatedLinkHtml(relatedLink, new { @class = "test-class"});
-            Assert.AreEqual("<a class=\"test-class\" href=\"https://www.google.com/\" target=\"_blank\">Link Caption</a>", output.ToHtmlString());
-        }
     }
 }
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 626a19a36991..1186102bc89a 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -830,39 +830,5 @@ public static HtmlTagWrapper Wrap(this HtmlHelper html, bool visible, string tag
         }
 
         #endregion
-
-
-        #region RelatedLink
-
-        /// <summary>
-        /// Renders an anchor element for a RelatedLink instance.
-        /// Format: &lt;a href=&quot;relatedLink.Link&quot; target=&quot;_blank/_self&quot;&gt;relatedLink.Caption&lt;/a&gt;
-        /// </summary>
-        /// <param name="htmlHelper">The HTML helper instance that this method extends.</param>
-        /// <param name="relatedLink">The RelatedLink instance</param>
-        /// <returns>An anchor element </returns>
-        public static MvcHtmlString GetRelatedLinkHtml(this HtmlHelper htmlHelper, RelatedLink relatedLink)
-        {
-            return htmlHelper.GetRelatedLinkHtml(relatedLink, null);
-        }
-
-        /// <summary>
-        /// Renders an anchor element for a RelatedLink instance, accepting htmlAttributes.
-        /// Format: &lt;a href=&quot;relatedLink.Link&quot; target=&quot;_blank/_self&quot; htmlAttributes&gt;relatedLink.Caption&lt;/a&gt;
-        /// </summary>
-        /// <param name="htmlHelper">The HTML helper instance that this method extends.</param>
-        /// <param name="relatedLink">The RelatedLink instance</param>
-        /// <param name="htmlAttributes">An object that contains the HTML attributes to set for the element.</param>
-        /// <returns></returns>
-        public static MvcHtmlString GetRelatedLinkHtml(this HtmlHelper htmlHelper, RelatedLink relatedLink, object htmlAttributes)
-        {
-            var tagBuilder = new TagBuilder("a");
-            tagBuilder.MergeAttributes(HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
-            tagBuilder.MergeAttribute("href", relatedLink.Link);
-            tagBuilder.MergeAttribute("target", relatedLink.NewWindow ? "_blank" : "_self");
-            tagBuilder.InnerHtml = HttpUtility.HtmlEncode(relatedLink.Caption);
-            return MvcHtmlString.Create(tagBuilder.ToString(TagRenderMode.Normal));
-        }
-        #endregion
     }
 }
diff --git a/src/Umbraco.Web/Models/RelatedLink.cs b/src/Umbraco.Web/Models/RelatedLink.cs
deleted file mode 100644
index 1e1d7636adfb..000000000000
--- a/src/Umbraco.Web/Models/RelatedLink.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Umbraco.Core.Models.PublishedContent;
-
-namespace Umbraco.Web.Models
-{
-    public class RelatedLink : RelatedLinkBase
-    {
-        public int? Id { get; internal set; }
-        internal bool IsDeleted { get; set; }
-        public IPublishedContent Content { get; set; }
-    }
-}
diff --git a/src/Umbraco.Web/Models/RelatedLinkBase.cs b/src/Umbraco.Web/Models/RelatedLinkBase.cs
deleted file mode 100644
index c2077ce4a944..000000000000
--- a/src/Umbraco.Web/Models/RelatedLinkBase.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Umbraco.Web.Models
-{
-    public abstract class RelatedLinkBase
-    {
-        [JsonProperty("caption")]
-        public string Caption { get; set; }
-        [JsonProperty("link")]
-        public string Link { get; set; }
-        [JsonProperty("newWindow")]
-        public bool NewWindow { get; set; }
-        [JsonProperty("isInternal")]
-        public bool IsInternal { get; set; }
-        [JsonProperty("type")]
-        public RelatedLinkType Type { get; set; }
-    }
-}
diff --git a/src/Umbraco.Web/Models/RelatedLinkType.cs b/src/Umbraco.Web/Models/RelatedLinkType.cs
deleted file mode 100644
index eec7817ab6cb..000000000000
--- a/src/Umbraco.Web/Models/RelatedLinkType.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RelatedLinkType.cs" company="Umbraco">
-//   Umbraco
-// </copyright>
-// <summary>
-//   Defines the RelatedLinkType type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace Umbraco.Web.Models
-{
-    /// <summary>
-    /// The related link type.
-    /// </summary>
-    public enum RelatedLinkType
-    {
-        /// <summary>
-        /// Internal link type
-        /// </summary>
-        Internal,
-
-        /// <summary>
-        /// External link type
-        /// </summary>
-        External
-    }
-}
diff --git a/src/Umbraco.Web/Models/RelatedLinks.cs b/src/Umbraco.Web/Models/RelatedLinks.cs
deleted file mode 100644
index 22cdcd11b617..000000000000
--- a/src/Umbraco.Web/Models/RelatedLinks.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-
-namespace Umbraco.Web.Models
-{
-    [TypeConverter(typeof(RelatedLinksTypeConverter))]
-    public class RelatedLinks : IEnumerable<RelatedLink>
-    {
-        private readonly string _propertyData;
-
-        private readonly IEnumerable<RelatedLink> _relatedLinks;
-
-        public RelatedLinks(IEnumerable<RelatedLink> relatedLinks, string propertyData)
-        {
-            _relatedLinks = relatedLinks;
-            _propertyData = propertyData;
-        }
-
-        /// <summary>
-        /// Gets the property data.
-        /// </summary>
-        internal string PropertyData
-        {
-            get
-            {
-                return this._propertyData;
-            }
-        }
-
-        public IEnumerator<RelatedLink> GetEnumerator()
-        {
-            return _relatedLinks.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return this.GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Web/PropertyEditors/RelatedLinksConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RelatedLinksConfiguration.cs
deleted file mode 100644
index 5db14c684211..000000000000
--- a/src/Umbraco.Web/PropertyEditors/RelatedLinksConfiguration.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Web.PropertyEditors
-{
-    /// <summary>
-    /// Represents the configuration for the related links value editor.
-    /// </summary>
-    public class RelatedLinksConfiguration
-    {
-        [ConfigurationField("max", "Maximum number of links", "number", Description = "Enter the maximum amount of links to be added, enter 0 for unlimited")]
-        public int Maximum { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/RelatedLinksConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/RelatedLinksConfigurationEditor.cs
deleted file mode 100644
index 07ff359a8291..000000000000
--- a/src/Umbraco.Web/PropertyEditors/RelatedLinksConfigurationEditor.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Web.PropertyEditors
-{
-    /// <summary>
-    /// Represents the configuration editor for the related links value editor.
-    /// </summary>
-    public class RelatedLinksConfigurationEditor : ConfigurationEditor
-    {
-        public override IDictionary<string, object> ToValueEditor(object configuration)
-        {
-            var d = base.ToValueEditor(configuration);
-            d["idType"] = "udi";
-            return d;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/RelatedLinksPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RelatedLinksPropertyEditor.cs
deleted file mode 100644
index b450fcc67f79..000000000000
--- a/src/Umbraco.Web/PropertyEditors/RelatedLinksPropertyEditor.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Web.PropertyEditors
-{
-    [DataEditor(Constants.PropertyEditors.Aliases.RelatedLinks, "Related links", "relatedlinks", ValueType = ValueTypes.Json, Icon = "icon-thumbnail-list", Group = "pickers")]
-    public class RelatedLinksPropertyEditor : DataEditor
-    {
-        public RelatedLinksPropertyEditor(ILogger logger)
-            : base(logger)
-        { }
-
-        protected override IConfigurationEditor CreateConfigurationEditor() => new RelatedLinksConfigurationEditor();
-    }
-}
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksLegacyValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksLegacyValueConverter.cs
deleted file mode 100644
index 6c2a4331d06a..000000000000
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksLegacyValueConverter.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.PropertyEditors.ValueConverters;
-using Umbraco.Core.Services;
-
-namespace Umbraco.Web.PropertyEditors.ValueConverters
-{
-    [DefaultPropertyValueConverter(typeof(JsonValueConverter))] //this shadows the JsonValueConverter
-    public class RelatedLinksLegacyValueConverter : PropertyValueConverterBase
-    {
-        private static readonly string[] MatchingEditors = {
-            Constants.PropertyEditors.Aliases.RelatedLinks
-        };
-
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly ILogger _logger;
-        private readonly ServiceContext _services;
-
-        public RelatedLinksLegacyValueConverter(IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, ILogger logger)
-        {
-            _umbracoContextAccessor = umbracoContextAccessor;
-            _services = services;
-            _logger = logger;
-        }
-
-        public override bool IsConverter(PublishedPropertyType propertyType)
-            => MatchingEditors.Contains(propertyType.EditorAlias);
-
-        public override Type GetPropertyValueType(PublishedPropertyType propertyType)
-            => typeof (JArray);
-
-        public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType)
-            => PropertyCacheLevel.Element;
-
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
-        {
-            if (source == null) return null;
-            var sourceString = source.ToString();
-
-            if (sourceString.DetectIsJson())
-            {
-                try
-                {
-                    var obj = JsonConvert.DeserializeObject<JArray>(sourceString);
-                    //update the internal links if we have a context
-                    if (UmbracoContext.Current != null)
-                    {
-                        var helper = new UmbracoHelper(_umbracoContextAccessor.UmbracoContext, _services);
-                        foreach (var a in obj)
-                        {
-                            var type = a.Value<string>("type");
-                            if (type.IsNullOrWhiteSpace() == false)
-                            {
-                                if (type == "internal")
-                                {
-                                    switch (propertyType.EditorAlias)
-                                    {
-                                        case Constants.PropertyEditors.Aliases.RelatedLinks:
-                                            var strLinkId = a.Value<string>("link");
-                                            var udiAttempt = strLinkId.TryConvertTo<Udi>();
-                                            if (udiAttempt)
-                                            {
-                                                var content = helper.PublishedContent(udiAttempt.Result);
-                                                if (content == null) break;
-                                                a["link"] = helper.Url(content.Id);
-                                            }
-                                            break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    return obj;
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<RelatedLinksLegacyValueConverter>(ex, "Could not parse the string '{Json}' to a json object", sourceString);
-                }
-            }
-
-            //it's not json, just return the string
-            return sourceString;
-        }
-
-        public override object ConvertIntermediateToXPath(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object source, bool preview)
-        {
-            if (source == null) return null;
-            var sourceString = source.ToString();
-
-            if (sourceString.DetectIsJson())
-            {
-                try
-                {
-                    var obj = JsonConvert.DeserializeObject<Array>(sourceString);
-
-                    var d = new XmlDocument();
-                    var e = d.CreateElement("links");
-                    d.AppendChild(e);
-
-                    foreach (dynamic link in obj)
-                    {
-                        var ee = d.CreateElement("link");
-                        ee.SetAttribute("title", link.title);
-                        ee.SetAttribute("link", link.link);
-                        ee.SetAttribute("type", link.type);
-                        ee.SetAttribute("newwindow", link.newWindow);
-
-                        e.AppendChild(ee);
-                    }
-
-                    return d.CreateNavigator();
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<RelatedLinksLegacyValueConverter>(ex, "Could not parse the string '{Json}' to a json object", sourceString);
-                }
-            }
-
-            //it's not json, just return the string
-            return sourceString;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksValueConverter.cs
deleted file mode 100644
index 983d122a836e..000000000000
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksValueConverter.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Xml;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.PropertyEditors.ValueConverters;
-using Umbraco.Web.Models;
-using Umbraco.Web.PublishedCache;
-
-namespace Umbraco.Web.PropertyEditors.ValueConverters
-{
-    /// <summary>
-    /// The related links property value converter.
-    /// </summary>
-    [DefaultPropertyValueConverter(typeof(RelatedLinksLegacyValueConverter), typeof(JsonValueConverter))]
-    public class RelatedLinksValueConverter : PropertyValueConverterBase
-    {
-        private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly ILogger _logger;
-
-        public RelatedLinksValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor, IUmbracoContextAccessor umbracoContextAccessor, ILogger logger)
-        {
-            _publishedSnapshotAccessor = publishedSnapshotAccessor;
-            _umbracoContextAccessor = umbracoContextAccessor;
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Checks if this converter can convert the property editor and registers if it can.
-        /// </summary>
-        /// <param name="propertyType">
-        /// The property type.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public override bool IsConverter(PublishedPropertyType propertyType)
-            => propertyType.EditorAlias.Equals(Constants.PropertyEditors.Aliases.RelatedLinks);
-
-        public override Type GetPropertyValueType(PublishedPropertyType propertyType)
-            => typeof (JArray);
-
-        public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType)
-            => PropertyCacheLevel.Element;
-
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
-        {
-            if (source == null) return null;
-            var sourceString = source.ToString();
-
-            var relatedLinksData = JsonConvert.DeserializeObject<IEnumerable<RelatedLink>>(sourceString);
-            var relatedLinks = new List<RelatedLink>();
-
-            foreach (var linkData in relatedLinksData)
-            {
-                var relatedLink = new RelatedLink
-                {
-                    Caption = linkData.Caption,
-                    NewWindow = linkData.NewWindow,
-                    IsInternal = linkData.IsInternal,
-                    Type = linkData.Type,
-                    Link = linkData.Link
-                };
-
-                int contentId;
-                if (int.TryParse(relatedLink.Link, out contentId))
-                {
-                    relatedLink.Id = contentId;
-                    relatedLink = CreateLink(relatedLink);
-                }
-                else
-                {
-                    var strLinkId = linkData.Link;
-                    var udiAttempt = strLinkId.TryConvertTo<GuidUdi>();
-                    if (udiAttempt.Success && udiAttempt.Result != null)
-                    {
-                        var content = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(udiAttempt.Result.Guid);
-                        if (content != null)
-                        {
-                            relatedLink.Id = content.Id;
-                            relatedLink = CreateLink(relatedLink);
-                            relatedLink.Content = content;
-                        }
-                    }
-                }
-
-                if (relatedLink.IsDeleted == false)
-                {
-                    relatedLinks.Add(relatedLink);
-                }
-                else
-                {
-                    _logger.Warn<RelatedLinksValueConverter>("Related Links value converter skipped a link as the node has been unpublished/deleted (Internal Link NodeId: {RelatedLinkNodeId}, Link Caption: '{RelatedLinkCaption}')", relatedLink.Link, relatedLink.Caption);
-                }
-            }
-
-            return new RelatedLinks(relatedLinks, sourceString);
-        }
-
-        private RelatedLink CreateLink(RelatedLink link)
-        {
-            var umbracoContext = _umbracoContextAccessor.UmbracoContext;
-
-            if (link.IsInternal && link.Id != null)
-            {
-                if (umbracoContext == null)
-                    return null;
-
-                var urlProvider = umbracoContext.UrlProvider;
-
-                link.Link = urlProvider.GetUrl((int)link.Id);
-                if (link.Link.Equals("#"))
-                {
-                    link.IsDeleted = true;
-                    link.Link = link.Id.ToString();
-                }
-                else
-                {
-                    link.IsDeleted = false;
-                }
-            }
-
-            return link;
-        }
-
-        public override object ConvertIntermediateToXPath(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-        {
-            if (inter == null) return null;
-            var sourceString = inter.ToString();
-
-            if (sourceString.DetectIsJson())
-            {
-                try
-                {
-                    var obj = JsonConvert.DeserializeObject<Array>(sourceString);
-
-                    var d = new XmlDocument();
-                    var e = d.CreateElement("links");
-                    d.AppendChild(e);
-
-                    foreach (dynamic link in obj)
-                    {
-                        var ee = d.CreateElement("link");
-                        ee.SetAttribute("title", link.title);
-                        ee.SetAttribute("link", link.link);
-                        ee.SetAttribute("type", link.type);
-                        ee.SetAttribute("newwindow", link.newWindow);
-
-                        e.AppendChild(ee);
-                    }
-
-                    return d.CreateNavigator();
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<RelatedLinksValueConverter>(ex, "Could not parse the string {Json} to a json object", sourceString);
-                }
-            }
-
-            //it's not json, just return the string
-            return sourceString;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/RelatedLinksTypeConverter.cs b/src/Umbraco.Web/RelatedLinksTypeConverter.cs
deleted file mode 100644
index 647959b92094..000000000000
--- a/src/Umbraco.Web/RelatedLinksTypeConverter.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Composing;
-using Umbraco.Web.Models;
-
-namespace Umbraco.Web
-{
-    public class RelatedLinksTypeConverter : TypeConverter
-    {
-        private readonly UmbracoHelper _umbracoHelper;
-
-        public RelatedLinksTypeConverter(UmbracoHelper umbracoHelper)
-        {
-            _umbracoHelper = umbracoHelper;
-        }
-
-        public RelatedLinksTypeConverter()
-        {
-
-        }
-
-        private static readonly Type[] ConvertableTypes = new[]
-        {
-            typeof(JArray)
-        };
-
-        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
-        {
-            return ConvertableTypes.Any(x => TypeHelper.IsTypeAssignableFrom(x, destinationType))
-                   || base.CanConvertFrom(context, destinationType);
-        }
-
-        public override object ConvertTo(
-            ITypeDescriptorContext context,
-            CultureInfo culture,
-            object value,
-            Type destinationType)
-        {
-            var relatedLinks = value as RelatedLinks;
-            if (relatedLinks == null)
-                return null;
-
-            if (TypeHelper.IsTypeAssignableFrom<JArray>(destinationType))
-            {
-                // Conversion to JArray taken from old value converter
-
-                var obj = JsonConvert.DeserializeObject<JArray>(relatedLinks.PropertyData);
-
-                var umbracoHelper = GetUmbracoHelper();
-
-                //update the internal links if we have a context
-                if (umbracoHelper != null)
-                {
-                    foreach (var a in obj)
-                    {
-                        var type = a.Value<string>("type");
-                        if (type.IsNullOrWhiteSpace() == false)
-                        {
-                            if (type == "internal")
-                            {
-                                var linkId = a.Value<int>("link");
-                                var link = umbracoHelper.Url(linkId);
-                                a["link"] = link;
-                            }
-                        }
-                    }
-                }
-                return obj;
-
-            }
-
-            return base.ConvertTo(context, culture, value, destinationType);
-        }
-
-        private UmbracoHelper GetUmbracoHelper()
-        {
-            if (_umbracoHelper != null)
-                return _umbracoHelper;
-
-            if (UmbracoContext.Current == null)
-            {
-                Current.Logger.Warn<RelatedLinksTypeConverter>("Cannot create an UmbracoHelper the UmbracoContext is null");
-                return null;
-            }
-
-            //DO NOT assign to _umbracoHelper variable, this is a singleton class and we cannot assign this based on an UmbracoHelper which is request based
-            return new UmbracoHelper(UmbracoContext.Current, Current.Services);
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 6736f7512bfc..64a60d824a23 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -404,10 +404,6 @@
     <Compile Include="Models\Mapping\ContentItemDisplayVariationResolver.cs" />
     <Compile Include="Models\PublishedContent\HttpContextVariationContextAccessor.cs" />
     <Compile Include="Models\PublishedContent\PublishedValueFallback.cs" />
-    <Compile Include="Models\RelatedLink.cs" />
-    <Compile Include="Models\RelatedLinkBase.cs" />
-    <Compile Include="Models\RelatedLinks.cs" />
-    <Compile Include="Models\RelatedLinkType.cs" />
     <Compile Include="Models\SendCodeViewModel.cs" />
     <Compile Include="Models\Trees\ExportMember.cs" />
     <Compile Include="Models\UserTourStatus.cs" />
@@ -453,9 +449,6 @@
     <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" />
-    <Compile Include="PropertyEditors\RelatedLinksConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\RichTextConfiguration.cs" />
     <Compile Include="PropertyEditors\SliderConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\TagConfigurationEditor.cs" />
@@ -471,7 +464,6 @@
     <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentValueConverterBase.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksLegacyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MediaPickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MemberPickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerValueConverter.cs" />
@@ -535,7 +527,6 @@
     <Compile Include="PublishedCache\XmlPublishedCache\XmlStoreFilePersister.cs" />
     <Compile Include="PublishedElementExtensions.cs" />
     <Compile Include="PublishedModels\DummyClassSoThatPublishedModelsNamespaceExists.cs" />
-    <Compile Include="RelatedLinksTypeConverter.cs" />
     <Compile Include="Routing\ContentFinderByUrl.cs" />
     <Compile Include="Routing\ContentFinderByUrlAndTemplate.cs" />
     <Compile Include="Routing\ContentFinderCollection.cs" />
@@ -860,7 +851,6 @@
     <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
     <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
     <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RelatedLinksValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueListConfigurationEditor.cs" />
     <Compile Include="PublishedContentQuery.cs" />
     <Compile Include="ImageCropperTemplateExtensions.cs" />

From dfaa297104babc0fcc5a6a0b6e9a1676e16a9e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 25 Jan 2019 16:33:06 +0100
Subject: [PATCH 064/421] V8: Color refactoring up + first draft to fit with
 2019 brand colors.

---
 .../components/tree/umbtreeitem.directive.js  |   1 +
 src/Umbraco.Web.UI.Client/src/less/belle.less |   2 +-
 .../src/less/button-groups.less               | 229 ++++++++++++++++++
 .../src/less/buttons.less                     |   8 +-
 .../src/less/canvas-designer.less             |   4 +-
 .../application/umb-language-picker.less      |   4 +-
 .../src/less/components/html/umb-alert.less   |   4 +-
 .../less/components/tree/umb-tree-item.less   |   7 +-
 .../less/components/umb-child-selector.less   |  11 +-
 .../components/umb-editor-navigation.less     |  22 +-
 .../less/components/umb-group-builder.less    |  24 +-
 .../src/less/components/umb-tabs.less         |  32 ++-
 .../src/less/mixins.less                      |  16 +-
 .../src/less/property-editors.less            |  10 +-
 .../src/less/sections.less                    |   2 +-
 .../src/less/variables.less                   | 113 +++++----
 .../querybuilder/querybuilder.html            |  12 +-
 .../src/views/common/overlays/user/user.html  |   3 +-
 .../views/components/umb-groups-builder.html  |   4 +-
 19 files changed, 410 insertions(+), 98 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/button-groups.less

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
index 4440ceeb4b9d..20bcdf437c10 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
@@ -141,6 +141,7 @@ angular.module("umbraco.directives")
               defined on the tree
             */
             scope.altSelect = function(n, ev) {
+                if(ev.altKey) return false;
                 umbTreeCtrl.emitEvent("treeNodeAltSelect", { element: element, tree: scope.tree, node: n, event: ev });
             };
             
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index a65b94444e54..78e9cabcfc3e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -25,7 +25,7 @@
 @import "../../lib/bootstrap/less/close.less";
 
 // Components: Buttons & Alerts
-@import "../../lib/bootstrap/less/button-groups.less";
+@import "button-groups.less";
 @import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
 
 // Components: Nav
diff --git a/src/Umbraco.Web.UI.Client/src/less/button-groups.less b/src/Umbraco.Web.UI.Client/src/less/button-groups.less
new file mode 100644
index 000000000000..070e353c1469
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/button-groups.less
@@ -0,0 +1,229 @@
+//
+// Button groups
+// --------------------------------------------------
+
+
+// Make the div behave like a button
+.btn-group {
+  position: relative;
+  display: inline-block;
+  .ie7-inline-block();
+  font-size: 0; // remove as part 1 of font-size inline-block hack
+  vertical-align: middle; // match .btn alignment given font-size hack above
+  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
+  .ie7-restore-left-whitespace();
+}
+
+// Space out series of button groups
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+// Optional: Group multiple button groups together for a toolbar
+.btn-toolbar {
+  font-size: 0; // Hack to remove whitespace that results from using inline-block
+  margin-top: @baseLineHeight / 2;
+  margin-bottom: @baseLineHeight / 2;
+  > .btn + .btn,
+  > .btn-group + .btn,
+  > .btn + .btn-group {
+    margin-left: 5px;
+  }
+}
+
+// Float them, remove border radius, then re-add to first and last elements
+.btn-group > .btn {
+  position: relative;
+  .border-radius(0);
+}
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
+}
+
+// Reset fonts for other sizes
+.btn-group > .btn-mini {
+  font-size: @fontSizeMini;
+}
+.btn-group > .btn-small {
+  font-size: @fontSizeSmall;
+}
+.btn-group > .btn-large {
+  font-size: @fontSizeLarge;
+}
+
+// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  .border-top-left-radius(@baseBorderRadius);
+  .border-bottom-left-radius(@baseBorderRadius);
+}
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  .border-top-right-radius(@baseBorderRadius);
+  .border-bottom-right-radius(@baseBorderRadius);
+}
+// Reset corners for large buttons
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  .border-top-left-radius(@borderRadiusLarge);
+  .border-bottom-left-radius(@borderRadiusLarge);
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  .border-top-right-radius(@borderRadiusLarge);
+  .border-bottom-right-radius(@borderRadiusLarge);
+}
+
+// On hover/focus/active, bring the proper btn to front
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+// On active and open, don't show outline
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+
+
+// Split button dropdowns
+// ----------------------
+
+// Give the line between buttons some depth
+.btn-group > .btn + .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+  *padding-top: 5px;
+  *padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+.btn-group.open {
+
+  // The clickable button for toggling the menu
+  // Remove the gradient and set the same inset shadow as the :active state
+  .dropdown-toggle {
+    background-image: none;
+    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+  }
+
+  // Keep the hover's background when dropdown is open
+  .btn.dropdown-toggle {
+    background-color: @btnBackgroundHighlight;
+  }
+  .btn-primary.dropdown-toggle {
+    background-color: @btnPrimaryBackgroundHighlight;
+  }
+  .btn-warning.dropdown-toggle {
+    background-color: @btnWarningBackgroundHighlight;
+  }
+  .btn-danger.dropdown-toggle {
+    background-color: @btnDangerBackgroundHighlight;
+  }
+  .btn-success.dropdown-toggle {
+    background-color: @btnSuccessBackgroundHighlight;
+  }
+  .btn-info.dropdown-toggle {
+    background-color: @btnInfoBackgroundHighlight;
+  }
+  .btn-inverse.dropdown-toggle {
+    background-color: @btnInverseBackgroundHighlight;
+  }
+}
+
+
+// Reposition the caret
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+// Carets in other button sizes
+.btn-large .caret {
+  margin-top: 6px;
+}
+.btn-large .caret {
+  border-left-width:  5px;
+  border-right-width: 5px;
+  border-top-width:   5px;
+}
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+// Upside down carets for .dropup
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+
+
+/*
+// Account for other colors
+.btn-primary,
+.btn-warning,
+.btn-danger,
+.btn-info,
+.btn-success,
+.btn-inverse {
+  .caret {
+    border-top-color: @white;
+    border-bottom-color: @white;
+  }
+}
+*/
+
+
+// Vertical button groups
+// ----------------------
+
+.btn-group-vertical {
+  display: inline-block; // makes buttons only take up the width they need
+  .ie7-inline-block();
+}
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  .border-radius(0);
+}
+.btn-group-vertical > .btn + .btn {
+  margin-left: 0;
+  margin-top: -1px;
+}
+.btn-group-vertical > .btn:first-child {
+  .border-radius(@baseBorderRadius @baseBorderRadius 0 0);
+}
+.btn-group-vertical > .btn:last-child {
+  .border-radius(0 0 @baseBorderRadius @baseBorderRadius);
+}
+.btn-group-vertical > .btn-large:first-child {
+  .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
+}
+.btn-group-vertical > .btn-large:last-child {
+  .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index 0b21864127de..c99b759b5945 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -189,11 +189,15 @@ input[type="button"] {
 }
 // Success appears as green
 .btn-success {
-  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
+  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight, @btnSuccessType);
 }
 // Info appears as a neutral blue
 .btn-info {
-  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
+  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight, @btnInfoType);
+}
+// Made for Umbraco, 2019
+.btn-action {
+  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight, @btnInfoType);
 }
 // Inverse appears as dark gray
 .btn-inverse {
diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index cbb38a23b180..4d57f200637d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -113,7 +113,7 @@ a, a:hover{
     -webkit-box-shadow: none;
     box-shadow: none;
 }
-
+/*
 .btn-success {
     color: #ffffff;
     text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -133,7 +133,7 @@ a, a:hover{
 .btn-success:hover {
     color: #ffffff;
 }
-
+*/
 .btn-group > .btn + .dropdown-toggle {
     -webkit-box-shadow: none;
     box-shadow: none;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
index 78f631ac0df3..cf252020ee4f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
@@ -52,5 +52,5 @@
 
 .umb-language-picker__dropdown-item--current {
     background-color: @gray-10;
-    border-left: 2px solid @turquoise;
-}
\ No newline at end of file
+    border-left: 2px solid @ui-active;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
index c9aff190ce89..4cbee6b15e58 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
@@ -2,12 +2,12 @@
     padding: 15px;
     box-sizing: border-box;
     background-color: @turquoise-washed;
-    border: 1px solid @turquoise; 
+    border: 1px solid @blueMid; 
 }
 
 .umb-alert--info {
     background-color: @turquoise-washed;
-    border: 1px solid @turquoise;
+    border: 1px solid @blueMid;
 }
 
 .umb-alert--warning {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 39facb1f486e..a0ea622d6b69 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -42,7 +42,8 @@
 
 .umb-tree-item.current > .umb-tree-item__inner {
 
-    background: @ui-active; 
+    background: @ui-active;
+    color:@ui-active-type;
     
     // override small icon color. TODO => check usage 
     &:before {
@@ -56,7 +57,7 @@
         }
 
         i {
-            background: @white;
+            background: @ui-active-type;
             border-color: @ui-active;
             transition: opacity 120ms ease;
         }
@@ -65,7 +66,7 @@
     a,
     .umb-tree-icon,
     ins {
-        color: @white !important;
+        color: @ui-active-type !important;
         background-color: @ui-active;
         border-color: @ui-active;
     }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
index 18275631dd7b..d8e6676728dd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
@@ -19,6 +19,13 @@
   cursor: pointer;
   text-align: center;
   justify-content: center;
+  
+  color:@ui-action;
+  &:hover {
+      color:@ui-action-hover;
+      border-color:@ui-action-hover;
+      text-decoration:none;
+  }
 }
 
 .umb-child-selector__children-container {
@@ -44,11 +51,11 @@
 .umb-child-selector__child-name {
   font-size: 14px;
 }
-
+/*
 .umb-child-selector__child-name.-blue {
   color: @turquoise-d1;
 }
-
+*/
 .umb-child-selector__child-actions {
   flex: 0 0 50px;
   text-align: right;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
index db24210e300b..0982eaed2657 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
@@ -32,8 +32,24 @@
 }
 
 .umb-sub-views-nav-item.is-active {
-  color: @ui-active;
-  border-bottom-color: @ui-active;
+    color: @ui-active;
+    border-bottom-color: @ui-active;
+    
+    //background-color: @ui-active;
+    //color: @ui-active-type;
+    //border-bottom-color: @ui-active-type;
+    /*
+    &::after {
+        content: "";
+        height: 4px;
+        background-color: @ui-active;
+        position: absolute;
+        bottom: -1px;
+        border-radius: 3px 3px 0 0;
+        left: 8px;
+        right: 8px;
+    }
+    */
 }
 
 .show-validation .umb-sub-views-nav-item.-has-error {
@@ -63,7 +79,7 @@
   display: block;
 
   &.-type-alert {
-    background-color: @red-l1;
+    background-color: @red;
   }
   &.-type-warning {
     background-color: @yellow-d2;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index be6729bf56ef..0472deabf6d1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -17,7 +17,7 @@
 }
 
 .umb-group-builder__group.-active {
-  border-color: @turquoise;
+  border-color: @ui-active;
 }
 
 .umb-group-builder__group.-inherited {
@@ -33,10 +33,15 @@
   align-items: center;
   cursor: pointer;
   border: 1px dashed @gray-7;
-  color: @turquoise-d1;
+  color: @ui-action;
   font-weight: bold;
   position: relative;
   box-shadow: none;
+  &:hover {
+      color:@ui-action-hover;
+      text-decoration: none;
+      border-color: @ui-active-hover;
+  }
 }
 
 .umb-group-builder__group.-sortable {
@@ -61,11 +66,12 @@
   position: relative;
   margin-left: auto;
   font-size: 18px;
+  color: @ui-icon;
 }
 
 .umb-group-builder__group-remove:hover {
   cursor: pointer;
-  color: @turquoise;
+  color: @ui-icon-hover;
 }
 
 .umb-group-builder__group-title-wrapper {
@@ -296,10 +302,11 @@ input.umb-group-builder__group-title-input:disabled:hover {
   font-size: 18px;
   position: relative;
   cursor: pointer;
+  color: @ui-icon;
 }
 
 .umb-group-builder__property-action:hover {
-    color: @turquoise;
+    color: @ui-icon-hover;
 }
 
 .umb-group-builder__property-tags {
@@ -416,13 +423,14 @@ input.umb-group-builder__group-sort-value {
         text-align: center;
         display: block;
         border-radius: 5px;
-        color: @gray-3;
         font-weight: bold;
         font-size: 14px;
-        color: @turquoise-d1;
-
+        color: @ui-active;
+        
         &:hover {
             text-decoration: none;
+            color:@ui-active-hover;
+            border-color:@ui-active-hover;
         }
     }
 
@@ -493,4 +501,4 @@ input.umb-group-builder__group-sort-value {
     label.checkbox.no-indent {
         width: 100%;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
index 9da54f0bf958..f0f294ae4a92 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
@@ -16,22 +16,30 @@
 .umb-tab > a {
     cursor: pointer;
     border-bottom: 2px solid transparent;
-    color: @gray-3;
+    color: @ui-action-disgrete;
     padding: 5px 20px 15px 20px;
     transition: color 150ms ease-in-out;
+    &:focus {
+        color: @ui-action-disgrete-hover;
+    }
+    &:hover {
+        color: @ui-action-disgrete-hover;
+        text-decoration: none;
+    }
 }
 
-.umb-tab > a:hover,
-.umb-tab > a:focus {
-    color: @black;
-    text-decoration: none;
-}
 
-.umb-tab--active > a,
-.umb-tab--active > a:hover,
-.umb-tab--active > a:focus {
-  color: @black;
-  border-bottom-color: @turquoise;
+.umb-tab--active > a {
+    color: @ui-active;
+    border-bottom-color: @ui-active;
+    /*
+    &:focus {
+        border-bottom-color: @ui-active;
+    }
+    &:hover {
+        border-bottom-color: @ui-active-hover;
+    }
+    */
 }
 
 .show-validation .umb-tab--error > a,
@@ -72,4 +80,4 @@
     display: inline-block;
     margin: 0 5px 0 0;
     opacity: .6;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index 5b4211f17721..ffeaae680baa 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -517,9 +517,19 @@
 // ------------------
 .buttonBackground(@startColor, @endColor, @textColor: #fff) {
   // gradientBar will set the background to a pleasing blend of these, to support IE<=9
-  .gradientBar(@startColor, @endColor, @textColor);
-  *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+  //.gradientBar(@startColor, @endColor, @textColor);
+  
+  color: @textColor;
+  border-color: @startColor @startColor darken(@startColor, 15%);
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+  
+  background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
   .reset-filter();
+  
+  .caret {
+      border-top-color: @textColor;
+      border-bottom-color: @textColor;
+  }
 
   // button states
   &:hover, &:focus, &:active {
@@ -529,7 +539,7 @@
   // in these cases the gradient won't cover the background, so we override
   &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
     color: @textColor;
-    *background-color: darken(@endColor, 5%);
+    background-color: darken(@endColor, 5%);
   }
 
   // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 3ec8c383dae7..a0d32ee92e6b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -236,15 +236,15 @@
     align-items:center;
     width: 120px;
     text-align: center;
-    color: @gray-8;
-    border: 2px @gray-8 dashed;
+    color: @gray-9;
+    border: 2px @gray-9 dashed;
     text-decoration: none;
 
     transition: all 150ms ease-in-out;
 
     &:hover {
-        color: @turquoise-d1;
-        border-color: @turquoise;
+        color: @ui-action-disgrete-hover;
+        border-color: @ui-action-disgrete-hover;
     }
 }
 
@@ -828,7 +828,7 @@
         cursor: default;
         margin: 7px;
         padding: 10px;
-        background: @turquoise;
+        background: @ui-action;
         position: relative;
 
         .icon-trash{
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index a639d06d5a55..2c5be567c9a0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -36,7 +36,7 @@ ul.sections>li>a::after {
 	content: "";
 	height: 4px;
 	width: 100%;
-	background-color: @ui-active;
+	background-color: #b3afbd;
 	position: absolute;
 	bottom: -4px;
 	border-radius: 3px 3px 0 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index be9276bf3579..7fe253bc82da 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -21,42 +21,6 @@
 @white:                 #FFF;
 @grayIcon:              #9E9E9E;
 
-// Accent colors
-// -------------------------
-
-
-
-@blue:                  #2E8AEA;
-@blueDark:              #3544b1;// updated 2019
-@blueExtraDark:         #1b264f;// added 2019
-@blueLight:             #ADD8E6;
-@blueNight:             #162335;// added 2019
-@green:                 #46A546;
-@red:                   #9D261D;
-@yellow:                #fad634;// updated 2019
-@orange:                #f79c37;// updated 2019
-@pink:                  #C3325F;
-@pinkLight:             #f5c1bc;// added 2019
-@brown:                 #9d8057;// added 2019
-
-@u-greyLight:           #f2ebe6;// added 2019
-@u-white:               #f9f7f4;// added 2019
-
-
-// Accent colors
-// -------------------------
-
-@ui-active:             @pinkLight;
-@ui-active-hover:       @pinkLight;
-@ui-selected:           @pinkLight;
-@ui-selected-hover:     @pinkLight;
-
-@ui-action:             @orange;
-@ui-action-hover:       @orange;
-
-@ui-action-disgrete:             @gray-4;
-@ui-action-disgrete-hover:       @orange;
-
 
 // Colors
 // -------------------------
@@ -78,7 +42,7 @@
 
 // UI Colors
 @red-d1:                #F02E28;
-@red:                   #FE3E39;
+@red:                   #D42054;// updated 2019
 @red-l1:			    #FE6561;
 @red-l2:			    #FE8B88;
 @red-l3:			    #FFB2B0;
@@ -86,14 +50,14 @@
 
 @yellow-d2:             #F0AC00;
 @yellow-d1:             #FFC011;
-@yellow:                #FFCE38;
+@yellow:                #fad634;// updated 2019
 @yellow-l1:			    #FFD861;
 @yellow-l2:			    #FFE28A;
 @yellow-l3:			    #FFECB0;
 @yellow-washed:		    #FFFAEB;
 
 @green-d1:              #1FB572;
-@green:                 #35C786;
+@green:                 #36B37E;// updated 2019
 @green-l1:			    #4ECF95;
 @green-l2:			    #79E1B2;
 @green-l3:			    #A6F0CF;
@@ -131,6 +95,67 @@
 @indigoIcon:            #3F51B5;
 
 
+// Accent colors
+// -------------------------
+
+//@blueLight:               #4f89de;
+@blue:                  #2E8AEA;
+@blueMid:               #2152A3;// updated 2019
+@blueDark:              #3544b1;// updated 2019
+@blueExtraDark:         #1b264f;// added 2019
+@blueLight:             #ADD8E6;
+@blueNight:             #162335;// added 2019
+@orange:                #f79c37;// updated 2019
+@pink:                  #D93F4C;// #C3325F;// update 2019
+@pinkLight:             #f5c1bc;// added 2019
+@brown:                 #9d8057;// added 2019
+@brownLight:            #e4e0dd;// added 2019
+@claus: #f6efe7;
+@claus2: #f2ebe6;
+@claus3: #535963; //#56777A
+@claus4: #819a9e;
+//@claus5: #2152A3;// blueMid
+@claus6: #02A191;
+//@clausSoftRed: #D93F4C; // todo
+//@clausRed:#D42054;// todo.
+
+@u-greyLight:           #f2ebe6;// added 2019
+@u-white:               #f9f7f4;// added 2019
+
+
+// UI colors
+// -------------------------
+
+//@ui-active:           #346ab3;
+@ui-active:             @blueMid;
+@ui-active-type:        white;
+@ui-active-hover:       @blueMid;
+@ui-selected:           @blueMid;//not used jet.
+@ui-selected-hover:     @blueMid;//not used jet.
+
+@ui-action:             @blueMid;
+@ui-action-hover:       @blueMid;
+
+@ui-action-disgrete:             @gray-4;
+@ui-action-disgrete-hover:       @blueMid;
+
+@type-white:                      @u-white;
+@type-black:                      @blueNight;
+
+@ui-btn:                        @claus4;
+@ui-btn-hover:                  @ui-btn;
+@ui-btn-type:                   @u-white;
+
+@ui-btn-positive:               @green;
+@ui-btn-positive-hover:         @green;
+@ui-btn-positive-type:          @u-white;
+
+@ui-btn-negative:               @red;
+@ui-btn-negative-hover:         @red;
+
+@ui-icon:             @blueNight;
+@ui-icon-hover:       @blueMid;
+
 
 
 
@@ -278,11 +303,13 @@
 @btnPrimaryBackground:              @green;
 @btnPrimaryBackgroundHighlight:     @green;
 
-@btnInfoBackground:                 @purple-l1;
-@btnInfoBackgroundHighlight:        @purple-l1;
+@btnInfoType:                       @ui-btn-type;// updated 2019
+@btnInfoBackground:                 @ui-btn;// updated 2019
+@btnInfoBackgroundHighlight:        @ui-btn-hover;// updated 2019
 
-@btnSuccessBackground:              @green;
-@btnSuccessBackgroundHighlight:     @green;
+@btnSuccessType:                    @ui-btn-positive-type;// updated 2019
+@btnSuccessBackground:              @ui-btn-positive;// updated 2019
+@btnSuccessBackgroundHighlight:     @ui-btn-positive-hover;// updated 2019
 
 @btnWarningBackground:              @red-l1;
 @btnWarningBackgroundHighlight:     @red-l1;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
index 8376f50713e3..f919e1df61b4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
@@ -26,7 +26,7 @@
 
 									<umb-button
 										type="button"
-										button-style="outline"
+										button-style="action"
 										action="vm.contentTypeSelectOpen = !vm.contentTypeSelectOpen"
 										label="{{vm.query.contentType.name}}"
 										show-caret="true">
@@ -46,7 +46,7 @@
 
 								<umb-button
 									type="button"
-									button-style="outline"
+									button-style="action"
 									action="vm.chooseSource(vm.query)"
 									label="{{vm.query.source.name}}">
 								</umb-button>
@@ -66,7 +66,7 @@
 
 									<umb-button
 										type="button"
-										button-style="outline"
+										button-style="action"
 										action="vm.propertyFilterOpen[$index] = !vm.propertyFilterOpen[$index]"
 										label="{{filter.property.name}}"
 										show-caret="true">
@@ -86,7 +86,7 @@
 
 									<umb-button
 										type="button"
-										button-style="outline"
+										button-style="action"
 										action="vm.termFilterOpen[$index] = !vm.termFilterOpen[$index]"
 										label="{{filter.term.name}}"
 										show-caret="true">
@@ -135,7 +135,7 @@
 
 									<umb-button
 										type="button"
-										button-style="outline"
+										button-style="action"
 										action="vm.sortPropertyOpen = !vm.sortPropertyOpen"
 										label="{{vm.query.sort.property.name}}"
 										show-caret="true">
@@ -154,7 +154,7 @@
 								<umb-button
 									ng-show="vm.query.sort.property.name"
 									type="button"
-									button-style="outline"
+									button-style="action"
 									action="vm.changeSortOrder(vm.query)"
 									label="{{vm.query.sort.translation.currentLabel}}">
 								</umb-button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 8021d66a4320..754b170f2349 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -15,7 +15,7 @@ <h5><localize key="user_yourProfile" /></h5>
             type="link"
             href="#/users/users/user/{{user.id}}"
             action="model.close()"
-            button-style="primary"
+            button-style="action"
             label="Edit"
             label-key="general_edit"
             ng-if="canEditProfile">
@@ -25,6 +25,7 @@ <h5><localize key="user_yourProfile" /></h5>
             alias="changePassword"
             type="button"
             action="togglePasswordFields()"
+            button-style="action"
             label="Change password"
             label-key="general_changePassword"
             button-style="success">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index c0490a1707ca..e1d018282606 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -9,7 +9,7 @@
                 alias="compositions"
                 ng-if="compositions !== false"
                 type="button"
-                button-style="outline"
+                button-style="action"
                 label-key="contentTypeEditor_compositions"
                 icon="icon-merge"
                 action="openCompositionsDialog()"
@@ -21,7 +21,7 @@
                 alias="reorder"
                 ng-if="sorting !== false"
                 type="button"
-                button-style="outline"
+                button-style="action"
                 label-key="{{sortingButtonKey}}"
                 icon="icon-navigation"
                 action="toggleSortingMode();"

From de8516d2c7bdc1a94b2ab5b1836b93a219db3c85 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 21 Jan 2019 19:02:52 +0100
Subject: [PATCH 065/421] Make it possible to create folders for stylesheets

---
 src/Umbraco.Core/Services/IFileService.cs     | 13 +++++++
 .../Services/Implement/FileService.cs         | 18 ++++++++++
 .../views/stylesheets/create.controller.js    | 35 ++++++++++++++++++-
 .../src/views/stylesheets/create.html         | 30 ++++++++++++++--
 src/Umbraco.Web/Editors/CodeFileController.cs | 11 +++++-
 5 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index a895eff7e14a..d32c984b5e0a 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -108,6 +108,19 @@ public interface IFileService : IService
         /// <param name="folderPath"></param>
         void DeleteScriptFolder(string folderPath);
 
+        /// <summary>
+        /// Creates a folder for style sheets
+        /// </summary>
+        /// <param name="folderPath"></param>
+        /// <returns></returns>
+        void CreateStyleSheetFolder(string folderPath);
+
+        /// <summary>
+        /// Deletes a folder for style sheets
+        /// </summary>
+        /// <param name="folderPath"></param>
+        void DeleteStyleSheetFolder(string folderPath);
+
         /// <summary>
         /// Gets a list of all <see cref="ITemplate"/> objects
         /// </summary>
diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index da82d38e368a..888407c0d024 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -140,6 +140,24 @@ public bool ValidateStylesheet(Stylesheet stylesheet)
             }
         }
 
+        public void CreateStyleSheetFolder(string folderPath)
+        {
+            using (var scope = ScopeProvider.CreateScope())
+            {
+                ((StylesheetRepository) _stylesheetRepository).AddFolder(folderPath);
+                scope.Complete();
+            }
+        }
+
+        public void DeleteStyleSheetFolder(string folderPath)
+        {
+            using (var scope = ScopeProvider.CreateScope())
+            {
+                ((StylesheetRepository) _stylesheetRepository).DeleteFolder(folderPath);
+                scope.Complete();
+            }
+        }
+
         public Stream GetStylesheetFileContentStream(string filepath)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
index b37b16d4d68c..6033a6bdc7ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function StyleSheetsCreateController($scope, $location, navigationService) {
+    function StyleSheetsCreateController($scope, $location, navigationService, formHelper, codefileResource) {
 
         var vm = this;
         var node = $scope.currentNode;
@@ -9,6 +9,9 @@
         vm.createFile = createFile;
         vm.createRichtextStyle = createRichtextStyle;
         vm.close = close;
+        vm.creatingFolder = false;
+        vm.showCreateFolder = showCreateFolder;
+        vm.createFolder = createFolder;
 
         function createFile() {
             $location.path("/settings/stylesheets/edit/" + node.id).search("create", "true");
@@ -19,6 +22,36 @@
             $location.path("/settings/stylesheets/edit/" + node.id).search("create", "true").search("rtestyle", "true");
             navigationService.hideMenu();
         }
+        
+        function showCreateFolder() {
+            vm.creatingFolder = true;
+        }
+
+        function createFolder(form) {
+
+            if (formHelper.submitForm({scope: $scope, formCtrl: form })) {
+
+                codefileResource.createContainer("stylesheets", node.id, vm.folderName).then(function (saved) {
+
+                    navigationService.hideMenu();
+
+                    navigationService.syncTree({
+                        tree: "stylesheets",
+                        path: saved.path,
+                        forceReload: true,
+                        activate: true
+                    });
+
+                    formHelper.resetForm({ scope: $scope });
+
+                }, function(err) {
+
+                  vm.createFolderError = err;
+                    
+                });
+            }
+
+        }
 
         function close() {
             const showMenu = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
index 71811d2b07d9..0554c430d1ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
@@ -2,7 +2,7 @@
 
     <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
 
-        <div class="umb-pane">
+        <div class="umb-pane" ng-if="!vm.creatingFolder">
             <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
             <ul class="umb-actions umb-actions-child">
@@ -18,10 +18,36 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
                         <span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
                     </a>
                 </li>
+                <li class="umb-action">
+                    <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                        <i class="large icon icon-folder"></i>
+                        <span class="menu-label"><localize key="general_folder"></localize>...</span>
+                    </a>
+                </li>
             </ul>
 
         </div>
 
+        <div class="umb-pane" ng-if="vm.creatingFolder">
+            <form novalidate name="createFolderForm"
+                  ng-submit="vm.createFolder(createFolderForm)"
+                  val-form-manager>
+
+                <div ng-show="vm.createFolderError">
+                    <div class="alert alert-error">
+                        <div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
+                        <div>{{vm.createFolderError.data.message}}</div>
+                    </div>
+                </div>
+
+                <umb-control-group label="Enter a folder name" hide-label="false">
+                    <input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+                </umb-control-group>
+
+                <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
+            </form>
+        </div>
+
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
@@ -30,4 +56,4 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
         </button>
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index e995fa50a394..ec72ca3df4a0 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -68,7 +68,7 @@ public HttpResponseMessage PostCreate(string type, CodeFileDisplay display)
         }
 
         /// <summary>
-        /// Used to create a container/folder in 'partialViews', 'partialViewMacros' or 'scripts'
+        /// Used to create a container/folder in 'partialViews', 'partialViewMacros', 'scripts' or 'stylesheets'
         /// </summary>
         /// <param name="type">'partialViews', 'partialViewMacros' or 'scripts'</param>
         /// <param name="parentId">The virtual path of the parent.</param>
@@ -111,6 +111,10 @@ public CodeFileDisplay PostCreateContainer(string type, string parentId, string
                     virtualPath = NormalizeVirtualPath(name, SystemDirectories.Scripts);
                     Services.FileService.CreateScriptFolder(virtualPath);
                     break;
+                case Core.Constants.Trees.Stylesheets:
+                    virtualPath = NormalizeVirtualPath(name, SystemDirectories.Css);
+                    Services.FileService.CreateStyleSheetFolder(virtualPath);
+                    break;
 
             }
 
@@ -328,6 +332,11 @@ public HttpResponseMessage Delete(string type, string virtualPath)
                     return Request.CreateErrorResponse(HttpStatusCode.NotFound, "No Script or folder found with the specified path");
 
                 case Core.Constants.Trees.Stylesheets:
+                    if (IsDirectory(virtualPath, SystemDirectories.Css))
+                    {
+                        Services.FileService.DeleteStyleSheetFolder(virtualPath);
+                        return Request.CreateResponse(HttpStatusCode.OK);
+                    }
                     if (Services.FileService.GetStylesheetByName(virtualPath) != null)
                     {
                         Services.FileService.DeleteStylesheet(virtualPath, Security.CurrentUser.Id);

From 43a97185b61e778139c7e67b7894ad9c94d0f999 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 21 Jan 2019 19:03:16 +0100
Subject: [PATCH 066/421] Clean up file system tree controller handling of
 no-op for nodes

---
 src/Umbraco.Web/Trees/FileSystemTreeController.cs        | 5 ++++-
 src/Umbraco.Web/Trees/FilesTreeController.cs             | 6 ------
 src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs | 6 ------
 src/Umbraco.Web/Trees/PartialViewsTreeController.cs      | 7 -------
 src/Umbraco.Web/Trees/ScriptsTreeController.cs           | 6 ------
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
index 528e57773c94..11160ab2822c 100644
--- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -28,7 +28,10 @@ protected virtual void OnRenderFileNode(ref TreeNode treeNode) { }
         /// Inheritors can override this method to modify the folder node that is created.
         /// </summary>
         /// <param name="treeNode"></param>
-        protected virtual void OnRenderFolderNode(ref TreeNode treeNode) { }
+        protected virtual void OnRenderFolderNode(ref TreeNode treeNode) {
+            //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
+            treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
+        }
 
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
diff --git a/src/Umbraco.Web/Trees/FilesTreeController.cs b/src/Umbraco.Web/Trees/FilesTreeController.cs
index 598eb713eb86..99c4ade09ecf 100644
--- a/src/Umbraco.Web/Trees/FilesTreeController.cs
+++ b/src/Umbraco.Web/Trees/FilesTreeController.cs
@@ -15,11 +15,5 @@ public class FilesTreeController : FileSystemTreeController
         protected override string[] Extensions => ExtensionsStatic;
 
         protected override string FileIcon => "icon-document";
-
-        protected override void OnRenderFolderNode(ref TreeNode treeNode)
-        {
-            //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
-            treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-        }
     }
 }
diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
index c874b01244dd..f8c3fe3e9aeb 100644
--- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
@@ -23,11 +23,5 @@ public class PartialViewMacrosTreeController : PartialViewsTreeController
         protected override string[] Extensions => ExtensionsStatic;
 
         protected override string FileIcon => "icon-article";
-
-        protected override void OnRenderFolderNode(ref TreeNode treeNode)
-        {
-            //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
-            treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-        }
     }
 }
diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
index a7aa8f134ecc..113f907e120e 100644
--- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
@@ -23,12 +23,5 @@ public class PartialViewsTreeController : FileSystemTreeController
         protected override string[] Extensions => ExtensionsStatic;
 
         protected override string FileIcon => "icon-article";
-
-        protected override void OnRenderFolderNode(ref TreeNode treeNode)
-        {
-            //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
-            treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-            treeNode.Icon = "icon-folder";
-        }
     }
 }
diff --git a/src/Umbraco.Web/Trees/ScriptsTreeController.cs b/src/Umbraco.Web/Trees/ScriptsTreeController.cs
index 191c9a7f8e36..2fbeae4f6bae 100644
--- a/src/Umbraco.Web/Trees/ScriptsTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptsTreeController.cs
@@ -16,11 +16,5 @@ public class ScriptsTreeController : FileSystemTreeController
         protected override string[] Extensions => ExtensionsStatic;
 
         protected override string FileIcon => "icon-script";
-
-        protected override void OnRenderFolderNode(ref TreeNode treeNode)
-        {
-            //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
-            treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-        }
     }
 }

From c9819b2d89fe9b17a726c5b0afc045c1e87ffa29 Mon Sep 17 00:00:00 2001
From: Paul Seal <prjseal@gmail.com>
Date: Sat, 26 Jan 2019 14:01:03 +0000
Subject: [PATCH 067/421] - disabled the duplicated community health checks
 (#4175)

---
 src/Umbraco.Web.UI/config/HealthChecks.config | 30 +++++++++----------
 .../HealthCheck/HealthCheckController.cs      |  4 +--
 .../Scheduling/HealthCheckNotifier.cs         |  2 +-
 src/Umbraco.Web/WebBootManager.cs             | 13 ++++++++
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/HealthChecks.config b/src/Umbraco.Web.UI/config/HealthChecks.config
index 4e927e8bb636..5cb99e195b9d 100644
--- a/src/Umbraco.Web.UI/config/HealthChecks.config
+++ b/src/Umbraco.Web.UI/config/HealthChecks.config
@@ -8,19 +8,19 @@ For details on the format of this configuration file see:
 https://our.umbraco.com/documentation/reference/config/healthchecks
 -->
 <HealthChecks>
-  <disabledChecks>
-    <!--<check id="1B5D221B-CE99-4193-97CB-5F3261EC73DF" disabledOn="" disabledBy="0" />-->
-  </disabledChecks>
-  <notificationSettings enabled="true" firstRunTime="" periodInHours="24">
-    <notificationMethods>
-      <notificationMethod alias="email" enabled="true" verbosity="Summary">
-        <settings>
-          <add key="recipientEmail" value="" />
-        </settings>
-      </notificationMethod>
-    </notificationMethods>
     <disabledChecks>
-      <!--<check id="EB66BB3B-1BCD-4314-9531-9DA2C1D6D9A7" disabledOn="" disabledBy="0" />-->
-    </disabledChecks>    
-  </notificationSettings>
-</HealthChecks> 
\ No newline at end of file
+        <!--<check id="1B5D221B-CE99-4193-97CB-5F3261EC73DF" disabledOn="" disabledBy="0" />-->
+    </disabledChecks>
+    <notificationSettings enabled="true" firstRunTime="" periodInHours="24">
+        <notificationMethods>
+            <notificationMethod alias="email" enabled="true" verbosity="Summary">
+                <settings>
+                    <add key="recipientEmail" value="" />
+                </settings>
+            </notificationMethod>
+        </notificationMethods>
+        <disabledChecks>
+            <!--<check id="EB66BB3B-1BCD-4314-9531-9DA2C1D6D9A7" disabledOn="" disabledBy="0" />-->
+        </disabledChecks>    
+    </notificationSettings>
+</HealthChecks> 
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckController.cs b/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
index 34d201d5fe9b..dee62e936bc0 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
@@ -82,7 +82,7 @@ public object GetAllHealthChecks()
         public object GetStatus(Guid id)
         {
             var check = GetCheckById(id);
-            
+
             try
             {
                 //Core.Logging.LogHelper.Debug<HealthCheckController>("Running health check: " + check.Name);
@@ -113,4 +113,4 @@ private HealthCheck GetCheckById(Guid id)
             return check;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs b/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
index d6e72f936bfc..7d42a90e58e7 100644
--- a/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
+++ b/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
@@ -16,7 +16,7 @@ internal class HealthCheckNotifier : RecurringTaskBase
         private readonly ApplicationContext _appContext;
         private readonly IHealthCheckResolver _healthCheckResolver;
 
-        public HealthCheckNotifier(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds, 
+        public HealthCheckNotifier(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
             ApplicationContext appContext)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index dbab3d23463a..faf1418b42f5 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -544,6 +544,19 @@ protected override void InitializeResolvers()
                 () => PluginManager.ResolveTypes<HealthCheck.HealthCheck>());
             HealthCheckNotificationMethodResolver.Current = new HealthCheckNotificationMethodResolver(LoggerResolver.Current.Logger,
                 () => PluginManager.ResolveTypes<HealthCheck.NotificationMethods.IHealthCheckNotificatationMethod>());
+
+            // Disable duplicate community health checks which appear in Our.Umbraco.HealtchChecks and Umbraco Core.
+            // See this issue to understand why https://github.com/umbraco/Umbraco-CMS/issues/4174
+            var disabledHealthCheckTypes = new[]
+            {
+                "Our.Umbraco.HealthChecks.Checks.Security.HstsCheck",
+                "Our.Umbraco.HealthChecks.Checks.Security.TlsCheck"
+            }.Select(TypeFinder.GetTypeByName).WhereNotNull();
+
+            foreach (var type in disabledHealthCheckTypes)
+            {
+                HealthCheckResolver.Current.RemoveType(type);
+            }
         }
 
         /// <summary>

From 7a2f09643abf4ba9db5e648c8a816e0e6c95d37f Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Wed, 23 Jan 2019 23:50:02 +0100
Subject: [PATCH 068/421] Changed health check to indicate HTTPS endpoint
 connectivity using TLS 1.2

---
 .../Umbraco/config/lang/zh_tw.xml             |  3 --
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  4 +-
 .../umbraco/config/lang/en_us.xml             |  4 +-
 src/Umbraco.Web.UI/umbraco/config/lang/fr.xml |  3 --
 src/Umbraco.Web.UI/umbraco/config/lang/nl.xml |  4 +-
 src/Umbraco.Web.UI/umbraco/config/lang/pl.xml |  3 --
 src/Umbraco.Web.UI/umbraco/config/lang/ru.xml |  3 --
 src/Umbraco.Web.UI/umbraco/config/lang/zh.xml |  3 --
 .../HealthCheck/Checks/Security/TlsCheck.cs   | 51 ------------------
 .../HealthCheck/Checks/Services/Tls12Check.cs | 52 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 11 files changed, 59 insertions(+), 73 deletions(-)
 delete mode 100644 src/Umbraco.Web/HealthCheck/Checks/Security/TlsCheck.cs
 create mode 100644 src/Umbraco.Web/HealthCheck/Checks/Services/Tls12Check.cs

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index ba30581267dd..d765b7cecfaa 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -1331,9 +1331,6 @@
     <key alias="smtpMailSettingsConnectionFail">SMTP伺服器 %0% : %1% 無法連接。請確認在Web.config 檔案中 system.net/mailsettings 設定正確。</key>
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[提醒郵件已經設為 <strong>%0%</strong>。]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[提醒郵件仍為預設值<strong>%0%</strong>。]]></key>
-
-    <key alias="tlsHealthCheckSuccess">您的網站設置為使用TLS 1.2或更高版本進行傳出連接。</key>
-    <key alias="tlsHealthCheckWarn">來自您網站的傳出連接通過舊協議提供。您應該考慮將其更新為使用TLS 1.2或更高版本。</key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">停止網址追蹤器</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 06a7fbb109b2..53a58bd7b180 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -2207,8 +2207,8 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
         <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
 
-        <key alias="tlsHealthCheckSuccess">Your website is set up to use TLS 1.2 or greater for outgoing connections.</key>
-        <key alias="tlsHealthCheckWarn">Outgoing connections from your website are being served over an old protocol. You should consider updating it to use TLS 1.2 or higher.</key>
+        <key alias="tls12HealthCheckSuccess">Your site can use the TLS 1.2 security protocol when making outbound connections to HTTPS endpoints.</key>
+        <key alias="tls12HealthCheckWarn">Your site isn't configured to allow the TLS 1.2 security protocol when making outbound connections: some HTTPS endpoints might not be reachable using a less secure protocol.</key>
     </area>
     <area alias="redirectUrls">
         <key alias="disableUrlTracker">Disable URL tracker</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 766d2eec9e58..a2b7e6d0402b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -2200,8 +2200,8 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
         <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
 
-        <key alias="tlsHealthCheckSuccess">Your website is set up to use TLS 1.2 or greater for outgoing connections.</key>
-        <key alias="tlsHealthCheckWarn">Outgoing connections from your website are being served over an old protocol. You should consider updating it to use TLS 1.2 or higher.</key>
+        <key alias="tls12HealthCheckSuccess">Your site can use the TLS 1.2 security protocol when making outbound connections to HTTPS endpoints.</key>
+        <key alias="tls12HealthCheckWarn">Your site isn't configured to allow the TLS 1.2 security protocol when making outbound connections: some HTTPS endpoints might not be reachable using a less secure protocol.</key>
     </area>
     <area alias="redirectUrls">
         <key alias="disableUrlTracker">Disable URL tracker</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index dab9f49120b3..fd2b4c53a8af 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -2170,9 +2170,6 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[L'adresse email de notification est toujours à sa valeur par défaut : <strong>%0%</strong>.]]></key>
     <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Les résultats de l'exécution du Umbraco Health Checks planifiée le %0% à %1% sont les suivants :</p>%2%</body></html>]]></key>
     <key alias="scheduledHealthCheckEmailSubject">Statut du Umbraco Health Check: %0%</key>
-
-    <key alias="tlsHealthCheckSuccess">Votre site Web est configuré pour utiliser TLS version 1.2 ou supérieure pour les connexions sortantes.</key>
-    <key alias="tlsHealthCheckWarn">Les connexions sortantes de votre site Web sont servies via un ancien protocole. Vous devriez envisager de le mettre à jour pour utiliser TLS 1.2 ou supérieur.</key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">Désactiver URL tracker</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index 4680d0dfc51d..dc867823c2fa 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -1624,8 +1624,8 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op de
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notificatie email is verzonden naar <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notificatie email staat nog steeds op de default waarde van <strong>%0%</strong>.]]></key>
 
-    <key alias="tlsHealthCheckSuccess">Uw website is ingesteld om TLS 1.2 of hoger te gebruiken voor uitgaande verbindingen.</key>
-    <key alias="tlsHealthCheckWarn">Uitgaande verbindingen van uw website worden via een oud protocol bediend. U zou moeten overwegen om het bij te werken om TLS 1.2 of hoger te gebruiken.</key>
+    <key alias="tls12HealthCheckSuccess">Uw website kan het TLS 1.2 beveiligingsprotocol gebruiken bij het maken van uitgaande verbindingen naar HTTPS-eindpunten.</key>
+    <key alias="tls12HealthCheckWarn">Uw website is niet geconfigureerd om het TLS 1.2 beveiligingsprotocol te kunnen gebruiken bij het maken van uitgaande verbindingen: sommige HTTPS-eindpunten zijn mogelijk niet bereikbaar via een minder veilig protocol.</key>
   </area>
 	<area alias="redirectUrls">
     <key alias="disableUrlTracker">URL tracker uitzetten</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index bb36628757e4..9affa43727d8 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -1674,9 +1674,6 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
 
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[E-mail z powiadomieniem został wysłany do <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[E-mail do powiadomień jest nadal ustawiony na domyślną wartość <strong>%0%</strong>.]]></key>
-
-    <key alias="tlsHealthCheckSuccess">Twoja strona internetowa jest skonfigurowana do używania protokołu TLS 1.2 lub nowszego dla połączeń wychodzących.</key>
-    <key alias="tlsHealthCheckWarn">Połączenia wychodzące z Twojej witryny są obsługiwane przez stary protokół. Należy rozważyć zaktualizowanie go do korzystania z TLS w wersji 1.2 lub nowszej.</key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">Wyłącz śledzenie URL</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index 37a4613d435d..fd33e647adc5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -870,9 +870,6 @@
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Адрес для отправки уведомлений все еще установлен в значение по-умолчанию <strong>%0%</strong>.]]></key>
     <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Зафиксированы следующие результаты автоматической проверки состояния Umbraco по расписанию, запущенной на %0% в %1%:</p>%2%</body></html>]]></key>
     <key alias="scheduledHealthCheckEmailSubject">Результат проверки состояния Umbraco: %0%</key>
-
-    <key alias="tlsHealthCheckSuccess">Ваш веб-сайт настроен на использование TLS 1.2 или выше для исходящих соединений.</key>
-    <key alias="tlsHealthCheckWarn">Исходящие соединения с вашего сайта обслуживаются по старому протоколу. Вы должны рассмотреть возможность его обновления для использования TLS 1.2 или выше.</key>
   </area>
   <area alias="help">
     <key alias="goTo">перейти к</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
index 471925ccd5dd..a918b78f95c2 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
@@ -1598,9 +1598,6 @@
     <key alias="smtpMailSettingsConnectionFail">The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct.</key>
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
-
-    <key alias="tlsHealthCheckSuccess">您的网站设置为使用TLS 1.2或更高版本进行传出连接。</key>
-    <key alias="tlsHealthCheckWarn">来自您网站的传出连接通过旧协议提供。您应该考虑将其更新为使用TLS 1.2或更高版本。</key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">禁用 url 跟踪程序</key>
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/TlsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/TlsCheck.cs
deleted file mode 100644
index 8d4196539567..000000000000
--- a/src/Umbraco.Web/HealthCheck/Checks/Security/TlsCheck.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using Umbraco.Core.Services;
-
-namespace Umbraco.Web.HealthCheck.Checks.Security
-{
-    [HealthCheck("6D7D4E11-758E-4697-BA72-7E02A530CBD4",
-        "TLS Check",
-        Description = "Checks that your site is set up to use at least TLS 1.2 for outgoing connections.",
-        Group = "Security")]
-    public class TlsCheck : HealthCheck
-    {
-        private readonly ILocalizedTextService _textService;
-
-        public TlsCheck(HealthCheckContext healthCheckContext) : base(healthCheckContext)
-        {
-            _textService = healthCheckContext.ApplicationContext.Services.TextService;
-        }
-
-        public override IEnumerable<HealthCheckStatus> GetStatus()
-        {
-            return new[] { CheckTls() };
-        }
-
-        public override HealthCheckStatus ExecuteAction(HealthCheckAction action)
-        {
-            throw new InvalidOperationException("TlsCheck has no executable actions");
-        }
-
-        public HealthCheckStatus CheckTls()
-        {
-            bool success = (int)ServicePointManager.SecurityProtocol >= (int)SecurityProtocolType.Tls12;
-
-            string message = success
-                ? _textService.Localize("healthcheck/tlsHealthCheckSuccess")
-                : _textService.Localize("healthcheck/tlsHealthCheckWarn");
-
-            var actions = new List<HealthCheckAction>();
-
-            return
-                new HealthCheckStatus(message)
-                {
-                    ResultType = success
-                        ? StatusResultType.Success
-                        : StatusResultType.Warning,
-                    Actions = actions
-                };
-        }
-    }
-}
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Services/Tls12Check.cs b/src/Umbraco.Web/HealthCheck/Checks/Services/Tls12Check.cs
new file mode 100644
index 000000000000..d93fa28b49f3
--- /dev/null
+++ b/src/Umbraco.Web/HealthCheck/Checks/Services/Tls12Check.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Web.HealthCheck.Checks.Services
+{
+    [HealthCheck("6D7D4E11-758E-4697-BA72-7E02A530CBD4",
+        "HTTPS endpoints (TLS 1.2)",
+        Description = "Checks whether the TLS 1.2 security protocol can be used when making outbound connections to HTTPS endpoints.",
+        Group = "Services")]
+    public class Tls12Check : HealthCheck
+    {
+        private readonly ILocalizedTextService _textService;
+
+        public Tls12Check(HealthCheckContext healthCheckContext) : base(healthCheckContext)
+        {
+            _textService = healthCheckContext.ApplicationContext.Services.TextService;
+        }
+
+        public override IEnumerable<HealthCheckStatus> GetStatus()
+        {
+            return new[] { CheckTls() };
+        }
+
+        public override HealthCheckStatus ExecuteAction(HealthCheckAction action)
+        {
+            throw new InvalidOperationException("This check has no executable actions.");
+        }
+
+        public HealthCheckStatus CheckTls()
+        {
+            // When set to 0 (SystemDefault), allows the operating system to choose the best protocol to use, and to block protocols that are not secure (this allows TLS 1.2 by default).
+            var success = ServicePointManager.SecurityProtocol == 0 ||
+                ServicePointManager.SecurityProtocol.HasFlag(SecurityProtocolType.Tls12);
+
+            var message = success
+                ? _textService.Localize("healthcheck/tls12HealthCheckSuccess")
+                : _textService.Localize("healthcheck/tls12HealthCheckWarn");
+
+            var actions = new List<HealthCheckAction>();
+
+            return new HealthCheckStatus(message)
+            {
+                ResultType = success
+                    ? StatusResultType.Success
+                    : StatusResultType.Warning,
+                Actions = actions
+            };
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index a66e960e97be..036cb96b5032 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -338,7 +338,7 @@
     <Compile Include="Editors\CodeFileController.cs" />
     <Compile Include="Editors\TourController.cs" />
     <Compile Include="Features\EnabledFeatures.cs" />
-    <Compile Include="HealthCheck\Checks\Security\TlsCheck.cs" />
+    <Compile Include="HealthCheck\Checks\Services\Tls12Check.cs" />
     <Compile Include="HealthCheck\Checks\Security\XssProtectionCheck.cs" />
     <Compile Include="HealthCheck\Checks\Security\HstsCheck.cs" />
     <Compile Include="Models\BackOfficeTourFilter.cs" />

From a13a38a482336440962e18aa607fa7c4f5b88ba9 Mon Sep 17 00:00:00 2001
From: Chris Houston <chouston@vizioz.com>
Date: Sat, 26 Jan 2019 09:42:14 -0500
Subject: [PATCH 069/421] Updated all the TODO: comments in the Umbraco.Core
 project so they are all in the same format.  ( // TODO: ) (#4220)

Also moved some of the comments so they are will work better / are not within Code Documentation comments
---
 src/Umbraco.Core/Composing/Lifetime.cs          |  2 +-
 .../Events/QueuingEventDispatcher.cs            |  2 +-
 src/Umbraco.Core/IO/FileSystems.cs              |  2 +-
 src/Umbraco.Core/IO/PhysicalFileSystem.cs       |  2 +-
 .../Migrations/IMigrationExpression.cs          |  2 +-
 .../Migrations/Install/DatabaseSchemaResult.cs  |  2 +-
 src/Umbraco.Core/Models/ContentBase.cs          |  4 ++--
 src/Umbraco.Core/Models/ContentTypeBase.cs      |  2 +-
 src/Umbraco.Core/Models/GridValue.cs            |  4 ++--
 src/Umbraco.Core/Models/IContent.cs             |  2 +-
 .../Models/IContentTypeComposition.cs           |  2 +-
 .../Models/Identity/BackOfficeIdentityUser.cs   |  4 ++--
 src/Umbraco.Core/Models/MediaExtensions.cs      |  2 +-
 src/Umbraco.Core/Models/Membership/User.cs      |  2 +-
 .../Models/Packaging/CompiledPackage.cs         | 16 ++++++++--------
 src/Umbraco.Core/Models/Property.cs             |  4 ++--
 src/Umbraco.Core/Models/PropertyCollection.cs   |  2 +-
 .../Models/PropertyGroupCollection.cs           |  2 +-
 .../Models/PropertyTagsExtensions.cs            |  2 +-
 src/Umbraco.Core/Models/PropertyType.cs         |  6 +++---
 .../Models/PropertyTypeCollection.cs            |  4 ++--
 .../PublishedContent/IPublishedContent.cs       |  2 +-
 .../PublishedContent/PublishedContentType.cs    |  8 +++++---
 .../PublishedContent/PublishedPropertyType.cs   |  2 +-
 .../Persistence/Constants-DatabaseSchema.cs     |  4 ++--
 .../Dtos/ContentVersionCultureVariationDto.cs   |  4 ++--
 .../Persistence/Dtos/ContentVersionDto.cs       |  6 +++---
 .../Persistence/Dtos/DataTypeDto.cs             |  2 +-
 src/Umbraco.Core/Persistence/Dtos/NodeDto.cs    |  4 ++--
 .../Persistence/Factories/ContentBaseFactory.cs | 10 +++++-----
 src/Umbraco.Core/Persistence/LocalDb.cs         |  4 ++--
 .../Persistence/NPocoDatabaseExtensions-Bulk.cs |  6 +++---
 .../Persistence/NPocoDatabaseExtensions.cs      |  4 ++--
 .../Persistence/NPocoSqlExtensions.cs           |  4 ++--
 .../Querying/ExpressionVisitorBase.cs           |  2 +-
 .../Implement/ContentRepositoryBase.cs          | 12 ++++++------
 .../Implement/ContentTypeRepositoryBase.cs      |  3 +--
 .../Implement/DocumentRepository.cs             | 17 ++++++++---------
 .../Repositories/Implement/EntityRepository.cs  | 16 ++++++++--------
 .../Repositories/Implement/MediaRepository.cs   |  4 ++--
 .../Implement/MemberGroupRepository.cs          |  2 +-
 .../Repositories/Implement/MemberRepository.cs  | 14 +++++++-------
 .../Implement/NPocoRepositoryBase.cs            |  2 +-
 .../Implement/RepositoryBaseOfTIdTEntity.cs     |  2 +-
 .../Implement/ServerRegistrationRepository.cs   |  2 +-
 .../Repositories/Implement/UserRepository.cs    |  4 ++--
 .../Persistence/SqlSyntaxExtensions.cs          |  2 +-
 src/Umbraco.Core/Persistence/UmbracoDatabase.cs |  4 ++--
 .../Persistence/UmbracoDatabaseFactory.cs       |  8 ++++----
 src/Umbraco.Core/PropertyEditors/DataEditor.cs  |  4 ++--
 .../PropertyEditors/DataValueEditor.cs          |  2 +-
 src/Umbraco.Core/PropertyEditors/IDataEditor.cs |  2 +-
 .../PropertyEditors/IDataValueEditor.cs         |  4 ++--
 .../ManifestValueValidatorCollection.cs         |  2 +-
 .../TagsPropertyEditorAttribute.cs              |  2 +-
 .../ValueConverters/SliderValueConverter.cs     |  2 +-
 src/Umbraco.Core/Scoping/Scope.cs               |  6 +++---
 src/Umbraco.Core/Scoping/ScopeContext.cs        |  5 +----
 src/Umbraco.Core/Services/IContentService.cs    |  2 +-
 src/Umbraco.Core/Services/IEntityService.cs     |  3 ++-
 .../Services/IEntityXmlSerializer.cs            |  2 +-
 .../Services/Implement/ContentService.cs        | 10 +++++-----
 ...TypeServiceBaseOfTRepositoryTItemTService.cs |  2 +-
 .../Services/Implement/DataTypeService.cs       |  8 ++++----
 .../Services/Implement/EntityService.cs         |  2 +-
 .../Services/Implement/EntityXmlSerializer.cs   |  2 +-
 .../Services/Implement/FileService.cs           |  2 +-
 .../Services/Implement/MediaService.cs          |  4 ++--
 .../Services/Implement/MemberService.cs         |  2 +-
 .../Services/Implement/NotificationService.cs   |  2 +-
 .../Services/Implement/RelationService.cs       |  2 +-
 .../Implement/ScopeRepositoryService.cs         |  2 +-
 .../Services/Implement/UserService.cs           |  4 ++--
 src/Umbraco.Core/Services/OperationResult.cs    |  5 ++---
 .../Services/OperationResultType.cs             |  2 +-
 src/Umbraco.Core/Services/PublishResultType.cs  |  2 +-
 .../Strings/Utf8ToAsciiConverter.cs             |  3 +--
 src/Umbraco.Core/Sync/ApplicationUrlHelper.cs   |  2 +-
 .../Sync/DatabaseServerMessenger.cs             |  2 +-
 79 files changed, 157 insertions(+), 161 deletions(-)

diff --git a/src/Umbraco.Core/Composing/Lifetime.cs b/src/Umbraco.Core/Composing/Lifetime.cs
index a35d4d9ecfc2..1a2cc3119a90 100644
--- a/src/Umbraco.Core/Composing/Lifetime.cs
+++ b/src/Umbraco.Core/Composing/Lifetime.cs
@@ -15,7 +15,7 @@ public enum Lifetime
         /// <summary>
         /// One unique instance per request.
         /// </summary>
-        // TODO - review lifetimes for LightInject vs other containers
+        // TODO: review lifetimes for LightInject vs other containers
         // currently, corresponds to 'Request' in LightInject which is 'Transient + disposed by Scope'
         // but NOT (in LightInject) a per-web-request lifetime, more a TransientScoped
         //
diff --git a/src/Umbraco.Core/Events/QueuingEventDispatcher.cs b/src/Umbraco.Core/Events/QueuingEventDispatcher.cs
index 164b452f2cbd..88b527e753b8 100644
--- a/src/Umbraco.Core/Events/QueuingEventDispatcher.cs
+++ b/src/Umbraco.Core/Events/QueuingEventDispatcher.cs
@@ -34,7 +34,7 @@ protected override void ScopeExitCompleted()
 
         private IMediaFileSystem _mediaFileSystem;
 
-        // todo: inject
+        // TODO: inject
         private IMediaFileSystem MediaFileSystem => _mediaFileSystem ?? (_mediaFileSystem = Current.MediaFileSystem);
     }
 }
diff --git a/src/Umbraco.Core/IO/FileSystems.cs b/src/Umbraco.Core/IO/FileSystems.cs
index 38cb7df82423..19d29e14ba94 100644
--- a/src/Umbraco.Core/IO/FileSystems.cs
+++ b/src/Umbraco.Core/IO/FileSystems.cs
@@ -132,7 +132,7 @@ private object CreateWellKnownFileSystems()
             _scriptsFileSystem = new ShadowWrapper(scriptsFileSystem, "scripts", IsScoped);
             _mvcViewsFileSystem = new ShadowWrapper(mvcViewsFileSystem, "Views", IsScoped);
 
-            // todo - do we need a lock here?
+            // TODO: do we need a lock here?
             _shadowWrappers.Add(_macroPartialFileSystem);
             _shadowWrappers.Add(_partialViewsFileSystem);
             _shadowWrappers.Add(_stylesheetsFileSystem);
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index 80f4c57ee363..acf5e796e4c7 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -153,7 +153,7 @@ public void AddFile(string path, Stream stream, bool overrideExisting)
             if (directory == null) throw new InvalidOperationException("Could not get directory.");
             Directory.CreateDirectory(directory); // ensure it exists
 
-            if (stream.CanSeek) // todo - what if we cannot?
+            if (stream.CanSeek) // TODO: what if we cannot?
                 stream.Seek(0, 0);
 
             using (var destination = (Stream) File.Create(fullPath))
diff --git a/src/Umbraco.Core/Migrations/IMigrationExpression.cs b/src/Umbraco.Core/Migrations/IMigrationExpression.cs
index 81063bd2dac1..c60126f63c01 100644
--- a/src/Umbraco.Core/Migrations/IMigrationExpression.cs
+++ b/src/Umbraco.Core/Migrations/IMigrationExpression.cs
@@ -5,7 +5,7 @@
     /// </summary>
     public interface IMigrationExpression
     {
-        string Process(IMigrationContext context); // todo: remove that one?
+        string Process(IMigrationContext context); // TODO: remove that one?
         void Execute();
     }
 }
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
index d3f69378347c..f21216fde30d 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
@@ -27,7 +27,7 @@ public DatabaseSchemaResult(ISqlSyntaxProvider sqlSyntax)
 
         public List<TableDefinition> TableDefinitions { get; }
 
-        // todo what are these exactly? TableDefinitions are those that should be there, IndexDefinitions are those that... are in DB?
+        // TODO: what are these exactly? TableDefinitions are those that should be there, IndexDefinitions are those that... are in DB?
         internal List<DbIndexDefinition> IndexDefinitions { get; }
 
         public List<string> ValidTables { get; }
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 0d4e9ce789b8..ca1152a9a42b 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -128,14 +128,14 @@ public virtual PropertyCollection Properties
 
         /// <summary>
         /// Gets the enumeration of property groups for the entity.
-        /// todo - remove this proxy method
+        /// TODO: remove this proxy method
         /// </summary>
         [IgnoreDataMember]
         public IEnumerable<PropertyGroup> PropertyGroups => ContentTypeBase.CompositionPropertyGroups;
 
         /// <summary>
         /// Gets the numeration of property types for the entity.
-        /// todo - remove this proxy method
+        /// TODO: remove this proxy method
         /// </summary>
         [IgnoreDataMember]
         public IEnumerable<PropertyType> PropertyTypes => ContentTypeBase.CompositionPropertyTypes;
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index dadc3870b0f1..064bdd3d4a6b 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -431,7 +431,7 @@ public void RemovePropertyGroup(string propertyGroupName)
         /// PropertyTypes that are not part of a PropertyGroup
         /// </summary>
         [IgnoreDataMember]
-        //todo should we mark this as EditorBrowsable hidden since it really isn't ever used?
+        // TODO: should we mark this as EditorBrowsable hidden since it really isn't ever used?
         internal PropertyTypeCollection PropertyTypeCollection => _noGroupPropertyTypes;
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/GridValue.cs b/src/Umbraco.Core/Models/GridValue.cs
index c4a8b85b00a5..4f19576f1729 100644
--- a/src/Umbraco.Core/Models/GridValue.cs
+++ b/src/Umbraco.Core/Models/GridValue.cs
@@ -21,7 +21,7 @@ public class GridValue
         public class GridSection
         {
             [JsonProperty("grid")]
-            public string Grid { get; set; } //todo: what is this?
+            public string Grid { get; set; } // TODO: what is this?
 
             [JsonProperty("rows")]
             public IEnumerable<GridRow> Rows { get; set; }
@@ -48,7 +48,7 @@ public class GridRow
         public class GridArea
         {
             [JsonProperty("grid")]
-            public string Grid { get; set; } //todo: what is this?
+            public string Grid { get; set; } // TODO: what is this?
 
             [JsonProperty("controls")]
             public IEnumerable<GridControl> Controls { get; set; }
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index b3b4e0378307..4363324c8da1 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -137,7 +137,7 @@ public interface IContent : IContentBase
         /// </summary>
         IEnumerable<string> EditedCultures { get; }
 
-        // todo - these two should move to some kind of service
+        // TODO: these two should move to some kind of service
 
         /// <summary>
         /// Changes the <see cref="IContentType"/> for the current content object
diff --git a/src/Umbraco.Core/Models/IContentTypeComposition.cs b/src/Umbraco.Core/Models/IContentTypeComposition.cs
index 84e436e46f4d..675d3cd268d7 100644
--- a/src/Umbraco.Core/Models/IContentTypeComposition.cs
+++ b/src/Umbraco.Core/Models/IContentTypeComposition.cs
@@ -10,7 +10,7 @@ public interface IContentTypeComposition : IContentTypeBase
         /// <summary>
         /// Gets or sets the content types that compose this content type.
         /// </summary>
-        //todo: we should be storing key references, not the object else we are caching way too much
+        // TODO: we should be storing key references, not the object else we are caching way too much
         IEnumerable<IContentTypeComposition> ContentTypeComposition { get; set;  }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
index d118cd526eb8..f5c21a3a7464 100644
--- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
@@ -67,7 +67,7 @@ private BackOfficeIdentityUser()
             _startContentIds = new int[] { };
             _groups = new IReadOnlyUserGroup[] { };
             _allowedSections = new string[] { };
-            _culture = Current.Configs.Global().DefaultUILanguage; //todo inject
+            _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject
             _groups = new IReadOnlyUserGroup[0];
             _roles = new ObservableCollection<IdentityUserRole<string>>();
             _roles.CollectionChanged += _roles_CollectionChanged;
@@ -84,7 +84,7 @@ public BackOfficeIdentityUser(int userId, IEnumerable<IReadOnlyUserGroup> groups
             _startContentIds = new int[] { };
             _groups = new IReadOnlyUserGroup[] { };
             _allowedSections = new string[] { };
-            _culture = Current.Configs.Global().DefaultUILanguage; //todo inject
+            _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject
             _groups = groups.ToArray();
             _roles = new ObservableCollection<IdentityUserRole<string>>(_groups.Select(x => new IdentityUserRole<string>
             {
diff --git a/src/Umbraco.Core/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs
index 2945856817a4..e281aaf5abf6 100644
--- a/src/Umbraco.Core/Models/MediaExtensions.cs
+++ b/src/Umbraco.Core/Models/MediaExtensions.cs
@@ -21,7 +21,7 @@ public static string GetUrl(this IMedia media, string propertyAlias, ILogger log
             var val = media.Properties[propertyType];
             if (val == null) return string.Empty;
 
-            //todo would need to be adjusted to variations, when media become variants
+            // TODO: would need to be adjusted to variations, when media become variants
             var jsonString = val.GetValue() as string;
             if (jsonString == null) return string.Empty;
 
diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs
index 942c71f0c68f..5e79967a9470 100644
--- a/src/Umbraco.Core/Models/Membership/User.cs
+++ b/src/Umbraco.Core/Models/Membership/User.cs
@@ -27,7 +27,7 @@ public User()
         {
             SessionTimeout = 60;
             _userGroups = new HashSet<IReadOnlyUserGroup>();
-            _language = Current.Configs.Global().DefaultUILanguage; //todo inject
+            _language = Current.Configs.Global().DefaultUILanguage; // TODO: inject
             _isApproved = true;
             _isLockedOut = false;
             _startContentIds = new int[] { };
diff --git a/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs b/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs
index ac460ca34c93..f4ed11e09e1d 100644
--- a/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs
+++ b/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs
@@ -26,19 +26,19 @@ public class CompiledPackage : IPackageInfo
         public string PackageView { get; set; }
         public string IconUrl { get; set; }
 
-        public string Actions { get; set; } //todo: Should we make this strongly typed to IEnumerable<PackageAction> ?
+        public string Actions { get; set; } // TODO: Should we make this strongly typed to IEnumerable<PackageAction> ?
 
         public PreInstallWarnings Warnings { get; set; } = new PreInstallWarnings();
 
         public List<CompiledPackageFile> Files { get; set; } = new List<CompiledPackageFile>();
 
-        public IEnumerable<XElement> Macros { get; set; } //todo: make strongly typed
-        public IEnumerable<XElement> Templates { get; set; } //todo: make strongly typed
-        public IEnumerable<XElement> Stylesheets { get; set; } //todo: make strongly typed
-        public IEnumerable<XElement> DataTypes { get; set; } //todo: make strongly typed
-        public IEnumerable<XElement> Languages { get; set; } //todo: make strongly typed
-        public IEnumerable<XElement> DictionaryItems { get; set; } //todo: make strongly typed
-        public IEnumerable<XElement> DocumentTypes { get; set; } //todo: make strongly typed
+        public IEnumerable<XElement> Macros { get; set; } // TODO: make strongly typed
+        public IEnumerable<XElement> Templates { get; set; } // TODO: make strongly typed
+        public IEnumerable<XElement> Stylesheets { get; set; } // TODO: make strongly typed
+        public IEnumerable<XElement> DataTypes { get; set; } // TODO: make strongly typed
+        public IEnumerable<XElement> Languages { get; set; } // TODO: make strongly typed
+        public IEnumerable<XElement> DictionaryItems { get; set; } // TODO: make strongly typed
+        public IEnumerable<XElement> DocumentTypes { get; set; } // TODO: make strongly typed
         public IEnumerable<CompiledPackageDocument> Documents { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index 5e45475dd2f9..f5c475908d2f 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -347,7 +347,7 @@ internal void FactorySetValue(string culture, string segment, bool published, ob
         /// </summary>
         internal bool IsValid(string culture = "*", string segment = "*")
         {
-            //todo - validating values shouldn't be done here, this calls in to IsValidValue
+            // TODO: validating values shouldn't be done here, this calls in to IsValidValue
 
             culture = culture.NullOrWhiteSpaceAsNull();
             segment = segment.NullOrWhiteSpaceAsNull();
@@ -388,7 +388,7 @@ internal bool IsValid(string culture = "*", string segment = "*")
         /// <returns>True is property value is valid, otherwise false</returns>
         private bool IsValidValue(object value)
         {
-            //todo - this shouldn't exist here, the model itself shouldn't be responsible for it's own validation and this requires singleton access
+            // TODO: this shouldn't exist here, the model itself shouldn't be responsible for it's own validation and this requires singleton access
             return PropertyType.IsPropertyValueValid(value);
         }
 
diff --git a/src/Umbraco.Core/Models/PropertyCollection.cs b/src/Umbraco.Core/Models/PropertyCollection.cs
index ef56ce4a4cb0..5e71fe9f6592 100644
--- a/src/Umbraco.Core/Models/PropertyCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyCollection.cs
@@ -97,7 +97,7 @@ protected override void ClearItems()
         /// </summary>
         internal new void Add(Property property)
         {
-            lock (_addLocker) // todo - why are we locking here and not everywhere else?!
+            lock (_addLocker) // TODO: why are we locking here and not everywhere else?!
             {
                 var key = GetKeyForItem(property);
                 if (key != null)
diff --git a/src/Umbraco.Core/Models/PropertyGroupCollection.cs b/src/Umbraco.Core/Models/PropertyGroupCollection.cs
index 5fe47b52a492..2e9fb6520e2e 100644
--- a/src/Umbraco.Core/Models/PropertyGroupCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyGroupCollection.cs
@@ -19,7 +19,7 @@ public class PropertyGroupCollection : KeyedCollection<string, PropertyGroup>, I
     {
         private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();
 
-        //todo: this doesn't seem to be used anywhere
+        // TODO: this doesn't seem to be used anywhere
         internal Action OnAdd;
 
         internal PropertyGroupCollection()
diff --git a/src/Umbraco.Core/Models/PropertyTagsExtensions.cs b/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
index c0dcddc6aed2..63cf8702219f 100644
--- a/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
+++ b/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     public static class PropertyTagsExtensions
     {
-        // todo: inject
+        // TODO: inject
         private static PropertyEditorCollection PropertyEditors => Current.PropertyEditors;
         private static IDataTypeService DataTypeService => Current.Services.DataTypeService;
 
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 377e86d2e5b0..107831ebddf3 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -378,14 +378,14 @@ private static void ThrowTypeException(object value, Type expected, string alias
         }
 
 
-        //todo - this and other value validation methods should be a service level (not a model) thing. Changing this to internal for now
+        // TODO: this and other value validation methods should be a service level (not a model) thing. Changing this to internal for now
         /// <summary>
         /// Determines whether a value is valid for this property type.
         /// </summary>
         internal bool IsPropertyValueValid(object value)
         {
-            var editor = Current.PropertyEditors[_propertyEditorAlias]; // todo inject
-            var configuration = Current.Services.DataTypeService.GetDataType(_dataTypeId).Configuration; // todo inject
+            var editor = Current.PropertyEditors[_propertyEditorAlias]; // TODO: inject
+            var configuration = Current.Services.DataTypeService.GetDataType(_dataTypeId).Configuration; // TODO: inject
             var valueEditor = editor.GetValueEditor(configuration);
             return !valueEditor.Validate(value, Mandatory, ValidationRegExp).Any();
         }
diff --git a/src/Umbraco.Core/Models/PropertyTypeCollection.cs b/src/Umbraco.Core/Models/PropertyTypeCollection.cs
index 6753ee753238..f39918d5afb7 100644
--- a/src/Umbraco.Core/Models/PropertyTypeCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyTypeCollection.cs
@@ -19,7 +19,7 @@ public class PropertyTypeCollection : KeyedCollection<string, PropertyType>, INo
         [IgnoreDataMember]
         private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();
 
-        //todo: This doesn't seem to be used
+        // TODO: This doesn't seem to be used
         [IgnoreDataMember]
         internal Action OnAdd;
 
@@ -81,7 +81,7 @@ protected override void ClearItems()
         {
             item.IsPublishing = IsPublishing;
 
-            // todo this is not pretty and should be refactored
+            // TODO: this is not pretty and should be refactored
             try
             {
                 _addLocker.EnterWriteLock();
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
index e50fb2c39684..33efc48c95a0 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
@@ -15,7 +15,7 @@ public interface IPublishedContent : IPublishedElement
     {
         #region Content
 
-        // todo - IPublishedContent properties colliding with models
+        // TODO: IPublishedContent properties colliding with models
         // we need to find a way to remove as much clutter as possible from IPublishedContent,
         // since this is preventing someone from creating a property named 'Path' and have it
         // in a model, for instance. we could move them all under one unique property eg
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
index 083e8dcc6ebe..0798e9a4e055 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
@@ -86,7 +86,7 @@ private void EnsureMemberProperties(List<PublishedPropertyType> propertyTypes, I
             }
         }
 
-        // todo - this list somehow also exists in constants, see memberTypeRepository => remove duplicate!
+        // TODO: this list somehow also exists in constants, see memberTypeRepository => remove duplicate!
         private static readonly Dictionary<string, (int, string)> BuiltinMemberProperties = new Dictionary<string, (int, string)>
         {
             { "Email", (Constants.DataTypes.Textbox, Constants.PropertyEditors.Aliases.TextBox) },
@@ -148,7 +148,8 @@ public int GetPropertyIndex(string alias)
             return -1;
         }
 
-        // virtual for unit tests - todo explain why
+        // virtual for unit tests
+        // TODO: explain why
         /// <summary>
         /// Gets a property type.
         /// </summary>
@@ -158,7 +159,8 @@ public virtual PublishedPropertyType GetPropertyType(string alias)
             return GetPropertyType(index);
         }
 
-        // virtual for unit tests - todo explain why
+        // virtual for unit tests
+        // TODO: explain why
         /// <summary>
         /// Gets a property type.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
index 0860fdb82260..68892fd79a01 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Models.PublishedContent
     /// if the property type changes, then a new class needs to be created.</remarks>
     public class PublishedPropertyType
     {
-        //todo - API design review, should this be an interface?
+        // TODO: API design review, should this be an interface?
 
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly PropertyValueConverterCollection _propertyValueConverters;
diff --git a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
index bfbde592b5dc..7898a9997adb 100644
--- a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
+++ b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
@@ -14,8 +14,8 @@ public static class Tables
 
                 public const string Node = /*TableNamePrefix*/ "umbraco" + "Node";
                 public const string NodeData = /*TableNamePrefix*/ "cms" + "ContentNu";
-                public const string NodeXml = /*TableNamePrefix*/ "cms" + "ContentXml"; // todo get rid of these with the xml cache
-                public const string NodePreviewXml = /*TableNamePrefix*/ "cms" + "PreviewXml"; // todo get rid of these with the xml cache
+                public const string NodeXml = /*TableNamePrefix*/ "cms" + "ContentXml"; // TODO: get rid of these with the xml cache
+                public const string NodePreviewXml = /*TableNamePrefix*/ "cms" + "PreviewXml"; // TODO: get rid of these with the xml cache
 
                 public const string ContentType = /*TableNamePrefix*/ "cms" + "ContentType";
                 public const string ContentChildType = /*TableNamePrefix*/ "cms" + "ContentTypeAllowedContentType";
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentVersionCultureVariationDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentVersionCultureVariationDto.cs
index ada26358dcec..65d677d240a1 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentVersionCultureVariationDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentVersionCultureVariationDto.cs
@@ -33,10 +33,10 @@ internal class ContentVersionCultureVariationDto
         [Column("name")]
         public string Name { get; set; }
 
-        [Column("date")] // todo: db rename to 'updateDate'
+        [Column("date")] // TODO: db rename to 'updateDate'
         public DateTime UpdateDate { get; set; }
 
-        [Column("availableUserId")] // todo: db rename to 'updateDate'
+        [Column("availableUserId")] // TODO: db rename to 'updateDate'
         [ForeignKey(typeof(UserDto))]
         [NullSetting(NullSetting = NullSettings.Null)]
         public int? UpdateUserId { get => _updateUserId == 0 ? null : _updateUserId; set => _updateUserId = value; } //return null if zero
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
index 287e81221199..3c2c3deda495 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
@@ -21,16 +21,16 @@ internal class ContentVersionDto
         [ForeignKey(typeof(ContentDto))]
         public int NodeId { get; set; }
 
-        [Column("versionDate")] // todo: db rename to 'updateDate'
+        [Column("versionDate")] // TODO: db rename to 'updateDate'
         [Constraint(Default = SystemMethods.CurrentDateTime)]
         public DateTime VersionDate { get; set; }
 
-        [Column("userId")] // todo: db rename to 'updateUserId'
+        [Column("userId")] // TODO: db rename to 'updateUserId'
         [ForeignKey(typeof(UserDto))]
         [NullSetting(NullSetting = NullSettings.Null)]
         public int? UserId { get => _userId == 0 ? null : _userId; set => _userId = value; } //return null if zero
 
-        //todo - we need an index on this it is used almost always in querying and sorting
+        // TODO: we need an index on this it is used almost always in querying and sorting
         [Column("current")]
         public bool Current { get; set; }
 
diff --git a/src/Umbraco.Core/Persistence/Dtos/DataTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/DataTypeDto.cs
index a0e526b62eb6..d270c7b732ed 100644
--- a/src/Umbraco.Core/Persistence/Dtos/DataTypeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/DataTypeDto.cs
@@ -14,7 +14,7 @@ internal class DataTypeDto
         public int NodeId { get; set; }
 
         [Column("propertyEditorAlias")]
-        public string EditorAlias { get; set; } // todo should this have a length
+        public string EditorAlias { get; set; } // TODO: should this have a length
 
         [Column("dbType")]
         [Length(50)]
diff --git a/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs b/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
index 8f50891b34d6..5800efb97ab8 100644
--- a/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
@@ -45,7 +45,7 @@ internal class NodeDto
         [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_Trashed")]
         public bool Trashed { get; set; }
 
-        [Column("nodeUser")] // todo: db rename to 'createUserId'
+        [Column("nodeUser")] // TODO: db rename to 'createUserId'
         [ForeignKey(typeof(UserDto))]
         [NullSetting(NullSetting = NullSettings.Null)]
         public int? UserId { get => _userId == 0 ? null : _userId; set => _userId = value; } //return null if zero
@@ -54,7 +54,7 @@ internal class NodeDto
         [NullSetting(NullSetting = NullSettings.Null)]
         public string Text { get; set; }
 
-        [Column("nodeObjectType")] // todo: db rename to 'objectType'
+        [Column("nodeObjectType")] // TODO: db rename to 'objectType'
         [NullSetting(NullSetting = NullSettings.Null)]
         [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_ObjectType")]
         public Guid? NodeObjectType { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs
index 97e172f98f59..434e0393cd7c 100644
--- a/src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs
@@ -49,7 +49,7 @@ public static Content BuildEntity(DocumentDto dto, IContentType contentType)
                 content.Published = dto.Published;
                 content.Edited = dto.Edited;
 
-                // todo - shall we get published infos or not?
+                // TODO: shall we get published infos or not?
                 //if (dto.Published)
                 if (publishedVersionDto != null)
                 {
@@ -89,7 +89,7 @@ public static Models.Media BuildEntity(ContentDto dto, IMediaType contentType)
                 content.Key = nodeDto.UniqueId;
                 content.VersionId = contentVersionDto.Id;
 
-                // todo missing names?
+                // TODO: missing names?
 
                 content.Path = nodeDto.Path;
                 content.Level = nodeDto.Level;
@@ -130,7 +130,7 @@ public static Member BuildEntity(MemberDto dto, IMemberType contentType)
                 content.Key = nodeDto.UniqueId;
                 content.VersionId = contentVersionDto.Id;
 
-                // todo missing names?
+                // TODO: missing names?
 
                 content.Path = nodeDto.Path;
                 content.Level = nodeDto.Level;
@@ -294,7 +294,7 @@ private static DocumentVersionDto BuildDocumentVersionDto(IContent entity, Conte
         private static MediaVersionDto BuildMediaVersionDto(IMedia entity, ContentDto contentDto)
         {
             // try to get a path from the string being stored for media
-            // todo - only considering umbracoFile
+            // TODO: only considering umbracoFile
 
             TryMatch(entity.GetValue<string>("umbracoFile"), out var path);
 
@@ -309,7 +309,7 @@ private static MediaVersionDto BuildMediaVersionDto(IMedia entity, ContentDto co
             return dto;
         }
 
-        // todo - this should NOT be here?!
+        // TODO: this should NOT be here?!
         // more dark magic ;-(
         internal static bool TryMatch(string text, out string path)
         {
diff --git a/src/Umbraco.Core/Persistence/LocalDb.cs b/src/Umbraco.Core/Persistence/LocalDb.cs
index 94e930abe99d..55d6565344fb 100644
--- a/src/Umbraco.Core/Persistence/LocalDb.cs
+++ b/src/Umbraco.Core/Persistence/LocalDb.cs
@@ -317,8 +317,8 @@ public string[] GetDatabases()
                         if (dbname == "master" || dbname == "tempdb" || dbname == "model" || dbname == "msdb")
                             continue;
 
-                        // todo - shall we deal with stale databases?
-                        // todo - is it always ok to assume file names?
+                        // TODO: shall we deal with stale databases?
+                        // TODO: is it always ok to assume file names?
                         //var mdf = database.Value;
                         //var ldf = mdf.Replace(".mdf", "_log.ldf");
                         //if (staleOnly && File.Exists(mdf) && File.Exists(ldf))
diff --git a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
index b596ab60a3b0..09f754c47af1 100644
--- a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
+++ b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Core.Persistence
     /// </summary>
     public static partial class NPocoDatabaseExtensions
     {
-        // todo: review NPoco native InsertBulk to replace the code below
+        // TODO: review NPoco native InsertBulk to replace the code below
 
         /// <summary>
         /// Bulk-inserts records within a transaction.
@@ -177,8 +177,8 @@ internal static int BulkInsertRecordsSqlCe<T>(IUmbracoDatabase database, PocoDat
             using (var command = database.CreateCommand(database.Connection, CommandType.TableDirect, string.Empty))
             {
                 command.CommandText = pocoData.TableInfo.TableName;
-                command.CommandType = CommandType.TableDirect; // todo - why repeat?
-                // todo - not supporting transactions?
+                command.CommandType = CommandType.TableDirect; // TODO: why repeat?
+                // TODO: not supporting transactions?
                 //cmd.Transaction = GetTypedTransaction<SqlCeTransaction>(db.Connection.);
 
                 var count = 0;
diff --git a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
index b8417d743dfc..248f91284f49 100644
--- a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
+++ b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
@@ -32,7 +32,7 @@ public static partial class NPocoDatabaseExtensions
         //
         // works in READ COMMITED, TSQL & SQLCE lock the constraint even if it does not exist, so INSERT is OK
         //
-        // todo: use the proper database syntax, not this kludge
+        // TODO: use the proper database syntax, not this kludge
 
         /// <summary>
         /// Safely inserts a record, or updates if it exists, based on a unique constraint.
@@ -81,7 +81,7 @@ internal static RecordPersistenceType InsertOrUpdate<T>(this IUmbracoDatabase db
             if (poco == null)
                 throw new ArgumentNullException(nameof(poco));
 
-            // todo - NPoco has a Save method that works with the primary key
+            // TODO: NPoco has a Save method that works with the primary key
             //  in any case, no point trying to update if there's no primary key!
 
             // try to update
diff --git a/src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs b/src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs
index 10735f865ce7..23d818f0b3e6 100644
--- a/src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs
+++ b/src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs
@@ -496,7 +496,7 @@ public static Sql<ISqlContext>.SqlJoinClause<ISqlContext> RightJoin<TDto>(this S
         public static Sql<ISqlContext> On<TLeft, TRight>(this Sql<ISqlContext>.SqlJoinClause<ISqlContext> sqlJoin,
             Expression<Func<TLeft, object>> leftField, Expression<Func<TRight, object>> rightField)
         {
-            // todo - ugly - should define on SqlContext!
+            // TODO: ugly - should define on SqlContext!
 
             var xLeft = new Sql<ISqlContext>(sqlJoin.SqlContext).Columns(leftField);
             var xRight = new Sql<ISqlContext>(sqlJoin.SqlContext).Columns(rightField);
@@ -1180,7 +1180,7 @@ private static string GetColumn(DatabaseType dbType, string tableName, string co
 
         private static string GetTableName(this Type type)
         {
-            // todo: returning string.Empty for now
+            // TODO: returning string.Empty for now
             // BUT the code bits that calls this method cannot deal with string.Empty so we
             // should either throw, or fix these code bits...
             var attr = type.FirstAttribute<TableNameAttribute>();
diff --git a/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs b/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
index 64b3c91e5023..b6f5401bec71 100644
--- a/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
+++ b/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
@@ -10,7 +10,7 @@
 
 namespace Umbraco.Core.Persistence.Querying
 {
-    // todo - are we basically duplicating entire parts of NPoco just because of SqlSyntax ?!
+    // TODO: are we basically duplicating entire parts of NPoco just because of SqlSyntax ?!
     // try to use NPoco's version !
 
     /// <summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index 8057c8757812..821f0941fc96 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -43,7 +43,7 @@ protected ContentRepositoryBase(IScopeAccessor scopeAccessor, AppCaches cache, I
 
         protected ILanguageRepository LanguageRepository { get; }
 
-        protected PropertyEditorCollection PropertyEditors => Current.PropertyEditors; // todo inject
+        protected PropertyEditorCollection PropertyEditors => Current.PropertyEditors; // TODO: inject
 
         #region Versions
 
@@ -73,7 +73,7 @@ public virtual IEnumerable<int> GetVersionIds(int nodeId, int maxRows)
         // deletes a specific version
         public virtual void DeleteVersion(int versionId)
         {
-            // todo test object node type?
+            // TODO: test object node type?
 
             // get the version we want to delete
             var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetVersion", tsql =>
@@ -95,7 +95,7 @@ public virtual void DeleteVersion(int versionId)
         //  deletes all versions of an entity, older than a date.
         public virtual void DeleteVersions(int nodeId, DateTime versionDate)
         {
-            // todo test object node type?
+            // TODO: test object node type?
 
             // get the versions we want to delete, excluding the current one
             var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetVersions", tsql =>
@@ -240,7 +240,7 @@ protected void SetEntityTags(IContentBase entity, ITagRepository tagRepo)
             }
         }
 
-        // todo should we do it when un-publishing? or?
+        // TODO: should we do it when un-publishing? or?
         /// <summary>
         /// Clears tags for an item.
         /// </summary>
@@ -374,7 +374,7 @@ protected virtual string ApplySystemOrdering(ref Sql<ISqlContext> sql, Ordering
                     return GetAliasedField(SqlSyntax.GetFieldName<NodeDto>(x => x.Text), sql);
 
                 // "variantName" alias is defined in DocumentRepository.GetBaseQuery
-                // todo - what if it is NOT a document but a ... media or whatever?
+                // TODO: what if it is NOT a document but a ... media or whatever?
                 // previously, we inserted the join+select *here* so we were sure to have it,
                 // but now that's not the case anymore!
                 return "variantName";
@@ -620,7 +620,7 @@ protected string GetQuotedFieldName(string tableName, string fieldName)
 
         #region UnitOfWork Events
 
-        // todo: The reason these events are in the repository is for legacy, the events should exist at the service
+        // TODO: The reason these events are in the repository is for legacy, the events should exist at the service
         // level now since we can fire these events within the transaction... so move the events to service level
 
         public class ScopedEntityEventArgs : EventArgs
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 3bc730d5d0c4..92ade18204b3 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -343,8 +343,7 @@ protected void PersistUpdatedBaseContentType(IContentTypeComposition entity)
             List<int> orphanPropertyTypeIds = null;
             if (entity.IsPropertyDirty("PropertyGroups"))
             {
-                // todo
-                // we used to try to propagate tabs renaming downstream, relying on ParentId, but
+                // TODO: we used to try to propagate tabs renaming downstream, relying on ParentId, but
                 // 1) ParentId makes no sense (if a tab can be inherited from multiple composition
                 //    types) so we would need to figure things out differently, visiting downstream
                 //    content types and looking for tabs with the same name...
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 8bee55060b53..dcac7f4ff40d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -148,7 +148,7 @@ protected Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
                             .On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id && right.Published, "pcv", "pdv"), "pcv")
                     .On<DocumentDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId, aliasRight: "pcv")
 
-                // todo - should we be joining this when the query type is not single/many?
+                // TODO: should we be joining this when the query type is not single/many?
                 // left join on optional culture variation
                 //the magic "[[[ISOCODE]]]" parameter value will be replaced in ContentRepositoryBase.GetPage() by the actual ISO code
                 .LeftJoin<ContentVersionCultureVariationDto>(nested =>
@@ -277,7 +277,7 @@ protected override void PersistNewItem(IContent entity)
             SanitizeNames(content, publishing);
 
             // ensure that strings don't contain characters that are invalid in xml
-            // todo - do we really want to keep doing this here?
+            // TODO: do we really want to keep doing this here?
             entity.SanitizeEntityPropertiesForXmlStorage();
 
             // create the dto
@@ -466,7 +466,7 @@ protected override void PersistUpdatedItem(IContent entity)
             SanitizeNames(content, publishing);
 
             // ensure that strings don't contain characters that are invalid in xml
-            // todo - do we really want to keep doing this here?
+            // TODO: do we really want to keep doing this here?
             entity.SanitizeEntityPropertiesForXmlStorage();
 
             // if parent has changed, get path, level and sort order
@@ -545,7 +545,7 @@ protected override void PersistUpdatedItem(IContent entity)
                         edited = true;
                         (editedCultures ?? (editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase))).Add(culture);
 
-                        // todo - change tracking
+                        // TODO: change tracking
                         // at the moment, we don't do any dirty tracking on property values, so we don't know whether the
                         // culture has just been edited or not, so we don't update its update date - that date only changes
                         // when the name is set, and it all works because the controller does it - but, if someone uses a
@@ -561,7 +561,7 @@ protected override void PersistUpdatedItem(IContent entity)
                 var deleteDocumentVariations = Sql().Delete<DocumentCultureVariationDto>().Where<DocumentCultureVariationDto>(x => x.NodeId == content.Id);
                 Database.Execute(deleteDocumentVariations);
 
-                // todo NPoco InsertBulk issue?
+                // TODO: NPoco InsertBulk issue?
                 // we should use the native NPoco InsertBulk here but it causes problems (not sure exactly all scenarios)
                 // but by using SQL Server and updating a variants name will cause: Unable to cast object of type
                 // 'Umbraco.Core.Persistence.FaultHandling.RetryDbConnection' to type 'System.Data.SqlClient.SqlConnection'.
@@ -622,8 +622,7 @@ protected override void PersistUpdatedItem(IContent entity)
                 ClearEntityTags(entity, _tagRepository);
             }
 
-            // note re. tags: explicitly unpublished entities have cleared tags,
-            // but masked or trashed entities *still* have tags in the db todo so what?
+            // TODO: note re. tags: explicitly unpublished entities have cleared tags, but masked or trashed entities *still* have tags in the db - so what?
 
             entity.ResetDirtyProperties();
 
@@ -837,7 +836,7 @@ public bool Exists(Guid id)
         }
 
         // reading repository purely for looking up by GUID
-        // todo - ugly and to fix we need to decouple the IRepositoryQueryable -> IRepository -> IReadRepository which should all be separate things!
+        // TODO: ugly and to fix we need to decouple the IRepositoryQueryable -> IRepository -> IReadRepository which should all be separate things!
         private class ContentByGuidReadRepository : NPocoRepositoryBase<Guid, IContent>
         {
             private readonly DocumentRepository _outerRepo;
@@ -1124,7 +1123,7 @@ private IContent MapDtoToContent(DocumentDto dto)
                 // get properties - indexed by version id
                 var versionId = dto.DocumentVersionDto.Id;
 
-                // todo - shall we get published properties or not?
+                // TODO: shall we get published properties or not?
                 //var publishedVersionId = dto.Published ? dto.PublishedVersionDto.Id : 0;
                 var publishedVersionId = dto.PublishedVersionDto != null ? dto.PublishedVersionDto.Id : 0;
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index c531b991a9e7..85912694f029 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -62,7 +62,7 @@ public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> qu
                 ApplyOrdering(ref sql, ordering);
             }
 
-            //todo - we should be able to do sql = sql.OrderBy(x => Alias(x.NodeId, "NodeId")); but we can't because the OrderBy extension don't support Alias currently
+            // TODO: we should be able to do sql = sql.OrderBy(x => Alias(x.NodeId, "NodeId")); but we can't because the OrderBy extension don't support Alias currently
             //no matter what we always must have node id ordered at the end
             sql = ordering.Direction == Direction.Ascending ? sql.OrderBy("NodeId") : sql.OrderByDescending("NodeId");
 
@@ -73,7 +73,7 @@ public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> qu
             if (isContent)
                 BuildVariants(entities.Cast<DocumentEntitySlim>());
 
-            //todo - see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
+            // TODO: see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
             if (isMedia)
                 BuildProperties(entities, dtos);
 
@@ -166,7 +166,7 @@ private IEnumerable<IEntitySlim> GetEntities(Sql<ISqlContext> sql, bool isConten
 
             var entities = dtos.Select(x => BuildEntity(false, isMedia, x)).ToArray();
 
-            //todo- see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
+            // TODO: See https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
             if (isMedia && loadMediaProperties)
                 BuildProperties(entities, dtos);
 
@@ -227,7 +227,7 @@ public IEnumerable<IEntitySlim> GetByQuery(IQuery<IUmbracoEntity> query, Guid ob
             return GetEntities(sql, isContent, isMedia, true);
         }
 
-        //todo- see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
+        // TODO: See https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
         internal IEnumerable<IEntitySlim> GetMediaByQueryWithoutPropertyData(IQuery<IUmbracoEntity> query)
         {
             var isContent = false;
@@ -266,7 +266,7 @@ public bool Exists(int id)
             return Database.ExecuteScalar<int>(sql) > 0;
         }
 
-        //todo - see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
+        // TODO: see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
         private void BuildProperties(EntitySlim entity, BaseDto dto)
         {
             var pdtos = Database.Fetch<PropertyDataDto>(GetPropertyData(dto.VersionId));
@@ -274,7 +274,7 @@ private void BuildProperties(EntitySlim entity, BaseDto dto)
                 BuildProperty(entity, pdto);
         }
 
-        //todo - see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
+        // TODO: see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
         private void BuildProperties(EntitySlim[] entities, List<BaseDto> dtos)
         {
             var versionIds = dtos.Select(x => x.VersionId).Distinct().ToList();
@@ -290,7 +290,7 @@ private void BuildProperties(EntitySlim[] entities, List<BaseDto> dtos)
             }
         }
 
-        //todo - see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
+        // TODO: see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
         private void BuildProperty(EntitySlim entity, PropertyDataDto pdto)
         {
             // explain ?!
@@ -539,7 +539,7 @@ private void ApplyOrdering(ref Sql<ISqlContext> sql, Ordering ordering)
             if (sql == null) throw new ArgumentNullException(nameof(sql));
             if (ordering == null) throw new ArgumentNullException(nameof(ordering));
 
-            //todo - although this works for name, it probably doesn't work for others without an alias of some sort
+            // TODO: although this works for name, it probably doesn't work for others without an alias of some sort
             var orderBy = ordering.OrderBy;
 
             if (ordering.Direction == Direction.Ascending)
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
index 94714d6deda6..38558e1ca5f6 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
@@ -225,7 +225,7 @@ protected override void PersistNewItem(IMedia entity)
             entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
 
             // ensure that strings don't contain characters that are invalid in xml
-            // todo - do we really want to keep doing this here?
+            // TODO: do we really want to keep doing this here?
             entity.SanitizeEntityPropertiesForXmlStorage();
 
             // create the dto
@@ -304,7 +304,7 @@ protected override void PersistUpdatedItem(IMedia entity)
             entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
 
             // ensure that strings don't contain characters that are invalid in xml
-            // todo - do we really want to keep doing this here?
+            // TODO: do we really want to keep doing this here?
             entity.SanitizeEntityPropertiesForXmlStorage();
 
             // if parent has changed, get path, level and sort order
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
index e6ee79470cfd..ff7a79f98e42 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
@@ -298,7 +298,7 @@ private class AssignedRolesDto
             public int MemberGroupId { get; set; }
         }
 
-        // todo - understand why we need these two repository-level events, move them back to service
+        // TODO: understand why we need these two repository-level events, move them back to service
 
         /// <summary>
         /// Occurs before Save
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
index 9d7556f35674..18dc16cbce73 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
@@ -66,7 +66,7 @@ protected override IEnumerable<IMember> PerformGetByQuery(IQuery<IMember> query)
         {
             var baseQuery = GetBaseQuery(false);
 
-            // todo why is this different from content/media?!
+            // TODO: why is this different from content/media?!
             // check if the query is based on properties or not
 
             var wheres = query.GetWhereClauses();
@@ -103,7 +103,7 @@ protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool curren
         {
             var sql = SqlContext.Sql();
 
-            switch (queryType) // todo pretend we still need these queries for now
+            switch (queryType) // TODO: pretend we still need these queries for now
             {
                 case QueryType.Count:
                     sql = sql.SelectCount();
@@ -143,18 +143,18 @@ protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool curren
             return sql;
         }
 
-        // todo - move that one up to Versionable! or better: kill it!
+        // TODO: move that one up to Versionable! or better: kill it!
         protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
         {
             return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single);
         }
 
-        protected override string GetBaseWhereClause() // todo - can we kill / refactor this?
+        protected override string GetBaseWhereClause() // TODO: can we kill / refactor this?
         {
             return "umbracoNode.id = @id";
         }
 
-        // todo document/understand that one
+        // TODO: document/understand that one
         protected Sql<ISqlContext> GetNodeIdQueryWithPropertyData()
         {
             return Sql()
@@ -237,7 +237,7 @@ protected override void PersistNewItem(IMember entity)
             member.AddingEntity();
 
             // ensure that strings don't contain characters that are invalid in xml
-            // todo - do we really want to keep doing this here?
+            // TODO: do we really want to keep doing this here?
             entity.SanitizeEntityPropertiesForXmlStorage();
 
             // create the dto
@@ -329,7 +329,7 @@ protected override void PersistUpdatedItem(IMember entity)
             member.UpdatingEntity();
 
             // ensure that strings don't contain characters that are invalid in xml
-            // todo - do we really want to keep doing this here?
+            // TODO: do we really want to keep doing this here?
             entity.SanitizeEntityPropertiesForXmlStorage();
 
             // if parent has changed, get path, level and sort order
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/NPocoRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/NPocoRepositoryBase.cs
index a0ba2d5aa30e..23236ec9f056 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/NPocoRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/NPocoRepositoryBase.cs
@@ -42,7 +42,7 @@ protected NPocoRepositoryBase(IScopeAccessor scopeAccessor, AppCaches cache, ILo
 
         #region Abstract Methods
 
-        protected abstract Sql<ISqlContext> GetBaseQuery(bool isCount); // todo obsolete, use QueryType instead everywhere
+        protected abstract Sql<ISqlContext> GetBaseQuery(bool isCount); // TODO: obsolete, use QueryType instead everywhere
         protected abstract string GetBaseWhereClause();
         protected abstract IEnumerable<string> GetDeleteClauses();
         protected abstract Guid NodeObjectTypeId { get; }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
index 84e8ffc17250..fb45a79e4338 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
@@ -78,7 +78,7 @@ protected IAppPolicyCache IsolatedCache
             }
         }
 
-        // todo - but now that we have 1 unique repository?
+        // TODO: but now that we have 1 unique repository?
         // this is a *bad* idea because PerformCount captures the current repository and its UOW
         //
         //private static RepositoryCachePolicyOptions _defaultOptions;
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
index b4aa9c27f99e..2bad7229f28f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
@@ -20,7 +20,7 @@ public ServerRegistrationRepository(IScopeAccessor scopeAccessor, ILogger logger
 
         protected override IRepositoryCachePolicy<IServerRegistration, int> CreateCachePolicy()
         {
-            // todo - wtf are we doing with cache here?
+            // TODO: wtf are we doing with cache here?
             // why are we using disabled cache helper up there?
             //
             // 7.6 says:
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index 2242c652566e..fdd5fb0d8652 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -65,7 +65,7 @@ private string PasswordConfigJson
                 if (_passwordConfigInitialized)
                     return _passwordConfigJson;
 
-                // todo - this is bad
+                // TODO: this is bad
                 // because the membership provider we're trying to get has a dependency on the user service
                 // and we should not depend on services in repositories - need a way better way to do this
 
@@ -238,7 +238,7 @@ public int ClearLoginSessions(TimeSpan timespan)
 
         public void ClearLoginSession(Guid sessionId)
         {
-            // todo why is that one updating and not deleting?
+            // TODO: why is that one updating and not deleting?
             Database.Execute(Sql()
                 .Update<UserLoginDto>(u => u.Set(x => x.LoggedOutUtc, DateTime.UtcNow))
                 .Where<UserLoginDto>(x => x.SessionId == sessionId));
diff --git a/src/Umbraco.Core/Persistence/SqlSyntaxExtensions.cs b/src/Umbraco.Core/Persistence/SqlSyntaxExtensions.cs
index 43ef03327b3a..2fba8e7d49ed 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntaxExtensions.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntaxExtensions.cs
@@ -13,7 +13,7 @@ public static class SqlSyntaxExtensions
     {
         private static string GetTableName(this Type type)
         {
-            // todo: returning string.Empty for now
+            // TODO: returning string.Empty for now
             // BUT the code bits that calls this method cannot deal with string.Empty so we
             // should either throw, or fix these code bits...
             var attr = type.FirstAttribute<TableNameAttribute>();
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
index 4e795d3a783d..51e0172f35a4 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
@@ -159,7 +159,7 @@ internal bool EnableSqlCount
 
         #region OnSomething
 
-        // todo - has new interceptors to replace OnSomething?
+        // TODO: has new interceptors to replace OnSomething?
 
         protected override DbConnection OnConnectionOpened(DbConnection connection)
         {
@@ -218,7 +218,7 @@ protected override void OnExecutingCommand(DbCommand cmd)
                 cmd.CommandTimeout = cmd.Connection.ConnectionTimeout;
 
             if (EnableSqlTrace)
-                _logger.Debug<UmbracoDatabase>("SQL Trace:\r\n{Sql}", CommandToString(cmd).Replace("{", "{{").Replace("}", "}}")); // todo these escapes should be builtin
+                _logger.Debug<UmbracoDatabase>("SQL Trace:\r\n{Sql}", CommandToString(cmd).Replace("{", "{{").Replace("}", "}}")); // TODO: these escapes should be builtin
 
 #if DEBUG_DATABASES
             // detects whether the command is already in use (eg still has an open reader...)
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
index aec49b8eb5d7..eab0ae550978 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
@@ -22,8 +22,8 @@ namespace Umbraco.Core.Persistence
     /// <para>It wraps an NPoco UmbracoDatabaseFactory which is initializes with a proper IPocoDataFactory to ensure
     /// that NPoco's plumbing is cached appropriately for the whole application.</para>
     /// </remarks>
-    //todo these comments are not true anymore
-    //todo this class needs not be disposable!
+    // TODO: these comments are not true anymore
+    // TODO: this class needs not be disposable!
     internal class UmbracoDatabaseFactory : DisposableObject, IUmbracoDatabaseFactory
     {
         private readonly Lazy<IMapperCollection> _mappers;
@@ -288,7 +288,7 @@ protected override void DisposeResources()
             // thread, so we don't really know what we are disposing here...
             // besides, we don't really want to dispose the factory, which is a singleton...
 
-            // todo - the class does not need be disposable
+            // TODO: the class does not need be disposable
             //var db = _umbracoDatabaseAccessor.UmbracoDatabase;
             //_umbracoDatabaseAccessor.UmbracoDatabase = null;
             //db?.Dispose();
@@ -299,7 +299,7 @@ protected override void DisposeResources()
         // this method provides a way to force-reset the variable
         internal void ResetForTests()
         {
-            // todo remove all this eventually
+            // TODO: remove all this eventually
             //var db = _umbracoDatabaseAccessor.UmbracoDatabase;
             //_umbracoDatabaseAccessor.UmbracoDatabase = null;
             //db?.Dispose();
diff --git a/src/Umbraco.Core/PropertyEditors/DataEditor.cs b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
index 0db6dcb0dd91..ae6ace996e2c 100644
--- a/src/Umbraco.Core/PropertyEditors/DataEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
@@ -89,7 +89,7 @@ public DataEditor(ILogger logger, EditorType type = EditorType.PropertyValue)
         /// <para>Technically, it could be cached by datatype but let's keep things
         /// simple enough for now.</para>
         /// </remarks>
-        // todo point of that one? shouldn't we always configure?
+        // TODO: point of that one? shouldn't we always configure?
         public IDataValueEditor GetValueEditor() => ExplicitValueEditor ?? CreateValueEditor();
 
         /// <inheritdoc />
@@ -113,7 +113,7 @@ public IDataValueEditor GetValueEditor(object configuration)
                 return ExplicitValueEditor;
 
             var editor = CreateValueEditor();
-            ((DataValueEditor) editor).Configuration = configuration; // todo casting is bad
+            ((DataValueEditor) editor).Configuration = configuration; // TODO: casting is bad
             return editor;
         }
 
diff --git a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
index 153039dedbc1..096b80de1fbb 100644
--- a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
@@ -283,7 +283,7 @@ public virtual object ToEditor(Property property, IDataTypeService dataTypeServi
             }
         }
 
-        // todo - the methods below should be replaced by proper property value convert ToXPath usage!
+        // TODO: the methods below should be replaced by proper property value convert ToXPath usage!
 
         /// <summary>
         /// Converts a property to Xml fragments.
diff --git a/src/Umbraco.Core/PropertyEditors/IDataEditor.cs b/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
index 16aa4d6d5ca6..e7aa68459e9b 100644
--- a/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/IDataEditor.cs
@@ -46,7 +46,7 @@ public interface IDataEditor : IDiscoverable
         /// <summary>
         /// Gets a value editor.
         /// </summary>
-        IDataValueEditor GetValueEditor(); // todo - should be configured?!
+        IDataValueEditor GetValueEditor(); // TODO: should be configured?!
 
         /// <summary>
         /// Gets a configured value editor.
diff --git a/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs
index c92b6fa0d3f5..cb68531cc705 100644
--- a/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs
@@ -47,7 +47,7 @@ public interface IDataValueEditor
         /// </summary>
         /// <remarks>
         /// <para>Use this property to add validators, not to validate. Use <see cref="Validate"/> instead.</para>
-        /// todo replace with AddValidator? WithValidator?
+        /// TODO: replace with AddValidator? WithValidator?
         /// </remarks>
         List<IValueValidator> Validators { get; }
 
@@ -61,7 +61,7 @@ public interface IDataValueEditor
         /// </summary>
         object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null);
 
-        // todo / deal with this when unplugging the xml cache
+        // TODO: / deal with this when unplugging the xml cache
         // why property vs propertyType? services should be injected! etc...
         IEnumerable<XElement> ConvertDbToXml(Property property, IDataTypeService dataTypeService, ILocalizationService localizationService, bool published);
         XNode ConvertDbToXml(PropertyType propertyType, object value, IDataTypeService dataTypeService);
diff --git a/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs b/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs
index 204dff6f19ca..62f2e0ca1df4 100644
--- a/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs
+++ b/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs
@@ -17,7 +17,7 @@ public IManifestValueValidator Create(string name)
             if (v == null)
                 throw new InvalidOperationException($"Could not find a validator named \"{name}\".");
 
-            // todo - what is this exactly?
+            // TODO: what is this exactly?
             // we cannot return this instance, need to clone it?
             return (IManifestValueValidator) Activator.CreateInstance(v.GetType()); // ouch
         }
diff --git a/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
index e1f99083e8e8..2439c7c02ed5 100644
--- a/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
+++ b/src/Umbraco.Core/PropertyEditors/TagsPropertyEditorAttribute.cs
@@ -43,7 +43,7 @@ public TagsPropertyEditorAttribute()
         /// <summary>
         /// Gets or sets a value indicating whether to replace the tags entirely.
         /// </summary>
-        // todo: what's the usage?
+        // TODO: what's the usage?
         public bool ReplaceTags { get; set; }
 
         /// <summary>
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
index 12594eb842f7..31ab47223fbc 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
@@ -67,7 +67,7 @@ private bool IsRangeDataType(int dataTypeId)
             // GetPreValuesCollectionByDataTypeId is cached at repository level;
             // still, the collection is deep-cloned so this is kinda expensive,
             // better to cache here + trigger refresh in DataTypeCacheRefresher
-            // todo: this is cheap now, remove the caching
+            // TODO: this is cheap now, remove the caching
 
             return Storages.GetOrAdd(dataTypeId, id =>
             {
diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 6aeee33c413d..f9ea02b072c4 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -85,7 +85,7 @@ private Scope(ScopeProvider scopeProvider,
                 ParentScope = parent;
 
                 // cannot specify a different mode!
-                // todo - means that it's OK to go from L2 to None for reading purposes, but writing would be BAD!
+                // TODO: means that it's OK to go from L2 to None for reading purposes, but writing would be BAD!
                 // this is for XmlStore that wants to bypass caches when rebuilding XML (same for NuCache)
                 if (repositoryCacheMode != RepositoryCacheMode.Unspecified && parent.RepositoryCacheMode > repositoryCacheMode)
                     throw new ArgumentException($"Value '{repositoryCacheMode}' cannot be lower than parent value '{parent.RepositoryCacheMode}'.", nameof(repositoryCacheMode));
@@ -264,7 +264,7 @@ public EventMessages Messages
                 if (ParentScope != null) return ParentScope.Messages;
                 return _messages ?? (_messages = new EventMessages());
 
-                // todo - event messages?
+                // TODO: event messages?
                 // this may be a problem: the messages collection will be cleared at the end of the scope
                 // how shall we process it in controllers etc? if we don't want the global factory from v7?
                 // it'd need to be captured by the controller
@@ -323,7 +323,7 @@ private void EnsureNotDisposed()
             if (_disposed)
                 throw new ObjectDisposedException(GetType().FullName);
 
-            // todo - safer?
+            // TODO: safer?
             //if (Interlocked.CompareExchange(ref _disposed, 1, 0) != 0)
             //    throw new ObjectDisposedException(GetType().FullName);
         }
diff --git a/src/Umbraco.Core/Scoping/ScopeContext.cs b/src/Umbraco.Core/Scoping/ScopeContext.cs
index 3f70f1791ed6..03a0da1a55e2 100644
--- a/src/Umbraco.Core/Scoping/ScopeContext.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContext.cs
@@ -13,10 +13,7 @@ public void ScopeExit(bool completed)
             if (_enlisted == null)
                 return;
 
-            // todo
-            // - can we create infinite loops?
-            // - what about nested events? will they just be plainly ignored = really bad?
-
+            // TODO: - can we create infinite loops? - what about nested events? will they just be plainly ignored = really bad?
             List<Exception> exceptions = null;
             List<IEnlistedObject> orderedEnlisted;
             while ((orderedEnlisted = _enlisted.Values.OrderBy(x => x.Priority).ToList()).Count > 0)
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 3a3c43c6a044..7fb7450b46f1 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -242,7 +242,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <summary>
         /// Saves documents.
         /// </summary>
-        // todo why only 1 result not 1 per content?!
+        // TODO: why only 1 result not 1 per content?!
         OperationResult Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/IEntityService.cs b/src/Umbraco.Core/Services/IEntityService.cs
index 3f398cc1e990..9d0399f324ed 100644
--- a/src/Umbraco.Core/Services/IEntityService.cs
+++ b/src/Umbraco.Core/Services/IEntityService.cs
@@ -242,8 +242,9 @@ IEnumerable<IEntitySlim> GetPagedDescendants(int id, UmbracoObjectTypes objectTy
         IEnumerable<IEntitySlim> GetPagedDescendants(IEnumerable<int> ids, UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
             IQuery<IUmbracoEntity> filter = null, Ordering ordering = null);
 
+        // TODO: Do we really need this? why not just pass in -1
         /// <summary>
-        /// Gets descendants of root. todo: Do we really need this? why not just pass in -1
+        /// Gets descendants of root.
         /// </summary>
         IEnumerable<IEntitySlim> GetPagedDescendants(UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
             IQuery<IUmbracoEntity> filter = null, Ordering ordering = null, bool includeTrashed = true);
diff --git a/src/Umbraco.Core/Services/IEntityXmlSerializer.cs b/src/Umbraco.Core/Services/IEntityXmlSerializer.cs
index 1c58fc56b863..6feb31115cd7 100644
--- a/src/Umbraco.Core/Services/IEntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/IEntityXmlSerializer.cs
@@ -14,7 +14,7 @@ public interface IEntityXmlSerializer
         /// </summary>
         XElement Serialize(IContent content,
                 bool published,
-                bool withDescendants = false) //todo take care of usage! only used for the packager
+                bool withDescendants = false) // TODO: take care of usage! only used for the packager
             ;
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index e1304a324f83..cbc2eeca7a66 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -164,7 +164,7 @@ public EntityPermissionCollection GetPermissions(IContent content)
         /// <returns><see cref="IContent"/></returns>
         public IContent Create(string name, Guid parentId, string contentTypeAlias, int userId = 0)
         {
-            // todo - what about culture?
+            // TODO: what about culture?
 
             var parent = GetById(parentId);
             return Create(name, parent, contentTypeAlias, userId);
@@ -184,7 +184,7 @@ public IContent Create(string name, Guid parentId, string contentTypeAlias, int
         /// <returns>The content object.</returns>
         public IContent Create(string name, int parentId, string contentTypeAlias, int userId = 0)
         {
-            // todo - what about culture?
+            // TODO: what about culture?
 
             var contentType = GetContentType(contentTypeAlias);
             if (contentType == null)
@@ -217,7 +217,7 @@ public IContent Create(string name, int parentId, string contentTypeAlias, int u
         /// <returns>The content object.</returns>
         public IContent Create(string name, IContent parent, string contentTypeAlias, int userId = 0)
         {
-            // todo - what about culture?
+            // TODO: what about culture?
 
             if (parent == null) throw new ArgumentNullException(nameof(parent));
 
@@ -248,7 +248,7 @@ public IContent Create(string name, IContent parent, string contentTypeAlias, in
         /// <returns>The content object.</returns>
         public IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = 0)
         {
-            // todo - what about culture?
+            // TODO: what about culture?
 
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -282,7 +282,7 @@ public IContent CreateAndSave(string name, int parentId, string contentTypeAlias
         /// <returns>The content object.</returns>
         public IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = 0)
         {
-            // todo - what about culture?
+            // TODO: what about culture?
 
             if (parent == null) throw new ArgumentNullException(nameof(parent));
 
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index a9e75e6f2945..0cac249cdff0 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -353,7 +353,7 @@ public IEnumerable<TItem> GetComposedOf(int id, IEnumerable<TItem> all)
         public IEnumerable<TItem> GetComposedOf(int id)
         {
             // GetAll is cheap, repository has a full dataset cache policy
-            // todo - still, because it uses the cache, race conditions!
+            // TODO: still, because it uses the cache, race conditions!
             var allContentTypes = GetAll(Array.Empty<int>());
             return GetComposedOf(id, allContentTypes);
         }
diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index b97c3a3ee7cf..4c588157d000 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -204,7 +204,7 @@ public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameCont
                     _dataTypeContainerRepository.Save(container);
                     scope.Complete();
 
-                    // todo - triggering SavedContainer with a different name?!
+                    // TODO: triggering SavedContainer with a different name?!
                     scope.Events.Dispatch(SavedContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs), "RenamedContainer");
 
                     return OperationResult.Attempt.Succeed(OperationResultType.Success, evtMsgs, container);
@@ -318,7 +318,7 @@ public Attempt<OperationResult<MoveOperationStatusType>> Move(IDataType toMove,
                 }
                 catch (DataOperationException<MoveOperationStatusType> ex)
                 {
-                    scope.Complete(); // todo what are we doing here exactly?
+                    scope.Complete(); // TODO: what are we doing here exactly?
                     return OperationResult.Attempt.Fail(ex.Operation, evtMsgs);
                 }
             }
@@ -426,8 +426,8 @@ public void Delete(IDataType dataType, int userId = 0)
 
 
                 // find ContentTypes using this IDataTypeDefinition on a PropertyType, and delete
-                // todo - media and members?!
-                // todo - non-group properties?!
+                // TODO: media and members?!
+                // TODO: non-group properties?!
                 var query = Query<PropertyType>().Where(x => x.DataTypeId == dataType.Id);
                 var contentTypes = _contentTypeRepository.GetByQuery(query);
                 foreach (var contentType in contentTypes)
diff --git a/src/Umbraco.Core/Services/Implement/EntityService.cs b/src/Umbraco.Core/Services/Implement/EntityService.cs
index ee6bdeb46dab..00edde48f349 100644
--- a/src/Umbraco.Core/Services/Implement/EntityService.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityService.cs
@@ -388,7 +388,7 @@ internal IEnumerable<IEntitySlim> GetMediaChildrenWithoutPropertyData(int parent
             {
                 var query = Query<IUmbracoEntity>().Where(x => x.ParentId == parentId);
 
-                //todo - see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
+                // TODO: see https://github.com/umbraco/Umbraco-CMS/pull/3460#issuecomment-434903930 we need to not load any property data at all for media
                 return ((EntityRepository)_entityRepository).GetMediaByQueryWithoutPropertyData(query);
             }
         }
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 6b52dd4ac188..6a8514f0a027 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -47,7 +47,7 @@ public EntityXmlSerializer(
         /// </summary>
         public XElement Serialize(IContent content,
             bool published,
-            bool withDescendants = false) //todo take care of usage! only used for the packager
+            bool withDescendants = false) // TODO: take care of usage! only used for the packager
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
 
diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index 888407c0d024..36b4af6d5ec7 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -349,7 +349,7 @@ public Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateFo
 
             var evtMsgs = EventMessagesFactory.Get();
 
-            //todo: This isn't pretty because we we're required to maintain backwards compatibility so we could not change
+            // TODO: This isn't pretty because we we're required to maintain backwards compatibility so we could not change
             // the event args here. The other option is to create a different event with different event
             // args specifically for this method... which also isn't pretty. So fix this in v8!
             var additionalData = new Dictionary<string, object>
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index 357352c18299..9ca7892f621c 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -882,7 +882,7 @@ public Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = 0)
             {
                 scope.WriteLock(Constants.Locks.MediaTree);
 
-                // todo - missing 7.6 "ensure valid path" thing here?
+                // TODO: missing 7.6 "ensure valid path" thing here?
                 // but then should be in PerformMoveLocked on every moved item?
 
                 var originalPath = media.Path;
@@ -1031,7 +1031,7 @@ public OperationResult EmptyRecycleBin()
         {
             var nodeObjectType = Constants.ObjectTypes.Media;
             var deleted = new List<IMedia>();
-            var evtMsgs = EventMessagesFactory.Get(); // todo - and then?
+            var evtMsgs = EventMessagesFactory.Get(); // TODO: and then?
 
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs
index 5726c43fc73b..b7afaea1beff 100644
--- a/src/Umbraco.Core/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberService.cs
@@ -1304,7 +1304,7 @@ private static IEnumerable<MemberExportProperty> GetPropertyExportItems(IMember
                     Id = property.Id,
                     Alias = property.Alias,
                     Name = property.PropertyType.Name,
-                    Value = property.GetValue(), // todo ignoring variants
+                    Value = property.GetValue(), // TODO: ignoring variants
                     CreateDate = property.CreateDate,
                     UpdateDate = property.UpdateDate
                 };
diff --git a/src/Umbraco.Core/Services/Implement/NotificationService.cs b/src/Umbraco.Core/Services/Implement/NotificationService.cs
index a4aedec43836..95353715e117 100644
--- a/src/Umbraco.Core/Services/Implement/NotificationService.cs
+++ b/src/Umbraco.Core/Services/Implement/NotificationService.cs
@@ -307,7 +307,7 @@ private NotificationRequest CreateNotificationRequest(IUser performingUser, IUse
                     summary.Append("<table style=\"width: 100 %; \">");
                     foreach (var p in content.Properties)
                     {
-                        //todo doesn't take into account variants
+                        // TODO: doesn't take into account variants
 
                         var newText = p.GetValue() != null ? p.GetValue().ToString() : "";
                         var oldText = newText;
diff --git a/src/Umbraco.Core/Services/Implement/RelationService.cs b/src/Umbraco.Core/Services/Implement/RelationService.cs
index dc9693766f44..a316d04f8e28 100644
--- a/src/Umbraco.Core/Services/Implement/RelationService.cs
+++ b/src/Umbraco.Core/Services/Implement/RelationService.cs
@@ -393,7 +393,7 @@ public IRelation Relate(int parentId, int childId, IRelationType relationType)
                 if (scope.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
                 {
                     scope.Complete();
-                    return relation; // todo - returning sth that does not exist here?!
+                    return relation; // TODO: returning sth that does not exist here?!
                 }
 
                 _relationRepository.Save(relation);
diff --git a/src/Umbraco.Core/Services/Implement/ScopeRepositoryService.cs b/src/Umbraco.Core/Services/Implement/ScopeRepositoryService.cs
index 784d18da4e1c..d7303991b547 100644
--- a/src/Umbraco.Core/Services/Implement/ScopeRepositoryService.cs
+++ b/src/Umbraco.Core/Services/Implement/ScopeRepositoryService.cs
@@ -4,7 +4,7 @@
 
 namespace Umbraco.Core.Services.Implement
 {
-    // todo that one does not add anything = kill
+    // TODO: that one does not add anything = kill
     public abstract class ScopeRepositoryService : RepositoryService
     {
         protected ScopeRepositoryService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory)
diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index 1a88464231d8..e2c64d2f299b 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -200,7 +200,7 @@ public IUser GetByUsername(string username)
                 }
                 catch (DbException)
                 {
-                    // todo - refactor users/upgrade
+                    // TODO: refactor users/upgrade
                     // currently kinda accepting anything on upgrade, but that won't deal with all cases
                     // so we need to do it differently, see the custom UmbracoPocoDataBuilder which should
                     // be better BUT requires that the app restarts after the upgrade!
@@ -705,7 +705,7 @@ public IUser GetUserById(int id)
                 }
                 catch (DbException)
                 {
-                    // todo - refactor users/upgrade
+                    // TODO: refactor users/upgrade
                     // currently kinda accepting anything on upgrade, but that won't deal with all cases
                     // so we need to do it differently, see the custom UmbracoPocoDataBuilder which should
                     // be better BUT requires that the app restarts after the upgrade!
diff --git a/src/Umbraco.Core/Services/OperationResult.cs b/src/Umbraco.Core/Services/OperationResult.cs
index f6349a985d3f..d5cdcd79fc0c 100644
--- a/src/Umbraco.Core/Services/OperationResult.cs
+++ b/src/Umbraco.Core/Services/OperationResult.cs
@@ -3,8 +3,7 @@
 
 namespace Umbraco.Core.Services
 {
-    // todo
-    // no need for Attempt<OperationResult> - the operation result SHOULD KNOW if it's a success or a failure!
+    // TODO: no need for Attempt<OperationResult> - the operation result SHOULD KNOW if it's a success or a failure!
     // but then each WhateverResultType must 
 
     /// <summary>
@@ -119,7 +118,7 @@ public static OperationResult Cancel(EventMessages eventMessages)
             return new OperationResult(OperationResultType.FailedCancelledByEvent, eventMessages);
         }
 
-        // todo - this exists to support services that still return Attempt<OperationResult>
+        // TODO: this exists to support services that still return Attempt<OperationResult>
         // these services should directly return an OperationResult, and then this static class should be deleted
         internal static class Attempt
         {
diff --git a/src/Umbraco.Core/Services/OperationResultType.cs b/src/Umbraco.Core/Services/OperationResultType.cs
index 8ad24aafb878..2998692c13e5 100644
--- a/src/Umbraco.Core/Services/OperationResultType.cs
+++ b/src/Umbraco.Core/Services/OperationResultType.cs
@@ -38,7 +38,7 @@ public enum OperationResultType : byte
         /// <summary>
         /// No operation has been executed because it was not needed (eg deleting an item that doesn't exist).
         /// </summary>
-        NoOperation = Failed | 6, // todo shouldn't it be a success?
+        NoOperation = Failed | 6, // TODO: shouldn't it be a success?
 
         //TODO: In the future, we might need to add more operations statuses, potentially like 'FailedByPermissions', etc...
     }
diff --git a/src/Umbraco.Core/Services/PublishResultType.cs b/src/Umbraco.Core/Services/PublishResultType.cs
index 418e5c08963f..1a2b52f9c925 100644
--- a/src/Umbraco.Core/Services/PublishResultType.cs
+++ b/src/Umbraco.Core/Services/PublishResultType.cs
@@ -115,7 +115,7 @@ public enum PublishResultType : byte
         /// <summary>
         /// The document could not be published because it has no publishing flags or values.
         /// </summary>
-        FailedPublishNothingToPublish = FailedPublish | 9, // in ContentService.StrategyCanPublish - todo weird
+        FailedPublishNothingToPublish = FailedPublish | 9, // TODO: in ContentService.StrategyCanPublish - weird
 
         /// <summary>
         /// The document could not be published because some mandatory cultures are missing.
diff --git a/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs b/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs
index f5b4a1cff35d..91dd5a759730 100644
--- a/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs
+++ b/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs
@@ -3337,8 +3337,7 @@ private static void ToAscii(char[] input, int ipos, char[] output, ref int opos,
                     // time for a T4 template?
                     // also we should support extensibility so ppl can register more cases in external code
 
-                    // todo
-                    // transliterates Анастасия as Anastasiya, and not Anastasia
+                    // TODO: transliterates Анастасия as Anastasiya, and not Anastasia
                     // Ольга --> Ol'ga, Татьяна --> Tat'yana -- that's bad (?)
                     // Note: should ä (German umlaut) become a or ae ?
 
diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
index d2b790334350..a10c9678669c 100644
--- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
+++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
@@ -26,7 +26,7 @@ public static class ApplicationUrlHelper
         /// in config files but is determined programmatically.</para>
         /// <para>Must be assigned before resolution is frozen.</para>
         /// </remarks>
-        // todo need another way to do it, eg an interface, injected!
+        // TODO: need another way to do it, eg an interface, injected!
         public static Func<HttpRequestBase, string> ApplicationUrlProvider { get; set; }
 
         internal static string GetApplicationUrl(ILogger logger, IGlobalSettings globalSettings, IUmbracoSettingsSection settings, IServerRegistrar serverRegistrar, HttpRequestBase request = null)
diff --git a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
index a34644e6a112..741cc2bab18d 100644
--- a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
+++ b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
@@ -302,7 +302,7 @@ private void ProcessDatabaseInstructions(IUmbracoDatabase database)
             // (depending on what the cache refreshers are doing). I think it's best we do the one time check, process them and continue, if there are
             // pending requests after being processed, they'll just be processed on the next poll.
             //
-            // todo not true if we're running on a background thread, assuming we can?
+            // TODO: not true if we're running on a background thread, assuming we can?
 
             var sql = Sql().SelectAll()
                 .From<CacheInstructionDto>()

From 0b6ba5aa52980537c42ede478842e0fe3ce804ec Mon Sep 17 00:00:00 2001
From: Chris Houston <chouston@vizioz.com>
Date: Sat, 26 Jan 2019 10:52:19 -0500
Subject: [PATCH 070/421] Temp8 - Fixing spelling / typos etc in Umbraco.Web
 (#4148)

---
 src/Umbraco.Web.UI.Client/package-lock.json   |  4 +-
 src/Umbraco.Web.UI/Views/Web.config           |  6 +-
 .../Cache/ContentCacheRefresher.cs            |  2 +-
 src/Umbraco.Web/Cache/DistributedCache.cs     |  4 +-
 .../Cache/DistributedCacheBinder_Handlers.cs  |  4 +-
 .../Cache/LanguageCacheRefresher.cs           |  2 +-
 ...aseServerRegistrarAndMessengerComponent.cs |  2 +-
 .../Composers/ControllersComposer.cs          |  3 +-
 .../Editors/AuthenticationController.cs       | 52 ++++++-------
 .../Editors/BackOfficeController.cs           |  4 +-
 .../Editors/BackOfficeServerVariables.cs      |  2 +-
 .../Editors/Binders/MemberBinder.cs           |  4 +-
 src/Umbraco.Web/Editors/CodeFileController.cs |  4 +-
 src/Umbraco.Web/Editors/ContentController.cs  | 24 +++---
 .../Editors/ContentControllerBase.cs          |  4 +-
 .../Editors/ContentTypeController.cs          |  8 +-
 .../Editors/ContentTypeControllerBase.cs      |  2 +-
 src/Umbraco.Web/Editors/DataTypeController.cs |  6 +-
 .../Editors/DictionaryController.cs           | 10 +--
 src/Umbraco.Web/Editors/EntityController.cs   |  6 +-
 .../Editors/ExamineManagementController.cs    |  2 +-
 .../Filters/ContentItemValidationHelper.cs    |  2 +-
 .../Filters/ContentSaveValidationAttribute.cs |  2 +-
 src/Umbraco.Web/Editors/LanguageController.cs |  4 +-
 src/Umbraco.Web/Editors/LegacyController.cs   |  6 +-
 .../Editors/MacroRenderingController.cs       | 12 +--
 src/Umbraco.Web/Editors/MediaController.cs    |  8 +-
 .../Editors/MediaTypeController.cs            |  4 +-
 src/Umbraco.Web/Editors/MemberController.cs   | 12 +--
 .../Editors/MemberTypeController.cs           |  4 +-
 .../Editors/PackageInstallController.cs       |  2 +-
 src/Umbraco.Web/Editors/PasswordChanger.cs    |  2 +-
 src/Umbraco.Web/Editors/TemplateController.cs |  2 +-
 .../Editors/TemplateQueryController.cs        |  1 +
 .../Editors/UserGroupsController.cs           |  2 +-
 src/Umbraco.Web/Editors/UsersController.cs    |  2 +-
 .../FolderAndFilePermissionsCheck.cs          |  2 +-
 .../HealthCheck/Checks/Security/HstsCheck.cs  |  2 +-
 .../Checks/Security/XssProtectionCheck.cs     |  2 +-
 .../HealthCheck/HealthCheckResults.cs         |  4 +-
 .../HealthCheck/HealthCheckStatus.cs          |  2 +-
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |  4 +-
 src/Umbraco.Web/HtmlStringUtilities.cs        | 14 ++--
 src/Umbraco.Web/HttpCookieExtensions.cs       |  2 +-
 .../ImageCropperTemplateExtensions.cs         | 10 +--
 .../Controllers/InstallApiController.cs       |  2 +-
 .../Install/FilePermissionHelper.cs           |  6 +-
 .../Install/HttpInstallAuthorizeAttribute.cs  |  4 +-
 .../Install/InstallAuthorizeAttribute.cs      |  2 +-
 .../Install/InstallSteps/NewInstallStep.cs    |  2 +-
 .../InstallSteps/SetUmbracoVersionStep.cs     |  2 +-
 .../InstallSteps/StarterKitCleanupStep.cs     |  2 +-
 .../InstallSteps/StarterKitInstallStep.cs     |  2 +-
 src/Umbraco.Web/Macros/MacroRenderer.cs       |  6 +-
 src/Umbraco.Web/Macros/MacroTagParser.cs      | 10 +--
 .../Media/EmbedProviders/OEmbedResponse.cs    |  2 +-
 .../Media/Exif/ExifBitConverter.cs            |  4 +-
 src/Umbraco.Web/Media/Exif/ExifProperty.cs    |  2 +-
 .../Media/Exif/ExifPropertyFactory.cs         |  2 +-
 src/Umbraco.Web/Media/Exif/ExifTag.cs         |  4 +-
 src/Umbraco.Web/Media/Exif/JPEGFile.cs        | 12 +--
 src/Umbraco.Web/Media/Exif/MathEx.cs          |  4 +-
 src/Umbraco.Web/ModelStateExtensions.cs       |  2 +-
 .../Models/ContentEditing/ContentSortOrder.cs |  2 +-
 .../ContentEditing/ContentVariationDisplay.cs |  2 +-
 .../DictionaryTranslationSave.cs              |  2 +-
 .../Models/ContentEditing/EntityBasic.cs      |  2 +-
 .../ContentEditing/RelationTypeDisplay.cs     |  2 +-
 .../ContentEditing/SimpleNotificationModel.cs |  2 +-
 .../ContentEditing/TabbedContentItem.cs       |  4 +-
 .../Models/ContentEditing/TreeSearchResult.cs |  2 +-
 src/Umbraco.Web/Models/ImageCropMode.cs       |  2 +-
 .../ContentItemDisplayVariationResolver.cs    |  6 +-
 .../Mapping/ContentTypeProfileExtensions.cs   |  6 +-
 .../Models/Mapping/DictionaryMapperProfile.cs |  4 +-
 .../Models/Mapping/LanguageMapperProfile.cs   |  4 +-
 .../Models/Mapping/MacroMapperProfile.cs      |  2 +-
 .../MemberTabsAndPropertiesResolver.cs        | 38 +++++-----
 .../Mapping/TabsAndPropertiesResolver.cs      |  4 +-
 src/Umbraco.Web/Models/PackageInstallModel.cs |  2 +-
 .../Models/PublishedContentBase.cs            |  2 +-
 src/Umbraco.Web/Models/RegisterModel.cs       |  2 +-
 .../Models/Trees/TreeNodeExtensions.cs        |  2 +-
 src/Umbraco.Web/Mvc/ControllerExtensions.cs   |  2 +-
 .../Mvc/DisableBrowserCacheAttribute.cs       |  2 +-
 .../EnsurePublishedContentRequestAttribute.cs |  4 +-
 .../Mvc/MasterControllerFactory.cs            |  2 +-
 src/Umbraco.Web/Mvc/PluginController.cs       |  2 +-
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  4 +-
 src/Umbraco.Web/Mvc/Strings.Designer.cs       | 10 +--
 src/Umbraco.Web/Mvc/Strings.resx              |  4 +-
 .../Mvc/UmbracoAuthorizeAttribute.cs          |  2 +-
 src/Umbraco.Web/Mvc/UmbracoPageResult.cs      |  2 +-
 .../Mvc/UmbracoVirtualNodeRouteHandler.cs     | 15 ++--
 .../Mvc/ViewDataContainerExtensions.cs        |  2 +-
 src/Umbraco.Web/OwinExtensions.cs             |  2 +-
 .../FileUploadPropertyEditor.cs               |  4 +-
 .../PropertyEditors/GridConfiguration.cs      |  2 +-
 .../GridConfigurationEditor.cs                |  4 +-
 .../ImageCropperPropertyEditor.cs             |  6 +-
 .../ImageCropperPropertyValueEditor.cs        |  2 +-
 .../MultiNodePickerConfigurationEditor.cs     |  2 +-
 .../MultipleTextStringConfigurationEditor.cs  |  4 +-
 .../PropertyEditors/RichTextPropertyEditor.cs |  2 +-
 .../PropertyEditors/RteEmbedController.cs     |  2 +-
 .../PropertyEditors/TagConfigurationEditor.cs |  2 +-
 .../PropertyEditors/TagsDataController.cs     |  2 +-
 .../MarkdownEditorValueConverter.cs           |  2 +-
 .../ValueListUniqueValueValidator.cs          |  4 +-
 .../IPublishedSnapshotService.cs              |  4 +-
 .../PublishedCache/NuCache/ContentCache.cs    |  2 +-
 .../NuCache/DataSource/SerializerBase.cs      |  2 +-
 .../NuCache/Navigable/NavigableContentType.cs |  2 +-
 .../PublishedCache/NuCache/NuCacheComposer.cs |  2 +-
 .../NuCache/PublishedContent.cs               |  2 +-
 .../NuCache/PublishedSnapshotService.cs       | 16 ++--
 .../PublishedCache/NuCache/SnapDictionary.cs  |  2 +-
 .../PublishedElementPropertyBase.cs           |  2 +-
 .../DictionaryPublishedContent.cs             |  2 +-
 .../XmlPublishedCache/PublishedMediaCache.cs  | 12 +--
 .../XmlPublishedCache/XmlStore.cs             | 14 ++--
 .../XmlStoreFilePersister.cs                  |  2 +-
 src/Umbraco.Web/PublishedElementExtensions.cs |  2 +-
 src/Umbraco.Web/RouteCollectionExtensions.cs  |  4 +-
 .../Routing/ContentFinderByRedirectUrl.cs     |  2 +-
 .../Routing/ContentFinderByUrlAlias.cs        |  3 +-
 .../Routing/IContentLastChanceFinder.cs       |  2 +-
 src/Umbraco.Web/Routing/PublishedRequest.cs   | 11 +--
 src/Umbraco.Web/Routing/PublishedRouter.cs    |  4 +-
 .../Routing/RedirectTrackingComponent.cs      |  2 +-
 .../Runtime/WebRuntimeComponent.cs            |  2 +-
 .../Scheduling/BackgroundTaskRunner.cs        | 12 +--
 .../Scheduling/RecurringTaskBase.cs           |  4 +-
 src/Umbraco.Web/Scheduling/ScheduledTasks.cs  |  2 +-
 .../Scheduling/SchedulerComponent.cs          |  2 +-
 src/Umbraco.Web/Search/ExamineComponent.cs    | 10 +--
 src/Umbraco.Web/Search/ExamineComposer.cs     |  2 +-
 .../Security/AuthenticationExtensions.cs      | 44 +++++------
 .../Security/BackOfficeSignInManager.cs       |  4 +-
 .../Security/BackOfficeUserManager.cs         | 14 ++--
 .../Security/GetUserSecondsMiddleWare.cs      |  2 +-
 .../Security/IdentityAuditEventArgs.cs        |  4 +-
 src/Umbraco.Web/Security/MembershipHelper.cs  |  6 +-
 .../Providers/UmbracoMembershipProvider.cs    |  6 +-
 .../Security/SessionIdValidator.cs            |  2 +-
 .../UmbracoAuthTicketDataProtector.cs         |  2 +-
 .../Security/UmbracoSecureDataFormat.cs       |  2 +-
 src/Umbraco.Web/Security/WebAuthExtensions.cs |  4 +-
 src/Umbraco.Web/Security/WebSecurity.cs       |  2 +-
 src/Umbraco.Web/Templates/TemplateRenderer.cs |  2 +-
 .../Trees/ApplicationTreeController.cs        |  2 +-
 .../Trees/ContentBlueprintTreeController.cs   |  2 +-
 .../Trees/ContentTreeController.cs            |  2 +-
 .../Trees/ContentTreeControllerBase.cs        |  2 +-
 .../Trees/ContentTypeTreeController.cs        |  4 +-
 .../Trees/DataTypeTreeController.cs           |  4 +-
 .../Trees/DictionaryTreeController.cs         |  2 +-
 .../Trees/MediaTypeTreeController.cs          | 16 ++--
 src/Umbraco.Web/Trees/TreeControllerBase.cs   |  6 +-
 src/Umbraco.Web/Trees/UrlHelperExtensions.cs  |  2 +-
 .../UI/JavaScript/AssetInitialization.cs      |  2 +-
 .../ClientDependencyConfiguration.cs          |  4 +-
 .../UI/JavaScript/Resources.Designer.cs       | 73 ++++++++++++-------
 src/Umbraco.Web/UI/JavaScript/Resources.resx  |  4 +-
 src/Umbraco.Web/UI/Pages/BasePage.cs          |  4 +-
 src/Umbraco.Web/UI/Pages/ClientTools.cs       |  6 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |  2 +-
 src/Umbraco.Web/UmbracoComponentRenderer.cs   |  2 +-
 src/Umbraco.Web/UmbracoContext.cs             |  2 +-
 src/Umbraco.Web/UmbracoHelper.cs              | 28 +++----
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 10 +--
 src/Umbraco.Web/UriUtility.cs                 |  2 +-
 src/Umbraco.Web/UrlHelperExtensions.cs        |  2 +-
 src/Umbraco.Web/UrlHelperRenderExtensions.cs  | 12 +--
 .../Filters/DisableBrowserCacheAttribute.cs   |  2 +-
 .../FileUploadCleanupFilterAttribute.cs       |  4 +-
 .../OverridableAuthorizationAttribute.cs      |  2 +-
 .../UmbracoApplicationAuthorizeAttribute.cs   |  2 +-
 .../WebApi/HttpActionContextExtensions.cs     |  2 +-
 .../WebApi/HttpRequestMessageExtensions.cs    |  4 +-
 .../SessionHttpControllerRouteHandler.cs      |  2 +-
 src/Umbraco.Web/_Legacy/Controls/TabPage.cs   |  2 +-
 .../PackageActions/publishRootDocument.cs     |  2 +-
 .../_Legacy/UI/LegacyDialogHandler.cs         |  2 +-
 .../umbraco.presentation/default.aspx.cs      |  2 +-
 src/Umbraco.Web/umbraco.presentation/item.cs  |  6 +-
 src/Umbraco.Web/umbraco.presentation/page.cs  |  2 +-
 .../umbraco/dashboard/FeedProxy.aspx.cs       |  2 +-
 .../umbraco/masterpages/umbracoPage.Master.cs |  2 +-
 .../DisableEventValidation.cs                 |  2 +-
 .../umbraco/templateControls/Item.cs          |  2 +-
 .../umbraco/templateControls/ItemRenderer.cs  |  2 +-
 .../umbraco/templateControls/Macro.cs         |  2 +-
 193 files changed, 498 insertions(+), 480 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index fe657ae4700e..8afb0a17e32f 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -13278,7 +13278,7 @@
     },
     "pretty-hrtime": {
       "version": "1.0.3",
-      "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
@@ -15838,7 +15838,7 @@
       "dependencies": {
         "lru-cache": {
           "version": "2.2.4",
-          "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
           "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
           "dev": true
         }
diff --git a/src/Umbraco.Web.UI/Views/Web.config b/src/Umbraco.Web.UI/Views/Web.config
index c9a74eebb05f..c137c3705e8b 100644
--- a/src/Umbraco.Web.UI/Views/Web.config
+++ b/src/Umbraco.Web.UI/Views/Web.config
@@ -54,16 +54,16 @@
                     Somehow, transitive dependencies are not working correctly, and either (a) NuGet fails to properly
                     register this dependency, or (b) when reference assemblies are gathered before compiling views, this
                     dependency is missed. In any case, the result is that the ICodeProvider is passed a list of referenced
-                    assemblies that is missing netstandard.
+                    assemblies that is missing .NET Standard.
 
                     It may be a mix of both. NuGet registers the dependency well enough, that we can actually build the
-                    whole application - but it is not doing something that is required in order to have netstandard
+                    whole application - but it is not doing something that is required in order to have .NET Standard
                     being a dependency when building views.
 
                     See also: https://stackoverflow.com/questions/50165910
 
                     Funny enough, the CSharpCompiler already explicitly adds System.Runtime as a referenced assembly,
-                    with a comment mentioning an issue. But it's not adding netstandard. So, for the time being, to be sure,
+                    with a comment mentioning an issue. But it's not adding .NET Standard. So, for the time being, to be sure,
                     we are adding both here.
                 -->
                 <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
index a1942ed141a1..944157db9da8 100644
--- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
@@ -75,7 +75,7 @@ public override void Refresh(JsonPayload[] payloads)
 
                 if (assignedDomains.Count > 0)
                 {
-                    // todo - this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container,
+                    // TODO: this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container,
                     // and we cannot inject the CacheRefresherCollection since that would be a circular reference, so what is the best way to call directly in to the
                     // DomainCacheRefresher?
 
diff --git a/src/Umbraco.Web/Cache/DistributedCache.cs b/src/Umbraco.Web/Cache/DistributedCache.cs
index c445f66621e9..1e0e33ebd7d1 100644
--- a/src/Umbraco.Web/Cache/DistributedCache.cs
+++ b/src/Umbraco.Web/Cache/DistributedCache.cs
@@ -24,7 +24,7 @@ public sealed class DistributedCache
         #region Core notification methods
 
         /// <summary>
-        /// Notifies the distributed cache of specifieds item invalidation, for a specified <see cref="ICacheRefresher"/>.
+        /// Notifies the distributed cache of specified item invalidation, for a specified <see cref="ICacheRefresher"/>.
         /// </summary>
         /// <typeparam name="T">The type of the invalidated items.</typeparam>
         /// <param name="refresherGuid">The unique identifier of the ICacheRefresher.</param>
@@ -148,7 +148,7 @@ public void Remove(Guid refresherGuid, int id)
         }
 
         /// <summary>
-        /// Notifies the distributed cache of specifieds item removal, for a specified <see cref="ICacheRefresher"/>.
+        /// Notifies the distributed cache of specified item removal, for a specified <see cref="ICacheRefresher"/>.
         /// </summary>
         /// <typeparam name="T">The type of the removed items.</typeparam>
         /// <param name="refresherGuid">The unique identifier of the ICacheRefresher.</param>
diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
index f75d8ead8723..4f05abc9ee03 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
@@ -267,7 +267,7 @@ private void DomainService_Deleted(IDomainService sender, DeleteEventArgs<IDomai
         #region LocalizationService / Language
 
         /// <summary>
-        /// Fires when a langauge is deleted
+        /// Fires when a language is deleted
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -278,7 +278,7 @@ private void LocalizationService_DeletedLanguage(ILocalizationService sender, De
         }
 
         /// <summary>
-        /// Fires when a langauge is saved
+        /// Fires when a language is saved
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
diff --git a/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs b/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs
index c5dfcfd1e7a6..909312460965 100644
--- a/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs
@@ -57,7 +57,7 @@ private void RefreshDomains(int langId)
 
             if (assignedDomains.Count > 0)
             {
-                // todo - this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container,
+                // TODO: this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container,
                 // and we cannot inject the CacheRefresherCollection since that would be a circular reference, so what is the best way to call directly in to the
                 // DomainCacheRefresher?
 
diff --git a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
index 589502e6a21c..4ae371502fd2 100644
--- a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Components
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
 
     // during Initialize / Startup, we end up checking Examine, which needs to be initialized beforehand
-    // todo - should not be a strong dependency on "examine" but on an "indexing component"
+    // TODO: should not be a strong dependency on "examine" but on an "indexing component"
     [ComposeAfter(typeof(ExamineComposer))]
 
     public sealed class DatabaseServerRegistrarAndMessengerComposer : ComponentComposer<DatabaseServerRegistrarAndMessengerComponent>, ICoreComposer
diff --git a/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs b/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs
index 377a6bdb862f..0aa3c7f8a12d 100644
--- a/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs
+++ b/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs
@@ -32,8 +32,7 @@ public static Composition ComposeUmbracoControllers(this Composition composition
             // UmbracoApiController is fast-ish because they both are IDiscoverable. Scanning for IController or IHttpController
             // is a full, non-cached scan = expensive, we do it only for 1 assembly.
             //
-            // TODO
-            // find a way to scan for IController *and* IHttpController in one single pass
+            // TODO: find a way to scan for IController *and* IHttpController in one single pass
             // or, actually register them manually so don't require a full scan for these
             // 5 are IController but not PluginController
             //  Umbraco.Web.Mvc.RenderMvcController
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index c11b64882a28..5804a00a792d 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -69,8 +69,8 @@ public AuthenticationController(IGlobalSettings globalSettings, UmbracoContext u
         [WebApi.UmbracoAuthorize(requireApproval: false)]
         public IDictionary<string, object> GetMembershipProviderConfig()
         {
-            //TODO: Check if the current PasswordValidator is an IMembershipProviderPasswordValidator, if
-            //it's not than we should return some generic defaults
+            // TODO: Check if the current PasswordValidator is an IMembershipProviderPasswordValidator, if
+            // it's not than we should return some generic defaults
             var provider = Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider();
             return provider.GetConfiguration(Services.UserService);
         }
@@ -194,7 +194,7 @@ public UserDetail GetCurrentInvitedUser()
 
             if (user.IsApproved)
             {
-                //if they are approved, than they are no longer invited and we can return an error
+                // if they are approved, than they are no longer invited and we can return an error
                 throw new HttpResponseException(Request.CreateUserNoAccessResponse());
             }
 
@@ -202,14 +202,14 @@ public UserDetail GetCurrentInvitedUser()
             var httpContextAttempt = TryGetHttpContext();
             if (httpContextAttempt.Success)
             {
-                //set their remaining seconds
+                // set their remaining seconds
                 result.SecondsUntilTimeout = httpContextAttempt.Result.GetRemainingAuthSeconds();
             }
 
             return result;
         }
 
-        //TODO: This should be on the CurrentUserController?
+        // TODO: This should be on the CurrentUserController?
         [WebApi.UmbracoAuthorize]
         [ValidateAngularAntiForgeryToken]
         public async Task<Dictionary<string, string>> GetCurrentUserLinkedLogins()
@@ -228,8 +228,8 @@ public async Task<HttpResponseMessage> PostLogin(LoginModel loginModel)
             var http = EnsureHttpContext();
             var owinContext = TryGetOwinContext().Result;
 
-            //Sign the user in with username/password, this also gives a chance for developers to
-            //custom verify the credentials and auto-link user accounts with a custom IBackOfficePasswordChecker
+            // Sign the user in with username/password, this also gives a chance for developers to
+            // custom verify the credentials and auto-link user accounts with a custom IBackOfficePasswordChecker
             var result = await SignInManager.PasswordSignInAsync(
                 loginModel.Username, loginModel.Password, isPersistent: true, shouldLockout: true);
 
@@ -237,7 +237,7 @@ public async Task<HttpResponseMessage> PostLogin(LoginModel loginModel)
             {
                 case SignInStatus.Success:
 
-                    //get the user
+                    // get the user
                     var user = Services.UserService.GetByUsername(loginModel.Username);
                     UserManager.RaiseLoginSuccessEvent(user.Id);
 
@@ -268,7 +268,7 @@ public async Task<HttpResponseMessage> PostLogin(LoginModel loginModel)
 
                     var attemptedUser = Services.UserService.GetByUsername(loginModel.Username);
 
-                    //create a with information to display a custom two factor send code view
+                    // create a with information to display a custom two factor send code view
                     var verifyResponse = Request.CreateResponse(HttpStatusCode.PaymentRequired, new
                     {
                         twoFactorView = twofactorView,
@@ -282,10 +282,10 @@ public async Task<HttpResponseMessage> PostLogin(LoginModel loginModel)
                 case SignInStatus.LockedOut:
                 case SignInStatus.Failure:
                 default:
-                    //return BadRequest (400), we don't want to return a 401 because that get's intercepted
+                    // return BadRequest (400), we don't want to return a 401 because that get's intercepted
                     // by our angular helper because it thinks that we need to re-perform the request once we are
-                    // authorized and we don't want to return a 403 because angular will show a warning msg indicating
-                    // that the user doesn't have access to perform this function, we just want to return a normal invalid msg.
+                    // authorized and we don't want to return a 403 because angular will show a warning message indicating
+                    // that the user doesn't have access to perform this function, we just want to return a normal invalid message.
                     throw new HttpResponseException(HttpStatusCode.BadRequest);
             }
         }
@@ -314,13 +314,13 @@ public async Task<HttpResponseMessage> PostRequestPasswordReset(RequestPasswordR
                     var callbackUrl = ConstructCallbackUrl(identityUser.Id, code);
 
                     var message = Services.TextService.Localize("resetPasswordEmailCopyFormat",
-                        //Ensure the culture of the found user is used for the email!
+                        // Ensure the culture of the found user is used for the email!
                         UserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings),
                         new[] { identityUser.UserName, callbackUrl });
 
                     await UserManager.SendEmailAsync(identityUser.Id,
                         Services.TextService.Localize("login/resetPasswordEmailCopySubject",
-                            //Ensure the culture of the found user is used for the email!
+                            // Ensure the culture of the found user is used for the email!
                             UserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings)),
                         message);
 
@@ -332,7 +332,7 @@ await UserManager.SendEmailAsync(identityUser.Id,
         }
 
         /// <summary>
-        /// Used to retrived the 2FA providers for code submission
+        /// Used to retrieve the 2FA providers for code submission
         /// </summary>
         /// <returns></returns>
         [SetAngularAntiForgeryTokens]
@@ -417,7 +417,7 @@ public async Task<HttpResponseMessage> PostSetPassword(SetPasswordModel model)
                 {
                     Logger.Info<AuthenticationController>("User {UserId} is currently locked out, unlocking and resetting AccessFailedCount", model.UserId);
 
-                    //var user = await UserManager.FindByIdAsync(model.UserId);
+                    //// var user = await UserManager.FindByIdAsync(model.UserId);
                     var unlockResult = await UserManager.SetLockoutEndDateAsync(model.UserId, DateTimeOffset.Now);
                     if (unlockResult.Succeeded == false)
                     {
@@ -431,18 +431,18 @@ public async Task<HttpResponseMessage> PostSetPassword(SetPasswordModel model)
                     }
                 }
 
-                //They've successfully set their password, we can now update their user account to be confirmed
-                //if user was only invited, then they have not been approved
-                //but a successful forgot password flow (e.g. if their token had expired and they did a forgot password instead of request new invite)
-                //means we have verified their email
+                // They've successfully set their password, we can now update their user account to be confirmed
+                // if user was only invited, then they have not been approved
+                // but a successful forgot password flow (e.g. if their token had expired and they did a forgot password instead of request new invite)
+                // means we have verified their email
                 if (!UserManager.IsEmailConfirmed(model.UserId))
                 {
                     await UserManager.ConfirmEmailAsync(model.UserId, model.ResetCode);
                 }
 
-                //if the user is invited, enable their account on forgot password
+                // if the user is invited, enable their account on forgot password
                 var identityUser = await UserManager.FindByIdAsync(model.UserId);
-                //invited is not approved, never logged in, invited date present
+                // invited is not approved, never logged in, invited date present
                 /*
                 if (LastLoginDate == default && IsApproved == false && InvitedDate != null)
                     return UserState.Invited;
@@ -450,7 +450,7 @@ public async Task<HttpResponseMessage> PostSetPassword(SetPasswordModel model)
                 if (identityUser != null && !identityUser.IsApproved)
                 {
                     var user = Services.UserService.GetByUsername(identityUser.UserName);
-                    //also check InvitedDate and never logged in, otherwise this would allow a disabled user to reactivate their account with a forgot password
+                    // also check InvitedDate and never logged in, otherwise this would allow a disabled user to reactivate their account with a forgot password
                     if (user.LastLoginDate == default && user.InvitedDate != null)
                     {
                         user.IsApproved = true;
@@ -505,13 +505,13 @@ private HttpResponseMessage SetPrincipalAndReturnUserDetail(IUser user, IPrincip
             if (principal == null) throw new ArgumentNullException(nameof(principal));
 
             var userDetail = Mapper.Map<UserDetail>(user);
-            //update the userDetail and set their remaining seconds
+            // update the userDetail and set their remaining seconds
             userDetail.SecondsUntilTimeout = TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes).TotalSeconds;
 
-            //create a response with the userDetail object
+            // create a response with the userDetail object
             var response = Request.CreateResponse(HttpStatusCode.OK, userDetail);
 
-            //ensure the user is set for the current request
+            // ensure the user is set for the current request
             Request.SetPrincipalForRequest(principal);
 
             return response;
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 6dd5efecb128..7e45797107f5 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -176,7 +176,7 @@ public JsonNetResult LocalizedText(string culture = null)
 
             var textForCulture = Services.TextService.GetAllStoredValues(cultureInfo)
                 //the dictionary returned is fine but the delimiter between an 'area' and a 'value' is a '/' but the javascript
-                // in the back office requres the delimiter to be a '_' so we'll just replace it
+                // in the back office requires the delimiter to be a '_' so we'll just replace it
                 .ToDictionary(key => key.Key.Replace("/", "_"), val => val.Value);
 
             return new JsonNetResult { Data = textForCulture, Formatting = Formatting.Indented };
@@ -416,7 +416,7 @@ private async Task<ActionResult> ExternalSignInAsync(ExternalLoginInfo loginInfo
             {
                 if (await AutoLinkAndSignInExternalAccount(loginInfo, autoLinkOptions) == false)
                 {
-                    ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to to an account" };
+                    ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to an account" };
                 }
 
                 //Remove the cookie otherwise this message will keep appearing
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index d6a6947eba41..1d4113bb7dcf 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -426,7 +426,7 @@ private IEnumerable<Dictionary<string, string>> GetTreePluginsMetaData()
         /// </summary>
         /// <remarks>
         /// We are doing this because if we constantly resolve the tree controller types from the PluginManager it will re-scan and also re-log that
-        /// it's resolving which is unecessary and annoying.
+        /// it's resolving which is unnecessary and annoying.
         /// </remarks>
         private static readonly Lazy<IEnumerable<Type>> TreeControllerTypes
             = new Lazy<IEnumerable<Type>>(() => Current.TypeLoader.GetAttributedTreeControllers().ToArray()); // todo inject
diff --git a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
index f50122bc9bbb..f54fd12c30fa 100644
--- a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
+++ b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
@@ -140,7 +140,7 @@ private IMember CreateNew(MemberSave model)
                 var contentType = _services.MemberTypeService.Get(model.ContentTypeAlias);
                 if (contentType == null)
                 {
-                    throw new InvalidOperationException("No member type found wth alias " + model.ContentTypeAlias);
+                    throw new InvalidOperationException("No member type found with alias " + model.ContentTypeAlias);
                 }
 
                 //remove all membership properties, these values are set with the membership provider.
@@ -176,7 +176,7 @@ private IMember CreateNew(MemberSave model)
 
         /// <summary>
         /// This will remove all of the special membership provider properties which were required to display the property editors
-        /// for editing - but the values have been mapped back ot the MemberSave object directly - we don't want to keep these properties
+        /// for editing - but the values have been mapped back to the MemberSave object directly - we don't want to keep these properties
         /// on the IMember because they will attempt to be persisted which we don't want since they might not even exist.
         /// </summary>
         /// <param name="contentType"></param>
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index ec72ca3df4a0..6db0c6a8f9f0 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -82,7 +82,7 @@ public CodeFileDisplay PostCreateContainer(string type, string parentId, string
             if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
 
             // if the parentId is root (-1) then we just need an empty string as we are
-            // creating the path below and we don't wan't -1 in the path
+            // creating the path below and we don't want -1 in the path
             if (parentId == Core.Constants.System.Root.ToInvariantString())
             {
                 parentId = string.Empty;
@@ -193,7 +193,7 @@ public CodeFileDisplay GetByPath(string type, string virtualPath)
         }
 
         /// <summary>
-        /// Used to get a list of available templates/snippets to base a new Partial View og Partial View Macro from
+        /// Used to get a list of available templates/snippets to base a new Partial View or Partial View Macro from
         /// </summary>
         /// <param name="type">This is a string but will be 'partialViews', 'partialViewMacros'</param>
         /// <returns>Returns a list of <see cref="SnippetDisplay"/> if a correct type is sent</returns>
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index b574dc8f29d7..841c60938a87 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -104,14 +104,14 @@ public IEnumerable<ContentItemDisplay> GetByIds([FromUri]int[] ids)
         /// <param name="saveModel"></param>
         /// <returns></returns>
         /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to update
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to update
         /// </remarks>
         [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
         public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
         {
             if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
 
-            //TODO: Should non-admins be alowed to set granular permissions?
+            // TODO: Should non-admins be allowed to set granular permissions?
 
             var content = Services.ContentService.GetById(saveModel.ContentId);
             if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
@@ -166,7 +166,7 @@ public IEnumerable<AssignedUserGroupPermissions> PostSaveUserGroupPermissions(Us
         /// <param name="contentId"></param>
         /// <returns></returns>
         /// <remarks>
-        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to to view
+        /// Permission check is done for letter 'R' which is for <see cref="ActionRights"/> which the user must have access to view
         /// </remarks>
         [EnsureUserPermissionForContent("contentId", 'R')]
         public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int contentId)
@@ -457,7 +457,7 @@ public PagedResult<ContentItemBasic<ContentPropertyBasic>> GetChildren(
                 Direction orderDirection = Direction.Ascending,
                 bool orderBySystemField = true,
                 string filter = "",
-                string cultureName = "") // TODO it's not a NAME it's the ISO CODE
+                string cultureName = "") // TODO: it's not a NAME it's the ISO CODE
         {
             long totalChildren;
             List<IContent> children;
@@ -583,7 +583,7 @@ public ContentItemDisplay PostSave([ModelBinder(typeof(ContentItemBinder))] Cont
 
         private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IContent, OperationResult> saveMethod)
         {
-            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
+            //Recent versions of IE/Edge may send in the full client side file path instead of just the file name.
             //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
             //uploaded files to being *only* the actual file name (as it should be).
             if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
@@ -647,7 +647,7 @@ private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IC
                             .Any(x => x == false))
                     {
                         //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
-                        // add the modelstate to the outgoing object and throw a validation message
+                        // add the model state to the outgoing object and throw a validation message
                         var forDisplay = MapToDisplay(contentItem.PersistedContent);
                         forDisplay.Errors = ModelState.ToErrorDictionary();
                         throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
@@ -797,7 +797,7 @@ private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func<IC
                     v.Notifications.AddRange(n.Notifications);
             }
 
-            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            //lastly, if it is not valid, add the model state to the outgoing object and throw a 403
             HandleInvalidModelState(display);
 
             if (wasCancelled)
@@ -1040,7 +1040,7 @@ private bool SaveScheduleVariant(ContentItemSave contentItem)
         /// <param name="msg"></param>
         /// <remarks>
         /// global notifications will be shown if all variant processing is successful and the save/publish dialog is closed, otherwise
-        /// variant specific notifications are used to show success messagse in the save/publish dialog.
+        /// variant specific notifications are used to show success messages in the save/publish dialog.
         /// </remarks>
         private static void AddSuccessNotification(IDictionary<string, SimpleNotificationModel> notifications, string culture, string header, string msg)
         {
@@ -1091,7 +1091,7 @@ private IEnumerable<PublishResult> PublishBranchInternal(ContentItemSave content
             {
                 //its invariant, proceed normally
                 var publishStatus = Services.ContentService.SaveAndPublishBranch(contentItem.PersistedContent, force, userId: Security.CurrentUser.Id);
-                //TODO: Deal with multiple cancelations
+                //TODO: Deal with multiple cancellations
                 wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent);
                 successfulCultures = Array.Empty<string>();
                 return publishStatus;
@@ -1124,7 +1124,7 @@ private IEnumerable<PublishResult> PublishBranchInternal(ContentItemSave content
             {
                 //proceed to publish if all validation still succeeds
                 var publishStatus = Services.ContentService.SaveAndPublishBranch(contentItem.PersistedContent, force, culturesToPublish, Security.CurrentUser.Id);
-                //TODO: Deal with multiple cancelations
+                //TODO: Deal with multiple cancellations
                 wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent);
                 successfulCultures = contentItem.Variants.Where(x => x.Publish).Select(x => x.Culture).ToArray();
                 return publishStatus;
@@ -1732,7 +1732,7 @@ protected override void HandleInvalidModelState(IErrorModel display)
         /// <param name="contentSave"></param>
         private void MapValuesForPersistence(ContentItemSave contentSave)
         {
-            //inline method to determine if a property type varies
+            // inline method to determine if a property type varies
             bool Varies(Property property) => property.PropertyType.VariesByCulture();
 
             var variantIndex = 0;
@@ -1865,7 +1865,7 @@ private IContent ValidateMoveOrCopy(MoveOrCopy model)
         /// <param name="status"></param>
         /// <param name="display"></param>
         /// <param name="successfulCultures">
-        /// This is null when dealing with invariant content, else it's the cultures that were succesfully published
+        /// This is null when dealing with invariant content, else it's the cultures that were successfully published
         /// </param>
         private void AddMessageForPublishStatus(IEnumerable<PublishResult> statuses, INotificationModel display, string[] successfulCultures = null)
         {
diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs
index 1a8820c4a0f1..904e6911c93c 100644
--- a/src/Umbraco.Web/Editors/ContentControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs
@@ -101,7 +101,7 @@ internal void MapPropertyValuesForPersistence<TPersisted, TSaved>(
 
         protected virtual void HandleInvalidModelState(IErrorModel display)
         {
-            //lastly, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            //lastly, if it is not valid, add the model state to the outgoing object and throw a 403
             if (!ModelState.IsValid)
             {
                 display.Errors = ModelState.ToErrorDictionary();
@@ -117,7 +117,7 @@ protected virtual void HandleInvalidModelState(IErrorModel display)
         /// <param name="getFromService"></param>
         /// <returns></returns>
         /// <remarks>
-        /// This is useful for when filters have alraedy looked up a persisted entity and we don't want to have
+        /// This is useful for when filters have already looked up a persisted entity and we don't want to have
         /// to look it up again.
         /// </remarks>
         protected TPersisted GetObjectFromRequest<TPersisted>(Func<TPersisted> getFromService)
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 9811c4880160..b59e17d9e1d3 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -82,7 +82,7 @@ public DocumentTypeDisplay GetById(int id)
         }
 
         /// <summary>
-        /// Deletes a document type wth a given ID
+        /// Deletes a document type with a given ID
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -128,7 +128,7 @@ public IEnumerable<string> GetAllStandardFields()
         }
 
         /// <summary>
-        /// Returns the avilable compositions for this content type
+        /// Returns the available compositions for this content type
         /// This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request body
         /// </summary>
         /// <param name="filter"></param>
@@ -187,7 +187,7 @@ public ContentPropertyDisplay GetPropertyTypeScaffold(int id)
         }
 
         /// <summary>
-        /// Deletes a document type container wth a given ID
+        /// Deletes a document type container with a given ID
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -293,7 +293,7 @@ public DocumentTypeDisplay PostSave(DocumentTypeSave contentTypeSave)
                 saveContentType:    type => Services.ContentTypeService.Save(type),
                 beforeCreateNew:    ctSave =>
                 {
-                    //create a default template if it doesnt exist -but only if default template is == to the content type
+                    //create a default template if it doesn't exist -but only if default template is == to the content type
                     if (ctSave.DefaultTemplate.IsNullOrWhiteSpace() == false && ctSave.DefaultTemplate == ctSave.Alias)
                     {
                         var template = CreateTemplateForContentType(ctSave.Alias, ctSave.Name);
diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
index 9cfde94a3ae3..fe91f9fff6f0 100644
--- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
@@ -259,7 +259,7 @@ protected TContentType PerformPostSave<TContentTypeDisplay, TContentTypeSave, TP
                 ModelState.AddModelError("Alias", Services.TextService.Localize("editcontenttype/aliasAlreadyExists"));
             }
 
-            // execute the externam validators
+            // execute the external validators
             EditorValidator.Validate(ModelState, contentTypeSave);
 
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs
index 335b609b0a23..0af3a1cfe724 100644
--- a/src/Umbraco.Web/Editors/DataTypeController.cs
+++ b/src/Umbraco.Web/Editors/DataTypeController.cs
@@ -68,7 +68,7 @@ public DataTypeDisplay GetById(int id)
         }
 
         /// <summary>
-        /// Deletes a data type wth a given ID
+        /// Deletes a data type with a given ID
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -120,7 +120,7 @@ public DataTypeDisplay PostCreateCustomListView(string contentTypeAlias)
         {
             var dt = Services.DataTypeService.GetDataType(Constants.Conventions.DataTypes.ListViewPrefix + contentTypeAlias);
 
-            //if it doesnt exist yet, we will create it.
+            //if it doesn't exist yet, we will create it.
             if (dt == null)
             {
                 var editor = _propertyEditors[Constants.PropertyEditors.Aliases.ListView];
@@ -172,7 +172,7 @@ public IEnumerable<DataTypeConfigurationFieldDisplay> GetPreValues(string editor
         }
 
         /// <summary>
-        /// Deletes a data type container wth a given ID
+        /// Deletes a data type container with a given ID
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/Editors/DictionaryController.cs b/src/Umbraco.Web/Editors/DictionaryController.cs
index 9d01cc9d640b..616317f7bad4 100644
--- a/src/Umbraco.Web/Editors/DictionaryController.cs
+++ b/src/Umbraco.Web/Editors/DictionaryController.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Web.Editors
     /// </summary>
     /// <remarks>
     /// The security for this controller is defined to allow full CRUD access to dictionary if the user has access to either:
-    /// Dictionar
+    /// Dictionary
     /// </remarks>
     [PluginController("UmbracoApi")]
     [UmbracoTreeAuthorize(Constants.Trees.Dictionary)]
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Editors
     public class DictionaryController : BackOfficeNotificationsController
     {
         /// <summary>
-        /// Deletes a data type wth a given ID
+        /// Deletes a data type with a given ID
         /// </summary>
         /// <param name="id"></param>
         /// <returns><see cref="HttpResponseMessage"/></returns>
@@ -49,7 +49,7 @@ public HttpResponseMessage DeleteById(int id)
         }
 
         /// <summary>
-        /// Creates a new dictoinairy item
+        /// Creates a new dictionary item
         /// </summary>
         /// <param name="parentId">
         /// The parent id.
@@ -65,7 +65,7 @@ public HttpResponseMessage Create(int parentId, string key)
         {
             if (string.IsNullOrEmpty(key))
                 return Request
-                    .CreateNotificationValidationErrorResponse("Key can not be empty;"); // TODO translate
+                    .CreateNotificationValidationErrorResponse("Key can not be empty;"); // TODO: translate
 
             if (Services.LocalizationService.DictionaryItemExists(key))
             {
@@ -108,7 +108,7 @@ public HttpResponseMessage Create(int parentId, string key)
         /// The <see cref="DictionaryDisplay"/>.
         /// </returns>
         /// <exception cref="HttpResponseException">
-        ///  Returrns a not found response when dictionary item does not exist
+        ///  Returns a not found response when dictionary item does not exist
         /// </exception>
         public DictionaryDisplay GetById(int id)
         {
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index b25f3f5af157..6fcf5b0e2dba 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -207,7 +207,7 @@ public IEnumerable<int> GetPath(Udi id, UmbracoEntityTypes type)
         /// Gets the url of an entity
         /// </summary>
         /// <param name="id">Int id of the entity to fetch URL for</param>
-        /// <param name="type">The tpye of entity such as Document, Media, Member</param>
+        /// <param name="type">The type of entity such as Document, Media, Member</param>
         /// <returns>The URL or path to the item</returns>
         public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
         {
@@ -256,7 +256,7 @@ public EntityBasic GetByQuery(string query, int nodeContextId, UmbracoEntityType
 
 
             if (type != UmbracoEntityTypes.Document)
-                throw new ArgumentException("Get by query is only compatible with enitities of type Document");
+                throw new ArgumentException("Get by query is only compatible with entities of type Document");
 
 
             var q = ParseXPathQuery(query, nodeContextId);
@@ -268,7 +268,7 @@ public EntityBasic GetByQuery(string query, int nodeContextId, UmbracoEntityType
             return GetById(node.Id, type);
         }
 
-        //PP: wip in progress on the query parser
+        // PP: Work in progress on the query parser
         private string ParseXPathQuery(string query, int id)
         {
             return UmbracoXPathPathSyntaxParser.ParseXPathQuery(
diff --git a/src/Umbraco.Web/Editors/ExamineManagementController.cs b/src/Umbraco.Web/Editors/ExamineManagementController.cs
index b7392a1fa4c3..5f969cdd8001 100644
--- a/src/Umbraco.Web/Editors/ExamineManagementController.cs
+++ b/src/Umbraco.Web/Editors/ExamineManagementController.cs
@@ -133,7 +133,7 @@ public HttpResponseMessage PostRebuildIndex(string indexName)
 
             _logger.Info<ExamineManagementController>("Rebuilding index '{IndexName}'", indexName);
 
-            //remove it in case there's a handler there alraedy
+            //remove it in case there's a handler there already
             index.IndexOperationComplete -= Indexer_IndexOperationComplete;
 
             //now add a single handler
diff --git a/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs b/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs
index 264dd049f55f..e54bb3ef7147 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs
@@ -117,7 +117,7 @@ protected bool ValidateProperties(List<ContentPropertyBasic> postedProperties, L
         /// <param name="modelState"></param>
         /// <returns></returns>
         /// <remarks>
-        /// All property data validation goes into the modelstate with a prefix of "Properties"
+        /// All property data validation goes into the model state with a prefix of "Properties"
         /// </remarks>
         public virtual bool ValidatePropertyData(
             TModelSave model,
diff --git a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
index 789dd1fdf296..64e1c7641776 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
@@ -152,7 +152,7 @@ private bool ValidateUserAccess(ContentItemSave contentItem, HttpActionContext a
                 case ContentSaveAction.PublishWithDescendantsNew:
                 case ContentSaveAction.PublishWithDescendantsForceNew:
                     //Publish new requires both ActionNew AND ActionPublish
-                    //TODO: Shoudn't publish also require ActionUpdate since it will definitely perform an update to publish but maybe that's just implied
+                    //TODO: Shouldn't publish also require ActionUpdate since it will definitely perform an update to publish but maybe that's just implied
 
                     permissionToCheck.Add(ActionNew.ActionLetter);
                     permissionToCheck.Add(ActionPublish.ActionLetter);
diff --git a/src/Umbraco.Web/Editors/LanguageController.cs b/src/Umbraco.Web/Editors/LanguageController.cs
index 8b6d8ec6ac07..64132d3d8e94 100644
--- a/src/Umbraco.Web/Editors/LanguageController.cs
+++ b/src/Umbraco.Web/Editors/LanguageController.cs
@@ -100,7 +100,7 @@ public Language SaveLanguage(Language language)
             if (!ModelState.IsValid)
                 throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
 
-            // this is prone to race conds but the service will not let us proceed anyways
+            // this is prone to race conditions but the service will not let us proceed anyways
             var existing = Services.LocalizationService.GetLanguageByIsoCode(language.IsoCode);
 
             if (existing != null && language.Id != existing.Id)
@@ -150,7 +150,7 @@ public Language SaveLanguage(Language language)
             existing.FallbackLanguageId = language.FallbackLanguageId;
 
             // modifying an existing language can create a fallback, verify
-            // note that the service will check again, dealing with race conds
+            // note that the service will check again, dealing with race conditions
             if (existing.FallbackLanguageId.HasValue)
             {
                 var languages = Services.LocalizationService.GetAllLanguages().ToDictionary(x => x.Id, x => x);
diff --git a/src/Umbraco.Web/Editors/LegacyController.cs b/src/Umbraco.Web/Editors/LegacyController.cs
index e2e22457c11a..bc5b3b1a7a64 100644
--- a/src/Umbraco.Web/Editors/LegacyController.cs
+++ b/src/Umbraco.Web/Editors/LegacyController.cs
@@ -24,7 +24,7 @@ public class LegacyController : UmbracoAuthorizedJsonController
         [HttpPost]
         public HttpResponseMessage DeleteLegacyItem(string nodeId, string alias, string nodeType)
         {
-            //U4-2686 - alias is html encoded, make sure to decode
+            //U4-2686 - alias is HTML encoded, make sure to decode
             alias = HttpUtility.HtmlDecode(alias);
 
             //In order to process this request we MUST have an HttpContext available
@@ -45,8 +45,8 @@ public HttpResponseMessage DeleteLegacyItem(string nodeId, string alias, string
                     return Request.CreateResponse(HttpStatusCode.OK);
                 }
 
-                //the way this legacy stuff used to work is that if the node id didn't parse, we would
-                //pass the node id as the alias with an id of zero = sure whatevs.
+                // the way this legacy stuff used to work is that if the node id didn't parse, we would
+                // pass the node id as the alias with an id of zero = sure whatevs.
                 LegacyDialogHandler.Delete(httpContextAttempt.Result, Security.CurrentUser, nodeType, 0, nodeId);
                 return Request.CreateResponse(HttpStatusCode.OK);
             }
diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index 0b4a78e60361..3ec25b1632ad 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -60,7 +60,7 @@ public IEnumerable<MacroParameter> GetMacroParameters(int macroId)
         }
 
         /// <summary>
-        /// Gets a rendered macro as html for rendering in the rich text editor
+        /// Gets a rendered macro as HTML for rendering in the rich text editor
         /// </summary>
         /// <param name="macroAlias"></param>
         /// <param name="pageId"></param>
@@ -78,8 +78,8 @@ public HttpResponseMessage GetMacroResultAsHtmlForEditor(string macroAlias, int
         }
 
         /// <summary>
-        /// Gets a rendered macro as html for rendering in the rich text editor.
-        /// Using HTTP POST instead of GET allows for more parameters to be passed as it's not dependant on URL-length limitations like GET.
+        /// Gets a rendered macro as HTML for rendering in the rich text editor.
+        /// Using HTTP POST instead of GET allows for more parameters to be passed as it's not dependent on URL-length limitations like GET.
         /// The method using GET is kept to maintain backwards compatibility
         /// </summary>
         /// <param name="model"></param>
@@ -116,14 +116,14 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
             if (macro.RenderInEditor == false)
             {
                 var response = Request.CreateResponse();
-                //need to create a specific content result formatted as html since this controller has been configured
+                //need to create a specific content result formatted as HTML since this controller has been configured
                 //with only json formatters.
                 response.Content = new StringContent(string.Empty, Encoding.UTF8, "text/html");
 
                 return response;
             }
 
-            //because macro's are filled with insane legacy bits and pieces we need all sorts of wierdness to make them render.
+            //because macro's are filled with insane legacy bits and pieces we need all sorts of weirdness to make them render.
             //the 'easiest' way might be to create an IPublishedContent manually and populate the legacy 'page' object with that
             //and then set the legacy parameters.
 
@@ -145,7 +145,7 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
             var renderer = new UmbracoComponentRenderer(UmbracoContext);
 
             var result = Request.CreateResponse();
-            //need to create a specific content result formatted as html since this controller has been configured
+            //need to create a specific content result formatted as HTML since this controller has been configured
             //with only json formatters.
             result.Content = new StringContent(
                 renderer.RenderMacro(macro, macroParams, legacyPage).ToString(),
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index ce088e0caa47..fe081c1cb40d 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -457,7 +457,7 @@ public MediaItemDisplay PostSave(
             [ModelBinder(typeof(MediaItemBinder))]
                 MediaItemSave contentItem)
         {
-            //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name.
+            //Recent versions of IE/Edge may send in the full client side file path instead of just the file name.
             //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all
             //uploaded files to being *only* the actual file name (as it should be).
             if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any())
@@ -500,7 +500,7 @@ public MediaItemDisplay PostSave(
                     && (contentItem.Action == ContentSaveAction.SaveNew))
                 {
                     //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
-                    // add the modelstate to the outgoing object and throw validation response
+                    // add the model state to the outgoing object and throw validation response
                     var forDisplay = Mapper.Map<MediaItemDisplay>(contentItem.PersistedContent);
                     forDisplay.Errors = ModelState.ToErrorDictionary();
                     throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
@@ -513,7 +513,7 @@ public MediaItemDisplay PostSave(
             //return the updated model
             var display = Mapper.Map<MediaItemDisplay>(contentItem.PersistedContent);
 
-            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            //lastly, if it is not valid, add the model state to the outgoing object and throw a 403
             HandleInvalidModelState(display);
 
             //put the correct msgs in
@@ -928,7 +928,7 @@ internal static bool CheckPermissions(IDictionary<string, object> storage, IUser
             if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia)
             {
                 media = mediaService.GetById(nodeId);
-                //put the content item into storage so it can be retreived
+                //put the content item into storage so it can be retrieved
                 // in the controller (saves a lookup)
                 storage[typeof(IMedia).ToString()] = media;
             }
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index d6acc9331e47..dd1f53f8af4e 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -92,7 +92,7 @@ public HttpResponseMessage DeleteById(int id)
         }
 
         /// <summary>
-        /// Returns the avilable compositions for this content type
+        /// Returns the available compositions for this content type
         /// This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request body
         /// </summary>
         /// <param name="filter.contentTypeId"></param>
@@ -154,7 +154,7 @@ public IEnumerable<ContentTypeBasic> GetAll()
         }
 
         /// <summary>
-        /// Deletes a media type container wth a given ID
+        /// Deletes a media type container with a given ID
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs
index 92ca648c3f03..2211bea76b14 100644
--- a/src/Umbraco.Web/Editors/MemberController.cs
+++ b/src/Umbraco.Web/Editors/MemberController.cs
@@ -307,7 +307,7 @@ public MemberDisplay PostSave(
 
             string generatedPassword = null;
             //Depending on the action we need to first do a create or update using the membership provider
-            // this ensures that passwords are formatted correclty and also performs the validation on the provider itself.
+            // this ensures that passwords are formatted correctly and also performs the validation on the provider itself.
             switch (contentItem.Action)
             {
                 case ContentSaveAction.Save:
@@ -360,7 +360,7 @@ public MemberDisplay PostSave(
                 Roles.AddUserToRoles(contentItem.PersistedContent.Username, toAdd);
             }
 
-            //set the generated password (if there was one) - in order to do this we'll chuck the gen'd password into the
+            //set the generated password (if there was one) - in order to do this we'll chuck the generated password into the
             // additional data of the IUmbracoEntity of the persisted item - then we can retrieve this in the model mapper and set
             // the value to be given to the UI. Hooray for AdditionalData :)
             contentItem.PersistedContent.AdditionalData["GeneratedPassword"] = generatedPassword;
@@ -368,11 +368,11 @@ public MemberDisplay PostSave(
             //return the updated model
             var display = Mapper.Map<MemberDisplay>(contentItem.PersistedContent);
 
-            //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+            //lastly, if it is not valid, add the model state to the outgoing object and throw a 403
             HandleInvalidModelState(display);
 
             var localizedTextService = Services.TextService;
-            //put the correct msgs in
+            //put the correct messages in
             switch (contentItem.Action)
             {
                 case ContentSaveAction.Save:
@@ -603,7 +603,7 @@ private void RefetchMemberData(MemberSave contentItem, LookupType lookup)
 
         /// <summary>
         /// Following a refresh of member data called during an update if the membership provider has changed some underlying data,
-        /// we don't want to lose the provided, and potentiallly changed, username
+        /// we don't want to lose the provided, and potentially changed, username
         /// </summary>
         /// <param name="contentItem"></param>
         /// <param name="providedUserName"></param>
@@ -637,7 +637,7 @@ private static void UpdateName(MemberSave memberSave)
         ///     we create an empty IMember instance first (of type 'Member'), this gives us a unique ID (GUID)
         ///     that we then use to create the member in the custom membership provider. This acts as the link between Umbraco data and
         ///     the custom membership provider data. This gives us the ability to eventually have custom membership properties but still use
-        ///     a custom memberhip provider. If there is no 'Member' member type, then we will simply just create the membership provider member
+        ///     a custom membership provider. If there is no 'Member' member type, then we will simply just create the membership provider member
         ///     with no link to our data.
         ///
         /// If this is successful, it will go and re-fetch the IMember from the db because it will now have an ID because the Umbraco provider
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index f6bcbb727f39..b200f17372d6 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -51,7 +51,7 @@ public MemberTypeDisplay GetById(int id)
         }
 
         /// <summary>
-        /// Deletes a document type wth a given ID
+        /// Deletes a document type with a given ID
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -71,7 +71,7 @@ public HttpResponseMessage DeleteById(int id)
         }
 
         /// <summary>
-        /// Returns the avilable compositions for this content type
+        /// Returns the available compositions for this content type
         /// </summary>
         /// <param name="contentTypeId"></param>
         /// <param name="filterContentTypes">
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index e38a2fdd26c6..658a28a79e8e 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -52,7 +52,7 @@ public PackageInstallController(IGlobalSettings globalSettings, UmbracoContext u
         }
 
         /// <summary>
-        /// This checks if this package & version is alraedy installed
+        /// This checks if this package & version is already installed
         /// </summary>
         /// <param name="name"></param>
         /// <param name="version"></param>
diff --git a/src/Umbraco.Web/Editors/PasswordChanger.cs b/src/Umbraco.Web/Editors/PasswordChanger.cs
index 6777ae1f56a6..e124f3a9a484 100644
--- a/src/Umbraco.Web/Editors/PasswordChanger.cs
+++ b/src/Umbraco.Web/Editors/PasswordChanger.cs
@@ -254,7 +254,7 @@ public Attempt<PasswordChangedModel> ChangePasswordWithMembershipProvider(string
 
             if (passwordModel.OldPassword.IsNullOrWhiteSpace() == false)
             {
-                //if an old password is suplied try to change it
+                //if an old password is supplied try to change it
 
                 try
                 {
diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
index 5c0a746ee712..ac9341a095de 100644
--- a/src/Umbraco.Web/Editors/TemplateController.cs
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -52,7 +52,7 @@ public TemplateDisplay GetById(int id)
         }
 
         /// <summary>
-        /// Deletes a template wth a given ID
+        /// Deletes a template with a given ID
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs
index 73ebdf3bc5d0..41f38679a991 100644
--- a/src/Umbraco.Web/Editors/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs
@@ -120,6 +120,7 @@ private IEnumerable<IPublishedContent> PostTemplateValue(QueryModel model, Strin
                 //x is passed in as the parameter alias for the linq where statement clause
                 var operation = condition.BuildCondition("x", contents, Properties);
 
+                    //for review - this uses a tonized query rather then the normal linq query.
                 contents = contents.Where(operation.Compile());
                 queryExpression.Append(indent);
                 queryExpression.AppendFormat(".Where({0})", operation);
diff --git a/src/Umbraco.Web/Editors/UserGroupsController.cs b/src/Umbraco.Web/Editors/UserGroupsController.cs
index 5069d99cfe37..c8f7d2b0df53 100644
--- a/src/Umbraco.Web/Editors/UserGroupsController.cs
+++ b/src/Umbraco.Web/Editors/UserGroupsController.cs
@@ -112,7 +112,7 @@ public IEnumerable<UserGroupBasic> GetUserGroups(bool onlyCurrentUserGroups = tr
 
             if (onlyCurrentUserGroups == false)
             {
-                //this user is not an admin so in that case we need to exlude all admin users
+                //this user is not an admin so in that case we need to exclude all admin users
                 allGroups.RemoveAt(allGroups.IndexOf(allGroups.Find(basic => basic.Alias == Constants.Security.AdminGroupAlias)));
                 return allGroups;
             }
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index e7432c4828c1..c31d005ea6a8 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -200,7 +200,7 @@ public PagedUserResult GetPagedUsers(
             var isAdmin = Security.CurrentUser.IsAdmin();
             if (isAdmin == false)
             {
-                //this user is not an admin so in that case we need to exlude all admin users
+                //this user is not an admin so in that case we need to exclude all admin users
                 excludeUserGroups = new[] {Constants.Security.AdminGroupAlias};
             }
 
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
index 13e99fa886f6..273d19bae0de 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
@@ -134,7 +134,7 @@ private HealthCheckStatus GetStatus(bool requiredPathCheckResult, IEnumerable<st
             bool optionalPathCheckResult, IEnumerable<string> optionalFailedPaths,
             PermissionCheckFor checkingFor)
         {
-            // Return error if any required parths fail the check, or warning if any optional ones do
+            // Return error if any required paths fail the check, or warning if any optional ones do
             var resultType = StatusResultType.Success;
             var messageKey = string.Format("healthcheck/{0}PermissionsCheckMessage",
                 checkingFor == PermissionCheckFor.Folder ? "folder" : "file");
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/HstsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/HstsCheck.cs
index 61f56ec9d888..18827b0c8150 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Security/HstsCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Security/HstsCheck.cs
@@ -12,7 +12,7 @@ public class HstsCheck : BaseHttpHeaderCheck
     {
         // The check is mostly based on the instructions in the OWASP CheatSheet
         // (https://www.owasp.org/index.php/HTTP_Strict_Transport_Security_Cheat_Sheet)
-        // and the blogpost of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/)
+        // and the blog post of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/)
         // If you want do to it perfectly, you have to submit it https://hstspreload.appspot.com/,
         // but then you should include subdomains and I wouldn't suggest to do that for Umbraco-sites.
         public HstsCheck(IRuntimeState runtime, ILocalizedTextService textService)
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/XssProtectionCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/XssProtectionCheck.cs
index 75595db992b2..dc25aa6a6561 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Security/XssProtectionCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Security/XssProtectionCheck.cs
@@ -12,7 +12,7 @@ public class XssProtectionCheck : BaseHttpHeaderCheck
     {
         // The check is mostly based on the instructions in the OWASP CheatSheet
         // (https://www.owasp.org/index.php/HTTP_Strict_Transport_Security_Cheat_Sheet)
-        // and the blogpost of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/)
+        // and the blog post of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/)
         // If you want do to it perfectly, you have to submit it https://hstspreload.appspot.com/,
         // but then you should include subdomains and I wouldn't suggest to do that for Umbraco-sites.
         public XssProtectionCheck(IRuntimeState runtime, ILocalizedTextService textService)
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
index f8c3708e2e5f..da906c30f998 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
@@ -62,7 +62,7 @@ public void LogResults()
                 var checkIsSuccess = result.Value.All(x => x.ResultType == StatusResultType.Success);
                 if (checkIsSuccess)
                 {
-                    Logger.Info<HealthCheckResults>("Checks for '{HealthCheckName}' all completed succesfully.", checkName);
+                    Logger.Info<HealthCheckResults>("Checks for '{HealthCheckName}' all completed successfully.", checkName);
                 }
                 else
                 {
@@ -96,7 +96,7 @@ public string ResultsAsMarkDown(HealthCheckNotificationVerbosity verbosity)
 
                 if (checkIsSuccess)
                 {
-                    sb.AppendFormat("{0}Checks for '{1}' all completed succesfully.{2}", newItem, checkName, Environment.NewLine);
+                    sb.AppendFormat("{0}Checks for '{1}' all completed successfully.{2}", newItem, checkName, Environment.NewLine);
                 }
                 else
                 {
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs b/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs
index 445582788a95..2db0b1f2e746 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs
@@ -30,7 +30,7 @@ public HealthCheckStatus(string message)
         public string Description { get; set; }
 
         /// <summary>
-        /// This is optional but would allow a developer to specify a path to an angular html view
+        /// This is optional but would allow a developer to specify a path to an angular HTML view
         /// in order to either show more advanced information and/or to provide input for the admin
         /// to configure how an action is executed
         /// </summary>
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 626a19a36991..e18397dea223 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -140,7 +140,7 @@ public static MvcHtmlString ValidationSummary(this HtmlHelper htmlHelper,
                 return htmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes);
             }
 
-            //if there's a prefix applied, we need to create a new html helper with a filtered ModelState collection so that it only looks for
+            //if there's a prefix applied, we need to create a new HTML helper with a filtered ModelState collection so that it only looks for
             //specific model state with the prefix.
             var filteredHtmlHelper = new HtmlHelper(htmlHelper.ViewContext, htmlHelper.ViewDataContainer.FilterContainer(prefix));
             return filteredHtmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes);
@@ -736,7 +736,7 @@ private static MvcForm RenderForm(this HtmlHelper htmlHelper,
                                           object additionalRouteVals = null)
         {
 
-            //ensure that the multipart/form-data is added to the html attributes
+            //ensure that the multipart/form-data is added to the HTML attributes
             if (htmlAttributes.ContainsKey("enctype") == false)
             {
                 htmlAttributes.Add("enctype", "multipart/form-data");
diff --git a/src/Umbraco.Web/HtmlStringUtilities.cs b/src/Umbraco.Web/HtmlStringUtilities.cs
index be14df8e5a67..6cf5092bb03d 100644
--- a/src/Umbraco.Web/HtmlStringUtilities.cs
+++ b/src/Umbraco.Web/HtmlStringUtilities.cs
@@ -11,15 +11,15 @@
 namespace Umbraco.Web
 {
     /// <summary>
-    /// Provides utility methods for UmbracoHelper for working with strings and html in views.
+    /// Provides utility methods for UmbracoHelper for working with strings and HTML in views.
     /// </summary>
     public sealed class HtmlStringUtilities
     {
         /// <summary>
-        /// Replaces text line breaks with html line breaks
+        /// Replaces text line breaks with HTML line breaks
         /// </summary>
         /// <param name="text">The text.</param>
-        /// <returns>The text with text line breaks replaced with html linebreaks (<br/>)</returns>
+        /// <returns>The text with text line breaks replaced with HTML line breaks (<br/>)</returns>
         public HtmlString ReplaceLineBreaksForHtml(string text)
         {
             return new HtmlString(text.Replace("\r\n", @"<br />").Replace("\n", @"<br />").Replace("\r", @"<br />"));
@@ -257,8 +257,8 @@ public IHtmlString Truncate(string html, int length, bool addElipsis, bool treat
 
                         string firstTrim = outputtr.ReadToEnd().Replace("  ", " ").Trim();
 
-                        //Check to see if there is an empty char between the hellip and the output string
-                        //if there is, remove it
+                        // Check to see if there is an empty char between the hellip and the output string
+                        // if there is, remove it
                         if (addElipsis && lengthReached && string.IsNullOrWhiteSpace(firstTrim) == false)
                         {
                             result = firstTrim[firstTrim.Length - hellip.Length - 1] == ' ' ? firstTrim.Remove(firstTrim.Length - hellip.Length - 1, 1) : firstTrim;
@@ -275,9 +275,9 @@ public IHtmlString Truncate(string html, int length, bool addElipsis, bool treat
         }
 
         /// <summary>
-        /// Returns the length of the words from a html block
+        /// Returns the length of the words from a HTML block
         /// </summary>
-        /// <param name="html">Html text</param>
+        /// <param name="html">HTML text</param>
         /// <param name="words">Amount of words you would like to measure</param>
         /// <param name="tagsAsContent"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs
index 0006227f582f..5f520653f5ac 100644
--- a/src/Umbraco.Web/HttpCookieExtensions.cs
+++ b/src/Umbraco.Web/HttpCookieExtensions.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web
     /// Extension methods used to check/set cookie values
     /// </summary>
     /// <remarks>
-    /// This should 100% supercede the StateManager.Cookies
+    /// This should 100% supersede the StateManager.Cookies
     /// </remarks>
     internal static class HttpCookieExtensions
     {
diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
index 83e4b727b2bd..ed9903e07af7 100644
--- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
+++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
@@ -88,7 +88,7 @@ public static string GetCropUrl(this IPublishedContent mediaItem, string propert
         /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters.
         /// </param>
         /// <param name="cacheBuster">
-        /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated
+        /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated
         /// </param>
         /// <param name="furtherOptions">
         /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example:
@@ -196,7 +196,7 @@ public static string GetCropUrl(
         /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters
         /// </param>
         /// <param name="cacheBusterValue">
-        /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated
+        /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated
         /// </param>
         /// <param name="furtherOptions">
         /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example:
@@ -275,7 +275,7 @@ public static string GetCropUrl(
         /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters
         /// </param>
         /// <param name="cacheBusterValue">
-        /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated
+        /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated
         /// </param>
         /// <param name="furtherOptions">
         /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example:
@@ -383,7 +383,7 @@ public static string GetCropUrl(
 
                 if (ratioMode == ImageCropRatioMode.Width && height != null)
                 {
-                    // if only height specified then assume a sqaure
+                    // if only height specified then assume a square
                     if (width == null)
                     {
                         width = height;
@@ -395,7 +395,7 @@ public static string GetCropUrl(
 
                 if (ratioMode == ImageCropRatioMode.Height && width != null)
                 {
-                    // if only width specified then assume a sqaure
+                    // if only width specified then assume a square
                     if (height == null)
                     {
                         height = width;
diff --git a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
index c8e862abcb20..bf371bacf04f 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
@@ -58,7 +58,7 @@ public InstallSetup GetSetup()
 
             var installSteps = _installSteps.GetStepsForCurrentInstallType().ToArray();
 
-            //only get the steps that are targetting the current install type
+            //only get the steps that are targeting the current install type
             steps.AddRange(installSteps);
             setup.Steps = steps;
 
diff --git a/src/Umbraco.Web/Install/FilePermissionHelper.cs b/src/Umbraco.Web/Install/FilePermissionHelper.cs
index 26e24bd96684..6c166e734ba9 100644
--- a/src/Umbraco.Web/Install/FilePermissionHelper.cs
+++ b/src/Umbraco.Web/Install/FilePermissionHelper.cs
@@ -211,9 +211,9 @@ private static bool HasWritePermission(string path)
             }
             catch (Exception)
             {
-                //This is not 100% accurate btw because it could turn out that the current user doesn't
-                //have access to read the current permissions but does have write access.
-                //I think this is an edge case however
+                // This is not 100% accurate because it could turn out that the current user doesn't
+                // have access to read the current permissions but does have write access.
+                // I think this is an edge case however
                 return false;
             }
 
diff --git a/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs b/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs
index 83aa03709760..e135a83e81f7 100644
--- a/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs
@@ -9,11 +9,11 @@ namespace Umbraco.Web.Install
 {
     /// <summary>
     /// Ensures authorization occurs for the installer if it has already completed.
-    /// If install has not yet occured then the authorization is successful.
+    /// If install has not yet occurred then the authorization is successful.
     /// </summary>
     internal class HttpInstallAuthorizeAttribute : AuthorizeAttribute
     {
-        // todo - cannot inject UmbracoContext nor RuntimeState in the attribute, read:
+        // TODO: cannot inject UmbracoContext nor RuntimeState in the attribute, read:
         // http://stackoverflow.com/questions/30096903/dependency-injection-inside-a-filterattribute-in-asp-net-mvc-6
         //  https://www.cuttingedge.it/blogs/steven/pivot/entry.php?id=98 - don't do it!
         //  http://blog.ploeh.dk/2014/06/13/passive-attributes/ - passive attributes
diff --git a/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs b/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs
index 238bb7c6eba8..2041228a3e34 100644
--- a/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.Install
 {
     /// <summary>
     /// Ensures authorization occurs for the installer if it has already completed.
-    /// If install has not yet occured then the authorization is successful
+    /// If install has not yet occurred then the authorization is successful
     /// </summary>
     internal class InstallAuthorizeAttribute : AuthorizeAttribute
     {
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index 9132f5cd4965..7b53ecb966fa 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Install.InstallSteps
     /// This is the first UI step for a brand new install
     /// </summary>
     /// <remarks>
-    /// By default this will show the user view which is the most basic information to configure a new install, but if an install get's interupted because of an
+    /// By default this will show the user view which is the most basic information to configure a new install, but if an install get's interrupted because of an
     /// error, etc... and the end-user refreshes the installer then we cannot show the user screen because they've already entered that information so instead we'll
     /// display a simple continue installation view.
     /// </remarks>
diff --git a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
index 3e836397fd37..55d7d49ba9b2 100644
--- a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
@@ -35,7 +35,7 @@ public SetUmbracoVersionStep(HttpContextBase httpContext, InstallHelper installH
         public override Task<InstallSetupResult> ExecuteAsync(object model)
         {
             //During a new install we'll log the default user in (which is id = 0).
-            // During an upgrade, the user will already need to be logged in in order to run the installer.
+            // During an upgrade, the user will already need to be logged in order to run the installer.
 
             var security = new WebSecurity(_httpContext, _userService, _globalSettings);
             //we do this check here because for upgrades the user will already be logged in, for brand new installs,
diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
index 80fda66661ed..3ddc675405bb 100644
--- a/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
@@ -32,7 +32,7 @@ private void CleanupInstallation(int packageId, string packageFile)
         public override bool RequiresExecution(object model)
         {
             var installSteps = InstallStatusTracker.GetStatus().ToArray();
-            //this step relies on the preious one completed - because it has stored some information we need
+            //this step relies on the previous one completed - because it has stored some information we need
             if (installSteps.Any(x => x.Name == "StarterKitDownload" && x.AdditionalData.ContainsKey("packageId")) == false)
             {
                 return false;
diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
index 8bd699f293d2..8a61f9230c5d 100644
--- a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
@@ -52,7 +52,7 @@ private void InstallBusinessLogic(int packageId)
         public override bool RequiresExecution(object model)
         {
             var installSteps = InstallStatusTracker.GetStatus().ToArray();
-            //this step relies on the preious one completed - because it has stored some information we need
+            //this step relies on the previous one completed - because it has stored some information we need
             if (installSteps.Any(x => x.Name == "StarterKitDownload" && x.AdditionalData.ContainsKey("packageId")) == false)
             {
                 return false;
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index b7187da74374..17c5859e9181 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -29,7 +29,7 @@ public class MacroRenderer
     {
         private readonly IProfilingLogger _plogger;
 
-        // todo: there are many more things that would need to be injected in here
+        // TODO: there are many more things that would need to be injected in here
 
         public MacroRenderer(IProfilingLogger plogger)
         {
@@ -226,7 +226,7 @@ public static void GenerateMacroModelPropertiesFromAttributes(MacroModel model,
 
         // still, this is ugly. The macro should have a Content property
         // referring to IPublishedContent we're rendering the macro against,
-        // this is all soooo convoluted ;-(
+        // this is all so convoluted ;-(
 
         public MacroContent Render(MacroModel macro, Hashtable pageElements, int pageId, Hashtable attributes)
         {
@@ -547,7 +547,7 @@ public static string RenderMacroStartTag(Hashtable attributes, int pageId, Guid
 
         private static string EncodeMacroAttribute(string attributeContents)
         {
-            // replace linebreaks
+            // replace line breaks
             attributeContents = attributeContents.Replace("\n", "\\n").Replace("\r", "\\r");
 
             // replace quotes
diff --git a/src/Umbraco.Web/Macros/MacroTagParser.cs b/src/Umbraco.Web/Macros/MacroTagParser.cs
index cbfc1ce0f7eb..8e3f116614d5 100644
--- a/src/Umbraco.Web/Macros/MacroTagParser.cs
+++ b/src/Umbraco.Web/Macros/MacroTagParser.cs
@@ -24,7 +24,7 @@ internal class MacroTagParser
         /// persist all macro formats like {?UMBRACO_MACRO macroAlias=\"myMacro\" /}
         /// </summary>
         /// <param name="persistedContent"></param>
-        /// <param name="htmlAttributes">The html attributes to be added to the div</param>
+        /// <param name="htmlAttributes">The HTML attributes to be added to the div</param>
         /// <returns></returns>
         /// <remarks>
         /// This converts the persisted macro format to this:
@@ -77,11 +77,11 @@ internal static string FormatRichTextPersistedDataForEditor(string persistedCont
         /// <returns></returns>
         /// <remarks>
         ///
-        /// This is required because when editors are using the rte, the html that is contained in the editor might actually be displaying
+        /// This is required because when editors are using the rte, the HTML that is contained in the editor might actually be displaying
         /// the entire macro content, when the data is submitted the editor will clear most of this data out but we'll still need to parse it properly
-        /// and ensure the correct sytnax is persisted to the db.
+        /// and ensure the correct syntax is persisted to the db.
         ///
-        /// When a macro is inserted into the rte editor, the html will be:
+        /// When a macro is inserted into the rte editor, the HTML will be:
         ///
         ///     {div class='umb-macro-holder'}
         ///         <!-- <?UMBRACO_MACRO macroAlias=\"myMacro\" /> -->
@@ -134,7 +134,7 @@ internal static string FormatRichTextContentForPersistence(string rteContent)
         }
 
         /// <summary>
-        /// This will accept a text block and seach/parse it for macro markup.
+        /// This will accept a text block and search/parse it for macro markup.
         /// When either a text block or a a macro is found, it will call the callback method.
         /// </summary>
         /// <param name="text"> </param>
diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs
index 84164bc47fc0..e6577dea1fe8 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs
@@ -47,7 +47,7 @@ public class OEmbedResponse
         /// <summary>
         /// Gets the HTML.
         /// </summary>
-        /// <returns>The response html</returns>
+        /// <returns>The response HTML</returns>
         public string GetHtml()
         {
             if (Type == "photo")
diff --git a/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs b/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs
index e116e1994fdb..86bd12c15e44 100644
--- a/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs
+++ b/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs
@@ -99,7 +99,7 @@ public static DateTime ToDateTime(byte[] data)
         /// Returns an unsigned rational number converted from the first
         /// eight bytes of the given byte array. The first four bytes are
         /// assumed to be the numerator and the next four bytes are the
-        /// denumerator.
+        /// denominator.
         /// Numbers are converted from the given byte-order to platform byte-order.
         /// </summary>
         public static MathEx.UFraction32 ToURational(byte[] data, ByteOrder frombyteorder)
@@ -115,7 +115,7 @@ public static MathEx.UFraction32 ToURational(byte[] data, ByteOrder frombyteorde
         /// Returns a signed rational number converted from the first
         /// eight bytes of the given byte array. The first four bytes are
         /// assumed to be the numerator and the next four bytes are the
-        /// denumerator.
+        /// denominator.
         /// Numbers are converted from the given byte-order to platform byte-order.
         /// </summary>
         public static MathEx.Fraction32 ToSRational(byte[] data, ByteOrder frombyteorder)
diff --git a/src/Umbraco.Web/Media/Exif/ExifProperty.cs b/src/Umbraco.Web/Media/Exif/ExifProperty.cs
index 3a6efcab0b99..588d3d9f92f6 100644
--- a/src/Umbraco.Web/Media/Exif/ExifProperty.cs
+++ b/src/Umbraco.Web/Media/Exif/ExifProperty.cs
@@ -17,7 +17,7 @@ internal abstract class ExifProperty
         /// </summary>
         public ExifTag Tag { get { return mTag; } }
         /// <summary>
-        /// Gets the IFD section contaning this property.
+        /// Gets the IFD section containing this property.
         /// </summary>
         public IFD IFD { get { return mIFD; } }
         /// <summary>
diff --git a/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs b/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs
index 08d1f40afd31..68769eb1f3a5 100644
--- a/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs
+++ b/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs
@@ -17,7 +17,7 @@ internal static class ExifPropertyFactory
         /// <param name="count">Byte or component count.</param>
         /// <param name="value">Field data as an array of bytes.</param>
         /// <param name="byteOrder">Byte order of value.</param>
-        /// <param name="ifd">IFD section containing this propery.</param>
+        /// <param name="ifd">IFD section containing this property.</param>
         /// <param name="encoding">The encoding to be used for text metadata when the source encoding is unknown.</param>
         /// <returns>an ExifProperty initialized from the interoperability parameters.</returns>
         public static ExifProperty Get(ushort tag, ushort type, uint count, byte[] value, BitConverterEx.ByteOrder byteOrder, IFD ifd, Encoding encoding)
diff --git a/src/Umbraco.Web/Media/Exif/ExifTag.cs b/src/Umbraco.Web/Media/Exif/ExifTag.cs
index a65d75d7c706..5c85b9558d8a 100644
--- a/src/Umbraco.Web/Media/Exif/ExifTag.cs
+++ b/src/Umbraco.Web/Media/Exif/ExifTag.cs
@@ -95,7 +95,7 @@ internal enum ExifTag : int
         // Rating
         Rating = IFD.Zeroth + 0x4746,
         RatingPercent = IFD.Zeroth + 0x4749,
-        // Microsoft specifing padding and offset tags
+        // Microsoft specifying padding and offset tags
         ZerothIFDPadding = IFD.Zeroth + 0xea1c,
         // ****************************
         // EXIF Tags
@@ -157,7 +157,7 @@ internal enum ExifTag : int
         SubjectDistanceRange = IFD.EXIF + 41996,
         ImageUniqueID = IFD.EXIF + 42016,
         InteroperabilityIFDPointer = IFD.EXIF + 40965,
-        // Microsoft specifing padding and offset tags
+        // Microsoft specifying padding and offset tags
         ExifIFDPadding = IFD.EXIF + 0xea1c,
         OffsetSchema = IFD.EXIF + 0xea1d,
         // ****************************
diff --git a/src/Umbraco.Web/Media/Exif/JPEGFile.cs b/src/Umbraco.Web/Media/Exif/JPEGFile.cs
index d7a5d322dc5e..35c3788abdce 100644
--- a/src/Umbraco.Web/Media/Exif/JPEGFile.cs
+++ b/src/Umbraco.Web/Media/Exif/JPEGFile.cs
@@ -338,7 +338,7 @@ private bool WriteJFIFApp0()
             // Create a memory stream to write the APP0 section to
             MemoryStream ms = new MemoryStream();
 
-            // JFIF identifer
+            // JFIF identifier
             ms.Write(Encoding.ASCII.GetBytes("JFIF\0"), 0, 5);
 
             // Write tags
@@ -431,7 +431,7 @@ private bool WriteJFXXApp0()
             // Create a memory stream to write the APP0 section to
             MemoryStream ms = new MemoryStream();
 
-            // JFIF identifer
+            // JFIF identifier
             ms.Write(Encoding.ASCII.GetBytes("JFXX\0"), 0, 5);
 
             // Write tags
@@ -704,13 +704,13 @@ private bool WriteExifApp1(bool preserveMakerNote)
                 return false;
             }
 
-            // We will need these bitconverter to write byte-ordered data
+            // We will need these BitConverters to write byte-ordered data
             BitConverterEx bceExif = new BitConverterEx(BitConverterEx.SystemByteOrder, ByteOrder);
 
             // Create a memory stream to write the APP1 section to
             MemoryStream ms = new MemoryStream();
 
-            // Exif identifer
+            // Exif identifier
             ms.Write(Encoding.ASCII.GetBytes("Exif\0\0"), 0, 6);
 
             // TIFF header
@@ -812,7 +812,7 @@ private void WriteIFD(MemoryStream stream, Dictionary<ExifTag, ExifProperty> ifd
                     currentdataoffset + interop.Data.Length > makerNoteOffset &&
                     ifd.ContainsKey(ExifTag.MakerNote))
                 {
-                    // Delay writing this field until we write makernote data
+                    // Delay writing this field until we write the creator's note data
                     fieldqueue.Enqueue(field);
                     continue;
                 }
@@ -847,7 +847,7 @@ private void WriteIFD(MemoryStream stream, Dictionary<ExifTag, ExifProperty> ifd
                 }
 
                 // Fields containing offsets to other IFDs
-                // Just store their offets, we will write the values later on when we know the lengths of IFDs
+                // Just store their offsets, we will write the values later on when we know the lengths of IFDs
                 if (ifdtype == IFD.Zeroth && interop.TagID == 0x8769)
                     exifIFDFieldOffset = stream.Position;
                 else if (ifdtype == IFD.Zeroth && interop.TagID == 0x8825)
diff --git a/src/Umbraco.Web/Media/Exif/MathEx.cs b/src/Umbraco.Web/Media/Exif/MathEx.cs
index 508c5025f723..735358c40aa6 100644
--- a/src/Umbraco.Web/Media/Exif/MathEx.cs
+++ b/src/Umbraco.Web/Media/Exif/MathEx.cs
@@ -251,7 +251,7 @@ public static bool TryParse(string s, out Fraction32 f)
             {
                 return new Fraction32(f1.Numerator * f2.Numerator, f1.Denominator * f2.Denominator);
             }
-            // Divison
+            // Division
             public static Fraction32 operator /(Fraction32 f, int n)
             {
                 return new Fraction32(f.Numerator / n, f.Denominator / System.Math.Abs(n));
@@ -893,7 +893,7 @@ public static bool TryParse(string s, out UFraction32 f)
             {
                 return new UFraction32(f1.Numerator * f2.Numerator, f1.Denominator * f2.Denominator);
             }
-            // Divison
+            // Division
             public static UFraction32 operator /(UFraction32 f, uint n)
             {
                 return new UFraction32(f.Numerator / n, f.Denominator / n);
diff --git a/src/Umbraco.Web/ModelStateExtensions.cs b/src/Umbraco.Web/ModelStateExtensions.cs
index 48eb06c88a5f..a01958be0184 100644
--- a/src/Umbraco.Web/ModelStateExtensions.cs
+++ b/src/Umbraco.Web/ModelStateExtensions.cs
@@ -87,7 +87,7 @@ internal static void AddValidationError(this System.Web.Http.ModelBinding.ModelS
             // if there are assigned member names, we combine the member name with the owner name
             // so that we can try to match it up to a real field. otherwise, we assume that the
             // validation message is for the overall owner.
-            // Owner = the component being validated, like a content property but could be just an html field on another editor
+            // Owner = the component being validated, like a content property but could be just an HTML field on another editor
 
             var withNames = false;
             var delimitedParts = string.Join(".", parts);
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentSortOrder.cs b/src/Umbraco.Web/Models/ContentEditing/ContentSortOrder.cs
index 51352a5412ab..86b30652bb89 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentSortOrder.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentSortOrder.cs
@@ -24,7 +24,7 @@ public class ContentSortOrder
         /// An array of integer Ids representing the sort order
         /// </summary>
         /// <remarks>
-        /// Of course all of these Ids should be at the same level in the heirarchy!!
+        /// Of course all of these Ids should be at the same level in the hierarchy!!
         /// </remarks>
         [DataMember(Name = "idSortOrder", IsRequired = true)]
         [Required]
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentVariationDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentVariationDisplay.cs
index 5b986a067987..aff79d7b9d5c 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentVariationDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentVariationDisplay.cs
@@ -72,7 +72,7 @@ public ContentVariantDisplay()
         /// This is used to add custom localized messages/strings to the response for the app to use for localized UI purposes.
         /// </summary>
         /// <remarks>
-        /// The notifications assigned to a variant are currently only used to show custom messagse in the save/publish dialogs.
+        /// The notifications assigned to a variant are currently only used to show custom messages in the save/publish dialogs.
         /// </remarks>
         [DataMember(Name = "notifications")]
         [ReadOnly(true)]
diff --git a/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs b/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs
index a0ab02768c7e..72a28f633fc1 100644
--- a/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.Models.ContentEditing
     public class DictionaryTranslationSave
     {
         /// <summary>
-        /// Gets or sets the iso code.
+        /// Gets or sets the ISO code.
         /// </summary>
         [DataMember(Name = "isoCode")]        
         public string IsoCode { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
index 0c633d031989..6cb2ccffafe8 100644
--- a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
@@ -54,7 +54,7 @@ public EntityBasic()
         /// This will only be populated for some entities like macros
         /// </summary>
         /// <remarks>
-        /// This is overrideable to specify different validation attributes if required
+        /// It is possible to override this to specify different validation attributes if required
         /// </remarks>
         [DataMember(Name = "alias")]
         public virtual string Alias { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/RelationTypeDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/RelationTypeDisplay.cs
index c44317526098..55e140d6f35d 100644
--- a/src/Umbraco.Web/Models/ContentEditing/RelationTypeDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/RelationTypeDisplay.cs
@@ -34,7 +34,7 @@ public RelationTypeDisplay()
         public string ParentObjectTypeName { get; set; }
 
         /// <summary>
-        /// Gets or sets the Childs object type id
+        /// Gets or sets the Child's object type id
         /// </summary>
         /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
         [DataMember(Name = "childObjectType", IsRequired = true)]
diff --git a/src/Umbraco.Web/Models/ContentEditing/SimpleNotificationModel.cs b/src/Umbraco.Web/Models/ContentEditing/SimpleNotificationModel.cs
index 5394636bbfc0..af35412a493f 100644
--- a/src/Umbraco.Web/Models/ContentEditing/SimpleNotificationModel.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/SimpleNotificationModel.cs
@@ -23,7 +23,7 @@ public SimpleNotificationModel(params Notification[] notifications)
         public List<Notification> Notifications { get; private set; }
 
         /// <summary>
-        ///  A default msg
+        ///  A default message
         /// </summary>
         [DataMember(Name = "message")]
         public string Message { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs b/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs
index 604e726e6f40..4c958656ef33 100644
--- a/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs
@@ -22,13 +22,13 @@ protected TabbedContentItem()
 
         // note
         // once a [DataContract] has been defined on a class, with a [DataMember] property,
-        // one simply cannot ignore that property anymore - [IgnoreDataMember] on an overriden
+        // one simply cannot ignore that property anymore - [IgnoreDataMember] on an overridden
         // property is ignored, and 'newing' the property means that it's the base property
         // which is used
         //
         // OTOH, Json.NET is happy having [JsonIgnore] on overrides, even though the base
         // property is [JsonProperty]. so, forcing [JsonIgnore] here, but really, we should
-        // rething the whole thing.
+        // rethink the whole thing.
 
         /// <summary>
         /// Override the properties property to ensure we don't serialize this
diff --git a/src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs b/src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs
index 22c177190d48..ce4c053099bc 100644
--- a/src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs
@@ -24,7 +24,7 @@ public class TreeSearchResult
 
         /// <summary>
         /// This is optional but if specified should be the name of a method on the jsSvc angular service to use, if not
-        /// specfied than it will expect the method to be called `format(searchResult, appAlias, treeAlias)`
+        /// specified than it will expect the method to be called `format(searchResult, appAlias, treeAlias)`
         /// </summary>
         [DataMember(Name = "jsMethod")]
         public string JsFormatterMethod { get; set; }
diff --git a/src/Umbraco.Web/Models/ImageCropMode.cs b/src/Umbraco.Web/Models/ImageCropMode.cs
index 03fe6676cb06..1e168d03e071 100644
--- a/src/Umbraco.Web/Models/ImageCropMode.cs
+++ b/src/Umbraco.Web/Models/ImageCropMode.cs
@@ -8,7 +8,7 @@ public enum ImageCropMode
         Crop,
 
         /// <summary>
-        /// Resizes the image to the given dimensions. If the set dimensions do not match the aspect ratio of the original image then the output is resized to the maximum possible value in each direction while aintaining the original aspect ratio.
+        /// Resizes the image to the given dimensions. If the set dimensions do not match the aspect ratio of the original image then the output is resized to the maximum possible value in each direction while maintaining the original aspect ratio.
         /// </summary>
         Max,
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs
index 7db491ad2ea2..01e57bd872d6 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs
@@ -34,7 +34,7 @@ public IEnumerable<ContentVariantDisplay> Resolve(IContent source, ContentItemDi
 
                 var langs = context.Mapper.Map<IEnumerable<ILanguage>, IEnumerable<Language>>(allLanguages, null, context).ToList();
 
-                //create a variant for each lang, then we'll populate the values
+                //create a variant for each language, then we'll populate the values
                 var variants = langs.Select(x =>
                 {
                     //We need to set the culture in the mapping context since this is needed to ensure that the correct property values
@@ -55,13 +55,13 @@ public IEnumerable<ContentVariantDisplay> Resolve(IContent source, ContentItemDi
                 //Put the default language first in the list & then sort rest by a-z
                 var defaultLang = variants.SingleOrDefault(x => x.Language.IsDefault);
 
-                //Remove the default lang from the list for now
+                //Remove the default language from the list for now
                 variants.Remove(defaultLang);
 
                 //Sort the remaining languages a-z
                 variants = variants.OrderBy(x => x.Name).ToList();
 
-                //Insert the default lang as the first item
+                //Insert the default language as the first item
                 variants.Insert(0, defaultLang);
 
                 return variants;
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
index ba8076b4579a..257a53cf1adf 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
@@ -195,7 +195,7 @@ public static IMappingExpression<TSource, TDestination> MapBaseContentTypeSaveTo
                 {
                     // handle property groups and property types
                     // note that ContentTypeSave has
-                    // - all groups, inherited and local; only *one* occurence per group *name*
+                    // - all groups, inherited and local; only *one* occurrence per group *name*
                     // - potentially including the generic properties group
                     // - all properties, inherited and local
                     //
@@ -296,7 +296,7 @@ private static PropertyType MapSaveProperty(PropertyTypeBasic sourceProperty, IE
             PropertyType destProperty;
             if (sourceProperty.Id > 0)
             {
-                // updateg an existing property
+                // updating an existing property
                 // ensure it is still there, then map/update
                 destProperty = destOrigProperties.FirstOrDefault(x => x.Id == sourceProperty.Id);
                 if (destProperty != null)
@@ -310,7 +310,7 @@ private static PropertyType MapSaveProperty(PropertyTypeBasic sourceProperty, IE
             }
 
             // insert a new property, or update an existing property that has
-            // been deletedin the meantime and we need to re-create
+            // been deleted in the meantime and we need to re-create
             // map/create
             destProperty = Mapper.Map<PropertyType>(sourceProperty);
             return destProperty;
diff --git a/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs
index b3af04603c8f..01fcfa6f1388 100644
--- a/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs
@@ -47,7 +47,7 @@ public DictionaryMapperProfile(ILocalizationService localizationService)
                     (src, dest) =>
                     {
                         // build up the path to make it possible to set active item in tree
-                        // TODO check if there is a better way
+                        // TODO: check if there is a better way
                         if (src.ParentId.HasValue)
                         {
                             var ids = new List<int> { -1 };
@@ -112,7 +112,7 @@ public DictionaryMapperProfile(ILocalizationService localizationService)
         }
 
         /// <summary>
-        /// Goes up the dictoinary tree to get all parent ids
+        /// Goes up the dictionary tree to get all parent ids
         /// </summary>
         /// <param name="parentId">
         /// The parent id.
diff --git a/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs
index ea29b671a63b..13c6af2fda4b 100644
--- a/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs
@@ -45,13 +45,13 @@ public IEnumerable<Language> Convert(IEnumerable<ILanguage> source, IEnumerable<
                 //Put the default language first in the list & then sort rest by a-z
                 var defaultLang = langs.SingleOrDefault(x => x.IsDefault);
 
-                //Remove the default lang from the list for now
+                //Remove the default language from the list for now
                 langs.Remove(defaultLang);
 
                 //Sort the remaining languages a-z
                 langs = langs.OrderBy(x => x.Name).ToList();
 
-                //Insert the default lang as the first item
+                //Insert the default language as the first item
                 langs.Insert(0, defaultLang);
 
                 return langs;
diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
index a50a4f190e09..1be74ce5832c 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
@@ -35,7 +35,7 @@ public MacroMapperProfile()
                 .AfterMap((property, parameter) =>
                 {
                     //map the view and the config
-                    // we need to show the depracated ones for backwards compatibility
+                    // we need to show the deprecated ones for backwards compatibility
                     var paramEditor = Current.ParameterEditors[property.EditorAlias]; // todo - include/filter deprecated?!
                     if (paramEditor == null)
                     {
diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
index e32531e61a7e..c8391abdb430 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
@@ -14,7 +14,7 @@
 namespace Umbraco.Web.Models.Mapping
 {
     /// <summary>
-    /// A custom tab/property resolver for members which will ensure that the built-in membership properties are or arent' displayed
+    /// A custom tab/property resolver for members which will ensure that the built-in membership properties are or aren't displayed
     /// depending on if the member type has these properties
     /// </summary>
     /// <remarks>
@@ -38,7 +38,7 @@ public MemberTabsAndPropertiesResolver(IUmbracoContextAccessor umbracoContextAcc
         }
 
         /// <inheritdoc />
-        /// <remarks>Overriden to deal with custom member properties and permissions.</remarks>
+        /// <remarks>Overridden to deal with custom member properties and permissions.</remarks>
         public override IEnumerable<Tab<ContentPropertyDisplay>> Resolve(IMember source, MemberDisplay destination, IEnumerable<Tab<ContentPropertyDisplay>> destMember, ResolutionContext context)
         {
             var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
@@ -52,7 +52,7 @@ public override IEnumerable<Tab<ContentPropertyDisplay>> Resolve(IMember source,
 
             if (provider.IsUmbracoMembershipProvider() == false)
             {
-                //it's a generic provider so update the locked out property based on our known constant alias
+                // it's a generic provider so update the locked out property based on our known constant alias
                 var isLockedOutProperty = resolved.SelectMany(x => x.Properties).FirstOrDefault(x => x.Alias == Constants.Conventions.Member.IsLockedOut);
                 if (isLockedOutProperty?.Value != null && isLockedOutProperty.Value.ToString() != "1")
                 {
@@ -64,8 +64,8 @@ public override IEnumerable<Tab<ContentPropertyDisplay>> Resolve(IMember source,
             {
                 var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)provider;
 
-                //This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier
-                // if we just had all of the membeship provider fields on the member table :(
+                // This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier
+                // if we just had all of the membership provider fields on the member table :(
                 // TODO: But is there a way to map the IMember.IsLockedOut to the property ? i dunno.
                 var isLockedOutProperty = resolved.SelectMany(x => x.Properties).FirstOrDefault(x => x.Alias == umbracoProvider.LockPropertyTypeAlias);
                 if (isLockedOutProperty?.Value != null && isLockedOutProperty.Value.ToString() != "1")
@@ -82,7 +82,7 @@ public override IEnumerable<Tab<ContentPropertyDisplay>> Resolve(IMember source,
             {
                 var memberTypeLink = string.Format("#/member/memberTypes/edit/{0}", source.ContentTypeId);
 
-                //Replace the doctype property
+                // Replace the doctype property
                 var docTypeProperty = resolved.SelectMany(x => x.Properties)
                     .First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix));
                 docTypeProperty.Value = new List<object>
@@ -135,7 +135,7 @@ protected override IEnumerable<ContentPropertyDisplay> GetCustomGenericPropertie
                 {
                     Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}password",
                     Label = _localizedTextService.Localize("password"),
-                    //NOTE: The value here is a json value - but the only property we care about is the generatedPassword one if it exists, the newPassword exists
+                    // NOTE: The value here is a json value - but the only property we care about is the generatedPassword one if it exists, the newPassword exists
                     // only when creating a new member and we want to have a generated password pre-filled.
                     Value = new Dictionary<string, object>
                     {
@@ -143,12 +143,12 @@ protected override IEnumerable<ContentPropertyDisplay> GetCustomGenericPropertie
                         {"generatedPassword", member.GetAdditionalDataValueIgnoreCase("GeneratedPassword", null)},
                         {"newPassword", member.GetAdditionalDataValueIgnoreCase("NewPassword", null)},
                     },
-                    //TODO: Hard coding this because the changepassword doesn't necessarily need to be a resolvable (real) property editor
+                    // TODO: Hard coding this because the changepassword doesn't necessarily need to be a resolvable (real) property editor
                     View = "changepassword",
-                    //initialize the dictionary with the configuration from the default membership provider
+                    // initialize the dictionary with the configuration from the default membership provider
                     Config = new Dictionary<string, object>(membersProvider.GetConfiguration(_userService))
                     {
-                        //the password change toggle will only be displayed if there is already a password assigned.
+                        // the password change toggle will only be displayed if there is already a password assigned.
                         {"hasPassword", member.RawPasswordValue.IsNullOrWhiteSpace() == false}
                     }
                 },
@@ -180,21 +180,21 @@ protected override List<ContentPropertyDisplay> MapProperties(IContentBase conte
 
             var umbracoContext = _umbracoContextAccessor.UmbracoContext;
 
-            //now update the IsSensitive value
+            // now update the IsSensitive value
             foreach (var prop in result)
             {
-                //check if this property is flagged as sensitive
+                // check if this property is flagged as sensitive
                 var isSensitiveProperty = memberType.IsSensitiveProperty(prop.Alias);
-                //check permissions for viewing sensitive data
+                // check permissions for viewing sensitive data
                 if (isSensitiveProperty && (umbracoContext == null || umbracoContext.Security.CurrentUser.HasAccessToSensitiveData() == false))
                 {
-                    //mark this property as sensitive
+                    // mark this property as sensitive
                     prop.IsSensitive = true;
-                    //mark this property as readonly so that it does not post any data
+                    // mark this property as readonly so that it does not post any data
                     prop.Readonly = true;
-                    //replace this editor with a sensitivevalue
+                    // replace this editor with a sensitive value
                     prop.View = "sensitivevalue";
-                    //clear the value
+                    // clear the value
                     prop.Value = null;
                 }
             }
@@ -211,7 +211,7 @@ protected override List<ContentPropertyDisplay> MapProperties(IContentBase conte
         /// <returns></returns>
         /// <remarks>
         /// If the membership provider installed is the umbraco membership provider, then we will allow changing the username, however if
-        /// the membership provider is a custom one, we cannot allow chaning the username because MembershipProvider's do not actually natively
+        /// the membership provider is a custom one, we cannot allow changing the username because MembershipProvider's do not actually natively
         /// allow that.
         /// </remarks>
         internal static ContentPropertyDisplay GetLoginProperty(IMemberService memberService, IMember member, ILocalizedTextService localizedText)
@@ -225,7 +225,7 @@ internal static ContentPropertyDisplay GetLoginProperty(IMemberService memberSer
 
             var scenario = memberService.GetMembershipScenario();
 
-            //only allow editing if this is a new member, or if the membership provider is the umbraco one
+            // only allow editing if this is a new member, or if the membership provider is the Umbraco one
             if (member.HasIdentity == false || scenario == MembershipScenario.NativeUmbraco)
             {
                 prop.View = "textbox";
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
index ab33c3886b43..2f2af047f789 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -98,10 +98,10 @@ protected virtual void MapGenericProperties(IContentBase content, List<Tab<Conte
             //re-assign
             genericProps.Properties = contentProps;
 
-            //Show or hide properties tab based on wether it has or not any properties 
+            //Show or hide properties tab based on whether it has or not any properties 
             if (genericProps.Properties.Any() == false)
             {
-                //loop throug the tabs, remove the one with the id of zero and exit the loop
+                //loop through the tabs, remove the one with the id of zero and exit the loop
                 for (var i = 0; i < tabs.Count; i++)
                 {
                     if (tabs[i].Id != 0) continue;
diff --git a/src/Umbraco.Web/Models/PackageInstallModel.cs b/src/Umbraco.Web/Models/PackageInstallModel.cs
index c4dbbfde2a0e..b489604261c5 100644
--- a/src/Umbraco.Web/Models/PackageInstallModel.cs
+++ b/src/Umbraco.Web/Models/PackageInstallModel.cs
@@ -19,7 +19,7 @@ public class PackageInstallModel
         public string ZipFileName { get; set; }
 
         /// <summary>
-        /// During installation this can be used to track any pending appdomain restarts
+        /// During installation this can be used to track any pending AppDomain restarts
         /// </summary>
         [DataMember(Name = "isRestarting")]
         public bool IsRestarting { get; set; }
diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index 12acb6b0c8b5..c7e38ab7f04e 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Models
     /// <summary>
     /// Provide an abstract base class for <c>IPublishedContent</c> implementations.
     /// </summary>
-    /// <remarks>This base class does which (a) consitently resolves and caches the Url, (b) provides an implementation
+    /// <remarks>This base class does which (a) consistently resolves and caches the Url, (b) provides an implementation
     /// for this[alias], and (c) provides basic content set management.</remarks>
     [DebuggerDisplay("Content Id: {Id}, Name: {Name}")]
     public abstract class PublishedContentBase : IPublishedContent
diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs
index 44845bfd4330..86a5459a740e 100644
--- a/src/Umbraco.Web/Models/RegisterModel.cs
+++ b/src/Umbraco.Web/Models/RegisterModel.cs
@@ -77,7 +77,7 @@ private RegisterModel(bool doLookup)
         public bool UsernameIsEmail { get; set; }
 
         /// <summary>
-        /// Specifies if the member should be logged in if they are succesfully created
+        /// Specifies if the member should be logged in if they are successfully created
         /// </summary>
         public bool LoginOnSuccess { get; set; }
 
diff --git a/src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs b/src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
index 819d74f8e7b7..e25c3177163d 100644
--- a/src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
+++ b/src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
@@ -63,7 +63,7 @@ public static void SetHasPendingVersionStyle(this TreeNode treeNode)
         }
 
         /// <summary>
-        /// Sets the node style to show that it is is not published
+        /// Sets the node style to show that it is not published
         /// </summary>
         /// <param name="treeNode"></param>
         public static void SetNotPublishedStyle(this TreeNode treeNode)
diff --git a/src/Umbraco.Web/Mvc/ControllerExtensions.cs b/src/Umbraco.Web/Mvc/ControllerExtensions.cs
index 1906e6ba8143..d7a693be2d35 100644
--- a/src/Umbraco.Web/Mvc/ControllerExtensions.cs
+++ b/src/Umbraco.Web/Mvc/ControllerExtensions.cs
@@ -165,7 +165,7 @@ private class FakeController : ControllerBase { protected override void ExecuteC
         /// Normally in MVC the way that the View object gets assigned to the result is to Execute the ViewResult, this however
         /// will write to the Response output stream which isn't what we want. Instead, this method will use the same logic inside
         /// of MVC to assign the View object to the result but without executing it.
-        /// This is only relavent for view results of PartialViewResult or ViewResult.
+        /// This is only relevant for view results of PartialViewResult or ViewResult.
         /// </summary>
         /// <param name="result"></param>
         /// <param name="controller"></param>
diff --git a/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs b/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs
index 380ec4cd4e79..567e9ca145ba 100644
--- a/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs
+++ b/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs
@@ -13,7 +13,7 @@ public override void OnResultExecuting(ResultExecutingContext filterContext)
         {
             base.OnResultExecuting(filterContext);
 
-            // could happens if exception (but afaik this wouldn't happen in MVC)
+            // could happens if exception (but AFAIK this wouldn't happen in MVC)
             if (filterContext.HttpContext == null || filterContext.HttpContext.Response == null ||
                     filterContext.HttpContext.Response.Cache == null)
             {
diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
index a28afe17131e..62a7c48d2b7c 100644
--- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -73,7 +73,7 @@ public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, str
         /// </summary>
         protected UmbracoContext UmbracoContext => _umbracoContext ?? (_umbracoContext = UmbracoContext.Current);
 
-        // todo - try lazy property injection?
+        // TODO: try lazy property injection?
         private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>();
 
         /// <summary>
@@ -86,7 +86,7 @@ public override void OnActionExecuted(ActionExecutedContext filterContext)
         {
             base.OnActionExecuted(filterContext);
 
-            //First we need to check if the pcr has been set, if it has we're going to ignore this and not actually do anything
+            // First we need to check if the published content request has been set, if it has we're going to ignore this and not actually do anything
             if (UmbracoContext.Current.PublishedRequest != null)
             {
                 return;
diff --git a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
index 6bc799baa550..6d2f1ce5011f 100644
--- a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
+++ b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
@@ -29,7 +29,7 @@ public MasterControllerFactory(Func<FilteredControllerFactoryCollection> factori
             // ControllerBuilder.Current when setting up Mvc and WebApi, it cannot be ctored by
             // the IoC container - and yet we don't want that ctor to resolve the factories
             // as that happen before everything is configured - so, passing a factories
-            // accessor func.
+            // accessor function.
 
             _factoriesAccessor = factoriesAccessor;
         }
diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs
index 03d6e2905c6b..e3f4b45ce6cb 100644
--- a/src/Umbraco.Web/Mvc/PluginController.cs
+++ b/src/Umbraco.Web/Mvc/PluginController.cs
@@ -27,7 +27,7 @@ private static readonly ConcurrentDictionary<Type, PluginControllerMetadata> Met
 
         // note
         // properties marked as [Inject] below will be property-injected (vs constructor-injected) in
-        // order to keep the constuctor as light as possible, so that ppl implementing eg a SurfaceController
+        // order to keep the constructor as light as possible, so that ppl implementing eg a SurfaceController
         // don't need to implement complex constructors + need to refactor them each time we change ours.
         // this means that these properties have a setter.
         // what can go wrong?
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index c9123175b15f..10efb5455236 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -49,7 +49,7 @@ public RenderRouteHandler(UmbracoContext umbracoContext, IControllerFactory cont
         #region IRouteHandler Members
 
         /// <summary>
-        /// Assigns the correct controller based on the Umbraco request and returns a standard MvcHandler to prcess the response,
+        /// Assigns the correct controller based on the Umbraco request and returns a standard MvcHandler to process the response,
         /// this also stores the render model into the data tokens for the current RouteData.
         /// </summary>
         /// <param name="requestContext"></param>
@@ -428,7 +428,7 @@ internal IHttpHandler GetHandlerForRoute(RequestContext requestContext, Publishe
             // Set the session state requirements
             requestContext.HttpContext.SetSessionStateBehavior(GetSessionStateBehavior(requestContext, routeDef.ControllerName));
 
-            // reset the friendly path so in the controllers and anything occuring after this point in time,
+            // reset the friendly path so in the controllers and anything occurring after this point in time,
             //the URL is reset back to the original request.
             requestContext.HttpContext.RewritePath(UmbracoContext.OriginalRequestUrl.PathAndQuery);
 
diff --git a/src/Umbraco.Web/Mvc/Strings.Designer.cs b/src/Umbraco.Web/Mvc/Strings.Designer.cs
index a897e5349ceb..40269241a55a 100644
--- a/src/Umbraco.Web/Mvc/Strings.Designer.cs
+++ b/src/Umbraco.Web/Mvc/Strings.Designer.cs
@@ -62,12 +62,12 @@ internal Strings() {
         
         /// <summary>
         ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot;?&gt;
-        ///&lt;configuration&gt;
         ///
-        ///  &lt;configSections&gt;
-        ///    &lt;sectionGroup name=&quot;system.web.webPages.razor&quot; type=&quot;System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35&quot;&gt;
-        ///      &lt;section name=&quot;host&quot; type=&quot;System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35&quot; requirePermission=&quot;false&quot; /&gt;
-        ///      &lt;section name=&quot;page [rest of string was truncated]&quot;;.
+        ///&lt;configuration&gt;
+        ///    &lt;configSections&gt;
+        ///        &lt;sectionGroup name=&quot;system.web.webPages.razor&quot; type=&quot;System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35&quot;&gt;
+        ///            &lt;section name=&quot;host&quot; type=&quot;System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35&quot; requirePermission=&quot;false&quot; /&gt;
+        ///            &lt; [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string WebConfigTemplate {
             get {
diff --git a/src/Umbraco.Web/Mvc/Strings.resx b/src/Umbraco.Web/Mvc/Strings.resx
index fd82fa3865d9..1d4028f59403 100644
--- a/src/Umbraco.Web/Mvc/Strings.resx
+++ b/src/Umbraco.Web/Mvc/Strings.resx
@@ -37,7 +37,7 @@
     mimetype set.
     
     The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to stop persisting the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
     
     Note - application/x-microsoft.net.object.binary.base64 is the format 
@@ -121,4 +121,4 @@
   <data name="WebConfigTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\..\umbraco.web.ui\views\web.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
index 8b76a2069d93..fa0b1c5458d4 100644
--- a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
@@ -85,7 +85,7 @@ protected override bool AuthorizeCore(HttpContextBase httpContext)
         }
 
         /// <summary>
-        /// Override to to ensure no redirect occurs
+        /// Override to ensure no redirect occurs
         /// </summary>
         /// <param name="filterContext"></param>
         protected override void HandleUnauthorizedRequest(AuthorizationContext filterContext)
diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
index 9769945f371c..36ec76b3d95d 100644
--- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
@@ -94,7 +94,7 @@ private static void ValidateRouteData(RouteData routeData)
 
         /// <summary>
         /// When POSTing to MVC but rendering in WebForms we need to do some trickery, we'll create a dummy viewcontext with all of the
-        /// current modelstate, tempdata, viewdata so that if we're rendering partial view macros within the webforms view, they will
+        /// current model state, tempdata, viewdata so that if we're rendering partial view macros within the webforms view, they will
         /// get all of this merged into them.
         /// </summary>
         /// <param name="context"></param>
diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
index 164fb7acf71e..0c95e1d44634 100644
--- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.Mvc
 {
     public abstract class UmbracoVirtualNodeRouteHandler : IRouteHandler
     {
-        // todo - try lazy property injection?
+        // TODO: - try lazy property injection?
         private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>();
 
         /// <summary>
@@ -54,20 +54,21 @@ public IHttpHandler GetHttpHandler(RequestContext requestContext)
             request.PublishedContent = found;
             umbracoContext.PublishedRequest = request;
 
-            //allows inheritors to change the pcr
+            // allows inheritors to change the published content request
             PreparePublishedContentRequest(umbracoContext.PublishedRequest);
 
-            //create the render model
+            // create the render model
             var renderModel = new ContentModel(umbracoContext.PublishedRequest.PublishedContent);
 
-            //assigns the required tokens to the request
+            // assigns the required tokens to the request
             requestContext.RouteData.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, renderModel);
             requestContext.RouteData.DataTokens.Add(Core.Constants.Web.PublishedDocumentRequestDataToken, umbracoContext.PublishedRequest);
             requestContext.RouteData.DataTokens.Add(Core.Constants.Web.UmbracoContextDataToken, umbracoContext);
-            //this is used just for a flag that this is an umbraco custom route
+
+            // this is used just for a flag that this is an umbraco custom route
             requestContext.RouteData.DataTokens.Add(Core.Constants.Web.CustomRouteDataToken, true);
 
-            //Here we need to detect if a SurfaceController has posted
+            // Here we need to detect if a SurfaceController has posted
             var formInfo = RenderRouteHandler.GetFormInfo(requestContext);
             if (formInfo != null)
             {
@@ -78,7 +79,7 @@ public IHttpHandler GetHttpHandler(RequestContext requestContext)
                     PublishedRequest = umbracoContext.PublishedRequest
                 };
 
-                //set the special data token to the current route definition
+                // set the special data token to the current route definition
                 requestContext.RouteData.DataTokens[Core.Constants.Web.UmbracoRouteDefinitionDataToken] = def;
 
                 return RenderRouteHandler.HandlePostedValues(requestContext, formInfo);
diff --git a/src/Umbraco.Web/Mvc/ViewDataContainerExtensions.cs b/src/Umbraco.Web/Mvc/ViewDataContainerExtensions.cs
index c1b6fee8eb6a..2852e8061966 100644
--- a/src/Umbraco.Web/Mvc/ViewDataContainerExtensions.cs
+++ b/src/Umbraco.Web/Mvc/ViewDataContainerExtensions.cs
@@ -23,7 +23,7 @@ public static IViewDataContainer FilterContainer(this IViewDataContainer contain
         {
             var newContainer = new ViewDataContainer();
             newContainer.ViewData.ModelState.Merge(container.ViewData.ModelState, prefix);
-            //change the html field name too
+            //change the HTML field name too
             newContainer.ViewData.TemplateInfo.HtmlFieldPrefix = prefix;
             return newContainer;
         }
diff --git a/src/Umbraco.Web/OwinExtensions.cs b/src/Umbraco.Web/OwinExtensions.cs
index e7e1e85b502d..6961f5c91589 100644
--- a/src/Umbraco.Web/OwinExtensions.cs
+++ b/src/Umbraco.Web/OwinExtensions.cs
@@ -44,7 +44,7 @@ public static string GetCurrentRequestIpAddress(this IOwinContext owinContext)
         }
 
         /// <summary>
-        /// Nasty little hack to get httpcontextbase from an owin context
+        /// Nasty little hack to get HttpContextBase from an owin context
         /// </summary>
         /// <param name="owinContext"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
index 2b32e9d77446..6d87bfe49573 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
@@ -42,7 +42,7 @@ protected override IDataValueEditor CreateValueEditor()
         /// Gets a value indicating whether a property is an upload field.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <returns>A value indicating whether a property is an upload field, and (optionaly) has a non-empty value.</returns>
+        /// <returns>A value indicating whether a property is an upload field, and (optionally) has a non-empty value.</returns>
         private static bool IsUploadField(Property property)
         {
             return property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.UploadField;
@@ -61,7 +61,7 @@ internal IEnumerable<string> ServiceDeleted(IEnumerable<ContentBase> deletedEnti
         }
 
         /// <summary>
-        /// Look through all propery values stored against the property and resolve any file paths stored
+        /// Look through all property values stored against the property and resolve any file paths stored
         /// </summary>
         /// <param name="prop"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
index c238f934678b..8c2f7ac4881d 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
@@ -4,7 +4,7 @@
 namespace Umbraco.Web.PropertyEditors
 {
     /// <summary>
-    /// Represents the configuration for the gid value editor.
+    /// Represents the configuration for the grid value editor.
     /// </summary>
     public class GridConfiguration
     {
diff --git a/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
index 4a74925816f9..fe86bb9a6e19 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
@@ -3,8 +3,8 @@
 namespace Umbraco.Web.PropertyEditors
 {
     /// <summary>
-    /// Represents the configuration for the gid value editor.
+    /// Represents the configuration for the grid value editor.
     /// </summary>
     public class GridConfigurationEditor : ConfigurationEditor<GridConfiguration>
     { }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
index 2ca58b06e28a..fff11a28a597 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -57,7 +57,7 @@ public ImageCropperPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSyst
         /// Gets a value indicating whether a property is an image cropper field.
         /// </summary>
         /// <param name="property">The property.</param>        
-        /// <returns>A value indicating whether a property is an image cropper field, and (optionaly) has a non-empty value.</returns>
+        /// <returns>A value indicating whether a property is an image cropper field, and (optionally) has a non-empty value.</returns>
         private static bool IsCropperField(Property property)
         {
             return property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.ImageCropper;
@@ -69,7 +69,7 @@ private static bool IsCropperField(Property property)
         /// <param name="value">The property value.</param>
         /// <param name="writeLog">A value indicating whether to log the error.</param>
         /// <returns>The json object corresponding to the property value.</returns>
-        /// <remarks>In case of an error, optionaly logs the error and returns null.</remarks>
+        /// <remarks>In case of an error, optionally logs the error and returns null.</remarks>
         private JObject GetJObject(string value, bool writeLog)
         {
             if (string.IsNullOrWhiteSpace(value))
@@ -100,7 +100,7 @@ internal IEnumerable<string> ServiceDeleted(IEnumerable<ContentBase> deletedEnti
         }
 
         /// <summary>
-        /// Look through all propery values stored against the property and resolve any file paths stored
+        /// Look through all property values stored against the property and resolve any file paths stored
         /// </summary>
         /// <param name="prop"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
index 6ee0d23d955f..78f218982916 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
@@ -166,7 +166,7 @@ public override string ConvertDbToString(PropertyType propertyType, object value
             if (value == null || string.IsNullOrEmpty(value.ToString()))
                 return null;
 
-            // if we dont have a json structure, we will get it from the property type
+            // if we don't have a json structure, we will get it from the property type
             var val = value.ToString();
             if (val.DetectIsJson())
                 return val;
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
index a52ee2138eb8..75fe581d5b12 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
@@ -20,7 +20,7 @@ public MultiNodePickerConfigurationEditor()
         /// <inheritdoc />
         public override Dictionary<string, object> ToConfigurationEditor(MultiNodePickerConfiguration configuration)
         {
-            // sanitize configuraiton
+            // sanitize configuration
             var output = base.ToConfigurationEditor(configuration);
 
             output["multiPicker"] = configuration.MaxNumber > 1 ? true : false;
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
index 59a96a0e41f8..a7d05799d91e 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
@@ -6,7 +6,7 @@
 namespace Umbraco.Web.PropertyEditors
 {
     /// <summary>
-    /// Represents the configuration editor for a multiple testring value editor.
+    /// Represents the configuration editor for a multiple textstring value editor.
     /// </summary>
     internal class MultipleTextStringConfigurationEditor : ConfigurationEditor<MultipleTextStringConfiguration>
     {
@@ -35,7 +35,7 @@ public MultipleTextStringConfigurationEditor()
         public override MultipleTextStringConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, MultipleTextStringConfiguration configuration)
         {
             // todo this isn't pretty
-            //the values from the editor will be min/max fieds and we need to format to json in one field
+            //the values from the editor will be min/max fields and we need to format to json in one field
             // is the editor sending strings or ints or?!
             var min = (editorValues.ContainsKey("min") ? editorValues["min"].ToString() : "0").TryConvertTo<int>();
             var max = (editorValues.ContainsKey("max") ? editorValues["max"].ToString() : "0").TryConvertTo<int>();
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 31b65c6357fd..207e914061d7 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -101,7 +101,7 @@ public IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(Pro
 
                 if (!(val is string strVal)) yield break;
 
-                //index the stripped html values
+                //index the stripped HTML values
                 yield return new KeyValuePair<string, IEnumerable<object>>(property.Alias, new object[] { strVal.StripHtml() });
                 //store the raw value
                 yield return new KeyValuePair<string, IEnumerable<object>>($"{UmbracoExamineIndex.RawFieldPrefix}{property.Alias}", new object[] { strVal });
diff --git a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
index 9199707d1013..4cebc5c82920 100644
--- a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
+++ b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
@@ -22,7 +22,7 @@ public Result GetEmbed(string url, int width, int height)
         {
             var result = new Result();
 
-            //todo cache embed doc
+            // TODO: cache embed doc
             var xmlConfig = new XmlDocument();
             xmlConfig.Load(IOHelper.GetRootDirectorySafe() + Path.DirectorySeparatorChar + "config" + Path.DirectorySeparatorChar + "EmbeddedMedia.config");
 
diff --git a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs
index 1e671ba04492..5d396980e34b 100644
--- a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs
@@ -33,7 +33,7 @@ public override Dictionary<string, object> ToConfigurationEditor(TagConfiguratio
 
         public override TagConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, TagConfiguration configuration)
         {
-            // the front-end editor retuns the string value of the storage type
+            // the front-end editor returns the string value of the storage type
             // pure Json could do with
             // [JsonConverter(typeof(StringEnumConverter))]
             // but here we're only deserializing to object and it's too late
diff --git a/src/Umbraco.Web/PropertyEditors/TagsDataController.cs b/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
index bc0c281f981e..15c39bf994cc 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     /// <remarks>
     /// DO NOT inherit from UmbracoAuthorizedJsonController since we don't want to use the angularized
-    /// json formatter as it causes probs.
+    /// json formatter as it causes problems.
     /// </remarks>
     [PluginController("UmbracoApi")]
     public class TagsDataController : UmbracoAuthorizedApiController
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
index 0612c850208a..c96e9ff9a317 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
@@ -34,7 +34,7 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, Publ
 
         public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
         {
-            // convert markup to html for frontend rendering.
+            // convert markup to HTML for frontend rendering.
             // source should come from ConvertSource and be a string (or null) already
             var mark = new Markdown();
             return new HtmlString(inter == null ? string.Empty : mark.Transform((string)inter));
diff --git a/src/Umbraco.Web/PropertyEditors/ValueListUniqueValueValidator.cs b/src/Umbraco.Web/PropertyEditors/ValueListUniqueValueValidator.cs
index 88dd20c5161e..38dc6fb3ae8f 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueListUniqueValueValidator.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueListUniqueValueValidator.cs
@@ -20,7 +20,7 @@ public IEnumerable<ValidationResult> Validate(object value, string valueType, ob
             if (!(value is JArray json)) yield break;
 
             // we ensure that values are unique
-            // (those are are not empty - empty values are removed when persisting anyways)
+            // (those are not empty - empty values are removed when persisting anyways)
 
             var groupedValues = json.OfType<JObject>()
                 .Where(x => x["value"] != null)
@@ -38,4 +38,4 @@ public IEnumerable<ValidationResult> Validate(object value, string valueType, ob
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PublishedCache/IPublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/IPublishedSnapshotService.cs
index cf10ed5f3a81..ccdac5664d15 100644
--- a/src/Umbraco.Web/PublishedCache/IPublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/IPublishedSnapshotService.cs
@@ -17,7 +17,7 @@ public interface IPublishedSnapshotService : IDisposable
          * to find out how to get that navigator.
          *
          * Because a cache such as NuCache is contextual i.e. it has a "snapshot" thing and remains
-         * consistent over the snapshot, the navigator has to come come from the "current" snapshot.
+         * consistent over the snapshot, the navigator has to come from the "current" snapshot.
          *
          * So although everything should be injected... we also need a notion of "the current published
          * snapshot". This is provided by the IPublishedSnapshotAccessor.
@@ -105,7 +105,7 @@ public interface IPublishedSnapshotService : IDisposable
          * rely on cache refreshers CacheUpdated events to update itself, as these events are external
          * and the order-of-execution of the handlers cannot be guaranteed, which means that some
          * user code may run before Umbraco is finished updating itself. Instead, the cache refreshers
-         * explicitely notify the service of changes.
+         * explicitly notify the service of changes.
          *
          */
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
index 44d38c8f3a0d..d983a880cce9 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
@@ -93,7 +93,7 @@ private IPublishedContent GetByRouteInternal(bool preview, string route, bool? h
                 // if in a domain then start with the root node of the domain
                 // and follow the path
                 // note: if domain has a path (eg example.com/en) which is not recommended anymore
-                //  then then /en part of the domain is basically ignored here...
+                //  then /en part of the domain is basically ignored here...
                 content = GetById(preview, startNodeId);
                 content = FollowRoute(content, parts, 0, culture);
             }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
index 01f0bbad9be6..ed1742064599 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
@@ -60,7 +60,7 @@ protected object ReadObject(char type, Stream stream)
                 case 'D':
                     return PrimitiveSerializer.DateTime.ReadFrom(stream);
                 default:
-                    throw new NotSupportedException($"Cannot deserialize unknow type '{type}'.");
+                    throw new NotSupportedException($"Cannot deserialize unknown type '{type}'.");
             }
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContentType.cs b/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContentType.cs
index 068a1866ee3f..18bf3ead1361 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContentType.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContentType.cs
@@ -20,7 +20,7 @@ public NavigableContentType()
 
         // note - PublishedContentType are immutable ie they do not _change_ when the actual IContentTypeComposition
         // changes, but they are replaced by a new instance, so our map here will clean itself automatically and
-        // we don't have to manage cache - ConditionalWeakTable does not prevent keys from beeing GCed
+        // we don't have to manage cache - ConditionalWeakTable does not prevent keys from being GCed
 
         private static readonly ConditionalWeakTable<PublishedContentType, NavigableContentType> TypesMap
              = new ConditionalWeakTable<PublishedContentType,NavigableContentType>();
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
index 042308428526..f4449008f94b 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
@@ -19,7 +19,7 @@ public override void Compose(Composition composition)
             composition.SetPublishedSnapshotService<PublishedSnapshotService>();
 
             // add the NuCache health check (hidden from type finder)
-            // todo - no NuCache health check yet
+            // TODO: no NuCache health check yet
             //composition.HealthChecks().Add<NuCacheIntegrityHealthCheck>();
         }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index 69c672ab98d2..3dee81f1bba9 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -370,7 +370,7 @@ private IEnumerable<IPublishedContent> GetChildren()
 
             // notes:
             // _contentNode.ChildContentIds is an unordered int[]
-            // need needs to fetch & sort - do it only once, lazyily, though
+            // needs to fetch & sort - do it only once, lazily, though
             // Q: perfs-wise, is it better than having the store managed an ordered list
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 8675aefd1a62..889ce72ce03b 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -58,18 +58,18 @@ class PublishedSnapshotService : PublishedSnapshotServiceBase
         // define constant - determines whether to use cache when previewing
         // to store eg routes, property converted values, anything - caching
         // means faster execution, but uses memory - not sure if we want it
-        // so making it configureable.
+        // so making it configurable.
         public static readonly bool FullCacheWhenPreviewing = true;
 
         // define constant - determines whether to cache the published content
         // objects (in the elements cache, or snapshot cache, depending on preview)
-        // or to refetch them all the time. caching is faster but uses more
+        // or to re-fetch them all the time. caching is faster but uses more
         // memory. not sure what we want.
         public static readonly bool CachePublishedContentChildren = true;
 
         // define constant - determines whether to cache the content cache root
         // objects (in the elements cache, or snapshot cache, depending on preview)
-        // or to refecth them all the time. caching is faster but uses more
+        // or to re-fetch them all the time. caching is faster but uses more
         // memory - not sure what we want.
         public static readonly bool CacheContentCacheRoots = true;
 
@@ -88,7 +88,7 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
             //if (Interlocked.Increment(ref _singletonCheck) > 1)
-            //    throw new Exception("Singleton must be instancianted only once!");
+            //    throw new Exception("Singleton must be instantiated only once!");
 
             _serviceContext = serviceContext;
             _publishedContentTypeFactory = publishedContentTypeFactory;
@@ -140,14 +140,14 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
                     var localMediaDbPath = IOHelper.MapPath("~/App_Data/NuCache.Media.db");
                     _localDbExists = System.IO.File.Exists(localContentDbPath) && System.IO.File.Exists(localMediaDbPath);
 
-                    // if both local dbs exist then GetTree will open them, else new dbs will be created
+                    // if both local databases exist then GetTree will open them, else new databases will be created
                     _localContentDb = BTree.GetTree(localContentDbPath, _localDbExists);
                     _localMediaDb = BTree.GetTree(localMediaDbPath, _localDbExists);
                 }
 
                 // stores are created with a db so they can write to it, but they do not read from it,
                 // stores need to be populated, happens in OnResolutionFrozen which uses _localDbExists to
-                // figure out whether it can read the dbs or it should populate them from sql
+                // figure out whether it can read the databases or it should populate them from sql
                 _contentStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger, _localContentDb);
                 _mediaStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger, _localMediaDb);
             }
@@ -194,7 +194,7 @@ private void LoadCaches()
                     _logger.Fatal<PublishedSnapshotService>(ex, "Panic, exception while loading cache data.");
                 }
 
-                // finaly, cache is ready!
+                // finally, cache is ready!
                 _isReady = true;
             }
         }
@@ -253,7 +253,7 @@ public class Options
             //
             //// indicates that the snapshot cache should reuse the application request cache
             //// otherwise a new cache object would be created for the snapshot specifically,
-            //// which is the default - web boot manager uses this to optimze facades
+            //// which is the default - web boot manager uses this to optimize facades
             //public bool PublishedSnapshotCacheIsApplicationRequestCache;
 
             public bool IgnoreLocalDb;
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index b0231368af14..30f6e7e63815 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -58,7 +58,7 @@ public SnapDictionary()
         //
         // so when getting a read-lock,
         //  either we are write-locked or not, but if not, we won't be write-locked
-        //  otoh the write-lock may be released in the meantime
+        //  on the other hand the write-lock may be released in the meantime
 
         // Lock has a 'forceGen' parameter:
         //  used to start a set of changes that may not commit, to isolate the set from any pending
diff --git a/src/Umbraco.Web/PublishedCache/PublishedElementPropertyBase.cs b/src/Umbraco.Web/PublishedCache/PublishedElementPropertyBase.cs
index 6d69b96e0c23..62f72a27aac3 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedElementPropertyBase.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedElementPropertyBase.cs
@@ -23,7 +23,7 @@ internal class PublishedElementPropertyBase : PublishedPropertyBase
         // define constant - determines whether to use cache when previewing
         // to store eg routes, property converted values, anything - caching
         // means faster execution, but uses memory - not sure if we want it
-        // so making it configureable.
+        // so making it configurable.
         private const bool FullCacheWhenPreviewing = true;
 
         public PublishedElementPropertyBase(PublishedPropertyType propertyType, IPublishedElement element, bool previewing, PropertyCacheLevel referenceCacheLevel, object sourceValue = null, IPublishedSnapshotAccessor publishedSnapshotAccessor = null)
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
index a395db1da542..4e206f73d737 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
@@ -124,7 +124,7 @@ private DateTime ParseDateTimeValue(string val)
         }
 
         /// <summary>
-        /// Flag to get/set if this was laoded from examine cache
+        /// Flag to get/set if this was loaded from examine cache
         /// </summary>
         internal bool LoadedFromExamine { get; }
 
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
index dadf40a33b5a..5521cabe765c 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -119,7 +119,7 @@ public override IEnumerable<IPublishedContent> GetAtRoot(bool preview)
                 {
                     if (ex is FileNotFoundException)
                     {
-                        //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
+                        //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco
                         //See this thread: http://examine.cdodeplex.com/discussions/264341
                         //Catch the exception here for the time being, and just fallback to GetMedia
                         //TODO: Need to fix examine in LB scenarios!
@@ -245,7 +245,7 @@ private ISearcher GetSearchProviderSafe()
             }
             catch (FileNotFoundException)
             {
-                //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
+                //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco
                 //See this thread: http://examine.cdodeplex.com/discussions/264341
                 //Catch the exception here for the time being, and just fallback to GetMedia
                 //TODO: Need to fix examine in LB scenarios!
@@ -302,7 +302,7 @@ private CacheValues GetUmbracoMediaCacheValues(int id)
                 {
                     if (ex is FileNotFoundException)
                     {
-                        //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
+                        //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco
                         //See this thread: http://examine.cdodeplex.com/discussions/264341
                         //Catch the exception here for the time being, and just fallback to GetMedia
                         //TODO: Need to fix examine in LB scenarios!
@@ -485,7 +485,7 @@ private IPublishedProperty GetProperty(DictionaryPublishedContent dd, string ali
         }
 
         /// <summary>
-        /// A Helper methods to return the children for media whther it is based on examine or xml
+        /// A Helper methods to return the children for media whether it is based on examine or xml
         /// </summary>
         /// <param name="parentId"></param>
         /// <param name="xpath"></param>
@@ -532,14 +532,14 @@ private IEnumerable<IPublishedContent> GetChildrenMedia(int parentId, XPathNavig
                     }
 
                     //if there's no result then return null. Previously we defaulted back to library.GetMedia below
-                    //but this will always get called for when we are getting descendents since many items won't have
+                    //but this will always get called for when we are getting descendants since many items won't have
                     //children and then we are hitting the database again!
                     //So instead we're going to rely on Examine to have the correct results like it should.
                     return Enumerable.Empty<IPublishedContent>();
                 }
                 catch (FileNotFoundException)
                 {
-                    //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
+                    //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco
                     //See this thread: http://examine.cdodeplex.com/discussions/264341
                     //Catch the exception here for the time being, and just fallback to GetMedia
                 }
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
index 0d7d188dac56..0153cca18be9 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
     /// Represents the Xml storage for the Xml published cache.
     /// </summary>
     /// <remarks>
-    /// <para>One instance of <see cref="XmlStore"/> is instanciated by the <see cref="PublishedSnapshotService"/> and
+    /// <para>One instance of <see cref="XmlStore"/> is instantiated by the <see cref="PublishedSnapshotService"/> and
     /// then passed to all <see cref="PublishedContentCache"/> instances that are created (one per request).</para>
     /// <para>This class should *not* be public.</para>
     /// </remarks>
@@ -751,7 +751,7 @@ private static string SaveXmlToString(XmlDocument xml)
         {
             // using that one method because we want to have proper indent
             // and in addition, writing async is never fully async because
-            // althouth the writer is async, xml.WriteTo() will not async
+            // although the writer is async, xml.WriteTo() will not async
 
             // that one almost works but... "The elements are indented as long as the element
             // does not contain mixed content. Once the WriteString or WriteWhitespace method
@@ -918,7 +918,7 @@ private class XmlDto
         // assumes xml lock
         private void LoadXmlTreeFromDatabaseLocked(SafeXmlReaderWriter safeXml)
         {
-            // initialise the document ready for the composition of content
+            // initialize the document ready for the composition of content
             var xml = new XmlDocument();
             InitializeXml(xml, GetDtd());
 
@@ -973,7 +973,7 @@ private XmlDocument LoadMoreXmlFromDatabase(Guid nodeObjectType)
                 var xmlDtos = scope.Database.Query<XmlDto>(ReadMoreCmsContentXmlSql,
                     new { /*@nodeObjectType =*/ nodeObjectType });
 
-                // Initialise the document ready for the final composition of content
+                // Initialize the document ready for the final composition of content
                 InitializeXml(xmlDoc, string.Empty);
 
                 XmlNode parent = null;
@@ -1102,7 +1102,7 @@ public void Notify(ContentCacheRefresher.JsonPayload[] payloads, out bool draftC
                                 id = content.Id
                             });
 
-                        // 'using' the enumerator ensures that the enumeration is properly terminated even if abandonned
+                        // 'using' the enumerator ensures that the enumeration is properly terminated even if abandoned
                         // otherwise, it would leak an open reader & an un-released database connection
                         // see PetaPoco.Query<TRet>(Type[] types, Delegate cb, string sql, params object[] args)
                         // and read http://blogs.msdn.com/b/oldnewthing/archive/2008/08/14/8862242.aspx
@@ -1348,7 +1348,7 @@ private static XmlDocument AddOrUpdateXmlNode(XmlDocument xml, XmlDto xmlDto)
                 if (docNode.Name == currentNode.Name)
                 {
                     // name has not changed, safe to just update the current node
-                    // by transfering values eg copying the attributes, and importing the data elements
+                    // by transferring values eg copying the attributes, and importing the data elements
                     TransferValuesFromDocumentXmlToPublishedXml(docNode, currentNode);
 
                     // if moving, move the node to the new parent
@@ -1819,7 +1819,7 @@ SELECT id FROM umbracoNode
             long total;
             do
             {
-                // .GetPagedResultsByQuery implicitely adds ({Constants.DatabaseSchema.Tables.Document}.newest = 1) which
+                // .GetPagedResultsByQuery implicitly adds ({Constants.DatabaseSchema.Tables.Document}.newest = 1) which
                 // is what we want for preview (ie latest version of a content, published or not)
                 var descendants = _documentRepository.GetPage(query, pageIndex++, groupSize, out total, null, Ordering.By("Path"));
                 const bool published = true; // previewXml contains edit content!
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs
index c6565622369c..83d25d3e49b4 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs
@@ -72,7 +72,7 @@ public XmlStoreFilePersister Touch()
         {
             // if _released is false then we're going to setup a timer
             //  then the runner wants to shutdown & run immediately
-            //  this sets _released to true & the timer will trigger eventualy & who cares?
+            //  this sets _released to true & the timer will trigger eventually & who cares?
             // if _released is true, either it's a normal release, or
             //  a runner shutdown, in which case we won't be able to
             //  add a new task, and so we'll run immediately
diff --git a/src/Umbraco.Web/PublishedElementExtensions.cs b/src/Umbraco.Web/PublishedElementExtensions.cs
index 3250dbc2ce55..f2a49f7f60fa 100644
--- a/src/Umbraco.Web/PublishedElementExtensions.cs
+++ b/src/Umbraco.Web/PublishedElementExtensions.cs
@@ -145,7 +145,7 @@ public static T Value<T>(this IPublishedElement content, string alias, string cu
         }
 
         #endregion
-
+            
         #region ToIndexedArray
 
         public static IndexedArrayItem<TContent>[] ToIndexedArray<TContent>(this IEnumerable<TContent> source)
diff --git a/src/Umbraco.Web/RouteCollectionExtensions.cs b/src/Umbraco.Web/RouteCollectionExtensions.cs
index 7fe80db10df7..08630820b7d1 100644
--- a/src/Umbraco.Web/RouteCollectionExtensions.cs
+++ b/src/Umbraco.Web/RouteCollectionExtensions.cs
@@ -84,7 +84,7 @@ public static void IgnoreStandardExclusions(this RouteCollection routes)
         }
 
         /// <summary>
-        /// Extension method to manually regsiter an area
+        /// Extension method to manually register an area
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="routes"></param>
@@ -103,7 +103,7 @@ public static void RegisterArea<T>(this RouteCollection routes)
         }
 
         ///// <summary>
-        ///// Extension method to manually regsiter an area from the container
+        ///// Extension method to manually register an area from the container
         ///// </summary>
         ///// <typeparam name="T"></typeparam>
         ///// <param name="routes"></param>
diff --git a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
index bd85d02dab17..f20aa95c0d06 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
@@ -52,7 +52,7 @@ public bool TryFindContent(PublishedRequest frequest)
                 return false;
             }
 
-            // Apending any querystring from the incoming request to the redirect url.
+            // Appending any querystring from the incoming request to the redirect url.
             url = string.IsNullOrEmpty(frequest.Uri.Query) ? url : url + frequest.Uri.Query;
 
             _logger.Debug<ContentFinderByRedirectUrl>("Route {Route} matches content {ContentId} with url '{Url}', redirecting.", route, content.Id, url);
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
index fc1712dfbded..ff629609d3ca 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
@@ -59,8 +59,7 @@ private static IPublishedContent FindContentByAlias(IPublishedContentCache cache
             // there may be spaces as in "/foo/bar,  /foo/nil"
             // these should probably be taken care of earlier on
 
-            // TODO
-            // can we normalize the values so that they contain no whitespaces, and no leading slashes?
+            // TODO: can we normalize the values so that they contain no whitespaces, and no leading slashes?
             // and then the comparisons in IsMatch can be way faster - and allocate way less strings
 
             const string propertyAlias = Constants.Conventions.Content.UrlAlias;
diff --git a/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs b/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs
index 91343b7d4990..259c6b5d411c 100644
--- a/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs
+++ b/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs
@@ -4,7 +4,7 @@
     /// Provides a method to try to find and assign an Umbraco document to a <c>PublishedContentRequest</c>
     /// when everything else has failed.
     /// </summary>
-    /// <remarks>Identical to <see cref="IContentFinder"/> but required in order to differenciate them in ioc.</remarks>
+    /// <remarks>Identical to <see cref="IContentFinder"/> but required in order to differentiate them in ioc.</remarks>
     public interface IContentLastChanceFinder : IContentFinder
     { }
 }
diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs
index 6814761572eb..540f6d727dab 100644
--- a/src/Umbraco.Web/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedRequest.cs
@@ -93,7 +93,7 @@ public void Prepare()
         /// </summary>
         /// <remarks>When the event triggers, no preparation has been done. It is still possible to
         /// modify the request's Uri property, for example to restore its original, public-facing value
-        /// that might have been modified by an in-between equipement such as a load-balancer.</remarks>
+        /// that might have been modified by an in-between equipment such as a load-balancer.</remarks>
         public static event EventHandler<EventArgs> Preparing;
 
         /// <summary>
@@ -274,7 +274,7 @@ public bool TrySetTemplate(string alias)
                 return true;
             }
 
-            // NOTE - can we stil get it with whitespaces in it due to old legacy bugs?
+            // NOTE - can we still get it with whitespaces in it due to old legacy bugs?
             alias = alias.Replace(" ", "");
 
             var model = _publishedRouter.GetTemplate(alias);
@@ -357,7 +357,7 @@ public CultureInfo Culture
         }
 
         // note: do we want to have an ordered list of alternate cultures,
-        // to allow for fallbacks when doing dictionnary lookup and such?
+        // to allow for fallbacks when doing dictionary lookup and such?
 
         #endregion
 
@@ -430,7 +430,7 @@ public void SetRedirectPermanent(string url)
         }
 
         /// <summary>
-        /// Indicates that the content requet should trigger a redirect, with a specified status code.
+        /// Indicates that the content request should trigger a redirect, with a specified status code.
         /// </summary>
         /// <param name="url">The url to redirect to.</param>
         /// <param name="status">The status code (300-308).</param>
@@ -507,7 +507,8 @@ public void SetResponseStatus(int code, string description = null)
 
         #region Legacy
 
-        // for legacy/webforms code - todo - get rid of it eventually
+        // for legacy/webforms code -
+        // TODO: get rid of it eventually
         internal page UmbracoPage
         {
             get
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index b95977c3a349..94980a7a1012 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -55,7 +55,7 @@ public PublishedRouter(
         // todo
         // in 7.7 this is cached in the PublishedContentRequest, which ... makes little sense
         // killing it entirely, if we need cache, just implement it properly !!
-        // this is all soooo weird
+        // this is all so weird
         public Func<string, IEnumerable<string>> GetRolesForLogin { get; }
 
         public PublishedRequest CreateRequest(UmbracoContext umbracoContext, Uri uri = null)
@@ -691,7 +691,7 @@ private void FindTemplate(PublishedRequest request)
             // read the alternate template alias, from querystring, form, cookie or server vars,
             // only if the published content is the initial once, else the alternate template
             // does not apply
-            // + optionnally, apply the alternate template on internal redirects
+            // + optionally, apply the alternate template on internal redirects
             var useAltTemplate = request.IsInitialPublishedContent
                 || (_webRoutingSection.InternalRedirectPreservesTemplate && request.IsInternalRedirectPublishedContent);
             var altTemplate = useAltTemplate
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
index 669039f08783..7795543320c1 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
@@ -92,7 +92,7 @@ public void Initialize()
             // we cannot rely only on ContentCacheRefresher because when CacheUpdated triggers the old
             // route is gone
             //
-            // this is all verrrry weird but it seems to work
+            // this is all very weird but it seems to work
 
             ContentService.Publishing += ContentService_Publishing;
             ContentService.Published += ContentService_Published;
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
index b7f4e134329a..26c8faca588f 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
@@ -255,7 +255,7 @@ private static void ConfigureClientDependency(IGlobalSettings globalSettings)
             {
                 var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
                 var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
-                    //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                    //include the AppDomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
                     // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
                     // utilizing an old path
                     appDomainHash);
diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
index b4d122b64f9f..d9e3c3c98045 100644
--- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
+++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
@@ -434,12 +434,12 @@ private async Task<T> GetNextBackgroundTask(CancellationToken token)
 
         private async Task<T> GetNextBackgroundTask2(CancellationToken shutdownToken)
         {
-            // exit if cancelling
+            // exit if canceling
             if (shutdownToken.IsCancellationRequested)
                 return null;
 
-            // if keepalive is false then don't block, exit if there is
-            // no task in the buffer - yes, there is a race cond, which
+            // if KeepAlive is false then don't block, exit if there is
+            // no task in the buffer - yes, there is a race condition, which
             // we'll take care of
             if (_options.KeepAlive == false && _tasks.Count == 0)
                 return null;
@@ -482,7 +482,7 @@ private async Task<T> WaitForLatch(T bgTask, CancellationToken token)
             var latched = bgTask as ILatchedBackgroundTask;
             if (latched == null || latched.IsLatched == false) return bgTask;
 
-            // support cancelling awaiting
+            // support canceling awaiting
             // read https://github.com/dotnet/corefx/issues/2704
             // read http://stackoverflow.com/questions/27238232/how-can-i-cancel-task-whenall
             var tokenTaskSource = new TaskCompletionSource<bool>();
@@ -519,7 +519,7 @@ private async Task RunAsync(T bgTask, CancellationToken token)
                     try
                     {
                         if (bgTask.IsAsync)
-                            //configure await = false since we don't care about the context, we're on a background thread.
+                            // configure await = false since we don't care about the context, we're on a background thread.
                             await bgTask.RunAsync(token).ConfigureAwait(false);
                         else
                             bgTask.Run();
@@ -706,7 +706,7 @@ public void Stop(bool immediate)
                 // immediate parameter is true, the registered object must call the UnregisterObject method before returning;
                 // otherwise, its registration will be removed by the application manager.
 
-                _logger.Info<BackgroundTaskRunner>("{LogPrefix} Cancelling tasks", _logPrefix);
+                _logger.Info<BackgroundTaskRunner>("{LogPrefix} Canceling tasks", _logPrefix);
                 Shutdown(true, true); // cancel all tasks, wait for the current one to end
                 Terminate(true);
             }
diff --git a/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs b/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
index 7a51890c1239..58df54a07e9f 100644
--- a/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
+++ b/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
@@ -9,9 +9,9 @@ namespace Umbraco.Web.Scheduling
     /// </summary>
     /// <remarks>Implement by overriding PerformRun or PerformRunAsync and then IsAsync accordingly,
     /// depending on whether the task is implemented as a sync or async method. Run nor RunAsync are
-    /// sealed here as overriding them would break recurrence. And then optionnally override
+    /// sealed here as overriding them would break recurrence. And then optionally override
     /// RunsOnShutdown, in order to indicate whether the latched task should run immediately on
-    /// shutdown, or just be abandonned (default).</remarks>
+    /// shutdown, or just be abandoned (default).</remarks>
     public abstract class RecurringTaskBase : LatchedBackgroundTaskBase
     {
         private readonly IBackgroundTaskRunner<RecurringTaskBase> _runner;
diff --git a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
index 115a28504c72..66037a045665 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
@@ -44,7 +44,7 @@ private async Task ProcessTasksAsync(CancellationToken token)
                     ScheduledTaskTimes.Add(t.Alias, DateTime.Now);
                 }
 
-                // Add 1 second to timespan to compensate for differencies in timer
+                // Add 1 second to timespan to compensate for differences in timer
                 else if (
                     new TimeSpan(
                         DateTime.Now.Ticks - ((DateTime)ScheduledTaskTimes[t.Alias]).Ticks).TotalSeconds + 1 >= t.Interval)
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
index cd4f5ac9338a..d400ccc07761 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
@@ -65,7 +65,7 @@ public void Initialize()
 
         public void Terminate()
         {
-            // the appdomain / maindom / whatever takes care of stopping background task runners
+            // the AppDomain / maindom / whatever takes care of stopping background task runners
         }
 
         private void RegisterBackgroundTasksOnce(object sender, RoutableAttemptEventArgs e)
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index 47357802313b..871f90a31905 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -71,7 +71,7 @@ public ExamineComponent(IMainDom mainDom,
 
         public void Initialize()
         {
-            //we want to tell examine to use a different fs lock instead of the default NativeFSFileLock which could cause problems if the appdomain
+            //we want to tell examine to use a different fs lock instead of the default NativeFSFileLock which could cause problems if the AppDomain
             //terminates and in some rare cases would only allow unlocking of the file if IIS is forcefully terminated. Instead we'll rely on the simplefslock
             //which simply checks the existence of the lock file
             DirectoryFactory.DefaultLockFactory = d =>
@@ -91,7 +91,7 @@ public void Initialize()
 
             if (!examineShutdownRegistered)
             {
-                _logger.Debug<ExamineComponent>("Examine shutdown not registered, this appdomain is not the MainDom, Examine will be disabled");
+                _logger.Debug<ExamineComponent>("Examine shutdown not registered, this AppDomain is not the MainDom, Examine will be disabled");
 
                 //if we could not register the shutdown examine ourselves, it means we are not maindom! in this case all of examine should be disabled!
                 Suspendable.ExamineEvents.SuspendIndexers(_logger);
@@ -174,7 +174,7 @@ private static void EnsureUnlocked(ILogger logger, IExamineManager examineManage
 
             lock (IsConfiguredLocker)
             {
-                //double chekc
+                //double check
                 if (_isConfigured) return;
 
                 _isConfigured = true;
@@ -218,7 +218,7 @@ private void ContentCacheRefresherUpdated(ContentCacheRefresher sender, CacheRef
                 else // RefreshNode or RefreshBranch (maybe trashed)
                 {
                     // don't try to be too clever - refresh entirely
-                    // there has to be race conds in there ;-(
+                    // there has to be race conditions in there ;-(
 
                     var content = contentService.GetById(payload.Id);
                     if (content == null)
@@ -585,7 +585,7 @@ private void DeleteIndexForEntity(int entityId, bool keepIfUnpublished)
         }
         #endregion
 
-        #region Defered Actions
+        #region Deferred Actions
         private class DeferedActions
         {
             private readonly List<DeferedAction> _actions = new List<DeferedAction>();
diff --git a/src/Umbraco.Web/Search/ExamineComposer.cs b/src/Umbraco.Web/Search/ExamineComposer.cs
index 7aab3cfd8fa7..5a897144f97a 100644
--- a/src/Umbraco.Web/Search/ExamineComposer.cs
+++ b/src/Umbraco.Web/Search/ExamineComposer.cs
@@ -45,7 +45,7 @@ public override void Compose(Composition composition)
             composition.RegisterUnique<IValueSetBuilder<IMedia>, MediaValueSetBuilder>();
             composition.RegisterUnique<IValueSetBuilder<IMember>, MemberValueSetBuilder>();
 
-            //We want to manage Examine's appdomain shutdown sequence ourselves so first we'll disable Examine's default behavior
+            //We want to manage Examine's AppDomain shutdown sequence ourselves so first we'll disable Examine's default behavior
             //and then we'll use MainDom to control Examine's shutdown - this MUST be done in Compose ie before ExamineManager
             //is instantiated, as the value is used during instantiation
             ExamineManager.DisableDefaultHostingEnvironmentRegistration();
diff --git a/src/Umbraco.Web/Security/AuthenticationExtensions.cs b/src/Umbraco.Web/Security/AuthenticationExtensions.cs
index 66fbd8e201a0..1fa75a214be3 100644
--- a/src/Umbraco.Web/Security/AuthenticationExtensions.cs
+++ b/src/Umbraco.Web/Security/AuthenticationExtensions.cs
@@ -34,21 +34,21 @@ public static bool AuthenticateCurrentRequest(this HttpContextBase http, Authent
         {
             if (http == null) throw new ArgumentNullException(nameof(http));
 
-            //if there was a ticket, it's not expired, - it should not be renewed or its renewable
+            // if there was a ticket, it's not expired, - it should not be renewed or its renewable
             if (ticket?.Properties.ExpiresUtc != null && ticket.Properties.ExpiresUtc.Value > DateTimeOffset.UtcNow && (renewTicket == false || http.RenewUmbracoAuthTicket()))
             {
                 try
                 {
-                    //get the Umbraco user identity
+                    // get the Umbraco user identity
                     if (!(ticket.Identity is UmbracoBackOfficeIdentity identity))
                         throw new InvalidOperationException("The AuthenticationTicket specified does not contain the correct Identity type");
 
-                    //set the principal object
+                    // set the principal object
                     var principal = new ClaimsPrincipal(identity);
 
-                    //It is actually not good enough to set this on the current app Context and the thread, it also needs
+                    // It is actually not good enough to set this on the current app Context and the thread, it also needs
                     // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually
-                    // an underlying fault of asp.net not propogating the User correctly.
+                    // an underlying fault of asp.net not propagating the User correctly.
                     if (HttpContext.Current != null)
                     {
                         HttpContext.Current.User = principal;
@@ -56,7 +56,7 @@ public static bool AuthenticateCurrentRequest(this HttpContextBase http, Authent
                     http.User = principal;
                     Thread.CurrentPrincipal = principal;
 
-                    //This is a back office request, we will also set the culture/ui culture
+                    // This is a back office request, we will also set the culture/ui culture
                     Thread.CurrentThread.CurrentCulture =
                         Thread.CurrentThread.CurrentUICulture =
                         new System.Globalization.CultureInfo(identity.Culture);
@@ -67,7 +67,7 @@ public static bool AuthenticateCurrentRequest(this HttpContextBase http, Authent
                 {
                     if (ex is FormatException || ex is JsonReaderException)
                     {
-                        //this will occur if the cookie data is invalid
+                        // this will occur if the cookie data is invalid
                         http.UmbracoLogout();
                     }
                     else
@@ -99,17 +99,17 @@ public static UmbracoBackOfficeIdentity GetCurrentIdentity(this HttpContextBase
             if (http == null) throw new ArgumentNullException(nameof(http));
             if (http.User == null) return null; //there's no user at all so no identity
 
-            //If it's already a UmbracoBackOfficeIdentity
+            // If it's already a UmbracoBackOfficeIdentity
             var backOfficeIdentity = http.User.GetUmbracoIdentity();
             if (backOfficeIdentity != null) return backOfficeIdentity;
 
             if (authenticateRequestIfNotFound == false) return null;
 
-            //even if authenticateRequestIfNotFound is true we cannot continue if the request is actually authenticated
+            // even if authenticateRequestIfNotFound is true we cannot continue if the request is actually authenticated
             // which would mean something strange is going on that it is not an umbraco identity.
             if (http.User.Identity.IsAuthenticated) return null;
 
-            //So the user is not authed but we've been asked to do the auth if authenticateRequestIfNotFound = true,
+            // So the user is not authed but we've been asked to do the auth if authenticateRequestIfNotFound = true,
             // which might occur in old webforms style things or for routes that aren't included as a back office request.
             // in this case, we are just reverting to authing using the cookie.
 
@@ -237,8 +237,8 @@ public static AuthenticationTicket GetUmbracoAuthTicket(this IOwinContext ctx)
         /// <param name="cookieName"></param>
         private static void Logout(this HttpContextBase http, string cookieName)
         {
-            //We need to clear the sessionId from the database. This is legacy code to do any logging out and shouldn't really be used at all but in any case
-            //we need to make sure the session is cleared. Due to the legacy nature of this it means we need to use singletons
+            // We need to clear the sessionId from the database. This is legacy code to do any logging out and shouldn't really be used at all but in any case
+            // we need to make sure the session is cleared. Due to the legacy nature of this it means we need to use singletons
             if (http.User != null)
             {
                 var claimsIdentity = http.User.Identity as ClaimsIdentity;
@@ -254,23 +254,23 @@ private static void Logout(this HttpContextBase http, string cookieName)
             }
 
             if (http == null) throw new ArgumentNullException("http");
-            //clear the preview cookie and external login
+            // clear the preview cookie and external login
             var cookies = new[] { cookieName, Constants.Web.PreviewCookieName, Constants.Security.BackOfficeExternalCookieName };
             foreach (var c in cookies)
             {
-                //remove from the request
+                // remove from the request
                 http.Request.Cookies.Remove(c);
 
-                //expire from the response
+                // expire from the response
                 var formsCookie = http.Response.Cookies[c];
                 if (formsCookie != null)
                 {
-                    //this will expire immediately and be removed from the browser
+                    // this will expire immediately and be removed from the browser
                     formsCookie.Expires = DateTime.Now.AddYears(-1);
                 }
                 else
                 {
-                    //ensure there's def an expired cookie
+                    // ensure there's def an expired cookie
                     http.Response.Cookies.Add(new HttpCookie(c) { Expires = DateTime.Now.AddYears(-1) });
                 }
             }
@@ -287,7 +287,7 @@ private static AuthenticationTicket GetAuthTicket(this IOwinContext owinCtx, str
 
             var secureFormat = owinCtx.GetUmbracoAuthTicketDataProtector();
 
-            //get the ticket
+            // get the ticket
             try
             {
 
@@ -314,17 +314,17 @@ private static AuthenticationTicket GetAuthTicket(this HttpContextBase http, str
             var owinCtx = http.GetOwinContext();
             var secureFormat = owinCtx.GetUmbracoAuthTicketDataProtector();
 
-            //will only happen in tests
+            // will only happen in tests
             if (secureFormat == null) return null;
 
-            //get the ticket
+            // get the ticket
             try
             {
                 return GetAuthTicket(secureFormat, asDictionary, cookieName);
             }
             catch (Exception)
             {
-                //occurs when decryption fails
+                // occurs when decryption fails
                 http.Logout(cookieName);
                 return null;
             }
@@ -341,7 +341,7 @@ private static AuthenticationTicket GetAuthTicket(ISecureDataFormat<Authenticati
             {
                 return null;
             }
-            //get the ticket
+            // get the ticket
 
             return secureDataFormat.Unprotect(formsCookie);
         }
diff --git a/src/Umbraco.Web/Security/BackOfficeSignInManager.cs b/src/Umbraco.Web/Security/BackOfficeSignInManager.cs
index b711fe76cf7d..4315d3a76218 100644
--- a/src/Umbraco.Web/Security/BackOfficeSignInManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeSignInManager.cs
@@ -82,7 +82,7 @@ public override async Task<SignInStatus> PasswordSignInAsync(string userName, st
         }
 
         /// <summary>
-        /// Borrowed from Micorosoft's underlying sign in manager which is not flexible enough to tell it to use a different cookie type
+        /// Borrowed from Microsoft's underlying sign in manager which is not flexible enough to tell it to use a different cookie type
         /// </summary>
         /// <param name="userName"></param>
         /// <param name="password"></param>
@@ -148,7 +148,7 @@ private async Task<SignInStatus> PasswordSignInAsyncImpl(string userName, string
         }
 
         /// <summary>
-        /// Borrowed from Micorosoft's underlying sign in manager which is not flexible enough to tell it to use a different cookie type
+        /// Borrowed from Microsoft's underlying sign in manager which is not flexible enough to tell it to use a different cookie type
         /// </summary>
         /// <param name="user"></param>
         /// <param name="isPersistent"></param>
diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
index ce51f82c43a0..a7256b257dd0 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
@@ -211,7 +211,7 @@ protected void InitUserManager(
                 contentSectionConfig.NotificationEmailAddress,
                 new EmailSender());
 
-            //NOTE: Not implementing these, if people need custom 2 factor auth, they'll need to implement their own UserStore to suport it
+            //NOTE: Not implementing these, if people need custom 2 factor auth, they'll need to implement their own UserStore to support it
 
             //// Register two factor authentication providers. This application uses Phone and Emails as a step of receiving a code for verifying the user
             //// You can write your own provider and plug in here.
@@ -250,7 +250,7 @@ public virtual async Task<bool> ValidateSessionIdAsync(int userId, string sessio
         /// <returns></returns>
         protected virtual IPasswordHasher GetDefaultPasswordHasher(MembershipProviderBase provider)
         {
-            //if the current user membership provider is unkown (this would be rare), then return the default password hasher
+            //if the current user membership provider is unknown (this would be rare), then return the default password hasher
             if (provider.IsUmbracoUsersProvider() == false)
                 return new PasswordHasher();
 
@@ -459,7 +459,7 @@ protected override async Task<IdentityResult> UpdatePassword(IUserPasswordStore<
         }
 
         /// <summary>
-        /// This is copied from the underlying .NET base class since they decied to not expose it
+        /// This is copied from the underlying .NET base class since they decided to not expose it
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
@@ -471,7 +471,7 @@ private async Task UpdateSecurityStampInternal(BackOfficeIdentityUser user)
         }
 
         /// <summary>
-        /// This is copied from the underlying .NET base class since they decied to not expose it
+        /// This is copied from the underlying .NET base class since they decided to not expose it
         /// </summary>
         /// <returns></returns>
         private IUserSecurityStampStore<BackOfficeIdentityUser, int> GetSecurityStore()
@@ -483,7 +483,7 @@ private IUserSecurityStampStore<BackOfficeIdentityUser, int> GetSecurityStore()
         }
 
         /// <summary>
-        /// This is copied from the underlying .NET base class since they decied to not expose it
+        /// This is copied from the underlying .NET base class since they decided to not expose it
         /// </summary>
         /// <returns></returns>
         private static string NewSecurityStamp()
@@ -534,14 +534,14 @@ public override async Task<IdentityResult> ResetAccessFailedCountAsync(int userI
 
 
         /// <summary>
-        /// Overides the microsoft ASP.NET user managment method
+        /// Overrides the Microsoft ASP.NET user management method
         /// </summary>
         /// <param name="userId"></param>
         /// <returns>
         /// returns a Async Task<IdentityResult>
         /// </returns>
         /// <remarks>
-        /// Doesnt set fail attempts back to 0
+        /// Doesn't set fail attempts back to 0
         /// </remarks>
         public override async Task<IdentityResult> AccessFailedAsync(int userId)
         {
diff --git a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
index dace264996cd..dba7a8c33a61 100644
--- a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
@@ -123,7 +123,7 @@ public override async Task Invoke(IOwinContext context)
                     }
                 }
 
-                //Hack! we need to suppress the stupid forms authentcation module but we can only do that by using non owin stuff
+                //Hack! we need to suppress the stupid forms authentication module but we can only do that by using non owin stuff
                 if (HttpContext.Current != null && HttpContext.Current.Response != null)
                 {
                     HttpContext.Current.Response.SuppressFormsAuthenticationRedirect = true;
diff --git a/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs b/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs
index 4756390d06fa..81407afe503b 100644
--- a/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs
+++ b/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Security
 {
     /// <summary>
-    /// This class is used by events raised from hthe BackofficeUserManager
+    /// This class is used by events raised from the BackofficeUserManager
     /// </summary>
     public class IdentityAuditEventArgs : EventArgs
     {
@@ -30,7 +30,7 @@ public class IdentityAuditEventArgs : EventArgs
         public int AffectedUser { get; private set; }
 
         /// <summary>
-        /// If a user is perfoming an action on a different user, then this will be set. Otherwise it will be -1
+        /// If a user is performing an action on a different user, then this will be set. Otherwise it will be -1
         /// </summary>
         public int PerformingUser { get; private set; }
 
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index db93df953f65..79eb27bc3c2b 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -486,7 +486,7 @@ private IEnumerable<UmbracoProperty> GetMemberPropertiesViewModel(IMemberType me
                 ////This is a rudimentary check to see what data template we should render
                 //// if developers want to change the template they can do so dynamically in their views or controllers
                 //// for a given property.
-                ////These are the default built-in MVC template types: “Boolean”, “Decimal”, “EmailAddress”, “HiddenInput”, “Html”, “Object”, “String”, “Text”, and “Url”
+                ////These are the default built-in MVC template types: “Boolean”, “Decimal”, “EmailAddress”, “HiddenInput”, “HTML”, “Object”, “String”, “Text”, and “Url”
                 //// by default we'll render a text box since we've defined that metadata on the UmbracoProperty.Value property directly.
                 //if (prop.DataTypeId == new Guid(Constants.PropertyEditors.TrueFalse))
                 //{
@@ -706,7 +706,7 @@ public virtual Attempt<PasswordChangedModel> ChangePassword(string username, Cha
         /// <param name="lastActivityDate"></param>
         /// <param name="comment"></param>
         /// <returns>
-        /// Returns successful if the membershipuser required updating, otherwise returns failed if it didn't require updating.
+        /// Returns successful if the membership user required updating, otherwise returns failed if it didn't require updating.
         /// </returns>
         internal Attempt<MembershipUser> UpdateMember(MembershipUser member, MembershipProvider provider,
             string email = null,
@@ -763,7 +763,7 @@ private IMember GetCurrentPersistedMember()
 
                     if (provider.IsUmbracoMembershipProvider() == false)
                     {
-                        throw new NotSupportedException("An IMember model can only be retreived when using the built-in Umbraco membership providers");
+                        throw new NotSupportedException("An IMember model can only be retrieved when using the built-in Umbraco membership providers");
                     }
                     var username = provider.GetCurrentUserName();
                     var member = _memberService.GetByUsername(username);
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index 1b528c2ba91b..413023c27c1a 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -82,7 +82,7 @@ public override void Initialize(string name, NameValueCollection config)
         /// </returns>
         protected override bool PerformChangePassword(string username, string oldPassword, string newPassword)
         {
-            //NOTE: due to backwards compatibilty reasons (and UX reasons), this provider doesn't care about the old password and
+            //NOTE: due to backwards compatibility reasons (and UX reasons), this provider doesn't care about the old password and
             // allows simply setting the password manually so we don't really care about the old password.
             // This is allowed based on the overridden AllowManuallyChangingPassword option.
 
@@ -354,7 +354,7 @@ public override MembershipUser GetUser(string username, bool userIsOnline)
                 // cause all distributed cache to execute - which will clear out some caches we don't want.
                 // http://issues.umbraco.org/issue/U4-3451
 
-                // when upgrating from 7.2 to 7.3 trying to save will throw
+                // when upgrading from 7.2 to 7.3 trying to save will throw
                 if (UmbracoVersion.Current >= new Version(7, 3, 0, 0))
                     MemberService.Save(member, false);
             }
@@ -594,7 +594,7 @@ internal virtual ValidateUserResult PerformValidateUser(string username, string
             //TODO: In v8 we aren't going to have an overload to disable events, so we'll need to make a different method
             // for this type of thing (i.e. UpdateLastLogin or similar).
 
-            // when upgrating from 7.2 to 7.3 trying to save will throw
+            // when upgrading from 7.2 to 7.3 trying to save will throw
             if (UmbracoVersion.Current >= new Version(7, 3, 0, 0))
                 MemberService.Save(member, false);
 
diff --git a/src/Umbraco.Web/Security/SessionIdValidator.cs b/src/Umbraco.Web/Security/SessionIdValidator.cs
index e5e1394aeae5..58b6c6ad1ca8 100644
--- a/src/Umbraco.Web/Security/SessionIdValidator.cs
+++ b/src/Umbraco.Web/Security/SessionIdValidator.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Web.Security
     /// </summary>
     /// <remarks>
     /// This uses another cookie to track the last checked time which is done for a few reasons:    
-    /// * We can't use the user's auth ticket to do thsi because we'd be re-issuing the auth ticket all of the time and it would never expire
+    /// * We can't use the user's auth ticket to do this because we'd be re-issuing the auth ticket all of the time and it would never expire
     ///     plus the auth ticket size is much larger than this small value
     /// * This will execute quite often (every minute per user) and in some cases there might be several requests that end up re-issuing the cookie so the cookie value should be small
     /// * We want to avoid the user lookup if it's not required so that will only happen when the time diff is great enough in the cookie
diff --git a/src/Umbraco.Web/Security/UmbracoAuthTicketDataProtector.cs b/src/Umbraco.Web/Security/UmbracoAuthTicketDataProtector.cs
index c65c010204c9..3824935559c0 100644
--- a/src/Umbraco.Web/Security/UmbracoAuthTicketDataProtector.cs
+++ b/src/Umbraco.Web/Security/UmbracoAuthTicketDataProtector.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Security
 {
     /// <summary>
-    /// This is used so that we can retrive the auth ticket protector from an IOwinContext
+    /// This is used so that we can retrieve the auth ticket protector from an IOwinContext
     /// </summary>
     internal class UmbracoAuthTicketDataProtector : DisposableObjectSlim
     {
diff --git a/src/Umbraco.Web/Security/UmbracoSecureDataFormat.cs b/src/Umbraco.Web/Security/UmbracoSecureDataFormat.cs
index 0dc73f521400..19cd6026575a 100644
--- a/src/Umbraco.Web/Security/UmbracoSecureDataFormat.cs
+++ b/src/Umbraco.Web/Security/UmbracoSecureDataFormat.cs
@@ -38,7 +38,7 @@ public string Protect(AuthenticationTicket data)
         }
 
         /// <summary>
-        /// Unprotects the cookie
+        /// Un-protects the cookie
         /// </summary>
         /// <param name="protectedText"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/Security/WebAuthExtensions.cs b/src/Umbraco.Web/Security/WebAuthExtensions.cs
index d38345e48c08..aa06616d90c6 100644
--- a/src/Umbraco.Web/Security/WebAuthExtensions.cs
+++ b/src/Umbraco.Web/Security/WebAuthExtensions.cs
@@ -23,7 +23,7 @@ internal static IPrincipal SetPrincipalForRequest(this HttpRequestMessage reques
         {
             //It is actually not good enough to set this on the current app Context and the thread, it also needs
             // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually
-            // an underlying fault of asp.net not propogating the User correctly.
+            // an underlying fault of asp.net not propagating the User correctly.
             if (HttpContext.Current != null)
             {
                 HttpContext.Current.User = principal;
@@ -51,7 +51,7 @@ internal static IPrincipal SetPrincipalForRequest(this HttpContextBase httpConte
         {            
             //It is actually not good enough to set this on the current app Context and the thread, it also needs
             // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually
-            // an underlying fault of asp.net not propogating the User correctly.
+            // an underlying fault of asp.net not propagating the User correctly.
             if (HttpContext.Current != null)
             {
                 HttpContext.Current.User = principal;
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index 18ef806ad147..54ff1bba3f95 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -223,7 +223,7 @@ public virtual ValidateRequestAttempt ValidateCurrentUser(bool throwExceptions,
             // Check for console access
             if (user == null || (requiresApproval && user.IsApproved == false) || (user.IsLockedOut && RequestIsInUmbracoApplication(_httpContext)))
             {
-                if (throwExceptions) throw new ArgumentException("You have no priviledges to the umbraco console. Please contact your administrator");
+                if (throwExceptions) throw new ArgumentException("You have no privileges to the umbraco console. Please contact your administrator");
                 return ValidateRequestAttempt.FailedNoPrivileges;
             }
             return ValidateRequestAttempt.Success;
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index db786655b489..ff87719b12e8 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -177,7 +177,7 @@ private void ExecuteTemplateRendering(TextWriter sw, PublishedRequest request)
         /// <returns></returns>
         /// <remarks>
         /// To achieve this we temporarily change the output text writer of the current HttpResponse, then
-        ///   execute the controller via the handler which innevitably writes the result to the text writer
+        ///   execute the controller via the handler which inevitably writes the result to the text writer
         ///   that has been assigned to the response. Then we change the response textwriter back to the original
         ///   before continuing .
         /// </remarks>
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index c8b13562cd20..b4a91f8ab803 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -137,7 +137,7 @@ public async Task<TreeRootNode> GetApplicationTrees(string application, string t
                 //If treeGroupName == null then its third party
                 if (treeGroupName.IsNullOrWhiteSpace())
                 {
-                    //This is used for the localisation key
+                    //This is used for the localization key
                     //treeHeaders/thirdPartyGroup
                     treeGroupName = "thirdPartyGroup";
                 }
diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
index cce40eb047d6..ba851191b23a 100644
--- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
@@ -62,7 +62,7 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
                         var treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprint, id, queryStrings, "icon-item-arrangement", true);
                         treeNode.Path = $"-1,{entity.Id}";
                         treeNode.NodeType = "document-type-blueprints";
-                        //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
+                        // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
                         treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
                         return treeNode;
                     }));
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 8113a85690d1..b50f06e14e7d 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -58,7 +58,7 @@ protected override TreeNode GetSingleTreeNode(IEntitySlim entity, string parentI
             var allowedUserOptions = GetAllowedUserMenuItemsForNode(entity);
             if (CanUserAccessNode(entity, allowedUserOptions, culture))
             {
-                //Special check to see if it ia a container, if so then we'll hide children.
+                //Special check to see if it is a container, if so then we'll hide children.
                 var isContainer = entity.IsContainer;   // && (queryStrings.Get("isDialog") != "true");
 
                 var node = CreateTreeNode(
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index c7420d8d9c65..7c0e7c736d31 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -429,7 +429,7 @@ internal IEnumerable<MenuItem> GetAllowedUserMenuItemsForNode(IUmbracoEntity dd)
         }
 
         /// <summary>
-        /// Determins if the user has access to view the node/document
+        /// Determines if the user has access to view the node/document
         /// </summary>
         /// <param name="doc">The Document to check permissions against</param>
         /// <param name="allowedUserOptions">A list of MenuItems that the user has permissions to execute on the current document</param>
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 3c6b9c782c2f..65a2aa3fb530 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -43,7 +43,7 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
                         var node = CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-folder", dt.HasChildren, "");
                         node.Path = dt.Path;
                         node.NodeType = "container";
-                        //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
+                        // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
                         node.AdditionalData["jsClickCallback"] = "javascript:void(0);";
                         return node;
                     }));
@@ -57,7 +57,7 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
                     .Select(dt =>
                     {
                         // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to.
-                        // need this check to keep supporting sites where childs have already been created.
+                        // need this check to keep supporting sites where children have already been created.
                         var hasChildren = dt.HasChildren;
                         var node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentType, id, queryStrings, "icon-item-arrangement", hasChildren);
 
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 8b38bee865ed..e60bbe49ed41 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -38,8 +38,8 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
                        var node = CreateTreeNode(dt, Constants.ObjectTypes.DataType, id, queryStrings, "icon-folder", dt.HasChildren);
                        node.Path = dt.Path;
                        node.NodeType = "container";
-                        //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
-                        node.AdditionalData["jsClickCallback"] = "javascript:void(0);";
+                       // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
+                       node.AdditionalData["jsClickCallback"] = "javascript:void(0);";
                        return node;
                    }));
 
diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
index 6c8f576732d4..4ff3697a1710 100644
--- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs
+++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
@@ -45,7 +45,7 @@ protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
         /// All of the query string parameters passed from jsTree
         /// </param>
         /// <remarks>
-        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
+        /// We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom data from the front-end
         /// to the back end to be used in the query for model data.
         /// </remarks>
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index b93c1ac9e3fb..8420126db4ad 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -36,12 +36,12 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
                         var node = CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-folder", dt.HasChildren, "");
                         node.Path = dt.Path;
                         node.NodeType = "container";
-                        //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
+                        // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
                         node.AdditionalData["jsClickCallback"] = "javascript:void(0);";
                         return node;
                     }));
 
-            //if the request is for folders only then just return
+            // if the request is for folders only then just return
             if (queryStrings["foldersonly"].IsNullOrWhiteSpace() == false && queryStrings["foldersonly"] == "1") return nodes;
 
             nodes.AddRange(
@@ -50,7 +50,7 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
                     .Select(dt =>
                     {
                         // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to.
-                        // need this check to keep supporting sites where childs have already been created.
+                        // need this check to keep supporting sites where children have already been created.
                         var hasChildren = dt.HasChildren;
                         var node = CreateTreeNode(dt, Constants.ObjectTypes.MediaType, id, queryStrings, "icon-thumbnails", hasChildren);
 
@@ -69,7 +69,7 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
 
             if (id == Constants.System.Root.ToInvariantString())
             {
-                //set the default to create
+                // set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
 
                 // root actions
@@ -81,7 +81,7 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
             var container = Services.EntityService.Get(int.Parse(id), UmbracoObjectTypes.MediaTypeContainer);
             if (container != null)
             {
-                //set the default to create
+                // set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
 
                 menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
@@ -93,7 +93,7 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
 
                 if (container.HasChildren == false)
                 {
-                    //can delete doc type
+                    // can delete doc type
                     menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
                 }
                 menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -107,7 +107,7 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
                 {
                     menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
 
-                    //no move action if this is a child doc type
+                    // no move action if this is a child doc type
                     if (parent == null)
                     {
                         menu.Items.Add<ActionMove>(Services.TextService, true, opensDialog: true);
@@ -116,7 +116,7 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
                 else
                 {
                     menu.Items.Add<ActionMove>(Services.TextService, opensDialog: true);
-                    //no move action if this is a child doc type
+                    // no move action if this is a child doc type
                     if (parent == null)
                     {
                         menu.Items.Add<ActionMove>(Services.TextService, true, opensDialog: true);
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index d06d768f2d43..7b4c049353c1 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -44,7 +44,7 @@ protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbr
         /// All of the query string parameters passed from jsTree
         /// </param>
         /// <remarks>
-        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
+        /// We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom data from the front-end
         /// to the back end to be used in the query for model data.
         /// </remarks>
         protected abstract TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings);
@@ -115,7 +115,7 @@ public TreeNode GetRootNode(FormDataCollection queryStrings)
         /// </param>
         /// <returns>JSON markup for jsTree</returns>
         /// <remarks>
-        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
+        /// We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom data from the front-end
         /// to the back end to be used in the query for model data.
         /// </remarks>
         [HttpQueryStringFilter("queryStrings")]
@@ -389,7 +389,7 @@ internal static void OnRootNodeRendering(TreeControllerBase instance, TreeNodeRe
         }
 
         /// <summary>
-        /// An event that allows developers to modify the meun that is being rendered
+        /// An event that allows developers to modify the menu that is being rendered
         /// </summary>
         /// <remarks>
         /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
diff --git a/src/Umbraco.Web/Trees/UrlHelperExtensions.cs b/src/Umbraco.Web/Trees/UrlHelperExtensions.cs
index c794110d8820..3221023ca2d6 100644
--- a/src/Umbraco.Web/Trees/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/Trees/UrlHelperExtensions.cs
@@ -39,7 +39,7 @@ internal static string GetTreePathFromFilePath(this UrlHelper urlHelper, string
             //to convert a filepath to a tree syncing path string.
 
             //removes the basepath from the path
-            //and normalises paths - / is used consistently between trees and editors
+            //and normalizes paths - / is used consistently between trees and editors
             basePath = basePath.TrimStart("~");
             virtualPath = virtualPath.TrimStart("~");
             virtualPath = virtualPath.Substring(basePath.Length);
diff --git a/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs b/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs
index cd7270ac6227..9b6aa96e3789 100644
--- a/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs
+++ b/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs
@@ -38,7 +38,7 @@ internal static IEnumerable<string> OptimizeAssetCollection(IEnumerable<string>
             var dependencies = assets.Select(x =>
             {
                 // most declarations with be made relative to the /umbraco folder, so things
-                // ike lib/blah/blah.js so we need to turn them into absolutes here
+                // like lib/blah/blah.js so we need to turn them into absolutes here
                 if (x.StartsWith("/") == false && Uri.IsWellFormedUriString(x, UriKind.Relative))
                 {
                     return new BasicFile(assetType) { FilePath = new Uri(requestUrl, x).AbsolutePath };
diff --git a/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs b/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs
index f1f57a03a71e..b5235c79385e 100644
--- a/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs
+++ b/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs
@@ -35,7 +35,7 @@ public ClientDependencyConfiguration(ILogger logger)
         /// <param name="version">The <see cref="SemVersion">version</see> of Umbraco we're upgrading to</param>
         /// <param name="date">A <see cref="DateTime">date</see> value to use in the hash to prevent this method from updating the version on each startup</param>
         /// <param name="dateFormat">Allows the developer to specify the <see cref="string">date precision</see> for the hash (i.e. "yyyyMMdd" would be a precision for the day)</param>
-        /// <returns>Boolean to indicate succesful update of the ClientDependency.config file</returns>
+        /// <returns>Boolean to indicate successful update of the ClientDependency.config file</returns>
         public bool UpdateVersionNumber(SemVersion version, DateTime date, string dateFormat)
         {
             var byteContents = Encoding.Unicode.GetBytes(version + date.ToString(dateFormat));
@@ -56,7 +56,7 @@ public bool UpdateVersionNumber(SemVersion version, DateTime date, string dateFo
                 //CDF requires an INT, and although this isn't fail safe, it will work for our purposes. We are not hashing for crypto purposes
                 //so there could be some collisions with this conversion but it's not a problem for our purposes
                 //It's also important to note that the long.GetHashCode() implementation in .NET is this: return (int) this ^ (int) (this >> 32);
-                //which means that this value will not change per appdomain like some GetHashCode implementations.
+                //which means that this value will not change per AppDomain like some GetHashCode implementations.
                 intHash = longResult.GetHashCode();
             }
 
diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
index 2f320ef83938..f223fe531068 100644
--- a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
+++ b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
@@ -8,10 +8,11 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Umbraco.Web.UI.JavaScript {
+namespace Umbraco.Web.UI.JavaScript
+{
     using System;
-    
-    
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -22,44 +23,52 @@ namespace Umbraco.Web.UI.JavaScript {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
+    internal class Resources
+    {
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
+        internal Resources()
+        {
         }
-        
+
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if (object.ReferenceEquals(resourceMan, null))
+                {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.UI.JavaScript.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
                 return resourceCulture;
             }
-            set {
+            set
+            {
                 resourceCulture = value;
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to [
         ///    &apos;lib/jquery/jquery.min.js&apos;,
@@ -80,12 +89,14 @@ internal Resources() {
         ///    &apos;lib/angular-animate/angular-animate.js&apos;,
         ///    [rest of string was truncated]&quot;;.
         /// </summary>
-        internal static string JsInitialize {
-            get {
+        internal static string JsInitialize
+        {
+            get
+            {
                 return ResourceManager.GetString("JsInitialize", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to LazyLoad.js(&quot;##JsInitialize##&quot;, function () {
         ///    //we need to set the legacy UmbClientMgr path
@@ -99,12 +110,14 @@ internal static string JsInitialize {
         ///});
         ///.
         /// </summary>
-        internal static string Main {
-            get {
+        internal static string Main
+        {
+            get
+            {
                 return ResourceManager.GetString("Main", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to [
         ///    &apos;../lib/jquery/jquery.min.js&apos;,
@@ -122,12 +135,14 @@ internal static string Main {
         ///]
         ///.
         /// </summary>
-        internal static string PreviewInitialize {
-            get {
+        internal static string PreviewInitialize
+        {
+            get
+            {
                 return ResourceManager.GetString("PreviewInitialize", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to //TODO: This would be nicer as an angular module so it can be injected into stuff... that&apos;d be heaps nicer, but
         ///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want
@@ -139,8 +154,10 @@ internal static string PreviewInitialize {
         /////define a global static object
         ///Umbraco.Sys.ServerVariables = ##Variables## ;.
         /// </summary>
-        internal static string ServerVariables {
-            get {
+        internal static string ServerVariables
+        {
+            get
+            {
                 return ResourceManager.GetString("ServerVariables", resourceCulture);
             }
         }
diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.resx b/src/Umbraco.Web/UI/JavaScript/Resources.resx
index 34cea3a2d4d9..95526f51e75b 100644
--- a/src/Umbraco.Web/UI/JavaScript/Resources.resx
+++ b/src/Umbraco.Web/UI/JavaScript/Resources.resx
@@ -37,7 +37,7 @@
     mimetype set.
     
     The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to stop persisting the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
     
     Note - application/x-microsoft.net.object.binary.base64 is the format 
@@ -130,4 +130,4 @@
   <data name="ServerVariables" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>servervariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/Umbraco.Web/UI/Pages/BasePage.cs b/src/Umbraco.Web/UI/Pages/BasePage.cs
index a8fbc92722db..c0c266367a04 100644
--- a/src/Umbraco.Web/UI/Pages/BasePage.cs
+++ b/src/Umbraco.Web/UI/Pages/BasePage.cs
@@ -40,9 +40,9 @@ public class BasePage : Page
         public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext));
 
         /// <summary>
-        /// Gets the Html helper.
+        /// Gets the HTML helper.
         /// </summary>
-        /// <remarks>This html helper is created with an empty context and page so it may not have all of the functionality expected.</remarks>
+        /// <remarks>This HTML helper is created with an empty context and page so it may not have all of the functionality expected.</remarks>
         public HtmlHelper Html => _html ?? (_html = new HtmlHelper(new ViewContext(), new ViewPage()));
 
         /// <summary>
diff --git a/src/Umbraco.Web/UI/Pages/ClientTools.cs b/src/Umbraco.Web/UI/Pages/ClientTools.cs
index 6988877fa25c..92b879dad188 100644
--- a/src/Umbraco.Web/UI/Pages/ClientTools.cs
+++ b/src/Umbraco.Web/UI/Pages/ClientTools.cs
@@ -126,10 +126,10 @@ public ClientTools RefreshTree(string treeType)
         }
 
         /// <summary>
-        /// A reference to the umbraco UI component "speechbubble". The speechbubble appears in the lower right corner of the screen, notifying users of events
+        /// A reference to the umbraco UI component "speechbubble". The speech bubble appears in the lower right corner of the screen, notifying users of events
         /// </summary>
-        /// <param name="i">The speechbubble icon.</param>
-        /// <param name="header">The speechbubble header.</param>
+        /// <param name="i">The speech bubble icon.</param>
+        /// <param name="header">The speech bubble header.</param>
         /// <param name="body">The body text</param>
         public ClientTools ShowSpeechBubble(SpeechBubbleIcon i, string header, string body)
         {
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index d8d0d65b550c..1ce518a653fb 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -86,7 +86,7 @@ private void OnApplicationInit(object sender, EventArgs evargs)
         // which means that this will be called *many* times for different apps when Umbraco runs
         public override void Init()
         {
-            // note: base.Init() is what initializes all of the httpmodules, ties up a bunch of stuff with IIS, etc...
+            // note: base.Init() is what initializes all of the http modules, ties up a bunch of stuff with IIS, etc...
             // therefore, since OWIN is an HttpModule when running in IIS/ASP.Net the OWIN startup is not executed
             // until this method fires and by that time - Umbraco has booted already
 
diff --git a/src/Umbraco.Web/UmbracoComponentRenderer.cs b/src/Umbraco.Web/UmbracoComponentRenderer.cs
index e2d4ecfc3974..48d0d571eeb4 100644
--- a/src/Umbraco.Web/UmbracoComponentRenderer.cs
+++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs
@@ -132,7 +132,7 @@ internal IHtmlString RenderMacro(MacroModel m, IDictionary<string, object> param
                 // looks for a lower case match. WTF. the whole macro concept needs to be rewritten.
 
 
-                //NOTE: the value could have html encoded values, so we need to deal with that
+                //NOTE: the value could have HTML encoded values, so we need to deal with that
                 macroProps.Add(i.Key.ToLowerInvariant(), (i.Value is string) ? HttpUtility.HtmlDecode(i.Value.ToString()) : i.Value);
             }
             var renderer = new MacroRenderer(Current.ProfilingLogger);
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 41ac3096534c..49a3832483e9 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -260,7 +260,7 @@ internal UmbracoContext(HttpContextBase httpContext,
         /// ctor will have to have another parameter added only for this one method which is annoying and doesn't make a ton of sense
         /// since the UmbracoContext itself doesn't use this.
         ///
-        /// TODO The alternative is to have a IDomainHelperAccessor singleton which is cached per UmbracoContext
+        /// TODO: The alternative is to have a IDomainHelperAccessor singleton which is cached per UmbracoContext
         /// </remarks>
         internal DomainHelper GetDomainHelper(ISiteDomainHelper siteDomainHelper)
             => _domainHelper ?? (_domainHelper = new DomainHelper(PublishedSnapshot.Domains, siteDomainHelper));
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index ee57054dc9d7..110c3e84d0d9 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -770,10 +770,10 @@ public IEnumerable<IPublishedContent> MediaAtRoot()
         #region Strings
 
         /// <summary>
-        /// Replaces text line breaks with html line breaks
+        /// Replaces text line breaks with HTML line breaks
         /// </summary>
         /// <param name="text">The text.</param>
-        /// <returns>The text with text line breaks replaced with html linebreaks (<br/>)</returns>
+        /// <returns>The text with text line breaks replaced with HTML line breaks (<br/>)</returns>
         public IHtmlString ReplaceLineBreaksForHtml(string text)
         {
             return StringUtilities.ReplaceLineBreaksForHtml(text);
@@ -791,7 +791,7 @@ public string CreateHash(string text)
         }
 
         /// <summary>
-        /// Strips all html tags from a given string, all contents of the tags will remain.
+        /// Strips all HTML tags from a given string, all contents of the tags will remain.
         /// </summary>
         public HtmlString StripHtml(IHtmlString html, params string[] tags)
         {
@@ -799,7 +799,7 @@ public HtmlString StripHtml(IHtmlString html, params string[] tags)
         }
 
         /// <summary>
-        /// Strips all html tags from a given string, all contents of the tags will remain.
+        /// Strips all HTML tags from a given string, all contents of the tags will remain.
         /// </summary>
         public HtmlString StripHtml(string html, params string[] tags)
         {
@@ -831,7 +831,7 @@ public string Join(string separator, params object[] args)
         }
 
         /// <summary>
-        /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString Truncate(IHtmlString html, int length)
         {
@@ -839,7 +839,7 @@ public IHtmlString Truncate(IHtmlString html, int length)
         }
 
         /// <summary>
-        /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString Truncate(IHtmlString html, int length, bool addElipsis)
         {
@@ -847,7 +847,7 @@ public IHtmlString Truncate(IHtmlString html, int length, bool addElipsis)
         }
 
         /// <summary>
-        /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString Truncate(IHtmlString html, int length, bool addElipsis, bool treatTagsAsContent)
         {
@@ -855,7 +855,7 @@ public IHtmlString Truncate(IHtmlString html, int length, bool addElipsis, bool
         }
 
         /// <summary>
-        /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString Truncate(string html, int length)
         {
@@ -863,7 +863,7 @@ public IHtmlString Truncate(string html, int length)
         }
 
         /// <summary>
-        /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString Truncate(string html, int length, bool addElipsis)
         {
@@ -871,7 +871,7 @@ public IHtmlString Truncate(string html, int length, bool addElipsis)
         }
 
         /// <summary>
-        /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString Truncate(string html, int length, bool addElipsis, bool treatTagsAsContent)
         {
@@ -881,7 +881,7 @@ public IHtmlString Truncate(string html, int length, bool addElipsis, bool treat
         #region Truncate by Words
 
         /// <summary>
-        /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given amount of words, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString TruncateByWords(string html, int words)
         {
@@ -891,7 +891,7 @@ public IHtmlString TruncateByWords(string html, int words)
         }
 
         /// <summary>
-        /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given amount of words, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString TruncateByWords(string html, int words, bool addElipsis)
         {
@@ -901,7 +901,7 @@ public IHtmlString TruncateByWords(string html, int words, bool addElipsis)
         }
 
         /// <summary>
-        /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given amount of words, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString TruncateByWords(IHtmlString html, int words)
         {
@@ -911,7 +911,7 @@ public IHtmlString TruncateByWords(IHtmlString html, int words)
         }
 
         /// <summary>
-        /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
+        /// Truncates a string to a given amount of words, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them
         /// </summary>
         public IHtmlString TruncateByWords(IHtmlString html, int words, bool addElipsis)
         {
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index eb6fc54fbbbc..9c413402b8a3 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -107,7 +107,7 @@ private void BeginRequest(HttpContextBase httpContext)
         }
 
         /// <summary>
-        /// Processses the Umbraco Request
+        /// Processes the Umbraco Request
         /// </summary>
         /// <param name="httpContext"></param>
         /// <remarks>
@@ -150,9 +150,9 @@ void ProcessRequest(HttpContextBase httpContext)
 
             // note: requestModule.UmbracoRewrite also did some stripping of &umbPage
             // from the querystring... that was in v3.x to fix some issues with pre-forms
-            // auth. Paul Sterling confirmed in jan. 2013 that we can get rid of it.
+            // auth. Paul Sterling confirmed in Jan. 2013 that we can get rid of it.
 
-            // instanciate, prepare and process the published content request
+            // instantiate, prepare and process the published content request
             // important to use CleanedUmbracoUrl - lowercase path-only version of the current url
             var request = _publishedRouter.CreateRequest(umbracoContext);
             umbracoContext.PublishedRequest = request;
@@ -347,7 +347,7 @@ private void RewriteToBackOfficeHandler(HttpContextBase context)
             context.RewritePath(rewritePath, "", "", false);
 
             //if it is MVC we need to do something special, we are not using TransferRequest as this will
-            //require us to rewrite the path with query strings and then reparse the query strings, this would
+            //require us to rewrite the path with query strings and then re-parse the query strings, this would
             //also mean that we need to handle IIS 7 vs pre-IIS 7 differently. Instead we are just going to create
             //an instance of the UrlRoutingModule and call it's PostResolveRequestCache method. This does:
             // * Looks up the route based on the new rewritten URL
@@ -380,7 +380,7 @@ private void RewriteToUmbracoHandler(HttpContextBase context, PublishedRequest p
             context.RewritePath(rewritePath, "", query, false);
 
             //if it is MVC we need to do something special, we are not using TransferRequest as this will
-            //require us to rewrite the path with query strings and then reparse the query strings, this would
+            //require us to rewrite the path with query strings and then re-parse the query strings, this would
             //also mean that we need to handle IIS 7 vs pre-IIS 7 differently. Instead we are just going to create
             //an instance of the UrlRoutingModule and call it's PostResolveRequestCache method. This does:
             // * Looks up the route based on the new rewritten URL
diff --git a/src/Umbraco.Web/UriUtility.cs b/src/Umbraco.Web/UriUtility.cs
index 9f90c803c62b..a4de3c412e56 100644
--- a/src/Umbraco.Web/UriUtility.cs
+++ b/src/Umbraco.Web/UriUtility.cs
@@ -223,7 +223,7 @@ public static string TrimPathEndSlash(string uri)
         #endregion
 
         /// <summary>
-        /// Returns an faull url with the host, port, etc...
+        /// Returns an full url with the host, port, etc...
         /// </summary>
         /// <param name="absolutePath">An absolute path (i.e. starts with a '/' )</param>
         /// <param name="httpContext"> </param>
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index 0a0453996717..1397ffc81840 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -177,7 +177,7 @@ public static string GetUrlWithCacheBust(this UrlHelper url, string actionName,
         public static string GetCacheBustHash()
         {
             //make a hash of umbraco and client dependency version
-            //in case the user bypasses the installer and just bumps the web.config or clientdep config
+            //in case the user bypasses the installer and just bumps the web.config or client dependency config
 
             //if in debug mode, always burst the cache
             if (GlobalSettings.DebugMode)
diff --git a/src/Umbraco.Web/UrlHelperRenderExtensions.cs b/src/Umbraco.Web/UrlHelperRenderExtensions.cs
index 490ad9a6a7d9..2835bc02dcc0 100644
--- a/src/Umbraco.Web/UrlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperRenderExtensions.cs
@@ -32,7 +32,7 @@ public static class UrlHelperRenderExtensions
         /// The crop alias e.g. thumbnail
         /// </param>
         /// <param name="htmlEncode">
-        /// Whether to HTML encode this URL - default is true - w3c standards require html attributes to be html encoded but this can be
+        /// Whether to HTML encode this URL - default is true - w3c standards require HTML attributes to be HTML encoded but this can be
         /// set to false if using the result of this method for CSS.
         /// </param>
         /// <returns></returns>
@@ -56,7 +56,7 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper, IPublishedContent
         /// The crop alias e.g. thumbnail
         /// </param>
         /// <param name="htmlEncode">
-        /// Whether to HTML encode this URL - default is true - w3c standards require html attributes to be html encoded but this can be
+        /// Whether to HTML encode this URL - default is true - w3c standards require HTML attributes to be HTML encoded but this can be
         /// set to false if using the result of this method for CSS.
         /// </param>
         /// <returns>
@@ -102,7 +102,7 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper, IPublishedContent
         /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters
         /// </param>
         /// <param name="cacheBuster">
-        /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated
+        /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated
         /// </param>
         /// <param name="furtherOptions">
         /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example:
@@ -120,7 +120,7 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper, IPublishedContent
         /// </param>
         /// <param name="urlHelper"></param>
         /// <param name="htmlEncode">
-        /// Whether to HTML encode this URL - default is true - w3c standards require html attributes to be html encoded but this can be
+        /// Whether to HTML encode this URL - default is true - w3c standards require HTML attributes to be HTML encoded but this can be
         /// set to false if using the result of this method for CSS.
         /// </param>
         /// <returns>
@@ -183,7 +183,7 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper,
         /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters
         /// </param>
         /// <param name="cacheBusterValue">
-        /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated
+        /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated
         /// </param>
         /// <param name="furtherOptions">
         /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example:
@@ -201,7 +201,7 @@ public static IHtmlString GetCropUrl(this UrlHelper urlHelper,
         /// </param>
         /// <param name="urlHelper"></param>
         /// <param name="htmlEncode">
-        /// Whether to HTML encode this URL - default is true - w3c standards require html attributes to be html encoded but this can be
+        /// Whether to HTML encode this URL - default is true - w3c standards require HTML attributes to be HTML encoded but this can be
         /// set to false if using the result of this method for CSS.
         /// </param>
         /// <returns>
diff --git a/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs b/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
index 99e08a4597e9..cfb7ddb6bcd4 100644
--- a/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
@@ -21,7 +21,7 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo
             }
             //NOTE: Until we upgraded to WebApi 2, this didn't work correctly and we had to revert to using
             // HttpContext.Current responses. I've changed this back to what it should be now since it works
-            // and now with WebApi2, the HttpContext.Current responses dont! Anyways, all good now.
+            // and now with WebApi2, the HttpContext.Current responses don't! Anyways, all good now.
             actionExecutedContext.Response.Headers.CacheControl = new CacheControlHeaderValue()
             {
                 NoCache = true,
diff --git a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
index 233ce39e5264..6e6ec35b1b8c 100644
--- a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
@@ -44,7 +44,7 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo
                         //cleanup any files associated
                         foreach (var f in contentItem.UploadedFiles)
                         {
-                            //track all temp folders so we can remove old files afterwords
+                            //track all temp folders so we can remove old files afterwards
                             var dir = Path.GetDirectoryName(f.TempFilePath);
                             if (tempFolders.Contains(dir) == false)
                             {
@@ -104,7 +104,7 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo
                             {
                                 if (f.TempFilePath.IsNullOrWhiteSpace() == false)
                                 {
-                                    //track all temp folders so we can remove old files afterwords
+                                    //track all temp folders so we can remove old files afterwards
                                     var dir = Path.GetDirectoryName(f.TempFilePath);
                                     if (tempFolders.Contains(dir) == false)
                                     {
diff --git a/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs b/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs
index d56411952d1e..522c3af8bbac 100644
--- a/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs
@@ -37,7 +37,7 @@ public override void OnAuthorization(HttpActionContext actionContext)
                 return;
             }
 
-            //if the controller is allowing overridable authorization at the action level and there are action level authorization attributes
+            //if the controller is allowing authorization to be overridden at the action level and there are action level authorization attributes
             // then exit and let the action level auth attribute(s) execute.
 
             if (actionContext.ActionDescriptor.ControllerDescriptor.GetCustomAttributes<EnableOverrideAuthorizationAttribute>().Any()
diff --git a/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
index bbb91efd64f3..37a8f8a4b495 100644
--- a/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
@@ -18,7 +18,7 @@ public sealed class UmbracoApplicationAuthorizeAttribute : OverridableAuthorizat
         private readonly string[] _appNames;
 
         /// <summary>
-        /// Constructor to set any number of applications that the user needs access to to be authorized
+        /// Constructor to set any number of applications that the user needs access to be authorized
         /// </summary>
         /// <param name="appName">
         /// If the user has access to any of the specified apps, they will be authorized.
diff --git a/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs b/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs
index 6390ead73e9a..c67ec2f6a7b3 100644
--- a/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs
+++ b/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs
@@ -74,7 +74,7 @@ public static MultipartFormDataStreamProvider ReadAsMultipart(this HttpActionCon
             // But it deadlocks. See https://stackoverflow.com/questions/15201255 for details, which
             // points to https://msdn.microsoft.com/en-us/magazine/jj991977.aspx which contains more
             // details under "Async All the Way" - see also https://olitee.com/2015/01/c-async-await-common-deadlock-scenario/
-            // which contains a simplified explaination: ReadAsMultipartAsync is meant to be awaited,
+            // which contains a simplified explanation: ReadAsMultipartAsync is meant to be awaited,
             // not used in the non-async .Result way, and there is nothing we can do about it.
             //
             // Alas, model binders cannot be async "all the way", so we have to wrap in a task, to
diff --git a/src/Umbraco.Web/WebApi/HttpRequestMessageExtensions.cs b/src/Umbraco.Web/WebApi/HttpRequestMessageExtensions.cs
index 5bd429b598b6..96c9c0e9a016 100644
--- a/src/Umbraco.Web/WebApi/HttpRequestMessageExtensions.cs
+++ b/src/Umbraco.Web/WebApi/HttpRequestMessageExtensions.cs
@@ -62,7 +62,7 @@ public static Attempt<HttpContextBase> TryGetHttpContext(this HttpRequestMessage
         }
 
         /// <summary>
-        /// Create a 403 (Forbidden) response indicating that hte current user doesn't have access to the resource
+        /// Create a 403 (Forbidden) response indicating that the current user doesn't have access to the resource
         /// requested or the action it needs to take.
         /// </summary>
         /// <param name="request"></param>
@@ -131,7 +131,7 @@ public static HttpResponseMessage CreateNotificationValidationErrorResponse(this
         }
 
         /// <summary>
-        /// Creates a succressful response with notifications in the result to be displayed in the UI
+        /// Creates a successful response with notifications in the result to be displayed in the UI
         /// </summary>
         /// <param name="request"></param>
         /// <param name="successMessage"></param>
diff --git a/src/Umbraco.Web/WebApi/SessionHttpControllerRouteHandler.cs b/src/Umbraco.Web/WebApi/SessionHttpControllerRouteHandler.cs
index 5dd641b25c9a..fac3a633a482 100644
--- a/src/Umbraco.Web/WebApi/SessionHttpControllerRouteHandler.cs
+++ b/src/Umbraco.Web/WebApi/SessionHttpControllerRouteHandler.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.WebApi
     /// </summary>
     /// <remarks>
     /// WebApi controllers (and REST in general) shouldn't have session state enabled since it's stateless,
-    /// enabling session state puts additional locks on requests so only use this when absolutley needed
+    /// enabling session state puts additional locks on requests so only use this when absolutely needed
     /// </remarks>
     internal class SessionHttpControllerRouteHandler : HttpControllerRouteHandler
     {
diff --git a/src/Umbraco.Web/_Legacy/Controls/TabPage.cs b/src/Umbraco.Web/_Legacy/Controls/TabPage.cs
index 4a5be34d7c50..5be5bf114747 100644
--- a/src/Umbraco.Web/_Legacy/Controls/TabPage.cs
+++ b/src/Umbraco.Web/_Legacy/Controls/TabPage.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Web._Legacy.Controls
 
     public class TabPage : WebControl
     {
-        // Ensure that a TabPage cannot be instatiated outside
+        // Ensure that a TabPage cannot be instantiated outside
         // this assembly -> New instances of a tabpage can only be retrieved through the tabview
         private bool _hasMenu = true;
         protected LiteralControl ErrorHeaderControl = new LiteralControl();
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
index f276afeca965..94e1b6e92342 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
@@ -23,7 +23,7 @@ public class PublishRootDocument : IPackageAction
         /// <example>
         /// <Action runat="install" alias="publishRootDocument" documentName="News"  />
         /// </example>
-        /// <returns>true if executed successfully</returns>
+        /// <returns>True if executed succesfully</returns>
         public bool Execute(string packageName, XElement xmlData)
         {
 
diff --git a/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs b/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
index cfa93dc0f6c1..5390d3d30aef 100644
--- a/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
+++ b/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
@@ -197,7 +197,7 @@ internal static string Create(HttpContextBase httpContext, IUser umbracoUser, st
             ITaskReturnUrl returnUrlTask = typeInstance as LegacyDialogTask;
             if (returnUrlTask != null)
             {
-                // if castable to LegacyDialogTask: add in additionalValues
+                // if it is possible to cast to LegacyDialogTask: add in additionalValues
                 ((LegacyDialogTask) returnUrlTask).AdditionalValues = additionalValues;
             }
             else
diff --git a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
index 56d596e24d67..1c2fdcb72ba0 100644
--- a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
@@ -60,7 +60,7 @@ protected override void OnPreInit(EventArgs e)
                 };
                 FireBeforeRequestInit(args);
 
-                //if we are cancelling then return and don't proceed
+                //if we are canceling then return and don't proceed
                 if (args.Cancel) return;
 
                 // reset the friendly path so it's used by forms, etc.
diff --git a/src/Umbraco.Web/umbraco.presentation/item.cs b/src/Umbraco.Web/umbraco.presentation/item.cs
index 74cfb9bf2571..bbbc67bb26fb 100644
--- a/src/Umbraco.Web/umbraco.presentation/item.cs
+++ b/src/Umbraco.Web/umbraco.presentation/item.cs
@@ -88,7 +88,7 @@ internal item(IPublishedContent publishedContent, IDictionary elements, IDiction
                 }
                 else
                 {
-                    //get the vaue the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent)
+                    //get the value the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent)
                     var elt = elements[_fieldName];
                     if (elt != null && string.IsNullOrEmpty(elt.ToString()) == false)
                         _fieldContent = elt.ToString().Trim();
@@ -108,7 +108,7 @@ internal item(IPublishedContent publishedContent, IDictionary elements, IDiction
                         }
                         else
                         {
-                            //get the vaue the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent)
+                            //get the value the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent)
                             var elt = elements[altFieldName];
                             if (elt != null && string.IsNullOrEmpty(elt.ToString()) == false)
                                 _fieldContent = elt.ToString().Trim();
@@ -135,7 +135,7 @@ static string FindAttribute(IDictionary attributes, string key)
         /// <returns></returns>
         private string GetRecursiveValueLegacy(IDictionary elements)
         {
-            using (Current.ProfilingLogger.DebugDuration<item>("Checking recusively"))
+            using (Current.ProfilingLogger.DebugDuration<item>("Checking recursively"))
             {
                 var content = "";
 
diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs
index 0c9b0c6ff370..3b879c5b0257 100644
--- a/src/Umbraco.Web/umbraco.presentation/page.cs
+++ b/src/Umbraco.Web/umbraco.presentation/page.cs
@@ -51,7 +51,7 @@ public class page
         /// <remarks>
         /// The difference between creating the page with PublishedContentRequest vs an IPublishedContent item is
         /// that the PublishedContentRequest takes into account how a template is assigned during the routing process whereas
-        /// with an IPublishedContent item, the template id is asssigned purely based on the default.
+        /// with an IPublishedContent item, the template id is assigned purely based on the default.
         /// </remarks>
         internal page(PublishedRequest frequest)
         {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
index 58d219e0c6b6..0997d2675e2c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
@@ -53,7 +53,7 @@ protected void Page_Load(object sender, EventArgs e)
                 }
                 else
                 {
-                                Current.Logger.Debug<FeedProxy>("Access to unallowed feedproxy attempted: {RequestUrl}", requestUri);
+                                Current.Logger.Debug<FeedProxy>("Access to unallowed feed proxy attempted: {RequestUrl}", requestUri);
                 }
             }
             catch (Exception ex)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs
index 584ad4ca7f19..b47f48804eaa 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs
@@ -6,7 +6,7 @@
 using System.Web.UI;
 using System.Web.UI.WebControls;
 
-//This is only in case an upgrade goes wrong and the the /masterpages/ files are not copied over
+//This is only in case an upgrade goes wrong and the /masterpages/ files are not copied over
 //which would result in an error. so we have kept the old namespaces intact with references to new ones
 using StackExchange.Profiling;
 using Umbraco.Core.Configuration;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs
index 1672053023db..f3552cdb4dc5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs
@@ -8,7 +8,7 @@
 namespace umbraco.presentation.templateControls
 {
     /// <summary>
-    /// This control disables request validation (equalevant of setting validateRequest to false in page directive)
+    /// This control disables request validation (equivalent of setting validateRequest to false in page directive)
     /// </summary>
     [ToolboxData("<{0}:DisableRequestValidation runat=\"server\"></{0}:Item>")]
     [Designer("umbraco.presentation.templateControls.ItemDesigner, Umbraco.Web")]
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs
index 8473341ca8cb..f6f2510818e5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs
@@ -145,7 +145,7 @@ internal Item(IPublishedContent contentItem)
 
         #endregion
 
-        #region Overriden Control Methods
+        #region Overridden Control Methods
 
         /// <summary>
         /// Raises the <see cref="E:System.Web.UI.Control.Init"/> event.
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
index 67e82b382230..0b91be5faf1f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
@@ -134,7 +134,7 @@ protected virtual string GetFieldContents(Item item)
         }
 
         /// <summary>
-        /// Inits the specified item. To be called from the OnInit method of Item.
+        /// Initializes the specified item. To be called from the OnInit method of Item.
         /// </summary>
         /// <param name="item">The item.</param>
         public virtual void Init(Item item)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs
index 0d54ce2a02c3..a6aa51752ea4 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs
@@ -159,7 +159,7 @@ protected override void CreateChildControls() {
                     if (int.TryParse(Attributes["Cache"], out cacheDuration))
                         tempMacro.CacheDuration = cacheDuration;
                     else
-                        Context.Trace.Warn("Template", "Cache attribute is in incorect format (should be an integer).");
+                        Context.Trace.Warn("Template", "Cache attribute is in incorrect format (should be an integer).");
                 }
 
                 var renderer = new MacroRenderer(Current.ProfilingLogger);

From 8d2c1332d3ba41f47c036ef8948afce9a0b43225 Mon Sep 17 00:00:00 2001
From: Chris Houston <chouston@vizioz.com>
Date: Sat, 26 Jan 2019 10:56:30 -0500
Subject: [PATCH 071/421] Fixed a few typos I spotted in the last commit :)
 (#4215)

---
 src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs b/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs
index 7b292307cce3..6c266ced2aae 100644
--- a/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs
+++ b/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs
@@ -5,11 +5,11 @@
 namespace Umbraco.Core.Deploy
 {
     /// <summary>
-    /// Defines methods that can convert a data type configurations to / from an environment-agnostic string.
+    /// Defines methods that can convert data type configuration to / from an environment-agnostic string.
     /// </summary>
-    /// <remarks>Configurations may contain values such as content identifiers, that would be local
+    /// <remarks>Configuration may contain values such as content identifiers, that would be local
     /// to one environment, and need to be converted in order to be deployed.</remarks>
-    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "This is actual only used by Deploy, but we dont want third parties to have references on deploy, thats why this interface is part of core.")]
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "This is actual only used by Deploy, but we don't want third parties to have references on deploy, that's why this interface is part of core.")]
     public interface IDataTypeConfigurationConnector
     {
         /// <summary>

From 32f228fa7c7e8b062b35db1c7f5dfd41c69e03f5 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 24 Jan 2019 11:48:39 +0100
Subject: [PATCH 072/421] Use the media file name as display name in the file
 link

---
 .../components/media/umbmedianodeinfo.directive.js       | 9 ++++++++-
 .../src/views/components/media/umb-media-node-info.html  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
index ce816261d01a..577ffe0176ef 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
@@ -40,6 +40,13 @@
 
             function setMediaLink(){
                 scope.nodeUrl = scope.node.mediaLink;
+                // grab the file name from the URL and use it as the display name in the file link
+                var match = /.*\/(.*)/.exec(scope.nodeUrl);
+                if (match) {
+                    scope.nodeFileName = match[1];
+                } else {
+                    scope.nodeFileName = scope.nodeUrl;
+                }
             }
 
             scope.openMediaType = function (mediaType) {
@@ -92,4 +99,4 @@
 
     angular.module('umbraco.directives').directive('umbMediaNodeInfo', MediaNodeInfoDirective);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index 4004c2b95816..f411437b1dd2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -14,7 +14,7 @@
                     <li>
                         <a href="{{nodeUrl}}" target="_blank">
                             <i class="icon icon-out"></i>
-                            <span>{{nodeUrl}}</span>
+                            <span>{{nodeFileName}}</span>
                         </a>
                     </li>
                 </ul>

From 52a56c8852f0053fe293f5107902158302d30f30 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Thu, 24 Jan 2019 00:24:37 +0100
Subject: [PATCH 073/421] Only add TLS 1.2 if explicit protocols are defined

---
 src/Umbraco.Web/WebBootManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index faf1418b42f5..950676355ebe 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -131,9 +131,9 @@ public override IBootManager Initialize()
             InstallHelper insHelper = new InstallHelper(UmbracoContext.Current);
             insHelper.DeleteLegacyInstaller();
 
-            // Tell .net 4.5 that we also want to try connecting over TLS 1.2, not just 1.1
-            if (ServicePointManager.SecurityProtocol.HasFlag(SecurityProtocolType.Tls12) == false)
-                ServicePointManager.SecurityProtocol = ServicePointManager.SecurityProtocol | SecurityProtocolType.Tls12;
+            // Tell .NET 4.5 that we also want to try connecting over TLS 1.2, not just TLS 1.1 (but only if specific protocols are defined)
+            if (ServicePointManager.SecurityProtocol != 0)
+                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
 
             return this;
         }

From a2f0ad67ab904b52ea06ba14b5016bb96d39bb60 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 24 Jan 2019 22:52:45 +0100
Subject: [PATCH 074/421] Fix the flickering tooltip

---
 .../src/less/components/tooltip/umb-tooltip.less                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less b/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less
index 6528c2120e28..77eba94b6de5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less
@@ -10,4 +10,5 @@
    animation-timing-function: ease-in;
    animation: fadeIn;
    margin-top: 15px;
+   pointer-events: none;
 }

From 0194ccdad78a23fbca989f632128c0e5c977a33e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 24 Jan 2019 11:58:08 +0100
Subject: [PATCH 075/421] corrected on-edit method for MultiUrlPicker, Fixes
 #4171

---
 .../views/propertyeditors/multiurlpicker/multiurlpicker.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
index ca79c7faa06e..0d1c736438ee 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
@@ -13,7 +13,7 @@
                               allow-remove="true"
                               allow-edit="true"
                               on-remove="remove($index)"
-                              on-edit="openContentEditor(link, $index)">
+                              on-edit="openLinkPicker(link, $index)">
             </umb-node-preview>
         </div>
 

From a4c5b7118df15b0017bdc288d0f9e68ecaff1d0a Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Sat, 26 Jan 2019 20:50:19 +1000
Subject: [PATCH 076/421] check for editorstate.current before attempting to
 access properties object

---
 .../src/views/propertyeditors/rte/rte.controller.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 212db4fc319e..2b81521ca984 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -278,7 +278,7 @@ angular.module("umbraco")
                         $scope.linkPickerOverlay = {
                             view: "linkpicker",
                             currentTarget: currentTarget,
-							anchors: tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)),
+							              anchors: editorState.current ? tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)) : [],
                             show: true,
                             submit: function(model) {
                                 tinyMceService.insertLinkInEditor(editor, model.target, anchorElement);

From 35a6d721eeb40d0c250532525e6793ff312db381 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 26 Jan 2019 13:03:21 +0100
Subject: [PATCH 077/421] Make sure to inform the content editor of an app
 change when split view is opened

---
 .../components/content/umbvariantcontenteditors.directive.js  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index 99d6b939e087..af0792502124 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -232,6 +232,10 @@
                     var app = editor.content.apps[i];
                     if (app.alias === "umbContent") {
                         app.active = true;
+                        // tell the world that the app has changed (but do it only once)
+                        if (e === 0) {
+                            selectApp(app);
+                        }
                     }
                     else {
                         app.active = false;

From 9f2477ad75b1a637ae5752650c8044031eccd36a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 24 Jan 2019 23:14:55 +0100
Subject: [PATCH 078/421] Remove the hover underline from grid items

---
 .../src/less/components/umb-content-grid.less                   | 2 +-
 .../src/views/components/umb-content-grid.html                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 63a0856c8400..399a367dc5bc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -53,7 +53,7 @@
    display: inline-flex;
 }
 
-.umb-content-grid__item-name:hover {
+.umb-content-grid__item-name:hover span {
     text-decoration: underline;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
index 760597fcab9c..490c94a79d89 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
@@ -12,7 +12,7 @@
 
         <div class="umb-content-grid__item-name" ng-click="clickItemName(item, $event, $index)" ng-class="{'-light': !item.published && item.updater != null}">
             <i class="umb-content-grid__icon {{ item.icon }}"></i>
-            {{ item.name }}
+            <span>{{ item.name }}</span>
         </div>
 
         <ul class="umb-content-grid__details-list" ng-class="{'-light': !item.published && item.updater != null}">

From 54bb3384b232df89e91bfba61603699935890f7b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 24 Jan 2019 13:19:41 +0100
Subject: [PATCH 079/421] Add "time" and "bigint" to value types

---
 .../src/views/prevalueeditors/valuetype.html                    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/valuetype.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/valuetype.html
index 4146ba076337..739ef1122658 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/valuetype.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/valuetype.html
@@ -2,6 +2,8 @@
     <option value="STRING">String</option>
     <option value="DECIMAL">Decimal</option>
     <option value="DATETIME">Date/time</option>
+    <option value="TIME">Time</option>
     <option value="INT">Integer</option>
+    <option value="BIGINT">Big integer</option>
     <option value="TEXT">Long string</option>
 </select>

From 57fb9888a2c6d13358699dd854d73832d3c1ebe8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 23 Jan 2019 22:56:00 +0100
Subject: [PATCH 080/421] Add localization to Flatpickr

---
 .../gulp/tasks/dependencies.js                |  3 ++-
 .../components/umbflatpickr.directive.js      | 27 ++++++++++++-------
 .../resources/javascriptlibrary.resource.js   | 12 ++++-----
 .../src/common/services/assets.service.js     | 25 ++++++++++-------
 .../Editors/BackOfficeAssetsController.cs     | 19 ++++++++++---
 .../Editors/BackOfficeServerVariables.cs      |  2 +-
 src/Umbraco.Web/UI/JavaScript/JsInitialize.js |  1 +
 7 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
index e9ada635e57d..819c804a4fcd 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
@@ -141,7 +141,8 @@ gulp.task('dependencies', function () {
             "name": "flatpickr",
             "src":  [
                 "./node_modules/flatpickr/dist/flatpickr.js",
-                "./node_modules/flatpickr/dist/flatpickr.css"
+                "./node_modules/flatpickr/dist/flatpickr.css",
+                "./node_modules/flatpickr/dist/l10n/*.js"
             ],
             "base": "./node_modules/flatpickr/dist"
         },
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbflatpickr.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbflatpickr.directive.js
index 1f396ab6c264..79b29b407b81 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbflatpickr.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbflatpickr.directive.js
@@ -92,20 +92,25 @@ Use this directive to render a date time picker
 		}
     };
     
-	function umbFlatpickrCtrl($element, $timeout, $scope, assetsService) {
+	function umbFlatpickrCtrl($element, $timeout, $scope, assetsService, userService) {
         var ctrl = this;
         var loaded = false;
+        var userLocale = null;
 
 		ctrl.$onInit = function() {
 
             // load css file for the date picker
-            assetsService.loadCss('lib/flatpickr/flatpickr.css', $scope);
-
-            // load the js file for the date picker
-            assetsService.loadJs('lib/flatpickr/flatpickr.js', $scope).then(function () {
-                // init date picker
-                loaded = true;
-                grabElementAndRunFlatpickr();
+            assetsService.loadCss('lib/flatpickr/flatpickr.css', $scope).then(function () {
+                userService.getCurrentUser().then(function (user) {
+                    // init date picker
+                    userLocale = user.locale;
+                    if (userLocale.indexOf('-') > -1) {
+                        userLocale = userLocale.split('-')[0];
+                    }
+                    loaded = true;
+                    grabElementAndRunFlatpickr();
+
+                });
             });
 
 		};
@@ -128,6 +133,10 @@ Use this directive to render a date time picker
 
 			setUpCallbacks();
 
+            if (!ctrl.options.locale) {
+                ctrl.options.locale = userLocale;
+            }
+
             var fpInstance = new fpLib(element, ctrl.options);
             
 			if (ctrl.onSetup) {
@@ -228,4 +237,4 @@ Use this directive to render a date time picker
     
     angular.module('umbraco.directives').component('umbFlatpickr', umbFlatpickr);
     
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/javascriptlibrary.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/javascriptlibrary.resource.js
index fbd54433d714..15460a335676 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/javascriptlibrary.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/javascriptlibrary.resource.js
@@ -8,17 +8,17 @@
       **/
     function javascriptLibraryResource($q, $http, umbRequestHelper) {
 
-        var existingLocales = [];
+        var existingLocales = null;
 
-        function getSupportedLocalesForMoment() {
+        function getSupportedLocales() {
             var deferred = $q.defer();
 
-            if (existingLocales.length === 0) {
+            if (existingLocales === null) {
                 umbRequestHelper.resourcePromise(
                     $http.get(
                         umbRequestHelper.getApiUrl(
                             "backOfficeAssetsApiBaseUrl",
-                            "GetSupportedMomentLocales")),
+                            "GetSupportedLocales")),
                     "Failed to get cultures").then(function(locales) {
                     existingLocales = locales;
                     deferred.resolve(existingLocales);
@@ -29,9 +29,9 @@
 
             return deferred.promise;
         }
-
+        
         var service = {
-            getSupportedLocalesForMoment: getSupportedLocalesForMoment
+            getSupportedLocales: getSupportedLocales
         };
 
         return service;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
index 27e055a7d3ee..81e439a9bbaa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
@@ -66,20 +66,26 @@ angular.module('umbraco.services')
         }
 
         function getMomentLocales(locales, supportedLocales) {
+            return getLocales(locales, supportedLocales, 'lib/moment/');
+        }
 
+        function getFlatpickrLocales(locales, supportedLocales) {
+            return getLocales(locales, supportedLocales, 'lib/flatpickr/l10n/');
+        }
+        
+        function getLocales(locales, supportedLocales, path) {
             var localeUrls = [];
             var locales = locales.split(',');
             for (var i = 0; i < locales.length; i++) {
                 var locale = locales[i].toString().toLowerCase();
                 if (locale !== 'en-us') {
-
                     if (supportedLocales.indexOf(locale + '.js') > -1) {
-                        localeUrls.push('lib/moment/' + locale + '.js');
+                        localeUrls.push(path + locale + '.js');
                     }
                     if (locale.indexOf('-') > -1) {
                         var majorLocale = locale.split('-')[0] + '.js';
                         if (supportedLocales.indexOf(majorLocale) > -1) {
-                            localeUrls.push('lib/moment/' + majorLocale);
+                            localeUrls.push(path + majorLocale);
                         }
                     }
                 }
@@ -89,12 +95,13 @@ angular.module('umbraco.services')
         }
 
         /**
-         * Loads specific Moment.js Locales.
+         * Loads specific Moment.js and Flatpickr Locales.
          * @param {any} locales
          * @param {any} supportedLocales
          */
         function loadLocales(locales, supportedLocales) {
-            var localeUrls = getMomentLocales(locales, supportedLocales);
+            var localeUrls = getMomentLocales(locales, supportedLocales.moment);
+            localeUrls = localeUrls.concat(getFlatpickrLocales(locales, supportedLocales.flatpickr));
             if (localeUrls.length >= 1) {
                 return service.load(localeUrls, $rootScope);
             }
@@ -104,12 +111,12 @@ angular.module('umbraco.services')
         }
 
         /**
-         * Loads in moment.js requirements during the _loadInitAssets call
+         * Loads in locale requirements during the _loadInitAssets call
          */
-        function loadMomentLocaleForCurrentUser() {
+        function loadLocaleForCurrentUser() {
 
             userService.getCurrentUser().then(function (currentUser) {
-                return javascriptLibraryResource.getSupportedLocalesForMoment().then(function (supportedLocales) {
+                return javascriptLibraryResource.getSupportedLocales().then(function (supportedLocales) {
                     return loadLocales(currentUser.locale, supportedLocales);
                 });
             });
@@ -141,7 +148,7 @@ angular.module('umbraco.services')
                     var self = this;
                     return self.loadJs(umbRequestHelper.getApiUrl("serverVarsJs", "", ""), $rootScope).then(function () {
                         initAssetsLoaded = true;
-                        return loadMomentLocaleForCurrentUser();
+                        return loadLocaleForCurrentUser();
                     });
                 }
                 else {
diff --git a/src/Umbraco.Web/Editors/BackOfficeAssetsController.cs b/src/Umbraco.Web/Editors/BackOfficeAssetsController.cs
index cb23e88c9b98..71aeb73d15b6 100644
--- a/src/Umbraco.Web/Editors/BackOfficeAssetsController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeAssetsController.cs
@@ -11,16 +11,27 @@ namespace Umbraco.Web.Editors
     public class BackOfficeAssetsController : UmbracoAuthorizedJsonController
     {
         private readonly IFileSystem _jsLibFileSystem = new PhysicalFileSystem(SystemDirectories.Umbraco + IOHelper.DirSepChar + "lib");
-
+        
         [HttpGet]
-        public IEnumerable<string> GetSupportedMomentLocales()
+        public object GetSupportedLocales()
         {
             const string momentLocaleFolder = "moment";
-            var cultures = _jsLibFileSystem.GetFiles(momentLocaleFolder, "*.js").ToList();
+            const string flatpickrLocaleFolder = "flatpickr/l10n";
+
+            return new
+            {
+                moment = GetLocales(momentLocaleFolder),
+                flatpickr = GetLocales(flatpickrLocaleFolder)
+            };
+        }
+
+        private IEnumerable<string> GetLocales(string path)
+        {
+            var cultures = _jsLibFileSystem.GetFiles(path, "*.js").ToList();
             for (var i = 0; i < cultures.Count; i++)
             {
                 cultures[i] = cultures[i]
-                    .Substring(cultures[i].IndexOf(momentLocaleFolder, StringComparison.Ordinal) + momentLocaleFolder.Length + 1);
+                    .Substring(cultures[i].IndexOf(path, StringComparison.Ordinal) + path.Length + 1);
             }
             return cultures;
         }
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 1d4113bb7dcf..66289a3c7c40 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -302,7 +302,7 @@ internal Dictionary<string, object> GetServerVariables()
                         },
                         {
                             "backOfficeAssetsApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<BackOfficeAssetsController>(
-                                controller => controller.GetSupportedMomentLocales())
+                                controller => controller.GetSupportedLocales())
                         },
                         {
                             "languageApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<LanguageController>(
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
index 62d294ee6fce..1ef6e74dfefa 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -7,6 +7,7 @@
     'lib/underscore/underscore-min.js',
 
     'lib/moment/moment.min.js',
+    'lib/flatpickr/flatpickr.js',
 
     'lib/animejs/anime.min.js',
 

From b709ed4aa3d1b1aec21df204438f56b79bd7e6f3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 23 Jan 2019 12:13:55 +0100
Subject: [PATCH 081/421] Don't attempt to resolve URLs for element types

---
 src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs | 5 +++++
 src/Umbraco.Web/Routing/UrlProvider.cs               | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs
index dd235bda7578..f09638330b82 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs
@@ -35,6 +35,11 @@ public ContentUrlResolver(
 
         public UrlInfo[] Resolve(IContent source, ContentItemDisplay destination, UrlInfo[] destMember, ResolutionContext context)
         {
+            if (source.ContentType.IsElement)
+            {
+                return new UrlInfo[0];
+            }
+
             var umbracoContext = _umbracoContextAccessor.UmbracoContext;
 
             var urls = umbracoContext == null
diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs
index 7ed530093c30..4dd4820d265b 100644
--- a/src/Umbraco.Web/Routing/UrlProvider.cs
+++ b/src/Umbraco.Web/Routing/UrlProvider.cs
@@ -185,7 +185,7 @@ public string GetUrl(int id, UrlProviderMode mode, string culture = null, Uri cu
         /// </remarks>
         public string GetUrl(IPublishedContent content, UrlProviderMode mode, string culture = null, Uri current = null)
         {
-            if (content == null)
+            if (content == null || content.ItemType == PublishedItemType.Element)
                 return "#";
 
             // this the ONLY place where we deal with default culture - IUrlProvider always receive a culture

From 19554095821038ffd45650d61042cfef25356894 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 23 Jan 2019 07:45:39 +0100
Subject: [PATCH 082/421] Don't allow creation of element types in the content
 tree

---
 src/Umbraco.Web/Editors/ContentTypeController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index b59e17d9e1d3..d5a72a737871 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -413,7 +413,7 @@ public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
                 types = Services.ContentTypeService.GetAll(ids).ToList();
             }
 
-            var basics = types.Select(Mapper.Map<IContentType, ContentTypeBasic>).ToList();
+            var basics = types.Where(type => type.IsElement == false).Select(Mapper.Map<IContentType, ContentTypeBasic>).ToList();
 
             var localizedTextService = Services.TextService;
             foreach (var basic in basics)

From ae25e4564ea320faa37ccabc0f7835447540a363 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 27 Jan 2019 10:26:20 +0100
Subject: [PATCH 083/421] Fix the tests

---
 .../Web/HealthChecks/HealthCheckResultsTests.cs           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests/Web/HealthChecks/HealthCheckResultsTests.cs b/src/Umbraco.Tests/Web/HealthChecks/HealthCheckResultsTests.cs
index 9247cb92a0a1..39a9ca621169 100644
--- a/src/Umbraco.Tests/Web/HealthChecks/HealthCheckResultsTests.cs
+++ b/src/Umbraco.Tests/Web/HealthChecks/HealthCheckResultsTests.cs
@@ -84,8 +84,8 @@ public void HealthCheckResults_WithSuccessfulChecks_ReturnsCorrectResultDescript
             Assert.IsTrue(results.AllChecksSuccessful);
 
             var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed succesfully.") > -1);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' all completed succesfully.") > -1);
+            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
+            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' all completed successfully.") > -1);
         }
 
         [Test]
@@ -101,7 +101,7 @@ public void HealthCheckResults_WithFailingChecks_ReturnsCorrectResultDescription
             Assert.IsFalse(results.AllChecksSuccessful);
 
             var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed succesfully.") > -1);
+            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
             Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' completed with errors.") > -1);
         }
 
@@ -119,7 +119,7 @@ public void HealthCheckResults_WithErroringCheck_ReturnsCorrectResultDescription
             Assert.IsFalse(results.AllChecksSuccessful);
 
             var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed succesfully.") > -1);
+            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
             Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' completed with errors.") > -1);
             Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 3' completed with errors.") > -1);
         }

From df20feb70395a31addc6bb3e31493d2cf29e427b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 8 Jan 2019 10:31:44 +0100
Subject: [PATCH 084/421] Make cache properties on PublishedContentRequest
 public

---
 src/Umbraco.Web/Routing/PublishedContentRequest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Routing/PublishedContentRequest.cs b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
index 3598d5ff8def..ef55b5176702 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
@@ -613,13 +613,13 @@ public void SetResponseStatus(int code, string description = null)
         // Note: we used to set a default value here but that would then be the default
         // for ALL requests, we shouldn't overwrite it though if people are using [OutputCache] for example
         // see: https://our.umbraco.com/forum/using-umbraco-and-getting-started/79715-output-cache-in-umbraco-752
-        internal HttpCacheability Cacheability { get; set; }
+        public HttpCacheability Cacheability { get; set; }
 
         /// <summary>
         /// Gets or sets a list of Extensions to append to the Response.Cache object
         /// </summary>
         private List<string> _cacheExtensions = new List<string>();
-        internal List<string> CacheExtensions
+        public List<string> CacheExtensions
         {
             get { return _cacheExtensions; }
             set { _cacheExtensions = value; }
@@ -629,7 +629,7 @@ internal List<string> CacheExtensions
         /// Gets or sets a dictionary of Headers to append to the Response object
         /// </summary>
         private Dictionary<string, string> _headers = new Dictionary<string, string>();
-        internal Dictionary<string, string> Headers
+        public Dictionary<string, string> Headers
         {
             get { return _headers; }
             set { _headers = value; }
@@ -640,4 +640,4 @@ internal Dictionary<string, string> Headers
         /// </summary>
         public bool IgnorePublishedContentCollisions { get; set; }
     }
-}
\ No newline at end of file
+}

From d31e25281d4d5f3ec0e8ba859096c9d3aa13f016 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 26 Jan 2019 19:01:30 +0100
Subject: [PATCH 085/421] Fix infinite loop when saving multiple variants using
 list view

---
 .../common/directives/components/content/edit.controller.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 60d44abfa561..79701414f7d3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -305,8 +305,8 @@
                 var fieldControl = item.control;
                 var fieldErrorKeys = item.errorKeys;
 
-                for (var i = 0; i < fieldErrorKeys.length; i++) {
-                    fieldControl.$setValidity(fieldErrorKeys[i], false);
+                for (var j = 0; j < fieldErrorKeys.length; j++) {
+                    fieldControl.$setValidity(fieldErrorKeys[j], false);
                 }
             }
         }

From 193e24afd256b2994a0900c0e9739f3f3466c036 Mon Sep 17 00:00:00 2001
From: Chris Houston <chouston@vizioz.com>
Date: Sun, 27 Jan 2019 01:17:32 -0500
Subject: [PATCH 086/421] Fixing all the TODO, FIXME & HACK comments so they
 all follow the same layout.

---
 build/NuSpecs/UmbracoCms.nuspec               |  2 +-
 build/build.ps1                               |  4 +--
 src/Umbraco.Core/Cache/CacheKeys.cs           |  2 +-
 src/Umbraco.Core/Cache/HttpRequestAppCache.cs |  2 +-
 .../Components/RelateOnCopyComponent.cs       |  2 +-
 src/Umbraco.Core/Composing/TypeFinder.cs      |  2 +-
 src/Umbraco.Core/Composing/TypeHelper.cs      |  2 +-
 .../Configuration/Grid/GridEditorsConfig.cs   |  2 +-
 .../UmbracoSettings/TourConfigElement.cs      |  4 +--
 .../Configuration/UmbracoVersion.cs           |  4 +--
 src/Umbraco.Core/Constants-Applications.cs    |  2 +-
 src/Umbraco.Core/EmailSender.cs               |  2 +-
 .../Events/ImportPackageEventArgs.cs          |  2 +-
 src/Umbraco.Core/IO/FileSystemExtensions.cs   |  2 +-
 src/Umbraco.Core/IO/IOHelper.cs               |  3 +-
 src/Umbraco.Core/IO/PhysicalFileSystem.cs     |  2 +-
 src/Umbraco.Core/Media/Result.cs              |  2 +-
 .../Migrations/Install/DatabaseDataCreator.cs |  2 +-
 .../Models/ContentScheduleCollection.cs       |  6 ++--
 .../Models/ContentTypeBaseExtensions.cs       |  2 +-
 src/Umbraco.Core/Models/GridValue.cs          |  2 +-
 src/Umbraco.Core/Models/Member.cs             | 12 ++++----
 src/Umbraco.Core/Models/MemberType.cs         |  2 +-
 .../Membership/UmbracoMembershipMember.cs     |  2 +-
 src/Umbraco.Core/Models/Membership/User.cs    |  2 +-
 .../Models/Packaging/PreInstallWarnings.cs    |  2 +-
 src/Umbraco.Core/Models/Property.cs           |  4 +--
 .../Models/PropertyGroupCollection.cs         |  2 +-
 .../Models/PropertyTypeCollection.cs          |  4 +--
 src/Umbraco.Core/Models/UserExtensions.cs     |  2 +-
 src/Umbraco.Core/ObjectExtensions.cs          |  4 +--
 .../Packaging/PackageDataInstallation.cs      |  4 +--
 .../Packaging/PackageFileInstallation.cs      |  2 +-
 .../Packaging/PackagesRepository.cs           |  2 +-
 src/Umbraco.Core/Persistence/Dtos/LogDto.cs   |  4 +--
 .../Persistence/Dtos/MemberTypeReadOnlyDto.cs |  4 +--
 .../Persistence/EntityNotFoundException.cs    |  2 +-
 .../Querying/ExpressionVisitorBase.cs         |  4 +--
 .../Querying/ModelToSqlExpressionVisitor.cs   |  2 +-
 .../Implement/ContentTypeRepositoryBase.cs    | 14 +++++-----
 .../Implement/DataTypeRepository.cs           |  4 +--
 .../Implement/DomainRepository.cs             |  2 +-
 .../Implement/MemberRepository.cs             |  2 +-
 .../Implement/RepositoryBaseOfTIdTEntity.cs   |  2 +-
 .../Repositories/Implement/TagRepository.cs   |  3 +-
 .../Implement/TemplateRepository.cs           | 20 ++++++-------
 .../Implement/UserGroupRepository.cs          |  4 +--
 .../Repositories/Implement/UserRepository.cs  |  8 +++---
 .../SqlSyntax/SqlSyntaxProviderBase.cs        |  2 +-
 .../Validators/DelimitedValueValidator.cs     |  2 +-
 .../ValueConverters/JsonValueConverter.cs     |  2 +-
 .../Runtime/CoreRuntimeComposer.cs            |  2 +-
 src/Umbraco.Core/Scoping/ScopeContext.cs      |  2 +-
 .../Security/BackOfficeUserStore.cs           |  8 +++---
 .../Security/MembershipProviderExtensions.cs  |  2 +-
 ...erAwareMembershipProviderPasswordHasher.cs |  4 +--
 .../Services/Implement/AuditService.cs        |  4 +--
 .../Services/Implement/ContentService.cs      |  9 +++---
 ...peServiceBaseOfTRepositoryTItemTService.cs | 10 +++----
 .../Services/Implement/DataTypeService.cs     |  6 ++--
 .../Services/Implement/FileService.cs         |  2 +-
 .../Implement/LocalizedTextService.cs         |  6 ++--
 .../LocalizedTextServiceFileSources.cs        |  8 +++---
 .../Services/Implement/MediaService.cs        |  5 ++--
 .../Services/Implement/MemberService.cs       | 10 +++----
 .../Services/Implement/NotificationService.cs |  2 +-
 .../Services/Implement/UserService.cs         |  4 +--
 .../Services/OperationResultType.cs           |  2 +-
 .../Strings/IUrlSegmentProvider.cs            |  2 +-
 src/Umbraco.Core/Sync/IServerAddress.cs       |  2 +-
 src/Umbraco.Core/TypeExtensions.cs            |  2 +-
 src/Umbraco.Core/UdiEntityType.cs             |  2 +-
 .../Xml/UmbracoXPathPathSyntaxParser.cs       |  4 +--
 .../Xml/XPath/INavigableContent.cs            |  2 +-
 src/Umbraco.Examine/ContentValueSetBuilder.cs |  2 +-
 src/Umbraco.Examine/ExamineExtensions.cs      |  2 +-
 .../BulkInsertBenchmarks.cs                   |  2 +-
 .../Cache/DistributedCacheBinderTests.cs      |  2 +-
 .../Clr/ReflectionUtilitiesTests.cs           |  4 +--
 .../Components/ComponentTests.cs              |  4 +--
 .../Composing/ContainerConformingTests.cs     |  5 ++--
 src/Umbraco.Tests/CoreThings/UdiTests.cs      |  2 +-
 .../FrontEnd/UmbracoHelperTests.cs            |  2 +-
 src/Umbraco.Tests/IO/FileSystemsTests.cs      |  2 +-
 src/Umbraco.Tests/Logging/LogviewerTests.cs   |  2 +-
 .../Manifest/ManifestParserTests.cs           |  6 ++--
 .../Membership/MembershipProviderBaseTests.cs |  3 +-
 src/Umbraco.Tests/Misc/UriUtilityTests.cs     |  2 +-
 src/Umbraco.Tests/Models/LightEntityTest.cs   |  2 +-
 .../Mapping/ContentTypeModelMappingTests.cs   | 22 +++++++--------
 .../Models/Mapping/UserModelMapperTests.cs    |  2 +-
 .../CreatedPackagesRepositoryTests.cs         |  4 +--
 .../Packaging/PackageInstallationTest.cs      |  2 +-
 .../Persistence/DatabaseContextTests.cs       |  2 +-
 .../NPocoTests/NPocoBulkInsertTests.cs        |  2 +-
 .../Persistence/NPocoTests/NPocoFetchTests.cs |  2 +-
 .../NPocoTests/PetaPocoCachesTest.cs          |  2 +-
 .../Repositories/ContentTypeRepositoryTest.cs |  2 +-
 .../PublicAccessRepositoryTest.cs             |  2 +-
 .../RedirectUrlRepositoryTests.cs             |  4 +--
 .../Repositories/TagRepositoryTest.cs         |  2 +-
 .../Repositories/UserRepositoryTest.cs        |  3 +-
 .../PublishedContentLanguageVariantTests.cs   |  2 +-
 .../PublishedContentTestBase.cs               |  2 +-
 .../Publishing/PublishingStrategyTests.cs     |  2 +-
 .../Routing/ContentFinderByAliasTests.cs      |  2 +-
 .../ContentFinderByPageIdQueryTests.cs        |  6 ++--
 .../Routing/ContentFinderByUrlTests.cs        |  2 +-
 .../Routing/GetContentUrlsTests.cs            | 10 +++----
 .../Routing/RenderRouteHandlerTests.cs        |  4 +--
 src/Umbraco.Tests/Routing/RoutesCacheTests.cs |  2 +-
 .../Routing/UmbracoModuleTests.cs             |  4 +--
 .../Runtimes/CoreRuntimeTests.cs              |  2 +-
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |  8 +++---
 .../PassThroughEventDispatcherTests.cs        |  2 +-
 .../Scoping/ScopedNuCacheTests.cs             |  2 +-
 .../Scoping/ScopedRepositoryTests.cs          |  2 +-
 src/Umbraco.Tests/Scoping/ScopedXmlTests.cs   |  2 +-
 .../Security/BackOfficeCookieManagerTests.cs  |  2 +-
 .../Services/ContentServiceTagsTests.cs       | 10 +++----
 .../Services/ContentServiceTests.cs           | 18 ++++++------
 .../Services/MemberServiceTests.cs            |  2 +-
 .../Services/PerformanceTests.cs              |  2 +-
 .../Services/SectionServiceTests.cs           |  2 +-
 .../Strings/DefaultShortStringHelperTests.cs  | 10 +++----
 .../TestControllerActivatorBase.cs            |  2 +-
 .../ControllerTesting/TestStartup.cs          |  2 +-
 .../TestHelpers/SettingsForTests.cs           |  2 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  2 +-
 .../TestHelpers/TestObjects-Mocks.cs          |  6 ++--
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |  6 ++--
 .../TestHelpers/TestWithDatabaseBase.cs       | 12 ++++----
 .../Testing/UmbracoTestAttribute.cs           |  3 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  4 +--
 .../ExamineDemoDataContentService.cs          |  2 +-
 .../ExamineDemoDataMediaService.cs            |  2 +-
 .../Web/Controllers/ContentControllerTests.cs |  2 +-
 .../Web/TemplateUtilitiesTests.cs             |  4 +--
 .../lib/bootstrap/less/forms.less             |  2 +-
 .../lib/umbraco/LegacySpeechBubble.js         |  2 +-
 .../application/umblogin.directive.js         |  6 ++--
 .../components/buttons/umbbutton.directive.js |  2 +-
 .../umbvariantcontenteditors.directive.js     |  6 ++--
 .../editor/umbeditorcontainer.directive.js    |  2 +-
 .../components/grid/grid.rte.directive.js     |  6 ++--
 .../imaging/umbimagegravity.directive.js      |  2 +-
 .../overlays/umboverlaybackdrop.directive.js  |  2 +-
 .../components/tree/umbtree.directive.js      |  6 ++--
 .../components/tree/umbtreeitem.directive.js  |  2 +-
 .../components/umbgroupsbuilder.directive.js  |  4 +--
 .../upload/umbpropertyfileupload.directive.js |  2 +-
 .../users/changepassword.directive.js         |  2 +-
 .../validation/valpropertymsg.directive.js    |  4 +--
 .../validation/valsubview.directive.js        |  2 +-
 .../common/mocks/resources/dashboard.mocks.js |  2 +-
 .../src/common/resources/auth.resource.js     |  2 +-
 .../src/common/services/appstate.service.js   |  2 +-
 .../services/contenteditinghelper.service.js  |  4 +--
 .../src/common/services/formhelper.service.js |  2 +-
 .../src/common/services/iconhelper.service.js |  2 +-
 .../common/services/localization.service.js   |  2 +-
 .../common/services/mediahelper.service.js    |  2 +-
 .../services/mediatypehelper.service.js       |  2 +-
 .../src/common/services/search.service.js     |  2 +-
 .../src/common/services/tinymce.service.js    |  4 +--
 .../src/common/services/tour.service.js       |  2 +-
 .../services/umbdataformatter.service.js      |  2 +-
 .../services/umbrequesthelper.service.js      |  6 ++--
 .../src/controllers/navigation.controller.js  | 12 ++++----
 .../src/installer/installer.controller.js     |  2 +-
 .../src/less/components/tree/umb-tree.less    |  2 +-
 .../src/less/components/umb-grid.less         |  2 +-
 src/Umbraco.Web.UI.Client/src/less/forms.less |  2 +-
 .../treepicker/treepicker.controller.js       |  4 +--
 .../apps/content/content.controller.js        |  2 +-
 .../content/content.delete.controller.js      |  2 +-
 .../content/overlays/publish.controller.js    |  2 +-
 .../overlays/publishdescendants.controller.js |  2 +-
 .../content/overlays/schedule.controller.js   |  2 +-
 .../contentblueprints/delete.controller.js    |  2 +-
 .../content/redirecturls.controller.js        |  9 +++---
 .../settings/examinemanagement.controller.js  |  6 ++--
 .../src/views/datatypes/create.controller.js  |  2 +-
 .../datatypes/datatype.delete.controller.js   |  4 +--
 .../views/documenttypes/delete.controller.js  |  4 +--
 .../views/media/media.delete.controller.js    |  2 +-
 .../src/views/mediatypes/delete.controller.js |  4 +--
 .../views/membergroups/delete.controller.js   |  2 +-
 .../views/membertypes/create.controller.js    |  2 +-
 .../views/membertypes/delete.controller.js    |  2 +-
 .../partialviewmacros/delete.controller.js    |  2 +-
 .../views/partialviews/delete.controller.js   |  2 +-
 .../colorpicker/colorpicker.controller.js     |  4 +--
 .../listview/listview.controller.js           |  2 +-
 .../markdowneditor.controller.js              |  2 +-
 .../nestedcontent/nestedcontent.controller.js |  4 +--
 .../rte/codeeditor.controller.js              |  2 +-
 .../propertyeditors/rte/rte.controller.js     |  2 +-
 .../src/views/scripts/delete.controller.js    |  2 +-
 .../src/views/scripts/edit.controller.js      |  2 +-
 .../src/views/stylesheets/edit.controller.js  |  2 +-
 .../src/views/templates/delete.controller.js  |  2 +-
 .../src/views/templates/edit.controller.js    |  2 +-
 .../template-editor-controller.spec.js        |  2 +-
 .../unit/common/directives/val-email.spec.js  |  2 +-
 .../server-validation-manager.spec.js         |  2 +-
 .../Actions/ActionChangeDocType.cs            |  2 +-
 .../Cache/ContentCacheRefresher.cs            |  2 +-
 .../Cache/DataTypeCacheRefresher.cs           |  2 +-
 .../Cache/DistributedCacheBinder.cs           |  2 +-
 .../Cache/DistributedCacheBinder_Handlers.cs  | 10 +++----
 .../Composing/Composers/InstallerComposer.cs  |  2 +-
 src/Umbraco.Web/Composing/Current.cs          |  2 +-
 .../Controllers/UmbRegisterController.cs      |  2 +-
 .../Editors/BackOfficeController.cs           |  2 +-
 .../Editors/BackOfficeServerVariables.cs      | 10 +++----
 .../Binders/ContentModelBinderHelper.cs       |  2 +-
 .../Editors/Binders/MemberBinder.cs           |  2 +-
 src/Umbraco.Web/Editors/CodeFileController.cs |  2 +-
 src/Umbraco.Web/Editors/ContentController.cs  | 18 ++++++------
 .../Editors/ContentControllerBase.cs          |  2 +-
 .../Editors/ContentTypeController.cs          |  2 +-
 .../Editors/CurrentUserController.cs          |  2 +-
 src/Umbraco.Web/Editors/DashboardSecurity.cs  |  2 +-
 src/Umbraco.Web/Editors/DataTypeController.cs |  2 +-
 src/Umbraco.Web/Editors/EditorValidator.cs    |  2 +-
 src/Umbraco.Web/Editors/EntityController.cs   | 12 ++++----
 .../Filters/ContentItemValidationHelper.cs    |  2 +-
 .../Filters/ContentSaveValidationAttribute.cs |  2 +-
 .../Filters/UserGroupValidateAttribute.cs     |  4 +--
 src/Umbraco.Web/Editors/MediaController.cs    |  2 +-
 .../Editors/MediaTypeController.cs            |  2 +-
 src/Umbraco.Web/Editors/MemberController.cs   | 28 +++++++++----------
 .../Checks/Config/ConfigurationService.cs     |  2 +-
 src/Umbraco.Web/HealthCheck/HealthCheck.cs    |  2 +-
 .../HealthCheck/HealthCheckAttribute.cs       |  2 +-
 .../HealthCheck/HealthCheckResults.cs         |  2 +-
 .../HealthCheck/HealthCheckStatus.cs          |  2 +-
 .../Controllers/InstallApiController.cs       |  2 +-
 .../Install/InstallStepCollection.cs          |  4 +--
 .../Install/InstallSteps/NewInstallStep.cs    |  2 +-
 .../InstallSteps/StarterKitCleanupStep.cs     |  2 +-
 .../Install/InstallSteps/UpgradeStep.cs       |  4 +--
 .../Install/Models/InstallPackageModel.cs     |  2 +-
 .../EmbedProviders/AbstractOEmbedProvider.cs  |  2 +-
 .../MembershipProviderExtensions.cs           |  2 +-
 .../Models/ContentEditing/MemberSave.cs       |  2 +-
 .../UserGroupPermissionsSave.cs               |  2 +-
 .../Models/Mapping/ActionButtonsResolver.cs   |  2 +-
 .../ContentPropertyDisplayConverter.cs        |  2 +-
 .../Mapping/ContentTypeBasicResolver.cs       |  2 +-
 .../Mapping/ContentTypeProfileExtensions.cs   |  8 +++---
 .../Models/Mapping/DatabaseTypeResolver.cs    |  2 +-
 .../Models/Mapping/EntityMapperProfile.cs     |  4 +--
 .../Models/Mapping/MacroMapperProfile.cs      |  2 +-
 .../Models/Mapping/MemberMapperProfile.cs     |  2 +-
 .../MemberTabsAndPropertiesResolver.cs        |  2 +-
 .../Mapping/TabsAndPropertiesResolver.cs      |  2 +-
 .../PublishedValueFallback.cs                 |  3 +-
 .../Models/PublishedContentBase.cs            |  8 +++---
 src/Umbraco.Web/Models/PublishedProperty.cs   |  2 +-
 src/Umbraco.Web/Models/Trees/MenuItem.cs      |  2 +-
 src/Umbraco.Web/Models/UmbracoProperty.cs     |  2 +-
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  2 +-
 .../Mvc/UmbracoViewPageOfTModel.cs            |  3 +-
 .../Mvc/UmbracoVirtualNodeRouteHandler.cs     |  4 +--
 .../FileUploadPropertyValueEditor.cs          |  2 +-
 .../PropertyEditors/GridConfiguration.cs      |  4 +--
 .../GridPropertyIndexValueFactory.cs          |  2 +-
 .../ImageCropperPropertyEditor.cs             |  2 +-
 .../ImageCropperPropertyValueEditor.cs        |  4 +--
 .../PropertyEditors/ListViewConfiguration.cs  |  6 ++--
 .../MacroContainerPropertyEditor.cs           |  2 +-
 .../MultipleTextStringConfigurationEditor.cs  |  2 +-
 .../PropertyEditors/RichTextConfiguration.cs  |  2 +-
 .../PropertyEditors/TrueFalseConfiguration.cs |  2 +-
 .../MultiNodeTreePickerValueConverter.cs      |  2 +-
 .../PublishedCache/IPublishedCache.cs         |  2 +-
 .../PublishedCache/NuCache/ContentCache.cs    |  2 +-
 .../PublishedCache/NuCache/ContentStore.cs    |  4 +--
 ....DictionaryOfCultureVariationSerializer.cs |  2 +-
 .../NuCache/DataSource/DatabaseDataSource.cs  |  2 +-
 .../NuCache/DataSource/PropertyData.cs        |  4 +--
 .../NuCache/PublishedSnapshotService.cs       |  8 +++---
 .../PublishedCache/PublishedMember.cs         |  4 +--
 .../XmlPublishedCache/PublishedMediaCache.cs  |  6 ++--
 .../XmlPublishedCache/SafeXmlReaderWriter.cs  |  2 +-
 .../XmlPublishedCache/XmlPublishedContent.cs  |  2 +-
 .../XmlPublishedCache/XmlStore.cs             | 14 +++++-----
 src/Umbraco.Web/PublishedContentExtensions.cs |  4 +--
 .../Routing/ContentFinderByUrlAlias.cs        |  2 +-
 .../Routing/CustomRouteUrlProvider.cs         |  2 +-
 src/Umbraco.Web/Routing/DomainHelper.cs       |  4 +--
 .../Routing/NotFoundHandlerHelper.cs          |  2 +-
 src/Umbraco.Web/Routing/PublishedRouter.cs    |  7 ++---
 .../Routing/RedirectTrackingComponent.cs      |  2 +-
 src/Umbraco.Web/Routing/SiteDomainHelper.cs   |  4 +--
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  2 +-
 .../Scheduling/BackgroundTaskRunnerOptions.cs |  2 +-
 .../Scheduling/IBackgroundTaskRunner.cs       |  2 +-
 .../Scheduling/ScheduledPublishing.cs         |  3 +-
 src/Umbraco.Web/Scheduling/ScheduledTasks.cs  |  4 +--
 src/Umbraco.Web/Search/ExamineComponent.cs    |  6 ++--
 .../Search/UmbracoIndexesCreator.cs           |  2 +-
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |  2 +-
 ...eDirectoryBackOfficeUserPasswordChecker.cs |  4 +--
 .../Security/BackOfficeSignInManager.cs       |  2 +-
 .../Security/BackOfficeUserManager.cs         | 10 +++----
 .../Security/GetUserSecondsMiddleWare.cs      |  4 +--
 src/Umbraco.Web/Security/MembershipHelper.cs  | 10 +++----
 .../Providers/UmbracoMembershipProvider.cs    |  4 +--
 src/Umbraco.Web/Suspendable.cs                |  2 +-
 src/Umbraco.Web/Templates/TemplateRenderer.cs |  4 +--
 .../Trees/ApplicationTreeController.cs        |  2 +-
 .../Trees/ContentTreeController.cs            |  2 +-
 .../Trees/ContentTreeControllerBase.cs        |  4 +--
 .../Trees/FileSystemTreeController.cs         |  2 +-
 src/Umbraco.Web/Trees/FilesTreeController.cs  |  2 +-
 src/Umbraco.Web/Trees/ITree.cs                |  2 +-
 .../Trees/LegacyTreeDataConverter.cs          |  2 +-
 .../Trees/ScriptsTreeController.cs            |  2 +-
 .../Trees/StylesheetsTreeController.cs        |  2 +-
 .../Trees/TemplatesTreeController.cs          |  4 +--
 src/Umbraco.Web/UI/Controls/UmbracoControl.cs |  2 +-
 .../UI/Controls/UmbracoUserControl.cs         |  2 +-
 .../UI/JavaScript/Resources.Designer.cs       |  2 +-
 .../UI/JavaScript/ServerVariables.js          |  2 +-
 src/Umbraco.Web/UmbracoComponentRenderer.cs   |  2 +-
 src/Umbraco.Web/UmbracoContext.cs             |  2 +-
 src/Umbraco.Web/UmbracoHelper.cs              |  4 +--
 src/Umbraco.Web/UmbracoHttpHandler.cs         |  2 +-
 .../EnableOverrideAuthorizationAttribute.cs   |  2 +-
 ...EnsureUserPermissionForContentAttribute.cs |  4 +--
 .../EnsureUserPermissionForMediaAttribute.cs  |  2 +-
 .../OverridableAuthorizationAttribute.cs      |  2 +-
 .../WebApi/UmbracoAuthorizeAttribute.cs       |  2 +-
 .../PackageActions/publishRootDocument.cs     |  2 +-
 src/Umbraco.Web/umbraco.presentation/page.cs  |  2 +-
 338 files changed, 573 insertions(+), 586 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index a188377c19a7..f642b2f4e853 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -55,7 +55,7 @@
         <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
         <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
         <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
-        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME Content\ !! and then... transform?! -->
+        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME: Content\ !! and then... transform?! -->
 
         <!-- UmbracoCms props and targets -->
         <file src="build\**" target="build" />
diff --git a/build/build.ps1 b/build/build.ps1
index 65b4041e302f..d811c2cc213a 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -120,7 +120,7 @@
     } finally {
         Pop-Location
 
-        # fixme - should we filter the log to find errors?
+        # FIXME: should we filter the log to find errors?
         #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
 
         # restore
@@ -177,7 +177,7 @@
   {
     Write-Host "Prepare Tests"
 
-    # fixme - idea is to avoid rebuilding everything for tests
+    # FIXME: - idea is to avoid rebuilding everything for tests
     # but because of our weird assembly versioning (with .* stuff)
     # everything gets rebuilt all the time...
     #Copy-Files "$tmp\bin" "." "$tmp\tests"
diff --git a/src/Umbraco.Core/Cache/CacheKeys.cs b/src/Umbraco.Core/Cache/CacheKeys.cs
index 50bd4ca0ac95..e8f93d636a88 100644
--- a/src/Umbraco.Core/Cache/CacheKeys.cs
+++ b/src/Umbraco.Core/Cache/CacheKeys.cs
@@ -7,7 +7,7 @@ public static class CacheKeys
     {
         public const string ApplicationsCacheKey = "ApplicationCache"; // used by SectionService
 
-        // TODO this one can probably be removed
+        // TODO: this one can probably be removed
         public const string TemplateFrontEndCacheKey = "template";
 
         public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
diff --git a/src/Umbraco.Core/Cache/HttpRequestAppCache.cs b/src/Umbraco.Core/Cache/HttpRequestAppCache.cs
index 0fdf70ac2748..f1932f97ced1 100644
--- a/src/Umbraco.Core/Cache/HttpRequestAppCache.cs
+++ b/src/Umbraco.Core/Cache/HttpRequestAppCache.cs
@@ -31,7 +31,7 @@ public HttpRequestAppCache(HttpContextBase context)
         /// </summary>
         /// <remarks>
         /// <para>Will use HttpContext.Current.</para>
-        /// TODO - https://github.com/umbraco/Umbraco-CMS/issues/4239 - use IHttpContextAccessor NOT HttpContext.Current
+        /// TODO: https://github.com/umbraco/Umbraco-CMS/issues/4239 - use IHttpContextAccessor NOT HttpContext.Current
         /// </remarks>
         public HttpRequestAppCache()
         { }
diff --git a/src/Umbraco.Core/Components/RelateOnCopyComponent.cs b/src/Umbraco.Core/Components/RelateOnCopyComponent.cs
index 404d385680f2..d38406f97095 100644
--- a/src/Umbraco.Core/Components/RelateOnCopyComponent.cs
+++ b/src/Umbraco.Core/Components/RelateOnCopyComponent.cs
@@ -5,7 +5,7 @@
 
 namespace Umbraco.Core.Components
 {
-    //TODO: This should just exist in the content service/repo!
+    // TODO: This should just exist in the content service/repo!
     public sealed class RelateOnCopyComponent : IComponent
     {
         public void Initialize()
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 4086eb394be6..308d0ecfd7f0 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -614,7 +614,7 @@ public static Type GetTypeByName(string typeName)
             var type = BuildManager.GetType(typeName, false);
             if (type != null) return type;
 
-            //TODO: This isn't very elegant, and will have issues since the AppDomain.CurrentDomain
+            // TODO: This isn't very elegant, and will have issues since the AppDomain.CurrentDomain
             // doesn't actualy load in all assemblies, only the types that have been referenced so far.
             // However, in a web context, the BuildManager will have executed which will force all assemblies
             // to be loaded so it's fine for now.
diff --git a/src/Umbraco.Core/Composing/TypeHelper.cs b/src/Umbraco.Core/Composing/TypeHelper.cs
index c2746bef9620..2f29ee09bc5f 100644
--- a/src/Umbraco.Core/Composing/TypeHelper.cs
+++ b/src/Umbraco.Core/Composing/TypeHelper.cs
@@ -278,7 +278,7 @@ public static PropertyInfo[] CachedDiscoverableProperties(Type type, bool mustRe
 
         #region Match Type
 
-        //TODO: Need to determine if these methods should replace/combine/merge etc with IsTypeAssignableFrom, IsAssignableFromGeneric
+        // TODO: Need to determine if these methods should replace/combine/merge etc with IsTypeAssignableFrom, IsAssignableFromGeneric
 
         // readings:
         // http://stackoverflow.com/questions/2033912/c-sharp-variance-problem-assigning-listderived-as-listbase
diff --git a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
index 2862a98a0e1f..0e7ef62c58e4 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
@@ -31,7 +31,7 @@ public IEnumerable<IGridEditorConfig> Editors
             {
                 List<GridEditor> GetResult()
                 {
-                    // TODO should use the common one somehow! + ignoring _appPlugins here!
+                    // TODO: should use the common one somehow! + ignoring _appPlugins here!
                     var parser = new ManifestParser(_appCaches, Current.ManifestValidators, _logger);
 
                     var editors = new List<GridEditor>();
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/TourConfigElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/TourConfigElement.cs
index ebb649ca3b13..fb231ec0cf1c 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/TourConfigElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/TourConfigElement.cs
@@ -5,13 +5,13 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     internal class TourConfigElement : UmbracoConfigurationElement, ITourSection
     {
         //disabled by default so that upgraders don't get it enabled by default
-        //TODO: we probably just want to disable the initial one from automatically loading ?
+        // TODO: we probably just want to disable the initial one from automatically loading ?
         [ConfigurationProperty("enable", DefaultValue = false)]
         public bool EnableTours
         {
             get { return (bool)this["enable"]; }
         }
 
-        //TODO: We could have additional filters, etc... defined here
+        // TODO: We could have additional filters, etc... defined here
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index bc5b6993e387..7ab97500f057 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -31,7 +31,7 @@ static UmbracoVersion()
         /// <summary>
         /// Gets the non-semantic version of the Umbraco code.
         /// </summary>
-        // TODO rename to Version
+        // TODO: rename to Version
         public static Version Current { get; }
 
         /// <summary>
@@ -81,7 +81,7 @@ public static SemVersion LocalVersion
             {
                 try
                 {
-                    // TODO - https://github.com/umbraco/Umbraco-CMS/issues/4238 - stop having version in web.config appSettings
+                    // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4238 - stop having version in web.config appSettings
                     var value = ConfigurationManager.AppSettings["umbracoConfigurationStatus"];
                     return value.IsNullOrWhiteSpace() ? null : SemVersion.TryParse(value, out var semver) ? semver : null;
                 }
diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index 415357aab3ed..2d4042fad08a 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -156,7 +156,7 @@ public static class Groups
                 public const string ThirdParty = "thirdPartyGroup";
             }
 
-            //TODO: Fill in the rest!
+            // TODO: Fill in the rest!
         }
     }
 }
diff --git a/src/Umbraco.Core/EmailSender.cs b/src/Umbraco.Core/EmailSender.cs
index 1f2c6d865389..0fda5c40a4fa 100644
--- a/src/Umbraco.Core/EmailSender.cs
+++ b/src/Umbraco.Core/EmailSender.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Core
     /// </summary>
     public class EmailSender : IEmailSender
     {
-        //TODO: This should encapsulate a BackgroundTaskRunner with a queue to send these emails!
+        // TODO: This should encapsulate a BackgroundTaskRunner with a queue to send these emails!
 
         private readonly bool _enableEvents;
 
diff --git a/src/Umbraco.Core/Events/ImportPackageEventArgs.cs b/src/Umbraco.Core/Events/ImportPackageEventArgs.cs
index 61369af59d1e..a044cd71b30f 100644
--- a/src/Umbraco.Core/Events/ImportPackageEventArgs.cs
+++ b/src/Umbraco.Core/Events/ImportPackageEventArgs.cs
@@ -27,7 +27,7 @@ public bool Equals(ImportPackageEventArgs<TEntity> other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
-            //TODO: MetaData for package metadata has no equality operators :/
+            // TODO: MetaData for package metadata has no equality operators :/
             return base.Equals(other) && PackageMetaData.Equals(other.PackageMetaData);
         }
 
diff --git a/src/Umbraco.Core/IO/FileSystemExtensions.cs b/src/Umbraco.Core/IO/FileSystemExtensions.cs
index ade2c58b385a..e0f5af75c597 100644
--- a/src/Umbraco.Core/IO/FileSystemExtensions.cs
+++ b/src/Umbraco.Core/IO/FileSystemExtensions.cs
@@ -54,7 +54,7 @@ public static string GetFileName(this IFileSystem fs, string path)
             return Path.GetFileName(fs.GetFullPath(path));
         }
 
-        //TODO: Currently this is the only way to do this
+        // TODO: Currently this is the only way to do this
         internal static void CreateFolder(this IFileSystem fs, string folderPath)
         {
             var path = fs.GetRelativePath(folderPath);
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index 76e76314829b..a92b5562404c 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -155,8 +155,7 @@ internal static bool VerifyEditPath(string filePath, IEnumerable<string> validDi
             //
             // except that for templates, filePath actually is a virtual path
 
-            //TODO
-            // what's below is dirty, there are too many ways to get the root dir, etc.
+            // TODO: what's below is dirty, there are too many ways to get the root dir, etc.
             // not going to fix everything today
 
             var mappedRoot = MapPath(SystemDirectories.Root);
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index acf5e796e4c7..66ef095b0429 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -284,7 +284,7 @@ public string GetFullPath(string path)
             var opath = path;
             path = EnsureDirectorySeparatorChar(path);
 
-            // fixme - this part should go!
+            // FIXME: this part should go!
             // not sure what we are doing here - so if input starts with a (back) slash,
             // we assume it's not a FS relative path and we try to convert it... but it
             // really makes little sense?
diff --git a/src/Umbraco.Core/Media/Result.cs b/src/Umbraco.Core/Media/Result.cs
index 82894a5ef5bd..a8683d03d581 100644
--- a/src/Umbraco.Core/Media/Result.cs
+++ b/src/Umbraco.Core/Media/Result.cs
@@ -1,7 +1,7 @@
 namespace Umbraco.Core.Media
 {
 
-    //TODO: Could definitely have done with a better name
+    // TODO: Could definitely have done with a better name
     public class Result
     {
         public Status Status { get; set; }
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index f32ea1cb6f7f..82ca5960ecb2 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -263,7 +263,7 @@ void InsertDataTypeDto(int id, string editorAlias, string dbType, string configu
             const string listLayout = "{\"name\": \"List\",\"path\": \"views/propertyeditors/listview/layouts/list/list.html\",\"icon\": \"icon-list\", \"isSystem\": 1,\"selected\": true}";
             const string layouts = "[" + cardLayout + "," + listLayout + "]";
 
-            //TODO Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors.
+            // TODO: Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors.
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -49, EditorAlias = Constants.PropertyEditors.Aliases.Boolean, DbType = "Integer" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -51, EditorAlias = Constants.PropertyEditors.Aliases.Integer, DbType = "Integer" });
             _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -87, EditorAlias = Constants.PropertyEditors.Aliases.TinyMce, DbType = "Ntext",
diff --git a/src/Umbraco.Core/Models/ContentScheduleCollection.cs b/src/Umbraco.Core/Models/ContentScheduleCollection.cs
index 4c06f8927d9a..6c7dd79312e3 100644
--- a/src/Umbraco.Core/Models/ContentScheduleCollection.cs
+++ b/src/Umbraco.Core/Models/ContentScheduleCollection.cs
@@ -31,7 +31,7 @@ public void Add(ContentSchedule schedule)
                 _schedule[schedule.Culture] = changes;
             }
 
-            //TODO: Below will throw if there are duplicate dates added, validate/return bool?
+            // TODO: Below will throw if there are duplicate dates added, validate/return bool?
             changes.Add(schedule.Date, schedule);
 
             OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, schedule));
@@ -62,7 +62,7 @@ public bool Add(string culture, DateTime? releaseDate, DateTime? expireDate)
 
             if (!releaseDate.HasValue && !expireDate.HasValue) return false;
 
-            //TODO: Do we allow passing in a release or expiry date that is before now?
+            // TODO: Do we allow passing in a release or expiry date that is before now?
 
             if (!_schedule.TryGetValue(culture, out var changes))
             {
@@ -70,7 +70,7 @@ public bool Add(string culture, DateTime? releaseDate, DateTime? expireDate)
                 _schedule[culture] = changes;
             }
 
-            //TODO: Below will throw if there are duplicate dates added, should validate/return bool?
+            // TODO: Below will throw if there are duplicate dates added, should validate/return bool?
             // but the bool won't indicate which date was in error, maybe have 2 diff methods to schedule start/end?
 
             if (releaseDate.HasValue)
diff --git a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
index adbc3de54f79..51c642c20d00 100644
--- a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
@@ -48,7 +48,7 @@ internal static bool WasPropertyTypeVariationChanged(this IContentTypeBase conte
                     throw new Exception("oops");
 
                 // skip new properties
-                //TODO: This used to be WasPropertyDirty("HasIdentity") but i don't think that actually worked for detecting new entities this does seem to work properly
+                // TODO: This used to be WasPropertyDirty("HasIdentity") but i don't think that actually worked for detecting new entities this does seem to work properly
                 var isNewProperty = dirtyProperty.WasPropertyDirty("Id");
                 if (isNewProperty) return false;
 
diff --git a/src/Umbraco.Core/Models/GridValue.cs b/src/Umbraco.Core/Models/GridValue.cs
index 4f19576f1729..157304463f17 100644
--- a/src/Umbraco.Core/Models/GridValue.cs
+++ b/src/Umbraco.Core/Models/GridValue.cs
@@ -5,7 +5,7 @@
 
 namespace Umbraco.Core.Models
 {
-    //TODO: Make a property value converter for this!
+    // TODO: Make a property value converter for this!
 
     /// <summary>
     /// A model representing the value saved for the grid
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index c47f68c930fc..0ef15ee4132d 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -189,7 +189,7 @@ public string RawPasswordValue
         [DataMember]
         public IEnumerable<string> Groups { get; set; }
 
-        //TODO: When get/setting all of these properties we MUST:
+        // TODO: When get/setting all of these properties we MUST:
         // * Check if we are using the umbraco membership provider, if so then we need to use the configured fields - not the explicit fields below
         // * If any of the fields don't exist, what should we do? Currently it will throw an exception!
 
@@ -338,7 +338,7 @@ public bool IsLockedOut
                     return tryConvert.Result;
                 }
                 return false;
-                //TODO: Use TryConvertTo<T> instead
+                // TODO: Use TryConvertTo<T> instead
             }
             set
             {
@@ -371,7 +371,7 @@ public DateTime LastLoginDate
                     return tryConvert.Result;
                 }
                 return default(DateTime);
-                //TODO: Use TryConvertTo<T> instead
+                // TODO: Use TryConvertTo<T> instead
             }
             set
             {
@@ -404,7 +404,7 @@ public DateTime LastPasswordChangeDate
                     return tryConvert.Result;
                 }
                 return default(DateTime);
-                //TODO: Use TryConvertTo<T> instead
+                // TODO: Use TryConvertTo<T> instead
             }
             set
             {
@@ -437,7 +437,7 @@ public DateTime LastLockoutDate
                     return tryConvert.Result;
                 }
                 return default(DateTime);
-                //TODO: Use TryConvertTo<T> instead
+                // TODO: Use TryConvertTo<T> instead
             }
             set
             {
@@ -471,7 +471,7 @@ public int FailedPasswordAttempts
                     return tryConvert.Result;
                 }
                 return default(int);
-                //TODO: Use TryConvertTo<T> instead
+                // TODO: Use TryConvertTo<T> instead
             }
             set
             {
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index bcc7e14fd71b..1ce883d9a72f 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -66,7 +66,7 @@ public override string Alias
                 // leading underscores which we don't want in this case.
                 // see : http://issues.umbraco.org/issue/U4-3968
 
-                //TODO: BUT, I'm pretty sure we could do this with regards to underscores now:
+                // TODO: BUT, I'm pretty sure we could do this with regards to underscores now:
                 // .ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase)
                 // Need to ask Stephen
 
diff --git a/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs b/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
index ed3422d4f9f8..debce3afe545 100644
--- a/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
+++ b/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
@@ -44,7 +44,7 @@ public UmbracoMembershipMember(IMembershipUser member, string providerName, bool
             _isLockedOut = member.IsLockedOut;
             _creationDate = member.CreateDate.ToUniversalTime();
             _lastLoginDate = member.LastLoginDate.ToUniversalTime();
-            //TODO: We currently don't really have any place to store this data!!
+            // TODO: We currently don't really have any place to store this data!!
             _lastActivityDate = member.LastLoginDate.ToUniversalTime();
             _lastPasswordChangedDate = member.LastPasswordChangeDate.ToUniversalTime();
             _lastLockoutDate = member.LastLockoutDate.ToUniversalTime();
diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs
index 5e79967a9470..7832390b92b5 100644
--- a/src/Umbraco.Core/Models/Membership/User.cs
+++ b/src/Umbraco.Core/Models/Membership/User.cs
@@ -242,7 +242,7 @@ public int FailedPasswordAttempts
             set { SetPropertyValueAndDetectChanges(value, ref _failedLoginAttempts, Ps.Value.FailedPasswordAttemptsSelector); }
         }
 
-        //TODO: Figure out how to support all of this! - we cannot have NotImplementedExceptions because these get used by the IMembershipMemberService<IUser> service so
+        // TODO: Figure out how to support all of this! - we cannot have NotImplementedExceptions because these get used by the IMembershipMemberService<IUser> service so
         // we'll just have them as generic get/set which don't interact with the db.
 
         [IgnoreDataMember]
diff --git a/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs b/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
index f0acb2a46bec..69c7a5641d49 100644
--- a/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
+++ b/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
@@ -10,7 +10,7 @@ public class PreInstallWarnings
         public IEnumerable<string> UnsecureFiles { get; set; } = Enumerable.Empty<string>();
         public IEnumerable<string> FilesReplaced { get; set; } = Enumerable.Empty<string>();
 
-        //TODO: Shouldn't we detect other conflicting entities too ?
+        // TODO: Shouldn't we detect other conflicting entities too ?
         public IEnumerable<IMacro> ConflictingMacros { get; set; } = Enumerable.Empty<IMacro>();
         public IEnumerable<ITemplate> ConflictingTemplates { get; set; } = Enumerable.Empty<ITemplate>();
         public IEnumerable<IFile> ConflictingStylesheets { get; set; } = Enumerable.Empty<IFile>();
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index f5c475908d2f..11b5239a7069 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -55,7 +55,7 @@ public Property(int id, PropertyType propertyType)
         /// </summary>
         public class PropertyValue
         {
-            //TODO: Either we allow change tracking at this class level, or we add some special change tracking collections to the Property
+            // TODO: Either we allow change tracking at this class level, or we add some special change tracking collections to the Property
             // class to deal with change tracking which variants have changed
 
             private string _culture;
@@ -103,7 +103,7 @@ public PropertyValue Clone()
         // ReSharper disable once ClassNeverInstantiated.Local
         private class PropertySelectors
         {
-            //TODO: This allows us to track changes for an entire Property, but doesn't allow us to track changes at the variant level
+            // TODO: This allows us to track changes for an entire Property, but doesn't allow us to track changes at the variant level
             public readonly PropertyInfo ValuesSelector = ExpressionHelper.GetPropertyInfo<Property, object>(x => x.Values);
 
             public readonly DelegateEqualityComparer<object> PropertyValueComparer = new DelegateEqualityComparer<object>(
diff --git a/src/Umbraco.Core/Models/PropertyGroupCollection.cs b/src/Umbraco.Core/Models/PropertyGroupCollection.cs
index 2e9fb6520e2e..26e0fef178b0 100644
--- a/src/Umbraco.Core/Models/PropertyGroupCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyGroupCollection.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract]
-    //TODO: Change this to ObservableDictionary so we can reduce the INotifyCollectionChanged implementation details
+    // TODO: Change this to ObservableDictionary so we can reduce the INotifyCollectionChanged implementation details
     public class PropertyGroupCollection : KeyedCollection<string, PropertyGroup>, INotifyCollectionChanged, IDeepCloneable
     {
         private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();
diff --git a/src/Umbraco.Core/Models/PropertyTypeCollection.cs b/src/Umbraco.Core/Models/PropertyTypeCollection.cs
index f39918d5afb7..e79015d828e5 100644
--- a/src/Umbraco.Core/Models/PropertyTypeCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyTypeCollection.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract]
-    //TODO: Change this to ObservableDictionary so we can reduce the INotifyCollectionChanged implementation details
+    // TODO: Change this to ObservableDictionary so we can reduce the INotifyCollectionChanged implementation details
     public class PropertyTypeCollection : KeyedCollection<string, PropertyType>, INotifyCollectionChanged, IDeepCloneable
     {
         [IgnoreDataMember]
@@ -76,7 +76,7 @@ protected override void ClearItems()
             OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
         }
 
-        //TODO: Instead of 'new' this should explicitly implement one of the collection interfaces members
+        // TODO: Instead of 'new' this should explicitly implement one of the collection interfaces members
         internal new void Add(PropertyType item)
         {
             item.IsPublishing = IsPublishing;
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index e14d7ee2de61..f9aa1113b3c8 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -136,7 +136,7 @@ internal static CultureInfo GetUserCulture(string userLanguage, ILocalizedTextSe
             try
             {
                 var culture = CultureInfo.GetCultureInfo(userLanguage.Replace("_", "-"));
-                //TODO: This is a hack because we store the user language as 2 chars instead of the full culture
+                // TODO: This is a hack because we store the user language as 2 chars instead of the full culture
                 // which is actually stored in the language files (which are also named with 2 chars!) so we need to attempt
                 // to convert to a supported full culture
                 var result = textService.ConvertToSupportedCultureWithRegionCode(culture);
diff --git a/src/Umbraco.Core/ObjectExtensions.cs b/src/Umbraco.Core/ObjectExtensions.cs
index 1a66cb96fb41..68bc9c923d16 100644
--- a/src/Umbraco.Core/ObjectExtensions.cs
+++ b/src/Umbraco.Core/ObjectExtensions.cs
@@ -143,7 +143,7 @@ public static Attempt<object> TryConvertTo(this object input, Type target)
                         // Special case for empty strings for bools/dates which should return null if an empty string.
                         if (input is string inputString)
                         {
-                            //TODO: Why the check against only bool/date when a string is null/empty? In what scenario can we convert to another type when the string is null or empty other than just being null?
+                            // TODO: Why the check against only bool/date when a string is null/empty? In what scenario can we convert to another type when the string is null or empty other than just being null?
                             if (string.IsNullOrEmpty(inputString) && (underlying == typeof(DateTime) || underlying == typeof(bool)))
                             {
                                 return Attempt<object>.Succeed(null);
@@ -391,7 +391,7 @@ public static Attempt<object> TryConvertTo(this object input, Type target)
         }
         internal static void CheckThrowObjectDisposed(this IDisposable disposable, bool isDisposed, string objectname)
         {
-            //TODO: Localize this exception
+            // TODO: Localize this exception
             if (isDisposed)
                 throw new ObjectDisposedException(objectname);
         }
diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 72dc0cb3258a..a569954629d1 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -100,7 +100,7 @@ public UninstallationSummary UninstallPackageData(PackageDefinition package, int
             //Order the DocumentTypes before removing them
             if (contentTypes.Any())
             {
-                //TODO: I don't think this ordering is necessary
+                // TODO: I don't think this ordering is necessary
                 var orderedTypes = (from contentType in contentTypes
                                    orderby contentType.ParentId descending, contentType.Id descending
                                    select contentType).ToList();
@@ -710,7 +710,7 @@ private void UpdateContentTypesProperties(IContentType contentType, XElement gen
                 // This means that the property will not be created.
                 if (dataTypeDefinition == null)
                 {
-                    //TODO: We should expose this to the UI during install!
+                    // TODO: We should expose this to the UI during install!
                     _logger.Warn<PackagingService>("Packager: Error handling creation of PropertyType '{PropertyType}'. Could not find DataTypeDefintion with unique id '{DataTypeDefinitionId}' nor one referencing the DataType with a property editor alias (or legacy control id) '{PropertyEditorAlias}'. Did the package creator forget to package up custom datatypes? This property will be converted to a label/readonly editor if one exists.",
                         property.Element("Name").Value, dataTypeDefinitionId, property.Element("Type").Value.Trim());
 
diff --git a/src/Umbraco.Core/Packaging/PackageFileInstallation.cs b/src/Umbraco.Core/Packaging/PackageFileInstallation.cs
index 7c0891175bfe..29afc11d83f4 100644
--- a/src/Umbraco.Core/Packaging/PackageFileInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageFileInstallation.cs
@@ -65,7 +65,7 @@ public IEnumerable<string> UninstallFiles(PackageDefinition package)
                 var file = IOHelper.FindFile(item);
                 if (file != null)
                 {
-                    //TODO: Surely this should be ~/ ?
+                    // TODO: Surely this should be ~/ ?
                     file = file.EnsureStartsWith("/");
                     var filePath = IOHelper.MapPath(file);
 
diff --git a/src/Umbraco.Core/Packaging/PackagesRepository.cs b/src/Umbraco.Core/Packaging/PackagesRepository.cs
index dcf3b62e55c7..05f67b3ed601 100644
--- a/src/Umbraco.Core/Packaging/PackagesRepository.cs
+++ b/src/Umbraco.Core/Packaging/PackagesRepository.cs
@@ -362,7 +362,7 @@ private void PackageDocumentsAndTags(PackageDefinition definition, XContainer ro
                                     new XAttribute("importMode", "root"),
                                     contentXml)));
 
-                        //TODO: I guess tags has been broken for a very long time for packaging, we should get this working again sometime
+                        // TODO: I guess tags has been broken for a very long time for packaging, we should get this working again sometime
                         ////Create the TagProperties node - this is used to store a definition for all
                         //// document properties that are tags, this ensures that we can re-import tags properly
                         //XmlNode tagProps = new XElement("TagProperties");
diff --git a/src/Umbraco.Core/Persistence/Dtos/LogDto.cs b/src/Umbraco.Core/Persistence/Dtos/LogDto.cs
index 9a710c1fec0d..bfd96426e2ca 100644
--- a/src/Umbraco.Core/Persistence/Dtos/LogDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/LogDto.cs
@@ -35,12 +35,12 @@ internal class LogDto
         [NullSetting(NullSetting = NullSettings.Null)]
         public string EntityType { get; set; }
 
-        //TODO: Should we have an index on this since we allow searching on it?
+        // TODO: Should we have an index on this since we allow searching on it?
         [Column("Datestamp")]
         [Constraint(Default = SystemMethods.CurrentDateTime)]
         public DateTime Datestamp { get; set; }
 
-        //TODO: Should we have an index on this since we allow searching on it?
+        // TODO: Should we have an index on this since we allow searching on it?
         [Column("logHeader")]
         [Length(50)]
         public string Header { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Dtos/MemberTypeReadOnlyDto.cs b/src/Umbraco.Core/Persistence/Dtos/MemberTypeReadOnlyDto.cs
index f9e70cce1866..c4ea6a10fd6d 100644
--- a/src/Umbraco.Core/Persistence/Dtos/MemberTypeReadOnlyDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/MemberTypeReadOnlyDto.cs
@@ -66,13 +66,13 @@ internal class MemberTypeReadOnlyDto
         public bool AllowAtRoot { get; set; }
 
         /* PropertyTypes */
-        //TODO Add PropertyTypeDto (+MemberTypeDto and DataTypeDto as one) ReadOnly list
+        // TODO: Add PropertyTypeDto (+MemberTypeDto and DataTypeDto as one) ReadOnly list
         [ResultColumn]
         [Reference(ReferenceType.Many, ReferenceMemberName = "ContentTypeId")]
         public List<PropertyTypeReadOnlyDto> PropertyTypes { get; set; }
 
         /* PropertyTypeGroups */
-        //TODO Add PropertyTypeGroupDto ReadOnly list
+        // TODO: Add PropertyTypeGroupDto ReadOnly list
         [ResultColumn]
         [Reference(ReferenceType.Many, ReferenceMemberName = "ContentTypeNodeId")]
         public List<PropertyTypeGroupReadOnlyDto> PropertyTypeGroups { get; set; }
diff --git a/src/Umbraco.Core/Persistence/EntityNotFoundException.cs b/src/Umbraco.Core/Persistence/EntityNotFoundException.cs
index 49e85046a046..e0fe778fa67c 100644
--- a/src/Umbraco.Core/Persistence/EntityNotFoundException.cs
+++ b/src/Umbraco.Core/Persistence/EntityNotFoundException.cs
@@ -7,7 +7,7 @@
 namespace Umbraco.Core.Persistence
 {
 
-    //TODO: Would be good to use this exception type anytime we cannot find an entity
+    // TODO: Would be good to use this exception type anytime we cannot find an entity
 
     /// <summary>
     /// An exception used to indicate that an umbraco entity could not be found
diff --git a/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs b/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
index b6f5401bec71..d04930fa9202 100644
--- a/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
+++ b/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
@@ -269,7 +269,7 @@ protected virtual List<object> VisitExpressionList(ReadOnlyCollection<Expression
 
         protected virtual string VisitNew(NewExpression newExpression)
         {
-            // TODO : check !
+            // TODO: check !
             var member = Expression.Convert(newExpression, typeof(object));
             var lambda = Expression.Lambda<Func<object>>(member);
             try
@@ -662,7 +662,7 @@ protected virtual string VisitMethodCall(MethodCallExpression m)
                 // sql 'COALESCE(x,fb) = COALESCE(y,fb)' - of course, fb must be a value outside
                 // of x and y range - and if that is not possible, then a manual comparison need
                 // to be written
-                //TODO support SqlNullableEquals with 0 parameters, using the full syntax below
+                // TODO: support SqlNullableEquals with 0 parameters, using the full syntax below
                 case "SqlNullableEquals":
                     var compareTo = Visit(m.Arguments[1]);
                     var fallback = Visit(m.Arguments[2]);
diff --git a/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs b/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
index 9f57e61db977..a353f01f5bed 100644
--- a/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
+++ b/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
@@ -79,7 +79,7 @@ protected override string VisitMemberAccess(MemberExpression m)
                 return string.Empty;
             }
 
-            //TODO: When m.Expression.NodeType == ExpressionType.Constant and it's an expression like: content => aliases.Contains(content.ContentType.Alias);
+            // TODO: When m.Expression.NodeType == ExpressionType.Constant and it's an expression like: content => aliases.Contains(content.ContentType.Alias);
             // then an SQL parameter will be added for aliases as an array, however in SqlIn on the subclass it will manually add these SqlParameters anyways,
             // however the query will still execute because the SQL that is written will only contain the correct indexes of SQL parameters, this would be ignored,
             // I'm just unsure right now due to time constraints how to make it correct. It won't matter right now and has been working already with this bug but I've
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 92ade18204b3..7f41d2a4566c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -271,7 +271,7 @@ protected void PersistUpdatedBaseContentType(IContentTypeComposition entity)
                 compositionBase.RemovedContentTypeKeyTracker != null &&
                 compositionBase.RemovedContentTypeKeyTracker.Any())
             {
-                //TODO: Could we do the below with bulk SQL statements instead of looking everything up and then manipulating?
+                // TODO: Could we do the below with bulk SQL statements instead of looking everything up and then manipulating?
 
                 // find Content based on the current ContentType
                 var sql = Sql()
@@ -291,7 +291,7 @@ protected void PersistUpdatedBaseContentType(IContentTypeComposition entity)
                     // based on the PropertyTypes that belong to the removed ContentType.
                     foreach (var contentDto in contentDtos)
                     {
-                        //TODO: This could be done with bulk SQL statements
+                        // TODO: This could be done with bulk SQL statements
                         foreach (var propertyType in propertyTypes)
                         {
                             var nodeId = contentDto.NodeId;
@@ -437,7 +437,7 @@ protected void PersistUpdatedBaseContentType(IContentTypeComposition entity)
                         case ContentVariation.CultureAndSegment:
                         case ContentVariation.Segment:
                         default:
-                            throw new NotSupportedException(); //TODO: Support this
+                            throw new NotSupportedException(); // TODO: Support this
                     }
                 }
 
@@ -627,7 +627,7 @@ private void Clear301Redirects(IContentTypeComposition contentType)
         /// </summary>
         private void ClearScheduledPublishing(IContentTypeComposition contentType)
         {
-            //TODO: Fill this in when scheduled publishing is enabled for variants
+            // TODO: Fill this in when scheduled publishing is enabled for variants
         }
 
         /// <summary>
@@ -670,7 +670,7 @@ private void MovePropertyTypeVariantData(IDictionary<int, (ContentVariation From
                     case ContentVariation.CultureAndSegment:
                     case ContentVariation.Segment:
                     default:
-                        throw new NotSupportedException(); //TODO: Support this
+                        throw new NotSupportedException(); // TODO: Support this
                 }
             }
         }
@@ -753,7 +753,7 @@ private void MoveContentTypeVariantData(IContentTypeComposition contentType, Con
                 case ContentVariation.CultureAndSegment:
                 case ContentVariation.Segment:
                 default:
-                    throw new NotSupportedException(); //TODO: Support this
+                    throw new NotSupportedException(); // TODO: Support this
             }
         }
 
@@ -1037,7 +1037,7 @@ protected PropertyTypeCollection GetPropertyTypeCollection(int id, DateTime crea
 
             var dtos = Database.Fetch<PropertyTypeDto>(sql);
 
-            //TODO Move this to a PropertyTypeFactory
+            // TODO: Move this to a PropertyTypeFactory
             var list = new List<PropertyType>();
             foreach (var dto in dtos.Where(x => x.PropertyTypeGroupId <= 0))
             {
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
index 0e6ff0310d31..3de9e3c99ba2 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
@@ -26,7 +26,7 @@ internal class DataTypeRepository : NPocoRepositoryBase<int, IDataType>, IDataTy
     {
         private readonly Lazy<PropertyEditorCollection> _editors;
 
-        // TODO - https://github.com/umbraco/Umbraco-CMS/issues/4237 - get rid of Lazy injection and fix circular dependencies
+        // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4237 - get rid of Lazy injection and fix circular dependencies
         public DataTypeRepository(IScopeAccessor scopeAccessor, AppCaches cache, Lazy<PropertyEditorCollection> editors, ILogger logger)
             : base(scopeAccessor, cache, logger)
         {
@@ -111,7 +111,7 @@ protected override void PersistNewItem(IDataType entity)
             //ensure a datatype has a unique name before creating it
             entity.Name = EnsureUniqueNodeName(entity.Name);
 
-            //TODO: should the below be removed?
+            // TODO: should the below be removed?
             //Cannot add a duplicate data type
             var existsSql = Sql()
                 .SelectCount()
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
index fa06216f9b39..01b8bdd66c53 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
@@ -12,7 +12,7 @@
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
-    //TODO: We need to get a readonly ISO code for the domain assigned
+    // TODO: We need to get a readonly ISO code for the domain assigned
 
     internal class DomainRepository : NPocoRepositoryBase<int, IDomain>, IDomainRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
index 18dc16cbce73..ba3526f1f049 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
@@ -460,7 +460,7 @@ public IEnumerable<IMember> GetByMemberGroup(string groupName)
             var subQuery = Sql().Select("Member").From<Member2MemberGroupDto>().Where<Member2MemberGroupDto>(dto => dto.MemberGroup == memberGroup.Id);
 
             var sql = GetBaseQuery(false)
-                //TODO: An inner join would be better, though I've read that the query optimizer will always turn a
+                // TODO: An inner join would be better, though I've read that the query optimizer will always turn a
                 // subquery with an IN clause into an inner join anyways.
                 .Append("WHERE umbracoNode.id IN (" + subQuery.SQL + ")", subQuery.Arguments)
                 .OrderByDescending<ContentVersionDto>(x => x.VersionDate)
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
index fb45a79e4338..a7e366a94f0e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
@@ -207,7 +207,7 @@ public IEnumerable<TEntity> GetMany(params TId[] ids)
             //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
             ids = ids.Distinct()
                 //don't query by anything that is a default of T (like a zero)
-                //TODO: I think we should enabled this in case accidental calls are made to get all with invalid ids
+                // TODO: I think we should enabled this in case accidental calls are made to get all with invalid ids
                 //.Where(x => Equals(x, default(TId)) == false)
                 .ToArray();
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
index 7dd3f03407ae..f26fcca81b7e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
@@ -254,8 +254,7 @@ public int GetHashCode(ITag obj)
 
         #region Queries
 
-        // TODO
-        // consider caching implications
+        // TODO: consider caching implications
         // add lookups for parentId or path (ie get content in tag group, that are descendants of x)
 
         // ReSharper disable once ClassNeverInstantiated.Local
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
index a183894462f9..b3483179893f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
@@ -407,13 +407,12 @@ private string GetFileContent(ITemplate template, IFileSystem fs, string filenam
                 template.UpdateDate = fs.GetLastModified(filename).UtcDateTime;
             }
 
-            // TODO
-            //  see if this could enable us to update UpdateDate without messing with change tracking
-            //  and then we'd want to do it for scripts, stylesheets and partial views too (ie files)
-            //var xtemplate = template as Template;
-            //xtemplate.DisableChangeTracking();
-            //template.UpdateDate = fs.GetLastModified(filename).UtcDateTime;
-            //xtemplate.EnableChangeTracking();
+            // TODO: see if this could enable us to update UpdateDate without messing with change tracking
+            // and then we'd want to do it for scripts, stylesheets and partial views too (ie files)
+            // var xtemplate = template as Template;
+            // xtemplate.DisableChangeTracking();
+            // template.UpdateDate = fs.GetLastModified(filename).UtcDateTime;
+            // xtemplate.EnableChangeTracking();
 
             template.VirtualPath = fs.GetUrl(filename);
 
@@ -580,9 +579,8 @@ private void AddChildren(ITemplate[] all, List<ITemplate> descendants, string ma
         public bool ValidateTemplate(ITemplate template)
         {
             // get path
-            // TODO
-            //  templates should have a real Path somehow - but anyways
-            //  are we using Path for something else?!
+            // TODO: templates should have a real Path somehow - but anyways
+            // are we using Path for something else?!
             var path = template.VirtualPath;
 
             // get valid paths
@@ -652,7 +650,7 @@ private bool AliasAlreadExists(ITemplate template)
 
         private string EnsureUniqueAlias(ITemplate template, int attempts)
         {
-            //TODO: This is ported from the old data layer... pretty crap way of doing this but it works for now.
+            // TODO: This is ported from the old data layer... pretty crap way of doing this but it works for now.
             if (AliasAlreadExists(template))
                 return template.Alias + attempts;
             attempts++;
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
index b42060b6cc70..3935027adacd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
@@ -128,7 +128,7 @@ public EntityPermissionCollection GetPermissions(IReadOnlyUserGroup[] groups, bo
                 {
                     foreach (var nodeId in nodeIds)
                     {
-                        //TODO: We could/should change the EntityPermissionsCollection into a KeyedCollection and they key could be
+                        // TODO: We could/should change the EntityPermissionsCollection into a KeyedCollection and they key could be
                         // a struct of the nodeid + groupid so then we don't actually allocate this class just to check if it's not
                         // going to be included in the result!
 
@@ -444,7 +444,7 @@ private void RemoveAllUsersFromGroup(int groupId)
             /// <param name="userIds">Ids of users</param>
             private void AddUsersToGroup(int groupId, int[] userIds)
             {
-                //TODO: Check if the user exists?
+                // TODO: Check if the user exists?
                 foreach (var userId in userIds)
                 {
                     var dto = new User2UserGroupDto
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index fdd5fb0d8652..07ad6bcba968 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -169,7 +169,7 @@ public IDictionary<UserState, int> GetUserStates()
 
         public Guid CreateLoginSession(int userId, string requestingIpAddress, bool cleanStaleSessions = true)
         {
-            //TODO: I know this doesn't follow the normal repository conventions which would require us to create a UserSessionRepository
+            // TODO: I know this doesn't follow the normal repository conventions which would require us to create a UserSessionRepository
             //and also business logic models for these objects but that's just so overkill for what we are doing
             //and now that everything is properly in a transaction (Scope) there doesn't seem to be much reason for using that anymore
             var now = DateTime.UtcNow;
@@ -443,7 +443,7 @@ protected override void PersistNewItem(IUser entity)
             var userDto = UserFactory.BuildDto(entity);
 
             // check if we have a known config, we only want to store config for hashing
-            //TODO: This logic will need to be updated when we do http://issues.umbraco.org/issue/U4-10089
+            // TODO: This logic will need to be updated when we do http://issues.umbraco.org/issue/U4-10089
             if (PasswordConfigJson != null)
                 userDto.PasswordConfig = PasswordConfigJson;
 
@@ -538,7 +538,7 @@ protected override void PersistUpdatedItem(IUser entity)
                 }
 
                 // check if we have a known config, we only want to store config for hashing
-                //TODO: This logic will need to be updated when we do http://issues.umbraco.org/issue/U4-10089
+                // TODO: This logic will need to be updated when we do http://issues.umbraco.org/issue/U4-10089
                 if (PasswordConfigJson != null)
                 {
                     userDto.PasswordConfig = PasswordConfigJson;
@@ -573,7 +573,7 @@ protected override void PersistUpdatedItem(IUser entity)
                     : Database.Fetch<UserGroupDto>("SELECT * FROM umbracoUserGroup WHERE userGroupAlias IN (@aliases)", new { aliases = entity.Groups.Select(x => x.Alias) });
 
                 //first delete all
-                //TODO: We could do this a nicer way instead of "Nuke and Pave"
+                // TODO: We could do this a nicer way instead of "Nuke and Pave"
                 Database.Delete<User2UserGroupDto>("WHERE UserId = @UserId", new { UserId = entity.Id });
 
                 foreach (var groupDto in assigned)
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index d6ceeaa3e633..5b6a9afb0462 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -500,7 +500,7 @@ protected virtual string FormatDefaultValue(ColumnDefinition column)
             if (column.DefaultValue == null)
                 return string.Empty;
 
-            //hack - probably not needed with latest changes
+            // HACK: probably not needed with latest changes
             if (column.DefaultValue.ToString().ToLower().Equals("getdate()".ToLower()))
                 column.DefaultValue = SystemMethods.CurrentDateTime;
 
diff --git a/src/Umbraco.Core/PropertyEditors/Validators/DelimitedValueValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/DelimitedValueValidator.cs
index 3891d7952b34..c3dca609d263 100644
--- a/src/Umbraco.Core/PropertyEditors/Validators/DelimitedValueValidator.cs
+++ b/src/Umbraco.Core/PropertyEditors/Validators/DelimitedValueValidator.cs
@@ -23,7 +23,7 @@ internal sealed class DelimitedValueValidator : IManifestValueValidator
         /// <inheritdoc />
         public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
         {
-            //TODO: localize these!
+            // TODO: localize these!
             if (value != null)
             {
                 var delimiter = ",";
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs
index d4cee4762fe6..e04893716a64 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs
@@ -65,6 +65,6 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, Publ
             return sourceString;
         }
 
-        //TODO: Now to convert that to XPath!
+        // TODO: Now to convert that to XPath!
     }
 }
diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
index 83cc456127a5..8285b9b4fd30 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
@@ -73,7 +73,7 @@ public override void Compose(Composition composition)
             // register a server registrar, by default it's the db registrar
             composition.RegisterUnique<IServerRegistrar>(f =>
             {
-                // TODO this is a hack, use proper configuration!
+                // TODO: this is a hack, use proper configuration!
                 // also: we still register the full IServerMessenger because
                 // even on 1 single server we can have 2 concurrent app domains
                 var singleServer = "true".InvariantEquals(ConfigurationManager.AppSettings["umbracoDisableElectionForSingleServer"]);
diff --git a/src/Umbraco.Core/Scoping/ScopeContext.cs b/src/Umbraco.Core/Scoping/ScopeContext.cs
index 03a0da1a55e2..7b62c5c7a25d 100644
--- a/src/Umbraco.Core/Scoping/ScopeContext.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContext.cs
@@ -13,7 +13,7 @@ public void ScopeExit(bool completed)
             if (_enlisted == null)
                 return;
 
-            // TODO: - can we create infinite loops? - what about nested events? will they just be plainly ignored = really bad?
+            // TODO: can we create infinite loops? - what about nested events? will they just be plainly ignored = really bad?
             List<Exception> exceptions = null;
             List<IEnlistedObject> orderedEnlisted;
             while ((orderedEnlisted = _enlisted.Values.OrderBy(x => x.Priority).ToList()).Count > 0)
diff --git a/src/Umbraco.Core/Security/BackOfficeUserStore.cs b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
index 2d9469180a76..3d87482d60b2 100644
--- a/src/Umbraco.Core/Security/BackOfficeUserStore.cs
+++ b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
@@ -30,9 +30,9 @@ public class BackOfficeUserStore : DisposableObjectSlim,
         IUserTwoFactorStore<BackOfficeIdentityUser, int>,
         IUserSessionStore<BackOfficeIdentityUser, int>
 
-    //TODO: This would require additional columns/tables for now people will need to implement this on their own
+    // TODO: This would require additional columns/tables for now people will need to implement this on their own
     //IUserPhoneNumberStore<BackOfficeIdentityUser, int>,
-    //TODO: To do this we need to implement IQueryable -  we'll have an IQuerable implementation soon with the UmbracoLinqPadDriver implementation
+    // TODO: To do this we need to implement IQueryable -  we'll have an IQuerable implementation soon with the UmbracoLinqPadDriver implementation
     //IQueryableUserStore<BackOfficeIdentityUser, int>
     {
         private readonly IUserService _userService;
@@ -99,7 +99,7 @@ public Task CreateAsync(BackOfficeIdentityUser user)
 
             UpdateMemberProperties(userEntity, user);
 
-            //TODO: We should deal with Roles --> User Groups here which we currently are not doing
+            // TODO: We should deal with Roles --> User Groups here which we currently are not doing
 
             _userService.Save(userEntity);
 
@@ -720,7 +720,7 @@ private bool UpdateMemberProperties(IUser user, BackOfficeIdentityUser identityU
                 user.SecurityStamp = identityUser.SecurityStamp;
             }
 
-            //TODO: Fix this for Groups too
+            // TODO: Fix this for Groups too
             if (identityUser.IsPropertyDirty("Roles") || identityUser.IsPropertyDirty("Groups"))
             {
                 var userGroupAliases = user.Groups.Select(x => x.Alias).ToArray();
diff --git a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
index ff595a5d4550..8fc2cb77e446 100644
--- a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
+++ b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
@@ -161,7 +161,7 @@ public static bool IsUmbracoMembershipProvider(this MembershipProvider membershi
             return (membershipProvider is UmbracoMembershipProviderBase);
         }
 
-        //TODO: Add role provider checks too
+        // TODO: Add role provider checks too
 
         public static UmbracoMembershipProviderBase AsUmbracoMembershipProvider(this MembershipProvider membershipProvider)
         {
diff --git a/src/Umbraco.Core/Security/UserAwareMembershipProviderPasswordHasher.cs b/src/Umbraco.Core/Security/UserAwareMembershipProviderPasswordHasher.cs
index 7fecb30fbaed..e09c861caa55 100644
--- a/src/Umbraco.Core/Security/UserAwareMembershipProviderPasswordHasher.cs
+++ b/src/Umbraco.Core/Security/UserAwareMembershipProviderPasswordHasher.cs
@@ -15,14 +15,14 @@ public UserAwareMembershipProviderPasswordHasher(MembershipProviderBase provider
 
         public string HashPassword(BackOfficeIdentityUser user, string password)
         {
-            //TODO: Implement the logic for this, we need to lookup the password format for the user and hash accordingly: http://issues.umbraco.org/issue/U4-10089
+            // TODO: Implement the logic for this, we need to lookup the password format for the user and hash accordingly: http://issues.umbraco.org/issue/U4-10089
             //NOTE: For now this just falls back to the hashing we are currently using
             return base.HashPassword(password);
         }
 
         public PasswordVerificationResult VerifyHashedPassword(BackOfficeIdentityUser user, string hashedPassword, string providedPassword)
         {
-            //TODO: Implement the logic for this, we need to lookup the password format for the user and hash accordingly: http://issues.umbraco.org/issue/U4-10089
+            // TODO: Implement the logic for this, we need to lookup the password format for the user and hash accordingly: http://issues.umbraco.org/issue/U4-10089
             //NOTE: For now this just falls back to the hashing we are currently using
             return base.VerifyHashedPassword(hashedPassword, providedPassword);
         }
diff --git a/src/Umbraco.Core/Services/Implement/AuditService.cs b/src/Umbraco.Core/Services/Implement/AuditService.cs
index d02d7f541b07..46c851a7890d 100644
--- a/src/Umbraco.Core/Services/Implement/AuditService.cs
+++ b/src/Umbraco.Core/Services/Implement/AuditService.cs
@@ -200,7 +200,7 @@ public IAuditEntry Write(int performingUserId, string perfomingDetails, string p
             return entry;
         }
 
-        //TODO: Currently used in testing only, not part of the interface, need to add queryable methods to the interface instead
+        // TODO: Currently used in testing only, not part of the interface, need to add queryable methods to the interface instead
         internal IEnumerable<IAuditEntry> GetAll()
         {
             if (_isAvailable.Value == false) return Enumerable.Empty<IAuditEntry>();
@@ -211,7 +211,7 @@ internal IEnumerable<IAuditEntry> GetAll()
             }
         }
 
-        //TODO: Currently used in testing only, not part of the interface, need to add queryable methods to the interface instead
+        // TODO: Currently used in testing only, not part of the interface, need to add queryable methods to the interface instead
         internal IEnumerable<IAuditEntry> GetPage(long pageIndex, int pageCount, out long records)
         {
             if (_isAvailable.Value == false)
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index cbc2eeca7a66..266f34cc3729 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -778,7 +778,7 @@ public OperationResult Save(IContent content, int userId = 0, bool raiseEvents =
                 var culturesChanging = content.ContentType.VariesByCulture()
                     ? content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key).ToList()
                     : null;
-                //TODO: Currently there's no way to change track which variant properties have changed, we only have change
+                // TODO: Currently there's no way to change track which variant properties have changed, we only have change
                 // tracking enabled on all values on the Property which doesn't allow us to know which variants have changed.
                 // in this particular case, determining which cultures have changed works with the above with names since it will
                 // have always changed if it's been saved in the back office but that's not really fail safe.
@@ -1562,8 +1562,7 @@ void DoDelete(IContent c)
             DoDelete(content);
         }
 
-        //TODO:
-        // both DeleteVersions methods below have an issue. Sort of. They do NOT take care of files the way
+        //TODO: both DeleteVersions methods below have an issue. Sort of. They do NOT take care of files the way
         // Delete does - for a good reason: the file may be referenced by other, non-deleted, versions. BUT,
         // if that's not the case, then the file will never be deleted, because when we delete the content,
         // the version referencing the file will not be there anymore. SO, we can leak files.
@@ -2001,7 +2000,7 @@ public bool SendToPublication(IContent content, int userId = 0)
                     ? string.Join(",", content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key))
                     : null;
 
-                //TODO: Currently there's no way to change track which variant properties have changed, we only have change
+                // TODO: Currently there's no way to change track which variant properties have changed, we only have change
                 // tracking enabled on all values on the Property which doesn't allow us to know which variants have changed.
                 // in this particular case, determining which cultures have changed works with the above with names since it will
                 // have always changed if it's been saved in the back office but that's not really fail safe.
@@ -2553,7 +2552,7 @@ private PublishResult StrategyUnpublish(IScope scope, IContent content, int user
         /// <param name="userId">Optional Id of the user issuing the delete operation</param>
         public void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
         {
-            //TODO: This currently this is called from the ContentTypeService but that needs to change,
+            // TODO: This currently this is called from the ContentTypeService but that needs to change,
             // if we are deleting a content type, we should just delete the data and do this operation slightly differently.
             // This method will recursively go lookup every content item, check if any of it's descendants are
             // of a different type, move them to the recycle bin, then permanently delete the content items.
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index 0cac249cdff0..bf43693d3ba0 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -134,7 +134,7 @@ internal IEnumerable<ContentTypeChange<TItem>> ComposeContentTypeChanges(params
                 var dirty = (IRememberBeingDirty)contentType;
 
                 // skip new content types
-                //TODO: This used to be WasPropertyDirty("HasIdentity") but i don't think that actually worked for detecting new entities this does seem to work properly
+                // TODO: This used to be WasPropertyDirty("HasIdentity") but i don't think that actually worked for detecting new entities this does seem to work properly
                 var isNewContentType = dirty.WasPropertyDirty("Id");
                 if (isNewContentType)
                 {
@@ -152,7 +152,7 @@ internal IEnumerable<ContentTypeChange<TItem>> ComposeContentTypeChanges(params
                         throw new Exception("oops");
 
                     // skip new properties
-                    //TODO: This used to be WasPropertyDirty("HasIdentity") but i don't think that actually worked for detecting new entities this does seem to work properly
+                    // TODO: This used to be WasPropertyDirty("HasIdentity") but i don't think that actually worked for detecting new entities this does seem to work properly
                     var isNewProperty = dirtyProperty.WasPropertyDirty("Id");
                     if (isNewProperty) return false;
 
@@ -758,7 +758,7 @@ public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateCont
 
                     saveEventArgs.CanCancel = false;
                     OnSavedContainer(scope, saveEventArgs);
-                    //TODO: Audit trail ?
+                    // TODO: Audit trail ?
 
                     return OperationResult.Attempt.Succeed(evtMsgs, container);
                 }
@@ -805,7 +805,7 @@ public Attempt<OperationResult> SaveContainer(EntityContainer container, int use
                 OnSavedContainer(scope, args);
             }
 
-            //TODO: Audit trail ?
+            // TODO: Audit trail ?
 
             return OperationResult.Attempt.Succeed(evtMsgs);
         }
@@ -897,7 +897,7 @@ public Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0)
                 OnDeletedContainer(scope, deleteEventArgs);
 
                 return OperationResult.Attempt.Succeed(evtMsgs);
-                //TODO: Audit trail ?
+                // TODO: Audit trail ?
             }
         }
 
diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 4c588157d000..97368e9047c2 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -62,7 +62,7 @@ public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateCont
                     scope.Complete();
 
                     scope.Events.Dispatch(SavedContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs));
-                    //TODO: Audit trail ?
+                    // TODO: Audit trail ?
 
                     return OperationResult.Attempt.Succeed(evtMsgs, container);
                 }
@@ -149,7 +149,7 @@ public Attempt<OperationResult> SaveContainer(EntityContainer container, int use
                 scope.Complete();
             }
 
-            //TODO: Audit trail ?
+            // TODO: Audit trail ?
             return OperationResult.Attempt.Succeed(evtMsgs);
         }
 
@@ -182,7 +182,7 @@ public Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0)
                 scope.Complete();
             }
 
-            //TODO: Audit trail ?
+            // TODO: Audit trail ?
             return OperationResult.Attempt.Succeed(evtMsgs);
         }
 
diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index 36b4af6d5ec7..f49395d73d55 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -1039,7 +1039,7 @@ private void Audit(AuditType type, int userId, int objectId, string entityType)
             _auditRepository.Save(new AuditItem(objectId, type, userId, entityType));
         }
 
-        //TODO Method to change name and/or alias of view template
+        // TODO: Method to change name and/or alias of view template
 
         #region Event Handlers
 
diff --git a/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs b/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs
index 9401cefa7d66..4f5121def75a 100644
--- a/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs
+++ b/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs
@@ -8,7 +8,7 @@
 
 namespace Umbraco.Core.Services.Implement
 {
-    //TODO: Convert all of this over to Niels K's localization framework one day
+    // TODO: Convert all of this over to Niels K's localization framework one day
 
     public class LocalizedTextService : ILocalizedTextService
     {
@@ -58,7 +58,7 @@ public string Localize(string key, CultureInfo culture, IDictionary<string, stri
         {
             if (culture == null) throw new ArgumentNullException(nameof(culture));
 
-            //TODO: Hack, see notes on ConvertToSupportedCultureWithRegionCode
+            // TODO: Hack, see notes on ConvertToSupportedCultureWithRegionCode
             culture = ConvertToSupportedCultureWithRegionCode(culture);
 
             //This is what the legacy ui service did
@@ -91,7 +91,7 @@ public IDictionary<string, string> GetAllStoredValues(CultureInfo culture)
         {
             if (culture == null) throw new ArgumentNullException("culture");
 
-            //TODO: Hack, see notes on ConvertToSupportedCultureWithRegionCode
+            // TODO: Hack, see notes on ConvertToSupportedCultureWithRegionCode
             culture = ConvertToSupportedCultureWithRegionCode(culture);
 
             var result = new Dictionary<string, string>();
diff --git a/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs b/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
index f19dd9f63e72..a0b952a75aa1 100644
--- a/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
+++ b/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
@@ -21,7 +21,7 @@ public class LocalizedTextServiceFileSources
         private readonly IEnumerable<LocalizedTextServiceSupplementaryFileSource> _supplementFileSources;
         private readonly DirectoryInfo _fileSourceFolder;
 
-        //TODO: See other notes in this class, this is purely a hack because we store 2 letter culture file names that contain 4 letter cultures :(
+        // TODO: See other notes in this class, this is purely a hack because we store 2 letter culture file names that contain 4 letter cultures :(
         private readonly Dictionary<string, CultureInfo> _twoLetterCultureConverter = new Dictionary<string, CultureInfo>();
 
         private readonly Lazy<Dictionary<CultureInfo, Lazy<XDocument>>> _xmlSources;
@@ -60,7 +60,7 @@ public LocalizedTextServiceFileSources(
                     var localCopy = fileInfo;
                     var filename = Path.GetFileNameWithoutExtension(localCopy.FullName).Replace("_", "-");
 
-                    //TODO: Fix this nonsense... would have to wait until v8 to store the language files with their correct
+                    // TODO: Fix this nonsense... would have to wait until v8 to store the language files with their correct
                     // names instead of storing them as 2 letters but actually having a 4 letter culture. wtf. So now, we
                     // need to check if the file is 2 letters, then open it to try to find it's 4 letter culture, then use that
                     // if it's successful. We're going to assume (though it seems assuming in the legacy logic is never a great idea)
@@ -150,7 +150,7 @@ public IDictionary<CultureInfo, Lazy<XDocument>> GetXmlSources()
             return _xmlSources.Value;
         }
 
-        //TODO: See other notes in this class, this is purely a hack because we store 2 letter culture file names that contain 4 letter cultures :(
+        // TODO: See other notes in this class, this is purely a hack because we store 2 letter culture file names that contain 4 letter cultures :(
         public Attempt<CultureInfo> TryConvert2LetterCultureTo4Letter(string twoLetterCulture)
         {
             if (twoLetterCulture.Length != 2) return Attempt<CultureInfo>.Fail();
@@ -163,7 +163,7 @@ public Attempt<CultureInfo> TryConvert2LetterCultureTo4Letter(string twoLetterCu
                 : Attempt<CultureInfo>.Fail();
         }
 
-        //TODO: See other notes in this class, this is purely a hack because we store 2 letter culture file names that contain 4 letter cultures :(
+        // TODO: See other notes in this class, this is purely a hack because we store 2 letter culture file names that contain 4 letter cultures :(
         public Attempt<string> TryConvert4LetterCultureTo2Letter(CultureInfo culture)
         {
             if (culture == null) throw new ArgumentNullException("culture");
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index 9ca7892f621c..e7a42e28e48b 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -773,8 +773,7 @@ void DoDelete(IMedia c)
             DoDelete(media);
         }
 
-        //TODO:
-        // both DeleteVersions methods below have an issue. Sort of. They do NOT take care of files the way
+        //TODO: both DeleteVersions methods below have an issue. Sort of. They do NOT take care of files the way
         // Delete does - for a good reason: the file may be referenced by other, non-deleted, versions. BUT,
         // if that's not the case, then the file will never be deleted, because when we delete the media,
         // the version referencing the file will not be there anymore. SO, we can leak files.
@@ -1276,7 +1275,7 @@ public long GetMediaFileSize(string filepath)
         /// <param name="userId">Optional id of the user deleting the media</param>
         public void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = 0)
         {
-            //TODO: This currently this is called from the ContentTypeService but that needs to change,
+            // TODO: This currently this is called from the ContentTypeService but that needs to change,
             // if we are deleting a content type, we should just delete the data and do this operation slightly differently.
             // This method will recursively go lookup every content item, check if any of it's descendants are
             // of a different type, move them to the recycle bin, then permanently delete the content items.
diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs
index b7afaea1beff..3b3589676910 100644
--- a/src/Umbraco.Core/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberService.cs
@@ -449,7 +449,7 @@ public IMember GetByEmail(string email)
         /// <returns><see cref="IMember"/></returns>
         public IMember GetByUsername(string username)
         {
-            //TODO: Somewhere in here, whether at this level or the repository level, we need to add
+            // TODO: Somewhere in here, whether at this level or the repository level, we need to add
             // a caching mechanism since this method is used by all the membership providers and could be
             // called quite a bit when dealing with members.
 
@@ -770,8 +770,8 @@ public IEnumerable<IMember> GetMembersByPropertyValue(string propertyTypeAlias,
                         throw new ArgumentOutOfRangeException(nameof(matchType)); // causes rollback // causes rollback
                 }
 
-                //TODO: Since this is by property value, we need a GetByPropertyQuery on the repo!
-                //TODO: Since this is by property value, we need a GetByPropertyQuery on the repo!
+                // TODO: Since this is by property value, we need a GetByPropertyQuery on the repo!
+                // TODO: Since this is by property value, we need a GetByPropertyQuery on the repo!
                 return _memberRepository.Get(query);
             }
         }
@@ -1330,8 +1330,8 @@ public void DeleteMembersOfType(int memberTypeId)
             {
                 scope.WriteLock(Constants.Locks.MemberTree);
 
-                //TODO: What about content that has the contenttype as part of its composition?
-                //TODO: What about content that has the contenttype as part of its composition?
+                // TODO: What about content that has the contenttype as part of its composition?
+                // TODO: What about content that has the contenttype as part of its composition?
                 var query = Query<IMember>().Where(x => x.ContentTypeId == memberTypeId);
 
                 var members = _memberRepository.Get(query).ToArray();
diff --git a/src/Umbraco.Core/Services/Implement/NotificationService.cs b/src/Umbraco.Core/Services/Implement/NotificationService.cs
index 95353715e117..d981809364d3 100644
--- a/src/Umbraco.Core/Services/Implement/NotificationService.cs
+++ b/src/Umbraco.Core/Services/Implement/NotificationService.cs
@@ -394,7 +394,7 @@ private NotificationRequest CreateNotificationRequest(IUser performingUser, IUse
                 content.Id.ToString(CultureInfo.InvariantCulture),
                 string.Format("{2}://{0}/{1}",
                     string.Concat(siteUri.Authority),
-                    //TODO: RE-enable this so we can have a nice url
+                    // TODO: RE-enable this so we can have a nice url
                     /*umbraco.library.NiceUrl(documentObject.Id))*/
                     string.Concat(content.Id, ".aspx"),
                     protocol),
diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index e2c64d2f299b..0ea77dedcc3f 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -109,7 +109,7 @@ private IUser CreateUserWithIdentity(string username, string email, string passw
         {
             if (string.IsNullOrWhiteSpace(username)) throw new ArgumentNullOrEmptyException(nameof(username));
 
-            //TODO: PUT lock here!!
+            // TODO: PUT lock here!!
 
             User user;
             using (var scope = ScopeProvider.CreateScope())
@@ -1218,7 +1218,7 @@ private static void AddAdditionalPermissions(List<string> assignedPermissions, s
         /// </summary>
         public static event TypedEventHandler<IUserService, DeleteEventArgs<IUserGroup>> DeletedUserGroup;
 
-        //TODO: still don't know if we need this yet unless we start caching permissions, but that also means we'll need another
+        // TODO: still don't know if we need this yet unless we start caching permissions, but that also means we'll need another
         // event on the ContentService since there's a method there to modify node permissions too, or we can proxy events if needed.
         internal static event TypedEventHandler<IUserService, SaveEventArgs<EntityPermission>> UserGroupPermissionsAssigned;
     }
diff --git a/src/Umbraco.Core/Services/OperationResultType.cs b/src/Umbraco.Core/Services/OperationResultType.cs
index 2998692c13e5..918f1c49fa61 100644
--- a/src/Umbraco.Core/Services/OperationResultType.cs
+++ b/src/Umbraco.Core/Services/OperationResultType.cs
@@ -40,6 +40,6 @@ public enum OperationResultType : byte
         /// </summary>
         NoOperation = Failed | 6, // TODO: shouldn't it be a success?
 
-        //TODO: In the future, we might need to add more operations statuses, potentially like 'FailedByPermissions', etc...
+        // TODO: In the future, we might need to add more operations statuses, potentially like 'FailedByPermissions', etc...
     }
 }
diff --git a/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs
index b326a3cda604..12d2ef9a17f0 100644
--- a/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs
+++ b/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs
@@ -20,7 +20,7 @@ public interface IUrlSegmentProvider
         /// url per culture.</remarks>
         string GetUrlSegment(IContentBase content, string culture = null);
 
-        //TODO: For the 301 tracking, we need to add another extended interface to this so that
+        // TODO: For the 301 tracking, we need to add another extended interface to this so that
         // the RedirectTrackingEventHandler can ask the IUrlSegmentProvider if the URL is changing.
         // Currently the way it works is very hacky, see notes in: RedirectTrackingEventHandler.ContentService_Publishing
     }
diff --git a/src/Umbraco.Core/Sync/IServerAddress.cs b/src/Umbraco.Core/Sync/IServerAddress.cs
index 42567c67c19b..be74b8483fd4 100644
--- a/src/Umbraco.Core/Sync/IServerAddress.cs
+++ b/src/Umbraco.Core/Sync/IServerAddress.cs
@@ -10,6 +10,6 @@ public interface IServerAddress
         /// </summary>
         string ServerAddress { get; }
 
-        //TODO : Should probably add things like port, protocol, server name, app id
+        // TODO: Should probably add things like port, protocol, server name, app id
     }
 }
diff --git a/src/Umbraco.Core/TypeExtensions.cs b/src/Umbraco.Core/TypeExtensions.cs
index 56b2026afb0c..1582b603d38f 100644
--- a/src/Umbraco.Core/TypeExtensions.cs
+++ b/src/Umbraco.Core/TypeExtensions.cs
@@ -55,7 +55,7 @@ internal static Attempt<object> GetMemberIgnoreCase(this Type type, object targe
                     ? getMember(memberName.ToCleanString(CleanStringType.Ascii | CleanStringType.ConvertCase | CleanStringType.CamelCase))
                     : getMember(memberName.ToCleanString(CleanStringType.Ascii | CleanStringType.ConvertCase | CleanStringType.PascalCase));
 
-                //TODO: If this still fails then we should get a list of properties from the object and then compare - doing the above without listing
+                // TODO: If this still fails then we should get a list of properties from the object and then compare - doing the above without listing
                 // all properties will surely be faster than using reflection to get ALL properties first and then query against them.
             }
 
diff --git a/src/Umbraco.Core/UdiEntityType.cs b/src/Umbraco.Core/UdiEntityType.cs
index 07bde1ba9355..86197ce6a855 100644
--- a/src/Umbraco.Core/UdiEntityType.cs
+++ b/src/Umbraco.Core/UdiEntityType.cs
@@ -78,7 +78,7 @@ internal static Dictionary<string, UdiType> GetTypes()
             public const string DocumentType = "document-type";
             public const string DocumentTypeContainer = "document-type-container";
 
-            //TODO: What is this? This alias is only used for the blue print tree to render the blueprint's document type, it's not a real udi type
+            // TODO: What is this? This alias is only used for the blue print tree to render the blueprint's document type, it's not a real udi type
             public const string DocumentTypeBluePrints = "document-type-blueprints";
             public const string MediaType = "media-type";
             public const string MediaTypeContainer = "media-type-container";
diff --git a/src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs b/src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs
index afe9831b72ce..b31fa6a8df7f 100644
--- a/src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs
+++ b/src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs
@@ -31,7 +31,7 @@ public static string ParseXPathQuery(
             Func<int, bool> publishedContentExists)
         {
 
-            //TODO: This should probably support some of the old syntax and token replacements, currently
+            // TODO: This should probably support some of the old syntax and token replacements, currently
             // it does not, there is a ticket raised here about it: http://issues.umbraco.org/issue/U4-6364
             // previous tokens were: "$currentPage", "$ancestorOrSelf", "$parentPage" and I believe they were
             // allowed 'inline', not just at the beginning... whether or not we want to support that is up
@@ -97,7 +97,7 @@ public static string ParseXPathQuery(
                 });
             }
 
-            //TODO: This used to just replace $root with string.Empty BUT, that would never work
+            // TODO: This used to just replace $root with string.Empty BUT, that would never work
             // the root is always "/root . Need to confirm with Per why this was string.Empty before!
             vars.Add("$root", q => q.Replace("$root", "/root"));
 
diff --git a/src/Umbraco.Core/Xml/XPath/INavigableContent.cs b/src/Umbraco.Core/Xml/XPath/INavigableContent.cs
index c48b91893acb..eeb789172609 100644
--- a/src/Umbraco.Core/Xml/XPath/INavigableContent.cs
+++ b/src/Umbraco.Core/Xml/XPath/INavigableContent.cs
@@ -45,7 +45,7 @@ interface INavigableContent
         /// </remarks>
         object Value(int index);
 
-        // TODO implement the following one
+        // TODO: implement the following one
 
         ///// <summary>
         ///// Gets the value of a field of the navigable content, for a specified language.
diff --git a/src/Umbraco.Examine/ContentValueSetBuilder.cs b/src/Umbraco.Examine/ContentValueSetBuilder.cs
index a6262c53fc52..5e0197765ddc 100644
--- a/src/Umbraco.Examine/ContentValueSetBuilder.cs
+++ b/src/Umbraco.Examine/ContentValueSetBuilder.cs
@@ -29,7 +29,7 @@ public ContentValueSetBuilder(PropertyEditorCollection propertyEditors,
         /// <inheritdoc />
         public override IEnumerable<ValueSet> GetValueSets(params IContent[] content)
         {
-            //TODO: There is a lot of boxing going on here and ultimately all values will be boxed by Lucene anyways
+            // TODO: There is a lot of boxing going on here and ultimately all values will be boxed by Lucene anyways
             // but I wonder if there's a way to reduce the boxing that we have to do or if it will matter in the end since
             // Lucene will do it no matter what? One idea was to create a `FieldValue` struct which would contain `object`, `object[]`, `ValueType` and `ValueType[]`
             // references and then each array is an array of `FieldValue[]` and values are assigned accordingly. Not sure if it will make a difference or not.
diff --git a/src/Umbraco.Examine/ExamineExtensions.cs b/src/Umbraco.Examine/ExamineExtensions.cs
index 4fe6c359d797..19171ac6b119 100644
--- a/src/Umbraco.Examine/ExamineExtensions.cs
+++ b/src/Umbraco.Examine/ExamineExtensions.cs
@@ -48,7 +48,7 @@ public static IEnumerable<string> GetCultureFields(this IUmbracoIndex index, str
 
         internal static bool TryParseLuceneQuery(string query)
         {
-            //TODO: I'd assume there would be a more strict way to parse the query but not that i can find yet, for now we'll
+            // TODO: I'd assume there would be a more strict way to parse the query but not that i can find yet, for now we'll
             // also do this rudimentary check
             if (!query.Contains(":"))
                 return false;
diff --git a/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs
index ee2e75cfadeb..d6dc1f8c73fc 100644
--- a/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs
+++ b/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs
@@ -22,7 +22,7 @@ public class BulkInsertBenchmarks
     {
         private static byte[] _initDbBytes;
 
-        // fixme - should run on LocalDb same as NPoco tests!
+        // FIXME: should run on LocalDb same as NPoco tests!
 
         private IUmbracoDatabase GetSqlServerDatabase(ILogger logger)
         {
diff --git a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
index 3532a11c6304..e9448bd0fc1d 100644
--- a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
+++ b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
@@ -32,7 +32,7 @@ protected override void Compose(Composition composition)
         [Test]
         public void Can_Find_All_Event_Handlers()
         {
-            // fixme - cannot work with mocks
+            // FIXME: cannot work with mocks
             // because the events are defined on actual static classes, not on the interfaces, so name matching fails
             // we should really refactor events entirely - in the meantime, let it be an UmbracoTestBase ;(
             //var testObjects = new TestObjects(null);
diff --git a/src/Umbraco.Tests/Clr/ReflectionUtilitiesTests.cs b/src/Umbraco.Tests/Clr/ReflectionUtilitiesTests.cs
index f40ca3f50083..0431e7d69f85 100644
--- a/src/Umbraco.Tests/Clr/ReflectionUtilitiesTests.cs
+++ b/src/Umbraco.Tests/Clr/ReflectionUtilitiesTests.cs
@@ -309,7 +309,7 @@ public void PropertySetterCanCastUnsafeValue()
             setterInt4(object4, 42);
             Assert.AreEqual(42, object4.IntValue);
 
-            // fixme the code below runs fine with ReSharper test running within VisualStudio
+            // FIXME: the code below runs fine with ReSharper test running within VisualStudio
             // but it crashes when running via vstest.console.exe - unless some settings are required?
 
             // converting works
@@ -552,7 +552,7 @@ public void EmitFieldGetterSetterEmits()
             Assert.AreEqual(44, getter3(c));
         }
 
-        // fixme - missing tests specifying 'returned' on method, property
+        // FIXME: missing tests specifying 'returned' on method, property
 
         [Test]
         public void DeconstructAnonymousType()
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index a04636f919a1..390bb018dab4 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -23,7 +23,7 @@ public class ComponentTests
 
         private static IFactory MockFactory(Action<Mock<IFactory>> setup = null)
         {
-            // fixme use IUmbracoDatabaseFactory vs UmbracoDatabaseFactory, clean it all up!
+            // FIXME: use IUmbracoDatabaseFactory vs UmbracoDatabaseFactory, clean it all up!
 
             var mock = new Mock<IFactory>();
 
@@ -444,7 +444,7 @@ public class Composer25 : TestComposerBase, IComposer23
 
         #region TypeArray
 
-        // fixme - move to Testing
+        // FIXME: move to Testing
 
         private static Type[] TypeArray<T1>()
         {
diff --git a/src/Umbraco.Tests/Composing/ContainerConformingTests.cs b/src/Umbraco.Tests/Composing/ContainerConformingTests.cs
index 21ea961636c6..86226b82e73e 100644
--- a/src/Umbraco.Tests/Composing/ContainerConformingTests.cs
+++ b/src/Umbraco.Tests/Composing/ContainerConformingTests.cs
@@ -143,12 +143,11 @@ public void NonSingletonServiceIsNotUnique()
         }
 
         [Test]
-        public void SingletonServiceIsUnique() // fixme - but what is LightInject actually doing
+        public void SingletonServiceIsUnique() // FIXME: but what is LightInject actually doing
         {
             var register = GetRegister();
 
-            // fixme
-            // LightInject is 'unique' per serviceType+serviceName
+            // FIXME: LightInject is 'unique' per serviceType+serviceName
             // but that's not how all containers work
             // and we should not rely on it
             // if we need unique, use RegisterUnique
diff --git a/src/Umbraco.Tests/CoreThings/UdiTests.cs b/src/Umbraco.Tests/CoreThings/UdiTests.cs
index 35080e8c247e..c700b78c4bb8 100644
--- a/src/Umbraco.Tests/CoreThings/UdiTests.cs
+++ b/src/Umbraco.Tests/CoreThings/UdiTests.cs
@@ -22,7 +22,7 @@ public class UdiTests
         [SetUp]
         public void SetUp()
         {
-            // fixme - bad in a unit test - but Udi has a static ctor that wants it?!
+            // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var container = new Mock<IFactory>();
             var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
             container.Setup(x => x.GetInstance(typeof(TypeLoader))).Returns(
diff --git a/src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs b/src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
index 088ef6b54b29..1c0b407ac66d 100644
--- a/src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
@@ -406,7 +406,7 @@ out Udi result
 
         private void SetUpDependencyContainer()
         {
-            // fixme - bad in a unit test - but Udi has a static ctor that wants it?!
+            // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var container = new Mock<IFactory>();
             var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
 
diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs
index 52de1bbcfa42..1f98fd4443ca 100644
--- a/src/Umbraco.Tests/IO/FileSystemsTests.cs
+++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs
@@ -122,7 +122,7 @@ public void Can_Delete_MediaFiles()
         }
 
 
-        // fixme - don't make sense anymore
+        // FIXME: don't make sense anymore
         /*
         [Test]
         public void Cannot_Get_InvalidFileSystem()
diff --git a/src/Umbraco.Tests/Logging/LogviewerTests.cs b/src/Umbraco.Tests/Logging/LogviewerTests.cs
index 2feac2ae5fed..75e2c66a6121 100644
--- a/src/Umbraco.Tests/Logging/LogviewerTests.cs
+++ b/src/Umbraco.Tests/Logging/LogviewerTests.cs
@@ -199,7 +199,7 @@ public void Log_Search_Can_Persist()
             Assert.IsNotNull(findItem, "We should have found the saved search, but get no results");
             Assert.AreEqual(1, findItem.Count(), "Our list of searches should only contain one result");
 
-            //TODO: Need someone to help me find out why these don't work
+            // TODO: Need someone to help me find out why these don't work
             //CollectionAssert.Contains(searches, savedSearch, "Can not find the new search that was saved");
             //Assert.That(searches, Contains.Item(savedSearch));
 
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index 4e791c016905..051c660c66d9 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -337,12 +337,12 @@ public void CanParseManifest_GridEditors()
             Assert.AreEqual(2, config.Count);
             Assert.IsTrue(config.ContainsKey("image"));
             var c = config["image"];
-            Assert.IsInstanceOf<JObject>(c); // fixme - is this what we want?
+            Assert.IsInstanceOf<JObject>(c); // FIXME: is this what we want?
             Assert.IsTrue(config.ContainsKey("link"));
             c = config["link"];
-            Assert.IsInstanceOf<JObject>(c); // fixme - is this what we want?
+            Assert.IsInstanceOf<JObject>(c); // FIXME: is this what we want?
 
-            // fixme - should we resolveUrl in configs?
+            // FIXME: should we resolveUrl in configs?
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs b/src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
index f1f46133c361..091ea6f9a09d 100644
--- a/src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
+++ b/src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
@@ -120,8 +120,7 @@ public void GetPassword_With_Hashed()
             Assert.Throws<ProviderException>(() => provider.GetPassword("test", "test"));
         }
 
-        // fixme
-        // in v7 this test relies on ApplicationContext.Current being null, which makes little
+        // FIXME: in v7 this test relies on ApplicationContext.Current being null, which makes little
         // sense, not going to port the weird code in MembershipProviderBase.ResetPassword, so
         // what shall we do?
         [Test]
diff --git a/src/Umbraco.Tests/Misc/UriUtilityTests.cs b/src/Umbraco.Tests/Misc/UriUtilityTests.cs
index 42c69d39673d..3dbd54c3a902 100644
--- a/src/Umbraco.Tests/Misc/UriUtilityTests.cs
+++ b/src/Umbraco.Tests/Misc/UriUtilityTests.cs
@@ -7,7 +7,7 @@
 
 namespace Umbraco.Tests.Misc
 {
-    // fixme - not testing virtual directory!
+    // FIXME: not testing virtual directory!
 
     [TestFixture]
     public class UriUtilityTests
diff --git a/src/Umbraco.Tests/Models/LightEntityTest.cs b/src/Umbraco.Tests/Models/LightEntityTest.cs
index 1ec9f05822b2..f1752a7681ab 100644
--- a/src/Umbraco.Tests/Models/LightEntityTest.cs
+++ b/src/Umbraco.Tests/Models/LightEntityTest.cs
@@ -42,7 +42,7 @@ public void Can_Serialize_Without_Error()
 
             var result = ss.ToStream(item);
             var json = result.ResultStream.ToJsonString();
-            Debug.Print(json); // fixme compare with v7
+            Debug.Print(json); // FIXME: compare with v7
         }
     }
 }
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
index b2d1440010d0..0de416ed72e1 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
@@ -32,7 +32,7 @@ public override void SetUp()
         {
             base.SetUp();
 
-            // fixme - are we initializing mappers that... have already been?
+            // FIXME: are we initializing mappers that... have already been?
             Mapper.Reset();
             Mapper.Initialize(configuration =>
             {
@@ -97,7 +97,7 @@ public void MemberTypeSave_To_IMemberType()
             Assert.AreEqual(display.CreateDate, result.CreateDate);
             Assert.AreEqual(display.UpdateDate, result.UpdateDate);
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
             Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
             for (var i = 0; i < display.Groups.Count(); i++)
             {
@@ -157,7 +157,7 @@ public void MediaTypeSave_To_IMediaType()
             Assert.AreEqual(display.CreateDate, result.CreateDate);
             Assert.AreEqual(display.UpdateDate, result.UpdateDate);
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
             Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
             for (var i = 0; i < display.Groups.Count(); i++)
             {
@@ -221,7 +221,7 @@ public void ContentTypeSave_To_IContentType()
             Assert.AreEqual(display.CreateDate, result.CreateDate);
             Assert.AreEqual(display.UpdateDate, result.UpdateDate);
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
             Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
             for (var i = 0; i < display.Groups.Count(); i++)
             {
@@ -276,7 +276,7 @@ public void MediaTypeSave_With_Composition_To_IMediaType()
 
             //Assert
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
             Assert.AreEqual(display.Groups.Count(x => x.Inherited == false), result.PropertyGroups.Count);
         }
 
@@ -303,7 +303,7 @@ public void ContentTypeSave_With_Composition_To_IContentType()
 
             //Assert
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
             Assert.AreEqual(display.Groups.Count(x => x.Inherited == false), result.PropertyGroups.Count);
         }
 
@@ -337,7 +337,7 @@ public void IMemberType_To_MemberTypeDisplay()
             Assert.AreEqual(memberType.CreateDate, result.CreateDate);
             Assert.AreEqual(memberType.UpdateDate, result.UpdateDate);
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
 
             Assert.AreEqual(memberType.PropertyGroups.Count(), result.Groups.Count());
             for (var i = 0; i < memberType.PropertyGroups.Count(); i++)
@@ -393,7 +393,7 @@ public void IMediaType_To_MediaTypeDisplay()
             Assert.AreEqual(mediaType.CreateDate, result.CreateDate);
             Assert.AreEqual(mediaType.UpdateDate, result.UpdateDate);
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
 
             Assert.AreEqual(mediaType.PropertyGroups.Count(), result.Groups.Count());
             for (var i = 0; i < mediaType.PropertyGroups.Count(); i++)
@@ -447,7 +447,7 @@ public void IContentType_To_ContentTypeDisplay()
             Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
             Assert.AreEqual(contentType.DefaultTemplate.Alias, result.DefaultTemplate.Alias);
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
 
             Assert.AreEqual(contentType.PropertyGroups.Count, result.Groups.Count());
             for (var i = 0; i < contentType.PropertyGroups.Count; i++)
@@ -748,7 +748,7 @@ public void IMediaTypeComposition_To_MediaTypeDisplay()
             Assert.AreEqual(contentType.CreateDate, result.CreateDate);
             Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
 
             Assert.AreEqual(contentType.CompositionPropertyGroups.Select(x => x.Name).Distinct().Count(), result.Groups.Count(x => x.IsGenericProperties == false));
             Assert.AreEqual(1, result.Groups.Count(x => x.IsGenericProperties));
@@ -830,7 +830,7 @@ public void IContentTypeComposition_To_ContentTypeDisplay()
             Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
             Assert.AreEqual(contentType.DefaultTemplate.Alias, result.DefaultTemplate.Alias);
 
-            //TODO: Now we need to assert all of the more complicated parts
+            // TODO: Now we need to assert all of the more complicated parts
 
             Assert.AreEqual(contentType.CompositionPropertyGroups.Select(x => x.Name).Distinct().Count(), result.Groups.Count(x => x.IsGenericProperties == false));
             Assert.AreEqual(1, result.Groups.Count(x => x.IsGenericProperties));
diff --git a/src/Umbraco.Tests/Models/Mapping/UserModelMapperTests.cs b/src/Umbraco.Tests/Models/Mapping/UserModelMapperTests.cs
index f1dea9b5874b..bdab736cd1c1 100644
--- a/src/Umbraco.Tests/Models/Mapping/UserModelMapperTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/UserModelMapperTests.cs
@@ -28,7 +28,7 @@ public void Map_UserGroupSave_To_IUserGroup()
             var userGroupSave = JsonConvert.DeserializeObject<UserGroupSave>(json.Replace("@@@ID@@@", userGroup.Id.ToString()));
 
             // failed, AutoMapper complained, "Unable to cast object of type 'WhereSelectArrayIterator`2[System.Char,System.String]' to type 'System.Collections.IList'".
-            // fixmed: added ToList() in UserGroupFactory
+            // FIXME: added ToList() in UserGroupFactory
             Mapper.Map(userGroupSave, userGroup);
         }
     }
diff --git a/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs
index 010572abeca6..df4071281cfe 100644
--- a/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs
+++ b/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs
@@ -137,7 +137,7 @@ public void Update()
             def = PackageBuilder.GetById(def.Id);
             Assert.AreEqual("updated", def.Name);
             Assert.AreEqual(2, def.Files.Count);
-            //TODO: There's a whole lot more assertions to be done
+            // TODO: There's a whole lot more assertions to be done
 
         }
 
@@ -191,7 +191,7 @@ public void Export()
 
                     Assert.AreEqual("<Actions><Action alias=\"test\" /></Actions>", xml.Element("umbPackage").Element("Actions").ToString(SaveOptions.DisableFormatting));
 
-                    //TODO: There's a whole lot more assertions to be done
+                    // TODO: There's a whole lot more assertions to be done
                 }
             }
         }
diff --git a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs
index 4256a66a2d16..731ce73d3dc8 100644
--- a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs
+++ b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs
@@ -126,7 +126,7 @@ public void Can_Read_Compiled_Package_Warnings()
             Assert.AreEqual(1, preInstallWarnings.FilesReplaced.Count());
             Assert.AreEqual("bin\\Auros.DocumentTypePicker.dll", preInstallWarnings.FilesReplaced.First());
 
-            //TODO: More Asserts
+            // TODO: More Asserts
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
index 32689fe19221..c276dc35ca7e 100644
--- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
+++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -54,7 +54,7 @@ public void GetDatabaseType()
         }
 
         [Test]
-        public void CreateDatabase() // fixme - move to DatabaseBuilderTest!
+        public void CreateDatabase() // FIXME: move to DatabaseBuilderTest!
         {
             var path = TestHelper.CurrentAssemblyDirectory;
             AppDomain.CurrentDomain.SetData("DataDirectory", path);
diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs
index 3503318888c5..2a6c1f4e1247 100644
--- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs
+++ b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs
@@ -12,7 +12,7 @@
 
 namespace Umbraco.Tests.Persistence.NPocoTests
 {
-    // fixme.npoco - is this still appropriate?
+    // FIXME: npoco - is this still appropriate?
     //
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoFetchTests.cs b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoFetchTests.cs
index 64bc825c3eb0..9ee50d12306b 100644
--- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoFetchTests.cs
+++ b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoFetchTests.cs
@@ -370,7 +370,7 @@ public void TestCalculated()
 
                 var sql = scope.SqlContext.Sql()
                     .Select<Thing1Dto>()
-                    .Append(", COUNT(zbThing2Group.groupId) AS groupCount") // fixme
+                    .Append(", COUNT(zbThing2Group.groupId) AS groupCount") // FIXME:
                     .From<Thing1Dto>()
                     .InnerJoin<Thing2GroupDto>().On<Thing1Dto, Thing2GroupDto>((t, t2g) => t.Id == t2g.ThingId)
                     .GroupBy<Thing1Dto>(x => x.Id, x => x.Name);
diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/PetaPocoCachesTest.cs b/src/Umbraco.Tests/Persistence/NPocoTests/PetaPocoCachesTest.cs
index db3b02bacfc5..f558a6449908 100644
--- a/src/Umbraco.Tests/Persistence/NPocoTests/PetaPocoCachesTest.cs
+++ b/src/Umbraco.Tests/Persistence/NPocoTests/PetaPocoCachesTest.cs
@@ -15,7 +15,7 @@
 
 namespace Umbraco.Tests.Persistence.NPocoTests
 {
-    // fixme.npoco - what shall we do with those tests?
+    // FIXME: npoco - what shall we do with those tests?
     //
     [TestFixture, Ignore("fixme - ignored test")]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index 03701dd3b592..96809c7bf6d9 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -59,7 +59,7 @@ private EntityContainerRepository CreateContainerRepository(IScopeAccessor scope
             return new EntityContainerRepository(scopeAccessor, AppCaches.Disabled, Logger, containerEntityType);
         }
 
-        //TODO Add test to verify SetDefaultTemplates updates both AllowedTemplates and DefaultTemplate(id).
+        // TODO: Add test to verify SetDefaultTemplates updates both AllowedTemplates and DefaultTemplate(id).
         
         [Test]
         public void Maps_Templates_Correctly()
diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
index b7f354a2fb71..b140aa078e99 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
@@ -230,7 +230,7 @@ public void Get_All()
 
                 //now remove a few rules from a few of the items and then add some more, this will put things 'out of order' which
                 //we need to verify our sort order is working for the relator
-                // fixme - no "relator" in v8?!
+                // FIXME: no "relator" in v8?!
                 for (int i = 0; i < allEntries.Count; i++)
                 {
                     //all the even ones
diff --git a/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs b/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
index 66f6655c77df..652209b65b9b 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
@@ -73,7 +73,7 @@ public void CanSaveAndGetMostRecent()
 
                 Assert.AreNotEqual(0, rurl.Id);
 
-                // fixme - too fast = same date = key violation?
+                // FIXME: too fast = same date = key violation?
                 // and... can that happen in real life?
                 // we don't really *care* about the IX, only supposed to make things faster...
                 // BUT in realife we AddOrUpdate in a trx so it should be safe, always
@@ -119,7 +119,7 @@ public void CanSaveAndGetByContent()
 
                 Assert.AreNotEqual(0, rurl.Id);
 
-                // fixme - goes too fast and bam, errors, first is blah
+                // FIXME: goes too fast and bam, errors, first is blah
 
                 rurl = new RedirectUrl
                 {
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
index b927d2374000..6acd63b2b3a1 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
@@ -454,7 +454,7 @@ public void Can_Get_All_With_Ids()
                     contentType.PropertyTypes.First().Id,
                     tags, false);
 
-                //TODO: This would be nice to be able to map the ids back but unfortunately we are not doing this
+                // TODO: This would be nice to be able to map the ids back but unfortunately we are not doing this
                 //var result = repository.GetAll(new[] {tags[0].Id, tags[1].Id, tags[2].Id});
                 var all = repository.GetMany().ToArray();
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index 4ee6ecf9e36b..779ec45a35e9 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -234,8 +234,7 @@ public void Can_Perform_Get_On_UserRepository()
                 // Act
                 var updatedItem = repository.Get(user.Id);
 
-                // fixme
-                // this test cannot work, user has 2 sections but the way it's created,
+                // FIXME: this test cannot work, user has 2 sections but the way it's created,
                 // they don't show, so the comparison with updatedItem fails - fix!
 
                 // Assert
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs
index 42703f9bae4b..ac1c57d40942 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs
@@ -335,7 +335,7 @@ public void Can_Have_Custom_Default_Value()
         {
             var content = UmbracoContext.Current.ContentCache.GetAtRoot().First().Children.First();
 
-            // hack the value, pretend the converter would return something
+            // HACK: the value, pretend the converter would return something
             var prop = content.GetProperty("welcomeText") as SolidPublishedPropertyWithLanguageVariants;
             Assert.IsNotNull(prop);
             prop.SetValue("nl", "nope"); // HasValue false but getting value returns this
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index d18c6b6668d4..c5bcd295898b 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -20,7 +20,7 @@ protected override void Compose()
         {
             base.Compose();
 
-            // fixme - what about the if (PropertyValueConvertersResolver.HasCurrent == false) ??
+            // FIXME: what about the if (PropertyValueConvertersResolver.HasCurrent == false) ??
             // can we risk double - registering and then, what happens?
 
             Composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
diff --git a/src/Umbraco.Tests/Publishing/PublishingStrategyTests.cs b/src/Umbraco.Tests/Publishing/PublishingStrategyTests.cs
index 2d14aa1c08bd..0b98ec64b676 100644
--- a/src/Umbraco.Tests/Publishing/PublishingStrategyTests.cs
+++ b/src/Umbraco.Tests/Publishing/PublishingStrategyTests.cs
@@ -28,7 +28,7 @@ public override void SetUp()
         [Test]
         public void Can_Publish_And_Update_Xml_Cache()
         {
-            //TODO Create new test
+            // TODO: Create new test
         }
 
         public IEnumerable<IContent> CreateTestData()
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
index 4059cb1858f8..2aa01916fb0f 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
@@ -9,7 +9,7 @@
 
 namespace Umbraco.Tests.Routing
 {
-    //TODO: We should be able to decouple this from the base db tests since we're just mocking the services now
+    // TODO: We should be able to decouple this from the base db tests since we're just mocking the services now
 
     [TestFixture]
     public class ContentFinderByAliasTests : UrlRoutingTestBase
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
index 8bbd7c667977..c1abb5a3a559 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
@@ -10,9 +10,9 @@ public class ContentFinderByPageIdQueryTests : BaseWebTest
     {
         [TestCase("/?umbPageId=1046", 1046)]
         [TestCase("/?UMBPAGEID=1046", 1046)]
-        [TestCase("/default.aspx?umbPageId=1046", 1046)] //TODO: Should this match??
-        [TestCase("/some/other/page?umbPageId=1046", 1046)] //TODO: Should this match??
-        [TestCase("/some/other/page.aspx?umbPageId=1046", 1046)] //TODO: Should this match??
+        [TestCase("/default.aspx?umbPageId=1046", 1046)] // TODO: Should this match??
+        [TestCase("/some/other/page?umbPageId=1046", 1046)] // TODO: Should this match??
+        [TestCase("/some/other/page.aspx?umbPageId=1046", 1046)] // TODO: Should this match??
         public void Lookup_By_Page_Id(string urlAsString, int nodeMatch)
         {
             var umbracoContext = GetUmbracoContext(urlAsString);
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
index fa8beea2c2fe..85168e449072 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
@@ -39,7 +39,7 @@ public void Match_Document_By_Url_Hide_Top_Level(string urlString, int expectedI
 
             Assert.IsTrue(Current.Configs.Global().HideTopLevelNodeFromPath);
 
-            // fixme debugging - going further down, the routes cache is NOT empty?!
+            // FIXME: debugging - going further down, the routes cache is NOT empty?!
             if (urlString == "/home/sub1")
                 System.Diagnostics.Debugger.Break();
 
diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
index 8e9e52258cb3..46b10929cf6e 100644
--- a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
+++ b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
@@ -45,7 +45,7 @@ public void Content_Not_Published()
         {
             var contentType = MockedContentTypes.CreateBasicContentType();
             var content = MockedContent.CreateBasicContent(contentType);
-            content.Id = 1046; //fixme: we are using this ID only because it's built into the test XML published cache
+            content.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
             content.Path = "-1,1046";
 
             var umbContext = GetUmbracoContext("http://localhost:8000");
@@ -66,7 +66,7 @@ public void Invariant_Root_Content_Published_No_Domains()
         {
             var contentType = MockedContentTypes.CreateBasicContentType();
             var content = MockedContent.CreateBasicContent(contentType);
-            content.Id = 1046; //fixme: we are using this ID only because it's built into the test XML published cache
+            content.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
             content.Path = "-1,1046";
             content.Published = true;
 
@@ -92,13 +92,13 @@ public void Invariant_Child_Content_Published_No_Domains()
         {
             var contentType = MockedContentTypes.CreateBasicContentType();
             var parent = MockedContent.CreateBasicContent(contentType);
-            parent.Id = 1046; //fixme: we are using this ID only because it's built into the test XML published cache
+            parent.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
             parent.Name = "home";
             parent.Path = "-1,1046";
             parent.Published = true;
             var child = MockedContent.CreateBasicContent(contentType);
             child.Name = "sub1";
-            child.Id = 1173; //fixme: we are using this ID only because it's built into the test XML published cache
+            child.Id = 1173; // FIXME: we are using this ID only because it's built into the test XML published cache
             child.Path = "-1,1046,1173";
             child.Published = true;
 
@@ -119,7 +119,7 @@ public void Invariant_Child_Content_Published_No_Domains()
             Assert.IsTrue(urls[0].IsUrl);
         }
 
-        //TODO: We need a lot of tests here, the above was just to get started with being able to unit test this method
+        // TODO: We need a lot of tests here, the above was just to get started with being able to unit test this method
         // * variant URLs without domains assigned, what happens?
         // * variant URLs with domains assigned, but also having more languages installed than there are domains/cultures assigned
         // * variant URLs with an ancestor culture unpublished
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index e681c8556d7a..569f5382e8da 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -57,7 +57,7 @@ protected override void Compose()
             base.Compose();
 
             // set the default RenderMvcController
-            Current.DefaultRenderMvcControllerType = typeof(RenderMvcController); // fixme WRONG!
+            Current.DefaultRenderMvcControllerType = typeof(RenderMvcController); // FIXME: Wrong!
 
             var surfaceControllerTypes = new SurfaceControllerTypeCollection(Composition.TypeLoader.GetSurfaceControllers());
             Composition.RegisterUnique(surfaceControllerTypes);
@@ -110,7 +110,7 @@ public void Umbraco_Route_Umbraco_Defined_Controller_Action()
 
         //test all template name styles to match the ActionName
 
-        //[TestCase("home-\\234^^*32page")]        //TODO: This fails!
+        //[TestCase("home-\\234^^*32page")]        // TODO: This fails!
         [TestCase("home-page")]
         [TestCase("home-page")]
         [TestCase("home-page")]
diff --git a/src/Umbraco.Tests/Routing/RoutesCacheTests.cs b/src/Umbraco.Tests/Routing/RoutesCacheTests.cs
index 68e80076ddec..76c2a45ab265 100644
--- a/src/Umbraco.Tests/Routing/RoutesCacheTests.cs
+++ b/src/Umbraco.Tests/Routing/RoutesCacheTests.cs
@@ -22,7 +22,7 @@ public void U4_7939()
             var cache = umbracoContext.PublishedSnapshot.Content as PublishedContentCache;
             if (cache == null) throw new Exception("Unsupported IPublishedContentCache, only the Xml one is supported.");
 
-            // fixme not sure?
+            // FIXME: not sure?
             //PublishedContentCache.UnitTesting = false; // else does not write to routes cache
             //Assert.IsFalse(PublishedContentCache.UnitTesting);
 
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index c87a02f43a7d..6d7668ceabe9 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -28,7 +28,7 @@ public override void SetUp()
         {
             base.SetUp();
 
-            // fixme - be able to get the UmbracoModule from the container. any reason settings were from testobjects?
+            // FIXME: be able to get the UmbracoModule from the container. any reason settings were from testobjects?
             //create the module
             var logger = Mock.Of<ILogger>();
             var globalSettings = TestObjects.GetGlobalSettings();
@@ -44,7 +44,7 @@ public override void SetUp()
                 new UrlProviderCollection(new IUrlProvider[0]),
                 runtime,
                 logger,
-                null, // fixme - PublishedRouter complexities...
+                null, // FIXME: PublishedRouter complexities...
                 Mock.Of<IVariationContextAccessor>()
             );
 
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index c89465986545..ee3bca42e9a8 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -110,7 +110,7 @@ protected override Configs GetConfigs()
                 return configs;
             }
 
-            // fixme so how the f* should we do it now?
+            // FIXME: so how the f* should we do it now?
             /*
             // pretend we have the proper migration
             // else BootFailedException because our mock IUmbracoDatabaseFactory does not provide databases
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 3a52eea17c1b..3790a49cfc9f 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -53,13 +53,13 @@ public void StandaloneTest()
             // settings
             // reset the current version to 0.0.0, clear connection strings
             ConfigurationManager.AppSettings["umbracoConfigurationStatus"] = "";
-            // fixme we need a better management of settings here (and, true config files?)
+            // FIXME: we need a better management of settings here (and, true config files?)
 
             // create the very basic and essential things we need
             var logger = new ConsoleLogger();
             var profiler = new LogProfiler(logger);
             var profilingLogger = new ProfilingLogger(logger, profiler);
-            var appCaches = new AppCaches(); // fixme has HttpRuntime stuff?
+            var appCaches = new AppCaches(); // FIXME: has HttpRuntime stuff?
             var databaseFactory = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()));
             var typeLoader = new TypeLoader(appCaches.RuntimeCache, LocalTempStorage.Default, profilingLogger);
             var mainDom = new SimpleMainDom();
@@ -87,7 +87,7 @@ public void StandaloneTest()
             composers.Compose();
 
             // must registers stuff that WebRuntimeComponent would register otherwise
-            // fixme UmbracoContext creates a snapshot that it does not register with the accessor
+            // FIXME: UmbracoContext creates a snapshot that it does not register with the accessor
             //  and so, we have to use the UmbracoContextPublishedSnapshotAccessor
             //  the UmbracoContext does not know about the accessor
             //  else that would be a catch-22 where they both know about each other?
@@ -177,7 +177,7 @@ public void StandaloneTest()
             Assert.AreEqual("test", content.Name);
 
             // need an UmbracoCOntext to access the cache
-            // fixme - not exactly pretty, should not depend on HttpContext
+            // FIXME: not exactly pretty, should not depend on HttpContext
             var httpContext = Mock.Of<HttpContextBase>();
             var withUmbracoContext = UmbracoContext.EnsureContext(httpContext);
             var umbracoContext = Umbraco.Web.Composing.Current.UmbracoContext;
diff --git a/src/Umbraco.Tests/Scoping/PassThroughEventDispatcherTests.cs b/src/Umbraco.Tests/Scoping/PassThroughEventDispatcherTests.cs
index 68e69f4cd621..c955f88f674d 100644
--- a/src/Umbraco.Tests/Scoping/PassThroughEventDispatcherTests.cs
+++ b/src/Umbraco.Tests/Scoping/PassThroughEventDispatcherTests.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Tests.Scoping
     [NUnit.Framework.Ignore("Cannot dispatch events on NoScope!")]
     public class PassThroughEventDispatcherTests
     {
-        // fixme so... should we remove, or enable, these tests?
+        // FIXME: so... should we remove, or enable, these tests?
 
     //    [Test]
     //    public void TriggersCancelableEvents()
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index e8f3463ca7f7..d70b736bc26b 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -43,7 +43,7 @@ protected override void Compose()
 
             // the cache refresher component needs to trigger to refresh caches
             // but then, it requires a lot of plumbing ;(
-            // fixme - and we cannot inject a DistributedCache yet
+            // FIXME: and we cannot inject a DistributedCache yet
             // so doing all this mess
             Composition.RegisterUnique<IServerMessenger, ScopedXmlTests.LocalServerMessenger>();
             Composition.RegisterUnique(f => Mock.Of<IServerRegistrar>());
diff --git a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
index dee7a99ad0ba..b85a79f326ac 100644
--- a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
@@ -29,7 +29,7 @@ protected override void Compose()
 
             // the cache refresher component needs to trigger to refresh caches
             // but then, it requires a lot of plumbing ;(
-            // fixme - and we cannot inject a DistributedCache yet
+            // FIXME: and we cannot inject a DistributedCache yet
             // so doing all this mess
             Composition.RegisterUnique<IServerMessenger, LocalServerMessenger>();
             Composition.RegisterUnique(f => Mock.Of<IServerRegistrar>());
diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
index 568bafa4e674..11479ea3eb6b 100644
--- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
@@ -32,7 +32,7 @@ protected override void Compose()
 
             // the cache refresher component needs to trigger to refresh caches
             // but then, it requires a lot of plumbing ;(
-            // fixme - and we cannot inject a DistributedCache yet
+            // FIXME: and we cannot inject a DistributedCache yet
             // so doing all this mess
             Composition.RegisterUnique<IServerMessenger, LocalServerMessenger>();
             Composition.RegisterUnique(f => Mock.Of<IServerRegistrar>());
diff --git a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
index 23e5e472a31e..f0409d89282e 100644
--- a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
+++ b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
@@ -69,6 +69,6 @@ public void ShouldAuthenticateRequest_When_Configured()
             Assert.IsTrue(result);
         }
 
-        //TODO : Write remaining tests for `ShouldAuthenticateRequest`
+        // TODO: Write remaining tests for `ShouldAuthenticateRequest`
     }
 }
diff --git a/src/Umbraco.Tests/Services/ContentServiceTagsTests.cs b/src/Umbraco.Tests/Services/ContentServiceTagsTests.cs
index 62a3526af592..5e97bea2c10c 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTagsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTagsTests.cs
@@ -35,7 +35,7 @@ protected override void Compose()
         {
             base.Compose();
 
-            // fixme - do it differently
+            // FIXME: do it differently
             Composition.Register(factory => factory.GetInstance<ServiceContext>().TextService);
         }
 
@@ -392,11 +392,11 @@ public void TagsCanBecomeInvariantByPropertyTypeAndBackToVariant()
             propertyType.Variations = ContentVariation.Nothing;
             contentTypeService.Save(contentType);
 
-            //fixme: This throws due to index violations
+            // FIXME: This throws due to index violations
             propertyType.Variations = ContentVariation.Culture;
             contentTypeService.Save(contentType);
 
-            //TODO: Assert results
+            // TODO: Assert results
         }
 
         [Test]
@@ -526,7 +526,7 @@ public void TagsAreUpdatedWhenContentIsTrashedAndUnTrashed_Tree()
             tags = tagService.GetTagsForEntity(content1.Id);
             Assert.AreEqual(5, tags.Count());
 
-            // fixme tag & tree issue
+            // FIXME: tag & tree issue
             // when we publish, we 'just' publish the top one and not the ones below = fails
             // what we should do is... NOT clear tags when unpublishing or trashing or...
             // and just update the tag service to NOT return anything related to trashed or
@@ -593,7 +593,7 @@ public void TagsAreUpdatedWhenContentIsUnpublishedAndRePublished_Tree()
             var tags = tagService.GetTagsForEntity(content1.Id);
             Assert.AreEqual(0, tags.Count());
 
-            // fixme tag & tree issue
+            // FIXME: tag & tree issue
             // when we (un)publish, we 'just' publish the top one and not the ones below = fails
             // see similar note above
             tags = tagService.GetTagsForEntity(content2.Id);
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 039bcaed244a..75eb01e0e3b1 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -38,8 +38,8 @@ namespace Umbraco.Tests.Services
         Logger = UmbracoTestOptions.Logger.Console)]
     public class ContentServiceTests : TestWithSomeContentBase
     {
-        //TODO Add test to verify there is only ONE newest document/content in {Constants.DatabaseSchema.Tables.Document} table after updating.
-        //TODO Add test to delete specific version (with and without deleting prior versions) and versions by date.
+        // TODO: Add test to verify there is only ONE newest document/content in {Constants.DatabaseSchema.Tables.Document} table after updating.
+        // TODO: Add test to delete specific version (with and without deleting prior versions) and versions by date.
 
         public override void SetUp()
         {
@@ -2422,13 +2422,13 @@ public void PublishingTest()
             Assert.IsFalse(content.Published);
             Assert.IsTrue(content.Edited);
 
-            // fixme - depending on 1 line in ContentBaseFactory.BuildEntity
+            // FIXME: depending on 1 line in ContentBaseFactory.BuildEntity
             // the published infos can be gone or not
             // if gone, it's not consistent with above
             Assert.AreEqual(vpk, ((Content) content).VersionId);
             Assert.AreEqual(ppk, ((Content) content).PublishedVersionId); // still there
 
-            // fixme - depending on 1 line in ContentRepository.MapDtoToContent
+            // FIXME: depending on 1 line in ContentRepository.MapDtoToContent
             // the published values can be null or not
             // if null, it's not consistent with above
             //Assert.IsNull(content.GetValue("title", published:  true));
@@ -2444,7 +2444,7 @@ public void PublishingTest()
             //
             //contentService.SaveAndPublish(content);
 
-            // fixme - what shall we do of all this?
+            // FIXME: what shall we do of all this?
             /*
             // this basically republishes a content
             // what if it never was published?
@@ -2455,11 +2455,11 @@ public void PublishingTest()
             Assert.IsTrue(content.Published);
             Assert.IsFalse(content.Edited);
 
-            // fixme - should it be 2 or 3
+            // FIXME: should it be 2 or 3
             versions = contentService.GetVersions(content.Id);
             Assert.AreEqual(2, versions.Count());
 
-            // fixme - now test rollbacks
+            // FIXME: now test rollbacks
             var version = contentService.GetByVersion(content.Id); // test that it gets a version - should be GetVersion
             var previousVersion = contentService.GetVersions(content.Id).Skip(1).FirstOrDefault(); // need an optimized way to do this
             content.CopyValues(version); // copies the edited value - always
@@ -2498,7 +2498,7 @@ public void Ensure_Invariant_Name()
             //the name will be set to the default culture variant name
             Assert.AreEqual("name-us", content.Name);
 
-            //fixme - should we always sync the invariant name even on update? see EnsureInvariantNameValues
+            // FIXME: should we always sync the invariant name even on update? see EnsureInvariantNameValues
             ////updating the default culture variant name should also update the invariant name so they stay in sync
             //content.SetName("name-us-2", langUk.IsoCode);
             //contentService.Save(content);
@@ -2663,7 +2663,7 @@ public void Can_SaveRead_Variations()
             var contentType = contentTypeService.Get("umbTextpage");
             contentType.Variations = ContentVariation.Culture;
             contentType.AddPropertyType(new PropertyType(Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar, "prop") { Variations = ContentVariation.Culture });
-            // fixme add test w/ an invariant prop
+            // FIXME: add test w/ an invariant prop
             contentTypeService.Save(contentType);
 
             var contentService = ServiceContext.ContentService;
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index 13cde1c65995..0c9c543b0d3f 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -33,7 +33,7 @@ public override void SetUp()
         {
             base.SetUp();
 
-            //hack! but we have no choice until we remove the SavePassword method from IMemberService
+            // HACK: but we have no choice until we remove the SavePassword method from IMemberService
             var providerMock = new Mock<MembersMembershipProvider>(ServiceContext.MemberService, ServiceContext.MemberTypeService) { CallBase = true };
             providerMock.Setup(@base => @base.AllowManuallyChangingPassword).Returns(false);
             providerMock.Setup(@base => @base.PasswordFormat).Returns(MembershipPasswordFormat.Hashed);
diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs
index 09743b350ff6..7d73d95e7475 100644
--- a/src/Umbraco.Tests/Services/PerformanceTests.cs
+++ b/src/Umbraco.Tests/Services/PerformanceTests.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Tests.Services
     [NUnit.Framework.Ignore("These should not be run by the server, only directly as they are only benchmark tests")]
     public class PerformanceTests : TestWithDatabaseBase
     {
-        // fixme probably making little sense in places due to scope creating a transaction?!
+        // FIXME: probably making little sense in places due to scope creating a transaction?!
 
         protected override string GetDbConnectionString()
         {
diff --git a/src/Umbraco.Tests/Services/SectionServiceTests.cs b/src/Umbraco.Tests/Services/SectionServiceTests.cs
index 84eb0d1cbc02..d6bf26184b2c 100644
--- a/src/Umbraco.Tests/Services/SectionServiceTests.cs
+++ b/src/Umbraco.Tests/Services/SectionServiceTests.cs
@@ -48,7 +48,7 @@ private IUser CreateTestUser()
             };
             userGroupA.AddAllowedSection("media");
             userGroupA.AddAllowedSection("settings");
-            //TODO: This is failing the test
+            // TODO: This is failing the test
             ServiceContext.UserService.Save(userGroupA, new[] { user.Id }, false);
 
             var userGroupB = new UserGroup
diff --git a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
index 0d39fcc9e5ec..5fd5710a7989 100644
--- a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
+++ b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
@@ -68,7 +68,7 @@ public override void SetUp()
                     BreakTermsOnUpper = true
                 }));
 
-            // fixme - move to a "compose" thing?
+            // FIXME: move to a "compose" thing?
             Composition.RegisterUnique<IShortStringHelper>(f => _helper);
         }
 
@@ -337,8 +337,8 @@ public void CleanStringSymbols()
                 }));
             Assert.AreEqual("house*2", helper.CleanString("house (2)", CleanStringType.Alias));
 
-            // FIXME but for a filename we want to keep them!
-            // FIXME and what about a url?
+            // FIXME: but for a filename we want to keep them!
+            // FIXME: and what about a url?
         }
 
         [Test]
@@ -442,8 +442,8 @@ public void CleanStringCasing()
             // E is a word (too short to be an acronym)
             // FF is an acronym
 
-            // FIXME "C" can't be an acronym
-            // FIXME "DBXreview" = acronym?!
+            // FIXME: "C" can't be an acronym
+            // FIXME: "DBXreview" = acronym?!
 
             Assert.AreEqual("aaa BBB CCc Ddd E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias)); // unchanged
             Assert.AreEqual("aaa Bbb Ccc Ddd E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.CamelCase));
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
index 597882060145..602b5907d844 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
@@ -64,7 +64,7 @@ IHttpController IHttpControllerActivator.Create(HttpRequestMessage request, Http
 
             var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
 
-            // fixme v8?
+            // FIXME: v8?
             ////new app context
             //var dbCtx = new Mock<DatabaseContext>(Mock.Of<IDatabaseFactory>(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), "test");
             ////ensure these are set so that the appctx is 'Configured'
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
index 6ba6b672db81..95b5a3bfeb38 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
@@ -29,7 +29,7 @@ public void Configuration(IAppBuilder app)
         {
             var httpConfig = new HttpConfiguration();
 
-            //TODO: Enable this if you can't see the errors produced
+            // TODO: Enable this if you can't see the errors produced
             //var traceWriter = httpConfig.EnableSystemDiagnosticsTracing();
             //traceWriter.IsVerbose = true;
             //traceWriter.MinimumLevel = TraceLevel.Debug;
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index cfd935cd826c..37be4aea6d56 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -129,7 +129,7 @@ internal static IUmbracoSettingsSection GetDefaultUmbracoSettings()
         {
             if (_defaultUmbracoSettings == null)
             {
-                //TODO: Just make this mocks instead of reading from the config
+                // TODO: Just make this mocks instead of reading from the config
 
                 var config = new FileInfo(TestHelper.MapPathForTest("~/Configurations/UmbracoSettings/web.config"));
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index b6f597bf4696..dc692af36a82 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -98,7 +98,7 @@ public static void CleanUmbracoSettingsConfig()
                 File.Delete(umbracoSettingsFile);
         }
 
-        // fixme obsolete the dateTimeFormat thing and replace with dateDelta
+        // FIXME: obsolete the dateTimeFormat thing and replace with dateDelta
         public static void AssertPropertyValuesAreEqual(object actual, object expected, string dateTimeFormat = null, Func<IEnumerable, IEnumerable> sorter = null, string[] ignoreProperties = null)
         {
             const int dateDeltaMilliseconds = 500; // .5s
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
index c56eae9cd85a..660d0f201e24 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
@@ -55,7 +55,7 @@ public IUmbracoDatabaseFactory GetDatabaseFactoryMock(bool configured = true, bo
         /// <returns>A ServiceContext.</returns>
         public ServiceContext GetServiceContextMock(IFactory container = null)
         {
-            // fixme - else some tests break - figure it out
+            // FIXME: else some tests break - figure it out
             container = null;
 
             return ServiceContext.CreatePartial(
@@ -125,8 +125,8 @@ public UmbracoContext GetUmbracoContextMock(IUmbracoContextAccessor accessor = n
 
         public IUmbracoSettingsSection GetUmbracoSettings()
         {
-            //fixme Why not use the SettingsForTest.GenerateMock ... ?
-            //fixme Shouldn't we use the default ones so they are the same instance for each test?
+            // FIXME: Why not use the SettingsForTest.GenerateMock ... ?
+            // FIXME: Shouldn't we use the default ones so they are the same instance for each test?
 
             var umbracoSettingsMock = new Mock<IUmbracoSettingsSection>();
             var webRoutingSectionMock = new Mock<IWebRoutingSection>();
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 109860146c07..7a9702031b86 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -236,9 +236,9 @@ public IScopeProvider GetScopeProvider(ILogger logger, FileSystems fileSystems =
         {
             if (databaseFactory == null)
             {
-                //var mappersBuilder = new MapperCollectionBuilder(Current.Container); // fixme
-                //mappersBuilder.AddCore();
-                //var mappers = mappersBuilder.CreateCollection();
+                // var mappersBuilder = new MapperCollectionBuilder(Current.Container); // FIXME:
+                // mappersBuilder.AddCore();
+                // var mappers = mappersBuilder.CreateCollection();
                 var mappers = Current.Factory.GetInstance<IMapperCollection>();
                 databaseFactory = new UmbracoDatabaseFactory(Constants.System.UmbracoConnectionName, logger, new Lazy<IMapperCollection>(() => mappers));
             }
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 2deb30bbdd56..35085ddd85ba 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -102,10 +102,10 @@ public void FixtureTearDown()
         public override void TearDown()
         {
             var profilingLogger = Factory.TryGetInstance<IProfilingLogger>();
-            var timer = profilingLogger?.TraceDuration<TestWithDatabaseBase>("teardown"); // fixme move that one up
+            var timer = profilingLogger?.TraceDuration<TestWithDatabaseBase>("teardown"); // FIXME: move that one up
             try
             {
-                // fixme - should we first kill all scopes?
+                // FIXME: should we first kill all scopes?
                 if (Options.Database == UmbracoTestOptions.Database.NewSchemaPerTest)
                     RemoveDatabaseFile();
 
@@ -127,7 +127,7 @@ private void CreateAndInitializeDatabase()
         {
             using (ProfilingLogger.TraceDuration<TestWithDatabaseBase>("Create database."))
             {
-                CreateSqlCeDatabase(); // todo faster!
+                CreateSqlCeDatabase(); // TODO: faster!
             }
 
             // ensure the configuration matches the current version for tests
@@ -136,7 +136,7 @@ private void CreateAndInitializeDatabase()
 
             using (ProfilingLogger.TraceDuration<TestWithDatabaseBase>("Initialize database."))
             {
-                InitializeDatabase(); // todo faster!
+                InitializeDatabase(); // TODO: faster!
             }
         }
 
@@ -229,7 +229,7 @@ protected virtual void CreateSqlCeDatabase()
 
         protected IPublishedSnapshotService PublishedSnapshotService { get; set; }
 
-        protected override void Initialize() // fixme - should NOT be here!
+        protected override void Initialize() // FIXME: should NOT be here!
         {
             base.Initialize();
 
@@ -313,7 +313,7 @@ protected virtual void InitializeDatabase()
             }
         }
 
-        // fixme is this needed?
+        // FIXME: is this needed?
         private void CloseDbConnections(IUmbracoDatabase database)
         {
             //Ensure that any database connections from a previous test is disposed.
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs b/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs
index 2bf4ba271683..4013d93cd398 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs
@@ -24,8 +24,9 @@ public class UmbracoTestAttribute : TestOptionAttributeBase
         public bool AutoMapper { get => _autoMapper.ValueOrDefault(WithApplication); set => _autoMapper.Set(value); }
         private readonly Settable<bool> _autoMapper = new Settable<bool>();
 
+        // FIXME: to be completed
         /// <summary>
-        /// Gets or sets a value indicating ... FIXME to be completed
+        /// Gets or sets a value indicating ... 
         /// </summary>
         public bool PublishedRepositoryEvents { get => _publishedRepositoryEvents.ValueOrDefault(false); set => _publishedRepositoryEvents.Set(value); }
         private readonly Settable<bool> _publishedRepositoryEvents = new Settable<bool>();
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 7cd7be240bf2..9616a2689186 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -123,7 +123,7 @@ public virtual void SetUp()
             // get/merge the attributes marking the method and/or the classes
             Options = TestOptionAttributeBase.GetTestOptions<UmbracoTestAttribute>();
 
-            // fixme - align to runtimes & components - don't redo everything here
+            // FIXME: align to runtimes & components - don't redo everything here
 
             var (logger, profiler) = GetLoggers(Options.Logger);
             var proflogger = new ProfilingLogger(logger, profiler);
@@ -427,7 +427,7 @@ protected virtual void Reset()
 
             // reset all other static things that should not be static ;(
             UriUtility.ResetAppDomainAppVirtualPath();
-            SettingsForTests.Reset(); // fixme - should it be optional?
+            SettingsForTests.Reset(); // FIXME: should it be optional?
 
             Mapper.Reset();
 
diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineDemoDataContentService.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineDemoDataContentService.cs
index 5bc1fbfdaa95..2c71d1fe3eca 100644
--- a/src/Umbraco.Tests/UmbracoExamine/ExamineDemoDataContentService.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/ExamineDemoDataContentService.cs
@@ -9,7 +9,7 @@
 
 namespace Umbraco.Tests.UmbracoExamine
 {
-    //TODO: This is ultra hack and still left over from legacy but still works for testing atm
+    // TODO: This is ultra hack and still left over from legacy but still works for testing atm
     public class ExamineDemoDataContentService
     {
         public const int ProtectedNode = 1142;
diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineDemoDataMediaService.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineDemoDataMediaService.cs
index 8dcb17081636..035a31b2403e 100644
--- a/src/Umbraco.Tests/UmbracoExamine/ExamineDemoDataMediaService.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/ExamineDemoDataMediaService.cs
@@ -7,7 +7,7 @@
 
 namespace Umbraco.Tests.UmbracoExamine
 {
-    //TODO: This is ultra hack and still left over from legacy but still works for testing atm
+    // TODO: This is ultra hack and still left over from legacy but still works for testing atm
     internal class ExamineDemoDataMediaService
     {
         public ExamineDemoDataMediaService()
diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
index 7bd47bed66d3..cf0bf689a132 100644
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
@@ -393,7 +393,7 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
             Assert.IsTrue(display.Errors.ContainsKey("_content_variant_en-US_"));
         }
 
-        //TODO: There are SOOOOO many more tests we should write - a lot of them to do with validation
+        // TODO: There are SOOOOO many more tests we should write - a lot of them to do with validation
 
     }
 }
diff --git a/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs b/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
index e95ae7b78568..4bcad4f4d3b2 100644
--- a/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
+++ b/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
@@ -30,13 +30,13 @@ public void SetUp()
         {
             Current.Reset();
 
-            // fixme - now UrlProvider depends on EntityService for GetUrl(guid) - this is bad
+            // FIXME: now UrlProvider depends on EntityService for GetUrl(guid) - this is bad
             // should not depend on more than IdkMap maybe - fix this!
             var entityService = new Mock<IEntityService>();
             entityService.Setup(x => x.GetId(It.IsAny<Guid>(), It.IsAny<UmbracoObjectTypes>())).Returns(Attempt<int>.Fail());
             var serviceContext = ServiceContext.CreatePartial(entityService: entityService.Object);
 
-            // fixme - bad in a unit test - but Udi has a static ctor that wants it?!
+            // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var factory = new Mock<IFactory>();
             factory.Setup(x => x.GetInstance(typeof(TypeLoader))).Returns(
                 new TypeLoader(NoAppCache.Instance, LocalTempStorage.Default, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())));
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/forms.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/forms.less
index 9f4ef4b8f977..6bbbacd1e327 100644
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/forms.less
@@ -239,7 +239,7 @@ textarea {
 }
 
 // Radios and checkboxes on same line
-// TODO v3: Convert .inline to .control-inline
+// TODO: v3: Convert .inline to .control-inline
 .radio.inline,
 .checkbox.inline {
   display: inline-block;
diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacySpeechBubble.js b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacySpeechBubble.js
index f973cbac498e..05568354e60a 100644
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacySpeechBubble.js
+++ b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacySpeechBubble.js
@@ -1,5 +1,5 @@
 
-//TODO: WE NEED TO CONVERT ALL OF THESE METHODS TO PROXY TO OUR APPLICATION SINCE MANY CUSTOM APPS USE THIS!
+// TODO: WE NEED TO CONVERT ALL OF THESE METHODS TO PROXY TO OUR APPLICATION SINCE MANY CUSTOM APPS USE THIS!
 
 Umbraco.Sys.registerNamespace("Umbraco.Application");
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
index b92f8c0807f6..891e8f0e7b44 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
@@ -178,7 +178,7 @@
 
         function loginSubmit(login, password) {
 
-            //TODO: Do validation properly like in the invite password update
+            // TODO: Do validation properly like in the invite password update
 
             //if the login and password are not empty we need to automatically
             // validate them - this is because if there are validation errors on the server
@@ -242,7 +242,7 @@
 
         function requestPasswordResetSubmit(email) {
 
-            //TODO: Do validation properly like in the invite password update
+            // TODO: Do validation properly like in the invite password update
 
             if (email && email.length > 0) {
                 vm.requestPasswordResetForm.email.$setValidity('auth', true);
@@ -286,7 +286,7 @@
                 return;
             }
 
-            //TODO: All of this logic can/should be shared! We should do validation the nice way instead of all of this manual stuff, see: inviteSavePassword
+            // TODO: All of this logic can/should be shared! We should do validation the nice way instead of all of this manual stuff, see: inviteSavePassword
             authResource.performSetPassword(vm.resetPasswordCodeInfo.resetCodeModel.userId, password, confirmPassword, vm.resetPasswordCodeInfo.resetCodeModel.resetCode)
                 .then(function () {
                     vm.showSetPasswordConfirmation = true;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
index 923cac80f5b2..8ad71226bae2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
@@ -99,7 +99,7 @@ Use this directive to render an umbraco button. The directive can be used to gen
             }
         });
 
-    //TODO: This doesn't seem necessary?
+    // TODO: This doesn't seem necessary?
     UmbButtonController.$inject = ['$timeout', 'localizationService'];
 
     function UmbButtonController($timeout, localizationService) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index af0792502124..addbb3b11b26 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -8,7 +8,7 @@
         templateUrl: 'views/components/content/umb-variant-content-editors.html',
         bindings: {
             page: "<",
-            content: "<", //TODO: Not sure if this should be = since we are changing the 'active' property of a variant
+            content: "<", // TODO: Not sure if this should be = since we are changing the 'active' property of a variant
             culture: "<",
             onSelectApp: "&?"
         },
@@ -243,7 +243,7 @@
                 }
             }
 
-            //TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
+            // TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
             editor.collapsed = true;
             editor.loading = true;
             $timeout(function () {
@@ -255,7 +255,7 @@
 
         /** Closes the split view */
         function closeSplitView(editorIndex) {
-            //TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
+            // TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
             var editor = vm.editors[editorIndex];
             editor.loading = true;
             editor.collapsed = true;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontainer.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontainer.directive.js
index d4b0fb158e51..b7bcfa9eb4d4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontainer.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontainer.directive.js
@@ -46,7 +46,7 @@ Use this directive to construct a main content area inside the main editor windo
 
             scope.numberOfOverlays = 0;
 
-            //TODO: this shouldn't be a watch, this should be based on an event handler
+            // TODO: this shouldn't be a watch, this should be based on an event handler
             scope.$watch(function () {
                 return overlayHelper.getNumberOfOverlays();
             }, function (newValue) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index 372fb472fa8b..0a8846f97596 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -10,7 +10,7 @@ angular.module("umbraco.directives")
             replace: true,
             link: function (scope, element, attrs) {
 
-                //TODO: A lot of the code below should be shared between the grid rte and the normal rte
+                // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
                 var promises = [];
 
@@ -73,7 +73,7 @@ angular.module("umbraco.directives")
 
                         });
 
-                        //TODO: Perhaps we should pin the toolbar for the rte always, regardless of if it's in the grid or not?
+                        // TODO: Perhaps we should pin the toolbar for the rte always, regardless of if it's in the grid or not?
                         // this would mean moving this code into the tinyMceService.initializeEditor
 
                         //when we leave the editor (maybe)
@@ -116,7 +116,7 @@ angular.module("umbraco.directives")
 
                     loadTinyMce();
 
-                    //TODO: This should probably be in place for all RTE, not just for the grid, which means
+                    // TODO: This should probably be in place for all RTE, not just for the grid, which means
                     // this code can live in tinyMceService.initializeEditor
                     var tabShownListener = eventsService.on("app.tabChange", function (e, args) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
index a70b8ca33eab..5732fa0eac84 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
@@ -131,7 +131,7 @@
         function onDestroy() {
             $(window).off('resize.umbImageGravity');
             if (htmlOverlay) {
-                //TODO: This should be destroyed but this will throw an exception:
+                // TODO: This should be destroyed but this will throw an exception:
                 // "cannot call methods on draggable prior to initialization; attempted to call method 'destroy'"
                 // I've tried lots of things and cannot get this to work, we weren't destroying before so hopefully
                 // there's no mem leaks?
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlaybackdrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlaybackdrop.directive.js
index 927481952a65..6c5fb86134a1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlaybackdrop.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlaybackdrop.directive.js
@@ -7,7 +7,7 @@
 
             scope.numberOfOverlays = 0;
 
-            //TODO: this shouldn't be a watch, this should be based on an event handler
+            // TODO: this shouldn't be a watch, this should be based on an event handler
             scope.$watch(function () {
                 return overlayHelper.getNumberOfOverlays();
             }, function (newValue) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index 052f497ee9d2..c3243993c136 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -80,7 +80,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
             // entire tree again since we already still have it in memory. Of course if the section is different we will
             // reload it. This saves a lot on processing if someone is navigating in and out of the same section many times
             // since it saves on data retreival and DOM processing.
-            //TODO: This isn't used!?
+            // TODO: This isn't used!?
             var lastSection = "";
             
             /** Helper function to emit tree events */
@@ -92,7 +92,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
                 }
             }
 
-            //TODO: This isn't used!?
+            // TODO: This isn't used!?
             function clearCache(section) {
                 treeService.clearCache({ section: section });
             }
@@ -300,7 +300,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
                     return '';
                 }
 
-                //TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
+                // TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
                 // it would be better if we could cache the processing. The problem is that some of these things are dynamic.
 
                 var css = [];
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
index 4440ceeb4b9d..19ecdaf8d92f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
@@ -61,7 +61,7 @@ angular.module("umbraco.directives")
                     return '';
                 }
 
-                //TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
+                // TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
                 // it would be better if we could cache the processing. The problem is that some of these things are dynamic.
 
                 var css = [];                
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 11c94d04c0c4..15f5a1d46afa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -301,7 +301,7 @@
 
                         //based on the selection, we need to filter the available composite types list
                         filterAvailableCompositions(selectedContentType, newSelection).then(function () {
-                            //TODO: Here we could probably re-enable selection if we previously showed a throbber or something
+                            // TODO: Here we could probably re-enable selection if we previously showed a throbber or something
                         });
                     });
                 }
@@ -311,7 +311,7 @@
 
                     //based on the selection, we need to filter the available composite types list
                     filterAvailableCompositions(selectedContentType, newSelection).then(function () {
-                        //TODO: Here we could probably re-enable selection if we previously showed a throbber or something
+                        // TODO: Here we could probably re-enable selection if we previously showed a throbber or something
                     });
                 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
index 7ace23a988c7..e5bdd3ca78f6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
@@ -92,7 +92,7 @@
                 vm.culture = null;
             }
 
-            //TODO: need to figure out what we can do for things like Nested Content
+            // TODO: need to figure out what we can do for things like Nested Content
 
             var existingClientFiles = checkPendingClientFiles();
             //create the property to show the list of files currently saved
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
index 7cc109a5c0be..f8dbefa5d776 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
@@ -135,7 +135,7 @@
         !$scope.config.enablePasswordRetrieval && !$scope.showReset;
     };
       
-    //TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this directive
+    // TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this directive
     $scope.showCancelBtn = function () {
       return $scope.config.disableToggle !== true && $scope.config.hasPassword;
     };
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index 5568b4b27695..9ee83dc2ba3f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -42,12 +42,12 @@ function valPropertyMsg(serverValidationManager) {
                         return err.errorMsg;
                     }
                     else {
-                        //TODO: localize
+                        // TODO: localize
                         return scope.currentProperty.propertyErrorMessage ? scope.currentProperty.propertyErrorMessage : "Property has errors";
                     }
 
                 }
-                //TODO: localize
+                // TODO: localize
                 return "Property has errors";
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
index d5a21e0ba61d..524b5f7efead 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
@@ -15,7 +15,7 @@
             return {
                 valStatusChanged: function (args) {
 
-                    //TODO: Verify this is correct, does $scope.model ever exist?
+                    // TODO: Verify this is correct, does $scope.model ever exist?
                     if ($scope.model) {
                         if (!args.form.$valid) {
                             var subViewContent = $element.find(".ng-invalid");
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js
index 7582db6740d5..e19fabfe616e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js
@@ -8,7 +8,7 @@ angular.module('umbraco.mocks').
               return [401, null, null];
           }
           else {
-              //TODO: return real mocked data
+              // TODO: return real mocked data
               return [200, [], null];
           }
       }
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
index 4f9b9a21f82b..678cffe42e12 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
@@ -130,7 +130,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
         });
       }
 
-      //TODO: This validation shouldn't really be done here, the validation on the login dialog
+      // TODO: This validation shouldn't really be done here, the validation on the login dialog
       // is pretty hacky which is why this is here, ideally validation on the login dialog would
       // be done properly.
       var emailRegex = /\S+@\S+\.\S+/;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js b/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js
index 86d5510ca4b8..9b1d92f2b0af 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js
@@ -358,7 +358,7 @@ angular.module('umbraco.services').factory("editorState", function() {
         }
     };
 
-    //TODO: This shouldn't be removed! use getCurrent() method instead of a hacked readonly property which is confusing.
+    // TODO: This shouldn't be removed! use getCurrent() method instead of a hacked readonly property which is confusing.
 
     //create a get/set property but don't allow setting
     Object.defineProperty(state, "current", {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index 1258ec409974..b9bc4eb4995a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -35,7 +35,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
     return {
 
         /** Used by the content editor and mini content editor to perform saving operations */
-        //TODO: Make this a more helpful/reusable method for other form operations! we can simplify this form most forms
+        // TODO: Make this a more helpful/reusable method for other form operations! we can simplify this form most forms
         //         = this is already done in the formhelper service
         contentEditorPerformSave: function (args) {
             if (!angular.isObject(args)) {
@@ -421,7 +421,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
          */
         reBindChangedProperties: function (origContent, savedContent) {
 
-            //TODO: We should probably split out this logic to deal with media/members separately to content
+            // TODO: We should probably split out this logic to deal with media/members separately to content
 
             //a method to ignore built-in prop changes
             var shouldIgnore = function (propName) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
index 191e0a22c0bb..b6bcafbddf92 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
@@ -121,7 +121,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
             }
             else {
 
-                //TODO: All YSOD handling should be done with an interceptor
+                // TODO: All YSOD handling should be done with an interceptor
                 overlayService.ysod(err);
             }
             
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
index a57fd606aa9b..0fa2d0df1a20 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
@@ -56,7 +56,7 @@ function iconHelper($q, $timeout) {
         
         { oldIcon: ".sprTreeSettingDataType", newIcon: "icon-autofill" },
 
-        //TODO:
+        // TODO: Something needs to be done with the old tree icons that are commented out.
         /*
         { oldIcon: ".sprTreeSettingAgent", newIcon: "" },
         { oldIcon: ".sprTreeSettingCss", newIcon: "" },
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
index 1b7a6da76494..2a9afdfa9405 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
@@ -24,7 +24,7 @@
 angular.module('umbraco.services')
 .factory('localizationService', function ($http, $q, eventsService, $window, $filter, userService) {
 
-    //TODO: This should be injected as server vars
+    // TODO: This should be injected as server vars
     var url = "LocalizedText";
     var resourceFileLoadStatus = "none";
     var resourceLoadingPromise = [];
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 5db9e9c77e7e..16c5b38a7971 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -66,7 +66,7 @@ function mediaHelper(umbRequestHelper) {
             });
 
             //for now we'll just return the first image in the collection.
-            //TODO: we should enable returning many to be displayed in the picker if the uploader supports many.
+            // TODO: we should enable returning many to be displayed in the picker if the uploader supports many.
             if (mediaVal.length && mediaVal.length > 0) {
                 if (!options.imageOnly || (options.imageOnly === true && mediaVal[0].isImage)) {
                     return mediaVal[0].file;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js
index 7e0e1db24fe7..a347279fdbf9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js
@@ -22,7 +22,7 @@ function mediaTypeHelper(mediaTypeResource, $q) {
 
         getAllowedImagetypes: function (mediaId){
 
-            //TODO: This is horribly inneficient - why make one request per type!?
+            // TODO: This is horribly inneficient - why make one request per type!?
             //This should make a call to c# to get exactly what it's looking for instead of returning every single media type and doing 
             //some filtering on the client side.
             //This is also called multiple times when it's not needed! Example, when launching the media picker, this will be called twice 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index f0a3239602c1..04c431767c3f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -151,7 +151,7 @@ angular.module('umbraco.services')
 
             },
 
-            //TODO: This doesn't do anything!
+            // TODO: This doesn't do anything!
             setCurrent: function (sectionAlias) {
 
                 var currentSection = sectionAlias;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 97d939bac199..ffb9fe0f36da 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -680,7 +680,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                             //supported keys to move to the next or prev element (13-enter, 27-esc, 38-up, 40-down, 39-right, 37-left)
                             //supported keys to remove the macro (8-backspace, 46-delete)
-                            //TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
+                            // TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
                             if ($.inArray(e.keyCode, [13, 40, 39]) !== -1) {
                                 //move to next element
                                 moveSibling(macroElement, true);
@@ -1358,7 +1358,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
             self.createAceCodeEditor(args.editor, function () {
 
-                //TODO: CHECK TO SEE WHAT WE NEED TO DO WIT MACROS (See code block?)
+                // TODO: CHECK TO SEE WHAT WE NEED TO DO WIT MACROS (See code block?)
                 /*
                 var html = editor.getContent({source_view: true});
                 html = html.replace(/<span\s+class="CmCaReT"([^>]*)>([^<]*)<\/span>/gm, String.fromCharCode(chr));
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
index 28ac7f6485b8..e102da5d34f9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
@@ -114,7 +114,7 @@
          * @returns {Object} Returns the current tour
          */
         function getCurrentTour() {
-            //TODO: This should be reset if a new user logs in
+            // TODO: This should be reset if a new user logs in
             return currentTour;
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
index 1e6fc5d643a5..cbe9b561a072 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
@@ -66,7 +66,7 @@
                     'alias', 'description', 'thumbnail', 'name', 'id', 'icon', 'trashed',
                     'key', 'parentId', 'alias', 'path', 'allowCultureVariant', 'isElement');
 
-                //TODO: Map these
+                // TODO: Map these
                 saveModel.allowedTemplates = _.map(displayModel.allowedTemplates, function (t) { return t.alias; });
                 saveModel.defaultTemplate = displayModel.defaultTemplate ? displayModel.defaultTemplate.alias : null;
                 var realGroups = _.reject(displayModel.groups, function (g) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index fb1a1b8d5e10..6991c5d3867d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -177,7 +177,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                     //show a ysod dialog
                     if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
                         const error = { errorMsg: 'An error occured', data: response.data };
-                        //TODO: All YSOD handling should be done with an interceptor
+                        // TODO: All YSOD handling should be done with an interceptor
                         overlayService.ysod(error);
                     }
                     else {
@@ -270,7 +270,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                         formHelper.showNotifications(response.data);
                     }
 
-                    //TODO: Do we need to pass the result through umbDataFormatter.formatContentGetData? Right now things work so not sure but we should check
+                    // TODO: Do we need to pass the result through umbDataFormatter.formatContentGetData? Right now things work so not sure but we should check
 
                     //the data returned is the up-to-date data so the UI will refresh
                     return $q.resolve(response.data);
@@ -289,7 +289,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                         else if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
                             //show a ysod dialog
                             const error = { errorMsg: 'An error occured', data: response.data };
-                            //TODO: All YSOD handling should be done with an interceptor
+                            // TODO: All YSOD handling should be done with an interceptor
                             overlayService.ysod(error);
                         }
                         else {
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
index e023c6d23cf6..96f31151859d 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
@@ -137,7 +137,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
         navigationService.showSearch();
     });
 
-    ////TODO: remove this it's not a thing
+    //// TODO: remove this it's not a thing
     //$scope.selectedId = navigationService.currentId;
 
     var evts = [];
@@ -423,7 +423,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
                 var path = treeService.getPath(currNode);
                 promises.push($scope.treeApi.syncTree({ path: path, activate: true }));
             }
-            //TODO: If we want to keep all paths expanded ... but we need more testing since we need to deal with unexpanding
+            // TODO: If we want to keep all paths expanded ... but we need more testing since we need to deal with unexpanding
             //for (var i = 0; i < expandedPaths.length; i++) {
             //    promises.push($scope.treeApi.syncTree({ path: expandedPaths[i], activate: false, forceReload: true }));
             //}
@@ -441,16 +441,16 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     };
 
     //this reacts to the options item in the tree
-    //TODO: migrate to nav service
-    //TODO: is this used?
+    // TODO: migrate to nav service
+    // TODO: is this used?
     $scope.searchShowMenu = function (ev, args) {
         //always skip default
         args.skipDefault = true;
         navigationService.showMenu(args);
     };
 
-    //TODO: migrate to nav service
-    //TODO: is this used?
+    // TODO: migrate to nav service
+    // TODO: is this used?
     $scope.searchHide = function () {
         navigationService.hideSearch();
     };
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js b/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
index cdf5f8c98054..3dbc4e119b36 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
@@ -1,7 +1,7 @@
 angular.module("umbraco.install").controller("Umbraco.InstallerController",
 	function ($scope, installerService) {
 
-	    //TODO: Decouple the service from the controller - the controller should be responsible
+	    // TODO: Decouple the service from the controller - the controller should be responsible
 	    // for the model (state) and the service should be responsible for helping the controller,
 	    // the controller should be passing the model into it's methods for manipulation and not hold
 	    // state. We should not be assigning properties from a service to a controller's scope.
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index bd493cf0d36e..38860e6d22c8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -15,7 +15,7 @@
         outline: none;
         text-decoration: none;
 
-        // TODO => confirm not in use
+        // TODO: => confirm not in use
 //        &.noSpr {
 //            background-position: 0
 //        }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index a4c744bf7f75..9dc6aa1906ae 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -1,4 +1,4 @@
-// TODO General cleanup in !important (Round 2)
+// TODO: General cleanup in !important (Round 2)
 
 // Gridview
 // -------------------------
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index e3350b4956e0..f9bb860b5ec3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -368,7 +368,7 @@ textarea {
 }
 
 // Radios and checkboxes on same line
-// TODO v3: Convert .inline to .control-inline
+// TODO: v3: Convert .inline to .control-inline
 .radio.inline,
 .checkbox.inline {
   display: inline-block;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
index 346bddf00f30..4a43c340db85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
@@ -63,7 +63,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
 
         function initDialogTree() {
             vm.dialogTreeApi.callbacks.treeLoaded(treeLoadedHandler);
-            //TODO: Also deal with unexpanding!!
+            // TODO: Also deal with unexpanding!!
             vm.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
             vm.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
         }
@@ -111,7 +111,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
                 }
             }
 
-            //TODO: Seems odd this logic is here, i don't think it needs to be and should just exist on the property editor using this
+            // TODO: Seems odd this logic is here, i don't think it needs to be and should just exist on the property editor using this
             if ($scope.model.minNumber) {
                 $scope.model.minNumber = parseInt($scope.model.minNumber, 10);
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.controller.js
index 2bde680bf498..2a3f67a7e301 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.controller.js
@@ -26,7 +26,7 @@
                     if (newVal !== oldVal) {
                         vm.loading = true;
 
-                        //TODO: Can we minimize the flicker?
+                        // TODO: Can we minimize the flicker?
                         $timeout(function () {
                             onInit();
                         }, 100);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
index e594bae2f43e..56ce67a0dc79 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -65,7 +65,7 @@ function ContentDeleteController($scope, $timeout, contentResource, treeService,
 
             //check if response is ysod
             if (err.status && err.status >= 500) {
-                //TODO: All YSOD handling should be done with an interceptor
+                // TODO: All YSOD handling should be done with an interceptor
                 overlayService.ysod(err);
             }
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
index 9074834ee631..82432ba78dc9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
@@ -27,7 +27,7 @@
                     //and it's not publishable or not selected to be published
                     //then we cannot continue
 
-                    //TODO: Show a message when this occurs
+                    // TODO: Show a message when this occurs
                     return false;
                 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
index c2ffbced04cb..0ca2fe65c9d1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
@@ -69,7 +69,7 @@
                     //and not flagged for saving
                     //then we cannot continue
 
-                    //TODO: Show a message when this occurs
+                    // TODO: Show a message when this occurs
                     return false;
                 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
index 6991a7b50991..d97bfc77b135 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
@@ -333,7 +333,7 @@
                     //and it's not publishable or not selected to be published
                     //then we cannot continue
 
-                    //TODO: Show a message when this occurs
+                    // TODO: Show a message when this occurs
                     return false;
                 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/delete.controller.js
index cc5e4b32a923..80c716732e96 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/delete.controller.js
@@ -18,7 +18,7 @@ function ContentBlueprintDeleteController($scope, contentResource, treeService,
                 $scope.currentNode.loading = false;
                 //get the root node before we remove it
                 var rootNode = treeService.getTreeRoot($scope.currentNode);
-                //TODO: Need to sync tree, etc...
+                // TODO: Need to sync tree, etc...
                 treeService.removeNode($scope.currentNode);
                 navigationService.hideMenu();
             });
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js
index 9cef913e799f..8206d0a1147f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js
@@ -2,12 +2,11 @@
     "use strict";
 
     function RedirectUrlsController($scope, redirectUrlsResource, notificationsService, localizationService, $q) {
-        //...todo
-        //search by url or url part
-        //search by domain
-        //display domain in dashboard results?
+        // TODO: search by url or url part
+        // TODO: search by domain
+        // TODO: display domain in dashboard results?
 
-        //used to cancel any request in progress if another one needs to take it's place
+        // used to cancel any request in progress if another one needs to take it's place
         var vm = this;
         var canceler = null;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js
index a5e41257420d..10037db166dd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js
@@ -148,8 +148,8 @@ function ExamineManagementController($scope, umbRequestHelper, $http, $q, $timeo
                     'Failed to rebuild index')
                 .then(function() {
 
-                    //rebuilding has started, nothing is returned accept a 200 status code.
-                    //lets poll to see if it is done.
+                    // rebuilding has started, nothing is returned accept a 200 status code.
+                    // lets poll to see if it is done.
                     $timeout(() => { checkProcessing(index, "PostCheckRebuildIndex"), 1000 });
 
                 });
@@ -157,7 +157,7 @@ function ExamineManagementController($scope, umbRequestHelper, $http, $q, $timeo
     }
 
     function init() {
-        //go get the data
+        // go get the data
 
         //combine two promises and execute when they are both done
         $q.all([
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js
index 6cce37943e2a..15e1a9402eb3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js
@@ -32,7 +32,7 @@ function DataTypeCreateController($scope, $location, navigationService, dataType
 
             }, function(err) {
 
-               //TODO: Handle errors
+               // TODO: Handle errors
             });
         };
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.delete.controller.js
index 101d74b16b8f..470e9b5f1e0c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.delete.controller.js
@@ -18,7 +18,7 @@ function DataTypeDeleteController($scope, dataTypeResource, treeService, navigat
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
             
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
@@ -35,7 +35,7 @@ function DataTypeDeleteController($scope, dataTypeResource, treeService, navigat
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
 
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js
index c920e05480be..d7d8082048f8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js
@@ -18,7 +18,7 @@ function DocumentTypesDeleteController($scope, dataTypeResource, contentTypeReso
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
 
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
@@ -35,7 +35,7 @@ function DocumentTypesDeleteController($scope, dataTypeResource, contentTypeReso
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
 
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
index 70b5120ebe60..ab057f87a433 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
@@ -59,7 +59,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
 
             //check if response is ysod
             if (err.status && err.status >= 500) {
-                //TODO: All YSOD handling should be done with an interceptor
+                // TODO: All YSOD handling should be done with an interceptor
                 overlayService.ysod(err);
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.controller.js
index 785550684bc6..f4b61d55dd4d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.controller.js
@@ -18,7 +18,7 @@ function MediaTypesDeleteController($scope, dataTypeResource, mediaTypeResource,
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
 
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
@@ -35,7 +35,7 @@ function MediaTypesDeleteController($scope, dataTypeResource, mediaTypeResource,
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
 
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/membergroups/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/membergroups/delete.controller.js
index 22deb6df4be9..7e434b6f3b6b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membergroups/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membergroups/delete.controller.js
@@ -18,7 +18,7 @@ function MemberGroupsDeleteController($scope, memberGroupResource, treeService,
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
 
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
index af2457d0997b..adf6cbc8a60e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
@@ -35,7 +35,7 @@ function MemberTypesCreateController($scope, $location, navigationService, membe
 
             }, function(err) {
 
-               //TODO: Handle errors
+               // TODO: Handle errors
             });
         };
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js
index c0cd0c8598a6..8b8c966790ca 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js
@@ -18,7 +18,7 @@ function MemberTypesDeleteController($scope, memberTypeResource, treeService, na
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
 
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js
index 02b89dd27947..17e7fa1bd970 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js
@@ -18,7 +18,7 @@ function PartialViewMacrosDeleteController($scope, codefileResource, treeService
                 $scope.currentNode.loading = false;
                 //get the root node before we remove it
                 var rootNode = treeService.getTreeRoot($scope.currentNode);
-                //TODO: Need to sync tree, etc...
+                // TODO: Need to sync tree, etc...
                 treeService.removeNode($scope.currentNode);
                 navigationService.hideMenu();
             });
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js
index 1e615ad0d476..a848b77a82ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js
@@ -21,7 +21,7 @@ function PartialViewsDeleteController($scope, codefileResource, treeService, nav
                 $scope.currentNode.loading = false;
                 //get the root node before we remove it
                 var rootNode = treeService.getTreeRoot($scope.currentNode);
-                //TODO: Need to sync tree, etc...
+                // TODO: Need to sync tree, etc...
                 treeService.removeNode($scope.currentNode);
                 navigationService.hideMenu();
             }, function (err) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index 79ae34ea219f..d6fe7099621b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -12,7 +12,7 @@ function ColorPickerController($scope) {
     //map back to the model
     $scope.model.config = config;
 
-    //TODO: This isn't used
+    // TODO: This isn't used
     function convertArrayToDictionaryArray(model) {
         //now we need to format the items in the dictionary because we always want to have an array
         var newItems = [];
@@ -23,7 +23,7 @@ function ColorPickerController($scope) {
         return newItems;
     }
 
-    //TODO: This isn't used
+    // TODO: This isn't used
     function convertObjectToDictionaryArray(model) {
         //now we need to format the items in the dictionary because we always want to have an array
         var newItems = [];
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 1e7e3fa0ed0d..a3fc33d2ea41 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -766,7 +766,7 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
             case "published":
                 return "content_isPublished";
             case "contentTypeAlias":
-                //TODO: Check for members
+                // TODO: Check for members
                 return $scope.entityType === "content" ? "content_documentType" : "content_mediatype";
             case "email":
                 return "general_email";
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
index 67a56309096d..f05b1e31d898 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
@@ -69,7 +69,7 @@ function MarkdownEditorController($scope, $element, assetsService, editorService
                 }, 200);
             });
 
-            //load the seperat css for the editor to avoid it blocking our js loading TEMP HACK
+            // HACK: load the separate css for the editor to avoid it blocking our js loading TEMP HACK
             assetsService.loadCss("lib/markdown/markdown.css", $scope);
         })
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index d6cc35bacdaf..884b661beb95 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -300,7 +300,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                             function (property) {
                                 if (_.find(notSupported, function (x) { return x === property.editor; })) {
                                     property.notSupported = true;
-                                    //TODO: Not supported message to be replaced with 'content_nestedContentEditorNotSupported' dictionary key. Currently not possible due to async/timing quirk.
+                                    // TODO: Not supported message to be replaced with 'content_nestedContentEditorNotSupported' dictionary key. Currently not possible due to async/timing quirk.
                                     property.notSupportedMessage = "Property " + property.label + " uses editor " + property.editor + " which is not supported by Nested Content.";
                                 }
                             });
@@ -433,7 +433,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
             unsubscribe();
         });
 
-        //TODO: Move this into a shared location?
+        // TODO: Move this into a shared location?
         var UUID = (function () {
             var self = {};
             var lut = []; for (var i = 0; i < 256; i++) { lut[i] = (i < 16 ? '0' : '') + (i).toString(16); }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js
index b795c49855cc..f455e99fe795 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js
@@ -32,7 +32,7 @@
 
             // set default title
             if(!$scope.model.title) {
-                // TODO localize
+                // TODO: localize
                 $scope.model.title = "Edit source code";
             }
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 218136147049..960e66edfee3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -2,7 +2,7 @@ angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.RTEController",
     function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, editorService, macroService, editorState) {
 
-            //TODO: A lot of the code below should be shared between the grid rte and the normal rte
+            // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
             $scope.isLoading = true;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js
index 82c11a2242c2..475739922405 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js
@@ -18,7 +18,7 @@ function ScriptsDeleteController($scope, codefileResource, treeService, navigati
                 $scope.currentNode.loading = false;
                 //get the root node before we remove it
                 var rootNode = treeService.getTreeRoot($scope.currentNode);
-                //TODO: Need to sync tree, etc...
+                // TODO: Need to sync tree, etc...
                 treeService.removeNode($scope.currentNode);
                 navigationService.hideMenu();
             });
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
index 62c5ace83a31..2ca93fba4cf0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
@@ -145,7 +145,7 @@
                     //As conflicts with our own tree search shortcut
                     _editor.commands.bindKey("ctrl-space", null);
 
-                    //TODO: Move all these keybinding config out into some helper/service
+                    // TODO: Move all these keybinding config out into some helper/service
                     _editor.commands.addCommands([
                         //Disable (alt+shift+K)
                         //Conflicts with our own show shortcuts dialog - this overrides it
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.controller.js
index a05836be060b..541d329e0502 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.controller.js
@@ -205,7 +205,7 @@
                     //As conflicts with our own tree search shortcut
                     _editor.commands.bindKey("ctrl-space", null);
 
-                    //TODO: Move all these keybinding config out into some helper/service
+                    // TODO: Move all these keybinding config out into some helper/service
                     _editor.commands.addCommands([
                         //Disable (alt+shift+K)
                         //Conflicts with our own show shortcuts dialog - this overrides it
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js
index d019a44a10dc..32e9477133a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js
@@ -22,7 +22,7 @@ function TemplatesDeleteController($scope, templateResource , treeService, navig
             //get the root node before we remove it
             var rootNode = treeService.getTreeRoot($scope.currentNode);
 
-            //TODO: Need to sync tree, etc...
+            // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         }, function (err) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
index 1f6fb8863ac5..dee270563837 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
@@ -634,7 +634,7 @@
                     templateCode = templateCode.replace(layoutDefRegex, "$1\"" + newValue + "\"$3");
                 } else {
                     // Declaration doesn't exist, so prepend to start of doc
-                    //TODO: Maybe insert at the cursor position, rather than just at the top of the doc?
+                    // TODO: Maybe insert at the cursor position, rather than just at the top of the doc?
                     templateCode = "@{\n\tLayout = \"" + newValue + "\";\n}\n" + templateCode;
                 }
             } else {
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js
index e939c255762a..ac49709ee468 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js
@@ -117,7 +117,7 @@
                 }, 1000);
             });
 
-            ////TODO: THIS FAILED
+            //// TODO: THIS FAILED
             //it("changes layout value when masterpage is selected", function() {
             //    var newTemplate;
             //    ace.clearSelection = nada;
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/directives/val-email.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/directives/val-email.spec.js
index 9a6e884ff668..1a1c850b1556 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/directives/val-email.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/directives/val-email.spec.js
@@ -5,7 +5,7 @@
     beforeEach(module('umbraco'));
 
     beforeEach(inject(function ($injector) {
-        //TODO: I have no idea why this doesn't work!!?? it freakin should
+        // TODO: I have no idea why this doesn't work!!?? it freakin should
         //valEmailExpression = $injector.get('valEmailExpression');
 
         //in the meantime, i've had to hard code the regex statement here
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js
index 7510b766a86f..3f953fffcd4f 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js
@@ -268,7 +268,7 @@
             expect(numCalled).toEqual(3);
         });
         
-        //TODO: Finish testing the rest!
+        // TODO: Finish testing the rest!
 
     });
 
diff --git a/src/Umbraco.Web/Actions/ActionChangeDocType.cs b/src/Umbraco.Web/Actions/ActionChangeDocType.cs
index 56868e9fb03b..dcdff94037de 100644
--- a/src/Umbraco.Web/Actions/ActionChangeDocType.cs
+++ b/src/Umbraco.Web/Actions/ActionChangeDocType.cs
@@ -5,7 +5,7 @@
 
 namespace Umbraco.Web.Actions
 {
-    //TODO: Add this back in when we support this functionality again
+    // TODO: Add this back in when we support this functionality again
     ///// <summary>
     ///// This action is invoked when the document type of a piece of content is changed
     ///// </summary>
diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
index 944157db9da8..99a1e6c803cc 100644
--- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
@@ -92,7 +92,7 @@ public override void Refresh(JsonPayload[] payloads)
             // content and when the PublishedCachesService is notified of changes it does not see
             // the new content...
 
-            // todo - what about this?
+            // TODO: what about this?
             // should rename it, and then, this is only for Deploy, and then, ???
             //if (Suspendable.PageCacheRefresher.CanUpdateDocumentCache)
             //  ...
diff --git a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
index 6916b40f2d09..9bd275bc3e91 100644
--- a/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
@@ -56,7 +56,7 @@ public override void Refresh(JsonPayload[] payloads)
                 _idkMap.ClearCache(payload.Id);
             }
 
-            // todo - not sure I like these?
+            // TODO: not sure I like these?
             TagsValueConverter.ClearCaches();
             SliderValueConverter.ClearCaches();
 
diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
index ce8267dfc8af..c64951810a74 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
@@ -71,7 +71,7 @@ public void HandleEvents(IEnumerable<IEventDefinition> events)
                     var handler = FindHandler(e);
                     if (handler == null)
                     {
-                        // todo - should this be fatal (ie, an exception)?
+                        // TODO: should this be fatal (ie, an exception)?
                         var name = e.Sender.GetType().Name + "_" + e.EventName;
                         _logger.Warn<DistributedCacheBinder>("Dropping event {EventName} because no corresponding handler was found.", name);
                         continue;
diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
index 4f05abc9ee03..951b7f79dfcf 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
@@ -196,7 +196,7 @@ private void ContentService_TreeChanged(IContentService sender, TreeChange<ICont
             _distributedCache.RefreshContentCache(args.Changes.ToArray());
         }
 
-        // todo our weird events handling wants this for now
+        // TODO: our weird events handling wants this for now
         private void ContentService_Deleted(IContentService sender, DeleteEventArgs<IContent> e) { }
         private void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e) { }
         private void ContentService_Trashed(IContentService sender, MoveEventArgs<IContent> e) { }
@@ -307,7 +307,7 @@ private void MemberTypeService_Changed(IMemberTypeService sender, ContentTypeCha
             _distributedCache.RefreshContentTypeCache(args.Changes.ToArray());
         }
 
-        // todo our weird events handling wants this for now
+        // TODO: our weird events handling wants this for now
         private void ContentTypeService_Saved(IContentTypeService sender, SaveEventArgs<IContentType> args) { }
         private void MediaTypeService_Saved(IMediaTypeService sender, SaveEventArgs<IMediaType> args) { }
         private void MemberTypeService_Saved(IMemberTypeService sender, SaveEventArgs<IMemberType> args) { }
@@ -321,7 +321,7 @@ private void MemberTypeService_Deleted(IMemberTypeService sender, DeleteEventArg
 
         private void UserService_UserGroupPermissionsAssigned(IUserService sender, SaveEventArgs<EntityPermission> e)
         {
-            //TODO: Not sure if we need this yet depends if we start caching permissions
+            // TODO: Not sure if we need this yet depends if we start caching permissions
             //var groupIds = e.SavedEntities.Select(x => x.UserGroupId).Distinct();
             //foreach (var groupId in groupIds)
             //{
@@ -379,7 +379,7 @@ private void FileService_SavedTemplate(IFileService sender, SaveEventArgs<ITempl
                 _distributedCache.RefreshTemplateCache(entity.Id);
         }
 
-        // todo our weird events handling wants this for now
+        // TODO: our weird events handling wants this for now
         private void FileService_DeletedStylesheet(IFileService sender, DeleteEventArgs<Stylesheet> e) { }
         private void FileService_SavedStylesheet(IFileService sender, SaveEventArgs<Stylesheet> e) { }
 
@@ -408,7 +408,7 @@ private void MediaService_Changed(IMediaService sender, TreeChange<IMedia>.Event
             _distributedCache.RefreshMediaCache(args.Changes.ToArray());
         }
 
-        // todo our weird events handling wants this for now
+        // TODO: our weird events handling wants this for now
         private void MediaService_Saved(IMediaService sender, SaveEventArgs<IMedia> e) { }
         private void MediaService_Deleted(IMediaService sender, DeleteEventArgs<IMedia> e) { }
         private void MediaService_Moved(IMediaService sender, MoveEventArgs<IMedia> e) { }
diff --git a/src/Umbraco.Web/Composing/Composers/InstallerComposer.cs b/src/Umbraco.Web/Composing/Composers/InstallerComposer.cs
index b848425736be..f73491f1fb65 100644
--- a/src/Umbraco.Web/Composing/Composers/InstallerComposer.cs
+++ b/src/Umbraco.Web/Composing/Composers/InstallerComposer.cs
@@ -20,7 +20,7 @@ public static Composition ComposeInstaller(this Composition composition)
             composition.Register<DatabaseInstallStep>(Lifetime.Scope);
             composition.Register<DatabaseUpgradeStep>(Lifetime.Scope);
 
-            //TODO: Add these back once we have a compatible starter kit
+            // TODO: Add these back once we have a compatible starter kit
             //container.Register<StarterKitDownloadStep>(Lifetime.Scope);
             //container.Register<StarterKitInstallStep>(Lifetime.Scope);
             //container.Register<StarterKitCleanupStep>(Lifetime.Scope);
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index bd0e3d02dce6..70b0927c43bf 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -63,7 +63,7 @@ public static IFactory Factory
 
         #region Temp & Special
 
-        // todo - have to keep this until tests are refactored
+        // TODO: have to keep this until tests are refactored
         // but then, it should all be managed properly in the container
         public static IUmbracoContextAccessor UmbracoContextAccessor
         {
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index 66c8a8143cc4..726797c26a1c 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -64,7 +64,7 @@ public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]Registe
                     break;
                 case MembershipCreateStatus.InvalidQuestion:
                 case MembershipCreateStatus.InvalidAnswer:
-                    //TODO: Support q/a http://issues.umbraco.org/issue/U4-3213
+                    // TODO: Support q/a http://issues.umbraco.org/issue/U4-3213
                     throw new NotImplementedException(status.ToString());
                 case MembershipCreateStatus.InvalidEmail:
                     ModelState.AddModelError("registerModel.Email", "Email is invalid");
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 7e45797107f5..26651051208f 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -390,7 +390,7 @@ private async Task<ActionResult> ExternalSignInAsync(ExternalLoginInfo loginInfo
             var user = await UserManager.FindAsync(loginInfo.Login);
             if (user != null)
             {
-                //TODO: It might be worth keeping some of the claims associated with the ExternalLoginInfo, in which case we
+                // TODO: It might be worth keeping some of the claims associated with the ExternalLoginInfo, in which case we
                 // wouldn't necessarily sign the user in here with the standard login, instead we'd update the
                 // UseUmbracoBackOfficeExternalCookieAuthentication extension method to have the correct provider and claims factory,
                 // ticket format, etc.. to create our back office user including the claims assigned and in this method we'd just ensure
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 66289a3c7c40..c49974959182 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -87,7 +87,7 @@ internal Dictionary<string, object> BareMinimumServerVariables()
                 }
             }
 
-            //TODO: This is ultra confusing! this same key is used for different things, when returning the full app when authenticated it is this URL but when not auth'd it's actually the ServerVariables address
+            // TODO: This is ultra confusing! this same key is used for different things, when returning the full app when authenticated it is this URL but when not auth'd it's actually the ServerVariables address
             // so based on compat and how things are currently working we need to replace the serverVarsJs one
             ((Dictionary<string, object>)defaults["umbracoUrls"])["serverVarsJs"] = _urlHelper.Action("ServerVariables", "BackOffice");
 
@@ -105,7 +105,7 @@ internal Dictionary<string, object> GetServerVariables()
                 {
                     "umbracoUrls", new Dictionary<string, object>
                     {
-                        //TODO: Add 'umbracoApiControllerBaseUrl' which people can use in JS
+                        // TODO: Add 'umbracoApiControllerBaseUrl' which people can use in JS
                         // to prepend their URL. We could then also use this in our own resources instead of
                         // having each url defined here explicitly - we can do that in v8! for now
                         // for umbraco services we'll stick to explicitly defining the endpoints.
@@ -114,7 +114,7 @@ internal Dictionary<string, object> GetServerVariables()
                         {"externalLinkLoginsUrl", _urlHelper.Action("LinkLogin", "BackOffice")},
                         {"manifestAssetList", _urlHelper.Action("GetManifestAssetList", "BackOffice")},
                         {"gridConfig", _urlHelper.Action("GetGridConfig", "BackOffice")},
-                        //TODO: This is ultra confusing! this same key is used for different things, when returning the full app when authenticated it is this URL but when not auth'd it's actually the ServerVariables address
+                        // TODO: This is ultra confusing! this same key is used for different things, when returning the full app when authenticated it is this URL but when not auth'd it's actually the ServerVariables address
                         {"serverVarsJs", _urlHelper.Action("Application", "BackOffice")},
                         //API URLs
                         {
@@ -370,7 +370,7 @@ internal Dictionary<string, object> GetServerVariables()
                                 .Select(p => new
                                 {
                                     authType = p.AuthenticationType, caption = p.Caption,
-                                    //TODO: Need to see if this exposes any sensitive data!
+                                    // TODO: Need to see if this exposes any sensitive data!
                                     properties = p.Properties
                                 })
                                 .ToArray()
@@ -429,7 +429,7 @@ private IEnumerable<Dictionary<string, string>> GetTreePluginsMetaData()
         /// it's resolving which is unnecessary and annoying.
         /// </remarks>
         private static readonly Lazy<IEnumerable<Type>> TreeControllerTypes
-            = new Lazy<IEnumerable<Type>>(() => Current.TypeLoader.GetAttributedTreeControllers().ToArray()); // todo inject
+            = new Lazy<IEnumerable<Type>>(() => Current.TypeLoader.GetAttributedTreeControllers().ToArray()); // TODO: inject
 
         /// <summary>
         /// Returns the server variables regarding the application state
diff --git a/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs b/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
index dd6d22a96777..6fc0e123a567 100644
--- a/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
+++ b/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
@@ -50,7 +50,7 @@ public TModelSave BindModelFromMultipartRequest<TModelSave>(HttpActionContext ac
                     }
                 }
 
-                //TODO: anything after 3 parts we can put in metadata
+                // TODO: anything after 3 parts we can put in metadata
 
                 var fileName = file.Headers.ContentDisposition.FileName.Trim('\"');
 
diff --git a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
index f54fd12c30fa..393fab98a9b6 100644
--- a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
+++ b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
@@ -82,7 +82,7 @@ private IMember GetExisting(MemberSave model)
                         throw new InvalidOperationException("Could not find member with key " + model.Key);
                     }
 
-                    //TODO: Support this scenario!
+                    // TODO: Support this scenario!
                     //if (scenario == MembershipScenario.CustomProviderWithUmbracoLink)
                     //{
                     //    //if there's a 'Member' type then we should be able to just go get it from the db since it was created with a link
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 6db0c6a8f9f0..63b6c173b536 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -23,7 +23,7 @@
 
 namespace Umbraco.Web.Editors
 {
-    //TODO: Put some exception filters in our webapi to return 404 instead of 500 when we throw ArgumentNullException
+    // TODO: Put some exception filters in our webapi to return 404 instead of 500 when we throw ArgumentNullException
     // ref: https://www.exceptionnotfound.net/the-asp-net-web-api-exception-handling-pipeline-a-guided-tour/
     [PluginController("UmbracoApi")]
     [PrefixlessBodyModelValidator]
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 841c60938a87..0fba76e84b14 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -175,7 +175,7 @@ public IEnumerable<AssignedUserGroupPermissions> GetDetailedPermissions(int cont
             var content = Services.ContentService.GetById(contentId);
             if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
 
-            //TODO: Should non-admins be able to see detailed permissions?
+            // TODO: Should non-admins be able to see detailed permissions?
 
             var allUserGroups = Services.UserService.GetAllUserGroups();
 
@@ -271,7 +271,7 @@ private static void SetupBlueprint(ContentItemDisplay content, IContent persiste
             content.AllowedActions = new[] { "A" };
             content.IsBlueprint = true;
 
-            //todo  - exclude the content apps here
+            // TODO: exclude the content apps here
             //var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
             //var propsTab = content.Tabs.Last();
             //propsTab.Properties = propsTab.Properties
@@ -433,7 +433,7 @@ public HttpResponseMessage GetNiceUrl(Udi id)
         [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic>>), "Items")]
         public PagedResult<ContentItemBasic<ContentPropertyBasic>> GetChildren(
                 int id,
-                int pageNumber = 0,  //TODO: This should be '1' as it's not the index
+                int pageNumber = 0,  // TODO: This should be '1' as it's not the index
                 int pageSize = 0,
                 string orderBy = "SortOrder",
                 Direction orderDirection = Direction.Ascending,
@@ -1091,7 +1091,7 @@ private IEnumerable<PublishResult> PublishBranchInternal(ContentItemSave content
             {
                 //its invariant, proceed normally
                 var publishStatus = Services.ContentService.SaveAndPublishBranch(contentItem.PersistedContent, force, userId: Security.CurrentUser.Id);
-                //TODO: Deal with multiple cancellations
+                // TODO: Deal with multiple cancellations
                 wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent);
                 successfulCultures = Array.Empty<string>();
                 return publishStatus;
@@ -1124,7 +1124,7 @@ private IEnumerable<PublishResult> PublishBranchInternal(ContentItemSave content
             {
                 //proceed to publish if all validation still succeeds
                 var publishStatus = Services.ContentService.SaveAndPublishBranch(contentItem.PersistedContent, force, culturesToPublish, Security.CurrentUser.Id);
-                //TODO: Deal with multiple cancellations
+                // TODO: Deal with multiple cancellations
                 wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent);
                 successfulCultures = contentItem.Variants.Where(x => x.Publish).Select(x => x.Culture).ToArray();
                 return publishStatus;
@@ -1431,7 +1431,7 @@ public HttpResponseMessage PostSort(ContentSortOrder sorted)
                 if (!sortResult.Success)
                 {
                     Logger.Warn<ContentController>("Content sorting failed, this was probably caused by an event being cancelled");
-                    //TODO: Now you can cancel sorting, does the event messages bubble up automatically?
+                    // TODO: Now you can cancel sorting, does the event messages bubble up automatically?
                     return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
                 }
 
@@ -1907,7 +1907,7 @@ private void AddMessageForPublishStatus(IEnumerable<PublishResult> statuses, INo
                 {
                     case PublishResultType.SuccessPublishAlready:
                         {
-                            //TODO: Here we should have messaging for when there are release dates specified like https://github.com/umbraco/Umbraco-CMS/pull/3507
+                            // TODO: Here we should have messaging for when there are release dates specified like https://github.com/umbraco/Umbraco-CMS/pull/3507
                             // but this will take a bit of effort because we need to deal with variants, different messaging, etc... A quick attempt was made here:
                             // http://github.com/umbraco/Umbraco-CMS/commit/9b3de7b655e07c612c824699b48a533c0448131a
 
@@ -1938,7 +1938,7 @@ private void AddMessageForPublishStatus(IEnumerable<PublishResult> statuses, INo
                         break;
                     case PublishResultType.SuccessPublish:
                         {
-                            //TODO: Here we should have messaging for when there are release dates specified like https://github.com/umbraco/Umbraco-CMS/pull/3507
+                            // TODO: Here we should have messaging for when there are release dates specified like https://github.com/umbraco/Umbraco-CMS/pull/3507
                             // but this will take a bit of effort because we need to deal with variants, different messaging, etc... A quick attempt was made here:
                             // http://github.com/umbraco/Umbraco-CMS/commit/9b3de7b655e07c612c824699b48a533c0448131a
 
@@ -2148,7 +2148,7 @@ public HttpResponseMessage PostRollbackContent(int contentId, int versionId, str
                 default:
                     notificationModel.AddErrorNotification(
                                     Services.TextService.Localize("speechBubbles/operationFailedHeader"),
-                                    null); //TODO: There is no specific failed to save error message AFAIK
+                                    null); // TODO: There is no specific failed to save error message AFAIK
                     break;
                 case OperationResultType.FailedCancelledByEvent:
                     notificationModel.AddErrorNotification(
diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs
index 904e6911c93c..d7c4d4f7f725 100644
--- a/src/Umbraco.Web/Editors/ContentControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs
@@ -148,7 +148,7 @@ protected void AddCancelMessage(INotificationModel display,
             string[] messageParams = null)
         {
             //if there's already a default event message, don't add our default one
-            //todo inject
+            // TODO: inject
             var msgs = Current.EventMessages;
             if (msgs != null && msgs.GetAll().Any(x => x.IsDefaultEventMessage)) return;
 
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index d5a72a737871..3800871f882f 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -35,7 +35,7 @@
 
 namespace Umbraco.Web.Editors
 {
-    //TODO:  We'll need to be careful about the security on this controller, when we start implementing
+    // TODO:  We'll need to be careful about the security on this controller, when we start implementing
     // methods to modify content types we'll need to enforce security on the individual methods, we
     // cannot put security on the whole controller because things like
     //  GetAllowedChildren, GetPropertyTypeScaffold, GetAllPropertyTypeAliases are required for content editing.
diff --git a/src/Umbraco.Web/Editors/CurrentUserController.cs b/src/Umbraco.Web/Editors/CurrentUserController.cs
index f759a9e60418..30f3a431ad14 100644
--- a/src/Umbraco.Web/Editors/CurrentUserController.cs
+++ b/src/Umbraco.Web/Editors/CurrentUserController.cs
@@ -177,7 +177,7 @@ public async Task<ModelWithNotifications<string>> PostChangePassword(ChangingPas
                 var userMgr = this.TryGetOwinContext().Result.GetBackOfficeUserManager();
 
                 //raise the reset event
-                //TODO: I don't think this is required anymore since from 7.7 we no longer display the reset password checkbox since that didn't make sense.
+                // TODO: I don't think this is required anymore since from 7.7 we no longer display the reset password checkbox since that didn't make sense.
                 if (data.Reset.HasValue && data.Reset.Value)
                 {
                     userMgr.RaisePasswordResetEvent(Security.CurrentUser.Id);
diff --git a/src/Umbraco.Web/Editors/DashboardSecurity.cs b/src/Umbraco.Web/Editors/DashboardSecurity.cs
index fdbf5af7d92b..2e3fc4123b2f 100644
--- a/src/Umbraco.Web/Editors/DashboardSecurity.cs
+++ b/src/Umbraco.Web/Editors/DashboardSecurity.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Web.Editors
     /// </summary>
     internal class DashboardSecurity
     {
-        //TODO: Unit test all this!!! :/
+        // TODO: Unit test all this!!! :/
 
         public static bool AuthorizeAccess(ISection dashboardSection, IUser user, ISectionService sectionService)
         {
diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs
index 0af3a1cfe724..4446373cd396 100644
--- a/src/Umbraco.Web/Editors/DataTypeController.cs
+++ b/src/Umbraco.Web/Editors/DataTypeController.cs
@@ -204,7 +204,7 @@ public DataTypeDisplay PostSave(DataTypeSave dataType)
         {
             //If we've made it here, then everything has been wired up and validated by the attribute
 
-            //TODO: Check if the property editor has changed, if it has ensure we don't pass the
+            // TODO: Check if the property editor has changed, if it has ensure we don't pass the
             // existing values to the new property editor!
 
             // get the current configuration,
diff --git a/src/Umbraco.Web/Editors/EditorValidator.cs b/src/Umbraco.Web/Editors/EditorValidator.cs
index 537ae834d3f9..af355206a51c 100644
--- a/src/Umbraco.Web/Editors/EditorValidator.cs
+++ b/src/Umbraco.Web/Editors/EditorValidator.cs
@@ -16,7 +16,7 @@ public static void Validate(ModelStateDictionary modelState, object model)
         {
             var modelType = model.GetType();
 
-            var validationResults = Current.EditorValidators // todo inject
+            var validationResults = Current.EditorValidators // TODO: inject
                 .Where(x => x.ModelType == modelType)
                 .SelectMany(x => x.Validate(model))
                 .Where(x => !string.IsNullOrWhiteSpace(x.ErrorMessage) && x.MemberNames.Any());
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 6fcf5b0e2dba..5cf248d2a61b 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -107,7 +107,7 @@ public dynamic GetSafeAlias(string value, bool camelCase = true)
         [HttpGet]
         public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string searchFrom = null)
         {
-            //TODO: Should we restrict search results based on what app the user has access to?
+            // TODO: Should we restrict search results based on what app the user has access to?
             // - Theoretically you shouldn't be able to see member data if you don't have access to members right?
 
             if (string.IsNullOrEmpty(query))
@@ -252,7 +252,7 @@ public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type)
         /// <returns></returns>
         public EntityBasic GetByQuery(string query, int nodeContextId, UmbracoEntityTypes type)
         {
-            //TODO: Rename this!!! It's misleading, it should be GetByXPath
+            // TODO: Rename this!!! It's misleading, it should be GetByXPath
 
 
             if (type != UmbracoEntityTypes.Document)
@@ -628,7 +628,7 @@ private IEnumerable<EntityBasic> GetResultForChildren(int id, UmbracoEntityTypes
             var objectType = ConvertToObjectType(entityType);
             if (objectType.HasValue)
             {
-                //TODO: Need to check for Object types that support hierarchic here, some might not.
+                // TODO: Need to check for Object types that support hierarchic here, some might not.
 
                 return Services.EntityService.GetChildren(id, objectType.Value)
                     .WhereNotNull()
@@ -651,7 +651,7 @@ private IEnumerable<EntityBasic> GetResultForAncestors(int id, UmbracoEntityType
             var objectType = ConvertToObjectType(entityType);
             if (objectType.HasValue)
             {
-                //TODO: Need to check for Object types that support hierarchic here, some might not.
+                // TODO: Need to check for Object types that support hierarchic here, some might not.
 
                 var ids = Services.EntityService.Get(id).Path.Split(',').Select(int.Parse).Distinct().ToArray();
 
@@ -880,7 +880,7 @@ private IEnumerable<EntityBasic> GetResultForAll(UmbracoEntityTypes entityType,
             var objectType = ConvertToObjectType(entityType);
             if (objectType.HasValue)
             {
-                //TODO: Should we order this by something ?
+                // TODO: Should we order this by something ?
                 var entities = Services.EntityService.GetAll(objectType.Value).WhereNotNull().Select(Mapper.Map<EntityBasic>);
                 return ExecutePostFilter(entities, postFilter, postFilterParams);
             }
@@ -957,7 +957,7 @@ private IEnumerable<T> ExecutePostFilter<T>(IEnumerable<T> entities, string post
             // if a post filter is assigned then try to execute it
             if (postFilter.IsNullOrWhiteSpace() == false)
             {
-                // fixme/task/critical - trouble is, we've killed the dynamic Where thing!
+                // FIXME: task/critical - trouble is, we've killed the dynamic Where thing!
                 throw new NotImplementedException("oops");
                 //return postFilterParams == null
                 //               ? entities.AsQueryable().Where(postFilter).ToArray()
diff --git a/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs b/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs
index e54bb3ef7147..eacc904d9bb3 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs
@@ -96,7 +96,7 @@ protected bool ValidateProperties(List<ContentPropertyBasic> postedProperties, L
             {
                 if (persistedProperties.Any(property => property.Alias == p.Alias) == false)
                 {
-                    //TODO: Do we return errors here ? If someone deletes a property whilst their editing then should we just
+                    // TODO: Do we return errors here ? If someone deletes a property whilst their editing then should we just
                     //save the property data that remains? Or inform them they need to reload... not sure. This problem exists currently too i think.
 
                     var message = $"property with alias: {p.Alias} was not found";
diff --git a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
index 64e1c7641776..a0565c1d2fbb 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
@@ -152,7 +152,7 @@ private bool ValidateUserAccess(ContentItemSave contentItem, HttpActionContext a
                 case ContentSaveAction.PublishWithDescendantsNew:
                 case ContentSaveAction.PublishWithDescendantsForceNew:
                     //Publish new requires both ActionNew AND ActionPublish
-                    //TODO: Shouldn't publish also require ActionUpdate since it will definitely perform an update to publish but maybe that's just implied
+                    // TODO: Shouldn't publish also require ActionUpdate since it will definitely perform an update to publish but maybe that's just implied
 
                     permissionToCheck.Add(ActionNew.ActionLetter);
                     permissionToCheck.Add(ActionPublish.ActionLetter);
diff --git a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
index 3481c754d3dc..fe6a049768f1 100644
--- a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
@@ -27,7 +27,7 @@ public UserGroupValidateAttribute(IUserService userService)
             _userService = userService;
         }
 
-        private IUserService UserService => _userService ?? Current.Services.UserService; // todo inject
+        private IUserService UserService => _userService ?? Current.Services.UserService; // TODO: inject
 
         public override void OnActionExecuting(HttpActionContext actionContext)
         {
@@ -70,7 +70,7 @@ public override void OnActionExecuting(HttpActionContext actionContext)
                 actionContext.ModelState.AddModelError("Alias", "A user group with this alias already exists");
             }
 
-            //TODO: Validate the name is unique?
+            // TODO: Validate the name is unique?
 
             if (actionContext.ModelState.IsValid == false)
             {
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index fe081c1cb40d..5441b8026412 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -227,7 +227,7 @@ public PagedResult<ContentItemBasic<ContentPropertyBasic>> GetChildFolders(int i
         [FilterAllowedOutgoingMedia(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic>>))]
         public IEnumerable<ContentItemBasic<ContentPropertyBasic>> GetRootMedia()
         {
-            //TODO: Add permissions check!
+            // TODO: Add permissions check!
 
             return Services.MediaService.GetRootMedia()
                            .Select(Mapper.Map<IMedia, ContentItemBasic<ContentPropertyBasic>>);
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index dd1f53f8af4e..bb126ed1ddc4 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -24,7 +24,7 @@
 
 namespace Umbraco.Web.Editors
 {
-    //TODO:  We'll need to be careful about the security on this controller, when we start implementing
+    // TODO:  We'll need to be careful about the security on this controller, when we start implementing
     // methods to modify content types we'll need to enforce security on the individual methods, we
     // cannot put security on the whole controller because things like GetAllowedChildren are required for content editing.
 
diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs
index 2211bea76b14..f4a8dfbd5665 100644
--- a/src/Umbraco.Web/Editors/MemberController.cs
+++ b/src/Umbraco.Web/Editors/MemberController.cs
@@ -179,7 +179,7 @@ public MemberDisplay GetByKey(Guid key)
                     return Mapper.Map<MemberDisplay>(foundMember);
                 case MembershipScenario.CustomProviderWithUmbracoLink:
 
-                //TODO: Support editing custom properties for members with a custom membership provider here.
+                // TODO: Support editing custom properties for members with a custom membership provider here.
 
                 //foundMember = Services.MemberService.GetByKey(key);
                 //if (foundMember == null)
@@ -238,7 +238,7 @@ public MemberDisplay GetEmpty(string contentTypeAlias = null)
                     emptyContent.AdditionalData["NewPassword"] = Membership.GeneratePassword(provider.MinRequiredPasswordLength, provider.MinRequiredNonAlphanumericCharacters);
                     return Mapper.Map<MemberDisplay>(emptyContent);
                 case MembershipScenario.CustomProviderWithUmbracoLink:
-                //TODO: Support editing custom properties for members with a custom membership provider here.
+                // TODO: Support editing custom properties for members with a custom membership provider here.
 
                 case MembershipScenario.StandaloneCustomProvider:
                 default:
@@ -275,7 +275,7 @@ public MemberDisplay PostSave(
             {
                 ModelState.Remove("ContentTypeAlias");
 
-                //TODO: We're removing this because we are not displaying it but when we support the CustomProviderWithUmbracoLink scenario
+                // TODO: We're removing this because we are not displaying it but when we support the CustomProviderWithUmbracoLink scenario
                 // we will be able to have a real name associated so do not remove this state once that is implemented!
                 ModelState.Remove("Name");
             }
@@ -291,7 +291,7 @@ public MemberDisplay PostSave(
                 throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
             }
 
-            //TODO: WE need to support this! - requires UI updates, etc...
+            // TODO: WE need to support this! - requires UI updates, etc...
             if (_provider.RequiresQuestionAndAnswer)
             {
                 throw new NotSupportedException("Currently the member editor does not support providers that have RequiresQuestionAndAnswer specified");
@@ -334,7 +334,7 @@ public MemberDisplay PostSave(
             }
 
             //save the IMember -
-            //TODO: When we support the CustomProviderWithUmbracoLink scenario, we'll need to save the custom properties for that here too
+            // TODO: When we support the CustomProviderWithUmbracoLink scenario, we'll need to save the custom properties for that here too
             if (MembershipScenario == MembershipScenario.NativeUmbraco)
             {
                 //save the item
@@ -584,7 +584,7 @@ private void RefetchMemberData(MemberSave contentItem, LookupType lookup)
 
             UpdateName(contentItem);
 
-            //re-assign the mapped values that are not part of the membership provider properties.
+            // re-assign the mapped values that are not part of the membership provider properties.
             var builtInAliases = Constants.Conventions.Member.GetStandardPropertyTypeStubs().Select(x => x.Key).ToArray();
             foreach (var p in contentItem.PersistedContent.Properties)
             {
@@ -593,10 +593,10 @@ private void RefetchMemberData(MemberSave contentItem, LookupType lookup)
                 {
                     p.SetValue(valueMapped.GetValue());
 
-                    // fixme/task - ok, I give up, at that point tags are dead here, until we figure it out
-                    //p.TagChanges.Behavior = valueMapped.TagChanges.Behavior;
-                    //p.TagChanges.Enable = valueMapped.TagChanges.Enable;
-                    //p.TagChanges.Tags = valueMapped.TagChanges.Tags;
+                    // FIXME: /task - ok, I give up, at that point tags are dead here, until we figure it out
+                    // p.TagChanges.Behavior = valueMapped.TagChanges.Behavior;
+                    // p.TagChanges.Enable = valueMapped.TagChanges.Enable;
+                    // p.TagChanges.Tags = valueMapped.TagChanges.Tags;
                 }
             }
         }
@@ -652,7 +652,7 @@ private MembershipUser CreateWithMembershipProvider(MemberSave contentItem, out
                 case MembershipScenario.NativeUmbraco:
                     //We are using the umbraco membership provider, create the member using the membership provider first.
                     var umbracoMembershipProvider = (UmbracoMembershipProviderBase)_provider;
-                    //TODO: We are not supporting q/a - passing in empty here
+                    // TODO: We are not supporting q/a - passing in empty here
                     membershipUser = umbracoMembershipProvider.CreateUser(
                         contentItem.ContentTypeAlias, contentItem.Username,
                         contentItem.Password.NewPassword,
@@ -668,7 +668,7 @@ private MembershipUser CreateWithMembershipProvider(MemberSave contentItem, out
                     //create it - this persisted item has already been set in the MemberBinder based on the 'Member' member type:
                     Services.MemberService.Save(contentItem.PersistedContent);
 
-                    //TODO: We are not supporting q/a - passing in empty here
+                    // TODO: We are not supporting q/a - passing in empty here
                     membershipUser = _provider.CreateUser(
                         contentItem.Username,
                         contentItem.Password.NewPassword,
@@ -685,7 +685,7 @@ private MembershipUser CreateWithMembershipProvider(MemberSave contentItem, out
                     // link back to the umbraco data
 
                     var newKey = Guid.NewGuid();
-                    //TODO: We are not supporting q/a - passing in empty here
+                    // TODO: We are not supporting q/a - passing in empty here
                     membershipUser = _provider.CreateUser(
                         contentItem.Username,
                         contentItem.Password.NewPassword,
@@ -701,7 +701,7 @@ private MembershipUser CreateWithMembershipProvider(MemberSave contentItem, out
                     throw new ArgumentOutOfRangeException();
             }
 
-            //TODO: Localize these!
+            // TODO: Localize these!
             switch (status)
             {
                 case MembershipCreateStatus.Success:
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs b/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs
index 8b080af88cab..95b458b142a6 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs
@@ -7,7 +7,7 @@
 
 namespace Umbraco.Web.HealthCheck.Checks.Config
 {
-    //TODO: Add config transform for when config with specified XPath is not found
+    // TODO: Add config transform for when config with specified XPath is not found
 
     public class ConfigurationService
     {
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheck.cs b/src/Umbraco.Web/HealthCheck/HealthCheck.cs
index 2c8b0c3c84ce..81aa1e47d460 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheck.cs
@@ -50,6 +50,6 @@ protected HealthCheck()
         /// <returns></returns>
         public abstract HealthCheckStatus ExecuteAction(HealthCheckAction action);
 
-        //TODO: What else?
+        // TODO: What else?
     }
 }
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckAttribute.cs b/src/Umbraco.Web/HealthCheck/HealthCheckAttribute.cs
index 35a8e022fb6c..fe206f318614 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckAttribute.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckAttribute.cs
@@ -21,6 +21,6 @@ public HealthCheckAttribute(string id, string name)
 
         public Guid Id { get; private set; }
 
-        //TODO: Do we need more metadata?
+        // TODO: Do we need more metadata?
     }
 }
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
index da906c30f998..61028699f068 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
@@ -14,7 +14,7 @@ public class HealthCheckResults
         private readonly Dictionary<string, IEnumerable<HealthCheckStatus>> _results;
         public readonly bool AllChecksSuccessful;
 
-        private ILogger Logger => Current.Logger; // todo inject
+        private ILogger Logger => Current.Logger; // TODO: inject
 
         public HealthCheckResults(IEnumerable<HealthCheck> checks)
         {
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs b/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs
index 2db0b1f2e746..1d06f352c092 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs
@@ -49,6 +49,6 @@ public HealthCheckStatus(string message)
         [DataMember(Name = "actions")]
         public IEnumerable<HealthCheckAction> Actions { get; set; }
 
-        //TODO: What else?
+        // TODO: What else?
     }
 }
diff --git a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
index bf371bacf04f..dc315c571a4e 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
@@ -52,7 +52,7 @@ public InstallSetup GetSetup()
         {
             var setup = new InstallSetup();
 
-            //TODO: Check for user/site token
+            // TODO: Check for user/site token
 
             var steps = new List<InstallSetupStep>();
 
diff --git a/src/Umbraco.Web/Install/InstallStepCollection.cs b/src/Umbraco.Web/Install/InstallStepCollection.cs
index d5c32d0ce6cd..fd8f248325a1 100644
--- a/src/Umbraco.Web/Install/InstallStepCollection.cs
+++ b/src/Umbraco.Web/Install/InstallStepCollection.cs
@@ -14,7 +14,7 @@ public InstallStepCollection(InstallHelper installHelper, IEnumerable<InstallSet
         {
             _installHelper = installHelper;
 
-            // todo this is ugly but I have a branch where it's nicely refactored - for now we just want to manage ordering
+            // TODO: this is ugly but I have a branch where it's nicely refactored - for now we just want to manage ordering
             var a = installerSteps.ToArray();
             _orderedInstallerSteps = new InstallSetupStep[]
             {
@@ -26,7 +26,7 @@ public InstallStepCollection(InstallHelper installHelper, IEnumerable<InstallSet
                 a.OfType<DatabaseInstallStep>().First(),
                 a.OfType<DatabaseUpgradeStep>().First(),
 
-                //TODO: Add these back once we have a compatible starter kit
+                // TODO: Add these back once we have a compatible starter kit
                 //orderedInstallerSteps.OfType<StarterKitDownloadStep>().First(),
                 //orderedInstallerSteps.OfType<StarterKitInstallStep>().First(),
                 //orderedInstallerSteps.OfType<StarterKitCleanupStep>().First(),
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index 7b53ecb966fa..151265f3949d 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -42,7 +42,7 @@ public NewInstallStep(HttpContextBase http, IUserService userService, DatabaseBu
             _globalSettings = globalSettings;
         }
 
-        //TODO: Change all logic in this step to use ASP.NET Identity NOT MembershipProviders
+        // TODO: Change all logic in this step to use ASP.NET Identity NOT MembershipProviders
         private MembershipProvider CurrentProvider
         {
             get
diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
index 3ddc675405bb..6b90ff0a78d7 100644
--- a/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
@@ -26,7 +26,7 @@ private void CleanupInstallation(int packageId, string packageFile)
         {
             packageFile = HttpUtility.UrlDecode(packageFile);
 
-            //todo: When does the zip file get deleted?
+            // TODO: When does the zip file get deleted?
         }
 
         public override bool RequiresExecution(object model)
diff --git a/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs b/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
index 147710579712..3cab550a870c 100644
--- a/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
@@ -20,7 +20,7 @@ public override object ViewModel
         {
             get
             {
-                // todo- if UmbracoVersion.Local is null?
+                // TODO: if UmbracoVersion.Local is null?
                 // it means that there is a database but the web.config version is cleared
                 // that was a "normal" way to force the upgrader to execute, and we would detect the current
                 // version via the DB like DatabaseSchemaResult.DetermineInstalledVersion - magic, do we really
@@ -37,7 +37,7 @@ string FormatGuidState(string value)
                     return value;
                 }
 
-                var state = Current.RuntimeState; // todo inject
+                var state = Current.RuntimeState; // TODO: inject
                 var currentState = FormatGuidState(state.CurrentMigrationState);
                 var newState = FormatGuidState(state.FinalMigrationState);
 
diff --git a/src/Umbraco.Web/Install/Models/InstallPackageModel.cs b/src/Umbraco.Web/Install/Models/InstallPackageModel.cs
index 10335c48fc1e..0c7d270033a2 100644
--- a/src/Umbraco.Web/Install/Models/InstallPackageModel.cs
+++ b/src/Umbraco.Web/Install/Models/InstallPackageModel.cs
@@ -7,7 +7,7 @@
 
 namespace Umbraco.Web.Install.Models
 {
-    //todo : do we need this?
+    // TODO: do we need this?
     [Obsolete("This is only used for the obsolete controller InstallPackageController")]
     [DataContract(Name = "installPackage", Namespace = "")]
     public class InstallPackageModel
diff --git a/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs b/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
index 921036c75a28..c73e73226869 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
@@ -10,7 +10,7 @@
 
 namespace Umbraco.Web.Media.EmbedProviders
 {
-    //TODO: Make all Http calls async
+    // TODO: Make all Http calls async
 
     public abstract class AbstractOEmbedProvider : IEmbedProvider
     {
diff --git a/src/Umbraco.Web/MembershipProviderExtensions.cs b/src/Umbraco.Web/MembershipProviderExtensions.cs
index b8330288500b..133e886e1fb0 100644
--- a/src/Umbraco.Web/MembershipProviderExtensions.cs
+++ b/src/Umbraco.Web/MembershipProviderExtensions.cs
@@ -30,7 +30,7 @@ public static IDictionary<string, object> GetConfiguration(
                     {"requiresQuestionAnswer", membershipProvider.RequiresQuestionAndAnswer},
                     {"allowManuallyChangingPassword", baseProvider != null && baseProvider.AllowManuallyChangingPassword},
                     {"minNonAlphaNumericChars", membershipProvider.MinRequiredNonAlphanumericCharacters}
-                    //TODO: Inject the other parameters in here to change the behavior of this control - based on the membership provider settings.
+                    // TODO: Inject the other parameters in here to change the behavior of this control - based on the membership provider settings.
                 };
         }
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs b/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs
index b25a210083cc..5132dbc3ece6 100644
--- a/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs
@@ -37,6 +37,6 @@ public class MemberSave : ContentBaseSave<IMember>
         public bool IsApproved { get; set; }
         
 
-        //TODO: Need to add question / answer support
+        // TODO: Need to add question / answer support
     }
 }
diff --git a/src/Umbraco.Web/Models/ContentEditing/UserGroupPermissionsSave.cs b/src/Umbraco.Web/Models/ContentEditing/UserGroupPermissionsSave.cs
index e61f9debfae6..4c9a751573a2 100644
--- a/src/Umbraco.Web/Models/ContentEditing/UserGroupPermissionsSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/UserGroupPermissionsSave.cs
@@ -17,7 +17,7 @@ public UserGroupPermissionsSave()
             AssignedPermissions = new Dictionary<int, IEnumerable<string>>();
         }
 
-        //TODO: we should have an option to clear the permissions assigned to this node and instead just have them inherit - yes once we actually have inheritance!
+        // TODO: we should have an option to clear the permissions assigned to this node and instead just have them inherit - yes once we actually have inheritance!
 
         [DataMember(Name = "contentId", IsRequired = true)]
         [Required]
diff --git a/src/Umbraco.Web/Models/Mapping/ActionButtonsResolver.cs b/src/Umbraco.Web/Models/Mapping/ActionButtonsResolver.cs
index 6de0e704d51f..c2f7abd48723 100644
--- a/src/Umbraco.Web/Models/Mapping/ActionButtonsResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ActionButtonsResolver.cs
@@ -35,7 +35,7 @@ public IEnumerable<string> Resolve(IContent source)
                 path = parent == null ? "-1" : parent.Path;
             }
 
-            //TODO: This is certainly not ideal usage here - perhaps the best way to deal with this in the future is
+            // TODO: This is certainly not ideal usage here - perhaps the best way to deal with this in the future is
             // with the IUmbracoContextAccessor. In the meantime, if used outside of a web app this will throw a null
             // reference exception :(
             return UserService.GetPermissionsForPath(UmbracoContext.Current.Security.CurrentUser, path).GetAllPermissions();
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
index 3c2dd01c9c01..84eaabf52b0e 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
@@ -29,7 +29,7 @@ public override ContentPropertyDisplay Convert(Property originalProp, ContentPro
 
             var config = DataTypeService.GetDataType(originalProp.PropertyType.DataTypeId).Configuration;
 
-            // todo - IDataValueEditor configuration - general issue
+            // TODO: IDataValueEditor configuration - general issue
             // GetValueEditor() returns a non-configured IDataValueEditor
             // - for richtext and nested, configuration determines HideLabel, so we need to configure the value editor
             // - could configuration also determines ValueType, everywhere?
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
index 01ff458bd53a..cb745096ab03 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
@@ -17,7 +17,7 @@ internal class ContentTypeBasicResolver<TSource, TDestination> : IValueResolver<
     {
         public ContentTypeBasic Resolve(TSource source, TDestination destination, ContentTypeBasic destMember, ResolutionContext context)
         {
-            //TODO: We can resolve the UmbracoContext from the IValueResolver options!
+            // TODO: We can resolve the UmbracoContext from the IValueResolver options!
             // OMG
             if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
                 && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
index 257a53cf1adf..0181fc25bef9 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
@@ -25,7 +25,7 @@ public static IMappingExpression<TSource, PropertyGroup> MapPropertyGroupBasicTo
             where TPropertyTypeBasic : PropertyTypeBasic
         {
             return mapping
-                .ConstructUsing(x => new PropertyGroup(false)) // todo - we have NO idea of isPublishing here = wtf?
+                .ConstructUsing(x => new PropertyGroup(false)) // TODO: we have NO idea of isPublishing here = wtf?
                 .IgnoreEntityCommonProperties()
                 .ForMember(dest => dest.Id, map => map.Condition(src => src.Id > 0))
                 .ForMember(dest => dest.Key, map => map.Ignore())
@@ -66,7 +66,7 @@ public static void AfterMapContentTypeSaveToEntity<TSource, TDestination>(TSourc
 
             foreach (var a in add)
             {
-                //TODO: Remove N+1 lookup
+                // TODO: Remove N+1 lookup
                 var addCt = contentTypeService.Get(a);
                 if (addCt != null)
                     dest.AddContentType(addCt);
@@ -91,7 +91,7 @@ public static void AfterMapMediaTypeSaveToEntity<TSource, TDestination>(TSource
 
             foreach (var a in add)
             {
-                //TODO: Remove N+1 lookup
+                // TODO: Remove N+1 lookup
                 var addCt = mediaTypeService.Get(a);
                 if (addCt != null)
                     dest.AddContentType(addCt);
@@ -160,7 +160,7 @@ public static IMappingExpression<TSource, TDestination> MapBaseContentTypeSaveTo
             where TDestination : IContentTypeComposition
             where TSourcePropertyType : PropertyTypeBasic
         {
-            // todo not so clean really
+            // TODO: not so clean really
             var isPublishing = typeof(IContentType).IsAssignableFrom(typeof(TDestination));
 
             mapping = mapping
diff --git a/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs b/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs
index c8fc9ea4b239..35702719dc19 100644
--- a/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/DatabaseTypeResolver.cs
@@ -16,7 +16,7 @@ public ValueStorageType Resolve(DataTypeSave source)
             if (!Current.PropertyEditors.TryGet(source.EditorAlias, out var editor))
                 throw new InvalidOperationException($"Could not find property editor \"{source.EditorAlias}\".");
 
-            // todo - what about source.PropertyEditor? can we get the configuration here? 'cos it may change the storage type?!
+            // TODO: what about source.PropertyEditor? can we get the configuration here? 'cos it may change the storage type?!
             var valueType = editor.GetValueEditor().ValueType;
             return ValueTypes.ToStorageType(valueType);
         }
diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
index 8f99fe03dc58..90e98822b156 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
@@ -124,7 +124,7 @@ public EntityMapperProfile()
                   .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
                   .AfterMap((src, dest) =>
                       {
-                          //TODO: Properly map this (not aftermap)
+                          // TODO: Properly map this (not aftermap)
 
                           //get the icon if there is one
                           dest.Icon = src.Values.ContainsKey(UmbracoExamineIndex.IconFieldName)
@@ -204,7 +204,7 @@ public string Resolve(IEntitySlim source, EntityBasic destination, string destMe
                 // if there's no culture here, the issue is somewhere else (UI, whatever) - throw!
                 if (culture == null)
                     //throw new InvalidOperationException("Missing culture in mapping options.");
-                    // todo we should throw, but this is used in various places that won't set a culture yet
+                    // TODO: we should throw, but this is used in various places that won't set a culture yet
                     return source.Name;
 
                 // if we don't have a name for a culture, it means the culture is not available, and
diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
index 1be74ce5832c..be1bcdefdc2c 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
@@ -36,7 +36,7 @@ public MacroMapperProfile()
                 {
                     //map the view and the config
                     // we need to show the deprecated ones for backwards compatibility
-                    var paramEditor = Current.ParameterEditors[property.EditorAlias]; // todo - include/filter deprecated?!
+                    var paramEditor = Current.ParameterEditors[property.EditorAlias]; // TODO: include/filter deprecated?!
                     if (paramEditor == null)
                     {
                         //we'll just map this to a text box
diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
index 62afdd88c70e..dbdac1f91f81 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
@@ -56,7 +56,7 @@ public MemberMapperProfile(
                 .ForMember(dest => dest.FailedPasswordAttempts, opt => opt.Ignore())
                 .ForMember(dest => dest.DeleteDate, opt => opt.Ignore())
                 .ForMember(dest => dest.WriterId, opt => opt.Ignore())
-                //TODO: Support these eventually
+                // TODO: Support these eventually
                 .ForMember(dest => dest.PasswordQuestion, opt => opt.Ignore())
                 .ForMember(dest => dest.RawPasswordAnswerValue, opt => opt.Ignore());
 
diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
index c8391abdb430..6134275c7606 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
@@ -139,7 +139,7 @@ protected override IEnumerable<ContentPropertyDisplay> GetCustomGenericPropertie
                     // only when creating a new member and we want to have a generated password pre-filled.
                     Value = new Dictionary<string, object>
                     {
-                        // todo why ignoreCase, what are we doing here?!
+                        // TODO: why ignoreCase, what are we doing here?!
                         {"generatedPassword", member.GetAdditionalDataValueIgnoreCase("GeneratedPassword", null)},
                         {"newPassword", member.GetAdditionalDataValueIgnoreCase("NewPassword", null)},
                     },
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
index 2f2af047f789..e8d7fb38b261 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -27,7 +27,7 @@ protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService,
             IgnoreProperties = ignoreProperties ?? throw new ArgumentNullException(nameof(ignoreProperties));
         }
         
-        //TODO: This should deserialize to ListViewConfiguration
+        // TODO: This should deserialize to ListViewConfiguration
         private static int GetTabNumberFromConfig(IDictionary<string, object> listViewConfig)
         {
             if (!listViewConfig.TryGetValue("displayAtTabNumber", out var displayTabNum))
diff --git a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs
index ae011c01f966..7b467b6d15dd 100644
--- a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs
+++ b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs
@@ -267,8 +267,7 @@ private bool TryGetValueWithLanguageFallback<T>(IPublishedContent content, strin
 
             var visited = new HashSet<int>();
 
-            // todo
-            // _localizationService.GetXxx() is expensive, it deep clones objects
+            // TODO: _localizationService.GetXxx() is expensive, it deep clones objects
             // we want _localizationService.GetReadOnlyXxx() returning IReadOnlyLanguage which cannot be saved back = no need to clone
 
             var language = _localizationService.GetLanguageByIsoCode(culture);
diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index c7e38ab7f04e..dd6afbd97f64 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Web.Models
     [DebuggerDisplay("Content Id: {Id}, Name: {Name}")]
     public abstract class PublishedContentBase : IPublishedContent
     {
-        private string _url; // fixme/task - cannot cache urls, they depends on the current request
+        private string _url; // FIXME: task - cannot cache urls, they depends on the current request
 
         #region ContentType
 
@@ -79,12 +79,12 @@ public abstract class PublishedContentBase : IPublishedContent
         /// The url of documents are computed by the document url providers. The url of medias are, at the moment,
         /// computed here from the 'umbracoFile' property -- but we should move to media url providers at some point.
         /// </remarks>
-        public virtual string GetUrl(string culture = null) // todo - consider .GetCulture("fr-FR").Url
+        public virtual string GetUrl(string culture = null) // TODO: consider .GetCulture("fr-FR").Url
         {
                 switch (ItemType)
                 {
                     case PublishedItemType.Content:
-                        // todo - consider injecting an umbraco context accessor
+                        // TODO: consider injecting an umbraco context accessor
                         if (UmbracoContext.Current == null)
                             throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext.Current is null.");
                         if (UmbracoContext.Current.UrlProvider == null)
@@ -103,7 +103,7 @@ public virtual string GetUrl(string culture = null) // todo - consider .GetCultu
 
                         var propType = ContentType.GetPropertyType(Constants.Conventions.Media.File);
 
-                        // todo - consider implementing media url providers
+                        // TODO: consider implementing media url providers
                         // note: that one does not support variations
                         //This is a hack - since we now have 2 properties that support a URL: upload and cropper, we need to detect this since we always
                         // want to return the normal URL and the cropper stores data as json
diff --git a/src/Umbraco.Web/Models/PublishedProperty.cs b/src/Umbraco.Web/Models/PublishedProperty.cs
index 05d6b5cfe0aa..d32612c54c72 100644
--- a/src/Umbraco.Web/Models/PublishedProperty.cs
+++ b/src/Umbraco.Web/Models/PublishedProperty.cs
@@ -25,7 +25,7 @@ internal static IEnumerable<IPublishedProperty> MapProperties(
             var propertyEditors = Current.PropertyEditors;
             var dataTypeService = Current.Services.DataTypeService;
 
-            // todo not dealing with variants
+            // TODO: not dealing with variants
             // but the entire thing should die anyways
 
             return propertyTypes.Select(x =>
diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs
index 89239f43f713..9dd5524f765e 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItem.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs
@@ -106,7 +106,7 @@ public MenuItem(IAction action, string name = "")
         /// </summary>
         internal const string ActionUrlKey = "actionUrl";
 
-        //TODO: some action's want to launch a new window like live editing, we support this in the menu item's metadata with
+        // TODO: some action's want to launch a new window like live editing, we support this in the menu item's metadata with
         // a key called: "actionUrlMethod" which can be set to either: Dialog, BlankWindow. Normally this is always set to Dialog
         // if a URL is specified in the "actionUrl" metadata. For now I'm not going to implement launching in a blank window,
         // though would be v-easy, just not sure we want to ever support that?
diff --git a/src/Umbraco.Web/Models/UmbracoProperty.cs b/src/Umbraco.Web/Models/UmbracoProperty.cs
index 98ee9fd62894..8b41141b958d 100644
--- a/src/Umbraco.Web/Models/UmbracoProperty.cs
+++ b/src/Umbraco.Web/Models/UmbracoProperty.cs
@@ -28,7 +28,7 @@ public class UmbracoProperty
         [ReadOnly(true)]
         public string Name { get; set; }
 
-        //TODO: Perhaps one day we'll ship with our own EditorTempates but for now developers can just render their own inside the view
+        // TODO: Perhaps one day we'll ship with our own EditorTempates but for now developers can just render their own inside the view
 
         ///// <summary>
         ///// This can dynamically be set to a custom template name to change
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 10efb5455236..e88bab61e52e 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -44,7 +44,7 @@ public RenderRouteHandler(UmbracoContext umbracoContext, IControllerFactory cont
 
         private UmbracoContext UmbracoContext => _umbracoContext ?? _umbracoContextAccessor.UmbracoContext;
 
-        private UmbracoFeatures Features => Current.Factory.GetInstance<UmbracoFeatures>(); // todo inject
+        private UmbracoFeatures Features => Current.Factory.GetInstance<UmbracoFeatures>(); // TODO: inject
 
         #region IRouteHandler Members
 
diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
index 806a4bd250a9..a16f9661aa55 100644
--- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
@@ -41,8 +41,7 @@ public abstract class UmbracoViewPage<TModel> : WebViewPage<TModel>
         /// </summary>
         public AppCaches AppCaches { get; set; }
 
-        // todo
-        // previously, Services and ApplicationCache would derive from UmbracoContext.Application, which
+        // TODO: previously, Services and ApplicationCache would derive from UmbracoContext.Application, which
         // was an ApplicationContext - so that everything derived from UmbracoContext.
         // UmbracoContext is fetched from the data tokens, thus allowing the view to be rendered with a
         // custom context and NOT the Current.UmbracoContext - eg outside the normal Umbraco routing
diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
index 0c95e1d44634..48e16b48d7e6 100644
--- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.Mvc
 {
     public abstract class UmbracoVirtualNodeRouteHandler : IRouteHandler
     {
-        // TODO: - try lazy property injection?
+        // TODO: try lazy property injection?
         private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>();
 
         /// <summary>
@@ -28,7 +28,7 @@ public abstract class UmbracoVirtualNodeRouteHandler : IRouteHandler
         ///    //check if context is null, we know it will be null if we are dealing with a request that
         ///    //has an extension and by default no Umb ctx is created for the request
         ///    if (ctx == null) {
-        ///        //TODO: Here you can EnsureContext , please note that the requestContext is passed in
+        ///        // TODO: Here you can EnsureContext , please note that the requestContext is passed in
         ///        //therefore your should refrain from using other singletons like HttpContext.Current since
         ///        //you will already have a reference to it. Also if you need an ApplicationContext you should
         ///        //pass this in via a ctor instead of using the ApplicationContext.Current singleton.
diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
index f36dd6bfa830..81239caec0a3 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
@@ -108,7 +108,7 @@ private string ProcessFile(ContentPropertyData editorValue, ContentPropertyFile
 
             using (var filestream = File.OpenRead(file.TempFilePath))
             {
-                //TODO: Here it would make sense to do the auto-fill properties stuff but the API doesn't allow us to do that right
+                // TODO: Here it would make sense to do the auto-fill properties stuff but the API doesn't allow us to do that right
                 // since we'd need to be able to return values for other properties from these methods
 
                 _mediaFileSystem.AddFile(filepath, filestream, true); // must overwrite!
diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
index 8c2f7ac4881d..e2b46b360dd4 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
@@ -8,11 +8,11 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class GridConfiguration
     {
-        //todo: Make these strongly typed, for now this works though
+        // TODO: Make these strongly typed, for now this works though
         [ConfigurationField("items", "Grid", "views/propertyeditors/grid/grid.prevalues.html", Description = "Grid configuration")]
         public JObject Items { get; set; }
 
-        //todo: Make these strongly typed, for now this works though
+        // TODO: Make these strongly typed, for now this works though
         [ConfigurationField("rte", "Rich text editor", "views/propertyeditors/rte/rte.prevalues.html", Description = "Rich text editor configuration")]
         public JObject Rte { get; set; }
     }
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
index 83279ae97515..085d66f3c695 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -41,7 +41,7 @@ public IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(Pro
                         {
                             var controlVal = control.Value;
 
-                            //TODO: If it's not a string, then it's a json formatted value -
+                            // TODO: If it's not a string, then it's a json formatted value -
                             // we cannot really index this in a smart way since it could be 'anything'
                             if (controlVal.Type == JTokenType.String)
                             {
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
index fff11a28a597..86f341259301 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -37,7 +37,7 @@ public ImageCropperPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSyst
             _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _dataTypeService = dataTypeService;
 
-            //todo: inject?
+            // TODO: inject?
             _autoFillProperties = new UploadAutoFillProperties(_mediaFileSystem, logger, _contentSettings);
         }
 
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
index 78f218982916..7bea54252132 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// The value editor for the image cropper property editor.
     /// </summary>
-    internal class ImageCropperPropertyValueEditor : DataValueEditor // todo core vs web?
+    internal class ImageCropperPropertyValueEditor : DataValueEditor // TODO: core vs web?
     {
         private readonly ILogger _logger;
         private readonly IMediaFileSystem _mediaFileSystem;
@@ -151,7 +151,7 @@ private string ProcessFile(ContentPropertyData editorValue, ContentPropertyFile
 
             using (var filestream = File.OpenRead(file.TempFilePath))
             {
-                //TODO: Here it would make sense to do the auto-fill properties stuff but the API doesn't allow us to do that right
+                // TODO: Here it would make sense to do the auto-fill properties stuff but the API doesn't allow us to do that right
                 // since we'd need to be able to return values for other properties from these methods
 
                 _mediaFileSystem.AddFile(filepath, filestream, true); // must overwrite!
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
index 1b46a7a8a8ec..6448a3354c8c 100644
--- a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
@@ -62,7 +62,7 @@ public ListViewConfiguration()
 
         [ConfigurationField("bulkActionPermissions", "Bulk Action Permissions", "views/propertyeditors/listview/bulkactionpermissions.prevalues.html",
             Description = "The bulk actions that are allowed from the list view")]
-        public BulkActionPermissionSettings BulkActionPermissions { get; set; } = new BulkActionPermissionSettings(); // todomanaging defaults?
+        public BulkActionPermissionSettings BulkActionPermissions { get; set; } = new BulkActionPermissionSettings(); // TODO: managing defaults?
 
         [ConfigurationField("tabName", "Tab Name", "textstring", Description = "The name of the listview tab (default if empty: 'Child Items')")]
         public string TabName { get; set; }
@@ -76,7 +76,7 @@ public class Property
             public string Header { get; set; }
 
             [JsonProperty("isSystem")]
-            public int IsSystem { get; set; } // todo bool
+            public int IsSystem { get; set; } // TODO: bool
         }
 
         public class Layout
@@ -91,7 +91,7 @@ public class Layout
             public string Icon { get; set; }
 
             [JsonProperty("isSystem")]
-            public int IsSystem { get; set; } // todo bool
+            public int IsSystem { get; set; } // TODO: bool
 
             [JsonProperty("selected")]
             public bool Selected { get; set; }
diff --git a/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
index 77c5c0498535..d4d23da3a49c 100644
--- a/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MacroContainerPropertyEditor.cs
@@ -4,7 +4,7 @@
 
 namespace Umbraco.Web.PropertyEditors
 {
-    // todo - MacroContainerPropertyEditor is deprecated, but what's the alternative?
+    // TODO: MacroContainerPropertyEditor is deprecated, but what's the alternative?
     [DataEditor(Constants.PropertyEditors.Aliases.MacroContainer, "(Obsolete) Macro Picker", "macrocontainer", ValueType = ValueTypes.Text, Group="rich content", Icon="icon-settings-alt", IsDeprecated = true)]
     public class MacroContainerPropertyEditor : DataEditor
     {
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
index a7d05799d91e..e7da4ca11379 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
@@ -34,7 +34,7 @@ public MultipleTextStringConfigurationEditor()
         /// <inheritdoc />
         public override MultipleTextStringConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, MultipleTextStringConfiguration configuration)
         {
-            // todo this isn't pretty
+            // TODO: this isn't pretty
             //the values from the editor will be min/max fields and we need to format to json in one field
             // is the editor sending strings or ints or?!
             var min = (editorValues.ContainsKey("min") ? editorValues["min"].ToString() : "0").TryConvertTo<int>();
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
index df2968783805..13bf269bcdb3 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class RichTextConfiguration
     {
-        //todo: Make these strongly typed, for now this works though
+        // TODO: Make these strongly typed, for now this works though
         [ConfigurationField("editor", "Editor", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)]
         public JObject Editor { get; set; }
 
diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs b/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs
index 1089f3d5aad8..c6b3953e8c75 100644
--- a/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors
     public class TrueFalseConfiguration
     {
         [ConfigurationField("default", "Default Value", "boolean")]
-        public string Default { get; set; } // todo - well, true or false?!
+        public string Default { get; set; } // TODO: well, true or false?!
 
         [ConfigurationField("labelOn", "Write a label text", "textstring")]
         public string Label { get; set; }
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
index ca5489ac1f5d..0f8b75f6b167 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
@@ -66,7 +66,7 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, Publ
                 return null;
             }
 
-            //TODO: Inject an UmbracoHelper and create a GetUmbracoHelper method based on either injected or singleton
+            // TODO: Inject an UmbracoHelper and create a GetUmbracoHelper method based on either injected or singleton
             if (UmbracoContext.Current != null)
             {
                 if (propertyType.EditorAlias.Equals(Constants.PropertyEditors.Aliases.MultiNodeTreePicker))
diff --git a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
index 155e59133d86..178d34cfa379 100644
--- a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
+++ b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
@@ -209,7 +209,7 @@ public interface IPublishedCache : IXPathNavigable
         /// <remarks>The alias is case-insensitive.</remarks>
         PublishedContentType GetContentType(string alias);
 
-        // todo - can we implement this, now? maybe only with NuCache else will throw NotImplemented...
+        // TODO: can we implement this, now? maybe only with NuCache else will throw NotImplemented...
         IEnumerable<IPublishedContent> GetByContentType(PublishedContentType contentType);
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
index d983a880cce9..cab6e7d75929 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
@@ -29,7 +29,7 @@ internal class ContentCache : PublishedCacheBase, IPublishedContentCache, INavig
 
         #region Constructor
 
-        // todo - figure this out
+        // TODO: figure this out
         // after the current snapshot has been resync-ed
         // it's too late for UmbracoContext which has captured previewDefault and stuff into these ctor vars
         // but, no, UmbracoContext returns snapshot.Content which comes from elements SO a resync should create a new cache
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 0cf2c231b500..353ac83edaa8 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -38,7 +38,7 @@ internal class ContentStore
         private volatile int _wlocked;
         private List<KeyValuePair<int, ContentNodeKit>> _wchanges;
 
-        // todo - collection trigger (ok for now)
+        // TODO: collection trigger (ok for now)
         // see SnapDictionary notes
         private const long CollectMinGenDelta = 8;
 
@@ -104,7 +104,7 @@ public override void Release(bool completed)
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // todo GetScopedWriter? should the dict have a ref onto the scope provider?
+        // TODO: GetScopedWriter? should the dict have a ref onto the scope provider?
         public IDisposable GetWriter(IScopeProvider scopeProvider)
         {
             return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ContentStoreWriter(this, scoped));
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs
index ddf9023d8490..107e74b7c331 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs
@@ -36,7 +36,7 @@ public void WriteTo(IReadOnlyDictionary<string, CultureVariation> value, Stream
             // write each variation
             foreach (var (culture, variation) in variations)
             {
-                // todo - it's weird we're dealing with cultures here, and languageId in properties
+                // TODO: it's weird we're dealing with cultures here, and languageId in properties
 
                 PrimitiveSerializer.String.WriteTo(culture, stream); // should never be null
                 WriteObject(variation.Name, stream); // write an object in case it's null (though... should not happen)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
index 8e9e86b4fc6b..ca3abcca4894 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
@@ -15,7 +15,7 @@
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
-    // todo - use SqlTemplate for these queries else it's going to be horribly slow!
+    // TODO: use SqlTemplate for these queries else it's going to be horribly slow!
 
     // provides efficient database access for NuCache
     internal class DatabaseDataSource : IDataSource
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
index 9e50f50c8655..e14426a2e209 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
@@ -12,14 +12,14 @@ internal class PropertyData
         public string Culture
         {
             get => _culture;
-            set => _culture = value ?? throw new ArgumentNullException(nameof(value)); // todo or fallback to string.Empty? CANNOT be null
+            set => _culture = value ?? throw new ArgumentNullException(nameof(value)); // TODO: or fallback to string.Empty? CANNOT be null
         }
 
         [JsonProperty("seg")]
         public string Segment
         {
             get => _segment;
-            set => _segment = value ?? throw new ArgumentNullException(nameof(value)); // todo or fallback to string.Empty? CANNOT be null
+            set => _segment = value ?? throw new ArgumentNullException(nameof(value)); // TODO: or fallback to string.Empty? CANNOT be null
         }
 
         [JsonProperty("val")]
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 889ce72ce03b..e1cd1ec76480 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -201,7 +201,7 @@ private void LoadCaches()
 
         private void InitializeRepositoryEvents()
         {
-            //todo: The reason these events are in the repository is for legacy, the events should exist at the service
+            // TODO: The reason these events are in the repository is for legacy, the events should exist at the service
             // level now since we can fire these events within the transaction... so move the events to service level
 
             // plug repository event handlers
@@ -584,7 +584,7 @@ private void NotifyLocked(IEnumerable<ContentCacheRefresher.JsonPayload> payload
                     continue;
                 }
 
-                // todo- should we do some RV check here? (later)
+                // TODO: should we do some RV check here? (later)
 
                 var capture = payload;
                 using (var scope = _scopeProvider.CreateScope())
@@ -674,7 +674,7 @@ private void NotifyLocked(IEnumerable<MediaCacheRefresher.JsonPayload> payloads,
                     continue;
                 }
 
-                // todo- should we do some RV checks here? (later)
+                // TODO: should we do some RV checks here? (later)
 
                 var capture = payload;
                 using (var scope = _scopeProvider.CreateScope())
@@ -773,7 +773,7 @@ public override void Notify(DataTypeCacheRefresher.JsonPayload[] payloads)
             using (_contentStore.GetWriter(_scopeProvider))
             using (_mediaStore.GetWriter(_scopeProvider))
             {
-                // todo - need to add a datatype lock
+                // TODO: need to add a datatype lock
                 // this is triggering datatypes reload in the factory, and right after we create some
                 // content types by loading them ... there's a race condition here, which would require
                 // some locking on datatypes
diff --git a/src/Umbraco.Web/PublishedCache/PublishedMember.cs b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
index cbe225092090..906cc7a4aeb4 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedMember.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
@@ -140,10 +140,10 @@ private void EnsureMemberProperty(List<IPublishedProperty> properties, List<stri
 
         public override string UrlSegment => throw new NotSupportedException();
 
-        //TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
+        // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
         public override string WriterName => _member.GetCreatorProfile().Name;
 
-        //TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
+        // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
         public override string CreatorName => _member.GetCreatorProfile().Name;
 
         public override int WriterId => _member.CreatorId;
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
index 5521cabe765c..a3aad608d554 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -122,7 +122,7 @@ public override IEnumerable<IPublishedContent> GetAtRoot(bool preview)
                         //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco
                         //See this thread: http://examine.cdodeplex.com/discussions/264341
                         //Catch the exception here for the time being, and just fallback to GetMedia
-                        //TODO: Need to fix examine in LB scenarios!
+                        // TODO: Need to fix examine in LB scenarios!
                         Current.Logger.Error<PublishedMediaCache>(ex, "Could not load data from Examine index for media");
                     }
                     else if (ex is AlreadyClosedException)
@@ -248,7 +248,7 @@ private ISearcher GetSearchProviderSafe()
                 //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco
                 //See this thread: http://examine.cdodeplex.com/discussions/264341
                 //Catch the exception here for the time being, and just fallback to GetMedia
-                //TODO: Need to fix examine in LB scenarios!
+                // TODO: Need to fix examine in LB scenarios!
             }
             catch (NullReferenceException)
             {
@@ -305,7 +305,7 @@ private CacheValues GetUmbracoMediaCacheValues(int id)
                         //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco
                         //See this thread: http://examine.cdodeplex.com/discussions/264341
                         //Catch the exception here for the time being, and just fallback to GetMedia
-                        //TODO: Need to fix examine in LB scenarios!
+                        // TODO: Need to fix examine in LB scenarios!
                         Current.Logger.Error<PublishedMediaCache>(ex, "Could not load data from Examine index for media");
                     }
                     else if (ex is AlreadyClosedException)
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs
index 672aad1e3e13..37a6b666d4f3 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs
@@ -5,7 +5,7 @@
 
 namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 {
-    // todo should be a ScopeContextualBase
+    // TODO: should be a ScopeContextualBase
     internal class SafeXmlReaderWriter : IDisposable
     {
         private readonly bool _scoped;
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
index c3cf22559dcf..b1037759dcb1 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
@@ -377,7 +377,7 @@ internal static void InitializeNode(XmlPublishedContent node, XmlNode xmlNode, b
             }
             catch (InvalidOperationException e)
             {
-                // todo - enable!
+                // TODO: enable!
                 //content.Instance.RefreshContentFromDatabase();
                 throw new InvalidOperationException($"{e.Message}. This usually indicates that the content cache is corrupt; the content cache has been rebuilt in an attempt to self-fix the issue.");
             }
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
index 0153cca18be9..36a83347820f 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
@@ -69,7 +69,7 @@ public XmlStore(IContentTypeService contentTypeService, IContentService contentS
 
         // internal for unit tests
         // no file nor db, no config check
-        // todo - er, we DO have a DB?
+        // TODO: er, we DO have a DB?
         internal XmlStore(IContentTypeService contentTypeService, IContentService contentService, IScopeProvider scopeProvider, RoutesCache routesCache, PublishedContentTypeCache contentTypeCache,
             IPublishedSnapshotAccessor publishedSnapshotAccessor, MainDom mainDom,
             bool testing, bool enableRepositoryEvents, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IGlobalSettings globalSettings, IEntityXmlSerializer entitySerializer)
@@ -602,7 +602,7 @@ public XmlDocument GetPreviewXml(int contentId, bool includeSubs)
         // should we have async versions that would do: ?
         // var releaser = await _xmlLock.LockAsync();
         //
-        // todo - not sure about the "resync current published snapshot" thing here, see 7.6...
+        // TODO: not sure about the "resync current published snapshot" thing here, see 7.6...
 
         // gets a locked safe read access to the main xml
         private SafeXmlReaderWriter GetSafeXmlReader()
@@ -641,7 +641,7 @@ private SafeXmlReaderWriter GetSafeXmlWriter()
 
         public void EnsureFilePermission()
         {
-            // todo - but do we really have a store, initialized, at that point?
+            // TODO: but do we really have a store, initialized, at that point?
             var filename = _xmlFileName + ".temp";
             File.WriteAllText(filename, "TEMP");
             File.Delete(filename);
@@ -1559,8 +1559,8 @@ private void OnContentRefreshedEntity(DocumentRepository sender, DocumentReposit
             // need to update the published xml if we're saving the published version,
             // or having an impact on that version - we update the published xml even when masked
 
-            // todo - in the repo... either its 'unpublished' and 'publishing', or 'published' and 'published', this has changed!
-            // todo - what are we serializing really? which properties?
+            // TODO: in the repo... either its 'unpublished' and 'publishing', or 'published' and 'published', this has changed!
+            // TODO: what are we serializing really? which properties?
 
             // if not publishing, no change to published xml
             if (((Content) entity).PublishedState != PublishedState.Publishing)
@@ -1669,7 +1669,7 @@ private void OnMemberTypeRefreshedEntity(IMemberTypeService sender, ContentTypeC
 
         // RepositoryCacheMode.Scoped because we do NOT want to use the L2 cache that may be out-of-sync
         // hopefully this does not cause issues and we're not nested in another scope w/different mode
-        // todo - well, guess what?
+        // TODO: well, guess what?
         // original code made sure the repository used no cache
         // now we're using the Scoped scope cache mode
         // and then?
@@ -2027,7 +2027,7 @@ public bool VerifyMediaXmlLocked(IScope scope)
         {
             // every non-trashed media item should have a corresponding row in cmsContentXml
             // and that row should have the key="..." attribute
-            // todo - where's the trashed test here?
+            // TODO: where's the trashed test here?
 
             var mediaObjectType = Constants.ObjectTypes.Media;
             var db = scope.Database;
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index c57d0249c18d..e1bf60f55831 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -251,7 +251,7 @@ internal static IEnumerable<IPublishedContent> WhereIsInvariantOrHasCulture(this
 
         public static IEnumerable<PublishedSearchResult> SearchDescendants(this IPublishedContent content, string term, string indexName = null)
         {
-            //todo inject examine manager
+            // TODO: inject examine manager
 
             indexName = string.IsNullOrEmpty(indexName) ? Constants.UmbracoIndexes.ExternalIndexName : indexName;
             if (!ExamineManager.Instance.TryGetIndex(indexName, out var index))
@@ -272,7 +272,7 @@ public static IEnumerable<PublishedSearchResult> SearchDescendants(this IPublish
 
         public static IEnumerable<PublishedSearchResult> SearchChildren(this IPublishedContent content, string term, string indexName = null)
         {
-            //todo inject examine manager
+            // TODO: inject examine manager
 
             indexName = string.IsNullOrEmpty(indexName) ? Constants.UmbracoIndexes.ExternalIndexName : indexName;
             if (!ExamineManager.Instance.TryGetIndex(indexName, out var index))
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
index ff629609d3ca..60124a96a280 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
@@ -95,7 +95,7 @@ bool IsMatch(IPublishedContent c, string a1, string a2)
                 return v.InvariantContains(a1) || v.InvariantContains(a2);
             }
 
-            // todo - even with Linq, what happens below has to be horribly slow
+            // TODO: even with Linq, what happens below has to be horribly slow
             // but the only solution is to entirely refactor url providers to stop being dynamic
 
             if (rootNodeId > 0)
diff --git a/src/Umbraco.Web/Routing/CustomRouteUrlProvider.cs b/src/Umbraco.Web/Routing/CustomRouteUrlProvider.cs
index ae17ff6258c6..0c6998e7e12d 100644
--- a/src/Umbraco.Web/Routing/CustomRouteUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/CustomRouteUrlProvider.cs
@@ -25,7 +25,7 @@ public UrlInfo GetUrl(UmbracoContext umbracoContext, IPublishedContent content,
             //If we get this far, it means it's a custom route with published content assigned, check if the id being requested for is the same id as the assigned published content
             //NOTE: This looks like it might cause an infinite loop because PublishedContentBase.Url calls into UmbracoContext.Current.UrlProvider.GetUrl which calls back into the IUrlProvider pipeline
             // but the specific purpose of this is that a developer is using their own IPublishedContent that returns a specific Url and doesn't go back into the UrlProvider pipeline.
-            //TODO: We could put a try/catch here just in case, else we could do some reflection checking to see if the implementation is PublishedContentBase and the Url property is not overridden.
+            // TODO: We could put a try/catch here just in case, else we could do some reflection checking to see if the implementation is PublishedContentBase and the Url property is not overridden.
             return UrlInfo.Url(
                 content.Id == umbracoContext.PublishedRequest.PublishedContent.Id
                     ? umbracoContext.PublishedRequest.PublishedContent.GetUrl(culture)
diff --git a/src/Umbraco.Web/Routing/DomainHelper.cs b/src/Umbraco.Web/Routing/DomainHelper.cs
index 8ba06363dc75..88f2b17814a8 100644
--- a/src/Umbraco.Web/Routing/DomainHelper.cs
+++ b/src/Umbraco.Web/Routing/DomainHelper.cs
@@ -107,7 +107,7 @@ internal IEnumerable<DomainAndUri> DomainsForNode(int nodeId, Uri current, bool
         /// <param name="filter">An optional function to filter the list of domains, if more than one applies.</param>
         /// <returns>The domain and its normalized uri, that best matches the specified uri and cultures.</returns>
         /// <remarks>
-        /// todo - must document and explain this all
+        /// TODO: must document and explain this all
         /// <para>If <paramref name="uri"/> is null, pick the first domain that matches <paramref name="culture"/>,
         /// else the first that matches <paramref name="defaultCulture"/>, else the first one (ordered by id), else null.</para>
         /// <para>If <paramref name="uri"/> is not null, look for domains that would be a base uri of the current uri,</para>
@@ -244,7 +244,7 @@ private static DomainAndUri GetByCulture(IReadOnlyCollection<DomainAndUri> domai
         /// <returns>The domains and their normalized uris, that match the specified uri.</returns>
         internal static IEnumerable<DomainAndUri> SelectDomains(IEnumerable<Domain> domains, Uri uri)
         {
-            // todo where are we matching ?!!?
+            // TODO: where are we matching ?!!?
             return domains
                 .Where(d => d.IsWildcard == false)
                 .Select(d => new DomainAndUri(d, uri))
diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
index 1a0e5ef87340..38ecb09b2bb2 100644
--- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
+++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
@@ -74,7 +74,7 @@ internal class NotFoundHandlerHelper
             if (errorPage.HasContentKey)
             {
                 //need to get the Id for the GUID
-                //TODO: When we start storing GUIDs into the IPublishedContent, then we won't have to look this up
+                // TODO: When we start storing GUIDs into the IPublishedContent, then we won't have to look this up
                 // but until then we need to look it up in the db. For now we've implemented a cached service for
                 // converting Int -> Guid and vice versa.
                 var found = entityService.GetId(errorPage.ContentKey, UmbracoObjectTypes.Document);
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 94980a7a1012..63def7a1cd5e 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -19,7 +19,7 @@
 
 namespace Umbraco.Web.Routing
 {
-    // todo - making sense to have an interface?
+    // TODO: making sense to have an interface?
     public class PublishedRouter
     {
         private readonly IWebRoutingSection _webRoutingSection;
@@ -52,8 +52,7 @@ public PublishedRouter(
             GetRolesForLogin = s => Roles.Provider.GetRolesForUser(s);
         }
 
-        // todo
-        // in 7.7 this is cached in the PublishedContentRequest, which ... makes little sense
+        // TODO: in 7.7 this is cached in the PublishedContentRequest, which ... makes little sense
         // killing it entirely, if we need cache, just implement it properly !!
         // this is all so weird
         public Func<string, IEnumerable<string>> GetRolesForLogin { get; }
@@ -380,7 +379,7 @@ internal RenderingEngine FindTemplateRenderingEngine(string alias)
 
             // NOTE: we could start with what's the current default?
 
-            // todo - bad - we probably should be using the appropriate filesystems!
+            // TODO: bad - we probably should be using the appropriate filesystems!
 
             if (FindTemplateRenderingEngineInDirectory(new DirectoryInfo(IOHelper.MapPath(SystemDirectories.MvcViews)),
                     alias, new[] { ".cshtml", ".vbhtml" }))
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
index 7795543320c1..4843dd5522b2 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
@@ -182,7 +182,7 @@ private static void ContentService_Published(IContentService sender, PublishEven
 
         private static void ContentService_Moving(IContentService sender, MoveEventArgs<IContent> e)
         {
-            //TODO: Use the new e.EventState to track state between Moving/Moved events!
+            // TODO: Use the new e.EventState to track state between Moving/Moved events!
             Moving = true;
         }
 
diff --git a/src/Umbraco.Web/Routing/SiteDomainHelper.cs b/src/Umbraco.Web/Routing/SiteDomainHelper.cs
index 7879b2240234..6173dfb43c26 100644
--- a/src/Umbraco.Web/Routing/SiteDomainHelper.cs
+++ b/src/Umbraco.Web/Routing/SiteDomainHelper.cs
@@ -181,7 +181,7 @@ public virtual DomainAndUri MapDomain(IReadOnlyCollection<DomainAndUri> domainAn
         /// <inheritdoc />
         public virtual IEnumerable<DomainAndUri> MapDomains(IReadOnlyCollection<DomainAndUri> domainAndUris, Uri current, bool excludeDefault, string culture, string defaultCulture)
         {
-            // todo ignoring cultures entirely?
+            // TODO: ignoring cultures entirely?
 
             var currentAuthority = current.GetLeftPart(UriPartial.Authority);
             KeyValuePair<string, string[]>[] candidateSites = null;
@@ -279,7 +279,7 @@ private static DomainAndUri MapDomain(IReadOnlyCollection<DomainAndUri> domainAn
             if (domainAndUris == null) throw new ArgumentNullException(nameof(domainAndUris));
             if (domainAndUris.Count == 0) throw new ArgumentException("Cannot be empty.", nameof(domainAndUris));
 
-            // todo how shall we deal with cultures?
+            // TODO: how shall we deal with cultures?
 
             // we do our best, but can't do the impossible
             // get the "default" domain ie the first one for the culture, else the first one (exists, length > 0)
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 832699b5d7d1..de30590e9266 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -80,7 +80,7 @@ public override void Compose(Composition composition)
             // we should stop injecting UmbracoContext and always inject IUmbracoContextAccessor, however at the moment
             // there are tons of places (controllers...) which require UmbracoContext in their ctor - so let's register
             // a way to inject the UmbracoContext - and register it per-request to be more efficient
-            //TODO: stop doing this
+            // TODO: stop doing this
             composition.Register(factory => factory.GetInstance<IUmbracoContextAccessor>().UmbracoContext, Lifetime.Request);
 
             // register the umbraco helper
diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunnerOptions.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunnerOptions.cs
index 5813799f05c4..bc0369fee83a 100644
--- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunnerOptions.cs
+++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunnerOptions.cs
@@ -5,7 +5,7 @@
     /// </summary>
     public class BackgroundTaskRunnerOptions
     {
-        //TODO: Could add options for using a stack vs queue if required
+        // TODO: Could add options for using a stack vs queue if required
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BackgroundTaskRunnerOptions"/> class.
diff --git a/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs
index b478ed581cf3..9dd57225928b 100644
--- a/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs
+++ b/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs
@@ -15,6 +15,6 @@ public interface IBackgroundTaskRunner<in T> : IDisposable, IRegisteredObject
         void Add(T task);
         bool TryAdd(T task);
 
-        // todo - complete the interface?
+        // TODO: complete the interface?
     }
 }
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index 0d533a4da25a..4326ac328793 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -56,8 +56,7 @@ public override bool PerformRun()
                 // ensure we run with an UmbracoContext, because this may run in a background task,
                 // yet developers may be using the 'current' UmbracoContext in the event handlers
                 //
-                // todo
-                // - or maybe not, CacheRefresherComponent already ensures a context when handling events
+                // TODO: or maybe not, CacheRefresherComponent already ensures a context when handling events
                 // - UmbracoContext 'current' needs to be refactored and cleaned up
                 // - batched messenger should not depend on a current HttpContext
                 //    but then what should be its "scope"? could we attach it to scopes?
diff --git a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
index 66037a045665..a26b8b23ac9c 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
@@ -11,7 +11,7 @@
 
 namespace Umbraco.Web.Scheduling
 {
-    //TODO: No scheduled task (i.e. URL) would be secured, so if people are actually using these each task
+    // TODO: No scheduled task (i.e. URL) would be secured, so if people are actually using these each task
     // would need to be a publicly available task (URL) which isn't really very good :(
     // We should really be using the AdminTokenAuthorizeAttribute for this stuff
 
@@ -72,7 +72,7 @@ private async Task<bool> GetTaskByHttpAync(string url, CancellationToken token)
 
             var request = new HttpRequestMessage(HttpMethod.Get, url);
 
-            //TODO: pass custom the authorization header, currently these aren't really secured!
+            // TODO: pass custom the authorization header, currently these aren't really secured!
             //request.Headers.Authorization = AdminTokenAuthorizeAttribute.GetAuthenticationHeaderValue(_appContext);
 
             try
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index 871f90a31905..0db3f0b65ea8 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -122,7 +122,7 @@ public void Initialize()
 
             EnsureUnlocked(_logger, _examineManager);
 
-            //TODO: Instead of waiting 5000 ms, we could add an event handler on to fulfilling the first request, then start?
+            // TODO: Instead of waiting 5000 ms, we could add an event handler on to fulfilling the first request, then start?
             RebuildIndexes(_indexRebuilder, _logger, true, 5000);
         }
 
@@ -138,7 +138,7 @@ public void Terminate()
         /// <param name="waitMilliseconds"></param>
         public static void RebuildIndexes(IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
         {
-            //TODO: need a way to disable rebuilding on startup
+            // TODO: need a way to disable rebuilding on startup
 
             lock(RebuildLocker)
             {
@@ -213,7 +213,7 @@ private void ContentCacheRefresherUpdated(ContentCacheRefresher sender, CacheRef
                     // just ignore that payload
                     // so what?!
 
-                    //todo: Rebuild the index at this point?
+                    // TODO: Rebuild the index at this point?
                 }
                 else // RefreshNode or RefreshBranch (maybe trashed)
                 {
diff --git a/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs b/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
index 99f4c4b453ae..5ac5529be586 100644
--- a/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
+++ b/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Web.Search
     /// </summary>
     public class UmbracoIndexesCreator : LuceneIndexCreator, IUmbracoIndexesCreator
     {
-        //TODO: we should inject the different IValueSetValidator so devs can just register them instead of overriding this class?
+        // TODO: we should inject the different IValueSetValidator so devs can just register them instead of overriding this class?
 
         public UmbracoIndexesCreator(IProfilingLogger profilingLogger,
             ILocalizationService languageService,
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index a60e5f1d1b75..2bb093a659e9 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -64,7 +64,7 @@ public IEnumerable<SearchResultEntity> ExamineSearch(
 
             var umbracoContext = _umbracoHelper.UmbracoContext;
 
-            //TODO: WE should try to allow passing in a lucene raw query, however we will still need to do some manual string
+            // TODO: WE should try to allow passing in a lucene raw query, however we will still need to do some manual string
             // manipulation for things like start paths, member types, etc... 
             //if (Examine.ExamineExtensions.TryParseLuceneQuery(query))
             //{
diff --git a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
index 3ac74bd7c0a0..5b571f304eb1 100644
--- a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
+++ b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
@@ -6,7 +6,7 @@
 
 namespace Umbraco.Web.Security
 {
-    //TODO: This relies on an assembly that is not .NET Standard :(
+    // TODO: This relies on an assembly that is not .NET Standard :(
     public class ActiveDirectoryBackOfficeUserPasswordChecker : IBackOfficeUserPasswordChecker
     {
         public virtual string ActiveDirectoryDomain
@@ -27,7 +27,7 @@ public Task<BackOfficeUserPasswordCheckerResult> CheckPasswordAsync(BackOfficeId
 
             if (isValid && user.HasIdentity == false)
             {
-                //TODO: the user will need to be created locally (i.e. auto-linked)
+                // TODO: the user will need to be created locally (i.e. auto-linked)
                 throw new NotImplementedException("The user " + user.UserName + " does not exist locally and currently the " + typeof(ActiveDirectoryBackOfficeUserPasswordChecker) + " doesn't support auto-linking, see http://issues.umbraco.org/issue/U4-10181");
             }
 
diff --git a/src/Umbraco.Web/Security/BackOfficeSignInManager.cs b/src/Umbraco.Web/Security/BackOfficeSignInManager.cs
index 4315d3a76218..3ce72852bfd8 100644
--- a/src/Umbraco.Web/Security/BackOfficeSignInManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeSignInManager.cs
@@ -14,7 +14,7 @@
 
 namespace Umbraco.Web.Security
 {
-    //TODO: In v8 we need to change this to use an int? nullable TKey instead, see notes against overridden TwoFactorSignInAsync
+    // TODO: In v8 we need to change this to use an int? nullable TKey instead, see notes against overridden TwoFactorSignInAsync
     public class BackOfficeSignInManager : SignInManager<BackOfficeIdentityUser, int>
     {
         private readonly ILogger _logger;
diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
index a7256b257dd0..83cf06c6d904 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
@@ -125,13 +125,13 @@ public BackOfficeUserManager(IUserStore<T, int> store)
 
         #region What we support do not currently
 
-        //TODO: We could support this - but a user claims will mostly just be what is in the auth cookie
+        // TODO: We could support this - but a user claims will mostly just be what is in the auth cookie
         public override bool SupportsUserClaim
         {
             get { return false; }
         }
 
-        //TODO: Support this
+        // TODO: Support this
         public override bool SupportsQueryableUsers
         {
             get { return false; }
@@ -145,7 +145,7 @@ public override bool SupportsUserTwoFactor
             get { return false; }
         }
 
-        //TODO: Support this
+        // TODO: Support this
         public override bool SupportsUserPhoneNumber
         {
             get { return false; }
@@ -618,7 +618,7 @@ internal void RaisePasswordChangedEvent(int userId)
             OnPasswordChanged(new IdentityAuditEventArgs(AuditEvent.PasswordChanged, GetCurrentRequestIpAddress(), affectedUser: userId));
         }
 
-        //TODO: I don't think this is required anymore since from 7.7 we no longer display the reset password checkbox since that didn't make sense.
+        // TODO: I don't think this is required anymore since from 7.7 we no longer display the reset password checkbox since that didn't make sense.
         internal void RaisePasswordResetEvent(int userId)
         {
             OnPasswordReset(new IdentityAuditEventArgs(AuditEvent.PasswordReset, GetCurrentRequestIpAddress(), affectedUser: userId));
@@ -702,7 +702,7 @@ protected virtual void OnResetAccessFailedCount(IdentityAuditEventArgs e)
         /// <returns></returns>
         protected virtual string GetCurrentRequestIpAddress()
         {
-            //TODO: inject a service to get this value, we should not be relying on the old HttpContext.Current especially in the ASP.NET Identity world.
+            // TODO: inject a service to get this value, we should not be relying on the old HttpContext.Current especially in the ASP.NET Identity world.
             var httpContext = HttpContext.Current == null ? (HttpContextBase)null : new HttpContextWrapper(HttpContext.Current);
             return httpContext.GetCurrentRequestIpAddress();
         }
diff --git a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
index dba7a8c33a61..8da8ad23f8a1 100644
--- a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
@@ -84,7 +84,7 @@ public override async Task Invoke(IOwinContext context)
                                 //if it's time to renew, then do it
                                 if (timeRemaining < timeElapsed)
                                 {
-                                    //TODO: This would probably be simpler just to do: context.OwinContext.Authentication.SignIn(context.Properties, identity);
+                                    // TODO: This would probably be simpler just to do: context.OwinContext.Authentication.SignIn(context.Properties, identity);
                                     // this will invoke the default Cookie middleware to basically perform this logic for us.
 
                                     ticket.Properties.IssuedUtc = currentUtc;
@@ -123,7 +123,7 @@ public override async Task Invoke(IOwinContext context)
                     }
                 }
 
-                //Hack! we need to suppress the stupid forms authentication module but we can only do that by using non owin stuff
+                // HACK: we need to suppress the stupid forms authentication module but we can only do that by using non owin stuff
                 if (HttpContext.Current != null && HttpContext.Current.Response != null)
                 {
                     HttpContext.Current.Response.SuppressFormsAuthenticationRedirect = true;
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index 79eb27bc3c2b..e05361780615 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -216,7 +216,7 @@ public virtual MembershipUser RegisterMember(RegisterModel model, out Membership
                 membershipUser = ((UmbracoMembershipProviderBase)provider).CreateUser(
                     model.MemberTypeAlias,
                     model.Username, model.Password, model.Email,
-                    //TODO: Support q/a http://issues.umbraco.org/issue/U4-3213
+                    // TODO: Support q/a http://issues.umbraco.org/issue/U4-3213
                     null, null,
                     true, null, out status);
 
@@ -239,7 +239,7 @@ public virtual MembershipUser RegisterMember(RegisterModel model, out Membership
             else
             {
                 membershipUser = provider.CreateUser(model.Username, model.Password, model.Email,
-                    //TODO: Support q/a http://issues.umbraco.org/issue/U4-3213
+                    // TODO: Support q/a http://issues.umbraco.org/issue/U4-3213
                     null, null,
                     true, null, out status);
 
@@ -326,7 +326,7 @@ public virtual IPublishedContent Get(Udi udi)
             switch (umbracoType)
             {
                 case UmbracoObjectTypes.Member:
-                    // todo - need to implement Get(guid)!
+                    // TODO: need to implement Get(guid)!
                     var memberAttempt = entityService.GetId(guidUdi.Guid, umbracoType);
                     if (memberAttempt.Success)
                         return GetById(memberAttempt.Result);
@@ -422,7 +422,7 @@ public virtual ProfileModel GetCurrentMemberProfileModel()
             }
 
             //we can try to look up an associated member by the provider user key
-            //TODO: Support this at some point!
+            // TODO: Support this at some point!
             throw new NotSupportedException("Currently a member profile cannot be edited unless using the built-in Umbraco membership providers");
         }
 
@@ -480,7 +480,7 @@ private IEnumerable<UmbracoProperty> GetMemberPropertiesViewModel(IMemberType me
                     Value = value
                 };
 
-                //TODO: Perhaps one day we'll ship with our own EditorTempates but for now developers
+                // TODO: Perhaps one day we'll ship with our own EditorTempates but for now developers
                 // can just render their own.
 
                 ////This is a rudimentary check to see what data template we should render
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index 413023c27c1a..1f7e2c8084cc 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -414,7 +414,7 @@ public override string GetUserNameByEmail(string email)
         /// <returns>The new password for the specified user.</returns>
         protected override string PerformResetPassword(string username, string answer, string generatedPassword)
         {
-            //TODO: This should be here - but how do we update failure count in this provider??
+            // TODO: This should be here - but how do we update failure count in this provider??
             //if (answer == null && RequiresQuestionAndAnswer)
             //{
             //    UpdateFailureCount(username, "passwordAnswer");
@@ -591,7 +591,7 @@ internal virtual ValidateUserResult PerformValidateUser(string username, string
             //don't raise events for this! It just sets the member dates, if we do raise events this will
             // cause all distributed cache to execute - which will clear out some caches we don't want.
             // http://issues.umbraco.org/issue/U4-3451
-            //TODO: In v8 we aren't going to have an overload to disable events, so we'll need to make a different method
+            // TODO: In v8 we aren't going to have an overload to disable events, so we'll need to make a different method
             // for this type of thing (i.e. UpdateLastLogin or similar).
 
             // when upgrading from 7.2 to 7.3 trying to save will throw
diff --git a/src/Umbraco.Web/Suspendable.cs b/src/Umbraco.Web/Suspendable.cs
index 0ca43ff595ea..86c83120eaee 100644
--- a/src/Umbraco.Web/Suspendable.cs
+++ b/src/Umbraco.Web/Suspendable.cs
@@ -79,7 +79,7 @@ public static void ResumeIndexers(IndexRebuilder indexRebuilder, ILogger logger)
                 if (_tried == false) return;
                 _tried = false;
 
-                //TODO: when resuming do we always want a full rebuild of all indexes?
+                // TODO: when resuming do we always want a full rebuild of all indexes?
                 ExamineComponent.RebuildIndexes(indexRebuilder, logger, false);
             }
         }
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index ff87719b12e8..60d54d8bcd5e 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -37,8 +37,8 @@ public TemplateRenderer(UmbracoContext umbracoContext, int pageId, int? altTempl
             _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
         }
 
-        private IFileService FileService => Current.Services.FileService; // todo inject
-        private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>(); // todo inject
+        private IFileService FileService => Current.Services.FileService; // TODO: inject
+        private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>(); // TODO: inject
 
 
         /// <summary>
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index b4a91f8ab803..205c38b8a1d8 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -298,7 +298,7 @@ private Attempt<TreeNodeCollection> TryLoadFromControllerTree(Tree appTree, stri
             if (instance == null)
                 throw new Exception("Failed to create tree " + appTree.TreeControllerType + ".");
 
-            //TODO: Shouldn't we be applying the same proxying logic as above so that filters work? seems like an oversight
+            // TODO: Shouldn't we be applying the same proxying logic as above so that filters work? seems like an oversight
 
             instance.ControllerContext = controllerContext;
             instance.Request = controllerContext.Request;
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index b50f06e14e7d..1609e966e581 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -307,7 +307,7 @@ private void EnsureName(IEntitySlim entity, string culture)
                 entity.Name = "[[" + entity.Id + "]]";
         }
 
-        //todo: Remove the need for converting to legacy
+        // TODO: Remove the need for converting to legacy
         private void AddActionNode<TAction>(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool convert = false, bool opensDialog = false)
             where TAction : IAction
         {
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 7c0e7c736d31..bd35fd665f57 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -414,7 +414,7 @@ protected void FilterUserAllowedMenuItems(MenuItemCollection menuWithAllItems, I
         internal IEnumerable<MenuItem> GetAllowedUserMenuItemsForNode(IUmbracoEntity dd)
         {
             var permission = Services.UserService.GetPermissions(Security.CurrentUser, dd.Path);
-            //todo: inject
+            // TODO: inject
             var actions = Current.Actions.FromEntityPermission(permission)
                 .ToList();
 
@@ -437,7 +437,7 @@ internal IEnumerable<MenuItem> GetAllowedUserMenuItemsForNode(IUmbracoEntity dd)
         /// <returns></returns>
         internal bool CanUserAccessNode(IUmbracoEntity doc, IEnumerable<MenuItem> allowedUserOptions, string culture)
         {
-            //TODO: At some stage when we implement permissions on languages we'll need to take care of culture
+            // TODO: At some stage when we implement permissions on languages we'll need to take care of culture
             return allowedUserOptions.Select(x => x.Action).OfType<ActionBrowse>().Any();
         }
 
diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
index 11160ab2822c..9aea6e03dd82 100644
--- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -29,7 +29,7 @@ protected virtual void OnRenderFileNode(ref TreeNode treeNode) { }
         /// </summary>
         /// <param name="treeNode"></param>
         protected virtual void OnRenderFolderNode(ref TreeNode treeNode) {
-            //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
+            // TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
             treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
         }
 
diff --git a/src/Umbraco.Web/Trees/FilesTreeController.cs b/src/Umbraco.Web/Trees/FilesTreeController.cs
index 99c4ade09ecf..429b08e9ee24 100644
--- a/src/Umbraco.Web/Trees/FilesTreeController.cs
+++ b/src/Umbraco.Web/Trees/FilesTreeController.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Trees
     [Tree(Constants.Applications.Settings, "files", "Files", "icon-folder", "icon-folder", sortOrder: 13, initialize: false)]
     public class FilesTreeController : FileSystemTreeController
     {
-        protected override IFileSystem FileSystem => new PhysicalFileSystem("~/"); // todo inject
+        protected override IFileSystem FileSystem => new PhysicalFileSystem("~/"); // TODO: inject
 
         private static readonly string[] ExtensionsStatic = { "*" };
 
diff --git a/src/Umbraco.Web/Trees/ITree.cs b/src/Umbraco.Web/Trees/ITree.cs
index 2821d4bfbb2f..1125a80fe2ee 100644
--- a/src/Umbraco.Web/Trees/ITree.cs
+++ b/src/Umbraco.Web/Trees/ITree.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Web.Trees
 {
-    //todo- we don't really use this, it is nice to have the treecontroller, attribute and ApplicationTree streamlined to implement this but it's not used
+    // TODO: we don't really use this, it is nice to have the treecontroller, attribute and ApplicationTree streamlined to implement this but it's not used
     //leave as internal for now, maybe we'll use in the future, means we could pass around ITree 
     internal interface ITree
     {
diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
index 277094d3c63e..4936ce654182 100644
--- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
+++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Trees
     /// </summary>
     internal class LegacyTreeDataConverter
     {
-        //todo: remove this whole class when everything is angularized
+        // TODO: remove this whole class when everything is angularized
 
         /// <summary>
         /// This will look at the legacy IAction's JsFunctionName and convert it to a confirmation dialog view if possible
diff --git a/src/Umbraco.Web/Trees/ScriptsTreeController.cs b/src/Umbraco.Web/Trees/ScriptsTreeController.cs
index 2fbeae4f6bae..bb7fd80f5b4d 100644
--- a/src/Umbraco.Web/Trees/ScriptsTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptsTreeController.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.Trees
     [Tree(Constants.Applications.Settings, Constants.Trees.Scripts, "Scripts", "icon-folder", "icon-folder", sortOrder: 10)]
     public class ScriptsTreeController : FileSystemTreeController
     {
-        protected override IFileSystem FileSystem => Current.FileSystems.ScriptsFileSystem; // todo inject
+        protected override IFileSystem FileSystem => Current.FileSystems.ScriptsFileSystem; // TODO: inject
 
         private static readonly string[] ExtensionsStatic = { "js" };
 
diff --git a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
index f64e9fd7527d..0b8229191907 100644
--- a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
+++ b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Trees
     [Tree(Constants.Applications.Settings, Constants.Trees.Stylesheets, "Stylesheets", "icon-folder", "icon-folder", sortOrder: 9)]
     public class StylesheetsTreeController : FileSystemTreeController
     {
-        protected override IFileSystem FileSystem => Current.FileSystems.StylesheetsFileSystem; // todo inject
+        protected override IFileSystem FileSystem => Current.FileSystems.StylesheetsFileSystem; // TODO: inject
 
         private static readonly string[] ExtensionsStatic = { "css" };
 
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index c074f828d436..77102dff45d6 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -50,7 +50,7 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
 
             nodes.AddRange(found.Select(template => CreateTreeNode(
                 template.Id.ToString(CultureInfo.InvariantCulture),
-                //TODO: Fix parent ID stuff for templates
+                // TODO: Fix parent ID stuff for templates
                 "-1",
                 queryStrings,
                 template.Name,
@@ -112,7 +112,7 @@ private EntitySlim FromTemplate(ITemplate template)
                 Key = template.Key,
                 Name = template.Name,
                 NodeObjectType = Constants.ObjectTypes.Template,
-                //TODO: Fix parent/paths on templates
+                // TODO: Fix parent/paths on templates
                 ParentId = -1,
                 Path = template.Path,
                 UpdateDate = template.UpdateDate
diff --git a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
index c56e4fe07ff1..9e7eed3ae111 100644
--- a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
+++ b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
@@ -20,7 +20,7 @@ protected UmbracoControl(UmbracoContext umbracoContext, ServiceContext services)
             UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
             Umbraco = new UmbracoHelper(umbracoContext, services);
 
-            // todo inject somehow
+            // TODO: inject somehow
             Logger = Current.Logger;
             ProfilingLogger = Current.ProfilingLogger;
             Services = Current.Services;
diff --git a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
index f4cd7f1b509d..560c6a26603c 100644
--- a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
+++ b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
@@ -31,7 +31,7 @@ protected UmbracoUserControl(UmbracoContext umbracoContext, ServiceContext servi
             Umbraco = new UmbracoHelper(umbracoContext, services);
             Members = Current.Factory.GetInstance<MembershipHelper>();
 
-            // todo inject somehow
+            // TODO: inject somehow
             Logger = Current.Logger;
             ProfilingLogger = Current.ProfilingLogger;
             Services = Current.Services;
diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
index f223fe531068..51e40b5324d2 100644
--- a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
+++ b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
@@ -144,7 +144,7 @@ internal static string PreviewInitialize
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to //TODO: This would be nicer as an angular module so it can be injected into stuff... that&apos;d be heaps nicer, but
+        ///   Looks up a localized string similar to // TODO: This would be nicer as an angular module so it can be injected into stuff... that&apos;d be heaps nicer, but
         ///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want
         ///// to force load JS files ?
         ///
diff --git a/src/Umbraco.Web/UI/JavaScript/ServerVariables.js b/src/Umbraco.Web/UI/JavaScript/ServerVariables.js
index f7f6eb2a0951..4a0017550a14 100644
--- a/src/Umbraco.Web/UI/JavaScript/ServerVariables.js
+++ b/src/Umbraco.Web/UI/JavaScript/ServerVariables.js
@@ -1,4 +1,4 @@
-//TODO: This would be nicer as an angular module so it can be injected into stuff... that'd be heaps nicer, but
+// TODO: This would be nicer as an angular module so it can be injected into stuff... that'd be heaps nicer, but
 // how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want
 // to force load JS files ?
 
diff --git a/src/Umbraco.Web/UmbracoComponentRenderer.cs b/src/Umbraco.Web/UmbracoComponentRenderer.cs
index 48d0d571eeb4..a579c0abac53 100644
--- a/src/Umbraco.Web/UmbracoComponentRenderer.cs
+++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs
@@ -128,7 +128,7 @@ internal IHtmlString RenderMacro(MacroModel m, IDictionary<string, object> param
             var macroProps = new Hashtable();
             foreach (var i in parameters)
             {
-                //TODO: We are doing at ToLower here because for some insane reason the UpdateMacroModel method of macro.cs
+                // TODO: We are doing at ToLower here because for some insane reason the UpdateMacroModel method of macro.cs
                 // looks for a lower case match. WTF. the whole macro concept needs to be rewritten.
 
 
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 49a3832483e9..04a9658ee542 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -41,7 +41,7 @@ public class UmbracoContext : DisposableObject, IDisposeOnRequestEnd
         /// <param name="replace">A value indicating whether to replace the existing context.</param>
         ///  <returns>The "current" UmbracoContext.</returns>
         ///  <remarks>
-        ///  todo - this needs to be clarified
+        ///  TODO: this needs to be clarified
         ///
         ///  If <paramref name="replace"/> is true then the "current" UmbracoContext is replaced
         ///  with a new one even if there is one already. See <see cref="WebRuntimeComponent"/>. Has to do with
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 110c3e84d0d9..9d55299ecc52 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -638,10 +638,10 @@ public IPublishedContent Media(Udi id)
 
         public IPublishedContent Media(Guid id)
         {
-            //TODO: This is horrible but until the media cache properly supports GUIDs we have no choice here and
+            // TODO: This is horrible but until the media cache properly supports GUIDs we have no choice here and
             // currently there won't be any way to add this method correctly to `ITypedPublishedContentQuery` without breaking an interface and adding GUID support for media
 
-            var entityService = Current.Services.EntityService; // todo inject
+            var entityService = Current.Services.EntityService; // TODO: inject
             var mediaAttempt = entityService.GetId(id, UmbracoObjectTypes.Media);
             return mediaAttempt.Success ? ContentQuery.Media(mediaAttempt.Result) : null;
         }
diff --git a/src/Umbraco.Web/UmbracoHttpHandler.cs b/src/Umbraco.Web/UmbracoHttpHandler.cs
index 009272963cdc..336b53e9e083 100644
--- a/src/Umbraco.Web/UmbracoHttpHandler.cs
+++ b/src/Umbraco.Web/UmbracoHttpHandler.cs
@@ -23,7 +23,7 @@ protected UmbracoHttpHandler(UmbracoContext umbracoContext, ServiceContext servi
             UmbracoContext = umbracoContext;
             Umbraco = new UmbracoHelper(umbracoContext, services);
 
-            // todo inject somehow
+            // TODO: inject somehow
             Logger = Current.Logger;
             ProfilingLogger = Current.ProfilingLogger;
             Services = Current.Services;
diff --git a/src/Umbraco.Web/WebApi/Filters/EnableOverrideAuthorizationAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnableOverrideAuthorizationAttribute.cs
index 7828400487ec..358c9cc3b322 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnableOverrideAuthorizationAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnableOverrideAuthorizationAttribute.cs
@@ -11,6 +11,6 @@ namespace Umbraco.Web.WebApi.Filters
     [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
     public sealed class EnableOverrideAuthorizationAttribute : Attribute
     {
-        //todo we should remove this and use the System.Web.Http.OverrideAuthorizationAttribute which uses IOverrideFilter instead
+        // TODO: we should remove this and use the System.Web.Http.OverrideAuthorizationAttribute which uses IOverrideFilter instead
     }
 }
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
index 6604d1c9e747..ae42d54787a0 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
@@ -89,13 +89,13 @@ public override void OnActionExecuting(HttpActionContext actionContext)
                     }
                     else if (Udi.TryParse(argument, true, out Udi udi))
                     {
-                        //todo: inject? we can't because this is an attribute but we could provide ctors and empty ctors that pass in the required services
+                        // TODO: inject? we can't because this is an attribute but we could provide ctors and empty ctors that pass in the required services
                         nodeId = Current.Services.EntityService.GetId(udi).Result;
                     }
                     else
                     {
                         Guid.TryParse(argument, out Guid key);
-                        //todo: inject? we can't because this is an attribute but we could provide ctors and empty ctors that pass in the required services
+                        // TODO: inject? we can't because this is an attribute but we could provide ctors and empty ctors that pass in the required services
                         nodeId = Current.Services.EntityService.GetId(key, UmbracoObjectTypes.Document).Result;
                     }
                 }
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
index 866941d41df2..026b43a01bed 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
@@ -42,7 +42,7 @@ public EnsureUserPermissionForMediaAttribute(string paramName)
             _paramName = paramName;
         }
 
-        // todo v8 guess this is not used anymore, source is ignored?!
+        // TODO: v8 guess this is not used anymore, source is ignored?!
         public EnsureUserPermissionForMediaAttribute(string paramName, DictionarySource source)
         {
             if (string.IsNullOrEmpty(paramName)) throw new ArgumentNullOrEmptyException(nameof(paramName));
diff --git a/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs b/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs
index 522c3af8bbac..070bb53fb33e 100644
--- a/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs
@@ -5,7 +5,7 @@
 
 namespace Umbraco.Web.WebApi.Filters
 {
-    //todo remove this since we don't need it, see notes in EnableOverrideAuthorizationAttribute
+    // TODO: remove this since we don't need it, see notes in EnableOverrideAuthorizationAttribute
 
     /// <summary>
     /// Abstract auth filter class that can be used to enable overriding class auth filters at the action level
diff --git a/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
index 700554e73166..49cb75fffbe6 100644
--- a/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
@@ -19,7 +19,7 @@ public sealed class UmbracoAuthorizeAttribute : AuthorizeAttribute
         /// </summary>
         internal static bool Enable = true;
 
-        // todo - inject!
+        // TODO: inject!
         private readonly UmbracoContext _umbracoContext;
         private readonly IRuntimeState _runtimeState;
 
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
index 94e1b6e92342..c6bbbfa00b83 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
@@ -35,7 +35,7 @@ public bool Execute(string packageName, XElement xmlData)
             {
                 if (rootDoc.Name.Trim() == documentName.Trim() && rootDoc.ContentType != null)
                 {
-                    // todo variants?
+                    // TODO: variants?
                     Current.Services.ContentService.SaveAndPublishBranch(rootDoc, true);
                     break;
                 }
diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs
index 3b879c5b0257..5c2ff7aa0171 100644
--- a/src/Umbraco.Web/umbraco.presentation/page.cs
+++ b/src/Umbraco.Web/umbraco.presentation/page.cs
@@ -324,7 +324,7 @@ public PagePublishedContent(IContent inner, IVariationContextAccessor variationC
                 _id = _inner.Id;
                 _key = _inner.Key;
 
-                //TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
+                // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
                 _creatorName = _inner.GetCreatorProfile().Name;
                 _writerName = _inner.GetWriterProfile().Name;
 

From a185d56ae5eec9a084d55622109a8332e3ca78b3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 22 Jan 2019 15:57:50 +0100
Subject: [PATCH 087/421] Ensure that element types can't be assigned as
 allowed children to other content types

---
 .../views/permissions/permissions.controller.js           | 5 ++---
 src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
index 317fe094aeaf..a3b422e4f3f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
@@ -38,13 +38,12 @@
             });
 
             contentTypeResource.getAll().then(function(contentTypes){
-
-                vm.contentTypes = contentTypes;
+                vm.contentTypes = _.where(contentTypes, {isElement: false});
 
                 // convert legacy icons
                 iconHelper.formatContentTypeIcons(vm.contentTypes);
 
-                vm.selectedChildren = contentTypeHelper.makeObjectArrayFromId($scope.model.allowedContentTypes, vm.contentTypes);
+                vm.selectedChildren = contentTypeHelper.makeObjectArrayFromId($scope.model.allowedContentTypes, contentTypes);
 
                 if($scope.model.id === 0) {
                    contentTypeHelper.insertChildNodePlaceholder(vm.contentTypes, $scope.model.name, $scope.model.icon, $scope.model.id);
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs
index 6aca5d8054ce..56d81a31896e 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs
@@ -116,5 +116,13 @@ public string ThumbnailFilePath
         [DataMember(Name = "blueprints")]
         [ReadOnly(true)]
         public IDictionary<int, string> Blueprints { get; set; }
+
+        [DataMember(Name = "isContainer")]
+        [ReadOnly(true)]
+        public bool IsContainer { get; set; }
+
+        [DataMember(Name = "isElement")]
+        [ReadOnly(true)]
+        public bool IsElement { get; set; }
     }
 }

From 647d92775c092407a2734ed0d08b1c5c7292de8f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 27 Jan 2019 12:02:39 +0100
Subject: [PATCH 088/421] Make right-click menu work in Firefox

---
 .../src/common/directives/components/events/events.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index 6e75973ae787..77f2ffb54aef 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -188,7 +188,7 @@ angular.module('umbraco.directives')
             e.stopPropagation();
             var fn = $parse(attrs.onRightClick);
             scope.$apply(function () {
-                fn(scope, { $event: event });
+                fn(scope, { $event: e });
             });
             return false;
         });

From d174499e50f6ab84dba1600374371bb48fd5ad8a Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 27 Jan 2019 13:30:25 +0100
Subject: [PATCH 089/421] Fixes #4260 incorrect permissions required for
 Notifications sign up

---
 src/Umbraco.Web/Editors/ContentController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index c77fe04b0d5f..5f3022b2a980 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1179,7 +1179,7 @@ internal static bool CheckPermissions(
             return allowed;
         }
 
-        [EnsureUserPermissionForContent("contentId", 'R')]
+        [EnsureUserPermissionForContent("contentId", 'F')]
         public IEnumerable<NotifySetting> GetNotificationOptions(int contentId)
         {
             var notifications = new List<NotifySetting>();

From 7e8c0ed3694a35c131b601f9f06ae30045a57910 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 27 Jan 2019 15:17:08 +0100
Subject: [PATCH 090/421] Apply changes from PR #4197 to v8 too

---
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 5ece65034349..9dceead92783 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1328,9 +1328,9 @@ Mange hilsner fra Umbraco robotten
     <key alias="macros">Makroer</key>
     <key alias="mediaTypes">Medietyper</key>
     <key alias="member">Medlemmer</key>
-    <key alias="memberGroups">Medlemsgruppe</key>
+    <key alias="memberGroups">Medlemsgrupper</key>
     <key alias="memberRoles">Roller</key>
-    <key alias="memberTypes">Medlemstype</key>
+    <key alias="memberTypes">Medlemstyper</key>
     <key alias="documentTypes">Dokumenttyper</key>
     <key alias="relationTypes">Relationstyper</key>
     <key alias="packager">Pakker</key>

From 6b0158f761f8c4912a4c13e05289f5e8254b7be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Sun, 27 Jan 2019 18:14:55 +0100
Subject: [PATCH 091/421] color update

---
 .../src/less/components/umb-editor-navigation.less     | 10 +++++-----
 src/Umbraco.Web.UI.Client/src/less/sections.less       |  5 ++++-
 src/Umbraco.Web.UI.Client/src/less/variables.less      |  8 ++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
index 0982eaed2657..3875df1ce0cf 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
@@ -32,12 +32,12 @@
 }
 
 .umb-sub-views-nav-item.is-active {
-    color: @ui-active;
-    border-bottom-color: @ui-active;
+    //color: @ui-active;
+    //border-bottom-color: @ui-active;
     
-    //background-color: @ui-active;
-    //color: @ui-active-type;
-    //border-bottom-color: @ui-active-type;
+    //background-color: rgba(@ui-active, 0.25);
+    color: @ui-active-type;
+    border-bottom-color: @ui-active;
     /*
     &::after {
         content: "";
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index 2c5be567c9a0..70fb3d353b2e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -36,7 +36,7 @@ ul.sections>li>a::after {
 	content: "";
 	height: 4px;
 	width: 100%;
-	background-color: #b3afbd;
+	background-color: @pinkLight;
 	position: absolute;
 	bottom: -4px;
 	border-radius: 3px 3px 0 0;
@@ -45,6 +45,9 @@ ul.sections>li>a::after {
 	transition: all .2s linear;
 }
 
+ul.sections>li.current>a {
+    color:@pinkLight;
+}
 ul.sections>li.current>a::after {
 	opacity: 1;
 	bottom: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 7fe253bc82da..a8fdc57a687d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -127,8 +127,8 @@
 // -------------------------
 
 //@ui-active:           #346ab3;
-@ui-active:             @blueMid;
-@ui-active-type:        white;
+@ui-active:             @pinkLight;
+@ui-active-type:        @blueExtraDark;
 @ui-active-hover:       @blueMid;
 @ui-selected:           @blueMid;//not used jet.
 @ui-selected-hover:     @blueMid;//not used jet.
@@ -142,9 +142,9 @@
 @type-white:                      @u-white;
 @type-black:                      @blueNight;
 
-@ui-btn:                        @claus4;
+@ui-btn:                        @brownLight;
 @ui-btn-hover:                  @ui-btn;
-@ui-btn-type:                   @u-white;
+@ui-btn-type:                   @blueExtraDark;
 
 @ui-btn-positive:               @green;
 @ui-btn-positive-hover:         @green;

From 9b01910d44b4a720e065f9ebadcbe4995f490276 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 28 Jan 2019 08:27:42 +0100
Subject: [PATCH 092/421] Removed isPublished stuff from XmlPublishedContent.

---
 .../XmlPublishedContentInitBenchmarks.cs                 | 8 ++++----
 .../XmlPublishedCache/XmlPublishedContent.cs             | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs
index 860dc0ac4b21..bc18b97d4745 100644
--- a/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs
+++ b/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs
@@ -145,7 +145,7 @@ public void Enhanced_10_Children()
             XmlPublishedContent.InitializeNode(null, _xml10.DocumentElement, false,
                 out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
                 out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out createDate, out updateDate, out level, out isDraft, out isPublished, out publishedContentType,
+                out createDate, out updateDate, out level, out isDraft, out publishedContentType,
                 out properties, GetPublishedContentType);
         }
 
@@ -155,7 +155,7 @@ public void Enhanced_100_Children()
             XmlPublishedContent.InitializeNode(null, _xml100.DocumentElement, false,
                 out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
                 out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out createDate, out updateDate, out level, out isDraft,  out isPublished,out publishedContentType,
+                out createDate, out updateDate, out level, out isDraft, out publishedContentType,
                 out properties, GetPublishedContentType);
         }
 
@@ -165,7 +165,7 @@ public void Enhanced_1000_Children()
             XmlPublishedContent.InitializeNode(null, _xml1000.DocumentElement, false,
                 out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
                 out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out createDate, out updateDate, out level, out isDraft, out isPublished,out publishedContentType,
+                out createDate, out updateDate, out level, out isDraft,out publishedContentType,
                 out properties, GetPublishedContentType);
         }
 
@@ -175,7 +175,7 @@ public void Enhanced_10000_Children()
             XmlPublishedContent.InitializeNode(null, _xml10000.DocumentElement, false,
                 out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
                 out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out createDate, out updateDate, out level, out isDraft, out isPublished,out publishedContentType,
+                out createDate, out updateDate, out level, out isDraft,out publishedContentType,
                 out properties, GetPublishedContentType);
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
index f601114ffd6a..3db52616e8f1 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
@@ -63,7 +63,7 @@ private XmlPublishedContent(XmlNode xmlNode, bool isPreviewing, IAppCache appCac
         private int _sortOrder;
         private int _level;
         private bool _isDraft;
-        private bool _isPublished;
+
 
         public override IEnumerable<IPublishedContent> Children
         {
@@ -232,7 +232,7 @@ public override bool IsDraft(string culture = null)
         public override bool IsPublished(string culture = null)
         {
             EnsureNodeInitialized();
-            return _isPublished; // bah
+            return true; // Intentionally not implemented, because the XmlPublishedContent should not support this.
         }
 
         public override IEnumerable<IPublishedProperty> Properties
@@ -287,7 +287,7 @@ private void InitializeNode()
             InitializeNode(this, _xmlNode, _isPreviewing,
                 out _id, out _key, out _template, out _sortOrder, out _name, out _writerName,
                 out _urlName, out _creatorName, out _creatorId, out _writerId, out _docTypeAlias, out _docTypeId, out _path,
-                out _createDate, out _updateDate, out _level, out _isDraft, out _isPublished, out _contentType, out _properties,
+                out _createDate, out _updateDate, out _level, out _isDraft, out _contentType, out _properties,
                 _contentTypeCache.Get);
 
             _nodeInitialized = true;
@@ -297,7 +297,7 @@ private void InitializeNode()
         internal static void InitializeNode(XmlPublishedContent node, XmlNode xmlNode, bool isPreviewing,
             out int id, out Guid key, out int template, out int sortOrder, out string name, out string writerName, out string urlName,
             out string creatorName, out int creatorId, out int writerId, out string docTypeAlias, out int docTypeId, out string path,
-            out DateTime createDate, out DateTime updateDate, out int level, out bool isDraft,out bool isPublished,
+            out DateTime createDate, out DateTime updateDate, out int level, out bool isDraft,
             out PublishedContentType contentType, out Dictionary<string, IPublishedProperty> properties,
             Func<PublishedItemType, string, PublishedContentType> getPublishedContentType)
         {
@@ -309,7 +309,6 @@ internal static void InitializeNode(XmlPublishedContent node, XmlNode xmlNode, b
             name = writerName = urlName = creatorName = docTypeAlias = path = null;
             createDate = updateDate = default(DateTime);
             isDraft = false;
-            isPublished = false; // fixme not implemented?
             contentType = null;
             properties = null;
 

From da3a5d35c188050b25268572a6a0c6bee0c7ae45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 28 Jan 2019 09:00:38 +0100
Subject: [PATCH 093/421] make unpublish button in overlay appear as
 button-style warning

---
 .../src/common/directives/components/content/edit.controller.js | 1 +
 .../src/views/components/overlays/umb-overlay.html              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 79701414f7d3..9e8a66ce5aaf 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -442,6 +442,7 @@
                     variants: $scope.content.variants, //set a model property for the dialog
                     skipFormValidation: true, //when submitting the overlay form, skip any client side validation
                     submitButtonLabelKey: "content_unpublish",
+                    submitButtonSTYLE: "warning",
                     submit: function (model) {
 
                         model.submitButtonState = "busy";
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
index 40b0e181bfab..aac2e2665bad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
@@ -67,7 +67,7 @@ <h5 class="red" ng-if="model.confirmSubmit.title"><i class="icon-alert"></i> {{
 
                 <umb-button
                     alias="overlaySubmit"
-                    button-style="success"
+                    button-style="{{model.submitButtonStyle || 'success'}}"
                     label-key="{{model.submitButtonLabelKey}}"
                     label="{{model.submitButtonLabel}}"
                     ng-if="model.submit && model.hideSubmitButton !== true"

From f0611fff905577e1927b2dcb62b85272675d98b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 28 Jan 2019 09:30:08 +0100
Subject: [PATCH 094/421] correct color variable for variant switcher

---
 src/Umbraco.Web.UI.Client/src/less/components/editor.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index f193561ff373..c917b7e031d3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -166,7 +166,7 @@ a.umb-variant-switcher__toggle {
 
 .umb-variant-switcher_item--current .umb-variant-switcher__name-wrapper {
 	background-color: @gray-10;
-	border-left: 2px solid @turquoise;
+	border-left: 2px solid @ui-active;
 }
 
 .umb-variant-switcher__item:hover,

From e410b8b06719fe35ef154a3be621bddef3ee7a32 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Jan 2019 10:27:36 +0100
Subject: [PATCH 095/421] Fix TreeUse

---
 src/Umbraco.Web/Trees/TreeAttribute.cs     | 22 ------------------
 src/Umbraco.Web/Trees/TreeUse.cs           | 26 ++++++++++++++++++++++
 src/Umbraco.Web/Trees/TreeUseExtensions.cs | 24 ++++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj         |  2 ++
 4 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 src/Umbraco.Web/Trees/TreeUse.cs
 create mode 100644 src/Umbraco.Web/Trees/TreeUseExtensions.cs

diff --git a/src/Umbraco.Web/Trees/TreeAttribute.cs b/src/Umbraco.Web/Trees/TreeAttribute.cs
index 2102bd4bfc09..5b51d8605e65 100644
--- a/src/Umbraco.Web/Trees/TreeAttribute.cs
+++ b/src/Umbraco.Web/Trees/TreeAttribute.cs
@@ -2,28 +2,6 @@
 
 namespace Umbraco.Web.Trees
 {
-    // fixme move
-    [Flags]
-    public enum TreeUse
-    {
-        None = 0,
-        Main = 1,
-        Dialog = 2,
-    }
-
-    public static class TreeUseExtensions
-    {
-        public static bool Has(this TreeUse use, TreeUse uses)
-        {
-            return use == uses;
-        }
-
-        public static bool HasAny(this TreeUse use, TreeUse uses)
-        {
-            return (use & uses) > 0;
-        }
-    }
-
     /// <summary>
     /// Identifies a section tree.
     /// </summary>
diff --git a/src/Umbraco.Web/Trees/TreeUse.cs b/src/Umbraco.Web/Trees/TreeUse.cs
new file mode 100644
index 000000000000..a1baee3332b1
--- /dev/null
+++ b/src/Umbraco.Web/Trees/TreeUse.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// Defines tree uses.
+    /// </summary>
+    [Flags]
+    public enum TreeUse
+    {
+        /// <summary>
+        /// The tree is not used.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// The tree is used as a main (section) tree.
+        /// </summary>
+        Main = 1,
+
+        /// <summary>
+        /// The tree is used as a dialog.
+        /// </summary>
+        Dialog = 2,
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Trees/TreeUseExtensions.cs b/src/Umbraco.Web/Trees/TreeUseExtensions.cs
new file mode 100644
index 000000000000..02b417eb9801
--- /dev/null
+++ b/src/Umbraco.Web/Trees/TreeUseExtensions.cs
@@ -0,0 +1,24 @@
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// Provides extension methods to the <see cref="TreeUse"/> method.
+    /// </summary>
+    public static class TreeUseExtensions
+    {
+        /// <summary>
+        /// Determines whether a TreeUse has all the specified values.
+        /// </summary>
+        public static bool Has(this TreeUse use, TreeUse uses)
+        {
+            return (use & uses) == uses;
+        }
+
+        /// <summary>
+        /// Determines whether a TreeUse has any of the specified values.
+        /// </summary>
+        public static bool HasAny(this TreeUse use, TreeUse uses)
+        {
+            return (use & uses) > 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f924796d5fc6..361c2aa28aa5 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -185,6 +185,8 @@
     <Compile Include="Trees\SettingsBackOfficeSection.cs" />
     <Compile Include="Trees\TranslationBackOfficeSection.cs" />
     <Compile Include="Trees\TreeCollectionBuilder.cs" />
+    <Compile Include="Trees\TreeUse.cs" />
+    <Compile Include="Trees\TreeUseExtensions.cs" />
     <Compile Include="Trees\UsersBackOfficeSection.cs" />
     <Compile Include="Trees\Tree.cs" />
     <Compile Include="Trees\ITree.cs" />

From c2a404c02d84dbfeb6f06b366079dd8ac578023a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Jan 2019 10:34:57 +0100
Subject: [PATCH 096/421] Update ModelsBuilder

---
 build/NuSpecs/UmbracoCms.nuspec          | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index f642b2f4e853..56851700b01f 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,7 +22,7 @@
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
             <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
-            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.33]" />
+            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.34]" />
             <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
             <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
             <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 0ff158dadb46..4da6e9157921 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -106,7 +106,7 @@
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
-      <Version>8.0.0-alpha.33</Version>
+      <Version>8.0.0-alpha.34</Version>
     </PackageReference>
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>

From c675708388083ebae358f941e948494c9c722a69 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Jan 2019 12:20:22 +0100
Subject: [PATCH 097/421] Refactor dashboards

---
 .../WeightedCollectionBuilderBase.cs          |   2 +-
 src/Umbraco.Core/Dashboards/DashboardSlim.cs  |  12 ++
 src/Umbraco.Core/Dashboards/IDashboard.cs     |  37 ++++++
 .../Dashboards/IDashboardSection.cs           |  34 -----
 src/Umbraco.Core/Dashboards/IDashboardSlim.cs |  22 ++++
 ...gnoreDataMemberWhenSerializingAttribute.cs |  15 ---
 .../Manifest/ManifestContentAppDefinition.cs  |   7 +-
 ...oardDefinition.cs => ManifestDashboard.cs} |   5 +-
 src/Umbraco.Core/Manifest/ManifestParser.cs   |   2 +-
 src/Umbraco.Core/Manifest/PackageManifest.cs  |   2 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   7 +-
 .../Composing/CollectionBuildersTests.cs      |   2 +-
 .../DashboardSettings/Dashboard.config        | 114 ----------------
 .../DashboardSettingsTests.cs                 | 124 ------------------
 .../DashboardSettings/web.config              |  14 --
 .../Manifest/ManifestParserTests.cs           |   4 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   9 --
 .../Dashboards/ContentDashboard.cs            |   2 +-
 .../Dashboards/DashboardCollection.cs         |   4 +-
 .../Dashboards/DashboardCollectionBuilder.cs  |  32 +++--
 .../Dashboards/ExamineDashboard.cs            |   2 +-
 src/Umbraco.Web/Dashboards/FormsDashboard.cs  |   2 +-
 .../Dashboards/HealthCheckDashboard.cs        |   2 +-
 src/Umbraco.Web/Dashboards/MediaDashboard.cs  |   2 +-
 .../Dashboards/MembersDashboard.cs            |   2 +-
 .../Dashboards/ModelsBuilderDashboard.cs      |   2 +-
 .../Dashboards/PublishedStatusDashboard.cs    |   2 +-
 .../Dashboards/RedirectUrlDashboard.cs        |   2 +-
 .../Dashboards/SettingsDashboards.cs          |   2 +-
 .../Editors/DashboardController.cs            |  19 ++-
 .../Editors/EditorModelEventManager.cs        |   8 +-
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |   5 +-
 src/Umbraco.Web/Services/DashboardService.cs  |  10 +-
 src/Umbraco.Web/Services/IDashboardService.cs |   4 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 -
 ...taMemberWhenSerializingContractResolver.cs |  31 -----
 .../WebApi/JsonCamelCaseFormatter.cs          |   4 +-
 37 files changed, 141 insertions(+), 409 deletions(-)
 create mode 100644 src/Umbraco.Core/Dashboards/DashboardSlim.cs
 create mode 100644 src/Umbraco.Core/Dashboards/IDashboard.cs
 delete mode 100644 src/Umbraco.Core/Dashboards/IDashboardSection.cs
 create mode 100644 src/Umbraco.Core/Dashboards/IDashboardSlim.cs
 delete mode 100644 src/Umbraco.Core/Manifest/IgnoreDataMemberWhenSerializingAttribute.cs
 rename src/Umbraco.Core/Manifest/{ManifestDashboardDefinition.cs => ManifestDashboard.cs} (86%)
 delete mode 100644 src/Umbraco.Tests/Configurations/DashboardSettings/Dashboard.config
 delete mode 100644 src/Umbraco.Tests/Configurations/DashboardSettings/DashboardSettingsTests.cs
 delete mode 100644 src/Umbraco.Tests/Configurations/DashboardSettings/web.config
 delete mode 100644 src/Umbraco.Web/WebApi/CamelCaseAndDataMemberWhenSerializingContractResolver.cs

diff --git a/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs
index f8ecc11d98a8..88eb61de7625 100644
--- a/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs
+++ b/src/Umbraco.Core/Composing/WeightedCollectionBuilderBase.cs
@@ -114,7 +114,7 @@ protected override IEnumerable<Type> GetRegisteringTypes(IEnumerable<Type> types
             return list;
         }
 
-        protected virtual int DefaultWeight { get; set; } = 10;
+        public virtual int DefaultWeight { get; set; } = 100;
 
         protected virtual int GetWeight(Type type)
         {
diff --git a/src/Umbraco.Core/Dashboards/DashboardSlim.cs b/src/Umbraco.Core/Dashboards/DashboardSlim.cs
new file mode 100644
index 000000000000..a2869a90a2b7
--- /dev/null
+++ b/src/Umbraco.Core/Dashboards/DashboardSlim.cs
@@ -0,0 +1,12 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Dashboards
+{
+    [DataContract(IsReference = true)]
+    public class DashboardSlim : IDashboardSlim
+    {
+        public string Alias { get; set; }
+
+        public string View { get; set; }
+    }
+}
diff --git a/src/Umbraco.Core/Dashboards/IDashboard.cs b/src/Umbraco.Core/Dashboards/IDashboard.cs
new file mode 100644
index 000000000000..eaf6c47c8825
--- /dev/null
+++ b/src/Umbraco.Core/Dashboards/IDashboard.cs
@@ -0,0 +1,37 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Dashboards
+{
+    /// <summary>
+    /// Represents a dashboard.
+    /// </summary>
+    public interface IDashboard : IDashboardSlim
+    {
+        /// <summary>
+        /// Gets the aliases of sections/applications where this dashboard appears.
+        /// </summary>
+        /// <remarks>
+        /// <para>This field is *not* needed by the UI and therefore we want to exclude
+        /// it from serialization, but it is deserialized as part of the manifest,
+        /// therefore we cannot plainly ignore it.</para>
+        /// <para>So, it has to remain a data member, plus we use our special
+        /// JsonDontSerialize attribute (see attribute for more details).</para>
+        /// </remarks>
+        [DataMember(Name = "sections")]
+        string[] Sections { get; }
+
+
+        /// <summary>
+        /// Gets the access rule determining the visibility of the dashboard.
+        /// </summary>
+        /// <remarks>
+        /// <para>This field is *not* needed by the UI and therefore we want to exclude
+        /// it from serialization, but it is deserialized as part of the manifest,
+        /// therefore we cannot plainly ignore it.</para>
+        /// <para>So, it has to remain a data member, plus we use our special
+        /// JsonDontSerialize attribute (see attribute for more details).</para>
+        /// </remarks>
+        [DataMember(Name = "access")]
+        IAccessRule[] AccessRules { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Dashboards/IDashboardSection.cs b/src/Umbraco.Core/Dashboards/IDashboardSection.cs
deleted file mode 100644
index 73cf8513f96b..000000000000
--- a/src/Umbraco.Core/Dashboards/IDashboardSection.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Runtime.Serialization;
-using Umbraco.Core.Manifest;
-
-namespace Umbraco.Core.Dashboards
-{
-    public interface IDashboardSection
-    {
-        /// <summary>
-        /// Alias to refer to this dashboard via code
-        /// </summary>
-        [DataMember(Name = "alias")]
-        string Alias { get; }
-
-        /// <summary>
-        /// A collection of sections/application aliases that this dashboard will appear on
-        /// </summary>
-        [DataMember(Name = "sections")]
-        [IgnoreDataMemberWhenSerializing]
-        string[] Sections { get; }
-
-        /// <summary>
-        /// The HTML view to load for the dashboard
-        /// </summary>
-        [DataMember(Name = "view")]
-        string View { get; }
-
-        /// <summary>
-        /// Dashboards can be shown/hidden based on access rights
-        /// </summary>
-        [DataMember(Name = "access")]
-        [IgnoreDataMemberWhenSerializing]
-        IAccessRule[] AccessRules { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Dashboards/IDashboardSlim.cs b/src/Umbraco.Core/Dashboards/IDashboardSlim.cs
new file mode 100644
index 000000000000..655f56dfd97d
--- /dev/null
+++ b/src/Umbraco.Core/Dashboards/IDashboardSlim.cs
@@ -0,0 +1,22 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Dashboards
+{
+    /// <summary>
+    /// Represents a dashboard with only minimal data.
+    /// </summary>
+    public interface IDashboardSlim
+    {
+        /// <summary>
+        /// Gets the alias of the dashboard.
+        /// </summary>
+        [DataMember(Name = "alias")]
+        string Alias { get; }
+
+        /// <summary>
+        /// Gets the view used to render the dashboard.
+        /// </summary>
+        [DataMember(Name = "view")]
+        string View { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Manifest/IgnoreDataMemberWhenSerializingAttribute.cs b/src/Umbraco.Core/Manifest/IgnoreDataMemberWhenSerializingAttribute.cs
deleted file mode 100644
index 8486e1b6a990..000000000000
--- a/src/Umbraco.Core/Manifest/IgnoreDataMemberWhenSerializingAttribute.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Manifest
-{
-    /// <summary>
-    /// When applied to the member of a type, specifies that the member is not part of a data contract when
-    /// serialized but still when deserialized as opposite to <see cref="IgnoreDataMemberAttribute"/>.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
-    public class IgnoreDataMemberWhenSerializingAttribute : Attribute
-    {
-
-    }
-}
diff --git a/src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs b/src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs
index 0667f11aab68..af66bfc5447d 100644
--- a/src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs
+++ b/src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs
@@ -1,12 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text.RegularExpressions;
 using Umbraco.Core.IO;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.ContentEditing;
-using Umbraco.Core.Models.Membership;
 
 namespace Umbraco.Core.Manifest
 {
@@ -30,6 +24,7 @@ namespace Umbraco.Core.Manifest
     /// <summary>
     /// Represents a content app definition, parsed from a manifest.
     /// </summary>
+    /// <remarks>Is used to create an actual <see cref="ManifestContentAppFactory"/>.</remarks>
     [DataContract(Name = "appdef", Namespace = "")]
     public class ManifestContentAppDefinition
     {
diff --git a/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs b/src/Umbraco.Core/Manifest/ManifestDashboard.cs
similarity index 86%
rename from src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs
rename to src/Umbraco.Core/Manifest/ManifestDashboard.cs
index 879f78e19cf8..e7906552213f 100644
--- a/src/Umbraco.Core/Manifest/ManifestDashboardDefinition.cs
+++ b/src/Umbraco.Core/Manifest/ManifestDashboard.cs
@@ -6,7 +6,7 @@
 
 namespace Umbraco.Core.Manifest
 {
-    public class ManifestDashboardDefinition : IDashboardSection
+    public class ManifestDashboard : IDashboard
     {
         private string _view;
 
@@ -14,7 +14,7 @@ public class ManifestDashboardDefinition : IDashboardSection
         public string Alias { get; set; }
 
         [JsonProperty("weight", DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        [DefaultValue(100)]
+        [DefaultValue(100)] // must be equal to DashboardCollectionBuilder.DefaultWeight
         public int Weight { get; set; }
 
         [JsonProperty("view", Required = Required.Always)]
@@ -29,6 +29,5 @@ public string View
 
         [JsonProperty("access")]
         public IAccessRule[] AccessRules { get; set; } = Array.Empty<IAccessRule>();
-
     }
 }
diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs
index 825ffb7314d3..6ca3b916ea7c 100644
--- a/src/Umbraco.Core/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/ManifestParser.cs
@@ -100,7 +100,7 @@ private static PackageManifest MergeManifests(IEnumerable<PackageManifest> manif
             var parameterEditors = new List<IDataEditor>();
             var gridEditors = new List<GridEditor>();
             var contentApps = new List<ManifestContentAppDefinition>();
-            var dashboards = new List<ManifestDashboardDefinition>();
+            var dashboards = new List<ManifestDashboard>();
             var sections = new List<ManifestBackOfficeSection>();
 
             foreach (var manifest in manifests)
diff --git a/src/Umbraco.Core/Manifest/PackageManifest.cs b/src/Umbraco.Core/Manifest/PackageManifest.cs
index b29a28ab06e6..c2724495092f 100644
--- a/src/Umbraco.Core/Manifest/PackageManifest.cs
+++ b/src/Umbraco.Core/Manifest/PackageManifest.cs
@@ -49,7 +49,7 @@ public class PackageManifest
         /// Gets or sets the dashboards listed in the manifest.
         /// </summary>
         [JsonProperty("dashboards")]
-        public ManifestDashboardDefinition[] Dashboards { get; set; } = Array.Empty<ManifestDashboardDefinition>();
+        public ManifestDashboard[] Dashboards { get; set; } = Array.Empty<ManifestDashboard>();
 
         /// <summary>
         /// Gets or sets the sections listed in the manifest.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ebd0e2735b02..a4e60bb9a97f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -313,8 +313,10 @@
     <Compile Include="ContentVariationExtensions.cs" />
     <Compile Include="Dashboards\AccessRule.cs" />
     <Compile Include="Dashboards\AccessRuleType.cs" />
+    <Compile Include="Dashboards\DashboardSlim.cs" />
     <Compile Include="Dashboards\IAccessRule.cs" />
-    <Compile Include="Dashboards\IDashboardSection.cs" />
+    <Compile Include="Dashboards\IDashboard.cs" />
+    <Compile Include="Dashboards\IDashboardSlim.cs" />
     <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
     <Compile Include="DisposableObjectSlim.cs" />
     <Compile Include="Events\ExportedMemberEventArgs.cs" />
@@ -354,11 +356,10 @@
     <Compile Include="Logging\Viewer\MessageTemplateFilter.cs" />
     <Compile Include="Logging\Viewer\SavedLogSearch.cs" />
     <Compile Include="Manifest\DashboardAccessRuleConverter.cs" />
-    <Compile Include="Manifest\IgnoreDataMemberWhenSerializingAttribute.cs" />
     <Compile Include="Manifest\ManifestBackOfficeSection.cs" />
     <Compile Include="Manifest\ManifestContentAppDefinition.cs" />
     <Compile Include="Manifest\ManifestContentAppFactory.cs" />
-    <Compile Include="Manifest\ManifestDashboardDefinition.cs" />
+    <Compile Include="Manifest\ManifestDashboard.cs" />
     <Compile Include="Migrations\IncompleteMigrationExpressionException.cs" />
     <Compile Include="Migrations\MergeBuilder.cs" />
     <Compile Include="Migrations\MigrationBase_Extra.cs" />
diff --git a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
index 4c262fbf82cb..8ea13fc9204a 100644
--- a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
+++ b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
@@ -453,7 +453,7 @@ public abstract class Resolved
         public class Resolved1 : Resolved
         { }
 
-        [Weight(5)] // default is 10
+        [Weight(50)] // default is 100
         public class Resolved2 : Resolved
         { }
 
diff --git a/src/Umbraco.Tests/Configurations/DashboardSettings/Dashboard.config b/src/Umbraco.Tests/Configurations/DashboardSettings/Dashboard.config
deleted file mode 100644
index 4c86355a1b7d..000000000000
--- a/src/Umbraco.Tests/Configurations/DashboardSettings/Dashboard.config
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dashBoard>
-
-    <section alias="StartupSettingsDashboardSection">
-        <areas>
-            <area>settings</area>
-        </areas>
-        <tab caption="Get Started">
-            <control panelCaption="hello">
-                views/dashboard/settings/settingsdashboardintro.html
-            </control>
-            <control panelCaption="">
-                views/dashboard/settings/settingsdashboardvideos.html
-            </control>
-        </tab>
-        <tab caption="Examine Management">
-            <control>dashboard/ExamineManagement.ascx</control>
-        </tab>
-    </section>
-
-    <section alias="StartupDeveloperDashboardSection">
-        <areas>
-            <area>developer</area>
-        </areas>
-        <tab caption="Get Started">
-            <control panelCaption="">
-                views/dashboard/developer/developerdashboardintro.html
-            </control>
-            <control panelCaption="">
-                views/dashboard/developer/developerdashboardvideos.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupMediaDashboardSection">
-        <areas>
-            <area>media</area>
-        </areas>
-        <tab caption="Content">
-            <control panelCaption="">
-                views/dashboard/media/mediafolderbrowser.html
-            </control>
-        </tab>
-        <tab caption="Get Started">
-            <access>
-                <grant>admin</grant>
-            </access>
-            <control panelCaption="">
-                views/dashboard/media/mediadashboardintro.html
-            </control>
-            <control panelCaption="">
-                views/dashboard/media/desktopmediauploader.html
-            </control>
-            <control panelCaption="">
-                views/dashboard/media/mediadashboardvideos.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupDashboardSection">
-        <access>
-            <deny>translator</deny>
-            <grant>hello</grant>
-            <grantBySection>world</grantBySection>
-        </access>
-        <areas>
-            <area>content</area>
-        </areas>
-        <tab caption="Get Started">
-            <access>
-                <grant>admin</grant>
-            </access>
-            <control panelCaption="">
-                views/dashboard/default/startupdashboardintro.html
-            </control>
-            <control panelCaption="">
-                views/dashboard/default/startupdashboardkits.html
-                <access>
-                    <deny>editor</deny>
-                    <deny>writer</deny>
-                </access>
-            </control>
-            <control panelCaption="">
-                views/dashboard/default/startupdashboardvideos.html
-            </control>
-        </tab>
-        <tab caption="Last Edits">
-            <control MaxRecords="30">dashboard/latestEdits.ascx</control>
-        </tab>
-        <tab caption="Change Password">
-            <control >
-                views/dashboard/changepassword.html
-            </control>
-        </tab>
-    </section>
-
-    <section alias="StartupMemberDashboardSection">
-        <areas>
-            <area>default</area>
-            <area>member</area>
-        </areas>
-        <tab caption="Get Started">
-            <control panelCaption="">
-                views/dashboard/members/membersdashboardintro.html
-            </control>
-            <control panelCaption="">
-                members/membersearch.ascx
-            </control>
-            <control panelCaption="">
-                views/dashboard/members/membersdashboardvideos.html
-            </control>
-        </tab>
-    </section>
-</dashBoard>
diff --git a/src/Umbraco.Tests/Configurations/DashboardSettings/DashboardSettingsTests.cs b/src/Umbraco.Tests/Configurations/DashboardSettings/DashboardSettingsTests.cs
deleted file mode 100644
index 219e6092d20a..000000000000
--- a/src/Umbraco.Tests/Configurations/DashboardSettings/DashboardSettingsTests.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Configuration;
-using System.IO;
-using System.Linq;
-using NUnit.Framework;
-using Umbraco.Core.Dashboards;
-using Umbraco.Tests.TestHelpers;
-
-namespace Umbraco.Tests.Configurations.DashboardSettings
-{
-    //[Obsolete("Dashboard tests not in config/XML", true)]
-    //[TestFixture]
-    //public class DashboardSettingsTests
-    //{
-    //    [SetUp]
-    //    public void Init()
-    //    {
-    //        var config = new FileInfo(TestHelper.MapPathForTest("~/Configurations/DashboardSettings/web.config"));
-
-    //        var fileMap = new ExeConfigurationFileMap() { ExeConfigFilename = config.FullName };
-    //        var configuration = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None);
-
-    //        SettingsSection = configuration.GetSection("umbracoConfiguration/dashBoard") as DashboardSection;
-
-    //        Assert.IsNotNull(SettingsSection);
-    //    }
-
-    //    protected IDashboardSection SettingsSection { get; private set; }
-
-    //    [Test]
-    //    public void Test_Sections()
-    //    {
-    //        Assert.AreEqual(5, SettingsSection.Sections.Count());
-
-    //        Assert.AreEqual("StartupSettingsDashboardSection", SettingsSection.Sections.ElementAt(0).Alias);
-    //        Assert.AreEqual("StartupDeveloperDashboardSection", SettingsSection.Sections.ElementAt(1).Alias);
-    //        Assert.AreEqual("StartupMediaDashboardSection", SettingsSection.Sections.ElementAt(2).Alias);
-    //        Assert.AreEqual("StartupDashboardSection", SettingsSection.Sections.ElementAt(3).Alias);
-    //        Assert.AreEqual("StartupMemberDashboardSection", SettingsSection.Sections.ElementAt(4).Alias);
-    //    }
-
-    //    [Test]
-    //    public void Test_Section_Area()
-    //    {
-    //        Assert.AreEqual("settings", SettingsSection.Sections.ElementAt(0).Areas.First());
-    //        Assert.AreEqual("developer", SettingsSection.Sections.ElementAt(1).Areas.First());
-    //        Assert.AreEqual("media", SettingsSection.Sections.ElementAt(2).Areas.First());
-    //        Assert.AreEqual("content", SettingsSection.Sections.ElementAt(3).Areas.First());
-    //        Assert.AreEqual("default", SettingsSection.Sections.ElementAt(4).Areas.First());
-    //        Assert.AreEqual("member", SettingsSection.Sections.ElementAt(4).Areas.Last());
-    //    }
-
-    //    [Test]
-    //    public void Test_Section_Access()
-    //    {
-
-    //        Assert.AreEqual(3, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.Count());
-
-    //        Assert.AreEqual("translator", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(0).Value);
-    //        Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(0).Type);
-    //        Assert.AreEqual("hello", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(1).Value);
-    //        Assert.AreEqual(AccessRuleType.Grant, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(1).Type);
-    //        Assert.AreEqual("world", SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(2).Value);
-    //        Assert.AreEqual(AccessRuleType.GrantBySection, SettingsSection.Sections.ElementAt(3).AccessRights.Rules.ElementAt(2).Type);
-    //    }
-
-    //    [Test]
-    //    public void Test_Section_Tabs()
-    //    {
-    //        //Element 0 Alias "StartupSettingsDashboardSection"
-    //        Assert.AreEqual(2, SettingsSection.Sections.ElementAt(0).Tabs.Count());
-
-    //        //Element 1 Alias "StartupDeveloperDashboardSection"
-    //        Assert.AreEqual(1, SettingsSection.Sections.ElementAt(1).Tabs.Count());
-
-    //        //Element 2 Alias "StartupMediaDashboardSection"
-    //        Assert.AreEqual(2, SettingsSection.Sections.ElementAt(2).Tabs.Count());
-
-    //        //Element 3 Alias "StartupDashboardSection"
-    //        Assert.AreEqual(3, SettingsSection.Sections.ElementAt(3).Tabs.Count());
-
-    //        //Element 4 Alias "StartupMemberDashboardSection"
-    //        Assert.AreEqual(1, SettingsSection.Sections.ElementAt(4).Tabs.Count());
-
-    //    }
-
-    //    [Test]
-    //    public void Test_Tab()
-    //    {
-    //        Assert.AreEqual("Get Started", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Caption);
-    //        Assert.AreEqual(2, SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.Count());
-    //    }
-
-    //    [Test]
-    //    public void Test_Tab_Access()
-    //    {
-    //        Assert.AreEqual(1, SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.Count());
-    //        Assert.AreEqual(AccessRuleType.Grant, SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.ElementAt(0).Type);
-    //        Assert.AreEqual("admin", SettingsSection.Sections.ElementAt(2).Tabs.ElementAt(1).AccessRights.Rules.ElementAt(0).Value);
-    //    }
-
-    //    [Test]
-    //    public void Test_Control()
-    //    {
-    //        Assert.AreEqual("hello", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(0).PanelCaption);
-    //        Assert.AreEqual("views/dashboard/settings/settingsdashboardintro.html",
-    //            SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(0).ControlPath);
-
-    //        Assert.AreEqual("", SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(1).PanelCaption);
-    //        Assert.AreEqual("views/dashboard/settings/settingsdashboardvideos.html",
-    //            SettingsSection.Sections.ElementAt(0).Tabs.ElementAt(0).Controls.ElementAt(1).ControlPath);
-    //    }
-
-    //    [Test]
-    //    public void Test_Control_Access()
-    //    {
-    //        Assert.AreEqual(2, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.Count());
-    //        Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(0).Type);
-    //        Assert.AreEqual("editor", SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(0).Value);
-    //        Assert.AreEqual(AccessRuleType.Deny, SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(1).Type);
-    //        Assert.AreEqual("writer", SettingsSection.Sections.ElementAt(3).Tabs.ElementAt(0).Controls.ElementAt(1).AccessRights.Rules.ElementAt(1).Value);
-    //    }
-    //}
-}
diff --git a/src/Umbraco.Tests/Configurations/DashboardSettings/web.config b/src/Umbraco.Tests/Configurations/DashboardSettings/web.config
deleted file mode 100644
index 8cf262cbff1d..000000000000
--- a/src/Umbraco.Tests/Configurations/DashboardSettings/web.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  
-  <configSections>
-    <sectionGroup name="umbracoConfiguration">
-      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <umbracoConfiguration>
-    <dashBoard configSource="Dashboard.config" />
-  </umbracoConfiguration>
-
-</configuration>
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index d78c41f57ac9..6605bc45466d 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -404,7 +404,7 @@ public void CanParseManifest_Dashboards()
             var manifest = _parser.ParseManifest(json);
             Assert.AreEqual(2, manifest.Dashboards.Length);
 
-            Assert.IsInstanceOf<ManifestDashboardDefinition>(manifest.Dashboards[0]);
+            Assert.IsInstanceOf<ManifestDashboard>(manifest.Dashboards[0]);
             var db0 = manifest.Dashboards[0];
             Assert.AreEqual("something", db0.Alias);
             Assert.AreEqual(100, db0.Weight);
@@ -417,7 +417,7 @@ public void CanParseManifest_Dashboards()
             Assert.AreEqual(AccessRuleType.Deny, db0.AccessRules[1].Type);
             Assert.AreEqual("foo", db0.AccessRules[1].Value);
 
-            Assert.IsInstanceOf<ManifestDashboardDefinition>(manifest.Dashboards[1]);
+            Assert.IsInstanceOf<ManifestDashboard>(manifest.Dashboards[1]);
             var db1 = manifest.Dashboards[1];
             Assert.AreEqual("something.else", db1.Alias);
             Assert.AreEqual(-1, db1.Weight);
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 11f5527a8cf1..cd73b2836b5e 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -292,7 +292,6 @@
     <Compile Include="Cache\HttpRequestAppCacheTests.cs" />
     <Compile Include="Cache\WebCachingAppCacheTests.cs" />
     <Compile Include="Cache\RuntimeAppCacheTests.cs" />
-    <Compile Include="Configurations\DashboardSettings\DashboardSettingsTests.cs" />
     <Compile Include="Configurations\FileSystemProviderTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementTests.cs" />
@@ -499,14 +498,6 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Configurations\DashboardSettings\Dashboard.config">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Configurations\DashboardSettings\web.config">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="Configurations\UmbracoSettings\umbracoSettings.minimal.config">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/src/Umbraco.Web/Dashboards/ContentDashboard.cs b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
index 1ff741b7e466..0cd96f738c88 100644
--- a/src/Umbraco.Web/Dashboards/ContentDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    public class ContentDashboard : IDashboardSection
+    public class ContentDashboard : IDashboard
     {
         public string Alias => "contentIntro";
 
diff --git a/src/Umbraco.Web/Dashboards/DashboardCollection.cs b/src/Umbraco.Web/Dashboards/DashboardCollection.cs
index 8d3bde622ea7..616a2cc8cccb 100644
--- a/src/Umbraco.Web/Dashboards/DashboardCollection.cs
+++ b/src/Umbraco.Web/Dashboards/DashboardCollection.cs
@@ -4,9 +4,9 @@
 
 namespace Umbraco.Web.Dashboards
 {
-    public class DashboardCollection : BuilderCollectionBase<IDashboardSection>
+    public class DashboardCollection : BuilderCollectionBase<IDashboard>
     {
-        public DashboardCollection(IEnumerable<IDashboardSection> items)
+        public DashboardCollection(IEnumerable<IDashboard> items)
             : base(items)
         { }
     }
diff --git a/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs b/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
index 336625c415e5..36a417e95749 100644
--- a/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
+++ b/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
@@ -1,47 +1,45 @@
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 using Umbraco.Core.Manifest;
 
 namespace Umbraco.Web.Dashboards
 {
-    public class DashboardCollectionBuilder : WeightedCollectionBuilderBase<DashboardCollectionBuilder, DashboardCollection, IDashboardSection>
+    public class DashboardCollectionBuilder : WeightedCollectionBuilderBase<DashboardCollectionBuilder, DashboardCollection, IDashboard>
     {
         protected override DashboardCollectionBuilder This => this;
 
-        protected override IEnumerable<IDashboardSection> CreateItems(IFactory factory)
+        protected override IEnumerable<IDashboard> CreateItems(IFactory factory)
         {
             // get the manifest parser just-in-time - injecting it in the ctor would mean that
             // simply getting the builder in order to configure the collection, would require
             // its dependencies too, and that can create cycles or other oddities
             var manifestParser = factory.GetInstance<ManifestParser>();
 
-            var dashboardSections = Merge(base.CreateItems(factory).ToArray(), manifestParser.Manifest.Dashboards);
+            var dashboardSections = Merge(base.CreateItems(factory), manifestParser.Manifest.Dashboards);
 
             return dashboardSections;
         }
 
-        private IEnumerable<IDashboardSection> Merge(IReadOnlyList<IDashboardSection> dashboardsFromCode, IReadOnlyList<ManifestDashboardDefinition> dashboardFromManifest)
+        private IEnumerable<IDashboard> Merge(IEnumerable<IDashboard> dashboardsFromCode, IReadOnlyList<ManifestDashboard> dashboardFromManifest)
         {
-            var list = dashboardsFromCode.Concat(dashboardFromManifest)
-                .Where(x=>!string.IsNullOrEmpty(x.Alias))
-                .Select(x => (Weight: GetWeight(x), DashboardSection: x))
-                .OrderBy(x=>x.Weight);
-
-            return list.Select(x => x.DashboardSection);
+            return dashboardsFromCode.Concat(dashboardFromManifest)
+                .Where(x => !string.IsNullOrEmpty(x.Alias))
+                .OrderBy(GetWeight);
         }
 
-        private static int GetWeight(IDashboardSection dashboardSection)
+        private int GetWeight(IDashboard dashboard)
         {
-            switch (dashboardSection)
+            switch (dashboard)
             {
-                case ManifestDashboardDefinition danifestDashboardDefinition:
-                    return danifestDashboardDefinition.Weight;
+                case ManifestDashboard manifestDashboardDefinition:
+                    return manifestDashboardDefinition.Weight;
+
                 default:
-                    var weightAttribute = dashboardSection.GetType().GetCustomAttributes(typeof(WeightAttribute), false)
-                        .Cast<WeightAttribute>().FirstOrDefault();
-                    return weightAttribute.Weight;
+                    var weightAttribute = dashboard.GetType().GetCustomAttribute<WeightAttribute>(false);
+                    return weightAttribute?.Weight ?? DefaultWeight;
             }
         }
     }
diff --git a/src/Umbraco.Web/Dashboards/ExamineDashboard.cs b/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
index 8363e8079c3c..47cf97ca3b3c 100644
--- a/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ExamineDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(20)]
-    public class ExamineDashboard : IDashboardSection
+    public class ExamineDashboard : IDashboard
     {
         public string Alias => "settingsExamine";
 
diff --git a/src/Umbraco.Web/Dashboards/FormsDashboard.cs b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
index 0121fcd2c1b8..a3e1123369cc 100644
--- a/src/Umbraco.Web/Dashboards/FormsDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    public class FormsDashboard : IDashboardSection
+    public class FormsDashboard : IDashboard
     {
         public string Alias => "formsInstall";
 
diff --git a/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs b/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
index a8347f180661..746dd0443932 100644
--- a/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/HealthCheckDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(50)]
-    public class HealthCheckDashboard : IDashboardSection
+    public class HealthCheckDashboard : IDashboard
     {
         public string Alias => "settingsHealthCheck";
 
diff --git a/src/Umbraco.Web/Dashboards/MediaDashboard.cs b/src/Umbraco.Web/Dashboards/MediaDashboard.cs
index ae8f8343ceaa..c97ae298f3a6 100644
--- a/src/Umbraco.Web/Dashboards/MediaDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/MediaDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    public class MediaDashboard : IDashboardSection
+    public class MediaDashboard : IDashboard
     {
         public string Alias => "mediaFolderBrowser";
 
diff --git a/src/Umbraco.Web/Dashboards/MembersDashboard.cs b/src/Umbraco.Web/Dashboards/MembersDashboard.cs
index 57183ab6a6dd..473722dce13d 100644
--- a/src/Umbraco.Web/Dashboards/MembersDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/MembersDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    public class MembersDashboard : IDashboardSection
+    public class MembersDashboard : IDashboard
     {
         public string Alias => "memberIntro";
 
diff --git a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
index 5e284ee0c2d5..44bc00cb6ff3 100644
--- a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(40)]
-    public class ModelsBuilderDashboard : IDashboardSection
+    public class ModelsBuilderDashboard : IDashboard
     {
         public string Alias => "settingsModelsBuilder";
 
diff --git a/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs b/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
index 17e99bdf5b96..66faa20b5557 100644
--- a/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/PublishedStatusDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(30)]
-    public class PublishedStatusDashboard : IDashboardSection
+    public class PublishedStatusDashboard : IDashboard
     {
         public string Alias => "settingsPublishedStatus";
 
diff --git a/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs b/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
index 76cc03202ded..f538cbc122a3 100644
--- a/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/RedirectUrlDashboard.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(20)]
-    public class RedirectUrlDashboard : IDashboardSection
+    public class RedirectUrlDashboard : IDashboard
     {
         public string Alias => "contentRedirectManager";
 
diff --git a/src/Umbraco.Web/Dashboards/SettingsDashboards.cs b/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
index 1fd32bee1428..5cd92e4c3f98 100644
--- a/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
+++ b/src/Umbraco.Web/Dashboards/SettingsDashboards.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Dashboards
 {
     [Weight(10)]
-    public class SettingsDashboard : IDashboardSection
+    public class SettingsDashboard : IDashboard
     {
         public string Alias => "settingsWelcome";
 
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index b166a8b4bf3e..1b11b1c4f32c 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using System;
+using System.Linq;
 using System.Net;
 using System.Text;
 using Umbraco.Core.Cache;
@@ -26,7 +27,6 @@ namespace Umbraco.Web.Editors
     [AngularJsonOnlyConfiguration]
     [IsBackOffice]
     [WebApi.UmbracoAuthorize]
-    [JsonCamelCaseFormatter]
 
     public class DashboardController : UmbracoApiController
     {
@@ -133,11 +133,24 @@ public async Task<HttpResponseMessage> GetRemoteDashboardCss(string section, str
             };
         }
 
+        // return IDashboardSlim - we don't need sections nor access rules
         [ValidateAngularAntiForgeryToken]
         [OutgoingEditorModelEvent]
-        public IEnumerable<Tab<IDashboardSection>> GetDashboard(string section)
+        public IEnumerable<Tab<IDashboardSlim>> GetDashboard(string section)
         {
-            return _dashboardService.GetDashboards(section, Security.CurrentUser);
+            return _dashboardService.GetDashboards(section, Security.CurrentUser).Select(x => new Tab<IDashboardSlim>
+            {
+                Id = x.Id,
+                Alias = x.Alias,
+                Label = x.Label,
+                Expanded = x.Expanded,
+                IsActive = x.IsActive,
+                Properties = x.Properties.Select(y => new DashboardSlim
+                {
+                    Alias = y.Alias,
+                    View = y.View
+                })
+            });
         }
     }
 }
diff --git a/src/Umbraco.Web/Editors/EditorModelEventManager.cs b/src/Umbraco.Web/Editors/EditorModelEventManager.cs
index dd5282d7243d..c3a7d128ece5 100644
--- a/src/Umbraco.Web/Editors/EditorModelEventManager.cs
+++ b/src/Umbraco.Web/Editors/EditorModelEventManager.cs
@@ -15,9 +15,9 @@ public sealed class EditorModelEventManager
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<MediaItemDisplay>> SendingMediaModel;
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<MemberDisplay>> SendingMemberModel;
         public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<UserDisplay>> SendingUserModel;
-        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboardSection>>>> SendingDashboardModel;
+        public static event TypedEventHandler<HttpActionExecutedContext, EditorModelEventArgs<IEnumerable<Tab<IDashboard>>>> SendingDashboardModel;
 
-        private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs<IEnumerable<Tab<IDashboardSection>>> e)
+        private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs<IEnumerable<Tab<IDashboard>>> e)
         {
             var handler = SendingDashboardModel;
             handler?.Invoke(sender, e);
@@ -66,8 +66,8 @@ internal static void EmitEvent(HttpActionExecutedContext sender, EditorModelEven
             if (e.Model is UserDisplay)
                 OnSendingUserModel(sender, new EditorModelEventArgs<UserDisplay>(e));
 
-            if (e.Model is IEnumerable<IDashboardSection>)
-                OnSendingDashboardModel(sender, new EditorModelEventArgs<IEnumerable<Tab<IDashboardSection>>>(e));
+            if (e.Model is IEnumerable<IDashboard>)
+                OnSendingDashboardModel(sender, new EditorModelEventArgs<IEnumerable<Tab<IDashboard>>>(e));
         }
     }
 }
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index c1ae3f15fb8d..b8a7fee2f725 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -103,7 +103,7 @@ public override void Compose(Composition composition)
 
             // configure the container for web
             composition.ConfigureForWeb();
-            
+
             composition
                 .ComposeUmbracoControllers(GetType().Assembly)
                 .SetDefaultRenderMvcController<RenderMvcController>(); // default controller for template views
@@ -203,10 +203,9 @@ public override void Compose(Composition composition)
                 .Append<MembersBackOfficeSection>()
                 .Append<TranslationBackOfficeSection>();
 
-
             // register core CMS dashboards and 3rd party types - will be ordered by weight attribute & merged with package.manifest dashboards
             composition.WithCollectionBuilder<DashboardCollectionBuilder>()
-                .Add(composition.TypeLoader.GetTypes<IDashboardSection>());                
+                .Add(composition.TypeLoader.GetTypes<IDashboard>());
 
             // register back office trees
             foreach (var treeControllerType in umbracoApiControllerTypes
diff --git a/src/Umbraco.Web/Services/DashboardService.cs b/src/Umbraco.Web/Services/DashboardService.cs
index 373c70e6d25f..71969df47502 100644
--- a/src/Umbraco.Web/Services/DashboardService.cs
+++ b/src/Umbraco.Web/Services/DashboardService.cs
@@ -32,9 +32,9 @@ public DashboardService(ISectionService sectionService, DashboardCollection dash
 
 
         /// <inheritdoc />
-        public IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser currentUser)
+        public IEnumerable<Tab<IDashboard>> GetDashboards(string section, IUser currentUser)
         {
-            var tabs = new List<Tab<IDashboardSection>>();
+            var tabs = new List<Tab<IDashboard>>();
             var tabId = 0;
 
             foreach (var dashboard in _dashboardCollection.Where(x => x.Sections.InvariantContains(section)))
@@ -46,8 +46,8 @@ public IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser c
                 if (dashboard.View.InvariantEndsWith(".ascx"))
                     throw new NotSupportedException("Legacy UserControl (.ascx) dashboards are no longer supported.");
 
-                var dashboards = new List<IDashboardSection> {dashboard};
-                tabs.Add(new Tab<IDashboardSection>
+                var dashboards = new List<IDashboard> {dashboard};
+                tabs.Add(new Tab<IDashboard>
                 {
                     Id = tabId++,
                     Label = _localizedText.Localize("dashboardTabs", dashboard.Alias),
@@ -60,7 +60,7 @@ public IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser c
         }
 
         /// <inheritdoc />
-        public IDictionary<string, IEnumerable<Tab<IDashboardSection>>> GetDashboards(IUser currentUser)
+        public IDictionary<string, IEnumerable<Tab<IDashboard>>> GetDashboards(IUser currentUser)
         {
             return _sectionService.GetSections().ToDictionary(x => x.Alias, x => GetDashboards(x.Alias, currentUser));
         }
diff --git a/src/Umbraco.Web/Services/IDashboardService.cs b/src/Umbraco.Web/Services/IDashboardService.cs
index a86715c83d43..11ff2728cfa0 100644
--- a/src/Umbraco.Web/Services/IDashboardService.cs
+++ b/src/Umbraco.Web/Services/IDashboardService.cs
@@ -14,14 +14,14 @@ public interface IDashboardService
         /// <param name="section"></param>
         /// <param name="currentUser"></param>
         /// <returns></returns>
-        IEnumerable<Tab<IDashboardSection>> GetDashboards(string section, IUser currentUser);
+        IEnumerable<Tab<IDashboard>> GetDashboards(string section, IUser currentUser);
 
         /// <summary>
         /// Gets all dashboards, organized by section, for a user.
         /// </summary>
         /// <param name="currentUser"></param>
         /// <returns></returns>
-        IDictionary<string, IEnumerable<Tab<IDashboardSection>>> GetDashboards(IUser currentUser);
+        IDictionary<string, IEnumerable<Tab<IDashboard>>> GetDashboards(IUser currentUser);
 
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c3ff7d47da19..f81eff75ad8e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -262,7 +262,6 @@
     <Compile Include="UI\JavaScript\ClientDependencyConfiguration.cs" />
     <Compile Include="Editors\Binders\BlueprintItemBinder.cs" />
     <Compile Include="UmbracoApplicationBase.cs" />
-    <Compile Include="WebApi\CamelCaseAndDataMemberWhenSerializingContractResolver.cs" />
     <Compile Include="WebApi\HttpActionContextExtensions.cs" />
     <Compile Include="Models\ContentEditing\IContentSave.cs" />
     <Compile Include="WebApi\SerializeVersionAttribute.cs" />
diff --git a/src/Umbraco.Web/WebApi/CamelCaseAndDataMemberWhenSerializingContractResolver.cs b/src/Umbraco.Web/WebApi/CamelCaseAndDataMemberWhenSerializingContractResolver.cs
deleted file mode 100644
index 49ab02a12e28..000000000000
--- a/src/Umbraco.Web/WebApi/CamelCaseAndDataMemberWhenSerializingContractResolver.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using Newtonsoft.Json.Serialization;
-using Umbraco.Core.Manifest;
-
-namespace Umbraco.Web.WebApi
-{
-
-    public class CamelCaseAndDataMemberWhenSerializingContractResolver : CamelCasePropertyNamesContractResolver
-    {
-        /// <inheritdoc/>
-        protected override List<MemberInfo> GetSerializableMembers(Type objectType)
-        {
-            return base.GetSerializableMembers(objectType)
-                .Where(HasNotTheIgnoreDataMemberWhenSerializingAttribute)
-                .ToList();
-        }
-
-        private bool HasNotTheIgnoreDataMemberWhenSerializingAttribute(MemberInfo member)
-        {
-            if (member.GetCustomAttributes(typeof(IgnoreDataMemberWhenSerializingAttribute), true).Any())
-            {
-                return false;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs b/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
index 5803afc81986..912edc139735 100644
--- a/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
+++ b/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
@@ -2,9 +2,7 @@
 using System.Linq;
 using System.Net.Http.Formatting;
 using System.Web.Http.Controllers;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using Umbraco.Core.Manifest;
 
 namespace Umbraco.Web.WebApi
 {
@@ -26,7 +24,7 @@ public void Initialize(HttpControllerSettings controllerSettings, HttpController
             {
                 SerializerSettings =
                 {
-                    ContractResolver = new CamelCaseAndDataMemberWhenSerializingContractResolver() 
+                    ContractResolver = new CamelCasePropertyNamesContractResolver() 
                 }
             };
             controllerSettings.Formatters.Add(jsonFormatter);

From fac25b59712c254412c6be035795acc3752c7e35 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Jan 2019 13:04:37 +0100
Subject: [PATCH 098/421] Bugfix

---
 src/Umbraco.Web/Editors/BackOfficeServerVariables.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 07df3a03fa89..aa85a020bb59 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -397,6 +397,7 @@ internal Dictionary<string, object> GetServerVariables()
             return defaultVals;
         }
 
+        [DataContract]
         private class PluginTree
         {
             [DataMember(Name = "alias")]

From 9a0f50291c87bf1a2ac1ac5d860d2e1d5b93742b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 28 Jan 2019 13:15:40 +0100
Subject: [PATCH 099/421] color adjustments for proposal

---
 .../src/less/buttons.less                     | 22 +++++++-----
 .../application/umb-app-header.less           |  5 ++-
 .../components/application/umb-dashboard.less |  4 +--
 .../application/umb-language-picker.less      | 15 +++++---
 .../src/less/components/editor.less           | 11 +++++-
 .../src/less/components/umb-avatar.less       | 10 +++---
 .../components/umb-editor-navigation.less     | 35 ++++++++++++-------
 .../src/less/components/umb-tabs.less         | 34 ++++++++++++++----
 .../src/less/mixins.less                      | 21 +++++------
 .../src/less/sections.less                    |  2 +-
 .../src/less/variables.less                   | 21 ++++++++---
 .../editor/umb-editor-content-header.html     |  8 ++---
 .../components/editor/umb-editor-header.html  |  8 ++---
 .../components/editor/umb-editor-menu.html    |  2 +-
 14 files changed, 131 insertions(+), 67 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index c99b759b5945..f1e132dce3fa 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -176,7 +176,7 @@ input[type="button"] {
 // Set the backgrounds
 // -------------------------
 .btn-primary {
-  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
+  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackground);
 }
 
 // Warning appears are orange
@@ -199,6 +199,10 @@ input[type="button"] {
 .btn-action {
   .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight, @btnInfoType);
 }
+// Made for Umbraco, 2019, used for buttons that has to stand back.
+.btn-transparent {
+  .buttonBackground(@btnWhiteBackground, @btnWhiteBackgroundHighlight, @btnWhiteType);
+}
 // Inverse appears as dark gray
 .btn-inverse {
   .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight);
@@ -230,25 +234,27 @@ input[type="button"] {
     background: @green;
     color: @white;
     font-weight: bold;
-      &:hover {
+    &:hover {
         background: @green-d1;
-		}
+    }
 }
 
 // outlined
 .btn-outline {
-  border: 1px solid @gray-8;
+  border: 1px solid;
+  border-color: @gray-8;
   background: @white;
-  color: @black;
+  color: @ui-light-type;
   padding: 5px 13px;
+  transition: all .2s linear;
 }
 
 .btn-outline:hover,
 .btn-outline:focus,
 .btn-outline:active {
-  border-color: @gray-7;
-  background: transparent;
-  color: @black;
+  border-color: @ui-light-type-hover;
+  color: @ui-light-type-hover;
+  background: @white;
 }
 
 // Cross-browser Jank
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
index 1e3aa332faf1..86ead685b81f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
@@ -1,5 +1,5 @@
 .umb-app-header {
-    background: @blueNight;
+    background: @blueExtraDark;
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -31,7 +31,7 @@
 }
 
 .umb-app-header__action-icon {
-    opacity: 0.6;
+    opacity: 0.8;
     color: @white;
     font-size: 22px;
 }
@@ -40,4 +40,3 @@
 .umb-app-header__action a:focus .umb-app-header__action-icon {
     opacity: 1;
 }
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
index 2a1d5eb6d358..fc6baead4eb8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
@@ -31,5 +31,5 @@
 }
 
 .umb-dashboard__header .umb-tabs-nav .umb-tab > a {
-    padding-bottom: 23px;
-}
\ No newline at end of file
+    padding-bottom: 21px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
index cf252020ee4f..b2fb1fa6d69f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
@@ -16,14 +16,16 @@
     border-bottom: 1px solid @gray-9;
     height: @editorHeaderHeight;
     box-sizing: border-box;
+    color: @ui-light-active-type;
 }
 
 .umb-language-picker__toggle:hover {
-    background: @gray-10;
+    //background: @gray-10;
+    color:@ui-light-active-type-hover;
 }
 
 .umb-language-picker__expand {
-    color: @gray-6;
+    //color: @gray-6;
     font-size: 14px;
 }
 
@@ -48,9 +50,12 @@
 .umb-language-picker__dropdown a:focus {
     background: @gray-10;
     text-decoration: none;
+    color:@ui-light-active-type-hover;
 }
 
-.umb-language-picker__dropdown-item--current {
-    background-color: @gray-10;
-    border-left: 2px solid @ui-active;
+.umb-language-picker__dropdown a.umb-language-picker__dropdown-item--current {
+    //background-color: @gray-10;
+    padding-left: 16px;
+    border-left: 4px solid @ui-light-active-border;
+    color:@ui-light-active-type;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index c917b7e031d3..d091c1a44208 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -65,7 +65,7 @@
 .umb-editor-header {
 	background: @white;
 	position: absolute;
-	padding: 0 20px;
+	padding-left: 20px;
 	z-index: @zIndexEditor;
 	border-bottom: 1px solid @gray-9;
 	width: 100%;
@@ -124,6 +124,15 @@ a.umb-editor-header__close-split-view:hover {
 	color: @black;
 }
 
+.umb-editor-header {
+	.btn-transparent {
+        height:69px;
+        border-radius: 0;
+        padding-left: 30px;
+        padding-right: 30px;
+    }
+}
+
 /* variant switcher */
 .umb-variant-switcher__toggle {
 	display: flex;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-avatar.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-avatar.less
index de746090b92d..21f4a7bda851 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-avatar.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-avatar.less
@@ -70,13 +70,13 @@
 }
 
 .umb-avatar--primary {
-    background-color: @turquoise-l1;
-    color: @white;
+    background-color: @pinkLight;
+    color: @blueExtraDark;
 }
 
 .umb-avatar--secondary {
-    background-color: @purple-l3;
-    color: @white;
+    background-color: @pinkLight;
+    color: @blueExtraDark;
 }
 
 .umb-avatar--success {
@@ -114,4 +114,4 @@ a.umb-avatar-btn .umb-avatar span {
     font-size: 50px;
 }
 
-/*border-radius: 50%; width: 100px; height: 100px; font-size: 50px; text-align: center; display: flex; align-items: center; justify-content: center; background-color: #F3F3F5; border: 2px dashed #A2A1A6; color: #A2A1A6;*/
\ No newline at end of file
+/*border-radius: 50%; width: 100px; height: 100px; font-size: 50px; text-align: center; display: flex; align-items: center; justify-content: center; background-color: #F3F3F5; border: 2px dashed #A2A1A6; color: #A2A1A6;*/
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
index 3875df1ce0cf..d432310dab2a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
@@ -10,7 +10,7 @@
   cursor: pointer;
   display: block;
   padding: 4px 10px 0 10px;
-  border-bottom: 2px solid transparent;
+  //border-bottom: 4px solid transparent;
   min-width: 70px;
   border-right: 1px solid @gray-9;
   box-sizing: border-box;
@@ -20,6 +20,23 @@
   justify-content: center;
   height: @editorHeaderHeight;
   position: relative;
+  
+  &:hover {
+      color: @ui-light-active-type-hover !important;
+  }
+  
+  &::after {
+      content: "";
+      height: 0px;
+      left: 8px;
+      right: 8px;
+      background-color: @ui-light-active-border;
+      position: absolute;
+      bottom: 0;
+      border-radius: 3px 3px 0 0;
+      opacity: 0;
+      transition: all .2s linear;
+  }
 }
 
 .umb-sub-views-nav-item:focus {
@@ -36,20 +53,12 @@
     //border-bottom-color: @ui-active;
     
     //background-color: rgba(@ui-active, 0.25);
-    color: @ui-active-type;
-    border-bottom-color: @ui-active;
-    /*
+    color: @ui-light-active-type;
+    //border-bottom-color: @ui-active;
     &::after {
-        content: "";
+        opacity: 1;
         height: 4px;
-        background-color: @ui-active;
-        position: absolute;
-        bottom: -1px;
-        border-radius: 3px 3px 0 0;
-        left: 8px;
-        right: 8px;
     }
-    */
 }
 
 .show-validation .umb-sub-views-nav-item.-has-error {
@@ -69,7 +78,7 @@
   right: 6px;
   min-width: 16px;
   color: @white;
-  background-color: @turquoise-d1;
+  background-color: @ui-active-type;
   border: 2px solid @white;
   border-radius: 50%;
   font-size: 10px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
index f0f294ae4a92..2a5b98df3048 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
@@ -14,24 +14,42 @@
 }
 
 .umb-tab > a {
+    
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+    
     cursor: pointer;
-    border-bottom: 2px solid transparent;
-    color: @ui-action-disgrete;
+    //border-bottom: 4px solid transparent;
+    color: @ui-light-type;
     padding: 5px 20px 15px 20px;
     transition: color 150ms ease-in-out;
     &:focus {
-        color: @ui-action-disgrete-hover;
+        color: @ui-light-type-hover;
     }
     &:hover {
-        color: @ui-action-disgrete-hover;
+        color: @ui-light-type-hover;
         text-decoration: none;
     }
+    &::after {
+        content: "";
+        height: 0px;
+        left: 14px;
+        right: 14px;
+        background-color: @ui-light-active-border;
+        position: absolute;
+        bottom: 0;
+        border-radius: 3px 3px 0 0;
+        opacity: 0;
+        transition: all .2s linear;
+    }
 }
 
 
 .umb-tab--active > a {
-    color: @ui-active;
-    border-bottom-color: @ui-active;
+    color: @ui-light-active-type;
+    //border-bottom-color: @ui-active;
     /*
     &:focus {
         border-bottom-color: @ui-active;
@@ -40,6 +58,10 @@
         border-bottom-color: @ui-active-hover;
     }
     */
+    &::after {
+        opacity: 1;
+        height: 4px;
+    }
 }
 
 .show-validation .umb-tab--error > a,
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index ffeaae680baa..02654459a1e7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -515,7 +515,7 @@
 
 // Button backgrounds
 // ------------------
-.buttonBackground(@startColor, @endColor, @textColor: #fff) {
+.buttonBackground(@startColor, @hoverColor: @startColor, @textColor: #fff) {
   // gradientBar will set the background to a pleasing blend of these, to support IE<=9
   //.gradientBar(@startColor, @endColor, @textColor);
   
@@ -523,7 +523,7 @@
   border-color: @startColor @startColor darken(@startColor, 15%);
   border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
   
-  background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+  background-color: @startColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
   .reset-filter();
   
   .caret {
@@ -531,22 +531,23 @@
       border-bottom-color: @textColor;
   }
 
-  // button states
-  &:hover, &:focus, &:active {
-      background-color: darken(@startColor, 2%);
-  }
-
   // in these cases the gradient won't cover the background, so we override
-  &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
+  &:hover, &:focus, &:active, &.active {
     color: @textColor;
-    background-color: darken(@endColor, 5%);
+    background-color: @hoverColor;
   }
-
+  
+  &.disabled, &[disabled] {
+    color: @textColor;
+    background-color: @gray-4;
+  }
+  /*
   // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
   &:active,
   &.active {
     background-color: darken(@endColor, 10%) e("\9");
   }
+  */
 }
 
 // Navbar vertical align
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index 70fb3d353b2e..c0a95c97c567 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -28,7 +28,7 @@ ul.sections>li>a {
 }
 
 ul.sections>li>a .section__name {
-	opacity: 0.6;
+	opacity: 0.8;
 	transition: opacity .1s linear;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index a8fdc57a687d..a83691204111 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -57,7 +57,7 @@
 @yellow-washed:		    #FFFAEB;
 
 @green-d1:              #1FB572;
-@green:                 #36B37E;// updated 2019
+@green:                 #2bc37c;// updated 2019
 @green-l1:			    #4ECF95;
 @green-l2:			    #79E1B2;
 @green-l3:			    #A6F0CF;
@@ -130,6 +130,15 @@
 @ui-active:             @pinkLight;
 @ui-active-type:        @blueExtraDark;
 @ui-active-hover:       @blueMid;
+
+@ui-light-border:           @pinkLight;
+@ui-light-type:             @gray-4;
+@ui-light-type-hover:       @blueMid;
+
+@ui-light-active-border:      @pinkLight;
+@ui-light-active-type:        @blueExtraDark;
+@ui-light-active-type-hover:  @blueMid;
+
 @ui-selected:           @blueMid;//not used jet.
 @ui-selected-hover:     @blueMid;//not used jet.
 
@@ -142,9 +151,9 @@
 @type-white:                      @u-white;
 @type-black:                      @blueNight;
 
-@ui-btn:                        @brownLight;
-@ui-btn-hover:                  @ui-btn;
-@ui-btn-type:                   @blueExtraDark;
+@ui-btn:                        @blueExtraDark;
+@ui-btn-hover:                  @blueMid;
+@ui-btn-type:                   @white;
 
 @ui-btn-positive:               @green;
 @ui-btn-positive-hover:         @green;
@@ -307,6 +316,10 @@
 @btnInfoBackground:                 @ui-btn;// updated 2019
 @btnInfoBackgroundHighlight:        @ui-btn-hover;// updated 2019
 
+@btnWhiteType:                      @black;// updated 2019
+@btnWhiteBackground:                @white;// updated 2019
+@btnWhiteBackgroundHighlight:       @white;// updated 2019
+
 @btnSuccessType:                    @ui-btn-positive-type;// updated 2019
 @btnSuccessBackground:              @ui-btn-positive;// updated 2019
 @btnSuccessBackgroundHighlight:     @ui-btn-positive-hover;// updated 2019
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index dad9dc5ba938..edf04d5297c4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -13,7 +13,7 @@
             <div id="nameField" style="flex: 1 1 auto;">
                 <div class="umb-editor-header__name-wrapper">
                     <ng-form name="headerNameForm">
-                        <input 
+                        <input
                             data-element="editor-name-field"
                             type="text"
                             class="umb-editor-header__name-input"
@@ -61,15 +61,15 @@
         </div>
 
         <div ng-if="navigation && splitViewOpen !== true" style="margin-left: 20px;">
-            <umb-editor-navigation 
+            <umb-editor-navigation
                 data-element="editor-sub-views"
                 navigation="navigation"
                 on-select="selectNavigationItem(item)">
             </umb-editor-navigation>
         </div>
 
-        <div ng-if="menu.currentNode && splitViewOpen !== true && hideMenu !== true" style="margin-left: 20px;">
-            <umb-editor-menu 
+        <div ng-if="menu.currentNode && splitViewOpen !== true && hideMenu !== true">
+            <umb-editor-menu
                 data-element="editor-actions"
                 current-node="menu.currentNode"
                 current-section="{{menu.currentSection}}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index 25925f42edda..1023953ce002 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -23,7 +23,7 @@
             <div id="nameField" style="flex: 1 1 auto;">
                 <div class="umb-editor-header__name-wrapper">
                     <ng-form name="headerNameForm">
-                        <input data-element="editor-name-field" 
+                        <input data-element="editor-name-field"
                                no-password-manager
                                title="{{key}}"
                                type="text"
@@ -70,15 +70,15 @@
         </div>
 
         <div ng-if="navigation && splitViewOpen !== true" style="margin-left: 20px;">
-            <umb-editor-navigation 
+            <umb-editor-navigation
                 data-element="editor-sub-views"
                 navigation="navigation"
                 on-select="selectNavigationItem(item)">
             </umb-editor-navigation>
         </div>
 
-        <div ng-if="menu.currentNode && splitViewOpen !== true && hideMenu !== true" style="margin-left: 20px;">
-            <umb-editor-menu 
+        <div ng-if="menu.currentNode && splitViewOpen !== true && hideMenu !== true">
+            <umb-editor-menu
                 data-element="editor-actions"
                 current-node="menu.currentNode"
                 current-section="{{menu.currentSection}}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
index 54a33a705f1b..65935c379514 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
@@ -2,7 +2,7 @@
 
     <umb-button
         type="button"
-        button-style="info"
+        button-style="transparent"
         action="dropdown.isOpen = !dropdown.isOpen"
         label-key="general_actions"
         show-caret="true">

From f619b03b04b4c0b1c7358b1e3eea422429ffaacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 28 Jan 2019 13:17:38 +0100
Subject: [PATCH 100/421] Correct spelling

---
 .../src/common/directives/components/content/edit.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 9e8a66ce5aaf..fc7fff7e3c0d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -442,7 +442,7 @@
                     variants: $scope.content.variants, //set a model property for the dialog
                     skipFormValidation: true, //when submitting the overlay form, skip any client side validation
                     submitButtonLabelKey: "content_unpublish",
-                    submitButtonSTYLE: "warning",
+                    submitButtonStyle: "warning",
                     submit: function (model) {
 
                         model.submitButtonState = "busy";

From 27fd90851752d65c43e0c5a0a2683d492d51fd9a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Jan 2019 14:04:31 +0100
Subject: [PATCH 101/421] Refactor IPublished

---
 .../PublishedContent/NuCacheTests.cs          | 133 +++++++++++++-----
 .../NuCache/DataSource/CultureVariation.cs    |   3 -
 .../NuCache/PublishedContent.cs               |  28 ++--
 .../NuCache/PublishedSnapshotService.cs       |  21 +--
 4 files changed, 120 insertions(+), 65 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index ef37a822c1ac..cd5273cce74d 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -20,6 +20,7 @@
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
+using Umbraco.Web.PublishedCache;
 using Umbraco.Web.PublishedCache.NuCache;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
 using Umbraco.Web.Routing;
@@ -29,12 +30,13 @@ namespace Umbraco.Tests.PublishedContent
     [TestFixture]
     public class NuCacheTests
     {
-        [Test]
-        public void StandaloneVariations()
-        {
-            // this test implements a full standalone NuCache (based upon a test IDataSource, does not
-            // use any local db files, does not rely on any database) - and tests variations
+        private IPublishedSnapshotService _snapshotService;
+        private IVariationContextAccessor _variationAccesor;
+        private ContentType _contentType;
+        private PropertyType _propertyType;
 
+        private void Init()
+        {
             Current.Reset();
             Current.UnlockConfigs();
             Current.Configs.Add(SettingsForTests.GenerateMockUmbracoSettings);
@@ -46,20 +48,39 @@ public void StandaloneVariations()
             {
                 ContentTypeId = 2,
                 Node = new ContentNode(1, Guid.NewGuid(), 0, "-1,1", 0, -1, DateTime.Now, 0),
-                DraftData = new ContentData { Name="It Works2!", Published = false, TemplateId = 0, VersionId = 2, VersionDate = DateTime.Now, WriterId = 0,
+                DraftData = new ContentData
+                {
+                    Name = "It Works2!",
+                    Published = false,
+                    TemplateId = 0,
+                    VersionId = 2,
+                    VersionDate = DateTime.Now,
+                    WriterId = 0,
                     Properties = new Dictionary<string, PropertyData[]> { { "prop", new[]
                     {
                         new PropertyData { Culture = "", Segment = "", Value = "val2" },
                         new PropertyData { Culture = "fr-FR", Segment = "", Value = "val-fr2" },
-                        new PropertyData { Culture = "en-UK", Segment = "", Value = "val-uk2" }
+                        new PropertyData { Culture = "en-UK", Segment = "", Value = "val-uk2" },
+                        new PropertyData { Culture = "dk-DA", Segment = "", Value = "val-da2" },
+                        new PropertyData { Culture = "de-DE", Segment = "", Value = "val-de2" }
                     } } },
                     CultureInfos = new Dictionary<string, CultureVariation>
                     {
-                        { "fr-FR", new CultureVariation { Name = "name-fr2", Date = new DateTime(2018, 01, 03, 01, 00, 00) } },
-                        { "en-UK", new CultureVariation { Name = "name-uk2", Date = new DateTime(2018, 01, 04, 01, 00, 00) } }
+                        // draft data = everything, and IsDraft indicates what's edited
+                        { "fr-FR", new CultureVariation { Name = "name-fr2", IsDraft = true, Date = new DateTime(2018, 01, 03, 01, 00, 00) } },
+                        { "en-UK", new CultureVariation { Name = "name-uk2", IsDraft = true, Date = new DateTime(2018, 01, 04, 01, 00, 00) } },
+                        { "dk-DA", new CultureVariation { Name = "name-da2", IsDraft = true, Date = new DateTime(2018, 01, 05, 01, 00, 00) } },
+                        { "de-DE", new CultureVariation { Name = "name-de1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) } }
                     }
                 },
-                PublishedData = new ContentData { Name="It Works1!", Published = true, TemplateId = 0, VersionId = 1, VersionDate = DateTime.Now, WriterId = 0,
+                PublishedData = new ContentData
+                {
+                    Name = "It Works1!",
+                    Published = true,
+                    TemplateId = 0,
+                    VersionId = 1,
+                    VersionDate = DateTime.Now,
+                    WriterId = 0,
                     Properties = new Dictionary<string, PropertyData[]> { { "prop", new[]
                     {
                         new PropertyData { Culture = "", Segment = "", Value = "val1" },
@@ -68,8 +89,10 @@ public void StandaloneVariations()
                     } } },
                     CultureInfos = new Dictionary<string, CultureVariation>
                     {
-                        { "fr-FR", new CultureVariation { Name = "name-fr1", Date = new DateTime(2018, 01, 01, 01, 00, 00) } },
-                        { "en-UK", new CultureVariation { Name = "name-uk1", Date = new DateTime(2018, 01, 02, 01, 00, 00) } }
+                        // published data = only what's actually published, and IsDraft has to be false
+                        { "fr-FR", new CultureVariation { Name = "name-fr1", IsDraft = false, Date = new DateTime(2018, 01, 01, 01, 00, 00) } },
+                        { "en-UK", new CultureVariation { Name = "name-uk1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) } },
+                        { "de-DE", new CultureVariation { Name = "name-de1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) } }
                     }
                 }
             };
@@ -88,13 +111,13 @@ public void StandaloneVariations()
                 dataType
             };
 
-            var propertyType = new PropertyType("Umbraco.Void.Editor", ValueStorageType.Nvarchar) { Alias = "prop", DataTypeId = 3, Variations = ContentVariation.Culture };
-            var contentType = new ContentType(-1) { Id = 2, Alias = "alias-ct", Variations = ContentVariation.Culture };
-            contentType.AddPropertyType(propertyType);
+            _propertyType = new PropertyType("Umbraco.Void.Editor", ValueStorageType.Nvarchar) { Alias = "prop", DataTypeId = 3, Variations = ContentVariation.Culture };
+            _contentType = new ContentType(-1) { Id = 2, Alias = "alias-ct", Variations = ContentVariation.Culture };
+            _contentType.AddPropertyType(_propertyType);
 
             var contentTypes = new[]
             {
-                contentType
+                _contentType
             };
 
             var contentTypeService = Mock.Of<IContentTypeService>();
@@ -106,10 +129,10 @@ public void StandaloneVariations()
 
             // create a service context
             var serviceContext = ServiceContext.CreatePartial(
-                dataTypeService : dataTypeService,
+                dataTypeService: dataTypeService,
                 memberTypeService: Mock.Of<IMemberTypeService>(),
                 memberService: Mock.Of<IMemberService>(),
-                contentTypeService : contentTypeService,
+                contentTypeService: contentTypeService,
                 localizationService: Mock.Of<ILocalizationService>()
             );
 
@@ -132,18 +155,18 @@ public void StandaloneVariations()
                 dataTypeService);
 
             // create a variation accessor
-            var variationAccessor = new TestVariationContextAccessor();
+            _variationAccesor = new TestVariationContextAccessor();
 
             // at last, create the complete NuCache snapshot service!
             var options = new PublishedSnapshotService.Options { IgnoreLocalDb = true };
-            var snapshotService = new PublishedSnapshotService(options,
+            _snapshotService = new PublishedSnapshotService(options,
                 null,
                 runtime,
                 serviceContext,
                 contentTypeFactory,
                 null,
                 new TestPublishedSnapshotAccessor(),
-                variationAccessor,
+                _variationAccesor,
                 Mock.Of<ILogger>(),
                 scopeProvider,
                 Mock.Of<IDocumentRepository>(),
@@ -155,13 +178,22 @@ public void StandaloneVariations()
                 new SiteDomainHelper(),
                 Mock.Of<IEntityXmlSerializer>());
 
+            // invariant is the current default
+            _variationAccesor.VariationContext = new VariationContext();
+        }
+
+        [Test]
+        public void StandaloneVariations()
+        {
+            // this test implements a full standalone NuCache (based upon a test IDataSource, does not
+            // use any local db files, does not rely on any database) - and tests variations
+
+            Init();
+
             // get a snapshot, get a published content
-            var snapshot = snapshotService.CreatePublishedSnapshot(previewToken: null);
+            var snapshot = _snapshotService.CreatePublishedSnapshot(previewToken: null);
             var publishedContent = snapshot.Content.GetById(1);
 
-            // invariant is the current default
-            variationAccessor.VariationContext = new VariationContext();
-
             Assert.IsNotNull(publishedContent);
             Assert.AreEqual("It Works1!", publishedContent.Name);
             Assert.AreEqual("val1", publishedContent.Value<string>("prop"));
@@ -181,31 +213,31 @@ public void StandaloneVariations()
             Assert.AreEqual("name-uk2", draftContent.GetCulture("en-UK").Name);
 
             // now french is default
-            variationAccessor.VariationContext = new VariationContext("fr-FR");
+            _variationAccesor.VariationContext = new VariationContext("fr-FR");
             Assert.AreEqual("val-fr1", publishedContent.Value<string>("prop"));
             Assert.AreEqual("name-fr1", publishedContent.GetCulture().Name);
             Assert.AreEqual("name-fr1", publishedContent.Name);
             Assert.AreEqual(new DateTime(2018, 01, 01, 01, 00, 00), publishedContent.GetCulture().Date);
 
             // now uk is default
-            variationAccessor.VariationContext = new VariationContext("en-UK");
+            _variationAccesor.VariationContext = new VariationContext("en-UK");
             Assert.AreEqual("val-uk1", publishedContent.Value<string>("prop"));
             Assert.AreEqual("name-uk1", publishedContent.GetCulture().Name);
             Assert.AreEqual("name-uk1", publishedContent.Name);
             Assert.AreEqual(new DateTime(2018, 01, 02, 01, 00, 00), publishedContent.GetCulture().Date);
 
-            // invariant needs to be retrieved explicitely, when it's not default
+            // invariant needs to be retrieved explicitly, when it's not default
             Assert.AreEqual("val1", publishedContent.Value<string>("prop", culture: ""));
 
             // but,
             // if the content type / property type does not vary, then it's all invariant again
             // modify the content type and property type, notify the snapshot service
-            contentType.Variations = ContentVariation.Nothing;
-            propertyType.Variations = ContentVariation.Nothing;
-            snapshotService.Notify(new[] { new ContentTypeCacheRefresher.JsonPayload("IContentType", publishedContent.ContentType.Id, ContentTypeChangeTypes.RefreshMain) });
+            _contentType.Variations = ContentVariation.Nothing;
+            _propertyType.Variations = ContentVariation.Nothing;
+            _snapshotService.Notify(new[] { new ContentTypeCacheRefresher.JsonPayload("IContentType", publishedContent.ContentType.Id, ContentTypeChangeTypes.RefreshMain) });
 
             // get a new snapshot (nothing changed in the old one), get the published content again
-            var anotherSnapshot = snapshotService.CreatePublishedSnapshot(previewToken: null);
+            var anotherSnapshot = _snapshotService.CreatePublishedSnapshot(previewToken: null);
             var againContent = anotherSnapshot.Content.GetById(1);
 
             Assert.AreEqual(ContentVariation.Nothing, againContent.ContentType.Variations);
@@ -215,5 +247,42 @@ public void StandaloneVariations()
             Assert.AreEqual("It Works1!", againContent.Name);
             Assert.AreEqual("val1", againContent.Value<string>("prop"));
         }
+
+        [Test]
+        public void IsDraftIsPublished()
+        {
+            Init();
+
+            // get the published published content
+            var s = _snapshotService.CreatePublishedSnapshot(null);
+            var c1 = s.Content.GetById(1);
+
+            // published content = nothing is draft here
+            Assert.IsFalse(c1.IsDraft("fr-FR"));
+            Assert.IsFalse(c1.IsDraft("en-UK"));
+            Assert.IsFalse(c1.IsDraft("dk-DA"));
+            Assert.IsFalse(c1.IsDraft("de-DE"));
+
+            // and only those with published name, are published
+            Assert.IsTrue(c1.IsPublished("fr-FR"));
+            Assert.IsTrue(c1.IsPublished("en-UK"));
+            Assert.IsFalse(c1.IsDraft("dk-DA"));
+            Assert.IsTrue(c1.IsPublished("de-DE"));
+
+            // get the draft published content
+            var c2 = s.Content.GetById(true, 1);
+
+            // draft content = we have drafts
+            Assert.IsTrue(c2.IsDraft("fr-FR"));
+            Assert.IsTrue(c2.IsDraft("en-UK"));
+            Assert.IsTrue(c2.IsDraft("dk-DA"));
+            Assert.IsFalse(c2.IsDraft("de-DE")); // except for the one that does not
+
+            // and only those with published name, are published
+            Assert.IsTrue(c2.IsPublished("fr-FR"));
+            Assert.IsTrue(c2.IsPublished("en-UK"));
+            Assert.IsFalse(c2.IsPublished("dk-DA"));
+            Assert.IsTrue(c2.IsPublished("de-DE"));
+        }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
index 27bae6bf3963..c6e603f5a972 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
@@ -16,8 +16,5 @@ internal class CultureVariation
 
         [JsonProperty("isDraft")]
         public bool IsDraft { get; set; }
-
-        [JsonProperty("isPublished")]
-        public bool IsPublished { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index caecb4e05359..ced655ab434a 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
@@ -296,27 +295,26 @@ public override bool IsDraft(string culture = null)
         /// <inheritdoc />
         public override bool IsPublished(string culture = null)
         {
-            if (!IsDraft(culture))
-            {
-                return true;
-            }
+            // whether we are the 'draft' or 'published' content, need to determine whether
+            // there is a 'published' version for the specified culture (or at all, for
+            // invariant content items)
 
+            // if there is no 'published' published content, no culture can be published
+            var hasPublished = _contentNode.Published != null;
+            if (!hasPublished)
+                return false;
+
+            // if there is a 'published' published content, and does not vary = published
             if (!ContentType.VariesByCulture())
-            {
-                return _contentData.Published;
-            }
+                return true;
 
             // handle context culture
             if (culture == null)
                 culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
 
-            if (_contentData.CultureInfos.TryGetValue(culture, out var variant))
-            {
-                return variant.IsPublished;
-            }
-
-            return false;
-
+            // there is a 'published' published content, and varies
+            // = depends on the culture
+            return ((PublishedContent) _contentNode.Published)._contentData.CultureInfos.ContainsKey(culture);
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index fbb6ac21e71e..e1cd1ec76480 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1202,25 +1202,16 @@ private ContentNuDto GetDto(IContentBase content, bool published)
             // sanitize - names should be ok but ... never knows
             if (content.GetContentType().VariesByCulture())
             {
-
-                IReadOnlyDictionary<string, ContentCultureInfos> infos =  content.CultureInfos;
-                var publishedCultures = new HashSet<string>();
-
-                if (content is IContent document)
-                {
-                    if (published)
-                    {
-                        infos = document.PublishCultureInfos;
-                    }
-
-                    publishedCultures = new HashSet<string>(document.PublishedCultures);
-                }
-
+                var infos = content is IContent document
+                    ? (published
+                        ? document.PublishCultureInfos
+                        : document.CultureInfos)
+                    : content.CultureInfos;
 
                 foreach (var (culture, info) in infos)
                 {
                     var cultureIsDraft = !published && content is IContent d && d.IsCultureEdited(culture);
-                    cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft, IsPublished = publishedCultures.Contains(culture)};
+                    cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft };
                 }
             }
 

From 9b4b8b9d868c5f33c9034185c4018cb89ee75cb7 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Jan 2019 14:15:47 +0100
Subject: [PATCH 102/421] Cleanup NuCache/PublishedContent

---
 .../PublishedCache/NuCache/ContentCache.cs    |  8 ++--
 .../PublishedCache/NuCache/ContentNode.cs     | 39 +++++++++++--------
 .../PublishedCache/NuCache/ContentStore.cs    |  2 +-
 .../PublishedCache/NuCache/MediaCache.cs      |  6 +--
 .../NuCache/PublishedContent.cs               |  4 +-
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
index cab6e7d75929..74cf960170b4 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
@@ -243,7 +243,7 @@ public override bool HasById(bool preview, int contentId)
             var n = _snapshot.Get(contentId);
             if (n == null) return false;
 
-            return preview || n.Published != null;
+            return preview || n.PublishedModel != null;
         }
 
         public override IEnumerable<IPublishedContent> GetAtRoot(bool preview)
@@ -280,8 +280,8 @@ private static IPublishedContent GetNodePublishedContent(ContentNode node, bool
             // both .Draft and .Published cannot be null at the same time
 
             return preview
-                ? node.Draft ?? GetPublishedContentAsDraft(node.Published)
-                : node.Published;
+                ? node.DraftModel ?? GetPublishedContentAsDraft(node.PublishedModel)
+                : node.PublishedModel;
         }
 
         // gets a published content as a previewing draft, if preview is true
@@ -302,7 +302,7 @@ public override bool HasContent(bool preview)
         {
             return preview
                 ? _snapshot.IsEmpty == false
-                : _snapshot.GetAtRoot().Any(x => x.Published != null);
+                : _snapshot.GetAtRoot().Any(x => x.PublishedModel != null);
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index 647adaad916c..4ce6021801bf 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -67,9 +67,9 @@ public void SetContentTypeAndData(PublishedContentType contentType, ContentData
                 throw new ArgumentException("Both draftData and publishedData cannot be null at the same time.");
 
             if (draftData != null)
-                Draft = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+                DraftModel = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
             if (publishedData != null)
-                Published = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+                PublishedModel = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
         }
 
         // clone parent
@@ -88,11 +88,11 @@ private ContentNode(ContentNode origin)
             CreateDate = origin.CreateDate;
             CreatorId = origin.CreatorId;
 
-            var originDraft = origin.Draft == null ? null : PublishedContent.UnwrapIPublishedContent(origin.Draft);
-            var originPublished = origin.Published == null ? null : PublishedContent.UnwrapIPublishedContent(origin.Published);
+            var originDraft = origin.DraftModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.DraftModel);
+            var originPublished = origin.PublishedModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.PublishedModel);
 
-            Draft = originDraft == null ? null : new PublishedContent(this, originDraft).CreateModel();
-            Published = originPublished == null ? null : new PublishedContent(this, originPublished).CreateModel();
+            DraftModel = originDraft == null ? null : new PublishedContent(this, originDraft).CreateModel();
+            PublishedModel = originPublished == null ? null : new PublishedContent(this, originPublished).CreateModel();
 
             ChildContentIds = new List<int>(origin.ChildContentIds); // needs to be *another* list
         }
@@ -110,11 +110,13 @@ public ContentNode(ContentNode origin, PublishedContentType contentType, IPublis
             CreateDate = origin.CreateDate;
             CreatorId = origin.CreatorId;
 
-            var originDraft = origin.Draft == null ? null : PublishedContent.UnwrapIPublishedContent(origin.Draft);
-            var originPublished = origin.Published == null ? null : PublishedContent.UnwrapIPublishedContent(origin.Published);
+            var originDraft = origin.DraftModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.DraftModel);
+            var originPublished = origin.PublishedModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.PublishedModel);
 
-            Draft = originDraft == null ? null : new PublishedContent(this, originDraft._contentData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
-            Published = originPublished == null ? null : new PublishedContent(this, originPublished._contentData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+            DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft._contentData, publishedSnapshotAccessor, variationContextAccessor);
+            DraftModel = DraftContent?.CreateModel();
+            PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished._contentData, publishedSnapshotAccessor, variationContextAccessor);
+            PublishedModel = PublishedContent?.CreateModel();
 
             ChildContentIds = origin.ChildContentIds; // can be the *same* list
         }
@@ -132,10 +134,15 @@ public ContentNode(ContentNode origin, PublishedContentType contentType, IPublis
         public readonly DateTime CreateDate;
         public readonly int CreatorId;
 
+        // draft and published version (either can be null, but not both)
+        // are the direct PublishedContent instances
+        public PublishedContent DraftContent;
+        public PublishedContent PublishedContent;
+
         // draft and published version (either can be null, but not both)
         // are models not direct PublishedContent instances
-        public IPublishedContent Draft;
-        public IPublishedContent Published;
+        public IPublishedContent DraftModel;
+        public IPublishedContent PublishedModel;
 
         public ContentNode CloneParent(IPublishedSnapshotAccessor publishedSnapshotAccessor)
         {
@@ -144,13 +151,13 @@ public ContentNode CloneParent(IPublishedSnapshotAccessor publishedSnapshotAcces
 
         public ContentNodeKit ToKit()
         {
-            var draft = Draft is PublishedContentModel draftModel
+            var draft = DraftModel is PublishedContentModel draftModel
                 ? (PublishedContent) draftModel.Unwrap()
-                : (PublishedContent) Draft;
+                : (PublishedContent) DraftModel;
 
-            var published = Published is PublishedContentModel publishedModel
+            var published = PublishedModel is PublishedContentModel publishedModel
                 ? (PublishedContent) publishedModel.Unwrap()
-                : (PublishedContent) Published;
+                : (PublishedContent) PublishedModel;
 
             return new ContentNodeKit
             {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 353ac83edaa8..b14a8041bdf5 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -652,7 +652,7 @@ private bool ParentPublishedLocked(ContentNodeKit kit)
                 return true;
             var link = GetParentLink(kit.Node);
             var node = link?.Value;
-            return node?.Published != null;
+            return node?.PublishedModel != null;
         }
 
         private void AddToParentLocked(ContentNode content)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs
index 28c7c38c36ac..7a22366165e3 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs
@@ -34,14 +34,14 @@ public override IPublishedContent GetById(bool preview, int contentId)
         {
             // ignore preview, there's only draft for media
             var n = _snapshot.Get(contentId);
-            return n?.Published;
+            return n?.PublishedModel;
         }
 
         public override IPublishedContent GetById(bool preview, Guid contentId)
         {
             // ignore preview, there's only draft for media
             var n = _snapshot.Get(contentId);
-            return n?.Published;
+            return n?.PublishedModel;
         }
 
         public override bool HasById(bool preview, int contentId)
@@ -73,7 +73,7 @@ private IEnumerable<IPublishedContent> GetAtRootNoCache()
             var c = _snapshot.GetAtRoot();
 
             // ignore preview, there's only draft for media
-            return c.Select(n => n.Published);
+            return c.Select(n => n.PublishedModel);
         }
 
         public override bool HasContent(bool preview)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index ced655ab434a..b9d74e7f15a7 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -300,7 +300,7 @@ public override bool IsPublished(string culture = null)
             // invariant content items)
 
             // if there is no 'published' published content, no culture can be published
-            var hasPublished = _contentNode.Published != null;
+            var hasPublished = _contentNode.PublishedModel != null;
             if (!hasPublished)
                 return false;
 
@@ -314,7 +314,7 @@ public override bool IsPublished(string culture = null)
 
             // there is a 'published' published content, and varies
             // = depends on the culture
-            return ((PublishedContent) _contentNode.Published)._contentData.CultureInfos.ContainsKey(culture);
+            return _contentNode.PublishedContent._contentData.CultureInfos.ContainsKey(culture);
         }
 
         #endregion

From 9eabc1fb3f7ca0d55af2ea636e0f52fd8f3e9b82 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Jan 2019 16:22:40 +0100
Subject: [PATCH 103/421] More NuCache/PublishedContent cleanup

---
 .../PublishedCache/NuCache/ContentNode.cs     |  8 ++--
 .../NuCache/PublishedContent.cs               | 37 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index 4ce6021801bf..29749ad51b27 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -113,9 +113,9 @@ public ContentNode(ContentNode origin, PublishedContentType contentType, IPublis
             var originDraft = origin.DraftModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.DraftModel);
             var originPublished = origin.PublishedModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.PublishedModel);
 
-            DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft._contentData, publishedSnapshotAccessor, variationContextAccessor);
+            DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft.ContentData, publishedSnapshotAccessor, variationContextAccessor);
             DraftModel = DraftContent?.CreateModel();
-            PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished._contentData, publishedSnapshotAccessor, variationContextAccessor);
+            PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished.ContentData, publishedSnapshotAccessor, variationContextAccessor);
             PublishedModel = PublishedContent?.CreateModel();
 
             ChildContentIds = origin.ChildContentIds; // can be the *same* list
@@ -164,8 +164,8 @@ public ContentNodeKit ToKit()
                 Node = this,
                 ContentTypeId = ContentType.Id,
 
-                DraftData = draft?._contentData,
-                PublishedData = published?._contentData
+                DraftData = draft?.ContentData,
+                PublishedData = published?.ContentData
             };
         }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index b9d74e7f15a7..522104c2f9e9 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -14,9 +14,6 @@ internal class PublishedContent : PublishedContentBase
     {
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
         private readonly ContentNode _contentNode;
-        // ReSharper disable once InconsistentNaming
-        internal readonly ContentData _contentData; // internal for ContentNode cloning
-
         private readonly string _urlSegment;
 
         #region Constructors
@@ -24,12 +21,12 @@ internal class PublishedContent : PublishedContentBase
         public PublishedContent(ContentNode contentNode, ContentData contentData, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor)
         {
             _contentNode = contentNode;
-            _contentData = contentData;
+            ContentData = contentData;
             _publishedSnapshotAccessor = publishedSnapshotAccessor;
             VariationContextAccessor = variationContextAccessor;
 
-            _urlSegment = _contentData.Name.ToUrlSegment();
-            IsPreviewing = _contentData.Published == false;
+            _urlSegment = ContentData.Name.ToUrlSegment();
+            IsPreviewing = ContentData.Published == false;
 
             var properties = new List<IPublishedProperty>();
             foreach (var propertyType in _contentNode.ContentType.PropertyTypes)
@@ -70,7 +67,7 @@ public PublishedContent(ContentNode contentNode, PublishedContent origin)
             _contentNode = contentNode;
             _publishedSnapshotAccessor = origin._publishedSnapshotAccessor;
             VariationContextAccessor = origin.VariationContextAccessor;
-            _contentData = origin._contentData;
+            ContentData = origin.ContentData;
 
             _urlSegment = origin._urlSegment;
             IsPreviewing = origin.IsPreviewing;
@@ -87,7 +84,7 @@ private PublishedContent(PublishedContent origin)
             _publishedSnapshotAccessor = origin._publishedSnapshotAccessor;
             VariationContextAccessor = origin.VariationContextAccessor;
             _contentNode = origin._contentNode;
-            _contentData = origin._contentData;
+            ContentData = origin.ContentData;
 
             _urlSegment = origin._urlSegment;
             IsPreviewing = true;
@@ -169,6 +166,8 @@ private IEnumerable<IPublishedContent> GetMediaByIds(bool previewing, IEnumerabl
 
         #region PublishedContent
 
+        internal ContentData ContentData { get; }
+
         /// <inheritdoc />
         public override int Id => _contentNode.Id;
 
@@ -178,11 +177,11 @@ public override string Name
             get
             {
                 if (!ContentType.VariesByCulture())
-                    return _contentData.Name;
+                    return ContentData.Name;
 
                 var culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
                 if (culture == "")
-                    return _contentData.Name;
+                    return ContentData.Name;
 
                 return Cultures.TryGetValue(culture, out var cultureInfos) ? cultureInfos.Name : null;
             }
@@ -214,7 +213,7 @@ public override string UrlSegment
         public override string Path => _contentNode.Path;
 
         /// <inheritdoc />
-        public override int? TemplateId => _contentData.TemplateId;
+        public override int? TemplateId => ContentData.TemplateId;
 
         /// <inheritdoc />
         public override int CreatorId => _contentNode.CreatorId;
@@ -226,13 +225,13 @@ public override string UrlSegment
         public override DateTime CreateDate => _contentNode.CreateDate;
 
         /// <inheritdoc />
-        public override int WriterId => _contentData.WriterId;
+        public override int WriterId => ContentData.WriterId;
 
         /// <inheritdoc />
-        public override string WriterName => GetProfileNameById(_contentData.WriterId);
+        public override string WriterName => GetProfileNameById(ContentData.WriterId);
 
         /// <inheritdoc />
-        public override DateTime UpdateDate => _contentData.VersionDate;
+        public override DateTime UpdateDate => ContentData.VersionDate;
 
         private IReadOnlyDictionary<string, PublishedCultureInfo> _cultureInfos;
 
@@ -262,9 +261,9 @@ public override IReadOnlyDictionary<string, PublishedCultureInfo> Cultures
 
                 if (_cultureInfos != null) return _cultureInfos;
 
-                if (_contentData.CultureInfos == null)
+                if (ContentData.CultureInfos == null)
                     throw new Exception("oops: _contentDate.CultureInfos is null.");
-                return _cultureInfos = _contentData.CultureInfos
+                return _cultureInfos = ContentData.CultureInfos
                     .ToDictionary(x => x.Key, x => new PublishedCultureInfo(x.Key, x.Value.Name, x.Value.Date), StringComparer.OrdinalIgnoreCase);
             }
         }
@@ -276,7 +275,7 @@ public override IReadOnlyDictionary<string, PublishedCultureInfo> Cultures
         public override bool IsDraft(string culture = null)
         {
             // if this is the 'published' published content, nothing can be draft
-            if (_contentData.Published)
+            if (ContentData.Published)
                 return false;
 
             // not the 'published' published content, and does not vary = must be draft
@@ -289,7 +288,7 @@ public override bool IsDraft(string culture = null)
 
             // not the 'published' published content, and varies
             // = depends on the culture
-            return _contentData.CultureInfos.TryGetValue(culture, out var cvar) && cvar.IsDraft;
+            return ContentData.CultureInfos.TryGetValue(culture, out var cvar) && cvar.IsDraft;
         }
 
         /// <inheritdoc />
@@ -314,7 +313,7 @@ public override bool IsPublished(string culture = null)
 
             // there is a 'published' published content, and varies
             // = depends on the culture
-            return _contentNode.PublishedContent._contentData.CultureInfos.ContainsKey(culture);
+            return _contentNode.PublishedContent.ContentData.CultureInfos.ContainsKey(culture);
         }
 
         #endregion

From 4a5eca3c6a8a779cb0262dc6a05bfb8ea24880fe Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 28 Jan 2019 15:39:49 +0000
Subject: [PATCH 104/421] Adds in Composition Extension Methods to allow
 Setting the LogViewer without having to know the composition.RegisterUnique
 syntax

---
 .../Components/CompositionExtensions.cs       | 32 +++++++++++++++++++
 .../Logging/Viewer/LogViewerComposer.cs       |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs
index 2aef86599411..4e3e4816e567 100644
--- a/src/Umbraco.Core/Components/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Components/CompositionExtensions.cs
@@ -10,6 +10,7 @@
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
 using Umbraco.Core._Legacy.PackageActions;
+using Umbraco.Core.Logging.Viewer;
 
 namespace Umbraco.Core.Components
 {
@@ -297,6 +298,37 @@ public static void SetMediaFileSystem(this Composition composition, Func<IFactor
         public static void SetMediaFileSystem(this Composition composition, Func<IFileSystem> filesystemFactory)
             => composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(_ => filesystemFactory());
 
+        /// <summary>
+        /// Sets the log viewer.
+        /// </summary>
+        /// <typeparam name="T">The type of the log viewer.</typeparam>
+        /// <param name="composition">The composition.</param>
+        public static void SetLogViewer<T>(this Composition composition)
+            where T : ILogViewer
+        {
+            composition.RegisterUnique<ILogViewer, T>();
+        }
+
+        /// <summary>
+        /// Sets the log viewer.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="factory">A function creating a log viewer.</param>
+        public static void SetLogViewer(this Composition composition, Func<IFactory, ILogViewer> factory)
+        {
+            composition.RegisterUnique(factory);
+        }
+
+        /// <summary>
+        /// Sets the log viewer.
+        /// </summary>
+        /// <param name="composition">A composition.</param>
+        /// <param name="helper">A log viewer.</param>
+        public static void SetLogViewer(this Composition composition, ILogViewer viewer)
+        {
+            composition.RegisterUnique(_ => viewer);
+        }
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs b/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs
index f3d1b5137f85..5ddcb0107807 100644
--- a/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs
+++ b/src/Umbraco.Core/Logging/Viewer/LogViewerComposer.cs
@@ -8,7 +8,7 @@ public class LogViewerComposer : ICoreComposer
     {
         public void Compose(Composition composition)
         {
-            composition.RegisterUnique<ILogViewer>(_ => new JsonLogViewer());
+            composition.SetLogViewer(_ => new JsonLogViewer());
         }
     }
 }

From 052cee31b30c56ebc8996daf73076d2597dec22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 28 Jan 2019 21:36:04 +0100
Subject: [PATCH 105/421] color corrections for pink theme

---
 .../components/tree/umbtree.directive.js      | 12 ++++-
 .../src/less/buttons.less                     | 10 ++--
 .../src/less/canvas-designer.less             |  4 +-
 .../components/application/umb-dashboard.less |  2 +-
 .../application/umb-language-picker.less      | 17 ++++---
 .../src/less/components/editor.less           | 50 +++++++++++++------
 .../src/less/components/tree/umb-actions.less |  2 +-
 .../less/components/tree/umb-tree-root.less   |  1 -
 .../src/less/components/tree/umb-tree.less    | 39 +++++++++++----
 .../components/umb-editor-navigation.less     |  4 +-
 .../less/components/umb-group-builder.less    |  6 +--
 .../src/less/components/umb-node-preview.less |  4 +-
 .../src/less/components/umb-tabs.less         |  2 +-
 .../src/less/listview.less                    |  8 ---
 .../src/less/mixins.less                      |  4 +-
 src/Umbraco.Web.UI.Client/src/less/navs.less  |  6 +++
 .../src/less/property-editors.less            |  4 +-
 .../src/less/variables.less                   | 45 +++++++++++------
 .../src/views/components/content/edit.html    | 26 +++++-----
 .../editor/umb-editor-content-header.html     |  2 +-
 20 files changed, 160 insertions(+), 88 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index c3243993c136..06513c9c661f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -302,8 +302,18 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
 
                 // TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
                 // it would be better if we could cache the processing. The problem is that some of these things are dynamic.
-
+                
                 var css = [];
+                if (node == $scope.currentNode) {
+                    css.push("current");
+                }
+                if (node.hasChildren) {
+                    css.push("has-children");
+                }
+                if (node.deleteAnimations) {
+                    css.push("umb-tree-item--deleted");
+                }
+                
                 if (node.cssClasses) {
                     _.each(node.cssClasses, function (c) {
                         css.push(c);
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index f1e132dce3fa..2440aaa73852 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -193,15 +193,15 @@ input[type="button"] {
 }
 // Info appears as a neutral blue
 .btn-info {
-  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight, @btnInfoType);
+  .buttonBackground(@sand-5, @blueDark, @blueExtraDark, @u-white);
 }
 // Made for Umbraco, 2019
 .btn-action {
-  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight, @btnInfoType);
+  .buttonBackground(@blueExtraDark, @blueDark, @pinkLight, @u-white);
 }
 // Made for Umbraco, 2019, used for buttons that has to stand back.
 .btn-transparent {
-  .buttonBackground(@btnWhiteBackground, @btnWhiteBackgroundHighlight, @btnWhiteType);
+  .buttonBackground(@btnWhiteBackground, @btnWhiteBackgroundHighlight, @btnWhiteType, @btnWhiteTypeHover);
 }
 // Inverse appears as dark gray
 .btn-inverse {
@@ -242,9 +242,9 @@ input[type="button"] {
 // outlined
 .btn-outline {
   border: 1px solid;
-  border-color: @gray-8;
+  border-color: @blueExtraDark;
   background: @white;
-  color: @ui-light-type;
+  color: @blueExtraDark;
   padding: 5px 13px;
   transition: all .2s linear;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index 4d57f200637d..a144336a5475 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -207,14 +207,14 @@ a, a:hover{
     clear: both;
     font-weight: normal;
     line-height: 20px;
-    color: #343434;
+    color: black;
     white-space: nowrap;
     cursor:pointer;
 }
 
 .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
     color: #000000;
-    background: #f8f8f8;
+    background: #e4e0dd;
 }
 
 /****************************/
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
index fc6baead4eb8..3257d7b93f5b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
@@ -31,5 +31,5 @@
 }
 
 .umb-dashboard__header .umb-tabs-nav .umb-tab > a {
-    padding-bottom: 21px;
+    padding-bottom: 25px;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
index b2fb1fa6d69f..aabc4c4506fe 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
@@ -16,19 +16,22 @@
     border-bottom: 1px solid @gray-9;
     height: @editorHeaderHeight;
     box-sizing: border-box;
-    color: @ui-light-active-type;
-}
-
-.umb-language-picker__toggle:hover {
-    //background: @gray-10;
-    color:@ui-light-active-type-hover;
+    color: @ui-option-type;
 }
 
 .umb-language-picker__expand {
-    //color: @gray-6;
     font-size: 14px;
 }
 
+.umb-language-picker__toggle:hover {
+    background: @ui-option-hover;
+    color:@ui-option-type-hover;
+    .umb-language-picker__expand {
+        color: @ui-option-type-hover;
+    }
+}
+
+
 .umb-language-picker__dropdown {
     width: 100%;
     background: @white;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index d091c1a44208..bb54b254dfe1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -115,6 +115,14 @@ input.umb-editor-header__name-input:disabled {
 }
 
 a.umb-editor-header__close-split-view {
+    
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+    height: 69px;
+    width: 69px;
+    
 	font-size: 20px;
 	color: @gray-6;
 	text-decoration: none !important;
@@ -144,22 +152,28 @@ a.umb-editor-header__close-split-view:hover {
     height: 30px;
 	text-decoration: none !important;
 	font-size: 13px;
-	color: @gray-4;
-	background-color: @white;
+	//color: @gray-4;
+    color: @ui-action-disgrete-type;
+	//background-color: @white;
 }
 
 a.umb-variant-switcher__toggle {
-	transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out;
+	transition: color 0.2s ease-in-out;
 	&:hover {
-		background-color: @gray-10;
+		//background-color: @gray-10;
+        color: @ui-action-disgrete-type-hover;
+        .umb-variant-switcher__expand {
+            color: @ui-action-disgrete-type-hover;
+        }
 	}
 }
 
 .umb-variant-switcher__expand {
-	color: @gray-7;
+    color: @ui-action-disgrete-type;
 	margin-top: 3px;
 	margin-left: 5px;
 	margin-right: -5px;
+    transition: color 0.2s ease-in-out;
 }
 
 .umb-variant-switcher__item {
@@ -167,27 +181,30 @@ a.umb-variant-switcher__toggle {
     justify-content: space-between;
 	align-items: center;
 	border-bottom: 1px solid @gray-9;
+    &:hover .umb-variant-switcher__name-wrapper {
+        
+    }
 }
 
 .umb-variant-switcher__item:last-child {
 	border-bottom: none;
 }
 
+.umb-variant-switcher_item--current {
+    color: @ui-light-active-type;
+}
 .umb-variant-switcher_item--current .umb-variant-switcher__name-wrapper {
-	background-color: @gray-10;
-	border-left: 2px solid @ui-active;
+	//background-color: @gray-10;
+	border-left: 4px solid @ui-active;
 }
 
 .umb-variant-switcher__item:hover,
-.umb-variant-switcher__item:focus,
-.umb-variant-switcher__name-wrapper:hover,
-.umb-variant-switcher__name-wrapper:focus {
-	background-color: @gray-10;
+.umb-variant-switcher__item:focus {
 	outline: none;
 }
 
 .umb-variant-switcher_item--not-allowed:not(.umb-variant-switcher_item--current) .umb-variant-switcher__name-wrapper:hover {
-	background-color: @white !important;
+	//background-color: @white !important;
 	cursor: default;
 }
 
@@ -217,7 +234,12 @@ a.umb-variant-switcher__toggle {
 .umb-variant-switcher__split-view {
 	font-size: 13px;
 	display: none;
-	padding: 8px 20px;
+	padding: 16px 20px;
+    
+    &:hover {
+        background-color: @ui-option-hover;
+        color: @ui-option-type-hover;
+    }
 }
 
 // container
@@ -229,7 +251,7 @@ a.umb-variant-switcher__toggle {
 	bottom: @editorFooterHeight;
 	left: 0;
 	overflow: auto;
-	background: @gray-10;
+	background: @brownGrayLight;
 }
 
 .umb-editor-wrapper.-no-footer .umb-editor-container {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
index 15296a6aaa64..40a0cc41e33e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
@@ -23,7 +23,7 @@
     .icon {
         font-size: 18px;
         vertical-align: middle;
-        color: @gray-3;
+        //color: @gray-3;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less
index 72a008b8b676..a3529d550400 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less
@@ -14,7 +14,6 @@
         margin: 0;
         width: 100%;
         display: flex;
-        color: @gray-2;
     }
 
     .umb-options {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 38860e6d22c8..905b3abb8736 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -14,7 +14,7 @@
     a, a:hover {
         outline: none;
         text-decoration: none;
-
+        
         // TODO: => confirm not in use
 //        &.noSpr {
 //            background-position: 0
@@ -28,10 +28,11 @@
         visibility: hidden;
         text-decoration: none;
         font-size: 12px;
-        transition: opacity 120ms ease;
+        transition: color 120ms;
 
         &:hover {
-            opacity: .7;
+            //opacity: .7;
+            color: @ui-option-type-hover;
         }
     }
 
@@ -93,17 +94,36 @@ body.touch .umb-tree {
     display: flex;
     flex-wrap: nowrap;
     align-items: center;
-
+    
+    color: @ui-option-type;
+    a {
+        color: @ui-option-type;
+    }
+    
+    // active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
     &.active {
-        background: @gray-10;
+        background: @ui-selected;
+        color: @ui-selected-type;
+        a {
+            color: @ui-selected-type;
+        }
     }
-
+    
     &:hover {
-        background: @gray-10;
-
+        background: @ui-option-hover;
+        
+        color: @ui-option-type-hover;
+        a {
+            color: @ui-option-type-hover;
+        }
+        
         > .umb-options {
             visibility: visible;
         }
+        
+        .umb-tree-icon {
+            color: @ui-option-type-hover;
+        }
     }
 }
 
@@ -273,7 +293,8 @@ body.touch .umb-tree {
 .umb-tree-icon { 
     vertical-align: middle;
     margin: 0 13px 0 0;
-    color: @gray-1;
+    //color: @gray-1;
+    color: @ui-option-type;
     font-size: 20px;   
     
     &.blue {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
index d432310dab2a..c1f099c2a5ee 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
@@ -21,8 +21,10 @@
   height: @editorHeaderHeight;
   position: relative;
   
+  color: @ui-active-type;
+  
   &:hover {
-      color: @ui-light-active-type-hover !important;
+      color: @ui-active-type-hover !important;
   }
   
   &::after {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 0472deabf6d1..5db66da974b6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -40,7 +40,7 @@
   &:hover {
       color:@ui-action-hover;
       text-decoration: none;
-      border-color: @ui-active-hover;
+      border-color: @ui-active-type-hover;
   }
 }
 
@@ -429,8 +429,8 @@ input.umb-group-builder__group-sort-value {
         
         &:hover {
             text-decoration: none;
-            color:@ui-active-hover;
-            border-color:@ui-active-hover;
+            color:@ui-active-type-hover;
+            border-color:@ui-active-type-hover;
         }
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 3d1af014c718..233441c5d95e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -71,12 +71,12 @@
     margin-right: 5px;
     font-size: 13px;
     font-weight: bold;
-    color: @ui-action-disgrete;
+    color: @ui-action-disgrete-type;
     cursor: pointer;
 }
 
 .umb-node-preview__action:hover {
-    color: @ui-action-disgrete-hover;
+    color: @ui-action-disgrete-type-hover;
     text-decoration: none;
     opacity: 1;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
index 2a5b98df3048..f22d8b3a165a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
@@ -55,7 +55,7 @@
         border-bottom-color: @ui-active;
     }
     &:hover {
-        border-bottom-color: @ui-active-hover;
+        border-bottom-color: @ui-active-type-hover;
     }
     */
     &::after {
diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index 227170354072..c22e57b639e3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -3,14 +3,6 @@
 
 .umb-listview{width: auto !important;}
 
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:focus > a {
-  color: @black;
-  background: @gray-10;
-}
-
 .umb-listview table {
 	border: 1px solid @gray-8;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index 02654459a1e7..a9f10bb1965f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -515,7 +515,7 @@
 
 // Button backgrounds
 // ------------------
-.buttonBackground(@startColor, @hoverColor: @startColor, @textColor: #fff) {
+.buttonBackground(@startColor, @hoverColor: @startColor, @textColor: #fff, @textColorHover: @textColor) {
   // gradientBar will set the background to a pleasing blend of these, to support IE<=9
   //.gradientBar(@startColor, @endColor, @textColor);
   
@@ -533,7 +533,7 @@
 
   // in these cases the gradient won't cover the background, so we override
   &:hover, &:focus, &:active, &.active {
-    color: @textColor;
+    color: @textColorHover;
     background-color: @hoverColor;
   }
   
diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less
index d9656f194bfb..0101113670d2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/navs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/navs.less
@@ -233,6 +233,12 @@
 
 .dropdown-menu > li > a {
     padding: 8px 20px;
+    color: @ui-option-type;
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
+    color: @ui-option-type-hover;
+    background: @ui-option-hover;
 }
 
 .nav-tabs .dropdown-menu {
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index a0d32ee92e6b..c0364f4ad847 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -243,8 +243,8 @@
     transition: all 150ms ease-in-out;
 
     &:hover {
-        color: @ui-action-disgrete-hover;
-        border-color: @ui-action-disgrete-hover;
+        color: @ui-action-disgrete-type-hover;
+        border-color: @ui-action-disgrete-type-hover;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index a83691204111..dd5788fa1145 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -75,6 +75,9 @@
 @gray-9:                #E9E9EB;
 @gray-10:               #F3F3F5;
 
+@sand-2:                hsl(50, 20%, 97%);// added 2019
+@sand-5:                #f3efe9;// added 2019
+
 
 // Additional Icon Colours
 @brownIcon:             #795548;
@@ -110,26 +113,37 @@
 @pinkLight:             #f5c1bc;// added 2019
 @brown:                 #9d8057;// added 2019
 @brownLight:            #e4e0dd;// added 2019
-@claus: #f6efe7;
-@claus2: #f2ebe6;
-@claus3: #535963; //#56777A
-@claus4: #819a9e;
+@brownGrayLight:        #f3f2f1;// added 2019
+//@claus: #f6efe7;
+//@claus2: #f2ebe6;
+//@claus3: #535963; //#56777A
+//@claus4: #819a9e;
 //@claus5: #2152A3;// blueMid
-@claus6: #02A191;
+//@claus6: #02A191;
 //@clausSoftRed: #D93F4C; // todo
 //@clausRed:#D42054;// todo.
 
-@u-greyLight:           #f2ebe6;// added 2019
+//@u-greyLight:           #f2ebe6;// added 2019
 @u-white:               #f9f7f4;// added 2019
+@u-black:               black;// added 2019
 
 
 // UI colors
 // -------------------------
 
+@ui-option-type:        @blueExtraDark;
+@ui-option-hover:       @sand-2;
+@ui-option-type-hover:  @blueMid;
+
 //@ui-active:           #346ab3;
 @ui-active:             @pinkLight;
 @ui-active-type:        @blueExtraDark;
-@ui-active-hover:       @blueMid;
+@ui-active-type-hover:  @blueMid;
+
+@ui-selected:           @blue;
+@ui-selected-hover:     @blueMid;
+@ui-selected-type:           @u-white;
+@ui-selected-type-hover:     @u-white;
 
 @ui-light-border:           @pinkLight;
 @ui-light-type:             @gray-4;
@@ -139,16 +153,17 @@
 @ui-light-active-type:        @blueExtraDark;
 @ui-light-active-type-hover:  @blueMid;
 
-@ui-selected:           @blueMid;//not used jet.
-@ui-selected-hover:     @blueMid;//not used jet.
 
 @ui-action:             @blueMid;
 @ui-action-hover:       @blueMid;
 
-@ui-action-disgrete:             @gray-4;
-@ui-action-disgrete-hover:       @blueMid;
+@ui-action-disgrete:              white;
+@ui-action-disgrete-hover:        @brownLight;
+
+@ui-action-disgrete-type:         @gray-4;
+@ui-action-disgrete-type-hover:   @blueMid;
 
-@type-white:                      @u-white;
+@type-white:                      @white;
 @type-black:                      @blueNight;
 
 @ui-btn:                        @blueExtraDark;
@@ -157,7 +172,7 @@
 
 @ui-btn-positive:               @green;
 @ui-btn-positive-hover:         @green;
-@ui-btn-positive-type:          @u-white;
+@ui-btn-positive-type:          @white;
 
 @ui-btn-negative:               @red;
 @ui-btn-negative-hover:         @red;
@@ -313,10 +328,12 @@
 @btnPrimaryBackgroundHighlight:     @green;
 
 @btnInfoType:                       @ui-btn-type;// updated 2019
+@btnInfoTypeHover:                  @ui-btn-type;// updated 2019
 @btnInfoBackground:                 @ui-btn;// updated 2019
 @btnInfoBackgroundHighlight:        @ui-btn-hover;// updated 2019
 
-@btnWhiteType:                      @black;// updated 2019
+@btnWhiteType:                      @blueExtraDark;// updated 2019
+@btnWhiteTypeHover:                 @ui-action-hover;// updated 2019
 @btnWhiteBackground:                @white;// updated 2019
 @btnWhiteBackgroundHighlight:       @white;// updated 2019
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index adde101baad3..e97eabf17f2b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -6,7 +6,7 @@
 
         <umb-editor-view ng-if="!page.loading">
 
-            <umb-variant-content-editors 
+            <umb-variant-content-editors
                 page="page"
                 content="content"
                 culture="culture"
@@ -17,9 +17,9 @@
 
                 <umb-editor-footer-content-left>
 
-                    <umb-breadcrumbs 
-                        ng-if="ancestors && ancestors.length > 0" 
-                        ancestors="ancestors" 
+                    <umb-breadcrumbs
+                        ng-if="ancestors && ancestors.length > 0"
+                        ancestors="ancestors"
                         entity-type="content">
                     </umb-breadcrumbs>
 
@@ -36,16 +36,16 @@
                         type="button">
                     </umb-button>
 
-                    <umb-button 
-                        alias="preview" 
+                    <umb-button
+                        alias="preview"
                         ng-if="!page.isNew && content.allowPreview && page.showPreviewButton"
                         type="button"
-                        button-style="outline"
+                        button-style="info"
                         action="preview(content)"
                         label-key="buttons_showPage">
                     </umb-button>
 
-                    <umb-button 
+                    <umb-button
                         ng-if="page.showSaveButton"
                         alias="save"
                         type="button"
@@ -56,12 +56,12 @@
                         shortcut="ctrl+s"
                         add-ellipsis="{{page.saveButtonEllipsis}}">
                     </umb-button>
-                    
-                    <umb-button-group 
-                        ng-if="defaultButton && !content.trashed && !infiniteModel.infiniteMode" 
+
+                    <umb-button-group
+                        ng-if="defaultButton && !content.trashed && !infiniteModel.infiniteMode"
                         button-style="success"
-                        default-button="defaultButton" 
-                        sub-buttons="subButtons" 
+                        default-button="defaultButton"
+                        sub-buttons="subButtons"
                         state="page.buttonGroupState"
                         direction="up"
                         float="right">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index edf04d5297c4..4861aac8a456 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -54,7 +54,7 @@
 
         </div>
 
-        <div ng-if="splitViewOpen" style="margin-left: 20px;">
+        <div ng-if="splitViewOpen">
             <a class="umb-editor-header__close-split-view" href="" ng-click="closeSplitView()">
                 <i class="icon-delete"></i>
             </a>

From c2f51be0a1d492bd129f6aaee337afb6cf0db8d1 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Jan 2019 20:07:22 +0100
Subject: [PATCH 106/421] Bugfix

---
 .../PublishedCache/NuCache/ContentNode.cs     | 37 ++++++++++---------
 .../NuCache/PublishedContent.cs               |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index 29749ad51b27..21af0f87e214 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -67,9 +67,16 @@ public void SetContentTypeAndData(PublishedContentType contentType, ContentData
                 throw new ArgumentException("Both draftData and publishedData cannot be null at the same time.");
 
             if (draftData != null)
-                DraftModel = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+            {
+                DraftContent = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor);
+                DraftModel = DraftContent.CreateModel();
+            }
+
             if (publishedData != null)
-                PublishedModel = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor).CreateModel();
+            {
+                PublishedContent = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor);
+                PublishedModel = PublishedContent.CreateModel();
+            }
         }
 
         // clone parent
@@ -88,11 +95,13 @@ private ContentNode(ContentNode origin)
             CreateDate = origin.CreateDate;
             CreatorId = origin.CreatorId;
 
-            var originDraft = origin.DraftModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.DraftModel);
-            var originPublished = origin.PublishedModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.PublishedModel);
+            var originDraft = origin.DraftContent;
+            var originPublished = origin.PublishedContent;
 
-            DraftModel = originDraft == null ? null : new PublishedContent(this, originDraft).CreateModel();
-            PublishedModel = originPublished == null ? null : new PublishedContent(this, originPublished).CreateModel();
+            DraftContent = new PublishedContent(this, originDraft);
+            PublishedContent = new PublishedContent(this, originPublished);
+            DraftModel = DraftContent?.CreateModel();
+            PublishedModel = PublishedContent?.CreateModel();
 
             ChildContentIds = new List<int>(origin.ChildContentIds); // needs to be *another* list
         }
@@ -110,8 +119,8 @@ public ContentNode(ContentNode origin, PublishedContentType contentType, IPublis
             CreateDate = origin.CreateDate;
             CreatorId = origin.CreatorId;
 
-            var originDraft = origin.DraftModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.DraftModel);
-            var originPublished = origin.PublishedModel == null ? null : PublishedContent.UnwrapIPublishedContent(origin.PublishedModel);
+            var originDraft = origin.DraftContent;
+            var originPublished = origin.PublishedContent;
 
             DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft.ContentData, publishedSnapshotAccessor, variationContextAccessor);
             DraftModel = DraftContent?.CreateModel();
@@ -151,21 +160,13 @@ public ContentNode CloneParent(IPublishedSnapshotAccessor publishedSnapshotAcces
 
         public ContentNodeKit ToKit()
         {
-            var draft = DraftModel is PublishedContentModel draftModel
-                ? (PublishedContent) draftModel.Unwrap()
-                : (PublishedContent) DraftModel;
-
-            var published = PublishedModel is PublishedContentModel publishedModel
-                ? (PublishedContent) publishedModel.Unwrap()
-                : (PublishedContent) PublishedModel;
-
             return new ContentNodeKit
             {
                 Node = this,
                 ContentTypeId = ContentType.Id,
 
-                DraftData = draft?.ContentData,
-                PublishedData = published?.ContentData
+                DraftData = DraftContent?.ContentData,
+                PublishedData = PublishedContent?.ContentData
             };
         }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index 522104c2f9e9..e0d9a0c0275e 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -299,7 +299,7 @@ public override bool IsPublished(string culture = null)
             // invariant content items)
 
             // if there is no 'published' published content, no culture can be published
-            var hasPublished = _contentNode.PublishedModel != null;
+            var hasPublished = _contentNode.PublishedContent != null;
             if (!hasPublished)
                 return false;
 

From 86d8bc0c6237b000e846c70c79092176137b84e0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 17:19:58 +1100
Subject: [PATCH 107/421] fix merge

---
 src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index baf7192258b0..5bab8aa2653e 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -69,13 +69,13 @@ public void SetContentTypeAndData(PublishedContentType contentType, ContentData
 
             if (draftData != null)
             {
-                DraftContent = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor);
+                DraftContent = new PublishedContent(this, draftData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor);
                 DraftModel = DraftContent.CreateModel();
             }
 
             if (publishedData != null)
             {
-                PublishedContent = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor);
+                PublishedContent = new PublishedContent(this, publishedData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor);
                 PublishedModel = PublishedContent.CreateModel();
             }
         }
@@ -124,10 +124,9 @@ public ContentNode(ContentNode origin, PublishedContentType contentType, IPublis
             var originDraft = origin.DraftContent;
             var originPublished = origin.PublishedContent;
 
-
-            DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft._contentData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor);
+            DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft.ContentData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor);
             DraftModel = DraftContent?.CreateModel();
-            PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished._contentData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor);
+            PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished.ContentData, publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor);
             PublishedModel = PublishedContent?.CreateModel();
 
             ChildContentIds = origin.ChildContentIds; // can be the *same* list

From ee693b63bd0e172e45621a357c280af6cee0b3aa Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 17:52:48 +1100
Subject: [PATCH 108/421] Fixes issue with ConvertRelatedLinksToMultiUrlPicker
 migration since it produces invalid SQL if there are no values in the
 .Contains calls

---
 .../V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
index 7e7f398791e8..6a22451c0af5 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -26,12 +26,16 @@ public override void Migrate()
             var dataTypes = Database.Fetch<DataTypeDto>(sqlDataTypes);
             var dataTypeIds = dataTypes.Select(x => x.NodeId).ToList();
 
+            if (dataTypeIds.Count == 0) return;
+
             var sqlPropertyTpes = Sql()
                 .Select<PropertyTypeDto>()
                 .From<PropertyTypeDto>()
                 .Where<PropertyTypeDto>(x => dataTypeIds.Contains(x.DataTypeId));
 
-            var propertyTypeIds = Database.Fetch<PropertyTypeDto>(sqlPropertyTpes).Select(x => x.Id);
+            var propertyTypeIds = Database.Fetch<PropertyTypeDto>(sqlPropertyTpes).Select(x => x.Id).ToList();
+
+            if (propertyTypeIds.Count == 0) return;
 
             var sqlPropertyData = Sql()
                 .Select<PropertyDataDto>()
@@ -41,7 +45,7 @@ public override void Migrate()
             var properties = Database.Fetch<PropertyDataDto>(sqlPropertyData);
 
             // Create a Multi URL Picker datatype for the converted RelatedLinks data
-            if (properties.Any() == false)
+            if (!properties.Any())
                 return;
 
             foreach (var property in properties)

From 89a99e1c5f29dc7322ec27d2ac6d7a737ee58fcd Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 18:10:50 +1100
Subject: [PATCH 109/421] Makes IDashboard IDiscoverable

---
 src/Umbraco.Core/Dashboards/IDashboard.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Dashboards/IDashboard.cs b/src/Umbraco.Core/Dashboards/IDashboard.cs
index eaf6c47c8825..c990e2ba61b9 100644
--- a/src/Umbraco.Core/Dashboards/IDashboard.cs
+++ b/src/Umbraco.Core/Dashboards/IDashboard.cs
@@ -1,11 +1,12 @@
 using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Dashboards
 {
     /// <summary>
     /// Represents a dashboard.
     /// </summary>
-    public interface IDashboard : IDashboardSlim
+    public interface IDashboard : IDashboardSlim, IDiscoverable
     {
         /// <summary>
         /// Gets the aliases of sections/applications where this dashboard appears.

From 5135635bf8d75fb712658b183e47dd71676de468 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 29 Jan 2019 09:15:10 +0100
Subject: [PATCH 110/421] Cleanup

---
 .../Trees/TreeCollectionBuilder.cs            | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs b/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
index 438971ac41d8..a62e474e43e2 100644
--- a/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
+++ b/src/Umbraco.Web/Trees/TreeCollectionBuilder.cs
@@ -5,13 +5,6 @@
 
 namespace Umbraco.Web.Trees
 {
-    // todo
-    // this is a weird collection builder because it actually contains trees, not types
-    // and it does not really rely on DI to instantiate anything - but meh
-    // can we have trees that don't have a controller, or something? looks like, no
-    // and then, we should not register trees here, and only create them when creating
-    // the collection!
-
     /// <summary>
     /// Builds a <see cref="TreeCollection"/>.
     /// </summary>
@@ -32,8 +25,11 @@ public void AddTreeController(Type controllerType)
             if (!typeof(TreeControllerBase).IsAssignableFrom(controllerType))
                 throw new ArgumentException($"Type {controllerType} does not inherit from {typeof(TreeControllerBase).FullName}.");
 
+            // no all TreeControllerBase are meant to be used here,
+            // ignore those that don't have the attribute
+
             var attribute = controllerType.GetCustomAttribute<TreeAttribute>(false);
-            if (attribute == null) return; // todo - shouldn't we throw or at least log?
+            if (attribute == null) return;
             var tree = new Tree(attribute.SortOrder, attribute.SectionAlias, attribute.TreeGroup, attribute.TreeAlias, attribute.TreeTitle, attribute.TreeUse, controllerType, attribute.IsSingleNodeTree);
             _trees.Add(tree);
         }
@@ -43,13 +39,5 @@ public void AddTreeControllers(IEnumerable<Type> controllerTypes)
             foreach (var controllerType in controllerTypes)
                 AddTreeController(controllerType);
         }
-
-        // todo - do we want to support this?
-        public void AddTree(Tree tree)
-            => _trees.Add(tree);
-
-        // todo - do we want to support this?
-        public void AddTrees(IEnumerable<Tree> tree)
-            => _trees.AddRange(tree);
     }
 }

From 08a8e0793e62b59a347d6c208786f30c960504c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 09:30:42 +0100
Subject: [PATCH 111/421] Design & color changes for 2019 brand colors

---
 .../application/umbtour.directive.js          |  2 +-
 .../components/buttons/umbbutton.directive.js |  2 +-
 .../components/tree/umbtree.directive.js      | 10 --------
 .../src/common/services/editor.service.js     |  2 +-
 .../application/umb-language-picker.less      |  4 ++--
 .../src/less/components/overlays.less         |  4 +++-
 .../less/components/tree/umb-tree-item.less   |  6 ++---
 .../src/less/components/tree/umb-tree.less    | 24 ++++++++++++-------
 .../src/less/variables.less                   |  8 +++----
 .../common/overlays/user/user.controller.js   | 15 ++++++------
 .../src/views/common/overlays/user/user.html  |  4 ++--
 .../nodename/nodename.html                    |  2 +-
 .../doctypename/doctypename.html              |  2 +-
 .../propertyname/propertyname.html            |  2 +-
 .../tabname/tabname.html                      |  2 +-
 .../foldername/foldername.html                |  2 +-
 .../uploadimages/uploadimages.html            |  2 +-
 .../components/application/umb-tour.html      |  8 +++----
 .../src/views/content/notify.html             |  2 +-
 .../src/views/content/protect.html            |  4 ++--
 .../src/views/content/rights.html             |  2 +-
 .../propertyeditors/listview/listview.html    |  4 ++--
 .../src/views/users/views/users/users.html    | 10 ++++----
 23 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
index 2970c52bbbfc..b7495186609f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
@@ -137,7 +137,7 @@ In the following example you see how to run some custom logic before a step goes
                 <div>
                     <umb-button 
                         size="xs" 
-                        button-style="success" 
+                        button-style="action" 
                         type="button" 
                         action="vm.initNextStep()" 
                         label="Next">
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
index 8ad71226bae2..6038eb1ec0ad 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
@@ -14,7 +14,7 @@ Use this directive to render an umbraco button. The directive can be used to gen
         <umb-button
             action="vm.clickButton()"
             type="button"
-            button-style="success"
+            button-style="action"
             state="vm.buttonState"
             shortcut="ctrl+c"
             label="My button"
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index 06513c9c661f..2fdedcad4bc0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -304,16 +304,6 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
                 // it would be better if we could cache the processing. The problem is that some of these things are dynamic.
                 
                 var css = [];
-                if (node == $scope.currentNode) {
-                    css.push("current");
-                }
-                if (node.hasChildren) {
-                    css.push("has-children");
-                }
-                if (node.deleteAnimations) {
-                    css.push("umb-tree-item--deleted");
-                }
-                
                 if (node.cssClasses) {
                     _.each(node.cssClasses, function (c) {
                         css.push(c);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index d54f479f0adb..5c6046520b2c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -116,7 +116,7 @@ When building a custom infinite editor view you can use the same components as a
                     </umb-button>
                     <umb-button
                         type="button"
-                        button-style="success"
+                        button-style="action"
                         label-key="general_submit"
                         action="vm.submit(model)">
                     </umb-button>
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
index aabc4c4506fe..c950b01602e5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
@@ -51,9 +51,9 @@
 
 .umb-language-picker__dropdown a:hover, 
 .umb-language-picker__dropdown a:focus {
-    background: @gray-10;
+    background: @ui-option-hover;
     text-decoration: none;
-    color:@ui-light-active-type-hover;
+    color:@ui-option-type-hover;
 }
 
 .umb-language-picker__dropdown a.umb-language-picker__dropdown-item--current {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index b2d6cda9b157..6e9c79a0c2ea 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -15,8 +15,10 @@
 }
 
 .umb-overlay .umb-overlay-header {
-    background: @gray-10;
+    //background: @gray-10;
     border-bottom: 1px solid @purple-l3;
+    //background: @blueExtraDark;
+    //color:@u-white;
     padding: 10px;
     margin-top: 0;
     flex-grow: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index a0ea622d6b69..21e5f1388089 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -58,7 +58,7 @@
 
         i {
             background: @ui-active-type;
-            border-color: @ui-active;
+            //border-color: @ui-active;
             transition: opacity 120ms ease;
         }
     }
@@ -67,7 +67,7 @@
     .umb-tree-icon,
     ins {
         color: @ui-active-type !important;
-        background-color: @ui-active;
-        border-color: @ui-active;
+        //background-color: @ui-active;
+        //border-color: @ui-active;
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 905b3abb8736..8da00f5d0f6b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -87,6 +87,21 @@ body.touch .umb-tree {
     }
 }
 
+// active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
+.umb-tree-item > .umb-tree-item__inner.active {
+    background: @ui-selected;
+    color: @ui-selected-type;
+    a {
+        color: @ui-selected-type;
+    }
+    &:hover {
+        background: @ui-selected-hover;
+        color: @ui-selected-type-hover;
+        a {
+            color: @ui-selected-type-hover;
+        }
+    }
+}
 .umb-tree-root, .umb-tree-item__inner {
     padding: 0;
     position: relative;
@@ -100,15 +115,6 @@ body.touch .umb-tree {
         color: @ui-option-type;
     }
     
-    // active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
-    &.active {
-        background: @ui-selected;
-        color: @ui-selected-type;
-        a {
-            color: @ui-selected-type;
-        }
-    }
-    
     &:hover {
         background: @ui-option-hover;
         
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index dd5788fa1145..14d76c2251fc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -140,10 +140,10 @@
 @ui-active-type:        @blueExtraDark;
 @ui-active-type-hover:  @blueMid;
 
-@ui-selected:           @blue;
-@ui-selected-hover:     @blueMid;
-@ui-selected-type:           @u-white;
-@ui-selected-type-hover:     @u-white;
+@ui-selected:           @brownLight;
+@ui-selected-hover:     ligthen(@brownLight, 10);
+@ui-selected-type:           @blueMid;
+@ui-selected-type-hover:     @blueMid;
 
 @ui-light-border:           @pinkLight;
 @ui-light-type:             @gray-4;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
index 3147989821e6..5ed87f073b41 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
@@ -2,17 +2,18 @@ angular.module("umbraco")
     .controller("Umbraco.Overlays.UserController", function ($scope, $location, $timeout, dashboardResource, userService, historyService, eventsService, externalLoginInfo, authResource, currentUserResource, formHelper, localizationService) {
 
         $scope.history = historyService.getCurrent();
-        $scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion;
+        //$scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion;
         $scope.showPasswordFields = false;
         $scope.changePasswordButtonState = "init";
-        $scope.model.subtitle = "Umbraco version" + " " + $scope.version;
-
+        $scope.model.title = "user.name";
+        //$scope.model.subtitle = "Umbraco version" + " " + $scope.version;
+        /*
         if(!$scope.model.title) {
             localizationService.localize("general_user").then(function(value){
                 $scope.model.title = value;
             });
         }
-
+        */
         $scope.externalLoginProviders = externalLoginInfo.providers;
         $scope.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl;
         var evts = [];
@@ -45,7 +46,7 @@ angular.module("umbraco")
             $location.path(link);
             $scope.model.close();
         };
-
+        /*
         //Manually update the remaining timeout seconds
         function updateTimeout() {
             $timeout(function () {
@@ -58,7 +59,7 @@ angular.module("umbraco")
 
             }, 1000, false); // 1 second, do NOT execute a global digest
         }
-
+        */
         function updateUserInfo() {
             //get the user
             userService.getCurrentUser().then(function (user) {
@@ -68,7 +69,7 @@ angular.module("umbraco")
                     $scope.remainingAuthSeconds = $scope.user.remainingAuthSeconds;
                     $scope.canEditProfile = _.indexOf($scope.user.allowedSections, "users") > -1;
                     //set the timer
-                    updateTimeout();
+                    //updateTimeout();
 
                     authResource.getCurrentUserLinkedLogins().then(function(logins) {
                         //reset all to be un-linked
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 754b170f2349..404b4d8dd2c9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -4,11 +4,11 @@
 
        <h5><localize key="user_yourProfile" /></h5>
 
-       <p class="muted">
+       <!--<p class="muted">
            <small>
                <localize key="user_sessionExpires" />: {{remainingAuthSeconds | timespan}}
            </small>
-       </p>
+       </p>-->
 
         <umb-button
             alias="editUser"
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.html
index 53badd78434d..b048b245c1e0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.html
@@ -19,7 +19,7 @@
             </umb-tour-step-counter>
 
             <div>
-                <umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next"></umb-button>
+                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
             </div>
 
         </umb-tour-step-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html
index a0b4b529e82f..3ae894356062 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html
@@ -19,7 +19,7 @@
             </umb-tour-step-counter>
 
             <div>
-                <umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next"></umb-button>
+                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
             </div>
 
         </umb-tour-step-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html
index 5748f65a957a..2c255706c846 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html
@@ -19,7 +19,7 @@
             </umb-tour-step-counter>
 
             <div>
-                <umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next"></umb-button>
+                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
             </div>
 
         </umb-tour-step-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html
index baa0d3da9a46..0dfa084878a6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html
@@ -19,7 +19,7 @@
             </umb-tour-step-counter>
 
             <div>
-                <umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next"></umb-button>
+                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
             </div>
 
         </umb-tour-step-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html
index 1a9bd41226e6..063f332e1d5f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html
@@ -19,7 +19,7 @@
             </umb-tour-step-counter>
 
             <div>
-                <umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
+                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
             </div>
 
         </umb-tour-step-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html
index e7e8750823af..0e13b9b645d0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html
@@ -19,7 +19,7 @@
             </umb-tour-step-counter>
 
             <div>
-                <umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
+                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
             </div>
 
         </umb-tour-step-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
index b801d63cca95..b756d23b5000 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
@@ -31,11 +31,11 @@
                         </div>
                         
                         <div ng-if="model.currentStep.type !== 'intro'">
-                            <umb-button size="xs" ng-if="!model.currentStep.event" button-style="success" type="button" action="model.nextStep()" label="Next"></umb-button>
+                            <umb-button size="xs" ng-if="!model.currentStep.event" button-style="action" type="button" action="model.nextStep()" label="Next"></umb-button>
                         </div>
 
                         <div ng-if="model.currentStep.type === 'intro'">
-                            <umb-button size="m" button-style="success" type="button" action="model.nextStep()" label="Start tour"></umb-button>
+                            <umb-button size="m" button-style="action" type="button" action="model.nextStep()" label="Start tour"></umb-button>
                         </div>
                     </div>
 
@@ -55,7 +55,7 @@ <h3 class="bold">Congratulations!</h3>
                 </umb-tour-step-content>
 
                 <umb-tour-step-footer>
-                    <umb-button type="button" button-style="success" size="m" action="model.completeTour()" label="Complete"></umb-button>
+                    <umb-button type="button" button-style="action" size="m" action="model.completeTour()" label="Complete"></umb-button>
                 </umb-tour-step-footer>
 
             </umb-tour-step>
@@ -76,7 +76,7 @@ <h4 class="bold color-red">Oh, we got lost!</h4>
                     <p>Please go back and start the tour again.</p>
                 </umb-tour-step-content>
                 <umb-tour-step-footer>
-                    <umb-button size="s" button-style="success" type="button" action="model.endTour()" label="End tour"></umb-button>
+                    <umb-button size="s" button-style="action" type="button" action="model.endTour()" label="End tour"></umb-button>
                 </umb-tour-step-footer>
             </umb-tour-step>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/notify.html b/src/Umbraco.Web.UI.Client/src/views/content/notify.html
index 8e2f86066103..43f14d519ff4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/notify.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/notify.html
@@ -42,7 +42,7 @@
                     type="button"
                     action="vm.save(vm.notifyOptions)"
                     state="vm.saveState"
-                    button-style="success">
+                    button-style="action">
         </umb-button>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/protect.html b/src/Umbraco.Web.UI.Client/src/views/content/protect.html
index ae4a15e8c17c..77584dac122c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/protect.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/protect.html
@@ -127,7 +127,7 @@ <h5 class="pa-access-header"><localize key="publicAccess_paGroups">Group based p
                 <div class="alert alert-success" ng-bind-html="vm.success.message"></div>
                 <umb-button type="button"
                             action="vm.close()"
-                            button-style="success"
+                            button-style="action"
                             label-key="general_ok">
                 </umb-button>
             </umb-pane>
@@ -144,7 +144,7 @@ <h5 class="pa-access-header"><localize key="publicAccess_paGroups">Group based p
             <umb-button ng-hide="vm.step  || vm.removing"
                         type="button"
                         action="vm.next()"
-                        button-style="success"
+                        button-style="action"
                         label-key="general_next"
                         disabled="vm.loading || !vm.type">
             </umb-button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/rights.html b/src/Umbraco.Web.UI.Client/src/views/content/rights.html
index 35f3d34260b8..31c7c628c0fa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/rights.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/rights.html
@@ -75,7 +75,7 @@ <h4 style="font-size: 16px;"><localize key="prompt_unsavedChanges"></localize></
                                 label-key="prompt_stay"
                                 action="vm.stay()"
                                 type="button"
-                                button-style="success">
+                                button-style="action">
                             </umb-button>
                         </div>
                     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 77576cac6a62..abf571cfbfc8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -5,7 +5,7 @@
    </div>
 
    <div class="row-fluid" ng-switch-when="false">
-       
+
        <umb-editor-sub-header>
 
            <umb-editor-sub-header-content-left>
@@ -37,7 +37,7 @@
                    </div>
 
                    <div class="btn-group" ng-show="createAllowedButtonMultiWithBlueprints">
-                       <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
+                       <a class="btn btn-action dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
                            <localize key="actions_create">Create</localize>
                            <span class="caret"></span>
                        </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 0075342a36ab..4b6f77e696ec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -11,7 +11,7 @@
             <umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
                 <umb-button-group
                     ng-if="vm.defaultButton"
-                    button-style="success"
+                    button-style="action"
                     default-button="vm.defaultButton"
                     sub-buttons="vm.subButtons">
                 </umb-button-group>
@@ -392,7 +392,7 @@ <h3 class="bold" style="margin-bottom: 0;">
 
                         <umb-button
                             ng-if="vm.usersViewState === 'inviteUser'"
-                            button-style="success"
+                            button-style="action"
                             state="vm.page.createButtonState"
                             type="button"
                             action="vm.inviteUser(addUserForm)"
@@ -402,7 +402,7 @@ <h3 class="bold" style="margin-bottom: 0;">
 
                         <umb-button
                             ng-if="vm.usersViewState === 'createUser'"
-                            button-style="success"
+                            button-style="action"
                             state="vm.page.createButtonState"
                             type="button"
                             action="vm.createUser(addUserForm)"
@@ -486,7 +486,7 @@ <h3 class="bold" style="margin: 0 0 0 10px;">
                         </umb-button>
                         <umb-button
                             type="button"
-                            button-style="success"
+                            button-style="action"
                             label-key="user_goToProfile"
                             action="vm.goToUser(vm.newUser.id);"
                             size="m">
@@ -536,7 +536,7 @@ <h3 class="bold" style="margin: 0 0 0 10px;">
                     </umb-button>
                     <umb-button
                         type="button"
-                        button-style="success"
+                        button-style="action"
                         label-key="user_goToProfile"
                         action="vm.goToUser(vm.newUser.id);"
                         size="m">

From 9c3e501a605f82845ad6921d6e74ad487a583667 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 29 Jan 2019 09:46:24 +0100
Subject: [PATCH 112/421] Fixes UI for macropicker and added submit button

---
 .../macropicker/macropicker.html              | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
index a9551138e187..7e54e2ef8e47 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
@@ -12,11 +12,11 @@
 
         <umb-editor-container>
             <umb-box>
-                <umb-box-content>
+                <umb-box-content class="block-form">
                     <div ng-switch="wizardStep">
 
                         <div ng-switch-when="macroSelect">
-                
+
                             <div class="form-search">
                                 <i class="icon-search"></i>
                                 <input type="text"
@@ -28,7 +28,7 @@
                                         umb-auto-focus
                                         no-dirty-check />
                             </div>
-                
+
                             <ul class="umb-card-grid">
                                 <li ng-repeat="availableItem in macros | orderBy:'name' | filter:searchTerm"
                                     ng-click="selectMacro(availableItem)"
@@ -39,7 +39,7 @@
                                     </a>
                                 </li>
                             </ul>
-                
+
                             <umb-empty-state ng-if="nomacros"
                                                 position="center">
                                 <localize key="defaultdialogs_noMacros">
@@ -47,28 +47,28 @@
                                 </localize>
                             </umb-empty-state>
                         </div>
-                
+
                         <div ng-switch-when="paramSelect">
-                
+
                             <h5>{{model.selectedMacro.name}}</h5>
-                
+
                             <ul class="unstyled">
                                 <li ng-repeat="param in model.macroParams">
-                
+
                                     <ng-form name="parameterForm">
                                         <umb-control-group label="{{param.name}}">
                                             <umb-property-editor model="param"></umb-property-editor>
                                         </umb-control-group>
                                     </ng-form>
-                
+
                                 </li>
                             </ul>
-                
+
                             <umb-empty-state ng-if="noMacroParams"
                                                 position="center">
                                 <localize key="defaultdialogs_noMacroParams">There are no parameters for this macro</localize>
                             </umb-empty-state>
-                
+
                         </div>
                     </div>
                 </umb-box-content>
@@ -83,6 +83,13 @@ <h5>{{model.selectedMacro.name}}</h5>
                     label-key="general_close"
                     action="close()">
                 </umb-button>
+
+                <umb-button
+                    type="button"
+                    button-style="success"
+                    label-key="general_submit"
+                    action="selectMacro(model)">
+                </umb-button>
             </umb-editor-footer-content-right>
         </umb-editor-footer>
 

From 7b85ebab56862a1c038eea85696e795504a8ff97 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 19:54:32 +1100
Subject: [PATCH 113/421] Adds migration to convert start nodes for picker
 configuration to UDIs

---
 .../Migrations/Upgrade/UmbracoPlan.cs         |   1 +
 .../ConvertRelatedLinksToMultiUrlPicker.cs    |   5 +-
 .../V_8_0_0/UpdatePickerIntegerValuesToUdi.cs | 108 ++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 src/Umbraco.Web.UI.Client/package-lock.json   |   4 +-
 5 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index f4732acc4ba2..9bf58c8d2f99 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -125,6 +125,7 @@ protected void DefinePlan()
             To<AddContentTypeIsElementColumn>("{0009109C-A0B8-4F3F-8FEB-C137BBDDA268}");
             To<UpdateMemberGroupPickerData>("{8A027815-D5CD-4872-8B88-9A51AB5986A6}"); // from 7.14.0
             To<ConvertRelatedLinksToMultiUrlPicker>("{ED28B66A-E248-4D94-8CDB-9BDF574023F0}");
+            To<UpdatePickerIntegerValuesToUdi>("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
 
 
             //FINAL
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
index 6a22451c0af5..960990cbeb20 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
@@ -89,7 +88,7 @@ public override void Migrate()
                         // Should only have a URL if it's an external link otherwise it wil be a UDI 
                         Url = relatedLink.IsInternal == false ? relatedLink.Link : null
                     };
-                    
+
                     links.Add(link);
                 }
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs
new file mode 100644
index 000000000000..2e37c79632f6
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class UpdatePickerIntegerValuesToUdi : MigrationBase
+    {
+        public UpdatePickerIntegerValuesToUdi(IMigrationContext context) : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            var sqlDataTypes = Sql()
+                .Select<DataTypeDto>()
+                .From<DataTypeDto>()
+                .Where<DataTypeDto>(x => x.EditorAlias == Constants.PropertyEditors.Aliases.ContentPicker
+                                         || x.EditorAlias == Constants.PropertyEditors.Aliases.MediaPicker
+                                         || x.EditorAlias == Constants.PropertyEditors.Aliases.MultiNodeTreePicker);
+
+            var dataTypes = Database.Fetch<DataTypeDto>(sqlDataTypes).ToList();
+
+            foreach (var datatype in dataTypes.Where(x => !x.Configuration.IsNullOrWhiteSpace()))
+            {
+                switch (datatype.EditorAlias)
+                {
+                    case Constants.PropertyEditors.Aliases.ContentPicker:
+                    case Constants.PropertyEditors.Aliases.MediaPicker:
+                        {
+                            var config = JsonConvert.DeserializeObject<JObject>(datatype.Configuration);
+                            var startNodeId = config.Value<string>("startNodeId");
+                            if (!startNodeId.IsNullOrWhiteSpace() && int.TryParse(startNodeId, out var intStartNode))
+                            {
+                                var guid = intStartNode <= 0
+                                    ? null
+                                    : Context.Database.ExecuteScalar<Guid?>(
+                                        Sql().Select<NodeDto>(x => x.UniqueId).From<NodeDto>().Where<NodeDto>(x => x.NodeId == intStartNode));
+                                if (guid.HasValue)
+                                {
+                                    var udi = new GuidUdi(datatype.EditorAlias == Constants.PropertyEditors.Aliases.MediaPicker
+                                        ? Constants.UdiEntityType.Media
+                                        : Constants.UdiEntityType.Document, guid.Value);
+                                    config["startNodeId"] = new JValue(udi.ToString());
+                                }
+                                else
+                                    config.Remove("startNodeId");
+
+                                datatype.Configuration = JsonConvert.SerializeObject(config);
+                                Database.Update(datatype);
+                            }
+
+                            break;
+                        }
+                    case Constants.PropertyEditors.Aliases.MultiNodeTreePicker:
+                        {
+                            var config = JsonConvert.DeserializeObject<JObject>(datatype.Configuration);
+                            var startNodeConfig = config.Value<JObject>("startNode");
+                            if (startNodeConfig != null)
+                            {
+                                var startNodeId = startNodeConfig.Value<string>("id");
+                                var objectType = startNodeConfig.Value<string>("type");
+                                if (!objectType.IsNullOrWhiteSpace()
+                                    && !startNodeId.IsNullOrWhiteSpace()
+                                    && int.TryParse(startNodeId, out var intStartNode))
+                                {
+                                    var guid = intStartNode <= 0
+                                        ? null
+                                        : Context.Database.ExecuteScalar<Guid?>(
+                                            Sql().Select<NodeDto>(x => x.UniqueId).From<NodeDto>().Where<NodeDto>(x => x.NodeId == intStartNode));
+
+                                    string entityType = null;
+                                    switch (objectType.ToLowerInvariant())
+                                    {
+                                        case "content":
+                                            entityType = Constants.UdiEntityType.Document;
+                                            break;
+                                        case "media":
+                                            entityType = Constants.UdiEntityType.Media;
+                                            break;
+                                        case "member":
+                                            entityType = Constants.UdiEntityType.Member;
+                                            break;
+                                    }
+
+                                    if (entityType != null && guid.HasValue)
+                                    {
+                                        var udi = new GuidUdi(entityType, guid.Value);
+                                        startNodeConfig["id"] = new JValue(udi.ToString());
+                                    }
+                                    else
+                                        startNodeConfig.Remove("id");
+
+                                    datatype.Configuration = JsonConvert.SerializeObject(config);
+                                    Database.Update(datatype);
+                                }
+                            }
+
+                            break;
+                        }
+                }
+            }
+
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index dd9110eea26d..fb54e4a4f419 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -403,6 +403,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\FallbackLanguage.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TagsMigrationFix.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\UpdateDefaultMandatoryLanguage.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\UpdatePickerIntegerValuesToUdi.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\UserForeignKeys.cs" />
     <Compile Include="Models\AuditEntry.cs" />
     <Compile Include="Models\Consent.cs" />
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 8afb0a17e32f..fe657ae4700e 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -13278,7 +13278,7 @@
     },
     "pretty-hrtime": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
@@ -15838,7 +15838,7 @@
       "dependencies": {
         "lru-cache": {
           "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
           "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
           "dev": true
         }

From 9cd2e36c4be35650729e058c9258ff9acb0b2c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 10:00:38 +0100
Subject: [PATCH 114/421] more color corrections for brandcolors 2019

---
 .../src/less/buttons.less                     |  2 +-
 .../less/components/tree/umb-tree-item.less   |  2 +-
 .../src/less/components/umb-badge.less        | 12 +++++-----
 .../less/components/umb-grid-selector.less    | 23 ++++++++++++++++---
 .../src/less/variables.less                   | 18 +++++++--------
 5 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index 2440aaa73852..dee591c437e4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -242,7 +242,7 @@ input[type="button"] {
 // outlined
 .btn-outline {
   border: 1px solid;
-  border-color: @blueExtraDark;
+  border-color: @gray-7;
   background: @white;
   color: @blueExtraDark;
   padding: 5px 13px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 21e5f1388089..16bff41fd784 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -47,7 +47,7 @@
     
     // override small icon color. TODO => check usage 
     &:before {
-        color: @turquoise-l2;
+        color: @pink;
     }
     
     .umb-options {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
index 0e3bb35ffa4e..cad6dbaf2f6b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
@@ -10,22 +10,22 @@
 
 // Colors
 .umb-badge--primary {
-    background-color: @turquoise;
+    background-color: @blueDark;
     color: @white;
 }
 
 .umb-badge--secondary {
-    background-color: @purple;
+    background-color: @blueExtraDark;
     color: @white;
 }
 
 .umb-badge--gray {
-    background-color: @gray-8;
-    color: @gray-4;
+    background-color: @sand-2;
+    color: @blueDark;
 }
 
 .umb-badge--danger {
-    background-color: @red-l1;
+    background-color: @red;
     color: @white;
 }
 
@@ -68,4 +68,4 @@
 .umb-badge--xl {
     font-size: 20px;
     padding: 6px 8px;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
index 7a0b013e6874..e25349f5554f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
@@ -28,6 +28,13 @@
   border: 1px dashed @gray-8;
   background: none;
   cursor: pointer;
+  
+  color: @ui-option-type;
+  &:hover {
+      color: @ui-option-type-hover;
+      border-color: @ui-option-type-hover;
+      text-decoration: none;
+  }
 }
 
 .umb-grid-selector__item-content {
@@ -48,7 +55,7 @@
 }
 
 .umb-grid-selector__item-label.-blue {
-  color: @turquoise-d1;
+  color: @ui-option-type;
 }
 
 .umb-grid-selector__item-remove {
@@ -56,6 +63,10 @@
   top: 5px;
   right: 5px;
   cursor: pointer;
+  color: @ui-option-type;
+  &:hover {
+      color: @ui-option-type-hover;
+  }
 }
 
 .umb-grid-selector__item-default-label {
@@ -64,9 +75,15 @@
 }
 
 .umb-grid-selector__item-default-label.-blue {
-  color: @turquoise-d1;
+  color: @ui-option-type;
+  &:hover {
+      color: @ui-option-type-hover;
+  }
 }
 
 .umb-grid-selector__item-add {
-  color: @turquoise-d1;
+  color: @ui-option-type;
+  &:hover {
+      color: @ui-option-type-hover;
+  }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 14d76c2251fc..c370a2090abc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -75,8 +75,9 @@
 @gray-9:                #E9E9EB;
 @gray-10:               #F3F3F5;
 
-@sand-2:                hsl(50, 20%, 97%);// added 2019
+@sand-2:                hsl(50, 20%, 88%);// added 2019
 @sand-5:                #f3efe9;// added 2019
+@sand-7:                hsl(50, 20%, 97%);// added 2019
 
 
 // Additional Icon Colours
@@ -132,7 +133,7 @@
 // -------------------------
 
 @ui-option-type:        @blueExtraDark;
-@ui-option-hover:       @sand-2;
+@ui-option-hover:       @sand-7;
 @ui-option-type-hover:  @blueMid;
 
 //@ui-active:           #346ab3;
@@ -171,7 +172,7 @@
 @ui-btn-type:                   @white;
 
 @ui-btn-positive:               @green;
-@ui-btn-positive-hover:         @green;
+@ui-btn-positive-hover:         @green-l1;
 @ui-btn-positive-type:          @white;
 
 @ui-btn-negative:               @red;
@@ -201,15 +202,12 @@
 .btn-color-black {background-color: @black;}
 .color-black i { color: @black;}
 
-
 .btn-color-blue-grey {background-color: @blueGrey;}
 .color-blue-grey, .color-blue-grey i { color: @blueGrey !important;}
 
-
 .btn-color-grey{background-color: @grayIcon;}
 .color-grey, .color-grey i { color: @grayIcon !important; }
 
-
 .btn-color-brown{background-color: @brownIcon;}
 .color-brown, .color-brown i { color: @brownIcon !important; }
 
@@ -324,8 +322,8 @@
 @btnBackgroundHighlight:            @gray-9;
 @btnBorder:                         @gray-9;
 
-@btnPrimaryBackground:              @green;
-@btnPrimaryBackgroundHighlight:     @green;
+@btnPrimaryBackground:              @ui-btn-positive;
+@btnPrimaryBackgroundHighlight:     @ui-btn-positive-hover;
 
 @btnInfoType:                       @ui-btn-type;// updated 2019
 @btnInfoTypeHover:                  @ui-btn-type;// updated 2019
@@ -341,10 +339,10 @@
 @btnSuccessBackground:              @ui-btn-positive;// updated 2019
 @btnSuccessBackgroundHighlight:     @ui-btn-positive-hover;// updated 2019
 
-@btnWarningBackground:              @red-l1;
+@btnWarningBackground:              @red;
 @btnWarningBackgroundHighlight:     @red-l1;
 
-@btnDangerBackground:               @red-l1;
+@btnDangerBackground:               @red;
 @btnDangerBackgroundHighlight:      @red-l1;
 
 @btnInverseBackground:              @gray-2;

From d24b7f2abaa9ffa7fe5b4d87a40335e1c125dfdf Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 29 Jan 2019 10:17:26 +0100
Subject: [PATCH 115/421] Refactor enums

---
 src/Umbraco.Core/EnumExtensions.cs            | 45 +++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../CoreThings/EnumExtensionsTests.cs         | 55 +++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 +
 src/Umbraco.Web/Services/TreeService.cs       |  7 ++-
 src/Umbraco.Web/Trees/TreeUseExtensions.cs    | 24 --------
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 src/umbraco.sln.DotSettings                   |  2 +-
 8 files changed, 109 insertions(+), 28 deletions(-)
 create mode 100644 src/Umbraco.Core/EnumExtensions.cs
 create mode 100644 src/Umbraco.Tests/CoreThings/EnumExtensionsTests.cs
 delete mode 100644 src/Umbraco.Web/Trees/TreeUseExtensions.cs

diff --git a/src/Umbraco.Core/EnumExtensions.cs b/src/Umbraco.Core/EnumExtensions.cs
new file mode 100644
index 000000000000..1443a278764a
--- /dev/null
+++ b/src/Umbraco.Core/EnumExtensions.cs
@@ -0,0 +1,45 @@
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides extension methods to enums.
+    /// </summary>
+    public static class EnumExtensions
+    {
+        // note:
+        // - no need to HasFlagExact, that's basically an == test
+        // - HasFlagAll cannot be named HasFlag because ext. methods never take priority over instance methods
+
+        /// <summary>
+        /// Determines whether a flag enum has all the specified values.
+        /// </summary>
+        /// <remarks>
+        /// <para>True when all bits set in <paramref name="uses"/> are set in <paramref name="use"/>, though other bits may be set too.</para>
+        /// <para>This is the behavior of the original <see cref="Enum.HasFlag"/> method.</para>
+        /// </remarks>
+        public static bool HasFlagAll<T>(this T use, T uses)
+            where T : Enum
+        {
+            var num = Convert.ToUInt64(use);
+            var nums = Convert.ToUInt64(uses);
+
+            return (num & nums) == nums;
+        }
+
+        /// <summary>
+        /// Determines whether a flag enum has any of the specified values.
+        /// </summary>
+        /// <remarks>
+        /// <para>True when at least one of the bits set in <paramref name="uses"/> is set in <paramref name="use"/>.</para>
+        /// </remarks>
+        public static bool HasFlagAny<T>(this T use, T uses)
+            where T : Enum
+        {
+            var num = Convert.ToUInt64(use);
+            var nums = Convert.ToUInt64(uses);
+
+            return (num & nums) > 0;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1a978650f079..10c396444816 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -333,6 +333,7 @@
     <Compile Include="ContentVariationExtensions.cs" />
     <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
     <Compile Include="DisposableObjectSlim.cs" />
+    <Compile Include="EnumExtensions.cs" />
     <Compile Include="Events\ExportedMemberEventArgs.cs" />
     <Compile Include="Events\RolesEventArgs.cs" />
     <Compile Include="Events\UserGroupWithUsers.cs" />
diff --git a/src/Umbraco.Tests/CoreThings/EnumExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/EnumExtensionsTests.cs
new file mode 100644
index 000000000000..72a55cee853b
--- /dev/null
+++ b/src/Umbraco.Tests/CoreThings/EnumExtensionsTests.cs
@@ -0,0 +1,55 @@
+using NUnit.Framework;
+using Umbraco.Web.Trees;
+using Umbraco.Core;
+
+namespace Umbraco.Tests.CoreThings
+{
+    [TestFixture]
+    public class EnumExtensionsTests
+    {
+        [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
+        [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
+        [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
+        [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, false)]
+        public void HasFlagTest(TreeUse value, TreeUse test, bool expected)
+        {
+            // the built-in Enum.HasFlag() method determines whether
+            // all bits from <test> are set (other bits can be set too)
+
+            if (expected)
+                Assert.IsTrue(value.HasFlag(test));
+            else
+                Assert.IsFalse(value.HasFlag(test));
+        }
+
+        [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
+        [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
+        [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
+        [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, false)]
+        public void HasFlagAllTest(TreeUse value, TreeUse test, bool expected)
+        {
+            // the HasFlagAll() extension method determines whether
+            // all bits from <test> are set (other bits can be set too)
+
+            if (expected)
+                Assert.IsTrue(value.HasFlagAll(test));
+            else
+                Assert.IsFalse(value.HasFlagAll(test));
+        }
+
+        [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
+        [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
+        [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
+        [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, true)]
+        public void HasFlagAnyTest(TreeUse value, TreeUse test, bool expected)
+        {
+            // the HasFlagAny() extension method determines whether
+            // at least one bit from <test> is set
+
+            if (expected)
+                Assert.IsTrue(value.HasFlagAny(test));
+            else
+                Assert.IsFalse(value.HasFlagAny(test));
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 11f5527a8cf1..95b6608c422d 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -69,6 +69,7 @@
     <Reference Include="System.Text.Encoding" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -122,6 +123,7 @@
     <Compile Include="Composing\ContainerConformingTests.cs" />
     <Compile Include="CoreThings\CallContextTests.cs" />
     <Compile Include="Components\ComponentTests.cs" />
+    <Compile Include="CoreThings\EnumExtensionsTests.cs" />
     <Compile Include="CoreThings\GuidUtilsTests.cs" />
     <Compile Include="CoreThings\HexEncoderTests.cs" />
     <Compile Include="CoreXml\RenamedRootNavigatorTests.cs" />
diff --git a/src/Umbraco.Web/Services/TreeService.cs b/src/Umbraco.Web/Services/TreeService.cs
index a5574946a673..dc500f2583e6 100644
--- a/src/Umbraco.Web/Services/TreeService.cs
+++ b/src/Umbraco.Web/Services/TreeService.cs
@@ -26,11 +26,14 @@ public TreeService(TreeCollection treeCollection)
         public Tree GetByAlias(string treeAlias) => _treeCollection.FirstOrDefault(x => x.TreeAlias == treeAlias);
 
         /// <inheritdoc />
-        public IEnumerable<Tree> GetAll(TreeUse use = TreeUse.Main) => _treeCollection.Where(x => x.TreeUse.HasAny(use));
+        public IEnumerable<Tree> GetAll(TreeUse use = TreeUse.Main)
+            // use HasFlagAny: if use is Main|Dialog, we want to return Main *and* Dialog trees
+            => _treeCollection.Where(x => x.TreeUse.HasFlagAny(use));
 
         /// <inheritdoc />
         public IEnumerable<Tree> GetBySection(string sectionAlias, TreeUse use = TreeUse.Main)
-            => _treeCollection.Where(x => x.SectionAlias.InvariantEquals(sectionAlias) && x.TreeUse.HasAny(use)).OrderBy(x => x.SortOrder).ToList();
+            // use HasFlagAny: if use is Main|Dialog, we want to return Main *and* Dialog trees
+            => _treeCollection.Where(x => x.SectionAlias.InvariantEquals(sectionAlias) && x.TreeUse.HasFlagAny(use)).OrderBy(x => x.SortOrder).ToList();
 
         /// <inheritdoc />
         public IDictionary<string, IEnumerable<Tree>> GetBySectionGrouped(string sectionAlias, TreeUse use = TreeUse.Main)
diff --git a/src/Umbraco.Web/Trees/TreeUseExtensions.cs b/src/Umbraco.Web/Trees/TreeUseExtensions.cs
deleted file mode 100644
index 02b417eb9801..000000000000
--- a/src/Umbraco.Web/Trees/TreeUseExtensions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Umbraco.Web.Trees
-{
-    /// <summary>
-    /// Provides extension methods to the <see cref="TreeUse"/> method.
-    /// </summary>
-    public static class TreeUseExtensions
-    {
-        /// <summary>
-        /// Determines whether a TreeUse has all the specified values.
-        /// </summary>
-        public static bool Has(this TreeUse use, TreeUse uses)
-        {
-            return (use & uses) == uses;
-        }
-
-        /// <summary>
-        /// Determines whether a TreeUse has any of the specified values.
-        /// </summary>
-        public static bool HasAny(this TreeUse use, TreeUse uses)
-        {
-            return (use & uses) > 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 361c2aa28aa5..f5cd7ce14220 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -186,7 +186,6 @@
     <Compile Include="Trees\TranslationBackOfficeSection.cs" />
     <Compile Include="Trees\TreeCollectionBuilder.cs" />
     <Compile Include="Trees\TreeUse.cs" />
-    <Compile Include="Trees\TreeUseExtensions.cs" />
     <Compile Include="Trees\UsersBackOfficeSection.cs" />
     <Compile Include="Trees\Tree.cs" />
     <Compile Include="Trees\ITree.cs" />
diff --git a/src/umbraco.sln.DotSettings b/src/umbraco.sln.DotSettings
index d6826e5f9004..2f99fe635092 100644
--- a/src/umbraco.sln.DotSettings
+++ b/src/umbraco.sln.DotSettings
@@ -4,6 +4,6 @@
 	<s:String x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=2DA32DA040A7D74599ABE288C7224CF0/Comment/@EntryValue">Disposable construction</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=2DA32DA040A7D74599ABE288C7224CF0/Severity/@EntryValue">HINT</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=37A0B37A0ABAA34AA5CB32A93653C4FE/@KeyIndexDefined">False</s:Boolean>
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp71</s:String>
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Default</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unpublish/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unpublishing/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

From fd80aecb2001e088a511c37256488668e34da519 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 21:22:01 +1100
Subject: [PATCH 116/421] fixes more of the ConvertRelatedLinksToMultiUrlPicker
 migration

---
 .../ConvertRelatedLinksToMultiUrlPicker.cs    | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
index 960990cbeb20..ed1c08f0f840 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -27,6 +27,12 @@ public override void Migrate()
 
             if (dataTypeIds.Count == 0) return;
 
+            foreach (var dataType in dataTypes)
+            {
+                dataType.EditorAlias = Constants.PropertyEditors.Aliases.MultiUrlPicker;
+                Database.Update(dataType);
+            }
+
             var sqlPropertyTpes = Sql()
                 .Select<PropertyTypeDto>()
                 .From<PropertyTypeDto>()
@@ -44,9 +50,7 @@ public override void Migrate()
             var properties = Database.Fetch<PropertyDataDto>(sqlPropertyData);
 
             // Create a Multi URL Picker datatype for the converted RelatedLinks data
-            if (!properties.Any())
-                return;
-
+            
             foreach (var property in properties)
             {
                 var value = property.Value.ToString();
@@ -99,17 +103,7 @@ public override void Migrate()
                 Database.Update(property);
             }
 
-            foreach (var dataType in dataTypes)
-            {
-                // Change existing datatypes from RelatedLinks to MultiUrlPicker
-                var dataTypeResult = Database.Fetch<DataTypeDto>(Sql()
-                        .Select<DataTypeDto>()
-                        .From<DataTypeDto>()
-                        .Where<DataTypeDto>(x => x.NodeId == dataType.NodeId)).First();
-
-                dataTypeResult.EditorAlias = Constants.PropertyEditors.Aliases.MultiUrlPicker;
-                Database.Update(dataTypeResult);
-            }
+            
         }
     }
 

From 9bcb2bfb38534499c5812ba6e5c8e1d4e2874444 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 21:27:22 +1100
Subject: [PATCH 117/421] removes unused code

---
 src/Umbraco.Web/UrlHelperExtensions.cs | 37 --------------------------
 1 file changed, 37 deletions(-)

diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index 1397ffc81840..249ce7619313 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -21,17 +21,6 @@ namespace Umbraco.Web
     /// </summary>
     public static class UrlHelperExtensions
     {
-        /// <summary>
-        /// Returns the base path (not including the 'action') of the MVC controller "ExamineManagementController"
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        public static string GetExamineManagementServicePath(this UrlHelper url)
-        {
-            // TODO: Possibly remove this method, I think it's unused...
-            var result = url.GetUmbracoApiService<ExamineManagementController>("GetIndexerDetails");
-            return result.TrimEnd("GetIndexerDetails").EnsureEndsWith('/');
-        }
 
         /// <summary>
         /// Return the Url for a Web Api service
@@ -47,19 +36,6 @@ public static string GetUmbracoApiService<T>(this UrlHelper url, string actionNa
             return url.GetUmbracoApiService(actionName, typeof(T), routeVals);
         }
 
-        /// <summary>
-        /// Return the Base Url (not including the action) for a Web Api service
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="url"></param>
-        /// <param name="actionName"></param>
-        /// <returns></returns>
-        public static string GetUmbracoApiServiceBaseUrl<T>(this UrlHelper url, string actionName)
-            where T : UmbracoApiController
-        {
-            return url.GetUmbracoApiService<T>(actionName).TrimEnd(actionName);
-        }
-
         public static string GetUmbracoApiServiceBaseUrl<T>(this UrlHelper url, Expression<Func<T, object>> methodSelector)
             where T : UmbracoApiController
         {
@@ -112,19 +88,6 @@ public static string GetUmbracoApiService(this UrlHelper url, string actionName,
             return url.GetUmbracoApiService(actionName, ControllerExtensions.GetControllerName(apiControllerType), area, routeVals);
         }
 
-        /// <summary>
-        /// Return the Url for a Web Api service
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="actionName"></param>
-        /// <param name="controllerName"></param>
-        /// <param name="routeVals"></param>
-        /// <returns></returns>
-        public static string GetUmbracoApiService(this UrlHelper url, string actionName, string controllerName, RouteValueDictionary routeVals = null)
-        {
-            return url.GetUmbracoApiService(actionName, controllerName, "", routeVals);
-        }
-
         /// <summary>
         /// Return the Url for a Web Api service
         /// </summary>

From e2d41106856e599c009fd06dd3397ccc930bf4c9 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 29 Jan 2019 10:46:10 +0000
Subject: [PATCH 118/421] When creating a PartialView we do a string.replace
 for Model.Content. to be Model. as MacroPartialViews work with Model.Content
 and PartialViews like Model.

---
 src/Umbraco.Core/Services/Implement/FileService.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index f49395d73d55..cbf961595ef3 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -764,6 +764,12 @@ private Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, P
                     //strip the @inherits if it's there
                     snippetContent = StripPartialViewHeader(snippetContent);
 
+                    //Update Model.Content. to be Model. when used as PartialView
+                    if(partialViewType == PartialViewType.PartialView)
+                    {
+                        snippetContent = snippetContent.Replace("Model.Content.", "Model.");
+                    }
+
                     partialViewContent = $"{partialViewHeader}{Environment.NewLine}{snippetContent}";
                 }
             }
@@ -790,7 +796,7 @@ private Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, P
             }
 
             return Attempt<IPartialView>.Succeed(partialView);
-        }
+        }        
 
         public bool DeletePartialView(string path, int userId = 0)
         {
@@ -1027,6 +1033,12 @@ private string GetPartialViewMacroSnippetContent(string snippetName, PartialView
                 //strip the @inherits if it's there
                 snippetContent = StripPartialViewHeader(snippetContent);
 
+                //Update Model.Content. to be Model. when used as PartialView
+                if (partialViewType == PartialViewType.PartialView)
+                {
+                    snippetContent = snippetContent.Replace("Model.Content.", "Model.");
+                }
+
                 var content = $"{partialViewHeader}{Environment.NewLine}{snippetContent}";
                 return content;
             }

From 6bf7db79e3d02840c08c1df55208d8301244da93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 12:05:52 +0100
Subject: [PATCH 119/421] frontend design update for brandcolors 2019

---
 .../content/umbcontentnodeinfo.directive.js     |  8 ++++++++
 .../components/umbconfirm.directive.js          |  3 ++-
 src/Umbraco.Web.UI.Client/src/less/buttons.less |  2 +-
 .../src/less/components/editor.less             |  2 +-
 .../src/less/components/html/umb-alert.less     | 12 ++++++------
 .../src/less/components/tree/umb-tree-item.less | 10 +++++++---
 .../src/less/components/tree/umb-tree.less      |  2 +-
 .../src/less/components/umb-badge.less          |  2 +-
 .../src/less/components/umb-node-preview.less   |  4 ++--
 .../less/components/umb-progress-circle.less    |  2 +-
 .../src/less/dashboards.less                    |  2 +-
 src/Umbraco.Web.UI.Client/src/less/main.less    |  3 +--
 src/Umbraco.Web.UI.Client/src/less/mixins.less  |  4 ++--
 .../src/less/sections.less                      |  1 +
 .../src/less/variables.less                     | 17 +++++++++++------
 .../components/editor/umb-editor-menu.html      |  2 +-
 .../src/views/components/umb-confirm.html       |  8 ++++----
 .../src/views/content/delete.html               |  4 ++--
 .../propertyeditors/listview/listview.html      |  2 +-
 19 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index b65bf447e7e1..0a25471c4fe6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -245,13 +245,21 @@
 
             function setAuditTrailLogTypeColor(auditTrail) {
                 angular.forEach(auditTrail, function (item) {
+                    
+                    console.log(item.logType);
+                    
                     switch (item.logType) {
+                        case "Save":
+                            item.logTypeColor = "primary";
+                            break;
                         case "Publish":
                         case "PublishVariant":
                             item.logTypeColor = "success";
                             break;
                         case "Unpublish":
                         case "UnpublishVariant":
+                            item.logTypeColor = "warning";
+                        break;
                         case "Delete":
                             item.logTypeColor = "danger";
                             break;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js
index 18e08bb97338..ca9e7a671214 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js
@@ -54,7 +54,8 @@ function confirmDirective() {
         scope: {
             onConfirm: '=',
             onCancel: '=',
-            caption: '@'
+            caption: '@',
+            confirmButtonStyle: '@'
         },
         link: function (scope, element, attr, ctrl) {
             scope.showCancel = false;
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index dee591c437e4..00deec0a94af 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -200,7 +200,7 @@ input[type="button"] {
   .buttonBackground(@blueExtraDark, @blueDark, @pinkLight, @u-white);
 }
 // Made for Umbraco, 2019, used for buttons that has to stand back.
-.btn-transparent {
+.btn-white {
   .buttonBackground(@btnWhiteBackground, @btnWhiteBackgroundHighlight, @btnWhiteType, @btnWhiteTypeHover);
 }
 // Inverse appears as dark gray
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index bb54b254dfe1..d576c33b670d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -133,7 +133,7 @@ a.umb-editor-header__close-split-view:hover {
 }
 
 .umb-editor-header {
-	.btn-transparent {
+	.btn-white {
         height:69px;
         border-radius: 0;
         padding-left: 30px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
index 4cbee6b15e58..934992fc6e1b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
@@ -6,16 +6,16 @@
 }
 
 .umb-alert--info {
-    background-color: @turquoise-washed;
-    border: 1px solid @blueMid;
+    background-color: @blueLight;
+    border: 1px solid @blueDark;
 }
 
 .umb-alert--warning {
-    background-color: @yellow-washed;
-    border: 1px solid @yellow;
+    background-color: @pinkLight;
+    border: 1px solid @pink;
 }
 
 .umb-alert--danger {
-    background-color: @red-washed;
-    border: 1px solid @red;
+    background-color: @pinkLight;
+    border: 1px solid @pink;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 16bff41fd784..377b61c22582 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -2,7 +2,11 @@
     display: block;
     min-width: 100%;
     width: auto;
-
+    
+    .umb-tree-item__label {
+        user-select: none;
+    }
+    
     &:hover ins {
         visibility: visible;
         cursor: pointer
@@ -14,7 +18,7 @@
     &:hover .umb-tree-item__label {
         overflow: hidden;
         margin-right: 6px;
-    }    
+    }
     
     // Loading Animation
     // ------------------------
@@ -47,7 +51,7 @@
     
     // override small icon color. TODO => check usage 
     &:before {
-        color: @pink;
+        color: @blue;
     }
     
     .umb-options {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 8da00f5d0f6b..6b6f0c5f605c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -271,7 +271,7 @@ body.touch .umb-tree {
 
 .is-container::before {
     content: "\e04e";
-    color: @turquoise;
+    color: @blue;
     font-size: 8px;
     padding-left: 13px;
     padding-top: 8px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
index cad6dbaf2f6b..9a18bef2de06 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
@@ -30,7 +30,7 @@
 }
 
 .umb-badge--warning {
-    background-color: @yellow-d1;
+    background-color: @orange;
     color: @white;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 233441c5d95e..b10e761d6839 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -71,12 +71,12 @@
     margin-right: 5px;
     font-size: 13px;
     font-weight: bold;
-    color: @ui-action-disgrete-type;
+    color: @ui-action-type;
     cursor: pointer;
 }
 
 .umb-node-preview__action:hover {
-    color: @ui-action-disgrete-type-hover;
+    color: @ui-action-type-hover;
     text-decoration: none;
     opacity: 1;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-circle.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-circle.less
index 348d7bb5db01..5e98075fc2c0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-circle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-circle.less
@@ -17,7 +17,7 @@
 }
 
 .umb-progress-circle__highlight--primary {
-    stroke: @turquoise;
+    stroke: @blue;
 }
 
 .umb-progress-circle__highlight--secondary {
diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards.less b/src/Umbraco.Web.UI.Client/src/less/dashboards.less
index cc13ad31fdd3..0ddef2e8b123 100644
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/dashboards.less
@@ -133,4 +133,4 @@
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 12a13e11ed78..3a8228bde527 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -495,7 +495,7 @@ table thead a {
 // ------------------------
 
 .umb-loader{
-background-color: @turquoise-d1;
+background-color: @blue;
 margin-top:0;
 margin-left:-100%;
 -moz-animation-name:bounce_loadingProgressG;
@@ -671,4 +671,3 @@ input[type=checkbox]:checked + .input-label--small {
 	width: 1px !important;
 	overflow: hidden;
 }
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index a9f10bb1965f..b67fd1dd2507 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -538,8 +538,8 @@
   }
   
   &.disabled, &[disabled] {
-    color: @textColor;
-    background-color: @gray-4;
+    color: @white;
+    background-color: @sand-2;
   }
   /*
   // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index c0a95c97c567..cf362a67f0ec 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -57,6 +57,7 @@ ul.sections>li.current>a .section__name,
 ul.sections>li>a:hover .section__name,
 ul.sections>li>a:focus .section__name {
 	opacity: 1;
+    -webkit-font-smoothing: subpixel-antialiased;
 }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index c370a2090abc..6c906f316104 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -75,9 +75,10 @@
 @gray-9:                #E9E9EB;
 @gray-10:               #F3F3F5;
 
-@sand-2:                hsl(50, 20%, 88%);// added 2019
-@sand-5:                #f3efe9;// added 2019
-@sand-7:                hsl(50, 20%, 97%);// added 2019
+@sand-1:                hsl(22, 33%, 93%);// added 2019
+@sand-2:                hsl(22, 34%, 88%);// added 2019
+@sand-5:                hsl(22, 31%, 93%);// added 2019
+@sand-7:                hsl(22, 26%, 97%);// added 2019
 
 
 // Additional Icon Colours
@@ -112,9 +113,11 @@
 @orange:                #f79c37;// updated 2019
 @pink:                  #D93F4C;// #C3325F;// update 2019
 @pinkLight:             #f5c1bc;// added 2019
+@pinkRedLight:          #ff8a89;// added 2019
 @brown:                 #9d8057;// added 2019
 @brownLight:            #e4e0dd;// added 2019
 @brownGrayLight:        #f3f2f1;// added 2019
+@orange:                #ff9412;// added 2019
 //@claus: #f6efe7;
 //@claus2: #f2ebe6;
 //@claus3: #535963; //#56777A
@@ -141,8 +144,8 @@
 @ui-active-type:        @blueExtraDark;
 @ui-active-type-hover:  @blueMid;
 
-@ui-selected:           @brownLight;
-@ui-selected-hover:     ligthen(@brownLight, 10);
+@ui-selected:           @sand-1;
+@ui-selected-hover:     ligthen(@sand-1, 10);
 @ui-selected-type:           @blueMid;
 @ui-selected-type-hover:     @blueMid;
 
@@ -157,6 +160,8 @@
 
 @ui-action:             @blueMid;
 @ui-action-hover:       @blueMid;
+@ui-action-type:             @blueExtraDark;
+@ui-action-type-hover:       @blueMid;
 
 @ui-action-disgrete:              white;
 @ui-action-disgrete-hover:        @brownLight;
@@ -262,7 +267,7 @@
 // -------------------------
 @appHeaderHeight:       55px;
 @bodyBackground:        @gray-10;
-@textColor:             @gray-2;
+@textColor:             #000;
 
 @editorHeaderHeight:    70px;
 @editorFooterHeight:    50px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
index 65935c379514..c6216704627c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
@@ -2,7 +2,7 @@
 
     <umb-button
         type="button"
-        button-style="transparent"
+        button-style="white"
         action="dropdown.isOpen = !dropdown.isOpen"
         label-key="general_actions"
         show-caret="true">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
index ebe829ea521d..70839f2625e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
@@ -1,10 +1,10 @@
 <div>
     <p ng-hide="!caption" class="umb-abstract">{{caption}}</p>
-    
+
     <div class="umb-pane btn-toolbar umb-btn-toolbar">
-    	<div class="control-group umb-control-group">	
+    	<div class="control-group umb-control-group">
     		<a ng-if="showCancel" href class="btn btn-link" ng-click="onCancel()"><localize key="general_cancel">Cancel</localize></a>
-    		<a ng-if="showConfirm" href class="btn btn-primary" ng-click="onConfirm()"><localize key="general_ok">Ok</localize></a>
-    	</div>	
+    		<a ng-if="showConfirm" href class="btn btn-{{confirmButtonStyle || 'primary'}}" ng-click="onConfirm()"><localize key="general_ok">Ok</localize></a>
+    	</div>
 	</div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
index 8e85bfeaeb73..047776de5485 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -5,11 +5,11 @@
             <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
         </p>
 
-        <div class="umb-alert umb-alert--info">
+        <div class="umb-alert umb-alert--warning">
             <localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
         </div>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        <umb-confirm on-confirm="performDelete" confirm-button-style="danger" on-cancel="cancel"></umb-confirm>
 
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index abf571cfbfc8..dba6a41a7c9b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -37,7 +37,7 @@
                    </div>
 
                    <div class="btn-group" ng-show="createAllowedButtonMultiWithBlueprints">
-                       <a class="btn btn-action dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
+                       <a class="btn btn-white dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
                            <localize key="actions_create">Create</localize>
                            <span class="caret"></span>
                        </a>

From 66ca8c601812268b38f1dd8f852704945e05fa7e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 29 Jan 2019 12:25:23 +0100
Subject: [PATCH 120/421] Respect the name casing when creating a new template

---
 src/Umbraco.Core/Services/IFileService.cs     |  2 +-
 .../Services/Implement/FileService.cs         |  7 ++---
 .../Services/FileServiceTests.cs              | 27 ++++++++++++++-----
 src/Umbraco.Web/Editors/TemplateController.cs |  2 +-
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index d32c984b5e0a..8596424b03d8 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -200,7 +200,7 @@ public interface IFileService : IService
         /// </returns>
         Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = 0);
 
-        ITemplate CreateTemplateWithIdentity(string name, string content, ITemplate masterTemplate = null, int userId = 0);
+        ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = 0);
 
         /// <summary>
         /// Deletes a template by its alias
diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index f49395d73d55..658e3b93a519 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -390,16 +390,17 @@ public Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateFo
         /// Create a new template, setting the content if a view exists in the filesystem
         /// </summary>
         /// <param name="name"></param>
+        /// <param name="alias"></param>
         /// <param name="content"></param>
         /// <param name="masterTemplate"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-        public ITemplate CreateTemplateWithIdentity(string name, string content, ITemplate masterTemplate = null, int userId = 0)
+        public ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = 0)
         {
             // file might already be on disk, if so grab the content to avoid overwriting
-            var template = new Template(name, name)
+            var template = new Template(name, alias)
             {
-                Content = GetViewContent(name) ?? content
+                Content = GetViewContent(alias) ?? content
             };
             
             if (masterTemplate != null)
diff --git a/src/Umbraco.Tests/Services/FileServiceTests.cs b/src/Umbraco.Tests/Services/FileServiceTests.cs
index b419ae186fda..fa27a3ee8140 100644
--- a/src/Umbraco.Tests/Services/FileServiceTests.cs
+++ b/src/Umbraco.Tests/Services/FileServiceTests.cs
@@ -19,8 +19,8 @@ public class FileServiceTests : TestWithSomeContentBase
         [Test]
         public void Create_Template_Then_Assign_Child()
         {
-            var child = ServiceContext.FileService.CreateTemplateWithIdentity("child", "test");
-            var parent = ServiceContext.FileService.CreateTemplateWithIdentity("parent", "test");
+            var child = ServiceContext.FileService.CreateTemplateWithIdentity("Child", "child", "test");
+            var parent = ServiceContext.FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
 
             child.SetMasterTemplate(parent);
             ServiceContext.FileService.SaveTemplate(child);
@@ -34,8 +34,8 @@ public void Create_Template_Then_Assign_Child()
         [Test]
         public void Create_Template_With_Child_Then_Unassign()
         {
-            var parent = ServiceContext.FileService.CreateTemplateWithIdentity("parent", "test");
-            var child = ServiceContext.FileService.CreateTemplateWithIdentity("child", "test", parent);
+            var parent = ServiceContext.FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
+            var child = ServiceContext.FileService.CreateTemplateWithIdentity("Child", "child", "test", parent);
 
             child.SetMasterTemplate(null);
             ServiceContext.FileService.SaveTemplate(child);
@@ -48,9 +48,9 @@ public void Create_Template_With_Child_Then_Unassign()
         [Test]
         public void Can_Query_Template_Children()
         {
-            var parent = ServiceContext.FileService.CreateTemplateWithIdentity("parent", "test");
-            var child1 = ServiceContext.FileService.CreateTemplateWithIdentity("child1", "test", parent);
-            var child2 = ServiceContext.FileService.CreateTemplateWithIdentity("child2", "test", parent);
+            var parent = ServiceContext.FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
+            var child1 = ServiceContext.FileService.CreateTemplateWithIdentity("Child1", "child1", "test", parent);
+            var child2 = ServiceContext.FileService.CreateTemplateWithIdentity("Child2", "child2", "test", parent);
 
             var children = ServiceContext.FileService.GetTemplates(parent.Id).Select(x => x.Id).ToArray();
 
@@ -58,5 +58,18 @@ public void Can_Query_Template_Children()
             Assert.IsTrue(children.Contains(child2.Id));
         }
 
+        [Test]
+        public void Create_Template_With_Custom_Alias()
+        {
+            var template = ServiceContext.FileService.CreateTemplateWithIdentity("Test template", "customTemplateAlias", "test");
+
+            ServiceContext.FileService.SaveTemplate(template);
+
+            template = ServiceContext.FileService.GetTemplate(template.Id);
+
+            Assert.AreEqual("Test template", template.Name);
+            Assert.AreEqual("customTemplateAlias", template.Alias);
+        }
+
     }
 }
diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
index ac9341a095de..f91d27ceae27 100644
--- a/src/Umbraco.Web/Editors/TemplateController.cs
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -184,7 +184,7 @@ public TemplateDisplay PostSave(TemplateDisplay display)
                         throw new HttpResponseException(HttpStatusCode.NotFound);
                 }
 
-                var template = Services.FileService.CreateTemplateWithIdentity(display.Alias, display.Content, master);
+                var template = Services.FileService.CreateTemplateWithIdentity(display.Name, display.Alias, display.Content, master);
                 Mapper.Map(template, display);
             }
 

From e7b0e43d982af756a572fd69ece1574b2ec78639 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 22:38:03 +1100
Subject: [PATCH 121/421] removes scripting.config, EnableSplashWhileLoading,
 RenderingEngine, and more!

---
 .../UmbracoSettings/ContentElement.cs         |  5 --
 .../UmbracoSettings/IContentSection.cs        |  4 +-
 src/Umbraco.Core/RenderingEngine.cs           |  9 ----
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 -
 src/Umbraco.Tests/Cache/AppCacheTests.cs      | 52 ++++++++++---------
 .../UmbracoSettings/ContentElementTests.cs    |  6 +--
 .../Routing/RenderRouteHandlerTests.cs        |  1 -
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      | 14 -----
 .../config/scripting.Release.config           | 11 ----
 src/Umbraco.Web.UI/config/scripting.config    | 11 ----
 src/Umbraco.Web.UI/web.Template.config        |  2 -
 .../Cache/ContentCacheRefresher.cs            |  4 +-
 src/Umbraco.Web/Cache/MacroCacheRefresher.cs  |  9 ----
 .../Editors/DashboardController.cs            |  6 +--
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  3 --
 src/Umbraco.Web/Mvc/UmbracoPageResult.cs      | 31 +++++------
 src/Umbraco.Web/Routing/PublishedRequest.cs   | 39 ++------------
 src/Umbraco.Web/Routing/PublishedRouter.cs    | 24 ---------
 src/Umbraco.Web/Templates/TemplateRenderer.cs | 39 ++++++--------
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 src/Umbraco.Web/UmbracoInjectedModule.cs      |  6 +--
 .../umbraco.presentation/MacroCacheContent.cs | 28 ----------
 22 files changed, 69 insertions(+), 237 deletions(-)
 delete mode 100644 src/Umbraco.Core/RenderingEngine.cs
 delete mode 100644 src/Umbraco.Web.UI/config/scripting.Release.config
 delete mode 100644 src/Umbraco.Web.UI/config/scripting.config
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index 91627edb8be7..abeaa8542a82 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -40,9 +40,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         [ConfigurationProperty("XmlContentCheckForDiskChanges")]
         internal InnerTextConfigurationElement<bool> XmlContentCheckForDiskChanges => GetOptionalTextElement("XmlContentCheckForDiskChanges", false);
 
-        [ConfigurationProperty("EnableSplashWhileLoading")]
-        internal InnerTextConfigurationElement<bool> EnableSplashWhileLoading => GetOptionalTextElement("EnableSplashWhileLoading", false);
-
         [ConfigurationProperty("PropertyContextHelpOption")]
         internal InnerTextConfigurationElement<string> PropertyContextHelpOption => GetOptionalTextElement("PropertyContextHelpOption", "text");
 
@@ -110,8 +107,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         bool IContentSection.XmlContentCheckForDiskChanges => XmlContentCheckForDiskChanges;
 
-        bool IContentSection.EnableSplashWhileLoading => EnableSplashWhileLoading;
-
         string IContentSection.PropertyContextHelpOption => PropertyContextHelpOption;
 
         bool IContentSection.ForceSafeAliases => ForceSafeAliases;
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index fe2eea5d9122..00dc7f073d13 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -35,8 +35,6 @@ public interface IContentSection : IUmbracoConfigurationSection
 
         bool XmlContentCheckForDiskChanges { get; }
 
-        bool EnableSplashWhileLoading { get; }
-
         string PropertyContextHelpOption { get; }
 
         bool ForceSafeAliases { get; }
@@ -67,4 +65,4 @@ public interface IContentSection : IUmbracoConfigurationSection
 
         string LoginBackgroundImage { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/RenderingEngine.cs b/src/Umbraco.Core/RenderingEngine.cs
deleted file mode 100644
index ac1c9dce565d..000000000000
--- a/src/Umbraco.Core/RenderingEngine.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Umbraco.Core
-{
-    public enum RenderingEngine
-    {
-        Unknown,
-        Mvc,
-        WebForms
-    }
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index fb54e4a4f419..588c66cd3d80 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -1308,7 +1308,6 @@
     <Compile Include="PropertyEditors\ValueConverters\UploadPropertyConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\YesNoValueConverter.cs" />
     <Compile Include="ReflectionUtilities.cs" />
-    <Compile Include="RenderingEngine.cs" />
     <Compile Include="RuntimeLevel.cs" />
     <Compile Include="RuntimeState.cs" />
     <Compile Include="Runtime\CoreRuntimeComposer.cs" />
diff --git a/src/Umbraco.Tests/Cache/AppCacheTests.cs b/src/Umbraco.Tests/Cache/AppCacheTests.cs
index 29d61cc14a19..3a86feb90a7e 100644
--- a/src/Umbraco.Tests/Cache/AppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/AppCacheTests.cs
@@ -3,7 +3,6 @@
 using System.Web.UI;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
-using umbraco;
 
 namespace Umbraco.Tests.Cache
 {
@@ -104,9 +103,9 @@ public void Ensures_Delegate_Result_Is_Cached_Once()
         [Test]
         public void Can_Get_By_Search()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
-            var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2");
-            var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3");
+            var cacheContent1 = new MacroCacheContent();
+            var cacheContent2 = new MacroCacheContent();
+            var cacheContent3 = new MacroCacheContent();
             var cacheContent4 = new LiteralControl();
             AppCache.Get("Test1", () => cacheContent1);
             AppCache.Get("Tester2", () => cacheContent2);
@@ -123,9 +122,9 @@ public void Can_Get_By_Search()
         [Test]
         public void Can_Clear_By_Expression()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
-            var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2");
-            var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3");
+            var cacheContent1 = new MacroCacheContent();
+            var cacheContent2 = new MacroCacheContent();
+            var cacheContent3 = new MacroCacheContent();
             var cacheContent4 = new LiteralControl();
             AppCache.Get("TTes1t", () => cacheContent1);
             AppCache.Get("Tester2", () => cacheContent2);
@@ -142,9 +141,9 @@ public void Can_Clear_By_Expression()
         [Test]
         public void Can_Clear_By_Search()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
-            var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2");
-            var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3");
+            var cacheContent1 = new MacroCacheContent();
+            var cacheContent2 = new MacroCacheContent();
+            var cacheContent3 = new MacroCacheContent();
             var cacheContent4 = new LiteralControl();
             AppCache.Get("Test1", () => cacheContent1);
             AppCache.Get("Tester2", () => cacheContent2);
@@ -161,9 +160,9 @@ public void Can_Clear_By_Search()
         [Test]
         public void Can_Clear_By_Key()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
-            var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2");
-            var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3");
+            var cacheContent1 = new MacroCacheContent();
+            var cacheContent2 = new MacroCacheContent();
+            var cacheContent3 = new MacroCacheContent();
             var cacheContent4 = new LiteralControl();
             AppCache.Get("Test1", () => cacheContent1);
             AppCache.Get("Test2", () => cacheContent2);
@@ -181,9 +180,9 @@ public void Can_Clear_By_Key()
         [Test]
         public void Can_Clear_All_Items()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
-            var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2");
-            var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3");
+            var cacheContent1 = new MacroCacheContent();
+            var cacheContent2 = new MacroCacheContent();
+            var cacheContent3 = new MacroCacheContent();
             var cacheContent4 = new LiteralControl();
             AppCache.Get("Test1", () => cacheContent1);
             AppCache.Get("Test2", () => cacheContent2);
@@ -200,7 +199,7 @@ public void Can_Clear_All_Items()
         [Test]
         public void Can_Add_When_Not_Available()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
+            var cacheContent1 = new MacroCacheContent();
             AppCache.Get("Test1", () => cacheContent1);
             Assert.AreEqual(1, GetTotalItemCount);
         }
@@ -208,7 +207,7 @@ public void Can_Add_When_Not_Available()
         [Test]
         public void Can_Get_When_Available()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
+            var cacheContent1 = new MacroCacheContent();
             var result = AppCache.Get("Test1", () => cacheContent1);
             var result2 = AppCache.Get("Test1", () => cacheContent1);
             Assert.AreEqual(1, GetTotalItemCount);
@@ -218,9 +217,9 @@ public void Can_Get_When_Available()
         [Test]
         public void Can_Remove_By_Type_Name()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
-            var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2");
-            var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3");
+            var cacheContent1 = new MacroCacheContent();
+            var cacheContent2 = new MacroCacheContent();
+            var cacheContent3 = new MacroCacheContent();
             var cacheContent4 = new LiteralControl();
             AppCache.Get("Test1", () => cacheContent1);
             AppCache.Get("Test2", () => cacheContent2);
@@ -238,9 +237,9 @@ public void Can_Remove_By_Type_Name()
         [Test]
         public void Can_Remove_By_Strong_Type()
         {
-            var cacheContent1 = new MacroCacheContent(new LiteralControl(), "Test1");
-            var cacheContent2 = new MacroCacheContent(new LiteralControl(), "Test2");
-            var cacheContent3 = new MacroCacheContent(new LiteralControl(), "Test3");
+            var cacheContent1 = new MacroCacheContent();
+            var cacheContent2 = new MacroCacheContent();
+            var cacheContent3 = new MacroCacheContent();
             var cacheContent4 = new LiteralControl();
             AppCache.Get("Test1", () => cacheContent1);
             AppCache.Get("Test2", () => cacheContent2);
@@ -253,5 +252,10 @@ public void Can_Remove_By_Strong_Type()
 
             Assert.AreEqual(1, GetTotalItemCount);
         }
+
+        //just used for these tests
+        private class MacroCacheContent
+        {
+        }
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 962d6d13a90e..d1b86c6c37cc 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -130,11 +130,7 @@ public virtual void XmlContentCheckForDiskChanges()
         {
             Assert.IsTrue(SettingsSection.Content.XmlContentCheckForDiskChanges);
         }
-        [Test]
-        public void EnableSplashWhileLoading()
-        {
-            Assert.IsFalse(SettingsSection.Content.EnableSplashWhileLoading);
-        }
+        
         [Test]
         public void PropertyContextHelpOption()
         {
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 569f5382e8da..71e3836b3d81 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -97,7 +97,6 @@ public void Umbraco_Route_Umbraco_Defined_Controller_Action()
             var frequest = publishedRouter.CreateRequest(umbracoContext);
             frequest.PublishedContent = umbracoContext.ContentCache.GetById(1174);
             frequest.TemplateModel = template;
-            frequest.RenderingEngine = RenderingEngine.Mvc;
 
             var handler = new RenderRouteHandler(umbracoContext, new TestControllerFactory(umbracoContext, Mock.Of<ILogger>()));
 
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index f05a7b4eedda..5e61de213285 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -206,15 +206,6 @@
       <DependentUpon>tinyMceConfig.config</DependentUpon>
       <SubType>Designer</SubType>
     </None>
-    <None Include="Config\scripting.Release.config">
-      <DependentUpon>scripting.config</DependentUpon>
-    </None>
-    <None Include="Config\Dashboard.Release.config">
-      <DependentUpon>Dashboard.config</DependentUpon>
-      <SubType>Designer</SubType>
-    <None Include="Config\feedProxy.Release.config">
-      <DependentUpon>feedProxy.config</DependentUpon>
-    </None>
     <Content Include="Umbraco\Install\Views\Index.cshtml" />
     <Content Include="Media\Web.config" />
     <Content Include="Properties\Settings.settings">
@@ -249,7 +240,6 @@
     <Content Include="Config\ClientDependency.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\scripting.config" />
     <Content Include="Umbraco\Views\Default.cshtml" />
     <Content Include="Umbraco\PartialViewMacros\Templates\EditProfile.cshtml" />
     <Content Include="Umbraco\PartialViewMacros\Templates\Empty.cshtml" />
@@ -307,10 +297,6 @@
     <None Include="web.Template.config">
       <SubType>Designer</SubType>
     </None>
-    <Content Include="Config\Dashboard.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Config\404handlers.config" />
     <Content Include="Config\tinyMceConfig.config">
       <SubType>Designer</SubType>
     </Content>
diff --git a/src/Umbraco.Web.UI/config/scripting.Release.config b/src/Umbraco.Web.UI/config/scripting.Release.config
deleted file mode 100644
index 085856c52e45..000000000000
--- a/src/Umbraco.Web.UI/config/scripting.Release.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<microsoft.scripting>
-  <languages>
-    <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.6" type="IronPython.Runtime.PythonContext, IronPython, Version=2.6.10920.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-    <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby 1.0" type="IronRuby.Runtime.RubyContext, IronRuby, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-  </languages>
-
-  <options>
-    <set language="Ruby" option="LibraryPaths" value="..\..\Languages\Ruby\libs\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\1.8\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\1.8\" />
-  </options>
-</microsoft.scripting>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/scripting.config b/src/Umbraco.Web.UI/config/scripting.config
deleted file mode 100644
index 085856c52e45..000000000000
--- a/src/Umbraco.Web.UI/config/scripting.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<microsoft.scripting>
-  <languages>
-    <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.6" type="IronPython.Runtime.PythonContext, IronPython, Version=2.6.10920.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-    <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby 1.0" type="IronRuby.Runtime.RubyContext, IronRuby, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-  </languages>
-
-  <options>
-    <set language="Ruby" option="LibraryPaths" value="..\..\Languages\Ruby\libs\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\1.8\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\1.8\" />
-  </options>
-</microsoft.scripting>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index e7399f600be6..ab6e9258b996 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -8,7 +8,6 @@
   -->
 
     <configSections>
-        <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
         <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
 
         <sectionGroup name="umbracoConfiguration">
@@ -30,7 +29,6 @@
         <HealthChecks configSource="config\HealthChecks.config" />
     </umbracoConfiguration>
 
-    <microsoft.scripting configSource="config\scripting.config" />
     <clientDependency configSource="config\ClientDependency.config" />
 
     <appSettings>
diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
index 99a1e6c803cc..e4d2c2e4da44 100644
--- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
@@ -102,8 +102,7 @@ public override void Refresh(JsonPayload[] payloads)
             if (payloads.Any(x => x.ChangeTypes.HasType(TreeChangeTypes.RefreshAll)) || publishedChanged)
             {
                 // when a public version changes
-                Current.AppCaches.ClearPartialViewCache();
-                MacroCacheRefresher.ClearMacroContentCache(AppCaches); // just the content
+                AppCaches.ClearPartialViewCache();
             }
 
             base.Refresh(payloads);
@@ -160,7 +159,6 @@ public static void RefreshContentTypes(AppCaches appCaches)
             // simple for now, just clear the whole thing
 
             appCaches.ClearPartialViewCache();
-            MacroCacheRefresher.ClearMacroContentCache(appCaches); // just the content
 
             appCaches.IsolatedCaches.ClearCache<PublicAccessEntry>();
             appCaches.IsolatedCaches.ClearCache<IContent>();
diff --git a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
index b224a071519d..741604ee8124 100644
--- a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
@@ -37,9 +37,6 @@ public override void RefreshAll()
 
             ClearAllIsolatedCacheByEntityType<IMacro>();
 
-            //TODO: WB Was I too aggresive with cleanup?
-            AppCaches.RuntimeCache.ClearOfType<MacroCacheContent>();
-
             base.RefreshAll();
         }
 
@@ -111,12 +108,6 @@ internal static string[] GetCacheKeysForAlias(string alias)
             return GetAllMacroCacheKeys().Select(x => x + alias).ToArray();
         }
 
-        public static void ClearMacroContentCache(AppCaches appCaches)
-        {
-            //TODO: WB Was I too aggresive with cleanup?
-            appCaches.RuntimeCache.ClearOfType<MacroCacheContent>();
-        }
-
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index 91a966cef7d8..8ae59b974c6f 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -154,11 +154,7 @@ public async Task<HttpResponseMessage> GetRemoteXml(string site, string url)
                     break;
 
                 default:
-                    //Throw error
-                    return new HttpResponseMessage(HttpStatusCode.Unauthorized)
-                    {
-                        Content = new StringContent($"The Site {site} and {url} is not on the whitelist"),
-                    };
+                    return new HttpResponseMessage(HttpStatusCode.NotFound);
             }
 
 
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 48284769ec17..4cd7e3b0e0aa 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -347,9 +347,6 @@ internal IHttpHandler GetHandlerOnMissingTemplate(PublishedRequest request)
                 // to Mvc since Mvc can't do much
                 return new PublishedContentNotFoundHandler("In addition, no template exists to render the custom 404.");
 
-            if (request.RenderingEngine != RenderingEngine.Mvc) // else ?
-                return new PublishedContentNotFoundHandler("In addition, no rendering engine exists to render the custom 404.");
-
             return null;
         }
 
diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
index 96aa7f9039fe..ea832e13526b 100644
--- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
@@ -30,24 +30,21 @@ public override void ExecuteResult(ControllerContext context)
 
             var routeDef = (RouteDefinition)context.RouteData.DataTokens[Umbraco.Core.Constants.Web.UmbracoRouteDefinitionDataToken];
 
-            if (routeDef.PublishedRequest.RenderingEngine == RenderingEngine.Mvc)
+            var factory = ControllerBuilder.Current.GetControllerFactory();
+            context.RouteData.Values["action"] = routeDef.ActionName;
+            ControllerBase controller = null;
+
+            try
+            {
+                controller = CreateController(context, factory, routeDef);
+
+                CopyControllerData(context, controller);
+
+                ExecuteControllerAction(context, controller);
+            }
+            finally
             {
-                var factory = ControllerBuilder.Current.GetControllerFactory();
-                context.RouteData.Values["action"] = routeDef.ActionName;
-                ControllerBase controller = null;
-
-                try
-                {
-                    controller = CreateController(context, factory, routeDef);
-
-                    CopyControllerData(context, controller);
-
-                    ExecuteControllerAction(context, controller);
-                }
-                finally
-                {
-                    CleanupController(controller, factory);
-                }
+                CleanupController(controller, factory);
             }
         }
 
diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs
index cccc89074d20..9a775adb85e5 100644
--- a/src/Umbraco.Web/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedRequest.cs
@@ -6,10 +6,8 @@
 using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
-using RenderingEngine = Umbraco.Core.RenderingEngine;
 
 namespace Umbraco.Web.Routing
 {
@@ -24,7 +22,6 @@ public class PublishedRequest
         private bool _readonly; // after prepared
         private bool _readonlyUri; // after preparing
         private Uri _uri; // clean uri, no virtual dir, no trailing slash nor .aspx, nothing
-        private ITemplate _template; // template model if any else null
         private bool _is404;
         private DomainAndUri _domain;
         private CultureInfo _culture;
@@ -43,7 +40,6 @@ internal PublishedRequest(PublishedRouter publishedRouter, UmbracoContext umbrac
             UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
             _publishedRouter = publishedRouter ?? throw new ArgumentNullException(nameof(publishedRouter));
             Uri = uri ?? umbracoContext.CleanedUmbracoUrl;
-            RenderingEngine = RenderingEngine.Unknown;
         }
 
         /// <summary>
@@ -174,8 +170,7 @@ public void SetInternalRedirectPublishedContent(IPublishedContent content)
             // else
 
             // save
-            var template = _template;
-            var renderingEngine = RenderingEngine;
+            var template = TemplateModel;
 
             // set published content - this resets the template, and sets IsInternalRedirect to false
             PublishedContent = content;
@@ -185,8 +180,7 @@ public void SetInternalRedirectPublishedContent(IPublishedContent content)
             if (isInternalRedirect && Current.Configs.Settings().WebRouting.InternalRedirectPreservesTemplate)
             {
                 // restore
-                _template = template;
-                RenderingEngine = renderingEngine;
+                TemplateModel = template;
             }
         }
 
@@ -234,26 +228,12 @@ public void SetIsInitialPublishedContent()
         /// <summary>
         /// Gets or sets the template model to use to display the requested content.
         /// </summary>
-        internal ITemplate TemplateModel
-        {
-            get
-            {
-                return _template;
-            }
-
-            set
-            {
-                _template = value;
-                RenderingEngine = RenderingEngine.Unknown; // reset
-                if (_template != null)
-                    RenderingEngine = _publishedRouter.FindTemplateRenderingEngine(_template.Alias);
-            }
-        }
+        internal ITemplate TemplateModel { get; set; }
 
         /// <summary>
         /// Gets the alias of the template to use to display the requested content.
         /// </summary>
-        public string TemplateAlias => _template?.Alias;
+        public string TemplateAlias => TemplateModel?.Alias;
 
         /// <summary>
         /// Tries to set the template to use to display the requested content.
@@ -309,7 +289,7 @@ public void ResetTemplate()
         /// <summary>
         /// Gets a value indicating whether the content request has a template.
         /// </summary>
-        public bool HasTemplate => _template != null;
+        public bool HasTemplate => TemplateModel != null;
 
         internal void UpdateOnMissingTemplate()
         {
@@ -361,15 +341,6 @@ public CultureInfo Culture
 
         #endregion
 
-        #region Rendering
-
-        /// <summary>
-        /// Gets or sets whether the rendering engine is MVC or WebForms.
-        /// </summary>
-        public RenderingEngine RenderingEngine { get; internal set; }
-
-        #endregion
-
         #region Status
 
         /// <summary>
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 63def7a1cd5e..7ffb01e7f643 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -15,7 +15,6 @@
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Web.Security;
-using RenderingEngine = Umbraco.Core.RenderingEngine;
 
 namespace Umbraco.Web.Routing
 {
@@ -365,29 +364,6 @@ internal void HandleWildcardDomains(PublishedRequest request)
 
         #region Rendering engine
 
-        /// <summary>
-        /// Finds the rendering engine to use to render a template specified by its alias.
-        /// </summary>
-        /// <param name="alias">The alias of the template.</param>
-        /// <returns>The rendering engine, or Unknown if the template was not found.</returns>
-        internal RenderingEngine FindTemplateRenderingEngine(string alias)
-        {
-            if (string.IsNullOrWhiteSpace(alias))
-                return RenderingEngine.Unknown;
-
-            alias = alias.Replace('\\', '/'); // forward slashes only
-
-            // NOTE: we could start with what's the current default?
-
-            // TODO: bad - we probably should be using the appropriate filesystems!
-
-            if (FindTemplateRenderingEngineInDirectory(new DirectoryInfo(IOHelper.MapPath(SystemDirectories.MvcViews)),
-                    alias, new[] { ".cshtml", ".vbhtml" }))
-                return RenderingEngine.Mvc;
-
-            return RenderingEngine.Unknown;
-        }
-
         internal bool FindTemplateRenderingEngineInDirectory(DirectoryInfo directory, string alias, string[] extensions)
         {
             if (directory == null || directory.Exists == false)
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index 686f8e21e2c7..24526de7b23e 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -136,31 +136,22 @@ private void ExecuteTemplateRendering(TextWriter sw, PublishedRequest request)
             //var queryString = _umbracoContext.HttpContext.Request.QueryString.AllKeys
             //    .ToDictionary(key => key, key => context.Request.QueryString[key]);
 
-            switch (request.RenderingEngine)
+            var requestContext = new RequestContext(_umbracoContext.HttpContext, new RouteData()
             {
-                case RenderingEngine.Mvc:
-                    var requestContext = new RequestContext(_umbracoContext.HttpContext, new RouteData()
-                    {
-                        Route = RouteTable.Routes["Umbraco_default"]
-                    });
-                    var routeHandler = new RenderRouteHandler(_umbracoContext, ControllerBuilder.Current.GetControllerFactory());
-                    var routeDef = routeHandler.GetUmbracoRouteDefinition(requestContext, request);
-                    var renderModel = new ContentModel(request.PublishedContent);
-                    //manually add the action/controller, this is required by mvc
-                    requestContext.RouteData.Values.Add("action", routeDef.ActionName);
-                    requestContext.RouteData.Values.Add("controller", routeDef.ControllerName);
-                    //add the rest of the required route data
-                    routeHandler.SetupRouteDataForRequest(renderModel, requestContext, request);
-
-                    var stringOutput = RenderUmbracoRequestToString(requestContext);
-
-                    sw.Write(stringOutput);
-                    break;
-                case RenderingEngine.WebForms:
-                default:
-                    throw new Exception("We no longer support WebForms in Umbraco");
-            }
-
+                Route = RouteTable.Routes["Umbraco_default"]
+            });
+            var routeHandler = new RenderRouteHandler(_umbracoContext, ControllerBuilder.Current.GetControllerFactory());
+            var routeDef = routeHandler.GetUmbracoRouteDefinition(requestContext, request);
+            var renderModel = new ContentModel(request.PublishedContent);
+            //manually add the action/controller, this is required by mvc
+            requestContext.RouteData.Values.Add("action", routeDef.ActionName);
+            requestContext.RouteData.Values.Add("controller", routeDef.ControllerName);
+            //add the rest of the required route data
+            routeHandler.SetupRouteDataForRequest(renderModel, requestContext, request);
+
+            var stringOutput = RenderUmbracoRequestToString(requestContext);
+
+            sw.Write(stringOutput);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 2d30c27c2749..c3d3707fd307 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -261,7 +261,6 @@
     <Compile Include="Trees\TreeCollection.cs" />
     <Compile Include="UI\JavaScript\ClientDependencyConfiguration.cs" />
     <Compile Include="Editors\Binders\BlueprintItemBinder.cs" />
-    <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
     <Compile Include="UmbracoApplicationBase.cs" />
     <Compile Include="WebApi\HttpActionContextExtensions.cs" />
     <Compile Include="Models\ContentEditing\IContentSave.cs" />
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 9c413402b8a3..cc17d32752f0 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -270,12 +270,12 @@ private bool EnsureRuntime(HttpContextBase httpContext, Uri uri)
                     ReportRuntime(level, "Umbraco is booting.");
 
                     // let requests pile up and wait for 10s then show the splash anyway
-                    if (Current.Configs.Settings().Content.EnableSplashWhileLoading == false
-                        && ((RuntimeState) _runtime).WaitForRunLevel(TimeSpan.FromSeconds(10))) return true;
+                    //fixme: Do we want this for some insane reason? no other site in history has this
+                    if (((RuntimeState) _runtime).WaitForRunLevel(TimeSpan.FromSeconds(10))) return true;
 
                     // redirect to booting page
                     httpContext.Response.StatusCode = 503; // temp not available
-                    const string bootUrl = "~/config/splashes/booting.aspx";
+                    const string bootUrl = "~/config/splashes/booting.aspx"; //fixme: remove booting.aspx once the above question is resolved
                     httpContext.Response.AddHeader("Retry-After", debug ? "1" : "30"); // seconds
                     httpContext.RewritePath(UriUtility.ToAbsolute(bootUrl) + "?url=" + HttpUtility.UrlEncode(uri.ToString()));
                     return false; // cannot serve content
diff --git a/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs b/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs
deleted file mode 100644
index 38fa4deca83f..000000000000
--- a/src/Umbraco.Web/umbraco.presentation/MacroCacheContent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Web.UI;
-
-namespace umbraco
-{
-    public class MacroCacheContent
-    {
-        private readonly Control _control;
-        private readonly string _id;
-
-        [Obsolete("TODO: WB This seems legacy as we reference WebForms Control type", false)]
-        public MacroCacheContent(Control control, string ID)
-        {
-            _control = control;
-            _id = ID;
-        }
-
-        public string ID
-        {
-            get { return _id; }
-        }
-
-        public Control Content
-        {
-            get { return _control; }
-        }
-    }
-}

From 2c3a2b29b2bdaa2db5c65da215ae6e44ccf9196c Mon Sep 17 00:00:00 2001
From: Benjamin Carleski <benjamin@proworks.com>
Date: Mon, 28 Jan 2019 16:27:57 -0800
Subject: [PATCH 122/421] Obsolete direct hash generation methods, and switch
 to generic GenerateHash

As noted in https://github.com/umbraco/Umbraco-CMS/issues/4292, using direct hash methods can break compliance when on restricted systems that require FIPS compliance.  This has been addressed in a few commits.  This commit goes further to obsolete methods not previously obsoleted relating to direct hashing calls, and switches a direct call to one of these methods to use the correct, generic GenerateHash.
---
 src/Umbraco.Core/StringExtensions.cs              | 2 ++
 src/Umbraco.Web/Models/Mapping/UserModelMapper.cs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index 93ff2aac5080..869181f1b91a 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -731,6 +731,7 @@ public static string GenerateHash(this string str)
         /// </summary>
         /// <param name="stringToConvert">Referrs to itself</param>
         /// <returns>The MD5 hashed string</returns>
+        [Obsolete("Please use the GenerateHash method instead. This may be removed in future versions")]
         public static string ToMd5(this string stringToConvert)
         {
             return stringToConvert.GenerateHash("MD5");
@@ -741,6 +742,7 @@ public static string ToMd5(this string stringToConvert)
         /// </summary>
         /// <param name="stringToConvert">referrs to itself</param>
         /// <returns>The SHA1 hashed string</returns>
+        [Obsolete("Please use the GenerateHash method instead. This may be removed in future versions")]
         public static string ToSHA1(this string stringToConvert)
         {
             return stringToConvert.GenerateHash("SHA1");
diff --git a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
index ad6c81e2ee9e..4c7f8c17f8e7 100644
--- a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
@@ -323,7 +323,7 @@ public override void ConfigureMappings(IConfiguration config, ApplicationContext
                 .ForMember(detail => detail.Culture, opt => opt.MapFrom(user => user.GetUserCulture(applicationContext.Services.TextService)))
                 .ForMember(
                     detail => detail.EmailHash,
-                    opt => opt.MapFrom(user => user.Email.ToLowerInvariant().Trim().ToMd5()))
+                    opt => opt.MapFrom(user => user.Email.ToLowerInvariant().Trim().GenerateHash()))
                 .ForMember(detail => detail.ParentId, opt => opt.UseValue(-1))
                 .ForMember(detail => detail.Path, opt => opt.MapFrom(user => "-1," + user.Id))
                 .ForMember(detail => detail.Notifications, opt => opt.Ignore())

From eef86689c873713741c9b8d122eec1ac851db7fa Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 23:05:59 +1100
Subject: [PATCH 123/421] Removes booting.aspx and creates embedded html pages
 for booting and failed (if those are ever seen ), renames some classes and
 namespaces, removes old cdf bundle classes

---
 .../MultiValuePropertyEditorTests.cs          |   1 -
 .../Runtimes/WebRuntimeComponentTests.cs      |   1 -
 .../JsInitializationTests.cs                  |   2 +-
 .../ServerVariablesParserTests.cs             |   2 +-
 ...RenderIndexActionSelectorAttributeTests.cs |   1 -
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |   1 -
 .../config/ClientDependency.Release.config    |   2 +-
 .../config/splashes/booting.aspx              |  29 ----
 src/Umbraco.Web/{UI => }/CdfLogger.cs         |   2 +-
 src/Umbraco.Web/CompositionExtensions.cs      |   9 +-
 .../Editors/BackOfficeController.cs           |   2 +-
 .../Editors/ContentTypeController.cs          |   5 +-
 .../Editors/DictionaryController.cs           |   3 +-
 src/Umbraco.Web/Editors/MacrosController.cs   |  41 +++---
 src/Umbraco.Web/Editors/MediaController.cs    |  10 +-
 .../Editors/PackageInstallController.cs       |  14 +-
 src/Umbraco.Web/Editors/PreviewController.cs  |   2 +-
 .../Install/Controllers/InstallController.cs  |   2 +-
 .../JavaScript/AssetInitialization.cs         |   2 +-
 .../ClientDependencyConfiguration.cs          |   2 +-
 .../{UI => }/JavaScript/CssInitialization.cs  |   8 +-
 .../JavaScript/DependencyPathRenderer.cs      |   2 +-
 .../{UI => }/JavaScript/JsInitialization.cs   |   6 +-
 .../{UI => }/JavaScript/JsInitialize.js       |   0
 src/Umbraco.Web/{UI => }/JavaScript/Main.js   |   0
 .../{UI => }/JavaScript/PreviewInitialize.js  |   0
 .../{UI => }/JavaScript/Resources.Designer.cs |  89 +++++-------
 .../{UI => }/JavaScript/Resources.resx        |   0
 .../{UI => }/JavaScript/ServerVariables.js    |   0
 .../JavaScript/ServerVariablesParser.cs       |   2 +-
 .../UmbracoClientDependencyLoader.cs          |   2 +-
 .../ContentEditing/MessagesExtensions.cs      |  13 +-
 .../Models/ContentEditing/Notification.cs     |   5 +-
 .../ContentEditing/NotificationStyle.cs}      |   9 +-
 src/Umbraco.Web/Mvc/ProfilingView.cs          |   4 +-
 src/Umbraco.Web/Mvc/ProfilingViewEngine.cs    |   4 +-
 src/Umbraco.Web/Mvc/UmbracoPageResult.cs      |   1 -
 src/Umbraco.Web/Mvc/UrlHelperExtensions.cs    |  72 ----------
 .../Routing/RedirectTrackingComponent.cs      |   3 +-
 .../Routing/RedirectTrackingComposer.cs       |   2 +-
 .../Routing/Resources/Booting.html            |   9 ++
 src/Umbraco.Web/Routing/Resources/Failed.html |   8 ++
 .../Routing/Resources/HtmlPages.Designer.cs   |  99 ++++++++++++++
 .../Routing/Resources/HtmlPages.resx          | 127 ++++++++++++++++++
 .../Runtime/WebRuntimeComponent.cs            |   3 +-
 .../UI/Bundles/JsApplicationLib.cs            |  13 --
 src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs    |  14 --
 src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs |  15 ---
 .../UI/Bundles/JsUmbracoApplicationCore.cs    |  13 --
 .../UI/Bundles/JsUmbracoApplicationUI.cs      |  14 --
 src/Umbraco.Web/UI/Bundles/JsUmbracoTree.cs   |  18 ---
 src/Umbraco.Web/Umbraco.Web.csproj            |  48 ++++---
 src/Umbraco.Web/UmbracoInjectedModule.cs      |  10 +-
 .../AppendCurrentEventMessagesAttribute.cs    |  13 +-
 54 files changed, 383 insertions(+), 376 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/config/splashes/booting.aspx
 rename src/Umbraco.Web/{UI => }/CdfLogger.cs (97%)
 rename src/Umbraco.Web/{UI => }/JavaScript/AssetInitialization.cs (98%)
 rename src/Umbraco.Web/{UI => }/JavaScript/ClientDependencyConfiguration.cs (99%)
 rename src/Umbraco.Web/{UI => }/JavaScript/CssInitialization.cs (95%)
 rename src/Umbraco.Web/{UI => }/JavaScript/DependencyPathRenderer.cs (98%)
 rename src/Umbraco.Web/{UI => }/JavaScript/JsInitialization.cs (99%)
 rename src/Umbraco.Web/{UI => }/JavaScript/JsInitialize.js (100%)
 rename src/Umbraco.Web/{UI => }/JavaScript/Main.js (100%)
 rename src/Umbraco.Web/{UI => }/JavaScript/PreviewInitialize.js (100%)
 rename src/Umbraco.Web/{UI => }/JavaScript/Resources.Designer.cs (82%)
 rename src/Umbraco.Web/{UI => }/JavaScript/Resources.resx (100%)
 rename src/Umbraco.Web/{UI => }/JavaScript/ServerVariables.js (100%)
 rename src/Umbraco.Web/{UI => }/JavaScript/ServerVariablesParser.cs (95%)
 rename src/Umbraco.Web/{UI => }/JavaScript/UmbracoClientDependencyLoader.cs (97%)
 rename src/Umbraco.Web/{UI/SpeechBubbleIcon.cs => Models/ContentEditing/NotificationStyle.cs} (75%)
 delete mode 100644 src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
 create mode 100644 src/Umbraco.Web/Routing/Resources/Booting.html
 create mode 100644 src/Umbraco.Web/Routing/Resources/Failed.html
 create mode 100644 src/Umbraco.Web/Routing/Resources/HtmlPages.Designer.cs
 create mode 100644 src/Umbraco.Web/Routing/Resources/HtmlPages.resx
 delete mode 100644 src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs
 delete mode 100644 src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs
 delete mode 100644 src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs
 delete mode 100644 src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs
 delete mode 100644 src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationUI.cs
 delete mode 100644 src/Umbraco.Web/UI/Bundles/JsUmbracoTree.cs

diff --git a/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
index 129116bf6131..b7037eb192b4 100644
--- a/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
@@ -9,7 +9,6 @@
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Profiling;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
diff --git a/src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs b/src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs
index 97688a711392..27e5328f6f51 100644
--- a/src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs
+++ b/src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Web.Mvc;
 using NUnit.Framework;
-using Umbraco.Core.Profiling;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Runtime;
 
diff --git a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
index f16abd578a9a..c4b5e3247b57 100644
--- a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
+++ b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Web.UI.JavaScript;
+using Umbraco.Web.JavaScript;
 
 namespace Umbraco.Tests.Web.AngularIntegration
 {
diff --git a/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs
index 0bf07a83c6d3..42abecd06bcb 100644
--- a/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs
+++ b/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
-using Umbraco.Web.UI.JavaScript;
 using Umbraco.Core;
+using Umbraco.Web.JavaScript;
 
 namespace Umbraco.Tests.Web.AngularIntegration
 {
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
index c6609f38c9f1..29deeb31ec83 100644
--- a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
@@ -12,7 +12,6 @@
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Profiling;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5e61de213285..ceca081b37a0 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -162,7 +162,6 @@
     <Content Include="Config\Lang\ru-RU.user.xml" />
     <Content Include="Config\Lang\sv-SE.user.xml" />
     <Content Include="Config\Lang\zh-CN.user.xml" />
-    <Content Include="Config\splashes\booting.aspx" />
     <Content Include="Config\splashes\noNodes.aspx" />
     <Content Include="Umbraco\Config\Lang\cs.xml" />
     <Content Include="Umbraco\Config\Lang\tr.xml" />
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.Release.config b/src/Umbraco.Web.UI/config/ClientDependency.Release.config
index 469334795554..281411920190 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.Release.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.Release.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="1" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, Umbraco.Web">
+<clientDependency version="1" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.CdfLogger, Umbraco.Web">
 
   <!--
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web.UI/config/splashes/booting.aspx b/src/Umbraco.Web.UI/config/splashes/booting.aspx
deleted file mode 100644
index f32deac1c7f0..000000000000
--- a/src/Umbraco.Web.UI/config/splashes/booting.aspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" %>
-<%@ Import Namespace="System.Web.Mvc" %>
-<%@ Import Namespace="Umbraco.Web.Mvc" %>
-
-<%
-    var urlHelper = new UrlHelper(Request.RequestContext);
-
-    // NH: Adds this inline check to avoid a simple codebehind file in the legacy project!
-    if (Request["url"].ToLower().Contains("booting.aspx") || urlHelper.ValidateProxyUrl(Request["url"], Request.Url.AbsoluteUri) == false)
-    {
-        throw new ArgumentException("Can't redirect to the requested url - it's not local or an approved proxy url", "url");
-    }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>The website is restarting</title>
-    <meta http-equiv="REFRESH" content="10; URL=<%=Request["url"] %>">
-</head>
-<body>
-    <h1>The website is restarting</h1>
-    <p>Please wait for 10s while we prepare to serve the page you have requested...</p>
-
-    <p style="border-top: 1px solid #ccc; padding-top: 10px;">
-        <small>You can modify the design of this page by editing /config/splashes/booting.aspx</small>
-    </p>
-
-</body>
-</html>
diff --git a/src/Umbraco.Web/UI/CdfLogger.cs b/src/Umbraco.Web/CdfLogger.cs
similarity index 97%
rename from src/Umbraco.Web/UI/CdfLogger.cs
rename to src/Umbraco.Web/CdfLogger.cs
index 2a36a5237618..83a51a7b389d 100644
--- a/src/Umbraco.Web/UI/CdfLogger.cs
+++ b/src/Umbraco.Web/CdfLogger.cs
@@ -4,7 +4,7 @@
 using ICdfLogger = ClientDependency.Core.Logging.ILogger;
 using ICoreLogger = Umbraco.Core.Logging.ILogger;
 
-namespace Umbraco.Web.UI
+namespace Umbraco.Web
 {
     /// <summary>
     /// A logger for ClientDependency
diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index 783c991ab43b..6039d97a723d 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -1,23 +1,24 @@
 using System;
+using Umbraco.Core.Components;
 using Umbraco.Core.Composing;
-using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.Actions;
+using Umbraco.Web.ContentApps;
+using Umbraco.Web.Dashboards;
 using Umbraco.Web.Editors;
 using Umbraco.Web.HealthCheck;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
-using Umbraco.Web.ContentApps;
 using Umbraco.Web.Tour;
 using Umbraco.Web.Trees;
-using Umbraco.Web.Dashboards;
+using Current = Umbraco.Web.Composing.Current;
 
 // the namespace here is intentional -  although defined in Umbraco.Web assembly,
 // this class should be visible when using Umbraco.Core.Components, alongside
 // Umbraco.Core's own CompositionExtensions class
 
 // ReSharper disable once CheckNamespace
-namespace Umbraco.Core.Components
+namespace Umbraco.Web
 {
     /// <summary>
     /// Provides extension methods to the <see cref="Composition"/> class.
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 26651051208f..462b5bbc9c90 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -21,10 +21,10 @@
 using Umbraco.Core.Models.Identity;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.UI.JavaScript;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
+using Umbraco.Web.JavaScript;
 using Umbraco.Web.Security;
 using Constants = Umbraco.Core.Constants;
 using JArray = Newtonsoft.Json.Linq.JArray;
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 3800871f882f..e2d268450ce2 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -22,12 +22,9 @@
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
-using Umbraco.Core.Services.Implement;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.UI;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
@@ -573,7 +570,7 @@ public async Task<ContentTypeImportModel> Upload()
                 model.Notifications.Add(new Notification(
                     Services.TextService.Localize("speechBubbles/operationFailedHeader"),
                     Services.TextService.Localize("media/disallowedFileType"),
-                    SpeechBubbleIcon.Warning));
+                    NotificationStyle.Warning));
             }
 
             return model;
diff --git a/src/Umbraco.Web/Editors/DictionaryController.cs b/src/Umbraco.Web/Editors/DictionaryController.cs
index 616317f7bad4..484dd47a4eb4 100644
--- a/src/Umbraco.Web/Editors/DictionaryController.cs
+++ b/src/Umbraco.Web/Editors/DictionaryController.cs
@@ -8,7 +8,6 @@
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.UI;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
@@ -172,7 +171,7 @@ public DictionaryDisplay PostSave(DictionarySave dictionary)
 
                 model.Notifications.Add(new Notification(
                     Services.TextService.Localize("speechBubbles/dictionaryItemSaved", userCulture), string.Empty,
-                    SpeechBubbleIcon.Success));
+                    NotificationStyle.Success));
 
                 return model;
             }
diff --git a/src/Umbraco.Web/Editors/MacrosController.cs b/src/Umbraco.Web/Editors/MacrosController.cs
index 84cd1911c3eb..7fbcdbf98aa4 100644
--- a/src/Umbraco.Web/Editors/MacrosController.cs
+++ b/src/Umbraco.Web/Editors/MacrosController.cs
@@ -1,27 +1,24 @@
 using Umbraco.Core.Services;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using Umbraco.Core;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Web.Composing;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Editors
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http;
-    using System.Web.Http;
-
-    using Umbraco.Core;
-    using Umbraco.Core.IO;
-    using Umbraco.Core.Logging;
-    using Umbraco.Core.Models;
-    using Umbraco.Web.Composing;
-    using Umbraco.Web.Models.ContentEditing;
-    using Umbraco.Web.Mvc;
-    using Umbraco.Web.UI;
-    using Umbraco.Web.WebApi;
-    using Umbraco.Web.WebApi.Filters;
-
-    using Constants = Umbraco.Core.Constants;
+{   
 
     /// <summary>
     /// The API controller used for editing dictionary items
@@ -182,7 +179,7 @@ public HttpResponseMessage Save(MacroDisplay macroDisplay)
 
                 macroDisplay.Notifications.Clear();
 
-                macroDisplay.Notifications.Add(new Models.ContentEditing.Notification("Success", "Macro saved", SpeechBubbleIcon.Success));
+                macroDisplay.Notifications.Add(new Models.ContentEditing.Notification("Success", "Macro saved", NotificationStyle.Success));
 
                 return this.Request.CreateResponse(HttpStatusCode.OK, macroDisplay);
             }
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 5441b8026412..7a787d8848d5 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Net;
 using System.Net.Http;
@@ -18,7 +17,6 @@
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Models.Mapping;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 using System.Linq;
@@ -26,9 +24,7 @@
 using Umbraco.Core.Composing;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Persistence.Querying;
-using Umbraco.Web.UI;
 using Notification = Umbraco.Web.Models.ContentEditing.Notification;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -432,7 +428,7 @@ public HttpResponseMessage PostMove(MoveOrCopy move)
 
             if (sourceParentID == destinationParentID)
             {
-                return Request.CreateValidationErrorResponse(new SimpleNotificationModel(new Notification("",Services.TextService.Localize("media/moveToSameFolderFailed"),SpeechBubbleIcon.Error)));
+                return Request.CreateValidationErrorResponse(new SimpleNotificationModel(new Notification("",Services.TextService.Localize("media/moveToSameFolderFailed"),NotificationStyle.Error)));
             }
             if (moveResult == false)
             {
@@ -752,7 +748,7 @@ public async Task<HttpResponseMessage> PostAddFile()
                     tempFiles.Notifications.Add(new Notification(
                         Services.TextService.Localize("speechBubbles/operationFailedHeader"),
                         Services.TextService.Localize("media/disallowedFileType"),
-                        SpeechBubbleIcon.Warning));
+                        NotificationStyle.Warning));
                 }
             }
 
@@ -844,7 +840,7 @@ private int GetParentIdAsInt(string parentId, bool validatePermissions)
                     new SimpleNotificationModel(new Notification(
                         Services.TextService.Localize("speechBubbles/operationFailedHeader"),
                         Services.TextService.Localize("speechBubbles/invalidUserPermissionsText"),
-                        SpeechBubbleIcon.Warning))));
+                        NotificationStyle.Warning))));
             }
 
             return intParentId;
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 658a28a79e8e..e96665ebb524 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -1,39 +1,29 @@
 using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Web.Http;
-using System.Xml;
-using System.Xml.Linq;
 using Semver;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.Models.Packaging;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
-using Umbraco.Core.Services.Implement;
-using Umbraco.Web.Composing;
+using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.UI;
-using Umbraco.Web.UI.JavaScript;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using File = System.IO.File;
 using Notification = Umbraco.Web.Models.ContentEditing.Notification;
-using Version = System.Version;
 
 namespace Umbraco.Web.Editors
 {
@@ -200,7 +190,7 @@ public async Task<LocalPackageInstallModel> UploadLocalPackage()
                     model.Notifications.Add(new Notification(
                         Services.TextService.Localize("speechBubbles/operationFailedHeader"),
                         Services.TextService.Localize("media/disallowedFileType"),
-                        SpeechBubbleIcon.Warning));
+                        NotificationStyle.Warning));
                 }
 
             }
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index bd14a6c6f44c..0b07e8587d26 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -6,10 +6,10 @@
 using Umbraco.Core.Configuration;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
+using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.UI.JavaScript;
 using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Editors
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 175e6543ab4c..4dbb21a38f05 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -5,8 +5,8 @@
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
+using Umbraco.Web.JavaScript;
 using Umbraco.Web.Security;
-using Umbraco.Web.UI.JavaScript;
 
 namespace Umbraco.Web.Install.Controllers
 {
diff --git a/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
similarity index 98%
rename from src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs
rename to src/Umbraco.Web/JavaScript/AssetInitialization.cs
index 9b6aa96e3789..00605ece1f45 100644
--- a/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
@@ -8,7 +8,7 @@
 using Umbraco.Web.Composing;
 using Umbraco.Web.PropertyEditors;
 
-namespace Umbraco.Web.UI.JavaScript
+namespace Umbraco.Web.JavaScript
 {
     internal abstract class AssetInitialization
     {
diff --git a/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
similarity index 99%
rename from src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs
rename to src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
index b5235c79385e..777786675f99 100644
--- a/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs
+++ b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
@@ -12,7 +12,7 @@
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
-namespace Umbraco.Web.UI.JavaScript
+namespace Umbraco.Web.JavaScript
 {
     /// <summary>
     /// A utility class for working with CDF config and cache files - use sparingly!
diff --git a/src/Umbraco.Web/UI/JavaScript/CssInitialization.cs b/src/Umbraco.Web/JavaScript/CssInitialization.cs
similarity index 95%
rename from src/Umbraco.Web/UI/JavaScript/CssInitialization.cs
rename to src/Umbraco.Web/JavaScript/CssInitialization.cs
index 69dc73204905..172244038de9 100644
--- a/src/Umbraco.Web/UI/JavaScript/CssInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/CssInitialization.cs
@@ -1,12 +1,12 @@
-using System.Web;
-using ClientDependency.Core;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Web;
+using ClientDependency.Core;
 using Umbraco.Core.Manifest;
 
-namespace Umbraco.Web.UI.JavaScript
+namespace Umbraco.Web.JavaScript
 {
     internal class CssInitialization : AssetInitialization
     {
diff --git a/src/Umbraco.Web/UI/JavaScript/DependencyPathRenderer.cs b/src/Umbraco.Web/JavaScript/DependencyPathRenderer.cs
similarity index 98%
rename from src/Umbraco.Web/UI/JavaScript/DependencyPathRenderer.cs
rename to src/Umbraco.Web/JavaScript/DependencyPathRenderer.cs
index d0d8f9949737..eebc2e6900b7 100644
--- a/src/Umbraco.Web/UI/JavaScript/DependencyPathRenderer.cs
+++ b/src/Umbraco.Web/JavaScript/DependencyPathRenderer.cs
@@ -3,7 +3,7 @@
 using ClientDependency.Core;
 using ClientDependency.Core.FileRegistration.Providers;
 
-namespace Umbraco.Web.UI.JavaScript
+namespace Umbraco.Web.JavaScript
 {
     /// <summary>
     /// A custom renderer that only outputs a dependency path instead of script tags - for use with the js loader with yepnope
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs b/src/Umbraco.Web/JavaScript/JsInitialization.cs
similarity index 99%
rename from src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
rename to src/Umbraco.Web/JavaScript/JsInitialization.cs
index 0471b47e8e8c..638b1bf5b47f 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/JsInitialization.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 using ClientDependency.Core;
@@ -6,10 +8,8 @@
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.IO;
 using Umbraco.Core.Manifest;
-using System.Linq;
-using System.Text;
 
-namespace Umbraco.Web.UI.JavaScript
+namespace Umbraco.Web.JavaScript
 {
     /// <summary>
     /// Reads from all defined manifests and ensures that any of their initialization is output with the
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/JavaScript/JsInitialize.js
similarity index 100%
rename from src/Umbraco.Web/UI/JavaScript/JsInitialize.js
rename to src/Umbraco.Web/JavaScript/JsInitialize.js
diff --git a/src/Umbraco.Web/UI/JavaScript/Main.js b/src/Umbraco.Web/JavaScript/Main.js
similarity index 100%
rename from src/Umbraco.Web/UI/JavaScript/Main.js
rename to src/Umbraco.Web/JavaScript/Main.js
diff --git a/src/Umbraco.Web/UI/JavaScript/PreviewInitialize.js b/src/Umbraco.Web/JavaScript/PreviewInitialize.js
similarity index 100%
rename from src/Umbraco.Web/UI/JavaScript/PreviewInitialize.js
rename to src/Umbraco.Web/JavaScript/PreviewInitialize.js
diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs b/src/Umbraco.Web/JavaScript/Resources.Designer.cs
similarity index 82%
rename from src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
rename to src/Umbraco.Web/JavaScript/Resources.Designer.cs
index 51e40b5324d2..ca571b118650 100644
--- a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
+++ b/src/Umbraco.Web/JavaScript/Resources.Designer.cs
@@ -8,11 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Umbraco.Web.UI.JavaScript
-{
+namespace Umbraco.Web.JavaScript {
     using System;
-
-
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -23,62 +22,55 @@ namespace Umbraco.Web.UI.JavaScript
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if (object.ReferenceEquals(resourceMan, null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.UI.JavaScript.Resources", typeof(Resources).Assembly);
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.JavaScript.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to [
         ///    &apos;lib/jquery/jquery.min.js&apos;,
         ///    &apos;lib/jquery-ui/jquery-ui.min.js&apos;,
-        ///    &apos;lib/jquery-ui-touch-punch/jquery.ui.touch-punch.js&apos;,
+        ///    &apos;lib/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js&apos;,
         ///
         ///    &apos;lib/angular/angular.js&apos;,
         ///    &apos;lib/underscore/underscore-min.js&apos;,
         ///
         ///    &apos;lib/moment/moment.min.js&apos;,
+        ///    &apos;lib/flatpickr/flatpickr.js&apos;,
         ///
         ///    &apos;lib/animejs/anime.min.js&apos;,
         ///
@@ -86,38 +78,35 @@ internal Resources()
         ///    &apos;lib/angular-cookies/angular-cookies.js&apos;,
         ///    &apos;lib/angular-touch/angular-touch.js&apos;,
         ///    &apos;lib/angular-sanitize/angular-sanitize.js&apos;,
-        ///    &apos;lib/angular-animate/angular-animate.js&apos;,
-        ///    [rest of string was truncated]&quot;;.
+        ///    &apos;lib/an [rest of string was truncated]&quot;;.
         /// </summary>
-        internal static string JsInitialize
-        {
-            get
-            {
+        internal static string JsInitialize {
+            get {
                 return ResourceManager.GetString("JsInitialize", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to LazyLoad.js(&quot;##JsInitialize##&quot;, function () {
         ///    //we need to set the legacy UmbClientMgr path
-        ///    UmbClientMgr.setUmbracoPath(&apos;&quot;##UmbracoPath##&quot;&apos;);
+        ///    if ((typeof UmbClientMgr) !== &quot;undefined&quot;) {
+        ///        UmbClientMgr.setUmbracoPath(&apos;&quot;##UmbracoPath##&quot;&apos;);
+        ///    }
         ///
         ///    jQuery(document).ready(function () {
         ///
-        ///        angular.bootstrap(document, [&apos;##AngularModule##&apos;]);
+        ///        angular.bootstrap(document, [&apos;&quot;##AngularModule##&quot;&apos;]);
         ///
         ///    });
         ///});
         ///.
         /// </summary>
-        internal static string Main
-        {
-            get
-            {
+        internal static string Main {
+            get {
                 return ResourceManager.GetString("Main", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to [
         ///    &apos;../lib/jquery/jquery.min.js&apos;,
@@ -131,18 +120,16 @@ internal static string Main
         ///    &apos;../ServerVariables&apos;,
         ///    &apos;../lib/signalr/jquery.signalR.js&apos;,
         ///    &apos;../BackOffice/signalr/hubs&apos;,
-        ///    &apos;../js/umbraco.canvasdesigner.js&apos;
+        ///    &apos;../js/umbraco.preview.js&apos;
         ///]
         ///.
         /// </summary>
-        internal static string PreviewInitialize
-        {
-            get
-            {
+        internal static string PreviewInitialize {
+            get {
                 return ResourceManager.GetString("PreviewInitialize", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to // TODO: This would be nicer as an angular module so it can be injected into stuff... that&apos;d be heaps nicer, but
         ///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want
@@ -154,10 +141,8 @@ internal static string PreviewInitialize
         /////define a global static object
         ///Umbraco.Sys.ServerVariables = ##Variables## ;.
         /// </summary>
-        internal static string ServerVariables
-        {
-            get
-            {
+        internal static string ServerVariables {
+            get {
                 return ResourceManager.GetString("ServerVariables", resourceCulture);
             }
         }
diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.resx b/src/Umbraco.Web/JavaScript/Resources.resx
similarity index 100%
rename from src/Umbraco.Web/UI/JavaScript/Resources.resx
rename to src/Umbraco.Web/JavaScript/Resources.resx
diff --git a/src/Umbraco.Web/UI/JavaScript/ServerVariables.js b/src/Umbraco.Web/JavaScript/ServerVariables.js
similarity index 100%
rename from src/Umbraco.Web/UI/JavaScript/ServerVariables.js
rename to src/Umbraco.Web/JavaScript/ServerVariables.js
diff --git a/src/Umbraco.Web/UI/JavaScript/ServerVariablesParser.cs b/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
similarity index 95%
rename from src/Umbraco.Web/UI/JavaScript/ServerVariablesParser.cs
rename to src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
index 707f39142b16..42c8a3bbbd56 100644
--- a/src/Umbraco.Web/UI/JavaScript/ServerVariablesParser.cs
+++ b/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 
-namespace Umbraco.Web.UI.JavaScript
+namespace Umbraco.Web.JavaScript
 {
     public sealed class ServerVariablesParser
     {
diff --git a/src/Umbraco.Web/UI/JavaScript/UmbracoClientDependencyLoader.cs b/src/Umbraco.Web/JavaScript/UmbracoClientDependencyLoader.cs
similarity index 97%
rename from src/Umbraco.Web/UI/JavaScript/UmbracoClientDependencyLoader.cs
rename to src/Umbraco.Web/JavaScript/UmbracoClientDependencyLoader.cs
index dc3a2efbc7d6..5e6f16445bec 100644
--- a/src/Umbraco.Web/UI/JavaScript/UmbracoClientDependencyLoader.cs
+++ b/src/Umbraco.Web/JavaScript/UmbracoClientDependencyLoader.cs
@@ -3,7 +3,7 @@
 using ClientDependency.Core.FileRegistration.Providers;
 using Umbraco.Core.IO;
 
-namespace Umbraco.Web.UI.JavaScript
+namespace Umbraco.Web.JavaScript
 {
     /// <summary>
     /// Used to load in all client dependencies for Umbraco.
diff --git a/src/Umbraco.Web/Models/ContentEditing/MessagesExtensions.cs b/src/Umbraco.Web/Models/ContentEditing/MessagesExtensions.cs
index a1d135d2f470..3a8496ac3f58 100644
--- a/src/Umbraco.Web/Models/ContentEditing/MessagesExtensions.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/MessagesExtensions.cs
@@ -1,10 +1,9 @@
-using Umbraco.Web.UI;
-
+
 namespace Umbraco.Web.Models.ContentEditing
 {
     public static class MessagesExtensions
     {
-        public static void AddNotification(this INotificationModel model, string header, string msg, SpeechBubbleIcon type)
+        public static void AddNotification(this INotificationModel model, string header, string msg, NotificationStyle type)
         {
             model.Notifications.Add(new Notification()
                 {
@@ -20,7 +19,7 @@ public static void AddSuccessNotification(this INotificationModel model, string
                 {
                     Header = header,
                     Message = msg,
-                    NotificationType = SpeechBubbleIcon.Success
+                    NotificationType = NotificationStyle.Success
                 });
         }
 
@@ -30,7 +29,7 @@ public static void AddErrorNotification(this INotificationModel model, string he
                 {
                     Header = header,
                     Message = msg,
-                    NotificationType = SpeechBubbleIcon.Error
+                    NotificationType = NotificationStyle.Error
                 });
         }
 
@@ -40,7 +39,7 @@ public static void AddWarningNotification(this INotificationModel model, string
                 {
                     Header = header,
                     Message = msg,
-                    NotificationType = SpeechBubbleIcon.Warning
+                    NotificationType = NotificationStyle.Warning
                 });
         }
 
@@ -50,7 +49,7 @@ public static void AddInfoNotification(this INotificationModel model, string hea
                 {
                     Header = header,
                     Message = msg,
-                    NotificationType = SpeechBubbleIcon.Info
+                    NotificationType = NotificationStyle.Info
                 });
         }
     }
diff --git a/src/Umbraco.Web/Models/ContentEditing/Notification.cs b/src/Umbraco.Web/Models/ContentEditing/Notification.cs
index 1ed20d27d4bf..8852b2ca0203 100644
--- a/src/Umbraco.Web/Models/ContentEditing/Notification.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/Notification.cs
@@ -1,5 +1,4 @@
 using System.Runtime.Serialization;
-using Umbraco.Web.UI;
 
 namespace Umbraco.Web.Models.ContentEditing
 {
@@ -11,7 +10,7 @@ public Notification()
 
         }
 
-        public Notification(string header, string message, SpeechBubbleIcon notificationType)
+        public Notification(string header, string message, NotificationStyle notificationType)
         {
             Header = header;
             Message = message;
@@ -25,7 +24,7 @@ public Notification(string header, string message, SpeechBubbleIcon notification
         public string Message { get; set; }
 
         [DataMember(Name = "type")]
-        public SpeechBubbleIcon NotificationType { get; set; }
+        public NotificationStyle NotificationType { get; set; }
         
     }
 }
diff --git a/src/Umbraco.Web/UI/SpeechBubbleIcon.cs b/src/Umbraco.Web/Models/ContentEditing/NotificationStyle.cs
similarity index 75%
rename from src/Umbraco.Web/UI/SpeechBubbleIcon.cs
rename to src/Umbraco.Web/Models/ContentEditing/NotificationStyle.cs
index c4a81ec7954a..ade66a288847 100644
--- a/src/Umbraco.Web/UI/SpeechBubbleIcon.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/NotificationStyle.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Web.UI
+namespace Umbraco.Web.Models.ContentEditing
 {
-    public enum SpeechBubbleIcon
+    public enum NotificationStyle
     {
         /// <summary>
         /// Save icon
diff --git a/src/Umbraco.Web/Mvc/ProfilingView.cs b/src/Umbraco.Web/Mvc/ProfilingView.cs
index e48f880f42fa..ce733552d6c6 100644
--- a/src/Umbraco.Web/Mvc/ProfilingView.cs
+++ b/src/Umbraco.Web/Mvc/ProfilingView.cs
@@ -1,10 +1,8 @@
 using System.IO;
 using System.Web.Mvc;
-using Umbraco.Core.Logging;
-using Umbraco.Web;
 using Umbraco.Web.Composing;
 
-namespace Umbraco.Core.Profiling
+namespace Umbraco.Web.Mvc
 {
     public class ProfilingView : IView
     {
diff --git a/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs b/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs
index f5f63c23b30e..097434541c4b 100644
--- a/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs
+++ b/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs
@@ -1,9 +1,7 @@
 using System.Web.Mvc;
-using Umbraco.Core.Logging;
-using Umbraco.Web;
 using Umbraco.Web.Composing;
 
-namespace Umbraco.Core.Profiling
+namespace Umbraco.Web.Mvc
 {
     public class ProfilingViewEngine: IViewEngine
     {
diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
index ea832e13526b..d506090ecd51 100644
--- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
@@ -5,7 +5,6 @@
 using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Profiling;
 using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
diff --git a/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
deleted file mode 100644
index 9c583e4f88f6..000000000000
--- a/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Web.Mvc;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Xml;
-
-namespace Umbraco.Web.Mvc
-{
-    /// <summary>
-    /// Extension methods for UrlHelper
-    /// </summary>
-    public static class UrlHelperExtensions
-    {
-        /// <summary>
-        /// Utility method for checking for valid proxy urls or redirect urls to prevent Open Redirect security issues
-        /// </summary>
-        /// <param name="urlHelper"></param>
-        /// <param name="url">The url to validate</param>
-        /// <param name="callerUrl">The url of the current local domain (to ensure we can validate if the requested url is local without dependency on the request)</param>
-        /// <returns>True if it's an allowed url</returns>
-        [Obsolete("This looks OLD & unused", true)]
-        public static bool ValidateProxyUrl(this UrlHelper urlHelper, string url, string callerUrl)
-        {
-            if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false)
-            {
-                return false;
-            }
-
-            if (url.StartsWith("//"))
-                return false;
-
-            Uri requestUri;
-            if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out requestUri))
-            {
-                if (string.IsNullOrEmpty(callerUrl) == false)
-                {
-                    Uri localUri;
-                    if (Uri.TryCreate(callerUrl, UriKind.RelativeOrAbsolute, out localUri))
-                    {
-                        // check for local urls
-
-                        //Cannot start with // since that is not a local url
-                        if (requestUri.OriginalString.StartsWith("//") == false
-                            //cannot be non-absolute and also contain the char : since that will indicate a protocol
-                            && (requestUri.IsAbsoluteUri == false && requestUri.OriginalString.Contains(":") == false)
-                            //needs to be non-absolute or the hosts must match the current request
-                            && (requestUri.IsAbsoluteUri == false || requestUri.Host == localUri.Host))
-                        {
-                            return true;
-                        }
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-
-                //we cannot continue if the url is not absolute
-                if (requestUri.IsAbsoluteUri == false)
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
-            return false;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
index 4843dd5522b2..c49dffd6e422 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Components;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
@@ -13,7 +12,7 @@
 using Umbraco.Web.Cache;
 using Umbraco.Web.Composing;
 
-namespace Umbraco.Web.Redirects
+namespace Umbraco.Web.Routing
 {
     /// Implements an Application Event Handler for managing redirect urls tracking.
     /// <para>when content is renamed or moved, we want to create a permanent 301 redirect from it's old url</para>
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
index dabf1c15c375..1130f0880fe6 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
@@ -1,7 +1,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Components;
 
-namespace Umbraco.Web.Redirects
+namespace Umbraco.Web.Routing
 {
     /// <summary>
     /// Implements an Application Event Handler for managing redirect urls tracking.
diff --git a/src/Umbraco.Web/Routing/Resources/Booting.html b/src/Umbraco.Web/Routing/Resources/Booting.html
new file mode 100644
index 000000000000..7980301c6ad2
--- /dev/null
+++ b/src/Umbraco.Web/Routing/Resources/Booting.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+    <title>The website is restarting</title>
+</head>
+<body>
+    <h1>The website is restarting</h1>
+    <p>Please wait while we prepare to serve the page you have requested...</p>
+</body>
+</html>
diff --git a/src/Umbraco.Web/Routing/Resources/Failed.html b/src/Umbraco.Web/Routing/Resources/Failed.html
new file mode 100644
index 000000000000..2f4856820dd3
--- /dev/null
+++ b/src/Umbraco.Web/Routing/Resources/Failed.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+    <title>The website cannot start</title>
+</head>
+<body>
+    <h1>The website failed to start :(</h1>
+</body>
+</html>
diff --git a/src/Umbraco.Web/Routing/Resources/HtmlPages.Designer.cs b/src/Umbraco.Web/Routing/Resources/HtmlPages.Designer.cs
new file mode 100644
index 000000000000..206732265e6e
--- /dev/null
+++ b/src/Umbraco.Web/Routing/Resources/HtmlPages.Designer.cs
@@ -0,0 +1,99 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Umbraco.Web.Routing.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class HtmlPages {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal HtmlPages() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.Routing.Resources.HtmlPages", typeof(HtmlPages).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;html&gt;
+        ///&lt;head&gt;
+        ///    &lt;title&gt;The website is restarting&lt;/title&gt;
+        ///&lt;/head&gt;
+        ///&lt;body&gt;
+        ///    &lt;h1&gt;The website is restarting&lt;/h1&gt;
+        ///    &lt;p&gt;Please wait while we prepare to serve the page you have requested...&lt;/p&gt;
+        ///&lt;/body&gt;
+        ///&lt;/html&gt;
+        ///.
+        /// </summary>
+        internal static string Booting {
+            get {
+                return ResourceManager.GetString("Booting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;html&gt;
+        ///&lt;head&gt;
+        ///    &lt;title&gt;The website is restarting&lt;/title&gt;
+        ///&lt;/head&gt;
+        ///&lt;body&gt;
+        ///    &lt;h1&gt;The website is restarting&lt;/h1&gt;
+        ///    &lt;p&gt;Please wait while we prepare to serve the page you have requested...&lt;/p&gt;
+        ///&lt;/body&gt;
+        ///&lt;/html&gt;
+        ///.
+        /// </summary>
+        internal static string Failed {
+            get {
+                return ResourceManager.GetString("Failed", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Routing/Resources/HtmlPages.resx b/src/Umbraco.Web/Routing/Resources/HtmlPages.resx
new file mode 100644
index 000000000000..ac636df30508
--- /dev/null
+++ b/src/Umbraco.Web/Routing/Resources/HtmlPages.resx
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Booting" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>booting.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="Failed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>failed.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
index 26c8faca588f..4fb8dadf1716 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
@@ -19,16 +19,15 @@
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Profiling;
 using Umbraco.Core.Services;
 using Umbraco.Web.Install;
+using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 using Umbraco.Web.Trees;
-using Umbraco.Web.UI.JavaScript;
 using Umbraco.Web.WebApi;
 
 using Current = Umbraco.Web.Composing.Current;
diff --git a/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs b/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs
deleted file mode 100644
index 5b0ffcd85d99..000000000000
--- a/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Web.UI;
-using ClientDependency.Core;
-
-namespace Umbraco.Web.UI.Bundles
-{
-    /// <summary>
-    /// The core libs that have no dependencies
-    /// </summary>
-    [ClientDependency(ClientDependencyType.Javascript, "lib/umbraco/NamespaceManager.js", "UmbracoRoot", Priority = 0, Group = 0)]
-    public class JsApplicationLib : Control
-    {
-    }
-}
diff --git a/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs b/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs
deleted file mode 100644
index 570551c0bfbd..000000000000
--- a/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Web.UI;
-using ClientDependency.Core;
-
-namespace Umbraco.Web.UI.Bundles
-{
-    /// <summary>
-    /// The core Jquery libs
-    /// </summary>
-    [ClientDependency(ClientDependencyType.Javascript, "lib/jquery/jquery.min.js", "UmbracoRoot", Priority = 1, Group = 1)]
-    [ClientDependency(ClientDependencyType.Javascript, "lib/jquery-migrate/jquery-migrate.min.js", "UmbracoRoot", Priority = 2, Group = 1)]
-    public class JsJQueryCore : Control
-    {
-    }
-}
diff --git a/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs b/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs
deleted file mode 100644
index c5fcdb858be0..000000000000
--- a/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Web.UI;
-using ClientDependency.Core;
-namespace Umbraco.Web.UI.Bundles
-{
-    /// <summary>	
-    /// The core Jquery libs	
-    /// </summary>	
-    [ClientDependency(ClientDependencyType.Javascript, "modal/jquery.simplemodal.1.4.1.custom.js", "UmbracoClient", Priority = 2, Group = 4)]
-    [ClientDependency(ClientDependencyType.Javascript, "Application/jQuery/jquery.cookie.js", "UmbracoClient", Priority = 3, Group = 4)]
-    [ClientDependency(ClientDependencyType.Javascript, "Application/JQuery/jquery.metadata.min.js", "UmbracoClient", Priority = 4, Group = 4)]
-    [ClientDependency(ClientDependencyType.Javascript, "Application/jQuery/jquery.hotkeys.js", "UmbracoClient", Priority = 5, Group = 4)]
-    public class JsJQueryPlugins : Control
-    {
-    }
-}
diff --git a/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs b/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs
deleted file mode 100644
index 6ccee78fa30a..000000000000
--- a/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Web.UI;
-using ClientDependency.Core;
-
-namespace Umbraco.Web.UI.Bundles
-{
-    /// <summary>
-    /// The core libs that require JQuery to be loaded
-    /// </summary>
-    [ClientDependency(ClientDependencyType.Javascript, "lib/umbraco/LegacyUmbClientMgr.js", "UmbracoRoot", Priority = 1, Group = 2)]
-    public class JsUmbracoApplicationCore : Control
-    {
-    }
-}
diff --git a/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationUI.cs b/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationUI.cs
deleted file mode 100644
index cd4f8da660c0..000000000000
--- a/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationUI.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Web.UI;
-using ClientDependency.Core;
-
-namespace Umbraco.Web.UI.Bundles
-{
-    /// <summary>
-    /// The UI Umbraco libs
-    /// </summary>
-    [ClientDependency(ClientDependencyType.Javascript, "js/guiFunctions.js", "UmbracoRoot", Priority = 1, Group = 5)]
-    [ClientDependency(ClientDependencyType.Javascript, "js/UmbracoSpeechBubbleBackend.js", "UmbracoRoot", Priority = 3, Group = 5)]
-    public class JsUmbracoApplicationUI : Control
-    {
-    }
-}
diff --git a/src/Umbraco.Web/UI/Bundles/JsUmbracoTree.cs b/src/Umbraco.Web/UI/Bundles/JsUmbracoTree.cs
deleted file mode 100644
index 5f393376cf6b..000000000000
--- a/src/Umbraco.Web/UI/Bundles/JsUmbracoTree.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Web.UI;
-using ClientDependency.Core;
-
-namespace Umbraco.Web.UI.Bundles
-{
-    /// <summary>
-    /// The umb tree libs
-    /// </summary>
-    [ClientDependency(ClientDependencyType.Javascript, "Tree/jquery.tree.js", "UmbracoClient", Priority = 0, Group = 10)]
-    [ClientDependency(ClientDependencyType.Javascript, "Tree/UmbracoContext.js", "UmbracoClient", Priority = 1, Group = 10)]
-    [ClientDependency(ClientDependencyType.Javascript, "Tree/jquery.tree.contextmenu.js", "UmbracoClient", Priority = 2, Group = 10)]
-    [ClientDependency(ClientDependencyType.Javascript, "Tree/jquery.tree.checkbox.js", "UmbracoClient", Priority = 3, Group = 10)]
-    [ClientDependency(ClientDependencyType.Javascript, "Tree/NodeDefinition.js", "UmbracoClient", Priority = 4, Group = 10)]
-    [ClientDependency(ClientDependencyType.Javascript, "Tree/UmbracoTree.js", "UmbracoClient", Priority = 5, Group = 10)]
-    public class JsUmbracoTree : Control
-    {
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c3d3707fd307..5a3379b82bfc 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -182,6 +182,11 @@
     <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
+    <Compile Include="Routing\Resources\HtmlPages.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>HtmlPages.resx</DependentUpon>
+    </Compile>
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />
@@ -259,7 +264,7 @@
     <Compile Include="Trees\LegacyTreeDataConverter.cs" />
     <Compile Include="Trees\FilesTreeController.cs" />
     <Compile Include="Trees\TreeCollection.cs" />
-    <Compile Include="UI\JavaScript\ClientDependencyConfiguration.cs" />
+    <Compile Include="JavaScript\ClientDependencyConfiguration.cs" />
     <Compile Include="Editors\Binders\BlueprintItemBinder.cs" />
     <Compile Include="UmbracoApplicationBase.cs" />
     <Compile Include="WebApi\HttpActionContextExtensions.cs" />
@@ -577,9 +582,6 @@
     <Compile Include="Trees\DictionaryTreeController.cs" />
     <Compile Include="Trees\StylesheetsTreeController.cs" />
     <Compile Include="Trees\UserTreeController.cs" />
-    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
-    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
     <Compile Include="UmbracoModule.cs" />
     <Compile Include="WebApi\EnableDetailedErrorsAttribute.cs" />
     <Compile Include="WebApi\Filters\AppendUserModifiedHeaderAttribute.cs" />
@@ -679,7 +681,7 @@
     <Compile Include="Trees\MediaTypeTreeController.cs" />
     <Compile Include="Trees\MemberTypeTreeController.cs" />
     <Compile Include="Security\WebAuthExtensions.cs" />
-    <Compile Include="UI\JavaScript\UmbracoClientDependencyLoader.cs" />
+    <Compile Include="JavaScript\UmbracoClientDependencyLoader.cs" />
     <Compile Include="UmbracoDefaultOwinStartup.cs" />
     <Compile Include="IUmbracoContextAccessor.cs" />
     <Compile Include="HtmlStringUtilities.cs" />
@@ -691,7 +693,6 @@
     <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
     <Compile Include="Mvc\ProfilingView.cs" />
     <Compile Include="Mvc\ProfilingViewEngine.cs" />
-    <Compile Include="Mvc\UrlHelperExtensions.cs" />
     <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
     <Compile Include="BatchedDatabaseServerMessenger.cs" />
     <Compile Include="CacheHelperExtensions.cs" />
@@ -892,9 +893,9 @@
     <Compile Include="Models\Trees\MenuItemList.cs" />
     <Compile Include="Trees\TemplatesTreeController.cs" />
     <Compile Include="Trees\TreeControllerBase.cs" />
-    <Compile Include="UI\JavaScript\AssetInitialization.cs" />
-    <Compile Include="UI\JavaScript\CssInitialization.cs" />
-    <Compile Include="UI\JavaScript\DependencyPathRenderer.cs" />
+    <Compile Include="JavaScript\AssetInitialization.cs" />
+    <Compile Include="JavaScript\CssInitialization.cs" />
+    <Compile Include="JavaScript\DependencyPathRenderer.cs" />
     <Compile Include="UmbracoComponentRenderer.cs" />
     <Compile Include="Web References\org.umbraco.our\Reference.cs">
       <AutoGen>True</AutoGen>
@@ -1001,7 +1002,7 @@
     <Compile Include="Trees\ContentTreeController.cs" />
     <Compile Include="Trees\TreeRenderingEventArgs.cs" />
     <Compile Include="Trees\UrlHelperExtensions.cs" />
-    <Compile Include="UI\JavaScript\JsInitialization.cs" />
+    <Compile Include="JavaScript\JsInitialization.cs" />
     <Compile Include="Models\ContentEditing\ContentItemBasic.cs" />
     <Compile Include="Models\ContentEditing\ContentItemDisplay.cs" />
     <Compile Include="Models\ContentEditing\ContentPropertyCollectionDto.cs" />
@@ -1035,17 +1036,14 @@
     <Compile Include="Search\ExamineIndexModel.cs" />
     <Compile Include="Security\ValidateRequestAttempt.cs" />
     <Compile Include="Security\WebSecurity.cs" />
-    <Compile Include="UI\JavaScript\Resources.Designer.cs">
+    <Compile Include="JavaScript\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
+    <Compile Include="JavaScript\ServerVariablesParser.cs" />
     <Compile Include="Components\PublicAccessComponent.cs" />
-    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
-    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
-    <Compile Include="UI\CdfLogger.cs" />
+    <Compile Include="CdfLogger.cs" />
     <Compile Include="Controllers\UmbLoginController.cs" />
     <Compile Include="UrlHelperExtensions.cs" />
     <Compile Include="Editors\MediaController.cs" />
@@ -1139,7 +1137,7 @@
     <Compile Include="Trees\PartialViewsTreeController.cs" />
     <Compile Include="_Legacy\PackageActions\allowDoctype.cs" />
     <Compile Include="_Legacy\PackageActions\publishRootDocument.cs" />
-    <Compile Include="UI\SpeechBubbleIcon.cs" />
+    <Compile Include="Models\ContentEditing\NotificationStyle.cs" />
     <Compile Include="UmbracoHelper.cs" />
     <Compile Include="Mvc\ViewContextExtensions.cs" />
     <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
@@ -1202,7 +1200,7 @@
     <Compile Include="WebViewPageExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="UI\JavaScript\Resources.resx">
+    <EmbeddedResource Include="JavaScript\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
@@ -1211,15 +1209,21 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\JavaScript\Main.js" />
-    <EmbeddedResource Include="UI\JavaScript\JsInitialize.js" />
-    <EmbeddedResource Include="UI\JavaScript\ServerVariables.js" />
+    <EmbeddedResource Include="JavaScript\Main.js" />
+    <EmbeddedResource Include="JavaScript\JsInitialize.js" />
+    <EmbeddedResource Include="JavaScript\ServerVariables.js" />
+    <EmbeddedResource Include="Routing\Resources\HtmlPages.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>HtmlPages.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="UI\JavaScript\PreviewInitialize.js" />
+    <EmbeddedResource Include="Routing\Resources\Failed.html" />
+    <EmbeddedResource Include="Routing\Resources\Booting.html" />
+    <EmbeddedResource Include="JavaScript\PreviewInitialize.js" />
     <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
     <Content Include="PublishedCache\NuCache\notes.txt" />
   </ItemGroup>
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index cc17d32752f0..2b6d032f72b7 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -275,9 +275,10 @@ private bool EnsureRuntime(HttpContextBase httpContext, Uri uri)
 
                     // redirect to booting page
                     httpContext.Response.StatusCode = 503; // temp not available
-                    const string bootUrl = "~/config/splashes/booting.aspx"; //fixme: remove booting.aspx once the above question is resolved
+                    var bootHtml = Routing.Resources.HtmlPages.Booting;
                     httpContext.Response.AddHeader("Retry-After", debug ? "1" : "30"); // seconds
-                    httpContext.RewritePath(UriUtility.ToAbsolute(bootUrl) + "?url=" + HttpUtility.UrlEncode(uri.ToString()));
+                    httpContext.Response.Write(bootHtml);
+                    httpContext.Response.Flush();
                     return false; // cannot serve content
 
                 case RuntimeLevel.BootFailed:
@@ -285,9 +286,10 @@ private bool EnsureRuntime(HttpContextBase httpContext, Uri uri)
                     ReportRuntime(level, "Umbraco has failed.");
 
                     httpContext.Response.StatusCode = 503; // temp not available
-                    const string deathUrl = "~/config/splashes/death.aspx";
+                    var deathHtml = Routing.Resources.HtmlPages.Failed;
                     httpContext.Response.AddHeader("Retry-After", debug ? "1" : "300"); // seconds
-                    httpContext.RewritePath(UriUtility.ToAbsolute(deathUrl) + "?url=" + HttpUtility.UrlEncode(uri.ToString()));
+                    httpContext.Response.Write(deathHtml);
+                    httpContext.Response.Flush();
                     return false; // cannot serve content
 
                 case RuntimeLevel.Run:
diff --git a/src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs b/src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs
index 911fff3e3c9a..779a559a162d 100644
--- a/src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs
@@ -4,7 +4,6 @@
 using Umbraco.Core.Events;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.UI;
 
 namespace Umbraco.Web.WebApi.Filters
 {
@@ -32,23 +31,23 @@ public override void OnActionExecuted(HttpActionExecutedContext context)
 
             foreach (var eventMessage in msgs.GetAll())
             {
-                SpeechBubbleIcon msgType;
+                NotificationStyle msgType;
                 switch (eventMessage.MessageType)
                 {
                     case EventMessageType.Default:
-                        msgType = SpeechBubbleIcon.Save;
+                        msgType = NotificationStyle.Save;
                         break;
                     case EventMessageType.Info:
-                        msgType = SpeechBubbleIcon.Info;
+                        msgType = NotificationStyle.Info;
                         break;
                     case EventMessageType.Error:
-                        msgType = SpeechBubbleIcon.Error;
+                        msgType = NotificationStyle.Error;
                         break;
                     case EventMessageType.Success:
-                        msgType = SpeechBubbleIcon.Success;
+                        msgType = NotificationStyle.Success;
                         break;
                     case EventMessageType.Warning:
-                        msgType = SpeechBubbleIcon.Warning;
+                        msgType = NotificationStyle.Warning;
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();

From 2e527163f91cf73707f0f94b6cb6e19c038259ea Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 23:27:00 +1100
Subject: [PATCH 124/421] no more umbraco.presentation namespace! no more
 "page" class, has been refactored and renamed to what it actually is and
 internalized

---
 .../Composing/TypeFinderTests.cs              |   1 -
 .../Composing/TypeLoaderTests.cs              |   1 -
 .../PublishedContent/PublishedRouterTests.cs  |   2 +-
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |   1 -
 src/Umbraco.Web/Cache/MacroCacheRefresher.cs  |   1 -
 .../Editors/MacroRenderingController.cs       |   2 +-
 .../InstallSteps/FilePermissionsStep.cs       |   1 -
 .../PublishedContentHashtableConverter.cs}    | 321 ++++--------------
 .../Macros/UserControlMacroEngine.cs          |   1 -
 src/Umbraco.Web/Routing/PublishedRequest.cs   |  10 +-
 src/Umbraco.Web/Routing/PublishedRouter.cs    |  10 +-
 src/Umbraco.Web/Templates/TemplateRenderer.cs |   6 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 +-
 src/Umbraco.Web/UmbracoComponentRenderer.cs   |   7 +-
 14 files changed, 80 insertions(+), 286 deletions(-)
 rename src/Umbraco.Web/{umbraco.presentation/page.cs => Macros/PublishedContentHashtableConverter.cs} (53%)

diff --git a/src/Umbraco.Tests/Composing/TypeFinderTests.cs b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
index 49c807b19fbd..7271db9b612d 100644
--- a/src/Umbraco.Tests/Composing/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
@@ -11,7 +11,6 @@
 using System.Web;
 using System.Web.Compilation;
 using NUnit.Framework;
-using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index add3424599a0..2354dc81472e 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -5,7 +5,6 @@
 using System.Reflection;
 using Moq;
 using NUnit.Framework;
-using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
index 0e360bae5838..d8dbabb5690e 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
@@ -51,7 +51,7 @@ public void ConfigureRequest_Sets_UmbracoPage_When_Published_Content_Assigned()
             request.PublishedContent = content.Object;
             publishedRouter.ConfigureRequest(request);
 
-            Assert.IsNotNull(request.UmbracoPage);
+            Assert.IsNotNull(request.LegacyContentHashTable);
         }
 
         private Mock<IPublishedContent> GetPublishedContentMock()
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index a3c7dd912cc6..fba9a837892c 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -10,7 +10,6 @@
 @using Umbraco.Core.IO
 @using Umbraco.Web
 @using Umbraco.Web.Editors
-@using umbraco
 @using Umbraco.Core.Configuration
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 @{
diff --git a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
index 741604ee8124..a5187db21108 100644
--- a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
@@ -2,7 +2,6 @@
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
-using umbraco;
 using Umbraco.Core.Persistence.Repositories;
 using System.Linq;
 using Newtonsoft.Json;
diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index 3ec25b1632ad..65abde759a13 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -137,7 +137,7 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
                 Thread.CurrentThread.CurrentCulture = Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(culture.Culture);
             }
 
-            var legacyPage = new global::umbraco.page(doc, _variationContextAccessor);
+            var legacyPage = new global::Umbraco.Web.Macros.PublishedContentHashtableConverter(doc, _variationContextAccessor);
 
             UmbracoContext.HttpContext.Items["pageElements"] = legacyPage.Elements;
             UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = null;
diff --git a/src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs b/src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs
index c5bc9ac047a1..2c236e6592b9 100644
--- a/src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Web.Install.Models;
diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
similarity index 53%
rename from src/Umbraco.Web/umbraco.presentation/page.cs
rename to src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index 1ce2a738fa14..ece76090d853 100644
--- a/src/Umbraco.Web/umbraco.presentation/page.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -2,51 +2,25 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web.Editors;
-using Umbraco.Web.Routing;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Composing;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Routing;
 
-namespace umbraco
+namespace Umbraco.Web.Macros
 {
     /// <summary>
-    /// Summary description for page.
+    /// Legacy class used by macros which converts a published content item into a hashset of values
     /// </summary>
-    [Obsolete("TODO: WB This seems legacy", false)]
-    public class page
+    internal class PublishedContentHashtableConverter
     {
-
-        #region Private members and properties
-
-        string _pageName;
-        int _parentId;
-        string _writerName;
-        string _creatorName;
-        string _path;
-        int _nodeType;
-        string _nodeTypeAlias;
-        string[] _splitpath;
-        DateTime _createDate;
-        DateTime _updateDate;
-        int _pageId;
-        Guid _pageVersion;
-        readonly int _template;
-
-        readonly Hashtable _elements = new Hashtable();
-        readonly StringBuilder _pageContent = new StringBuilder();
-        Control _pageContentControl = new Control();
-
-        #endregion
-
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="page"/> class for a published document request.
+        /// Initializes a new instance of the <see cref="PublishedContentHashtableConverter"/> class for a published document request.
         /// </summary>
         /// <param name="frequest">The <see cref="PublishedRequest"/> pointing to the document.</param>
         /// <remarks>
@@ -54,22 +28,20 @@ public class page
         /// that the PublishedContentRequest takes into account how a template is assigned during the routing process whereas
         /// with an IPublishedContent item, the template id is assigned purely based on the default.
         /// </remarks>
-        internal page(PublishedRequest frequest)
+        internal PublishedContentHashtableConverter(PublishedRequest frequest)
         {
 
             if (!frequest.HasPublishedContent)
                 throw new ArgumentException("Document request has no node.", "frequest");
 
-            populatePageData(frequest.PublishedContent.Id,
+            PopulatePageData(frequest.PublishedContent.Id,
                 frequest.PublishedContent.Name, frequest.PublishedContent.ContentType.Id, frequest.PublishedContent.ContentType.Alias,
                 frequest.PublishedContent.WriterName, frequest.PublishedContent.CreatorName, frequest.PublishedContent.CreateDate, frequest.PublishedContent.UpdateDate,
                 frequest.PublishedContent.Path, frequest.PublishedContent.Parent == null ? -1 : frequest.PublishedContent.Parent.Id);
 
             if (frequest.HasTemplate)
             {
-
-                this._template = frequest.TemplateModel.Id;
-                _elements["template"] = _template.ToString();
+                Elements["template"] = frequest.TemplateModel.Id.ToString();
             }
 
             PopulateElementData(frequest.PublishedContent);
@@ -80,11 +52,11 @@ internal page(PublishedRequest frequest)
         /// Initializes a new instance of the page for a published document
         /// </summary>
         /// <param name="doc"></param>
-        internal page(IPublishedContent doc)
+        internal PublishedContentHashtableConverter(IPublishedContent doc)
         {
             if (doc == null) throw new ArgumentNullException("doc");
 
-            populatePageData(doc.Id,
+            PopulatePageData(doc.Id,
                 doc.Name, doc.ContentType.Id, doc.ContentType.Alias,
                 doc.WriterName, doc.CreatorName, doc.CreateDate, doc.UpdateDate,
                 doc.Path, doc.Parent == null ? -1 : doc.Parent.Id);
@@ -92,8 +64,7 @@ internal page(IPublishedContent doc)
             if (doc.TemplateId.HasValue)
             {
                 //set the template to whatever is assigned to the doc
-                _template = doc.TemplateId.Value;
-                _elements["template"] = _template.ToString();
+                Elements["template"] = doc.TemplateId.Value.ToString();
             }
 
             PopulateElementData(doc);
@@ -103,8 +74,9 @@ internal page(IPublishedContent doc)
         /// Initializes a new instance of the page for a content.
         /// </summary>
         /// <param name="content">The content.</param>
+        /// <param name="variationContextAccessor"></param>
         /// <remarks>This is for <see cref="MacroRenderingController"/> usage only.</remarks>
-        internal page(IContent content, IVariationContextAccessor variationContextAccessor)
+        internal PublishedContentHashtableConverter(IContent content, IVariationContextAccessor variationContextAccessor)
             : this(new PagePublishedContent(content, variationContextAccessor))
         { }
 
@@ -112,46 +84,34 @@ internal page(IContent content, IVariationContextAccessor variationContextAccess
 
         #region Initialize
 
-        void populatePageData(int pageID,
+        private void PopulatePageData(int pageId,
             string pageName, int nodeType, string nodeTypeAlias,
             string writerName, string creatorName, DateTime createDate, DateTime updateDate,
             string path, int parentId)
         {
-            this._pageId = pageID;
-            this._pageName = pageName;
-            this._nodeType = nodeType;
-            this._nodeTypeAlias = nodeTypeAlias;
-            this._writerName = writerName;
-            this._creatorName = creatorName;
-            this._createDate = createDate;
-            this._updateDate = updateDate;
-            this._parentId = parentId;
-            this._path = path;
-            this._splitpath = path.Split(',');
-
             // Update the elements hashtable
-            _elements.Add("pageID", pageID);
-            _elements.Add("parentID", parentId);
-            _elements.Add("pageName", pageName);
-            _elements.Add("nodeType", nodeType);
-            _elements.Add("nodeTypeAlias", nodeTypeAlias);
-            _elements.Add("writerName", writerName);
-            _elements.Add("creatorName", creatorName);
-            _elements.Add("createDate", createDate);
-            _elements.Add("updateDate", updateDate);
-            _elements.Add("path", path);
-            _elements.Add("splitpath", _splitpath);
+            Elements.Add("pageID", pageId);
+            Elements.Add("parentID", parentId);
+            Elements.Add("pageName", pageName);
+            Elements.Add("nodeType", nodeType);
+            Elements.Add("nodeTypeAlias", nodeTypeAlias);
+            Elements.Add("writerName", writerName);
+            Elements.Add("creatorName", creatorName);
+            Elements.Add("createDate", createDate);
+            Elements.Add("updateDate", updateDate);
+            Elements.Add("path", path);
+            Elements.Add("splitpath", path.Split(','));
         }
         
         /// <summary>
         /// Puts the properties of the node into the elements table
         /// </summary>
         /// <param name="node"></param>
-        void PopulateElementData(IPublishedContent node)
+        private void PopulateElementData(IPublishedElement node)
         {
             foreach (var p in node.Properties)
             {
-                if (_elements.ContainsKey(p.Alias) == false)
+                if (Elements.ContainsKey(p.Alias) == false)
                 {
                     // note: legacy used the raw value (see populating from an Xml node below)
                     // so we're doing the same here, using DataValue. If we use Value then every
@@ -161,94 +121,16 @@ void PopulateElementData(IPublishedContent node)
                     // to properly fix this, we'd need to turn the elements collection into some
                     // sort of collection of lazy values.
 
-                    _elements[p.Alias] = p.GetSourceValue();
+                    Elements[p.Alias] = p.GetSourceValue();
                 }
             }
         }
         #endregion
 
-        #region Public properties
-
-        public Control PageContentControl
-        {
-            get { return _pageContentControl; }
-        }
-
-        public string PageName
-        {
-            get { return _pageName; }
-        }
-
-        public int ParentId
-        {
-            get { return _parentId; }
-        }
-
-        public string NodeTypeAlias
-        {
-            get { return _nodeTypeAlias; }
-        }
-
-        public int NodeType
-        {
-            get { return _nodeType; }
-        }
-
-        public string WriterName
-        {
-            get { return _writerName; }
-        }
-
-        public string CreatorName
-        {
-            get { return _creatorName; }
-        }
-
-        public DateTime CreateDate
-        {
-            get { return _createDate; }
-        }
-
-        public DateTime UpdateDate
-        {
-            get { return _updateDate; }
-        }
-
-        public int PageID
-        {
-            get { return _pageId; }
-        }
-
-        public int Template
-        {
-            get { return _template; }
-        }
-
-        public Hashtable Elements
-        {
-            get { return _elements; }
-        }
-
-        public string PageContent
-        {
-            get { return _pageContent.ToString(); }
-        }
-
-        public string[] SplitPath
-        {
-            get { return this._splitpath; }
-        }
-
-        #endregion
-
-        #region ToString
-
-        public override string ToString()
-        {
-            return _pageName;
-        }
-
-        #endregion
+        /// <summary>
+        /// Returns a Hashtable of data for a published content item
+        /// </summary>
+        public Hashtable Elements { get; } = new Hashtable();
 
         #region PublishedContent
 
@@ -298,13 +180,7 @@ public override object GetXPathValue(string culture = null, string segment = nul
         private class PagePublishedContent : IPublishedContent
         {
             private readonly IContent _inner;
-            private readonly int _id;
-            private readonly Guid _key;
-            private readonly string _creatorName;
-            private readonly string _writerName;
-            private readonly PublishedContentType _contentType;
             private readonly IPublishedProperty[] _properties;
-            private readonly IPublishedContent _parent;
             private IReadOnlyDictionary<string, PublishedCultureInfo> _cultureInfos;
             private readonly IVariationContextAccessor _variationContextAccessor;
 
@@ -312,26 +188,23 @@ private class PagePublishedContent : IPublishedContent
 
             private PagePublishedContent(int id)
             {
-                _id = id;
+                Id = id;
             }
 
             public PagePublishedContent(IContent inner, IVariationContextAccessor variationContextAccessor)
             {
-                if (inner == null)
-                    throw new NullReferenceException("content");
-
-                _inner = inner;
+                _inner = inner ?? throw new NullReferenceException("content");
                 _variationContextAccessor = variationContextAccessor;
-                _id = _inner.Id;
-                _key = _inner.Key;
+                Id = _inner.Id;
+                Key = _inner.Key;
 
                 // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
-                _creatorName = _inner.GetCreatorProfile().Name;
-                _writerName = _inner.GetWriterProfile().Name;
+                CreatorName = _inner.GetCreatorProfile().Name;
+                WriterName = _inner.GetWriterProfile().Name;
 
-                _contentType = Current.PublishedContentTypeFactory.CreateContentType(_inner.ContentType);
+                ContentType = Current.PublishedContentTypeFactory.CreateContentType(_inner.ContentType);
 
-                _properties = _contentType.PropertyTypes
+                _properties = ContentType.PropertyTypes
                     .Select(x =>
                     {
                         var p = _inner.Properties.SingleOrDefault(xx => xx.Alias == x.Alias);
@@ -340,35 +213,20 @@ public PagePublishedContent(IContent inner, IVariationContextAccessor variationC
                     .Cast<IPublishedProperty>()
                     .ToArray();
 
-                _parent = new PagePublishedContent(_inner.ParentId);
+                Parent = new PagePublishedContent(_inner.ParentId);
             }
 
-            public PublishedContentType ContentType
-            {
-                get { return _contentType; }
-            }
+            public PublishedContentType ContentType { get; }
 
-            public int Id
-            {
-                get { return _id; }
-            }
+            public int Id { get; }
 
-            public Guid Key
-            {
-                get { return _key; }
-            }
+            public Guid Key { get; }
 
             public int? TemplateId => _inner.TemplateId;
 
-            public int SortOrder
-            {
-                get { return _inner.SortOrder; }
-            }
+            public int SortOrder => _inner.SortOrder;
 
-            public string Name
-            {
-                get { return _inner.Name; }
-            }
+            public string Name => _inner.Name;
 
             public PublishedCultureInfo GetCulture(string culture = null)
             {
@@ -398,72 +256,29 @@ public IReadOnlyDictionary<string, PublishedCultureInfo> Cultures
                 }
             }
 
-            public string UrlSegment
-            {
-                get { throw new NotImplementedException(); }
-            }
+            public string UrlSegment => throw new NotImplementedException();
 
-            public string DocumentTypeAlias
-            {
-                get { return _inner.ContentType.Alias; }
-            }
+            public string WriterName { get; }
 
-            public int DocumentTypeId
-            {
-                get { return _inner.ContentTypeId; }
-            }
+            public string CreatorName { get; }
 
-            public string WriterName
-            {
-                get { return _writerName; }
-            }
+            public int WriterId => _inner.WriterId;
 
-            public string CreatorName
-            {
-                get { return _creatorName; }
-            }
+            public int CreatorId => _inner.CreatorId;
 
-            public int WriterId
-            {
-                get { return _inner.WriterId; }
-            }
+            public string Path => _inner.Path;
 
-            public int CreatorId
-            {
-                get { return _inner.CreatorId; }
-            }
+            public DateTime CreateDate => _inner.CreateDate;
 
-            public string Path
-            {
-                get { return _inner.Path; }
-            }
-
-            public DateTime CreateDate
-            {
-                get { return _inner.CreateDate; }
-            }
+            public DateTime UpdateDate => _inner.UpdateDate;
 
-            public DateTime UpdateDate
-            {
-                get { return _inner.UpdateDate; }
-            }
+            public int Level => _inner.Level;
 
-            public int Level
-            {
-                get { return _inner.Level; }
-            }
-
-            public string Url
-            {
-                get { throw new NotImplementedException(); }
-            }
+            public string Url => throw new NotImplementedException();
 
             public string GetUrl(string culture = null) => throw new NotSupportedException();
 
-            public PublishedItemType ItemType
-            {
-                get { return PublishedItemType.Content; }
-            }
+            public PublishedItemType ItemType => PublishedItemType.Content;
 
             public bool IsDraft(string culture = null)
             {
@@ -475,30 +290,16 @@ public bool IsPublished(string culture = null)
                 throw new NotImplementedException();
             }
 
-            public IPublishedContent Parent
-            {
-                get { return _parent; }
-            }
+            public IPublishedContent Parent { get; }
 
-            public IEnumerable<IPublishedContent> Children
-            {
-                get { throw new NotImplementedException(); }
-            }
+            public IEnumerable<IPublishedContent> Children => throw new NotImplementedException();
 
-            public IEnumerable<IPublishedProperty> Properties
-            {
-                get { return _properties; }
-            }
+            public IEnumerable<IPublishedProperty> Properties => _properties;
 
             public IPublishedProperty GetProperty(string alias)
             {
                 throw new NotImplementedException();
             }
-
-            public IPublishedProperty GetProperty(string alias, bool recurse)
-            {
-                throw new NotImplementedException();
-            }
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Macros/UserControlMacroEngine.cs b/src/Umbraco.Web/Macros/UserControlMacroEngine.cs
index 12730c1d1d6e..f92074a91beb 100644
--- a/src/Umbraco.Web/Macros/UserControlMacroEngine.cs
+++ b/src/Umbraco.Web/Macros/UserControlMacroEngine.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Web;
 using System.Web.UI;
-using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs
index 9a775adb85e5..c5475f8b73f2 100644
--- a/src/Umbraco.Web/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedRequest.cs
@@ -3,11 +3,11 @@
 using System.Globalization;
 using System.Threading;
 using System.Web;
-using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Macros;
 
 namespace Umbraco.Web.Routing
 {
@@ -27,7 +27,7 @@ public class PublishedRequest
         private CultureInfo _culture;
         private IPublishedContent _publishedContent;
         private IPublishedContent _initialPublishedContent; // found by finders before 404, redirects, etc
-        private page _umbracoPage; // legacy
+        private PublishedContentHashtableConverter _umbracoPage; // legacy
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PublishedRequest"/> class.
@@ -478,9 +478,9 @@ public void SetResponseStatus(int code, string description = null)
 
         #region Legacy
 
-        // for legacy/webforms code -
+        // for legacy/webforms/macro code -
         // TODO: get rid of it eventually
-        internal page UmbracoPage
+        internal PublishedContentHashtableConverter LegacyContentHashTable
         {
             get
             {
@@ -489,7 +489,7 @@ internal page UmbracoPage
 
                 return _umbracoPage;
             }
-            set { _umbracoPage = value; }
+            set => _umbracoPage = value;
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 7ffb01e7f643..14c36198d870 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -5,7 +5,6 @@
 using System.Globalization;
 using System.IO;
 using System.Web.Security;
-using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -14,6 +13,7 @@
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
+using Umbraco.Web.Macros;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Web.Routing
@@ -205,10 +205,10 @@ public bool ConfigureRequest(PublishedRequest frequest)
 
             // assign the legacy page back to the request
             // handlers like default.aspx will want it and most macros currently need it
-            frequest.UmbracoPage = new page(frequest);
+            frequest.LegacyContentHashTable = new PublishedContentHashtableConverter(frequest);
 
             // used by many legacy objects
-            frequest.UmbracoContext.HttpContext.Items["pageElements"] = frequest.UmbracoPage.Elements;
+            frequest.UmbracoContext.HttpContext.Items["pageElements"] = frequest.LegacyContentHashTable.Elements;
 
             return true;
         }
@@ -251,10 +251,10 @@ public void UpdateRequestOnMissingTemplate(PublishedRequest request)
 
             // assign the legacy page back to the docrequest
             // handlers like default.aspx will want it and most macros currently need it
-            request.UmbracoPage = new page(request);
+            request.LegacyContentHashTable = new PublishedContentHashtableConverter(request);
 
             // this is used by many legacy objects
-            request.UmbracoContext.HttpContext.Items["pageElements"] = request.UmbracoPage.Elements;
+            request.UmbracoContext.HttpContext.Items["pageElements"] = request.LegacyContentHashTable.Elements;
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index 24526de7b23e..214612ef2d74 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -9,10 +9,10 @@
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Routing;
-using umbraco;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Services;
+using Umbraco.Web.Macros;
 using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.Templates
@@ -184,9 +184,9 @@ private string RenderUmbracoRequestToString(RequestContext requestContext)
         private void SetNewItemsOnContextObjects(PublishedRequest request)
         {
             // handlers like default.aspx will want it and most macros currently need it
-            request.UmbracoPage = new page(request);
+            request.LegacyContentHashTable = new PublishedContentHashtableConverter(request);
             //now, set the new ones for this page execution
-            _umbracoContext.HttpContext.Items["pageElements"] = request.UmbracoPage.Elements;
+            _umbracoContext.HttpContext.Items["pageElements"] = request.LegacyContentHashTable.Elements;
             _umbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = null;
             _umbracoContext.PublishedRequest = request;
         }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 5a3379b82bfc..463b72e3e938 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1173,7 +1173,7 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\page.cs">
+    <Compile Include="Macros\PublishedContentHashtableConverter.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\Settings.Designer.cs">
diff --git a/src/Umbraco.Web/UmbracoComponentRenderer.cs b/src/Umbraco.Web/UmbracoComponentRenderer.cs
index a579c0abac53..f59962a0f2c0 100644
--- a/src/Umbraco.Web/UmbracoComponentRenderer.cs
+++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs
@@ -5,7 +5,6 @@
 using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Web.Templates;
-using umbraco;
 using System.Collections.Generic;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Macros;
@@ -86,7 +85,7 @@ public IHtmlString RenderMacro(string alias, IDictionary<string, object> paramet
                 throw new InvalidOperationException("Cannot render a macro when there is no current PublishedContentRequest.");
             }
 
-            return RenderMacro(alias, parameters, _umbracoContext.PublishedRequest.UmbracoPage);
+            return RenderMacro(alias, parameters, _umbracoContext.PublishedRequest.LegacyContentHashTable);
         }
 
         /// <summary>
@@ -96,7 +95,7 @@ public IHtmlString RenderMacro(string alias, IDictionary<string, object> paramet
         /// <param name="parameters">The parameters.</param>
         /// <param name="umbracoPage">The legacy umbraco page object that is required for some macros</param>
         /// <returns></returns>
-        internal IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters, page umbracoPage)
+        internal IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters, PublishedContentHashtableConverter umbracoPage)
         {
             if (alias == null) throw new ArgumentNullException("alias");
             if (umbracoPage == null) throw new ArgumentNullException("umbracoPage");
@@ -115,7 +114,7 @@ internal IHtmlString RenderMacro(string alias, IDictionary<string, object> param
         /// <param name="parameters">The parameters.</param>
         /// <param name="umbracoPage">The legacy umbraco page object that is required for some macros</param>
         /// <returns></returns>
-        internal IHtmlString RenderMacro(MacroModel m, IDictionary<string, object> parameters, page umbracoPage)
+        internal IHtmlString RenderMacro(MacroModel m, IDictionary<string, object> parameters, PublishedContentHashtableConverter umbracoPage)
         {
             if (umbracoPage == null) throw new ArgumentNullException(nameof(umbracoPage));
             if (m == null) throw new ArgumentNullException(nameof(m));

From 34f93331bd310b9411710c19aa73fdbf061b0e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 13:31:54 +0100
Subject: [PATCH 125/421] brandcolor 2019 corrections

---
 .../subheader/umb-editor-sub-header.less      |  7 ++++
 .../less/components/tree/umb-tree-item.less   |  4 +-
 .../src/less/components/tree/umb-tree.less    |  8 +++-
 .../less/components/umb-file-dropzone.less    |  6 +--
 .../src/less/components/umb-folder-grid.less  | 23 +++++++++--
 .../src/less/components/umb-media-grid.less   | 39 ++++++++++++-------
 src/Umbraco.Web.UI.Client/src/less/main.less  |  2 +-
 .../src/less/variables.less                   |  6 ++-
 .../src/views/components/umb-folder-grid.html |  2 +-
 .../src/views/components/umb-media-grid.html  |  2 +-
 10 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 10296b58e3f3..2b9f1e31a561 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -48,10 +48,17 @@
    padding-right: 10px;
 }
 
+.umb-editor-sub-header__content-left .umb-editor-sub-header__section {
+   padding-left: 0;
+}
+
 .umb-editor-sub-header__content-left .umb-editor-sub-header__section:first-child {
    padding-left: 0;
 }
 
+.umb-editor-sub-header__content-right .umb-editor-sub-header__section {
+   padding-right: 0;
+}
 .umb-editor-sub-header__content-right .umb-editor-sub-header__section:last-child {
    padding-right: 0;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 377b61c22582..d6202c566525 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -24,11 +24,11 @@
     // ------------------------
     .l {
         width: 100%;
-        height: 1px;
+        height: 2px;
         overflow: hidden;
         position: absolute;
         left: 0;
-        bottom: 0;
+        bottom: -1;
 
         div { 
             .umb-loader;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 6b6f0c5f605c..13e2a550895d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -89,13 +89,15 @@ body.touch .umb-tree {
 
 // active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
 .umb-tree-item > .umb-tree-item__inner.active {
-    background: @ui-selected;
+    //background: @ui-selected;
+    border-color: @ui-selected-border;
     color: @ui-selected-type;
     a {
         color: @ui-selected-type;
     }
     &:hover {
-        background: @ui-selected-hover;
+        //background: @ui-selected-hover;
+        border-color: @ui-selected-border-hover;
         color: @ui-selected-type-hover;
         a {
             color: @ui-selected-type-hover;
@@ -110,6 +112,8 @@ body.touch .umb-tree {
     flex-wrap: nowrap;
     align-items: center;
     
+    border:2px dashed transparent;
+    
     color: @ui-option-type;
     a {
         color: @ui-option-type;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
index b7c58ad3cf23..63190f0ed3a4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
@@ -43,14 +43,14 @@
   // file select link
   .file-select {
     font-size: 15px;
-    color: @turquoise-d1;
+    color: @ui-action-disgrete-type;
     cursor: pointer;
 
     margin-top: 10px;
 
     &:hover {
-        color: @turquoise-d1;
-        text-decoration: underline;
+        color: @ui-action-disgrete-type-hover;
+        text-decoration: none;
     }
   }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
index d91f24cbca9b..f5ca1f84382c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
@@ -14,7 +14,7 @@
    padding: 10px 20px;
    box-sizing: border-box;
    flex: 1 1 200px;
-   border: 1px solid transparent;
+   border: 2px dashed transparent;
    transition: border 0.2s;
    position: relative;
    justify-content: space-between;
@@ -22,8 +22,24 @@
    user-select: none;
    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
    border-radius: 3px;
+   
+   transition: box-shadow 150ms ease-in-out;
+}
+
+.umb-folder-grid__folder.-selected {
+    box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
+    
+    //background: @ui-selected;
+    color:@ui-selected-type;
+    border-color:@ui-selected-border;
+    
+    &:hover {
+        color:@ui-selected-type-hover;
+        border-color:@ui-selected-border-hover;
+    }
 }
 
+
 .umb-folder-grid__folder:focus,
 .umb-folder-grid__folder:active {
    text-decoration: none;
@@ -31,8 +47,6 @@
 
 .umb-folder-grid__folder:hover {
    text-decoration: none;
-   box-shadow: 0 3px 6px 0 rgba(0,0,0,0.16);
-   transition: box-shadow 150ms ease-in-out;
 }
 
 .umb-folder-grid__folder-description {
@@ -57,7 +71,7 @@
 .umb-folder-grid__folder-name:hover {
    text-decoration: underline;
 }
-
+/*
 .umb-folder-grid__action {
    opacity: 0;
    border: 2px solid @white;
@@ -78,3 +92,4 @@
    opacity: 1;
    background: @green;
 }
+*/
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 3356c1de6800..8185040f2320 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -23,16 +23,30 @@
     position: relative;
     overflow: hidden;
     cursor: pointer;
-
+    
+    border: 2px dashed transparent;
     box-shadow: 0 1px 1px 0 rgba(0,0,0,.2);
-
-    transition: box-shadow 100ms;
+    
+    transition: box-shadow 150ms ease-in-out;
 }
 
 .umb-media-grid__item.-file {
     background-color: @white;
 }
 
+.umb-media-grid__item.-selected {
+    box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
+    
+    //background: @ui-selected;
+    color:@ui-selected-type;
+    border-color:@ui-selected-border;
+    
+    &:hover {
+        color:@ui-selected-type-hover;
+        border-color:@ui-selected-border-hover;
+    }
+}
+
 .umb-media-grid__item-file-icon > span {
     color: @white;
     background: @gray-4;
@@ -45,10 +59,6 @@
     position: relative;
 }
 
-.umb-media-grid__item.-selected {
-    box-shadow: 0 2px 8px 0 rgba(0,0,0,.35);
-}
-
 .umb-media-grid__item:hover {
    text-decoration: none;
 }
@@ -90,12 +100,13 @@
    box-sizing: border-box;
    font-size: 12px;
    overflow: hidden;
-   color: @white;
+   color: @black;
    white-space: nowrap;
-   background: @purple;
+   border-top:1px solid @gray-9;
+   background: @white;
    transition: opacity 150ms;
 }
-
+/*
 .umb-media-grid__item.-file .umb-media-grid__item-overlay {
     opacity: 1;
     color: @gray-4;
@@ -105,9 +116,9 @@
 .umb-media-grid__item.-file:hover .umb-media-grid__item-overlay,
 .umb-media-grid__item.-file.-selected .umb-media-grid__item-overlay {
     color: @white;
-    background: @purple;
+    background: @blueExtraDark;
 }
-
+*/
 .umb-media-grid__info {
     margin-right: 5px;
 }
@@ -134,7 +145,7 @@
    font-size: 40px !important;
    transform: translate(-50%,-50%);
 }
-
+/*
 .umb-media-grid__checkmark {
     position: absolute;
     z-index: 2;
@@ -152,7 +163,7 @@
     color: @white;
     transition: background 100ms;
 }
-
+*/
 .umb-media-grid__edit {
     position: absolute;
     opacity: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 3a8228bde527..51892106e128 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -519,7 +519,7 @@ animation-duration:1s;
 animation-iteration-count:infinite;
 animation-timing-function:linear;
 width:100%;
-height:1px;
+height:2px;
 }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 6c906f316104..31d0095836e0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -43,7 +43,7 @@
 // UI Colors
 @red-d1:                #F02E28;
 @red:                   #D42054;// updated 2019
-@red-l1:			    #FE6561;
+@red-l1:			    #e22c60;// updated 2019
 @red-l2:			    #FE8B88;
 @red-l3:			    #FFB2B0;
 @red-washed:		    #FFECEB;
@@ -146,8 +146,10 @@
 
 @ui-selected:           @sand-1;
 @ui-selected-hover:     ligthen(@sand-1, 10);
-@ui-selected-type:           @blueMid;
+@ui-selected-type:           @blueExtraDark;
 @ui-selected-type-hover:     @blueMid;
+@ui-selected-border:           @pinkLight;
+@ui-selected-border-hover:     @pinkLight;
 
 @ui-light-border:           @pinkLight;
 @ui-light-type:             @gray-4;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-folder-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-folder-grid.html
index df5eafbbcabc..6796b7d64b84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-folder-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-folder-grid.html
@@ -11,7 +11,7 @@
          <div ng-click="clickFolderName(folder, $event, $index)" class="umb-folder-grid__folder-name">{{ folder.name }}</div>
       </div>
 
-      <i class="icon-check umb-folder-grid__action" ng-class="{'-selected': folder.selected}"></i>
+      <!--<i class="icon-check umb-folder-grid__action" ng-class="{'-selected': folder.selected}"></i>-->
 
    </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index 360c6b2bb761..da9472956264 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -1,7 +1,7 @@
 <div data-element="media-grid" class="umb-media-grid">
     <div data-element="media-grid-item-{{$index}}" class="umb-media-grid__item" title="{{item.name}}" ng-click="clickItem(item, $event, $index)" ng-repeat="item in items | filter:filterBy" ng-style="item.flexStyle" ng-class="{'-selected': item.selected, '-file': !item.thumbnail, '-svg': item.extension == 'svg'}">
         <div>
-            <i ng-show="item.selected" class="icon-check umb-media-grid__checkmark"></i>
+            <!--<i ng-show="item.selected" class="icon-check umb-media-grid__checkmark"></i>-->
             <a ng-if="allowOnClickEdit === 'true'" ng-click="clickEdit(item, $event)" ng-href="" class="icon-edit umb-media-grid__edit"></a>
 
             <div data-element="media-grid-item-edit" class="umb-media-grid__item-overlay" ng-class="{'-locked': item.selected}" ng-click="clickItemName(item, $event, $index)">

From 1897c0f162bdb85a7c54fc3706aa435aa4ea5ddd Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 23:31:59 +1100
Subject: [PATCH 126/421] moves package actions to correct namespace, no more
 _Legacy namespace

---
 .../Components/CompositionExtensions.cs       |  2 +-
 src/Umbraco.Core/Composing/Current.cs         |  2 +-
 .../Composing/TypeLoaderExtensions.cs         |  2 +-
 .../PackageActions/AllowDoctype.cs}           | 10 +--
 .../PackageActions/IPackageAction.cs          |  3 +-
 .../PackageActions/PackageActionCollection.cs |  2 +-
 .../PackageActionCollectionBuilder.cs         |  2 +-
 .../PackageActions/PublishRootDocument.cs}    | 10 +--
 .../Packaging/PackageActionRunner.cs          |  2 +-
 .../Runtime/CoreRuntimeComposer.cs            |  2 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |  8 +-
 .../Composing/PackageActionCollectionTests.cs |  2 +-
 src/Umbraco.Web/Composing/Current.cs          |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 -
 .../PackageActions/addProxyFeedHost.cs        | 81 -------------------
 15 files changed, 21 insertions(+), 111 deletions(-)
 rename src/{Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs => Umbraco.Core/PackageActions/AllowDoctype.cs} (94%)
 rename src/Umbraco.Core/{_Legacy => }/PackageActions/IPackageAction.cs (80%)
 rename src/Umbraco.Core/{_Legacy => }/PackageActions/PackageActionCollection.cs (86%)
 rename src/Umbraco.Core/{_Legacy => }/PackageActions/PackageActionCollectionBuilder.cs (85%)
 rename src/{Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs => Umbraco.Core/PackageActions/PublishRootDocument.cs} (91%)
 delete mode 100644 src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs

diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs
index 4e3e4816e567..881021342182 100644
--- a/src/Umbraco.Core/Components/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Components/CompositionExtensions.cs
@@ -9,8 +9,8 @@
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Core._Legacy.PackageActions;
 using Umbraco.Core.Logging.Viewer;
+using Umbraco.Core.PackageActions;
 
 namespace Umbraco.Core.Components
 {
diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs
index 12672bcc9af1..1b16ad2b8e30 100644
--- a/src/Umbraco.Core/Composing/Current.cs
+++ b/src/Umbraco.Core/Composing/Current.cs
@@ -5,6 +5,7 @@
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PackageActions;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
@@ -12,7 +13,6 @@
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Core.Composing
 {
diff --git a/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs b/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs
index ba5724307182..5d17b0f53c6f 100644
--- a/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs
+++ b/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Cache;
+using Umbraco.Core.PackageActions;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.PropertyEditors;
-using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Core.Composing
 {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs b/src/Umbraco.Core/PackageActions/AllowDoctype.cs
similarity index 94%
rename from src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs
rename to src/Umbraco.Core/PackageActions/AllowDoctype.cs
index f4b206a9ad8d..2e37061c31fa 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs
+++ b/src/Umbraco.Core/PackageActions/AllowDoctype.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Linq;
-using System.Xml;
 using System.Xml.Linq;
-using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
-using Umbraco.Core._Legacy.PackageActions;
-using Umbraco.Web.Composing;
 
-namespace Umbraco.Web._Legacy.PackageActions
+namespace Umbraco.Core.PackageActions
 {
     /// <summary>
     /// This class implements the IPackageAction Interface, used to execute code when packages are installed.
diff --git a/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs b/src/Umbraco.Core/PackageActions/IPackageAction.cs
similarity index 80%
rename from src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs
rename to src/Umbraco.Core/PackageActions/IPackageAction.cs
index b58ea34a60bd..d4dfb4079b62 100644
--- a/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs
+++ b/src/Umbraco.Core/PackageActions/IPackageAction.cs
@@ -1,8 +1,7 @@
-using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Composing;
 
-namespace Umbraco.Core._Legacy.PackageActions
+namespace Umbraco.Core.PackageActions
 {
     public interface IPackageAction : IDiscoverable
     {
diff --git a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs b/src/Umbraco.Core/PackageActions/PackageActionCollection.cs
similarity index 86%
rename from src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs
rename to src/Umbraco.Core/PackageActions/PackageActionCollection.cs
index a38c8cea5611..813695f84cde 100644
--- a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs
+++ b/src/Umbraco.Core/PackageActions/PackageActionCollection.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Umbraco.Core.Composing;
 
-namespace Umbraco.Core._Legacy.PackageActions
+namespace Umbraco.Core.PackageActions
 {
     public sealed class PackageActionCollection : BuilderCollectionBase<IPackageAction>
     {
diff --git a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs b/src/Umbraco.Core/PackageActions/PackageActionCollectionBuilder.cs
similarity index 85%
rename from src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs
rename to src/Umbraco.Core/PackageActions/PackageActionCollectionBuilder.cs
index 2f73a2b4893a..fdb118ae069f 100644
--- a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs
+++ b/src/Umbraco.Core/PackageActions/PackageActionCollectionBuilder.cs
@@ -1,6 +1,6 @@
 using Umbraco.Core.Composing;
 
-namespace Umbraco.Core._Legacy.PackageActions
+namespace Umbraco.Core.PackageActions
 {
     internal class PackageActionCollectionBuilder : LazyCollectionBuilderBase<PackageActionCollectionBuilder, PackageActionCollection, IPackageAction>
     {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs b/src/Umbraco.Core/PackageActions/PublishRootDocument.cs
similarity index 91%
rename from src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
rename to src/Umbraco.Core/PackageActions/PublishRootDocument.cs
index c6bbbfa00b83..55955a4c8ff0 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
+++ b/src/Umbraco.Core/PackageActions/PublishRootDocument.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Xml;
-using System.Xml.Linq;
-using Umbraco.Core;
-using Umbraco.Core._Legacy.PackageActions;
-using Umbraco.Web.Composing;
+using System.Xml.Linq;
+using Umbraco.Core.Composing;
 
-namespace Umbraco.Web._Legacy.PackageActions
+namespace Umbraco.Core.PackageActions
 {
     /// <summary>
     /// This class implements the IPackageAction Interface, used to execute code when packages are installed.
diff --git a/src/Umbraco.Core/Packaging/PackageActionRunner.cs b/src/Umbraco.Core/Packaging/PackageActionRunner.cs
index dba2690c0c44..8434f52f302b 100644
--- a/src/Umbraco.Core/Packaging/PackageActionRunner.cs
+++ b/src/Umbraco.Core/Packaging/PackageActionRunner.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.Linq;
 using Umbraco.Core.Logging;
-using Umbraco.Core._Legacy.PackageActions;
+using Umbraco.Core.PackageActions;
 
 namespace Umbraco.Core.Packaging
 {
diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
index 8285b9b4fd30..ee289ddcfa38 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
@@ -11,6 +11,7 @@
 using Umbraco.Core.Migrations;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PackageActions;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.PropertyEditors;
@@ -19,7 +20,6 @@
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Core._Legacy.PackageActions;
 using IntegerValidator = Umbraco.Core.PropertyEditors.Validators.IntegerValidator;
 
 namespace Umbraco.Core.Runtime
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 588c66cd3d80..e31579c9f7c2 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -454,6 +454,8 @@
     <Compile Include="Models\PublishedContent\ThreadCultureVariationContextAccessor.cs" />
     <Compile Include="Models\PublishedContent\VariationContextAccessorExtensions.cs" />
     <Compile Include="Models\Trees\IBackOfficeSection.cs" />
+    <Compile Include="PackageActions\AllowDoctype.cs" />
+    <Compile Include="PackageActions\PublishRootDocument.cs" />
     <Compile Include="Packaging\CompiledPackageXmlParser.cs" />
     <Compile Include="Packaging\ICreatedPackagesRepository.cs" />
     <Compile Include="Packaging\IInstalledPackagesRepository.cs" />
@@ -1516,9 +1518,9 @@
     <Compile Include="Xml\XPath\MacroNavigator.cs" />
     <Compile Include="Xml\XPath\NavigableNavigator.cs" />
     <Compile Include="Xml\XPath\RenamedRootNavigator.cs" />
-    <Compile Include="_Legacy\PackageActions\IPackageAction.cs" />
-    <Compile Include="_Legacy\PackageActions\PackageActionCollection.cs" />
-    <Compile Include="_Legacy\PackageActions\PackageActionCollectionBuilder.cs" />
+    <Compile Include="PackageActions\IPackageAction.cs" />
+    <Compile Include="PackageActions\PackageActionCollection.cs" />
+    <Compile Include="PackageActions\PackageActionCollectionBuilder.cs" />
     <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
       <SubType>Component</SubType>
     </Compile>
diff --git a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
index 75030decbf65..fe8ca7dadcd5 100644
--- a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
+++ b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
@@ -8,7 +8,7 @@
 using Umbraco.Core.Components;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
-using Umbraco.Core._Legacy.PackageActions;
+using Umbraco.Core.PackageActions;
 using Umbraco.Tests.Components;
 
 namespace Umbraco.Tests.Composing
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 70b0927c43bf..b394684f56fd 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -11,13 +11,13 @@
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.PackageActions;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Core._Legacy.PackageActions;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Editors;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 463b72e3e938..89e35b4e0763 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1135,8 +1135,6 @@
     <Compile Include="Templates\TemplateUtilities.cs" />
     <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
     <Compile Include="Trees\PartialViewsTreeController.cs" />
-    <Compile Include="_Legacy\PackageActions\allowDoctype.cs" />
-    <Compile Include="_Legacy\PackageActions\publishRootDocument.cs" />
     <Compile Include="Models\ContentEditing\NotificationStyle.cs" />
     <Compile Include="UmbracoHelper.cs" />
     <Compile Include="Mvc\ViewContextExtensions.cs" />
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs b/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs
deleted file mode 100644
index f53adb3be065..000000000000
--- a/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Xml;
-using System.Xml.Linq;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Core.Xml;
-using Umbraco.Core._Legacy.PackageActions;
-
-namespace Umbraco.Web._Legacy.PackageActions
-{
-    public class AddProxyFeedHost : IPackageAction
-    {
-        #region IPackageAction Members
-
-        public bool Execute(string packageName, XElement xmlData)
-        {
-            var hostname = xmlData.AttributeValue<string>("host");
-            if (string.IsNullOrEmpty(hostname))
-                return false;
-
-            var xdoc = XDocument.Load(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
-
-            var insert = true;
-
-            if (xdoc.Root.HasElements)
-            {
-                foreach (var node in xdoc.Root.Elements("allow"))
-                {
-                    if (node.AttributeValue<string>("host") != null && node.AttributeValue<string>("host") == hostname)
-                        insert = false;
-                }
-            }
-
-            if (insert)
-            {
-                xdoc.Root.Add(new XElement("allow", new XAttribute("host", hostname)));
-                xdoc.Save(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
-
-                return true;
-            }
-            return false;
-        }
-
-        public string Alias()
-        {
-            return "addProxyFeedHost";
-        }
-
-        public bool Undo(string packageName, XElement xmlData)
-        {
-            var hostname = xmlData.AttributeValue<string>("host");
-            if (string.IsNullOrEmpty(hostname))
-                return false;
-
-            var xdoc = XDocument.Load(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
-
-            bool inserted = false;
-            if (xdoc.Root.HasElements)
-            {
-                foreach (var node in xdoc.Root.Elements("allow"))
-                {
-                    if (node.AttributeValue<string>("host") != null && node.AttributeValue<string>("host") == hostname)
-                    {
-                        node.Remove();
-                        inserted = true;
-                    }
-                }
-            }
-
-            if (inserted)
-            {
-                xdoc.Save(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
-                return true;
-            }
-
-            return false;
-        }
-
-        #endregion
-        
-    }
-}

From c0026d3c23b72ce0f6221dafea3dbf5d7829f447 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Jan 2019 23:58:43 +1100
Subject: [PATCH 127/421] Removes UseDirectoryUrls, have better defaults for
 reserved paths, don't ship with values in them just have them blank

---
 .../Configuration/GlobalSettings.cs           | 70 +++++++------------
 .../Configuration/IGlobalSettings.cs          |  6 --
 src/Umbraco.Tests/Misc/UriUtilityTests.cs     | 26 ++-----
 src/Umbraco.Tests/Routing/UrlProviderTests.cs |  8 ---
 .../Routing/UrlsProviderWithDomainsTests.cs   |  7 --
 .../Routing/UrlsWithNestedDomains.cs          |  1 -
 .../TestHelpers/SettingsForTests.cs           |  1 -
 .../config/umbracoSettings.config             |  3 -
 src/Umbraco.Web.UI/web.Template.config        | 17 +----
 .../JavaScript/ServerVariablesParser.cs       | 15 ++--
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 19 +++--
 src/Umbraco.Web/UriUtility.cs                 |  9 +--
 12 files changed, 53 insertions(+), 129 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 4b449decff16..49cb9c3fbf58 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -31,8 +31,8 @@ public class GlobalSettings : IGlobalSettings
         private static string _reservedPaths;
         private static string _reservedUrls;
         //ensure the built on (non-changeable) reserved paths are there at all times
-        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,";
-        internal const string StaticReservedUrls = "~/config/splashes/booting.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,";
+        internal const string StaticReservedPaths = "~/app_plugins/,~/install/";
+        internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known";
         #endregion
 
         /// <summary>
@@ -82,19 +82,18 @@ public static bool HasSmtpServerConfigured(string appPath)
         public string ReservedUrls
         {
             get
-            {                
-                if (_reservedUrls == null)
-                {
-                    var urls = ConfigurationManager.AppSettings.ContainsKey("umbracoReservedUrls")
-                        ? ConfigurationManager.AppSettings["umbracoReservedUrls"]
-                        : string.Empty;
+            {
+                if (_reservedUrls != null) return _reservedUrls;
 
-                    //ensure the built on (non-changeable) reserved paths are there at all times
-                    _reservedUrls = StaticReservedUrls + urls;
-                }
+                var urls = ConfigurationManager.AppSettings.ContainsKey("umbracoReservedUrls")
+                    ? ConfigurationManager.AppSettings["umbracoReservedUrls"]
+                    : string.Empty;
+
+                //ensure the built on (non-changeable) reserved paths are there at all times
+                _reservedUrls = StaticReservedUrls + urls;
                 return _reservedUrls;
             }
-            internal set { _reservedUrls = value; }
+            internal set => _reservedUrls = value;
         }
 
         /// <summary>
@@ -105,22 +104,20 @@ public string ReservedPaths
         {
             get
             {
-                if (_reservedPaths == null)
-                {
-                    var reservedPaths = StaticReservedPaths;
-                    //always add the umbraco path to the list
-                    if (ConfigurationManager.AppSettings.ContainsKey("umbracoPath")
-                        && !ConfigurationManager.AppSettings["umbracoPath"].IsNullOrWhiteSpace())
-                    {
-                        reservedPaths += ConfigurationManager.AppSettings["umbracoPath"].EnsureEndsWith(',');
-                    }
+                if (_reservedPaths != null) return _reservedPaths;
 
-                    var allPaths = ConfigurationManager.AppSettings.ContainsKey("umbracoReservedPaths")
-                                    ? ConfigurationManager.AppSettings["umbracoReservedPaths"]
-                                    : string.Empty;
+                var reservedPaths = StaticReservedPaths;
+                var umbPath = ConfigurationManager.AppSettings.ContainsKey("umbracoPath") && !ConfigurationManager.AppSettings["umbracoPath"].IsNullOrWhiteSpace()
+                    ? ConfigurationManager.AppSettings["umbracoPath"]
+                    : "~/umbraco";
+                //always add the umbraco path to the list
+                reservedPaths += umbPath.EnsureEndsWith(',');
 
-                    _reservedPaths = reservedPaths + allPaths;
-                }
+                var allPaths = ConfigurationManager.AppSettings.ContainsKey("umbracoReservedPaths")
+                    ? ConfigurationManager.AppSettings["umbracoReservedPaths"]
+                    : string.Empty;
+
+                _reservedPaths = reservedPaths + allPaths;
                 return _reservedPaths;
             }
         }
@@ -260,26 +257,7 @@ public int TimeOutInMinutes
                 }
             }
         }
-
-        /// <summary>
-        /// Gets a value indicating whether umbraco uses directory urls.
-        /// </summary>
-        /// <value><c>true</c> if umbraco uses directory urls; otherwise, <c>false</c>.</value>
-        public bool UseDirectoryUrls
-        {
-            get
-            {
-                try
-                {
-                    return bool.Parse(ConfigurationManager.AppSettings["umbracoUseDirectoryUrls"]);
-                }
-                catch
-                {
-                    return false;
-                }
-            }
-        }
-
+        
         /// <summary>
         /// Returns the number of days that should take place between version checks.
         /// </summary>
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index 157103be9e4c..b3c8ded1c09a 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -34,12 +34,6 @@ public interface IGlobalSettings
         /// </summary>
         int TimeOutInMinutes { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether umbraco uses directory urls.
-        /// </summary>
-        /// <value><c>true</c> if umbraco uses directory urls; otherwise, <c>false</c>.</value>
-        bool UseDirectoryUrls { get; }
-
         /// <summary>
         /// Gets the default UI language.
         /// </summary>
diff --git a/src/Umbraco.Tests/Misc/UriUtilityTests.cs b/src/Umbraco.Tests/Misc/UriUtilityTests.cs
index 3dbd54c3a902..33a4b4524912 100644
--- a/src/Umbraco.Tests/Misc/UriUtilityTests.cs
+++ b/src/Umbraco.Tests/Misc/UriUtilityTests.cs
@@ -60,32 +60,20 @@ public void Uri_To_Umbraco(string sourceUrl, string expectedUrl)
             Assert.AreEqual(expectedUri.ToString(), resultUri.ToString());
         }
 
-        // test directoryUrl false, trailingSlash false
-        [TestCase("/", "/", false, false)]
-        [TestCase("/home", "/home.aspx", false, false)]
-        [TestCase("/home/sub1", "/home/sub1.aspx", false, false)]
-
-        // test directoryUrl false, trailingSlash true
-        [TestCase("/", "/", false, true)]
-        [TestCase("/home", "/home.aspx", false, true)]
-        [TestCase("/home/sub1", "/home/sub1.aspx", false, true)]
 
         // test directoryUrl true, trailingSlash false
-        [TestCase("/", "/", true, false)]
-        [TestCase("/home", "/home", true, false)]
-        [TestCase("/home/sub1", "/home/sub1", true, false)]
+        [TestCase("/", "/", false)]
+        [TestCase("/home", "/home", false)]
+        [TestCase("/home/sub1", "/home/sub1", false)]
 
         // test directoryUrl true, trailingSlash true
-        [TestCase("/", "/", true, true)]
-        [TestCase("/home", "/home/", true, true)]
-        [TestCase("/home/sub1", "/home/sub1/", true, true)]
+        [TestCase("/", "/", true)]
+        [TestCase("/home", "/home/", true)]
+        [TestCase("/home/sub1", "/home/sub1/", true)]
 
-        public void Uri_From_Umbraco(string sourceUrl, string expectedUrl, bool directoryUrls, bool trailingSlash)
+        public void Uri_From_Umbraco(string sourceUrl, string expectedUrl, bool trailingSlash)
         {
-            ConfigurationManager.AppSettings.Set("umbracoUseDirectoryUrls", directoryUrls ? "true" : "false");
-
             var globalConfig = Mock.Get(SettingsForTests.GenerateMockGlobalSettings());
-            globalConfig.Setup(x => x.UseDirectoryUrls).Returns(directoryUrls);
 
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
             var requestMock = Mock.Get(settings.RequestHandler);
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index 819ea0b01c15..f223f2fbea3d 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -42,7 +42,6 @@ protected override void ComposeSettings()
         public void Ensure_Cache_Is_Correct()
         {
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var umbracoSettings = Current.Configs.Settings();
@@ -106,7 +105,6 @@ public void Ensure_Cache_Is_Correct()
         public void Get_Url_Not_Hiding_Top_Level(int nodeId, string niceUrlMatch)
         {
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var umbracoSettings = Current.Configs.Settings();
@@ -137,7 +135,6 @@ public void Get_Url_Not_Hiding_Top_Level(int nodeId, string niceUrlMatch)
         public void Get_Url_Hiding_Top_Level(int nodeId, string niceUrlMatch)
         {
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(true);
 
             var umbracoSettings = Current.Configs.Settings();
@@ -160,7 +157,6 @@ public void Get_Url_For_Culture_Variant_Without_Domains_Non_Current_Url()
             const string currentUri = "http://example.us/test";
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var umbracoSettings = Current.Configs.Settings();
@@ -209,7 +205,6 @@ public void Get_Url_For_Culture_Variant_With_Current_Url()
             const string currentUri = "http://example.fr/test";
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var umbracoSettings = Current.Configs.Settings();
@@ -267,7 +262,6 @@ public void Get_Url_For_Culture_Variant_Non_Current_Url()
             const string currentUri = "http://example.us/test";
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var umbracoSettings = Current.Configs.Settings();
@@ -321,7 +315,6 @@ public void Get_Url_For_Culture_Variant_Non_Current_Url()
         public void Get_Url_Relative_Or_Absolute()
         {
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var umbracoSettings = Current.Configs.Settings();
@@ -348,7 +341,6 @@ public void Get_Url_Relative_Or_Absolute()
         public void Get_Url_Unpublished()
         {
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var umbracoSettings = Current.Configs.Settings();
diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
index ba646f6d9431..dc9a52835bf9 100644
--- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
@@ -180,7 +180,6 @@ public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, s
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, umbracoSettings: settings, urlProviders: new[]
@@ -215,7 +214,6 @@ public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, umbracoSettings: settings, urlProviders: new[]
@@ -242,7 +240,6 @@ public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, str
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, umbracoSettings: settings, urlProviders: new[]
@@ -275,7 +272,6 @@ public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute,
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, umbracoSettings: settings, urlProviders: new[]
@@ -298,7 +294,6 @@ public void Get_Url_DomainsAndCache()
             request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, umbracoSettings: settings, urlProviders: new[]
@@ -364,7 +359,6 @@ public void Get_Url_Relative_Or_Absolute()
             requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("http://domain1.com/test", 1111, umbracoSettings: settings, urlProviders: new[]
@@ -395,7 +389,6 @@ public void Get_Url_Alternate()
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("http://domain1.com/en/test", 1111, umbracoSettings: settings, urlProviders: new[]
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index e28a6485d6a1..bb06ff894bbe 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -31,7 +31,6 @@ protected override void Compose()
         public void DoNotPolluteCache()
         {
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
-            globalSettings.Setup(x => x.UseDirectoryUrls).Returns(true);
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index 37be4aea6d56..ad6699b6d525 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -18,7 +18,6 @@ public static IGlobalSettings GenerateMockGlobalSettings()
                     settings.UseHttps == false &&
                     settings.HideTopLevelNodeFromPath == false &&
                     settings.Path == IOHelper.ResolveUrl("~/umbraco") &&
-                    settings.UseDirectoryUrls == true &&
                     settings.TimeOutInMinutes == 20 &&
                     settings.DefaultUILanguage == "en" &&
                     settings.LocalTempStorageLocation == LocalTempStorage.Default &&
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 4de0a04735ee..026bfa17b507 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -68,9 +68,6 @@
     <!-- Update in-memory cache if xml file is changed -->
     <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
 
-    <!-- Show the /config/splashes/booting.aspx page while initializing content -->
-    <EnableSplashWhileLoading>False</EnableSplashWhileLoading>
-
     <!-- Show property descriptions in editing view "icon|text|none" -->
     <PropertyContextHelpOption>text</PropertyContextHelpOption>
 
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index ab6e9258b996..f781d234fe2c 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -33,11 +33,10 @@
 
     <appSettings>
         <add key="umbracoConfigurationStatus" value="" />
-	    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
-        <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
+	    <add key="umbracoReservedUrls" value="" />
+        <add key="umbracoReservedPaths" value="" />
         <add key="umbracoPath" value="~/umbraco" />
         <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-        <add key="umbracoUseDirectoryUrls" value="true" />
         <add key="umbracoTimeOutInMinutes" value="20" />
         <add key="umbracoDefaultUILanguage" value="en-US" />
         <add key="umbracoUseHttps" value="false" />
@@ -90,18 +89,6 @@
 
         <httpRuntime requestValidationMode="2.0" enableVersionHeader="false" targetFramework="4.7.2" maxRequestLength="51200" fcnMode="Single" />
 
-        <pages enableEventValidation="false">
-            <controls>
-                <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-                <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="Umbraco.Web" />
-                <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-            </controls>
-            <namespaces>
-                <add namespace="Umbraco.Core" />
-                <add namespace="Umbraco.Core.Services" />
-            </namespaces>
-        </pages>
-
         <httpModules>
             <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
             <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
diff --git a/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs b/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
index 42c8a3bbbd56..6824d02d182e 100644
--- a/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
+++ b/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
@@ -2,9 +2,17 @@
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 
+namespace Umbraco.Web.UI.JavaScript
+{
+    //fixme delete this when Models Builder is updated
+    public sealed class ServerVariablesParser : global::Umbraco.Web.JavaScript.ServerVariablesParser
+    {
+    }
+}
+
 namespace Umbraco.Web.JavaScript
 {
-    public sealed class ServerVariablesParser
+    public class ServerVariablesParser
     {
 
         /// <summary>
@@ -19,10 +27,7 @@ internal static string Parse(Dictionary<string, object> items)
             var vars = Resources.ServerVariables;
 
             //Raise event for developers to add custom variables
-            if (Parsing != null)
-            {
-                Parsing(null, items);
-            }
+            Parsing?.Invoke(null, items);
 
             var json = JObject.FromObject(items);
             return vars.Replace(Token, json.ToString());
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 2b6d032f72b7..6da3f90ed95d 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -217,18 +217,15 @@ private bool EnsureDocumentRequest(HttpContextBase httpContext, Uri uri)
             var lpath = uri.AbsolutePath.ToLowerInvariant();
 
             // handle directory-urls used for asmx
-            // legacy - what's the point really?
-            if (/*maybeDoc &&*/ _globalSettings.UseDirectoryUrls)
+            // TODO: legacy - what's the point really?
+            var asmxPos = lpath.IndexOf(".asmx/", StringComparison.OrdinalIgnoreCase);
+            if (asmxPos >= 0)
             {
-                var asmxPos = lpath.IndexOf(".asmx/", StringComparison.OrdinalIgnoreCase);
-                if (asmxPos >= 0)
-                {
-                    // use uri.AbsolutePath, not path, 'cos path has been lowercased
-                    httpContext.RewritePath(uri.AbsolutePath.Substring(0, asmxPos + 5), // filePath
-                        uri.AbsolutePath.Substring(asmxPos + 5), // pathInfo
-                        uri.Query.TrimStart('?'));
-                    maybeDoc = false;
-                }
+                // use uri.AbsolutePath, not path, 'cos path has been lowercased
+                httpContext.RewritePath(uri.AbsolutePath.Substring(0, asmxPos + 5), // filePath
+                    uri.AbsolutePath.Substring(asmxPos + 5), // pathInfo
+                    uri.Query.TrimStart('?'));
+                maybeDoc = false;
             }
 
             // a document request should be
diff --git a/src/Umbraco.Web/UriUtility.cs b/src/Umbraco.Web/UriUtility.cs
index a4de3c412e56..04357a3a5a84 100644
--- a/src/Umbraco.Web/UriUtility.cs
+++ b/src/Umbraco.Web/UriUtility.cs
@@ -64,13 +64,8 @@ public static Uri UriFromUmbraco(Uri uri, IGlobalSettings globalSettings, IReque
         {
             var path = uri.GetSafeAbsolutePath();
 
-            if (path != "/")
-            {
-                if (!globalSettings.UseDirectoryUrls)
-                    path += ".aspx";
-                else if (requestConfig.AddTrailingSlash)
-				    path = path.EnsureEndsWith("/");
-            }
+            if (path != "/" && requestConfig.AddTrailingSlash)
+                path = path.EnsureEndsWith("/");
 
             path = ToAbsolute(path);
 

From b573b9a50a8470dd7d1fe0bc851dd938f971aba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 14:09:48 +0100
Subject: [PATCH 128/421] brandcolor 2019 corrections

---
 .../src/less/components/card.less                  | 14 +++++++-------
 .../src/less/components/umb-group-builder.less     |  8 ++++----
 src/Umbraco.Web.UI.Client/src/less/forms.less      |  4 ++--
 .../src/less/property-editors.less                 |  6 ++++--
 src/Umbraco.Web.UI.Client/src/less/variables.less  |  9 ++++++---
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less
index a302ba71b87a..0f4f2a7a9d10 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/card.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less
@@ -70,7 +70,7 @@
      margin: 0;
  }
 
-.umb-card-list li{
+.umb-card-list li {
     border-bottom: @gray-10 1px solid;
     padding-bottom: 3px;
     display: block;
@@ -123,15 +123,15 @@
  .umb-card-grid .umb-card-grid-item:focus,
  .umb-card-grid .umb-card-grid-item:hover > *,
  .umb-card-grid .umb-card-grid-item:focus > *  {
-	background: @gray-10;
-	//color: white;
+	background: @ui-option-hover;
+	color: @ui-option-type-hover;
 	cursor: pointer;
 	outline: none;
 	border-radius: 3px;
 }
 
 .umb-card-grid a {
-     color: @gray-2;
+     color: @ui-option-type;
      text-decoration: none;
  }
 
@@ -139,7 +139,7 @@
      font-size: 30px;
      line-height: 50px;
      display: block;
-	  color: @gray-3;
+	  color: @ui-option-type;
  }
 
  .umb-card-grid .umb-card-grid-item__loading {
@@ -164,9 +164,9 @@
 }
 
 .umb-btn-round:hover, .umb-btn-round:hover *{
-  background: @turquoise !important;
+  background: @blueDark !important;
   color: @white !important;
-  border-color: @turquoise !important;
+  border-color: @blueDark !important;
   text-decoration:none;
  }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 5db66da974b6..ba433e80d313 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -416,7 +416,7 @@ input.umb-group-builder__group-sort-value {
     }
 
     .editor-placeholder {
-        border: 1px dashed @gray-8;
+        border: 1px dashed @ui-action-border;
         width: 100%;
         height: 80px;
         line-height: 80px;
@@ -425,12 +425,12 @@ input.umb-group-builder__group-sort-value {
         border-radius: 5px;
         font-weight: bold;
         font-size: 14px;
-        color: @ui-active;
+        color: @ui-action-type;
         
         &:hover {
             text-decoration: none;
-            color:@ui-active-type-hover;
-            border-color:@ui-active-type-hover;
+            color:@ui-action-type-hover;
+            border-color:@ui-action-border-hover;
         }
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 70b60f810e9d..7b2afad20b93 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -201,7 +201,7 @@ input[type="color"],
   margin-bottom: @baseLineHeight / 2;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
-  color: @gray-3;
+  color: @gray-2;
   .border-radius(@inputBorderRadius);
   vertical-align: middle;
   box-sizing: border-box;
@@ -818,4 +818,4 @@ legend + .control-group {
 /* User/group selector */
 .group-selector .group-selector-list { float: left; }
 .group-selector .group-selector-list div { height: 24px; }
-.group-selector .group-selector-buttons { float: left; margin: 24px 16px; }
\ No newline at end of file
+.group-selector .group-selector-buttons { float: left; margin: 24px 16px; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 57df982fd33a..7c0383b41554 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -246,7 +246,7 @@
     display: flex;
     justify-content:center;
     align-items:center;
-    width: 120px;
+    //width: 120px;
     text-align: center;
     color: @gray-9;
     border: 2px @gray-9 dashed;
@@ -295,7 +295,9 @@
 }
 
 .umb-mediapicker .add-link-square {
-  height: 120px;
+  height: 100px;
+  width: 100px;
+  margin: 10px;
 }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index f5685059c97c..ea2f47910121 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -161,16 +161,19 @@
 @ui-light-active-type-hover:  @blueMid;
 
 
-@ui-action:             @blueMid;
-@ui-action-hover:       @blueMid;
+@ui-action:             white;
+@ui-action-hover:       @brownLight;
 @ui-action-type:             @blueExtraDark;
 @ui-action-type-hover:       @blueMid;
+@ui-action-border:             @blueExtraDark;
+@ui-action-border-hover:       @blueMid;
 
 @ui-action-disgrete:              white;
 @ui-action-disgrete-hover:        @brownLight;
-
 @ui-action-disgrete-type:         @gray-4;
 @ui-action-disgrete-type-hover:   @blueMid;
+@ui-action-disgrete-border:         @gray-4;
+@ui-action-disgrete-border-hover:   @blueMid;
 
 @type-white:                      @white;
 @type-black:                      @blueNight;

From 2c40e46d56518cad69db6369e49591fc89316312 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 23 Jan 2019 20:49:08 +0100
Subject: [PATCH 129/421] Set form dirty on color picker value change + update
 selected item label + clean up unused code

---
 .../colorpicker/colorpicker.controller.js     | 63 +++++++++----------
 .../colorpicker/colorpicker.html              |  3 +-
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index 9b3be511a457..15d8906ec0a2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -1,4 +1,4 @@
-function ColorPickerController($scope) {
+function ColorPickerController($scope, angularHelper) {
 
     //setup the default config
     var config = {
@@ -77,29 +77,7 @@ function ColorPickerController($scope) {
         //now make the editor model the array
         $scope.model.config.items = items;
     }
-
-    $scope.toggleItem = function (color) {
-
-        var currentColor = ($scope.model.value && $scope.model.value.hasOwnProperty("value"))
-            ? $scope.model.value.value
-            : $scope.model.value;
-
-        var newColor;
-        if (currentColor === color.value) {
-            // deselect
-            $scope.model.value = $scope.model.useLabel ? { value: "", label: "" } : "";
-            newColor = "";
-        }
-        else {
-            // select
-            $scope.model.value = $scope.model.useLabel ? { value: color.value, label: color.label } : color.value;
-            newColor = color.value;
-        }
-
-        // this is required to re-validate
-        $scope.propertyForm.modelValue.$setViewValue(newColor);
-    };
-
+    
     // Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
     $scope.validateMandatory = function () {
         var isValid = !$scope.model.validation.mandatory || (
@@ -115,20 +93,35 @@ function ColorPickerController($scope) {
     }
     $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
 
-    // A color is active if it matches the value and label of the model.
-    // If the model doesn't store the label, ignore the label during the comparison.
-    $scope.isActiveColor = function (color) {
+    $scope.onSelect = function (color) {
+        // Complex color (value and label)?
+        if (!$scope.model.value.hasOwnProperty("value")) {
+            // did the value change?
+            if ($scope.model.value !== color) {
+                // yes, make sure to set dirty
+                angularHelper.getCurrentForm($scope).$setDirty();
+            }
+            return;
+        }
 
-        // no value
-        if (!$scope.model.value)
-            return false;
+        // did the value change?
+        if ($scope.model.value.value === color) {
+            // no, skip the rest
+            return;
+        }
 
-        // Complex color (value and label)?
-        if (!$scope.model.value.hasOwnProperty("value"))
-            return $scope.model.value === color.value;
+        // yes, make sure to set dirty
+        angularHelper.getCurrentForm($scope).$setDirty();
 
-        return $scope.model.value.value === color.value && $scope.model.value.label === color.label;
-    };
+        // update the label according to the new color
+        var selectedItem = _.find($scope.model.config.items, function (item) {
+            return item.value === color;
+        });
+        if (!selectedItem) {
+            return;
+        }
+        $scope.model.value.label = selectedItem.label;
+    }
 
     // Finds the color best matching the model's color,
     // and sets the model color to that one. This is useful when
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
index b09d73cee272..0b6e8e7c5928 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
@@ -8,7 +8,8 @@
     <umb-color-swatches colors="model.config.items"
                         selected-color="model.value.value"
                         size="m"
-                        use-label="model.useLabel">
+                        use-label="model.useLabel"
+                        on-select="onSelect(color)">
     </umb-color-swatches>
 
     <input type="hidden" name="modelValue" ng-model="model.value" val-property-validator="validateMandatory" />

From 99f0e6c05a80017e1fb3fdb4b3035ed628309f22 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 23 Jan 2019 20:54:34 +0100
Subject: [PATCH 130/421] Fix callback

---
 .../common/directives/components/umbcolorswatches.directive.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
index dc67cb464b22..494fae9919df 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
@@ -38,7 +38,7 @@ Use this directive to generate color swatches to pick from.
                 scope.selectedColor = color;
 
                 if (scope.onSelect) {
-                    scope.onSelect(color);
+                    scope.onSelect({color: color });
                 }
             };
         }

From d39045caef7daf5a935b3481ca3f9b76d758af81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 14:31:27 +0100
Subject: [PATCH 131/421] =?UTF-8?q?V8:=20CSS=20=E2=80=94=20adding=20missin?=
 =?UTF-8?q?g=20unit=20for=20umb-loader=20in=20umb-tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/less/components/tree/umb-tree-item.less                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index d6202c566525..097665bdd4ba 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -28,7 +28,7 @@
         overflow: hidden;
         position: absolute;
         left: 0;
-        bottom: -1;
+        bottom: -1px;
 
         div { 
             .umb-loader;

From f94e0fd3ec61906c04ce2e7deba25d059cca2612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 14:38:33 +0100
Subject: [PATCH 132/421] =?UTF-8?q?V8:=20CSS=20=E2=80=94=20variable=20corr?=
 =?UTF-8?q?ection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/less/components/umb-child-selector.less             | 6 +++---
 .../src/less/components/umb-group-builder.less              | 4 ++--
 .../src/less/components/umb-list-view-settings.less         | 6 +++---
 .../src/less/components/umb-node-preview.less               | 6 +++---
 src/Umbraco.Web.UI.Client/src/less/variables.less           | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
index d8e6676728dd..b6cdc0e8d90d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
@@ -20,10 +20,10 @@
   text-align: center;
   justify-content: center;
   
-  color:@ui-action;
+  color:@ui-action-type;
   &:hover {
-      color:@ui-action-hover;
-      border-color:@ui-action-hover;
+      color:@ui-action-type-hover;
+      border-color:@ui-action-type-hover;
       text-decoration:none;
   }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index ba433e80d313..33df17c75452 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -33,12 +33,12 @@
   align-items: center;
   cursor: pointer;
   border: 1px dashed @gray-7;
-  color: @ui-action;
+  color: @ui-action-type;
   font-weight: bold;
   position: relative;
   box-shadow: none;
   &:hover {
-      color:@ui-action-hover;
+      color:@ui-action-type-hover;
       text-decoration: none;
       border-color: @ui-active-type-hover;
   }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
index b23a9d14b8cb..733836d85f1b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
@@ -34,12 +34,12 @@
 
 .umb-list-view-settings__create-new {
   font-size: 13px;
-  color: @ui-action;
+  color: @ui-action-type;
 }
 
 .umb-list-view-settings__create-new:hover {
-  color: @ui-action-hover;
-  border-color: @ui-action-hover;
+  color: @ui-action-type-hover;
+  border-color: @ui-action-type-hover;
 }
 
 .umb-list-view-settings__remove-new {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index b10e761d6839..5b27206fc27f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -90,15 +90,15 @@
     align-items: center;
     justify-content: center;
     border: 1px dashed @gray-7;
-    color: @ui-action;
+    color: @ui-action-type;
     font-weight: bold;
     padding: 5px 15px;
     box-sizing: border-box;
 }
 
 .umb-node-preview-add:hover {
-    color: @ui-action-hover;
-    border-color: @ui-action-hover;
+    color: @ui-action-type-hover;
+    border-color: @ui-action-type-hover;
     text-decoration: none;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index ea2f47910121..cde86b34e5e1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -342,7 +342,7 @@
 @btnInfoBackgroundHighlight:        @ui-btn-hover;// updated 2019
 
 @btnWhiteType:                      @blueExtraDark;// updated 2019
-@btnWhiteTypeHover:                 @ui-action-hover;// updated 2019
+@btnWhiteTypeHover:                 @ui-action-type-hover;// updated 2019
 @btnWhiteBackground:                @white;// updated 2019
 @btnWhiteBackgroundHighlight:       @white;// updated 2019
 

From cd5dc410cc5c47ef5049f3d7c51c4a0dd8d8e906 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 29 Jan 2019 14:47:09 +0100
Subject: [PATCH 133/421] Refactor IDataTypeConfigurationConnector for Deploy

---
 src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs   | 4 ++--
 .../PropertyEditors/ValueListConfigurationEditor.cs          | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs b/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs
index 6c266ced2aae..3a673e92a2b8 100644
--- a/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs
+++ b/src/Umbraco.Core/Deploy/IDataTypeConfigurationConnector.cs
@@ -22,13 +22,13 @@ public interface IDataTypeConfigurationConnector
         /// </summary>
         /// <param name="dataType">The datatype.</param>
         /// <param name="dependencies">The dependencies.</param>
-        IDictionary<string, object> ToArtifact(IDataType dataType, ICollection<ArtifactDependency> dependencies);
+        string ToArtifact(IDataType dataType, ICollection<ArtifactDependency> dependencies);
 
         /// <summary>
         /// Gets the actual datatype configuration corresponding to the artifact configuration.
         /// </summary>
         /// <param name="dataType">The datatype.</param>
         /// <param name="configuration">The artifact configuration.</param>
-        object FromArtifact(IDataType dataType, IDictionary<string, object> configuration);
+        object FromArtifact(IDataType dataType, string configuration);
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs
index d130fb595273..abfde3646a43 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.Services;
@@ -13,7 +12,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <remarks>
     /// This pre-value editor is shared with editors like drop down, checkbox list, etc....
     /// </remarks>
-    internal class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfiguration>
+    public class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfiguration>
     {
         public ValueListConfigurationEditor(ILocalizedTextService textService)
         {

From 78c3797e5a1e96be91ad467e5c8d2b17c3b995e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 15:14:38 +0100
Subject: [PATCH 134/421] V8: colors for tags

---
 src/Umbraco.Web.UI.Client/src/less/property-editors.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 7c0383b41554..8d1b70c35d4d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -845,16 +845,16 @@
 // Tags
 // --------------------------------------------------
 .umb-tags{
-    border: @gray-10 solid 1px;
+    border: @inputBorder solid 1px;
     padding: 10px;
     font-size: 13px;
     text-shadow: none;
 
-    .tag{
+    .tag {
         cursor: default;
         margin: 7px;
         padding: 10px;
-        background: @ui-action;
+        background: @blueDark;
         position: relative;
 
         .icon-trash{

From d75cace85de23f03d23f9102d21a3e16b3bdfee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 15:23:21 +0100
Subject: [PATCH 135/421] color variable clean up

---
 src/Umbraco.Web.UI.Client/src/less/variables.less | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index cde86b34e5e1..bde61517ac3e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -101,7 +101,7 @@
 @indigoIcon:            #3F51B5;
 
 
-// Accent colors
+// Brand colors
 // -------------------------
 
 //@blueLight:               #4f89de;
@@ -119,14 +119,6 @@
 @brownLight:            #e4e0dd;// added 2019
 @brownGrayLight:        #f3f2f1;// added 2019
 @orange:                #ff9412;// added 2019
-//@claus: #f6efe7;
-//@claus2: #f2ebe6;
-//@claus3: #535963; //#56777A
-//@claus4: #819a9e;
-//@claus5: #2152A3;// blueMid
-//@claus6: #02A191;
-//@clausSoftRed: #D93F4C; // todo
-//@clausRed:#D42054;// todo.
 
 //@u-greyLight:           #f2ebe6;// added 2019
 @u-white:               #f9f7f4;// added 2019

From 414f838476653170ede3266230a480078c4b29fe Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 29 Jan 2019 15:30:25 +0100
Subject: [PATCH 136/421] #3645 - Lists available languages in the preview bar
 (if more than 1) Reads the culture from hash instead of query and updates the
 hash when changing culture.

---
 .../components/content/edit.controller.js     |  2 +-
 .../src/preview/preview.controller.js         | 54 +++++++++++--------
 .../Umbraco/Views/Preview/Index.cshtml        | 11 ++++
 .../Editors/BackOfficePreviewLinkModel.cs     |  8 +++
 .../Editors/BackOfficePreviewModel.cs         | 14 +++--
 src/Umbraco.Web/Editors/PreviewController.cs  | 22 ++++++--
 .../Mvc/UmbracoViewPageOfTModel.cs            |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 8 files changed, 81 insertions(+), 33 deletions(-)
 create mode 100644 src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index fc7fff7e3c0d..9850f251f3da 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -785,7 +785,7 @@
                 // Build the correct path so both /#/ and #/ work.
                 var query = 'id=' + content.id;
                 if ($scope.culture) {
-                    query += "&culture=" + $scope.culture;
+                    query += "#?culture=" + $scope.culture;
                 }
                 var redirect = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + '/preview/?' + query;
 
diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index fe0bb28aebff..5eb985a58267 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -68,16 +68,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             return;
         }
 
-        $scope.pageId = $location.search().id || getParameterByName("id");
-        var culture = $location.search().culture || getParameterByName("culture");
-        
-        if ($scope.pageId) {
-            var query = 'id=' + $scope.pageId;
-            if (culture) {
-                query += "&culture=" + culture;
-            }
-            $scope.pageUrl = "frame?" + query;
-        }
+        setPageUrl();
 
         $scope.isOpen = false;
         $scope.frameLoaded = false;
@@ -93,6 +84,19 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         ];
         $scope.previewDevice = $scope.devices[0];
 
+        
+        function setPageUrl(){
+            $scope.pageId = $location.search().id || getParameterByName("id");
+            var culture = $location.search().culture || getParameterByName("culture");
+
+            if ($scope.pageId) {
+                var query = 'id=' + $scope.pageId;
+                if (culture) {
+                    query += "&culture=" + culture;
+                }
+                $scope.pageUrl = "frame?" + query;
+            }
+        }
         /*****************************************************************************/
         /* Preview devices */
         /*****************************************************************************/
@@ -107,28 +111,39 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         /*****************************************************************************/
 
         $scope.exitPreview = function () {
-            window.top.location.href = "../preview/end?redir=%2f" + $scope.pageId;
+
+            var culture = $location.search().culture || getParameterByName("culture");
+            var relativeUrl = "/" +  $scope.pageId +'?culture='+ culture;
+            window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
         };
 
         $scope.onFrameLoaded = function (iframe) {
             $scope.frameLoaded = true;
             configureSignalR(iframe);
-        }
+        };
 
         /*****************************************************************************/
-        /* Panel managment */
+        /* Panel management */
         /*****************************************************************************/
 
         $scope.openPreviewDevice = function () {
             $scope.showDevicesPreview = true;
-        }
+        };
+
+        /*****************************************************************************/
+        /* Change culture */
+        /*****************************************************************************/
+        $scope.changeCulture = function (culture) {
+          //  $scope.frameLoaded = false;
+            $location.search("culture", culture);
+            setPageUrl();
+        };
         
     })
 
 
     .component('previewIFrame', {
-
-        template: "<div style='width:100%;height:100%;margin:0 auto;overflow:hidden;'><iframe id='resultFrame' src='about:blank' ng-src=\"{{vm.srcDelayed}}\" frameborder='0'></iframe></div>",
+        template: "<div style='width:100%;height:100%;margin:0 auto;overflow:hidden;'><iframe id='resultFrame' src='about:blank' ng-src=\"{{vm.src}}\" frameborder='0'></iframe></div>",
         controller: function ($element, $scope, angularHelper) {
 
             var vm = this;
@@ -136,22 +151,15 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             vm.$postLink = function () {
                 var resultFrame = $element.find("#resultFrame");
                 resultFrame.on("load", iframeReady);
-                vm.srcDelayed = vm.src;
             };
 
             function iframeReady() {
                 var iframe = $element.find("#resultFrame").get(0);
-                hideUmbracoPreviewBadge(iframe);
                 angularHelper.safeApply($scope, function () {
                     vm.onLoaded({ iframe: iframe });
                 });
             }
 
-            function hideUmbracoPreviewBadge (iframe) {
-                if (iframe && iframe.contentDocument && iframe.contentDocument.getElementById("umbracoPreviewBadge")) {
-                    iframe.contentDocument.getElementById("umbracoPreviewBadge").style.display = "none";
-                }
-            };
 
         },
         controllerAs: "vm",
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index fcd375da45e3..db9fc2d3bf32 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -46,6 +46,17 @@
                 <li ng-repeat="device in devices" ng-class="{ current:previewDevice==device }">
                     <a href="" ng-click="updatePreviewDevice(device)"><i class="icon {{device.icon}}" title="{{device.title}}"></i><span></span></a>
                 </li>
+
+                @if (Model.PreviewLinks != null && Model.PreviewLinks.Count() > 2)
+                {
+                    foreach (var previewLink in Model.PreviewLinks)
+                     {
+                         <li>
+                             <a href="" ng-click="changeCulture('@previewLink.CultureId')" title="Preview in @previewLink.CultureName"><i class="icon icon-globe-europe---africa"></i><span>@previewLink.CultureName</span></a>
+                         </li>
+                     }
+                }
+
                 <li>
                     <a href="" ng-click="exitPreview()" title="Exit Preview"><i class="icon icon-wrong"></i><span> </span></a>
                 </li>
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs
new file mode 100644
index 000000000000..c47db0811a56
--- /dev/null
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Web.Editors
+{
+    public class BackOfficePreviewLinkModel
+    {
+        public string CultureName { get; set; }
+        public string CultureId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index 1298575e50fa..89b055d9d76d 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -1,15 +1,21 @@
-using Umbraco.Core.Configuration;
+using System.Collections.Generic;
+using Umbraco.Core.Configuration;
 using Umbraco.Web.Features;
 
 namespace Umbraco.Web.Editors
 {
     public class BackOfficePreviewModel : BackOfficeModel
     {
-        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings) : base(features, globalSettings)
+        private readonly UmbracoFeatures _features;
+        public IEnumerable<BackOfficePreviewLinkModel> PreviewLinks { get; }
+
+        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IEnumerable<BackOfficePreviewLinkModel> previewLinks) : base(features, globalSettings)
         {
+            _features = features;
+            PreviewLinks = previewLinks;
         }
 
-        public bool DisableDevicePreview => Features.Disabled.DisableDevicePreview;
-        public string PreviewExtendedHeaderView => Features.Enabled.PreviewExtendedView;
+        public bool DisableDevicePreview => _features.Disabled.DisableDevicePreview;
+        public string PreviewExtendedHeaderView => _features.Enabled.PreviewExtendedView;
     }
 }
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index bd14a6c6f44c..a71f9636789e 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -1,12 +1,13 @@
 using System;
+using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
-using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.UI.JavaScript;
@@ -21,20 +22,33 @@ public class PreviewController : Controller
         private readonly IGlobalSettings _globalSettings;
         private readonly IPublishedSnapshotService _publishedSnapshotService;
         private readonly UmbracoContext _umbracoContext;
-
-        public PreviewController(UmbracoFeatures features, IGlobalSettings globalSettings, IPublishedSnapshotService publishedSnapshotService, UmbracoContext umbracoContext)
+        private readonly ILocalizationService _localizationService;
+
+        public PreviewController(
+            UmbracoFeatures features,
+            IGlobalSettings globalSettings,
+            IPublishedSnapshotService publishedSnapshotService,
+            UmbracoContext umbracoContext,
+            ILocalizationService localizationService)
         {
             _features = features;
             _globalSettings = globalSettings;
             _publishedSnapshotService = publishedSnapshotService;
             _umbracoContext = umbracoContext;
+            _localizationService = localizationService;
         }
 
         [UmbracoAuthorize(redirectToUmbracoLogin: true)]
         [DisableBrowserCache]
         public ActionResult Index()
         {
-            var model = new BackOfficePreviewModel(_features, _globalSettings);
+            var availableLanguages = _localizationService.GetAllLanguages();
+            var previewLinks = availableLanguages.Select(x => new BackOfficePreviewLinkModel() {
+                CultureName = x.CultureName,
+                CultureId = x.IsoCode}
+            );
+
+            var model = new BackOfficePreviewModel(_features, _globalSettings, previewLinks);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
index a16f9661aa55..748efbb27ac1 100644
--- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
@@ -217,7 +217,7 @@ public override void WriteLiteral(object value)
                             markupToInject =
                                 string.Format(Current.Configs.Settings().Content.PreviewBadge,
                                     IOHelper.ResolveUrl(SystemDirectories.Umbraco),
-                                    Server.UrlEncode(UmbracoContext.Current.HttpContext.Request.Path));
+                                    Server.UrlEncode(UmbracoContext.Current.HttpContext.Request.Url?.PathAndQuery));
                         }
                         else
                         {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ccf8c49485ca..c9c33ceb8d9a 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -138,6 +138,7 @@
     <Compile Include="Editors\PackageController.cs" />
     <Compile Include="Editors\KeepAliveController.cs" />
     <Compile Include="Editors\MacrosController.cs" />
+    <Compile Include="Editors\BackOfficePreviewLinkModel.cs" />
     <Compile Include="Editors\RelationTypeController.cs" />
     <Compile Include="Logging\WebProfiler.cs" />
     <Compile Include="Logging\WebProfilerComponent.cs" />

From 5637c44f69db6c324fa5cb4806189fb5f39e026f Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 29 Jan 2019 16:49:10 +0100
Subject: [PATCH 137/421] Explicitly set the form dirty when toggling a boolean

---
 .../src/views/propertyeditors/boolean/boolean.controller.js  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
index c574e1424f6c..07be03da2927 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
@@ -1,4 +1,4 @@
-function booleanEditorController($scope) {
+function booleanEditorController($scope, angularHelper) {
 
     function setupViewModel() {
         $scope.renderModel = {
@@ -28,7 +28,8 @@ function booleanEditorController($scope) {
     };
 
     // Update the value when the toggle is clicked
-    $scope.toggle = function(){
+    $scope.toggle = function () {
+        angularHelper.getCurrentForm($scope).$setDirty();
         if($scope.renderModel.value){
             $scope.model.value = "0";
             setupViewModel();

From 1340a5ce4b7d5166a203b3b544c6744bddc76556 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Sat, 26 Jan 2019 02:59:14 +0000
Subject: [PATCH 138/421] Removing support for legacy webservices

---
 src/Umbraco.Core/IO/SystemDirectories.cs      |   3 -
 .../Sync/ServerSyncWebServiceClient.cs        | 248 ------------------
 src/Umbraco.Core/Umbraco.Core.csproj          |   3 -
 src/Umbraco.Core/UriExtensions.cs             |   3 -
 .../Composing/TypeFinderTests.cs              |   1 -
 .../CoreThings/UriExtensionsTests.cs          |   3 -
 src/Umbraco.Tests/IO/IoHelperTests.cs         |   1 -
 src/Umbraco.Web/Mvc/BackOfficeArea.cs         |   8 -
 .../Routing/WebServicesRouteConstraint.cs     |  26 --
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 -
 10 files changed, 297 deletions(-)
 delete mode 100644 src/Umbraco.Core/Sync/ServerSyncWebServiceClient.cs
 delete mode 100644 src/Umbraco.Web/Routing/WebServicesRouteConstraint.cs

diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs
index 5bbf325c8c3c..100dbc265e73 100644
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -39,9 +39,6 @@ public class SystemDirectories
         [Obsolete("Usercontrols are obsolete and code should be removed")]
         public static string UserControls => "~/usercontrols";
 
-        [Obsolete("Only used by legacy load balancing which is obsolete and should be removed")]
-        public static string WebServices => IOHelper.ReturnPath("umbracoWebservicesPath", Umbraco.EnsureEndsWith("/") + "webservices");
-
         public static string Packages => Data + "/packages";
 
         public static string Preview => Data + "/preview";
diff --git a/src/Umbraco.Core/Sync/ServerSyncWebServiceClient.cs b/src/Umbraco.Core/Sync/ServerSyncWebServiceClient.cs
deleted file mode 100644
index 38ba2ce189b4..000000000000
--- a/src/Umbraco.Core/Sync/ServerSyncWebServiceClient.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Web.Services;
-using Umbraco.Core.IO;
-
-namespace Umbraco.Core.Sync
-{
-    /// <summary>
-    /// The client Soap service for making distributed cache calls between servers
-    /// </summary>
-    [WebServiceBinding(Name = "CacheRefresherSoap", Namespace = "http://umbraco.org/webservices/")]
-    [Obsolete("Legacy load balancing is obsolete and should be removed")]
-    internal class ServerSyncWebServiceClient : System.Web.Services.Protocols.SoapHttpClientProtocol
-    {
-
-        /// <remarks/>
-        public ServerSyncWebServiceClient()
-        {
-            // only set the url if the httpcontext is present, else it's set by the cache dispatcher methods (when using distributed calls)
-            if (System.Web.HttpContext.Current != null)
-                this.Url = "http://" + System.Web.HttpContext.Current.Request.ServerVariables["SERVER_NAME"] + IOHelper.ResolveUrl(SystemDirectories.WebServices) + "/cacheRefresher.asmx";
-
-        }
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/BulkRefresh", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void BulkRefresh(RefreshInstruction[] instructions, string appId, string login, string password)
-        {
-            this.Invoke("BulkRefresh", new object[] {
-                                                       instructions,
-                                                       appId,
-                                                       login,
-                                                       password});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginBulkRefresh(RefreshInstruction[] instructions, string appId, string login, string password, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("BulkRefresh", new object[] {
-                                                                   instructions,
-                                                                   appId,
-                                                                   login,
-                                                                   password}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndBulkRefresh(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshAll", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void RefreshAll(System.Guid uniqueIdentifier, string Login, string Password)
-        {
-            this.Invoke("RefreshAll", new object[] {
-                                                       uniqueIdentifier,
-                                                       Login,
-                                                       Password});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginRefreshAll(System.Guid uniqueIdentifier, string Login, string Password, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("RefreshAll", new object[] {
-                                                                   uniqueIdentifier,
-                                                                   Login,
-                                                                   Password}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndRefreshAll(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshByJson", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void RefreshByJson(System.Guid uniqueIdentifier, string jsonPayload, string Login, string Password)
-        {
-            this.Invoke("RefreshByJson", new object[] {
-                                                          uniqueIdentifier,
-                                                          jsonPayload,
-                                                          Login,
-                                                          Password});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginRefreshByJson(System.Guid uniqueIdentifier, string jsonPayload, string Login, string Password, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("RefreshByJson", new object[] {
-                                                                      uniqueIdentifier,
-                                                                      jsonPayload,
-                                                                      Login,
-                                                                      Password}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndRefreshByJson(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshByGuid", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void RefreshByGuid(System.Guid uniqueIdentifier, System.Guid Id, string Login, string Password)
-        {
-            this.Invoke("RefreshByGuid", new object[] {
-                                                          uniqueIdentifier,
-                                                          Id,
-                                                          Login,
-                                                          Password});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginRefreshByGuid(System.Guid uniqueIdentifier, System.Guid Id, string Login, string Password, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("RefreshByGuid", new object[] {
-                                                                      uniqueIdentifier,
-                                                                      Id,
-                                                                      Login,
-                                                                      Password}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndRefreshByGuid(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshById",
-            RequestNamespace = "http://umbraco.org/webservices/",
-            ResponseNamespace = "http://umbraco.org/webservices/",
-            Use = System.Web.Services.Description.SoapBindingUse.Literal,
-            ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void RefreshById(System.Guid uniqueIdentifier, int Id, string Login, string Password)
-        {
-            this.Invoke("RefreshById", new object[] {
-                                                        uniqueIdentifier,
-                                                        Id,
-                                                        Login,
-                                                        Password});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginRefreshById(System.Guid uniqueIdentifier, int Id, string Login, string Password, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("RefreshById", new object[] {
-                                                                    uniqueIdentifier,
-                                                                    Id,
-                                                                    Login,
-                                                                    Password}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndRefreshById(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshByIds",
-            RequestNamespace = "http://umbraco.org/webservices/",
-            ResponseNamespace = "http://umbraco.org/webservices/",
-            Use = System.Web.Services.Description.SoapBindingUse.Literal,
-            ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void RefreshByIds(System.Guid uniqueIdentifier, string jsonIds, string Login, string Password)
-        {
-            this.Invoke("RefreshByIds", new object[] {
-                                                        uniqueIdentifier,
-                                                        jsonIds,
-                                                        Login,
-                                                        Password});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginRefreshByIds(System.Guid uniqueIdentifier, string jsonIds, string Login, string Password, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("RefreshByIds", new object[] {
-                                                                    uniqueIdentifier,
-                                                                    jsonIds,
-                                                                    Login,
-                                                                    Password}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndRefreshByIds(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RemoveById", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void RemoveById(System.Guid uniqueIdentifier, int Id, string Login, string Password)
-        {
-            this.Invoke("RemoveById", new object[] {
-                                                        uniqueIdentifier,
-                                                        Id,
-                                                        Login,
-                                                        Password});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginRemoveById(System.Guid uniqueIdentifier, int Id, string Login, string Password, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("RemoveById", new object[] {
-                                                                    uniqueIdentifier,
-                                                                    Id,
-                                                                    Login,
-                                                                    Password}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndRemoveById(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/GetRefreshers", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public System.Xml.XmlNode GetRefreshers(string Login, string Password)
-        {
-            object[] results = this.Invoke("GetRefreshers", new object[] {
-                                                                             Login,
-                                                                             Password});
-            return ((System.Xml.XmlNode)(results[0]));
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginGetRefreshers(string Login, string Password, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("GetRefreshers", new object[] {
-                                                                      Login,
-                                                                      Password}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public System.Xml.XmlNode EndGetRefreshers(System.IAsyncResult asyncResult)
-        {
-            object[] results = this.EndInvoke(asyncResult);
-            return ((System.Xml.XmlNode)(results[0]));
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 86c37ca54d8f..c3c052b2afcc 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -1524,9 +1524,6 @@
     <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Sync\ServerSyncWebServiceClient.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index ba3e67721913..083ca90cc4b0 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -4,7 +4,6 @@
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
 
 namespace Umbraco.Core
 {
@@ -28,7 +27,6 @@ public static class UriExtensions
         ///      If any route has an extension in the path like .aspx = back office
         /// 
         ///      These are def back office:
-        ///          /Umbraco/RestServices   = back office
         ///          /Umbraco/BackOffice     = back office
         ///          /Umbraco/Preview        = back office
         ///      If it's not any of the above, and there's no extension then we cannot determine if it's back office or front-end
@@ -78,7 +76,6 @@ internal static bool IsBackOfficeRequest(this Uri url, string applicationPath, I
 
             //check for special back office paths
             if (urlPath.InvariantStartsWith("/" + globalSettings.GetUmbracoMvcArea() + "/BackOffice/")
-                || urlPath.InvariantStartsWith("/" + globalSettings.GetUmbracoMvcArea() + "/RestServices/")
                 || urlPath.InvariantStartsWith("/" + globalSettings.GetUmbracoMvcArea() + "/Preview/"))
             {
                 return true;
diff --git a/src/Umbraco.Tests/Composing/TypeFinderTests.cs b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
index 49c807b19fbd..f615d6cebbc6 100644
--- a/src/Umbraco.Tests/Composing/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
@@ -367,7 +367,6 @@ private static IEnumerable<Assembly> GetFilteredAssemblies(
                     "umbraco.interfaces,",
                     "umbraco.providers,",
                     "Umbraco.Web.UI,",
-                    "umbraco.webservices",
                     "Lucene.",
                     "Examine,",
                     "Examine.",
diff --git a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
index f253d44973d9..be7aec631ed3 100644
--- a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
+++ b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
@@ -33,7 +33,6 @@ public void TearDown()
         [TestCase("http://www.domain.com/umbrac", "", false)]
         [TestCase("http://www.domain.com/test", "", false)]
         [TestCase("http://www.domain.com/test/umbraco", "", false)]        
-        [TestCase("http://www.domain.com/Umbraco/restServices/blah", "", true)]
         [TestCase("http://www.domain.com/Umbraco/Backoffice/blah", "", true)]
         [TestCase("http://www.domain.com/Umbraco/anything", "", true)]
         [TestCase("http://www.domain.com/Umbraco/anything/", "", true)]
@@ -42,8 +41,6 @@ public void TearDown()
         [TestCase("http://www.domain.com/myvdir/umbraco/api/blah", "myvdir", false)]
         [TestCase("http://www.domain.com/MyVdir/umbraco/api/blah", "/myvdir", false)]
         [TestCase("http://www.domain.com/MyVdir/Umbraco/", "myvdir", true)]
-        [TestCase("http://www.domain.com/MyVdir/Umbraco/restServices/blah", "/myvdir", true)]
-        [TestCase("http://www.domain.com/umbraco/webservices/legacyAjaxCalls.asmx/js", "", true)]
         [TestCase("http://www.domain.com/umbraco/test/legacyAjaxCalls.ashx?some=query&blah=js", "", true)]
         public void Is_Back_Office_Request(string input, string virtualPath, bool expected)
         {
diff --git a/src/Umbraco.Tests/IO/IoHelperTests.cs b/src/Umbraco.Tests/IO/IoHelperTests.cs
index b0e59cbb55ae..3f510dd57e36 100644
--- a/src/Umbraco.Tests/IO/IoHelperTests.cs
+++ b/src/Umbraco.Tests/IO/IoHelperTests.cs
@@ -44,7 +44,6 @@ public void IOHelper_MapPathTestVDirTraversal()
             Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Scripts, true), IOHelper.MapPath(SystemDirectories.Scripts, false));
             Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Umbraco, true), IOHelper.MapPath(SystemDirectories.Umbraco, false));            
             Assert.AreEqual(IOHelper.MapPath(SystemDirectories.UserControls, true), IOHelper.MapPath(SystemDirectories.UserControls, false));
-            Assert.AreEqual(IOHelper.MapPath(SystemDirectories.WebServices, true), IOHelper.MapPath(SystemDirectories.WebServices, false));
         }
 
         [Test]
diff --git a/src/Umbraco.Web/Mvc/BackOfficeArea.cs b/src/Umbraco.Web/Mvc/BackOfficeArea.cs
index f501a70729a7..e72f2cc81aaf 100644
--- a/src/Umbraco.Web/Mvc/BackOfficeArea.cs
+++ b/src/Umbraco.Web/Mvc/BackOfficeArea.cs
@@ -44,14 +44,6 @@ public override void RegisterArea(AreaRegistrationContext context)
                         id = @"[a-zA-Z]*"
                     },
                 new[] {typeof (BackOfficeController).Namespace});
-
-            //Create the REST/web/script service routes
-            context.MapRoute(
-                "Umbraco_web_services",
-                _globalSettings.GetUmbracoMvcArea() + "/RestServices/{controller}/{action}/{id}",
-                new {controller = "SaveFileController", action = "Index", id = UrlParameter.Optional},
-                //look in this namespace for controllers
-                new[] {"Umbraco.Web.WebServices"});
         }
 
         public override string AreaName => _globalSettings.GetUmbracoMvcArea();
diff --git a/src/Umbraco.Web/Routing/WebServicesRouteConstraint.cs b/src/Umbraco.Web/Routing/WebServicesRouteConstraint.cs
deleted file mode 100644
index 4b2ecc28fe4a..000000000000
--- a/src/Umbraco.Web/Routing/WebServicesRouteConstraint.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.Routing;
-
-namespace Umbraco.Web.Routing
-{
-    //public class WebServicesRouteConstraint : IRouteConstraint
-    //{
-    //    public bool Match(
-    //        HttpContextBase httpContext,
-    //        Route route,
-    //        string parameterName,
-    //        RouteValueDictionary values,
-    //        RouteDirection routeDirection)
-    //    {
-    //        if (routeDirection == RouteDirection.UrlGeneration)
-    //        {
-
-    //        }
-    //        return true;
-    //    }
-    //}
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ccf8c49485ca..5c1fb9d91df7 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1137,7 +1137,6 @@
     <Compile Include="Routing\EnsureRoutableOutcome.cs" />
     <Compile Include="Routing\PublishedRouter.cs" />
     <Compile Include="Routing\UrlProvider.cs" />
-    <Compile Include="Routing\WebServicesRouteConstraint.cs" />
     <Compile Include="Search\ExamineSearcherModel.cs" />
     <Compile Include="Search\ExamineComponent.cs" />
     <Compile Include="Components\DatabaseServerRegistrarAndMessengerComponent.cs" />

From c778249fed1ae34d0dc824c00fee648ffcc671d5 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 29 Jan 2019 14:33:41 +0100
Subject: [PATCH 139/421] Fix the approved color styling

---
 .../src/less/components/umb-color-swatches.less              | 4 ----
 .../src/views/components/umb-color-swatches.html             | 5 ++---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
index 6dc2dd6ff329..8cf64e183c30 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
@@ -57,10 +57,6 @@
                 .umb-color-box__label {
                     background: @white;
                     font-size: 14px;
-                    display: flex;
-                    flex-flow: column wrap;
-                    flex: 1 0 100%;
-                    justify-content: flex-end;
                     padding: 1px 5px;
                     min-height: 45px;
                     max-width: 100%;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
index a18319b4f282..24aa29125e83 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
@@ -2,8 +2,8 @@
 
     <button type="button" class="umb-color-box umb-color-box--{{size}} btn-{{color.value}}" ng-repeat="color in colors" title="{{useLabel || useColorClass ? (color.label || color.value) : ('#' + color.value)}}" hex-bg-inline="{{useColorClass === false}}" hex-bg-color="{{color.value}}" ng-class="{ 'active': color.value === selectedColor }" ng-click="setColor(color.value, $index, $event)">
         <div class="umb-color-box-inner">
-            <div class="check_circle" ng-if="color.value === selectedColor">
-                <i class="icon icon-check small"></i>
+            <div class="check_circle">
+                <i class="icon icon-check small" ng-show="color.value === selectedColor"></i>
             </div>
             <div class="umb-color-box__label" ng-if="useLabel">
                 <div class="umb-color-box__name truncate">{{ color.label || color.value }}</div>
@@ -13,4 +13,3 @@
     </button>
 
 </div>
- 
\ No newline at end of file

From 4915efbb8d0aced43a3bb5d634021aa510b4036a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 29 Jan 2019 14:38:52 +0100
Subject: [PATCH 140/421] Re-select selected color on reload

---
 .../src/views/components/umb-color-swatches.html                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
index 24aa29125e83..74c010307a9c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
@@ -3,7 +3,7 @@
     <button type="button" class="umb-color-box umb-color-box--{{size}} btn-{{color.value}}" ng-repeat="color in colors" title="{{useLabel || useColorClass ? (color.label || color.value) : ('#' + color.value)}}" hex-bg-inline="{{useColorClass === false}}" hex-bg-color="{{color.value}}" ng-class="{ 'active': color.value === selectedColor }" ng-click="setColor(color.value, $index, $event)">
         <div class="umb-color-box-inner">
             <div class="check_circle">
-                <i class="icon icon-check small" ng-show="color.value === selectedColor"></i>
+                <i class="icon icon-check small" ng-show="selectedColor && color.value === selectedColor.value"></i>
             </div>
             <div class="umb-color-box__label" ng-if="useLabel">
                 <div class="umb-color-box__name truncate">{{ color.label || color.value }}</div>

From bda8128e93cda4994dd91f1ea96da96686d89e85 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 29 Jan 2019 14:52:40 +0100
Subject: [PATCH 141/421] Proper handling of the selected color

---
 .../directives/components/umbcolorswatches.directive.js     | 6 +++++-
 .../src/views/components/umb-color-swatches.html            | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
index 1cbedaf26ed3..aac11bfd2203 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
@@ -36,10 +36,14 @@ Use this directive to generate color swatches to pick from.
             scope.setColor = function (color, $index, $event) {
                 scope.selectedColor = color;
                 if (scope.onSelect) {
-                    scope.onSelect(color, $index, $event);
+                    scope.onSelect(color.color, $index, $event);
                     $event.stopPropagation();
                 }
             };
+
+            scope.isSelectedColor = function (color) {
+                return scope.selectedColor && color.value === scope.selectedColor.value;
+            }
         }
 
         var directive = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
index 74c010307a9c..91d461668f2a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
@@ -1,9 +1,9 @@
 <div class="umb-color-swatches" ng-class="{ 'with-labels': useLabel }">
 
-    <button type="button" class="umb-color-box umb-color-box--{{size}} btn-{{color.value}}" ng-repeat="color in colors" title="{{useLabel || useColorClass ? (color.label || color.value) : ('#' + color.value)}}" hex-bg-inline="{{useColorClass === false}}" hex-bg-color="{{color.value}}" ng-class="{ 'active': color.value === selectedColor }" ng-click="setColor(color.value, $index, $event)">
+    <button type="button" class="umb-color-box umb-color-box--{{size}} btn-{{color.value}}" ng-repeat="color in colors" title="{{useLabel || useColorClass ? (color.label || color.value) : ('#' + color.value)}}" hex-bg-inline="{{useColorClass === false}}" hex-bg-color="{{color.value}}" ng-class="{ 'active': isSelectedColor(color) }" ng-click="setColor(color, $index, $event)">
         <div class="umb-color-box-inner">
             <div class="check_circle">
-                <i class="icon icon-check small" ng-show="selectedColor && color.value === selectedColor.value"></i>
+                <i class="icon icon-check small" ng-show="isSelectedColor(color)"></i>
             </div>
             <div class="umb-color-box__label" ng-if="useLabel">
                 <div class="umb-color-box__name truncate">{{ color.label || color.value }}</div>

From 106c044ba5d37e448fb9570079772072da7087ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 29 Jan 2019 21:28:25 +0100
Subject: [PATCH 142/421] V8: Color corrections

---
 .../components/editor/umbeditors.directive.js       |  8 ++++++--
 src/Umbraco.Web.UI.Client/src/less/buttons.less     |  4 ++--
 .../src/less/components/application/umb-drawer.less |  2 +-
 .../src/less/components/editor/umb-editor.less      |  4 ++--
 .../src/less/components/umb-insert-code-box.less    | 13 +++++++------
 .../less/components/umb-package-local-install.less  | 12 ++++++------
 src/Umbraco.Web.UI.Client/src/less/listview.less    |  6 ++++--
 src/Umbraco.Web.UI.Client/src/less/variables.less   |  8 ++++----
 .../infiniteeditors/querybuilder/querybuilder.html  | 12 ++++++------
 9 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index 58afc72f6cf5..ed8618d644e9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -12,7 +12,9 @@
             scope.editors = [];
 
             function addEditor(editor) {
-
+                
+                console.log("add:", editor)
+                
                 editor.animating = true;
 
                 showOverlayOnPrevEditor();
@@ -88,7 +90,9 @@
             }
 
             function removeEditor(editor) {
-
+                
+                console.log("remove: ", editor)
+                
                 editor.animating = true;
 
                 $timeout(function(){
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index 00deec0a94af..51dcce7b927d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -176,7 +176,7 @@ input[type="button"] {
 // Set the backgrounds
 // -------------------------
 .btn-primary {
-  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackground);
+  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
 }
 
 // Warning appears are orange
@@ -197,7 +197,7 @@ input[type="button"] {
 }
 // Made for Umbraco, 2019
 .btn-action {
-  .buttonBackground(@blueExtraDark, @blueDark, @pinkLight, @u-white);
+  .buttonBackground(@pinkLight, @blueDark, @blueExtraDark, @u-white);
 }
 // Made for Umbraco, 2019, used for buttons that has to stand back.
 .btn-white {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
index 2c7f07ef26e8..8c3b059a94be 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
@@ -6,7 +6,7 @@
     right: 0;
     z-index: 10;
     width: @drawerWidth;
-    background: @gray-9;
+    background: @brownGrayLight;
     box-shadow: inset 5px 0 20px rgba(0,0,0,.3);
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index 321fabadada2..764094a9b8ba 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -12,7 +12,7 @@
     right: 0;
     bottom: 0;
     left: 0;
-    background: @gray-10;
+    background: @brownGrayLight;
     z-index: @zIndexEditor;
 }
 
@@ -44,4 +44,4 @@
     left: 0;
     background: rgba(0,0,0,0.4);
     z-index: @zIndexEditor;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
index b0f9a7db3d43..a87e7084fbc2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
@@ -4,23 +4,24 @@
 }
 
 .umb-insert-code-box {
-    border: 2px solid @gray-10;
+    border: 1px solid @gray-10;
     padding: 15px 20px;
     margin-bottom: 10px;
     border-radius: 3px;
+    cursor: pointer;
 }
 
-.umb-insert-code-box:hover,
+.umb-insert-code-box:hover, 
 .umb-insert-code-box.-selected {
-    border-color: @turquoise;
-    cursor: pointer;
+    background-color: @ui-option-hover;
+    color: @ui-action-type-hover;
+    //border-color: @ui-action-border-hover;
 }
 
 .umb-insert-code-box__title {
     font-size: 15px;
     margin-bottom: 5px;
     font-weight: bold;
-    color: @black;
 }
 
 .umb-insert-code-box__description {
@@ -31,7 +32,7 @@
 .umb-insert-code-box__check {
     width: 18px;
     height: 18px;
-    background: @gray-10;
+    background: @gray-10;x
     border-radius: 50%;
     display: flex;
     align-items: center;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less
index 99759fcee750..d229bc81b6e0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less
@@ -13,7 +13,7 @@
     position: relative;
     width: 500px;
     height: 300px;
-    border: 2px dashed @gray-8;
+    border: 2px dashed @ui-action-border;
     border-radius: 3px;
     background: @white;
     display: flex;
@@ -22,10 +22,9 @@
     align-items: center;
     margin-bottom: 30px;
     transition: 100ms box-shadow ease, 100ms border ease;
-
-    &:hover,
+    
     &.drag-over {
-        border-color: @turquoise;
+        border-color: @ui-action-border-hover;
         border-style: solid;
         box-shadow: 0 3px 8px rgba(0,0,0, .1);
         transition: 100ms box-shadow ease, 100ms border ease;
@@ -34,18 +33,19 @@
 
 .umb-upload-local__dropzone i {
     display: block;
-    color: @gray-8;
+    color: @ui-action-type;
     font-size: 110px;
     line-height: 1;
 }
 
 .umb-upload-local__select-file {
     font-weight: bold;
-    color: @turquoise-d1;
+    color: @ui-action-type;
     cursor: pointer;
 
     &:hover {
         text-decoration: underline;
+        color: @ui-action-type-hover;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index c22e57b639e3..c0cb609afb8b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -246,8 +246,8 @@
 
 .list-view-add-layout {
    margin-top: 10px;
-   color: @turquoise-d1;
-   border: 1px dashed @gray-8;
+   color: @ui-action-disgrete-type;
+   border: 1px dashed @ui-action-disgrete-border;
    display: flex;
    align-items: center;
    justify-content: center;
@@ -257,4 +257,6 @@
 
 .list-view-add-layout:hover {
    text-decoration: none;
+   color: @ui-action-disgrete-type-hover;
+   border-color: @ui-action-disgrete-border-hover;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index bde61517ac3e..8add7c9002d0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -154,14 +154,14 @@
 
 
 @ui-action:             white;
-@ui-action-hover:       @brownLight;
+@ui-action-hover:       @sand-7;
 @ui-action-type:             @blueExtraDark;
 @ui-action-type-hover:       @blueMid;
 @ui-action-border:             @blueExtraDark;
 @ui-action-border-hover:       @blueMid;
 
 @ui-action-disgrete:              white;
-@ui-action-disgrete-hover:        @brownLight;
+@ui-action-disgrete-hover:        @sand-7;
 @ui-action-disgrete-type:         @gray-4;
 @ui-action-disgrete-type-hover:   @blueMid;
 @ui-action-disgrete-border:         @gray-4;
@@ -342,8 +342,8 @@
 @btnSuccessBackground:              @ui-btn-positive;// updated 2019
 @btnSuccessBackgroundHighlight:     @ui-btn-positive-hover;// updated 2019
 
-@btnWarningBackground:              @red;
-@btnWarningBackgroundHighlight:     @red-l1;
+@btnWarningBackground:              @orange;
+@btnWarningBackgroundHighlight:     lighten(@orange, 10%);
 
 @btnDangerBackground:               @red;
 @btnDangerBackgroundHighlight:      @red-l1;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
index f919e1df61b4..8376f50713e3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
@@ -26,7 +26,7 @@
 
 									<umb-button
 										type="button"
-										button-style="action"
+										button-style="outline"
 										action="vm.contentTypeSelectOpen = !vm.contentTypeSelectOpen"
 										label="{{vm.query.contentType.name}}"
 										show-caret="true">
@@ -46,7 +46,7 @@
 
 								<umb-button
 									type="button"
-									button-style="action"
+									button-style="outline"
 									action="vm.chooseSource(vm.query)"
 									label="{{vm.query.source.name}}">
 								</umb-button>
@@ -66,7 +66,7 @@
 
 									<umb-button
 										type="button"
-										button-style="action"
+										button-style="outline"
 										action="vm.propertyFilterOpen[$index] = !vm.propertyFilterOpen[$index]"
 										label="{{filter.property.name}}"
 										show-caret="true">
@@ -86,7 +86,7 @@
 
 									<umb-button
 										type="button"
-										button-style="action"
+										button-style="outline"
 										action="vm.termFilterOpen[$index] = !vm.termFilterOpen[$index]"
 										label="{{filter.term.name}}"
 										show-caret="true">
@@ -135,7 +135,7 @@
 
 									<umb-button
 										type="button"
-										button-style="action"
+										button-style="outline"
 										action="vm.sortPropertyOpen = !vm.sortPropertyOpen"
 										label="{{vm.query.sort.property.name}}"
 										show-caret="true">
@@ -154,7 +154,7 @@
 								<umb-button
 									ng-show="vm.query.sort.property.name"
 									type="button"
-									button-style="action"
+									button-style="outline"
 									action="vm.changeSortOrder(vm.query)"
 									label="{{vm.query.sort.translation.currentLabel}}">
 								</umb-button>

From 55aec0bf07a1075f06e61424c177404a1b5d2e1f Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 28 Jan 2019 19:21:59 +0100
Subject: [PATCH 143/421] Make sure the install doesn't fail if the user opts
 out of a custom machine key

---
 src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs b/src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs
index f71d486f5a8c..4d64d30e9db6 100644
--- a/src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs
@@ -33,7 +33,7 @@ private static bool HasMachineKey()
         /// <returns></returns>
         public override Task<InstallSetupResult> ExecuteAsync(bool? model)
         {
-            if (model.HasValue && model.Value == false) return null;
+            if (model.HasValue && model.Value == false) return Task.FromResult<InstallSetupResult>(null);
 
             //install the machine key
             var fileName = IOHelper.MapPath($"{SystemDirectories.Root}/web.config");
@@ -43,7 +43,7 @@ public override Task<InstallSetupResult> ExecuteAsync(bool? model)
 
             // Update appSetting if it exists, or else create a new appSetting for the given key and value
             var machineKey = systemWeb.Descendants("machineKey").FirstOrDefault();
-            if (machineKey != null) return null;
+            if (machineKey != null) return Task.FromResult<InstallSetupResult>(null);
 
             var generator = new MachineKeyGenerator();
             var generatedSection = generator.GenerateConfigurationBlock();

From 1002113e7d247b257d9b4d77af47c9ebe4a17472 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 27 Jan 2019 21:10:39 +0100
Subject: [PATCH 144/421] Server side validation of illegal chars in folder
 names

---
 src/Umbraco.Web/Editors/CodeFileController.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 63b6c173b536..1812ccd0ea8a 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -75,11 +75,14 @@ public HttpResponseMessage PostCreate(string type, CodeFileDisplay display)
         /// <param name="name">The name of the container/folder</param>
         /// <returns></returns>
         [HttpPost]
-        public CodeFileDisplay PostCreateContainer(string type, string parentId, string name)
+        public HttpResponseMessage PostCreateContainer(string type, string parentId, string name)
         {
             if (string.IsNullOrWhiteSpace(type)) throw new ArgumentException("Value cannot be null or whitespace.", "type");
             if (string.IsNullOrWhiteSpace(parentId)) throw new ArgumentException("Value cannot be null or whitespace.", "parentId");
             if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
+            if (name.ContainsAny(Path.GetInvalidPathChars())) {
+                return Request.CreateNotificationValidationErrorResponse("The folder name cannot contain illegal characters.");
+            }
 
             // if the parentId is root (-1) then we just need an empty string as we are
             // creating the path below and we don't want -1 in the path
@@ -118,11 +121,11 @@ public CodeFileDisplay PostCreateContainer(string type, string parentId, string
 
             }
 
-            return new CodeFileDisplay
+            return Request.CreateResponse(HttpStatusCode.OK, new CodeFileDisplay
             {
                 VirtualPath = virtualPath,
                 Path = Url.GetTreePathFromFilePath(virtualPath)
-            };
+            });
         }
 
         /// <summary>

From 2f146934d3e5ab9ef75c71ae32ee75d7a39b47f1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 27 Jan 2019 21:23:19 +0100
Subject: [PATCH 145/421] Show the error message and localize it

---
 .../src/views/partialviewmacros/create.html                    | 1 -
 src/Umbraco.Web.UI.Client/src/views/partialviews/create.html   | 1 -
 src/Umbraco.Web.UI.Client/src/views/scripts/create.html        | 3 +--
 src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html    | 1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml                  | 3 ++-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                  | 1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml               | 1 +
 src/Umbraco.Web/Editors/CodeFileController.cs                  | 2 +-
 8 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index 5c34040a8d48..89e8075d3301 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -62,7 +62,6 @@ <h5><localize key="defaultdialogs_selectSnippet">Select snippet</localize></h5>
 
                 <div ng-show="vm.createFolderError">
                     <div class="alert alert-error">
-                        <div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
                         <div>{{vm.createFolderError.data.message}}</div>
                     </div>
                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index 3cca62b2b97e..d11e240c3cab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -52,7 +52,6 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
                 
                 <div ng-show="vm.createFolderError">
                     <div class="alert alert-error">
-                        <div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
                         <div>{{vm.createFolderError.data.message}}</div>
                     </div>
                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index 89a6ce1f7d1b..2dc1f39ff819 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -29,7 +29,6 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
                 
                 <div ng-show="vm.createFolderError">
                     <div class="alert alert-error">
-                        <div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
                         <div>{{vm.createFolderError.data.message}}</div>
                     </div>
                 </div>
@@ -50,4 +49,4 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
         </button>
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
index 0554c430d1ad..630d23fe787e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
@@ -35,7 +35,6 @@ <h5><localize key="create_createUnder">Create an item under</localize> {{current
 
                 <div ng-show="vm.createFolderError">
                     <div class="alert alert-error">
-                        <div><strong>{{vm.createFolderError.errorMsg}}</strong></div>
                         <div>{{vm.createFolderError.data.message}}</div>
                     </div>
                 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 9dceead92783..3c57fa35d8ee 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -187,7 +187,8 @@
   <area alias="codefile">
     <key alias="createFolderFailedById">Oprettelse af mappen under parent med ID %0% fejlede</key>
     <key alias="createFolderFailedByName">Oprettelse af mappen under parent med navnet %0% fejlede</key>
-      <key alias="deleteItemFailed">Sletning af filen/mappen fejlede: %0%</key>
+    <key alias="createFolderIllegalChars">Mappens navn må ikke indeholde ugyldige tegn.</key>
+    <key alias="deleteItemFailed">Sletning af filen/mappen fejlede: %0%</key>
   </area>
   <area alias="content">
     <key alias="isPublished" version="7.2">Udgivet</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 3dcbfcded202..8135591c0cd9 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -195,6 +195,7 @@
   <area alias="codefile">
     <key alias="createFolderFailedById">Failed to create a folder under parent with ID %0%</key>
     <key alias="createFolderFailedByName">Failed to create a folder under parent with name %0%</key>
+    <key alias="createFolderIllegalChars">The folder name cannot contain illegal characters.</key>
     <key alias="deleteItemFailed">Failed to delete item: %0%</key>
   </area>
   <area alias="content">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 8c8a405e298b..48ea15e3dc77 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -199,6 +199,7 @@
   <area alias="codefile">
     <key alias="createFolderFailedById">Failed to create a folder under parent with ID %0%</key>
     <key alias="createFolderFailedByName">Failed to create a folder under parent with name %0%</key>
+    <key alias="createFolderIllegalChars">The folder name cannot contain illegal characters.</key>
     <key alias="deleteItemFailed">Failed to delete item: %0%</key>
   </area>
   <area alias="content">
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 1812ccd0ea8a..719f7521cb2a 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -81,7 +81,7 @@ public HttpResponseMessage PostCreateContainer(string type, string parentId, str
             if (string.IsNullOrWhiteSpace(parentId)) throw new ArgumentException("Value cannot be null or whitespace.", "parentId");
             if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
             if (name.ContainsAny(Path.GetInvalidPathChars())) {
-                return Request.CreateNotificationValidationErrorResponse("The folder name cannot contain illegal characters.");
+                return Request.CreateNotificationValidationErrorResponse(Services.TextService.Localize("codefile/createFolderIllegalChars"));
             }
 
             // if the parentId is root (-1) then we just need an empty string as we are

From 48069201798e95103cb0712beaadf19bc52d7fd5 Mon Sep 17 00:00:00 2001
From: Damiaan Peeters <damiaan@umbrace.be>
Date: Mon, 28 Jan 2019 15:01:09 +0100
Subject: [PATCH 146/421] Do not allow a empty name with for the MemberGroup

---
 src/Umbraco.Core/Services/MemberGroupService.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/MemberGroupService.cs b/src/Umbraco.Core/Services/MemberGroupService.cs
index 78d8581577df..e6b0c5e9981d 100644
--- a/src/Umbraco.Core/Services/MemberGroupService.cs
+++ b/src/Umbraco.Core/Services/MemberGroupService.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
@@ -69,6 +70,11 @@ public IMemberGroup GetByName(string name)
 
         public void Save(IMemberGroup memberGroup, bool raiseEvents = true)
         {
+            if (string.IsNullOrWhiteSpace(memberGroup.Name))
+            {
+                throw new InvalidOperationException("The name of a MemberGroup can not be empty");
+            }
+
             using (var uow = UowProvider.GetUnitOfWork())
             {
                 var saveEventArgs = new SaveEventArgs<IMemberGroup>(memberGroup);
@@ -133,4 +139,4 @@ public void Delete(IMemberGroup memberGroup)
         /// </remarks>
         public static event TypedEventHandler<IMemberGroupService, SaveEventArgs<IMemberGroup>> Saved;
     }
-}
\ No newline at end of file
+}

From 7656de693cce4a801c103f845a1e1be56ce1202e Mon Sep 17 00:00:00 2001
From: Damiaan Peeters <damiaan@umbrace.be>
Date: Mon, 28 Jan 2019 16:14:55 +0100
Subject: [PATCH 147/421] Add unittest

---
 .../Services/MemberGroupServiceTests.cs       | 39 +++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 src/Umbraco.Tests/Services/MemberGroupServiceTests.cs

diff --git a/src/Umbraco.Tests/Services/MemberGroupServiceTests.cs b/src/Umbraco.Tests/Services/MemberGroupServiceTests.cs
new file mode 100644
index 000000000000..20205d74bcde
--- /dev/null
+++ b/src/Umbraco.Tests/Services/MemberGroupServiceTests.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
+
+namespace Umbraco.Tests.Services
+{
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
+    [TestFixture, RequiresSTA]
+    public class MemberGroupServiceTests : BaseServiceTest
+    {
+        [SetUp]
+        public override void Initialize()
+        {
+            base.Initialize();
+        }
+
+        [TearDown]
+        public override void TearDown()
+        {
+            base.TearDown();
+        }
+        
+        [Test]
+        [ExpectedException("System.InvalidOperationException")]
+        public void New_MemberGroup_Is_Not_Allowed_With_Empty_Name()
+        {
+            var service = ServiceContext.MemberGroupService;
+            
+            service.Save(new MemberGroup {Name = ""});
+
+            Assert.Fail("An exception should have been thrown");
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 86c36a8d76a7..08c44aafdc06 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -193,6 +193,7 @@
     <Compile Include="PublishedContent\StronglyTypedModels\Home.cs" />
     <Compile Include="Services\AuditServiceTests.cs" />
     <Compile Include="Services\ConsentServiceTests.cs" />
+    <Compile Include="Services\MemberGroupServiceTests.cs" />
     <Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingExtensions.cs" />
     <Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingMiddleware.cs" />
     <Compile Include="TestHelpers\ControllerTesting\SpecificAssemblyResolver.cs" />

From 3f080ab2775ace29bd7612c8b1c31be26f7ed1db Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 27 Jan 2019 20:26:33 +0100
Subject: [PATCH 148/421] Remove the annoying menuDialogTitle tooltip

---
 .../tree/umbcontextdialog/umbcontextdialog.directive.js       | 2 +-
 .../src/views/components/application/umb-navigation.html      | 2 +-
 .../components/tree/umbcontextdialog/umb-context-dialog.html  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js
index 28e3a9f53cdf..99a5dad58cfd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js
@@ -25,7 +25,7 @@
             transclude: true,
             templateUrl: "views/components/tree/umbcontextdialog/umb-context-dialog.html",
             scope: {
-                title: "<",
+                dialogTitle: "<",
                 currentNode: "<",
                 view: "<"
             },
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
index c5b4f69cef7a..275c814761f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
@@ -38,7 +38,7 @@
 
             <umb-context-dialog
                 ng-if="showContextMenuDialog"
-                title="menuDialogTitle"
+                dialog-title="menuDialogTitle"
                 current-node="menuNode"
                 view="dialogTemplateUrl">
             </umb-context-dialog>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html
index 63385570d9b9..fa0ec487bc0a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html
@@ -1,6 +1,6 @@
 <div id="dialog" class="umb-modalcolumn fill shadow" on-outside-click="outSideClick()">
     <div class="umb-modalcolumn-header">
-        <h1>{{title}}</h1>
+        <h1>{{dialogTitle}}</h1>
     </div>
     <div class="umb-modalcolumn-body" ng-include="view"></div>
-</div>
\ No newline at end of file
+</div>

From 27ce8c8ebc2cf42a33b25898f2e0250f2ba6af1a Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 27 Jan 2019 14:01:42 +0100
Subject: [PATCH 149/421] Add a few missing localizations for edit media

---
 src/Umbraco.Web.UI.Client/src/views/media/edit.html          | 5 ++---
 .../src/views/media/media.edit.controller.js                 | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index be1219f05280..3a72b0b40dc2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -42,7 +42,7 @@
                     <umb-button ng-if="model.infiniteMode"
                                 action="close()"
                                 button-style="link"
-                                label="Close"
+                                label-key="general_close"
                                 type="button">
                     </umb-button>
 
@@ -50,14 +50,13 @@
                                 ng-if="page.listViewPath"
                                 type="link"
                                 href="#{{page.listViewPath}}"
-                                label="Return to list"
                                 label-key="buttons_returnToList">
                     </umb-button>
 
                     <!-- label-key="buttons_save" -->
                     <umb-button alias="save"
                                 type="submit"
-                                label="{{page.submitButtonLabel}}"
+                                label-key="{{page.submitButtonLabelKey}}"
                                 button-style="success"
                                 shortcut="ctrl+s"
                                 state="page.saveButtonState">
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index 19932887fde6..4868bf0c6bc8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -40,7 +40,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
     $scope.page.menu.currentNode = null; //the editors affiliated node
     $scope.page.listViewPath = null;
     $scope.page.saveButtonState = "init";
-    $scope.page.submitButtonLabel = "Save";
+    $scope.page.submitButtonLabelKey = "buttons_save";
 
     /** Syncs the content item to it's tree node - this occurs on first load and after saving */
     function syncTreeNode(content, path, initialLoad) {
@@ -103,7 +103,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
 
         // setup infinite mode
         if(infiniteMode) {
-            $scope.page.submitButtonLabel = "Save and Close";
+            $scope.page.submitButtonLabelKey = "buttons_saveAndClose";
         }
 
     }

From 69548aed20bb676a43cb87424942808d878aefe0 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 27 Jan 2019 12:33:32 +0100
Subject: [PATCH 150/421] Fix the offset in the crop editor

---
 .../imaging/umbimagecrop.directive.js         | 47 +++++--------------
 .../common/services/cropperhelper.service.js  |  7 ---
 2 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
index a287ec047629..62bf888852f6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
@@ -103,34 +103,6 @@ angular.module("umbraco.directives")
 						scope.dimensions.cropper.height = _viewPortH; //  scope.dimensions.viewport.height - 2 * scope.dimensions.margin;
 					};
 
-
-					//when loading an image without any crop info, we center and fit it
-					var resizeImageToEditor = function(){
-						//returns size fitting the cropper
-						var size = cropperHelper.calculateAspectRatioFit(
-								scope.dimensions.image.width,
-								scope.dimensions.image.height,
-								scope.dimensions.cropper.width,
-								scope.dimensions.cropper.height,
-								true);
-
-						//sets the image size and updates the scope
-						scope.dimensions.image.width = size.width;
-						scope.dimensions.image.height = size.height;
-
-						//calculate the best suited ratios
-						scope.dimensions.scale.min = size.ratio;
-						scope.dimensions.scale.max = 2;
-						scope.dimensions.scale.current = size.ratio;
-
-						//center the image
-						var position = cropperHelper.centerInsideViewPort(scope.dimensions.image, scope.dimensions.cropper);
-						scope.dimensions.top = position.top;
-						scope.dimensions.left = position.left;
-
-						setConstraints();
-					};
-
 					//resize to a given ratio
 					var resizeImageToScale = function(ratio){
 						//do stuff
@@ -227,12 +199,19 @@ angular.module("umbraco.directives")
 						//set dimensions on image, viewport, cropper etc
 						setDimensions(image);
 
-						//if we have a crop already position the image
-						if(scope.crop){
-							resizeImageToCrop();
-						}else{
-							resizeImageToEditor();
-						}
+						//create a default crop if we haven't got one already
+                        var createDefaultCrop = !scope.crop;
+                        if (createDefaultCrop) {
+                            calculateCropBox();
+                        }
+
+						resizeImageToCrop();
+
+                        //if we're creating a new crop, make sure to zoom out fully
+                        if (createDefaultCrop) {
+                            scope.dimensions.scale.current = scope.dimensions.scale.min;
+    						resizeImageToScale(scope.dimensions.scale.min);
+                        }
 
 						//sets constaints for the cropper
 						setConstraints();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/cropperhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/cropperhelper.service.js
index e613ccad0de9..256a1461db3f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/cropperhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/cropperhelper.service.js
@@ -123,13 +123,6 @@ function cropperHelper(umbRequestHelper, $http) {
 			return crop;
 		},
 
-		centerInsideViewPort : function(img, viewport){
-			var left = viewport.width/ 2 - img.width / 2,
-				top = viewport.height / 2 - img.height / 2;
-			
-			return {left: left, top: top};
-		},
-
 		alignToCoordinates : function(image, center, viewport){
 			
 			var min_left = (image.width) - (viewport.width);

From cca1393f2b7fe48499337281d974b9ce171fb08e Mon Sep 17 00:00:00 2001
From: Vigan Shemsiu <vigan@shemsiu.com>
Date: Tue, 29 Jan 2019 12:08:49 +0100
Subject: [PATCH 151/421] Validate both width and height

Make sure to validate both width and height before running "setDimensions();".

The focus point will not work if we have "img { width: 100%; }" in the stylesheet.

This pull request will fix the bug.
---
 .../directives/components/imaging/umbimagegravity.directive.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
index 7d1b1c5a18b1..28b9ebdb78e6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
@@ -35,7 +35,7 @@ angular.module("umbraco.directives")
                     var $overlay = element.find(".overlay");
 
 				    scope.style = function () {
-                        if (scope.dimensions.width <= 0) {
+                        if (scope.dimensions.width <= 0 || scope.dimensions.height <= 0) {
 							setDimensions();
 						}
 

From 10fbffcfcc82907b28b54bc027e1a35990e94179 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 23 Jan 2019 14:40:11 +0100
Subject: [PATCH 152/421] Handle element types in the conten picker

---
 .../ValueConverters/ContentPickerValueConverter.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs
index b9cac88ecfd9..d30762f13f52 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs
@@ -65,7 +65,7 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, Publ
                     if (udi == null)
                         return null;
                     content = _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(udi.Guid);
-                    if (content != null)
+                    if (content != null && content.ItemType == PublishedItemType.Content)
                         return content;
                 }
             }

From 9d3d4b77a0bed59856a3cd84a6a6e6623dae2db1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 23 Jan 2019 14:40:25 +0100
Subject: [PATCH 153/421] Handle element types in the MNTP

---
 .../ValueConverters/MultiNodeTreePickerValueConverter.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
index 0f8b75f6b167..beb22bb57e25 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
@@ -98,7 +98,7 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, Publ
                                     break;
                             }
 
-                            if (multiNodeTreePickerItem != null)
+                            if (multiNodeTreePickerItem != null && multiNodeTreePickerItem.ItemType != PublishedItemType.Element)
                             {
                                 multiNodeTreePicker.Add(multiNodeTreePickerItem);
                             }

From a025568196045a6347fee5ba236a1c599ea9da64 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 23 Jan 2019 14:40:42 +0100
Subject: [PATCH 154/421] Handle element types in the multi URL picker

---
 .../ValueConverters/MultiUrlPickerValueConverter.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
index c2c604cb7f57..814d49925276 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
@@ -65,7 +65,7 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, Publ
                              _publishedSnapshotAccessor.PublishedSnapshot.Media.GetById(preview, dto.Udi.Guid) :
                              _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(preview, dto.Udi.Guid);
 
-                        if (content == null)
+                        if (content == null || content.ItemType == PublishedItemType.Element)
                         {
                             continue;
                         }

From 45bfaee5904e78ab8456f15ba12b39d60533c3c8 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 14:26:41 +1100
Subject: [PATCH 155/421] fixing tests

---
 src/Umbraco.Core/Configuration/GlobalSettings.cs              | 4 ++--
 src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs       | 1 -
 .../Configurations/UmbracoSettings/umbracoSettings.config     | 3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 49cb9c3fbf58..b89a4d1dafd5 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -31,8 +31,8 @@ public class GlobalSettings : IGlobalSettings
         private static string _reservedPaths;
         private static string _reservedUrls;
         //ensure the built on (non-changeable) reserved paths are there at all times
-        internal const string StaticReservedPaths = "~/app_plugins/,~/install/";
-        internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known";
+        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,"; //must end with a comma!
+        internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
         #endregion
 
         /// <summary>
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index 8587a7b19428..54080f05de9b 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -60,7 +60,6 @@ public void Umbraco_Mvc_Area(string path, string rootPath, string outcome)
         [TestCase("/install")]
         [TestCase("/install/?installStep=asdf")]
         [TestCase("/install/test.aspx")]
-        [TestCase("/config/splashes/booting.aspx")]
         public void Is_Reserved_Path_Or_Url(string url)
         {
             var globalSettings = TestObjects.GetGlobalSettings();
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index dd44e233280d..b3ca1524c923 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -65,9 +65,6 @@
     <!-- Update in-memory cache if xml file is changed -->
     <XmlContentCheckForDiskChanges>True</XmlContentCheckForDiskChanges>
 
-    <!-- Show the /config/splashes/booting.aspx page while initializing content -->
-    <EnableSplashWhileLoading>False</EnableSplashWhileLoading>
-
     <!-- Show property descriptions in editing view "icon|text|none" -->
     <PropertyContextHelpOption>text</PropertyContextHelpOption>
 

From 16b655fd6277572627861cd73d12514ea3563895 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 16:47:48 +1100
Subject: [PATCH 156/421] Adds null check to SingleServerRegistrar

---
 src/Umbraco.Core/Sync/SingleServerRegistrar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Sync/SingleServerRegistrar.cs b/src/Umbraco.Core/Sync/SingleServerRegistrar.cs
index dec0342fc015..edd14e9f5ca0 100644
--- a/src/Umbraco.Core/Sync/SingleServerRegistrar.cs
+++ b/src/Umbraco.Core/Sync/SingleServerRegistrar.cs
@@ -23,7 +23,7 @@ public ServerRole GetCurrentServerRole()
 
         public string GetCurrentServerUmbracoApplicationUrl()
         {
-            return _runtime.ApplicationUrl.ToString();
+            return _runtime.ApplicationUrl?.ToString();
         }
 
         private class ServerAddressImpl : IServerAddress

From 35b78cc2246ee6e55efb0277dce8555dbb853bce Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 16:56:14 +1100
Subject: [PATCH 157/421] Adds notes

---
 src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs |  4 ++++
 src/Umbraco.Core/Sync/SingleServerRegistrar.cs   | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs b/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
index 9ad5875edfcc..276ce6097c6e 100644
--- a/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
+++ b/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
@@ -7,6 +7,10 @@ namespace Umbraco.Core.Sync
     /// <summary>
     /// A registrar that stores registered server nodes in the database.
     /// </summary>
+    /// <remarks>
+    /// This is the default registrar which determines a server's role by using a master election process.
+    /// The master election process doesn't occur until just after startup so this election process doesn't really affect the primary startup phase.
+    /// </remarks>
     public sealed class DatabaseServerRegistrar : IServerRegistrar
     {
         private readonly Lazy<IServerRegistrationService> _registrationService;
diff --git a/src/Umbraco.Core/Sync/SingleServerRegistrar.cs b/src/Umbraco.Core/Sync/SingleServerRegistrar.cs
index edd14e9f5ca0..b29533dd515a 100644
--- a/src/Umbraco.Core/Sync/SingleServerRegistrar.cs
+++ b/src/Umbraco.Core/Sync/SingleServerRegistrar.cs
@@ -3,6 +3,14 @@
 
 namespace Umbraco.Core.Sync
 {
+    /// <summary>
+    /// Can be used when Umbraco is definitely not operating in a Load Balanced scenario to micro-optimize some startup performance
+    /// </summary>
+    /// <remarks>
+    /// The micro optimization is specifically to avoid a DB query just after the app starts up to determine the <see cref="ServerRole"/>
+    /// which by default is done with master election by a database query. The master election process doesn't occur until just after startup
+    /// so this micro optimization doesn't really affect the primary startup phase.
+    /// </remarks>
     public class SingleServerRegistrar : IServerRegistrar
     {
         private readonly IRuntimeState _runtime;
@@ -13,7 +21,7 @@ public class SingleServerRegistrar : IServerRegistrar
         public SingleServerRegistrar(IRuntimeState runtime)
         {
             _runtime = runtime;
-            _registrations = new Lazy<IServerAddress[]>(() => new[] { new ServerAddressImpl(_runtime.ApplicationUrl.ToString()) });
+            _registrations = new Lazy<IServerAddress[]>(() => new IServerAddress[] { new ServerAddressImpl(_runtime.ApplicationUrl.ToString()) });
         }
 
         public ServerRole GetCurrentServerRole()

From f49516ff13cfe3dda77c089de36c184c4075fdd4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 17:14:04 +1100
Subject: [PATCH 158/421] fix csproj building

---
 src/Umbraco.Core/Umbraco.Core.csproj   | 23 -----------------------
 src/Umbraco.Tests/Umbraco.Tests.csproj |  2 --
 2 files changed, 25 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ca4bd405519e..366326cd8b23 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -211,29 +211,6 @@
     <Compile Include="ConfigsExtensions.cs" />
     <Compile Include="Configuration\Configs.cs" />
     <Compile Include="Configuration\CoreDebug.cs" />
-    <Compile Include="Configuration\Dashboard\AccessElement.cs" />
-    <Compile Include="Configuration\Dashboard\AccessRule.cs" />
-    <Compile Include="Configuration\Dashboard\AccessRuleType.cs" />
-    <Compile Include="Configuration\Dashboard\AreaCollection.cs" />
-    <Compile Include="Configuration\Dashboard\AreaElement.cs" />
-    <Compile Include="Configuration\Dashboard\AreasElement.cs" />
-    <Compile Include="Configuration\Dashboard\ControlCollection.cs" />
-    <Compile Include="Configuration\Dashboard\ControlElement.cs" />
-    <Compile Include="Configuration\Dashboard\DashboardSection.cs" />
-    <Compile Include="Configuration\Dashboard\IAccess.cs" />
-    <Compile Include="Configuration\Dashboard\IAccessRule.cs" />
-    <Compile Include="Configuration\Dashboard\IArea.cs" />
-    <Compile Include="Configuration\Dashboard\IDashboardControl.cs" />
-    <Compile Include="Configuration\Dashboard\IDashboardSection.cs" />
-    <Compile Include="Configuration\Dashboard\IDashboardTab.cs" />
-    <Compile Include="Configuration\Dashboard\ISection.cs" />
-    <Compile Include="Configuration\Dashboard\SectionCollection.cs" />
-    <Compile Include="Configuration\Dashboard\SectionElement.cs" />
-    <Compile Include="Configuration\Dashboard\TabCollection.cs" />
-    <Compile Include="Configuration\Dashboard\TabElement.cs" />
-    <Compile Include="Configuration\FileSystemProviderElement.cs" />
-    <Compile Include="Configuration\FileSystemProviderElementCollection.cs" />
-    <Compile Include="Configuration\FileSystemProvidersSection.cs" />
     <Compile Include="Configuration\GlobalSettings.cs" />
     <Compile Include="Configuration\GlobalSettingsExtensions.cs" />
     <Compile Include="Configuration\Grid\GridConfig.cs" />
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 4fa3961bf1f4..03d0d4f8cbf9 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -294,8 +294,6 @@
     <Compile Include="Cache\HttpRequestAppCacheTests.cs" />
     <Compile Include="Cache\WebCachingAppCacheTests.cs" />
     <Compile Include="Cache\RuntimeAppCacheTests.cs" />
-    <Compile Include="Configurations\DashboardSettings\DashboardSettingsTests.cs" />
-    <Compile Include="Configurations\FileSystemProviderTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\LoggingElementDefaultTests.cs" />

From 08a886b724862c5f5b5776d896658ef9a3c8ae9a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 17:35:57 +1100
Subject: [PATCH 159/421] nucache bug fix

---
 src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index 5bab8aa2653e..db7aa0d5d173 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -100,8 +100,8 @@ private ContentNode(ContentNode origin, IUmbracoContextAccessor umbracoContextAc
             var originPublished = origin.PublishedContent;
 
 
-            DraftContent = new PublishedContent(this, originDraft, umbracoContextAccessor);
-            PublishedContent = new PublishedContent(this, originPublished, umbracoContextAccessor);
+            DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft, umbracoContextAccessor);
+            PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished, umbracoContextAccessor);
             DraftModel = DraftContent?.CreateModel();
             PublishedModel = PublishedContent?.CreateModel();
 

From f02da1fdd2a0111dc8fa51a3a53e262b2a98fbe0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 17:36:33 +1100
Subject: [PATCH 160/421] nucache bug fix

---
 src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
index 5bab8aa2653e..db7aa0d5d173 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
@@ -100,8 +100,8 @@ private ContentNode(ContentNode origin, IUmbracoContextAccessor umbracoContextAc
             var originPublished = origin.PublishedContent;
 
 
-            DraftContent = new PublishedContent(this, originDraft, umbracoContextAccessor);
-            PublishedContent = new PublishedContent(this, originPublished, umbracoContextAccessor);
+            DraftContent = originDraft == null ? null : new PublishedContent(this, originDraft, umbracoContextAccessor);
+            PublishedContent = originPublished == null ? null : new PublishedContent(this, originPublished, umbracoContextAccessor);
             DraftModel = DraftContent?.CreateModel();
             PublishedModel = PublishedContent?.CreateModel();
 

From cf0095dc1c88b452e648c820be9fbda67f4871fd Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 30 Jan 2019 07:49:45 +0100
Subject: [PATCH 161/421] #3645 - removed viewmodel and uses ILanguage directly
 in the view

---
 src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml | 6 +++---
 src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs | 8 --------
 src/Umbraco.Web/Editors/BackOfficePreviewModel.cs     | 7 ++++---
 src/Umbraco.Web/Editors/PreviewController.cs          | 6 +-----
 src/Umbraco.Web/Umbraco.Web.csproj                    | 1 -
 5 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs

diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index db9fc2d3bf32..b6569420206b 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -47,12 +47,12 @@
                     <a href="" ng-click="updatePreviewDevice(device)"><i class="icon {{device.icon}}" title="{{device.title}}"></i><span></span></a>
                 </li>
 
-                @if (Model.PreviewLinks != null && Model.PreviewLinks.Count() > 2)
+                @if (Model.Languages != null && Model.Languages.Count() > 2)
                 {
-                    foreach (var previewLink in Model.PreviewLinks)
+                    foreach (var previewLink in Model.Languages)
                      {
                          <li>
-                             <a href="" ng-click="changeCulture('@previewLink.CultureId')" title="Preview in @previewLink.CultureName"><i class="icon icon-globe-europe---africa"></i><span>@previewLink.CultureName</span></a>
+                             <a href="" ng-click="changeCulture('@previewLink.IsoCode')" title="Preview in @previewLink.CultureName"><i class="icon icon-globe-europe---africa"></i><span>@previewLink.CultureName</span></a>
                          </li>
                      }
                 }
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs
deleted file mode 100644
index c47db0811a56..000000000000
--- a/src/Umbraco.Web/Editors/BackOfficePreviewLinkModel.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Umbraco.Web.Editors
-{
-    public class BackOfficePreviewLinkModel
-    {
-        public string CultureName { get; set; }
-        public string CultureId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index 89b055d9d76d..b66e4326996e 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Models;
 using Umbraco.Web.Features;
 
 namespace Umbraco.Web.Editors
@@ -7,12 +8,12 @@ namespace Umbraco.Web.Editors
     public class BackOfficePreviewModel : BackOfficeModel
     {
         private readonly UmbracoFeatures _features;
-        public IEnumerable<BackOfficePreviewLinkModel> PreviewLinks { get; }
+        public IEnumerable<ILanguage> Languages { get; }
 
-        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IEnumerable<BackOfficePreviewLinkModel> previewLinks) : base(features, globalSettings)
+        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IEnumerable<ILanguage> languages) : base(features, globalSettings)
         {
             _features = features;
-            PreviewLinks = previewLinks;
+            Languages = languages;
         }
 
         public bool DisableDevicePreview => _features.Disabled.DisableDevicePreview;
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 2b0bee052f33..55071048606f 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -44,12 +44,8 @@ public PreviewController(
         public ActionResult Index()
         {
             var availableLanguages = _localizationService.GetAllLanguages();
-            var previewLinks = availableLanguages.Select(x => new BackOfficePreviewLinkModel() {
-                CultureName = x.CultureName,
-                CultureId = x.IsoCode}
-            );
 
-            var model = new BackOfficePreviewModel(_features, _globalSettings, previewLinks);
+            var model = new BackOfficePreviewModel(_features, _globalSettings, availableLanguages);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 376f1fe313e9..91ffbe68b586 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -138,7 +138,6 @@
     <Compile Include="Editors\PackageController.cs" />
     <Compile Include="Editors\KeepAliveController.cs" />
     <Compile Include="Editors\MacrosController.cs" />
-    <Compile Include="Editors\BackOfficePreviewLinkModel.cs" />
     <Compile Include="Editors\RelationTypeController.cs" />
     <Compile Include="Logging\WebProfiler.cs" />
     <Compile Include="Logging\WebProfilerComponent.cs" />

From 134cc176fffbe0007a0200992da3112111e1b5df Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 17:50:13 +1100
Subject: [PATCH 162/421] Moves the Xml published cache to the tests project
 since that is the only place it is used, removes the xml data integrity check
 since it's not needed, removes the xml published cache benchmark since it's
 not needed. Now we don't include the old xml published cache at all in the
 shipped product.

---
 .../Umbraco.Tests.Benchmarks.csproj           |   1 -
 .../XmlPublishedContentInitBenchmarks.cs      | 311 ------------------
 .../PublishedContentCacheTests.cs             |   4 +-
 .../PublishedMediaCacheTests.cs               |   2 +-
 .../DictionaryPublishedContent.cs             |   4 +-
 .../LegacyXmlPublishedCache}/DomainCache.cs   |   5 +-
 .../PreviewContent.cs                         |   2 +-
 .../PublishedContentCache.cs                  |  10 +-
 .../PublishedMediaCache.cs                    |  10 +-
 .../PublishedMemberCache.cs                   |   4 +-
 .../PublishedSnapshot.cs                      |   3 +-
 .../PublishedSnapshotService.cs               |   5 +-
 .../LegacyXmlPublishedCache}/RoutesCache.cs   |   7 +-
 .../SafeXmlReaderWriter.cs                    |   2 +-
 .../UmbracoContextCache.cs                    |   9 +-
 .../XmlPublishedContent.cs                    |   4 +-
 .../XmlPublishedProperty.cs                   |   2 +-
 .../LegacyXmlPublishedCache}/XmlStore.cs      |   5 +-
 .../XmlStoreFilePersister.cs                  |   3 +-
 .../PublishedContent/PublishedMediaTests.cs   |   2 +-
 src/Umbraco.Tests/Routing/RoutesCacheTests.cs |   2 +-
 src/Umbraco.Tests/Routing/UrlProviderTests.cs |   2 +-
 src/Umbraco.Tests/Routing/UrlRoutesTests.cs   |   2 +-
 .../Routing/UrlsProviderWithDomainsTests.cs   |   2 +-
 .../Routing/UrlsWithNestedDomains.cs          |   2 +-
 src/Umbraco.Tests/Scoping/ScopedXmlTests.cs   |   2 +-
 .../TestHelpers/TestWithDatabaseBase.cs       |   2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  15 +
 .../Web/Mvc/UmbracoViewPageTests.cs           |   2 +-
 .../xmldataintegrityreport.controller.js      |  62 ----
 .../settings/xmldataintegrityreport.html      |  29 --
 .../Editors/BackOfficeServerVariables.cs      |   4 -
 .../Editors/PublishedStatusController.cs      |   3 -
 .../Editors/XmlDataIntegrityController.cs     |  61 ----
 src/Umbraco.Web/Umbraco.Web.csproj            |  16 -
 35 files changed, 66 insertions(+), 535 deletions(-)
 delete mode 100644 src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/DictionaryPublishedContent.cs (99%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/DomainCache.cs (94%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/PreviewContent.cs (99%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/PublishedContentCache.cs (99%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/PublishedMediaCache.cs (99%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/PublishedMemberCache.cs (98%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/PublishedSnapshot.cs (95%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/PublishedSnapshotService.cs (99%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/RoutesCache.cs (95%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/SafeXmlReaderWriter.cs (98%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/UmbracoContextCache.cs (81%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/XmlPublishedContent.cs (99%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/XmlPublishedProperty.cs (98%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/XmlStore.cs (99%)
 rename src/{Umbraco.Web/PublishedCache/XmlPublishedCache => Umbraco.Tests/LegacyXmlPublishedCache}/XmlStoreFilePersister.cs (98%)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.controller.js
 delete mode 100644 src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.html
 delete mode 100644 src/Umbraco.Web/Editors/XmlDataIntegrityController.cs

diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 233da0d14bf3..48d69cf75703 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -61,7 +61,6 @@
     <Compile Include="StringReplaceManyBenchmarks.cs" />
     <Compile Include="TryConvertToBenchmarks.cs" />
     <Compile Include="XmlBenchmarks.cs" />
-    <Compile Include="XmlPublishedContentInitBenchmarks.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs
deleted file mode 100644
index bc18b97d4745..000000000000
--- a/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml;
-using BenchmarkDotNet.Attributes;
-using Moq;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Tests.Benchmarks.Config;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
-
-namespace Umbraco.Tests.Benchmarks
-{
-    [QuickRunWithMemoryDiagnoserConfig]
-    public class XmlPublishedContentInitBenchmarks
-    {
-        public XmlPublishedContentInitBenchmarks()
-        {
-            _xml10 = Build(10);
-            _xml100 = Build(100);
-            _xml1000 = Build(1000);
-            _xml10000 = Build(10000);
-        }
-
-        private readonly string[] _intAttributes = { "id", "parentID", "nodeType", "level", "writerID", "creatorID", "template", "sortOrder", "isDoc", "isDraft" };
-        private readonly string[] _strAttributes = { "nodeName", "urlName", "writerName", "creatorName", "path" };
-        private readonly string[] _dateAttributes = { "createDate", "updateDate" };
-        private readonly string[] _guidAttributes = { "key", "version" };
-
-        private XmlDocument Build(int children)
-        {
-            var xml = new XmlDocument();
-            var root = Build(xml, "Home", 10);
-            for (int i = 0; i < children; i++)
-            {
-                var child = Build(xml, "child" + i, 10);
-                root.AppendChild(child);
-            }
-            xml.AppendChild(root);
-            return xml;
-        }
-
-        private XmlElement Build(XmlDocument xml, string name, int propertyCount)
-        {
-            var random = new Random();
-            var content = xml.CreateElement(name);
-            foreach (var p in _intAttributes)
-            {
-                var a = xml.CreateAttribute(p);
-                a.Value = random.Next(1, 9).ToInvariantString();
-                content.Attributes.Append(a);
-            }
-            foreach (var p in _strAttributes)
-            {
-                var a = xml.CreateAttribute(p);
-                a.Value = Guid.NewGuid().ToString();
-                content.Attributes.Append(a);
-            }
-            foreach (var p in _guidAttributes)
-            {
-                var a = xml.CreateAttribute(p);
-                a.Value = Guid.NewGuid().ToString();
-                content.Attributes.Append(a);
-            }
-            foreach (var p in _dateAttributes)
-            {
-                var a = xml.CreateAttribute(p);
-                a.Value = DateTime.Now.ToString("o");
-                content.Attributes.Append(a);
-            }
-
-            for (int i = 0; i < propertyCount; i++)
-            {
-                var prop = xml.CreateElement("prop" + i);
-                var cdata = xml.CreateCDataSection(string.Join("", Enumerable.Range(0, 10).Select(x => Guid.NewGuid().ToString())));
-                prop.AppendChild(cdata);
-                content.AppendChild(prop);
-            }
-
-            return content;
-        }
-
-        private readonly XmlDocument _xml10;
-        private readonly XmlDocument _xml100;
-        private readonly XmlDocument _xml1000;
-        private readonly XmlDocument _xml10000;
-
-        //out props
-        int id, nodeType, level, writerId, creatorId, template, sortOrder;
-        Guid key, version;
-        string name, urlName, writerName, creatorName, docTypeAlias, path;
-        bool isDraft;
-        bool isPublished;
-        DateTime createDate, updateDate;
-        PublishedContentType publishedContentType;
-        Dictionary<string, IPublishedProperty> properties;
-
-        [Benchmark(Baseline = true, OperationsPerInvoke = 10)]
-        public void Original_10_Children()
-        {
-            OriginalInitializeNode(_xml10.DocumentElement, false, false,
-                out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
-                out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out version, out createDate, out updateDate, out level, out isDraft, out isPublished, out publishedContentType,
-                out properties);
-        }
-
-        [Benchmark(OperationsPerInvoke = 10)]
-        public void Original_100_Children()
-        {
-            OriginalInitializeNode(_xml100.DocumentElement, false, false,
-                out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
-                out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out version, out createDate, out updateDate, out level, out isDraft, out isPublished, out publishedContentType,
-                out properties);
-        }
-
-        [Benchmark(OperationsPerInvoke = 10)]
-        public void Original_1000_Children()
-        {
-            OriginalInitializeNode(_xml1000.DocumentElement, false, false,
-                out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
-                out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out version, out createDate, out updateDate, out level, out isDraft, out isPublished, out publishedContentType,
-                out properties);
-        }
-
-        [Benchmark(OperationsPerInvoke = 10)]
-        public void Original_10000_Children()
-        {
-            OriginalInitializeNode(_xml10000.DocumentElement, false, false,
-                out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
-                out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out version, out createDate, out updateDate, out level, out isDraft, out isPublished, out publishedContentType,
-                out properties);
-        }
-
-        [Benchmark(OperationsPerInvoke = 10)]
-        public void Enhanced_10_Children()
-        {
-            XmlPublishedContent.InitializeNode(null, _xml10.DocumentElement, false,
-                out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
-                out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out createDate, out updateDate, out level, out isDraft, out publishedContentType,
-                out properties, GetPublishedContentType);
-        }
-
-        [Benchmark(OperationsPerInvoke = 10)]
-        public void Enhanced_100_Children()
-        {
-            XmlPublishedContent.InitializeNode(null, _xml100.DocumentElement, false,
-                out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
-                out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out createDate, out updateDate, out level, out isDraft, out publishedContentType,
-                out properties, GetPublishedContentType);
-        }
-
-        [Benchmark(OperationsPerInvoke = 10)]
-        public void Enhanced_1000_Children()
-        {
-            XmlPublishedContent.InitializeNode(null, _xml1000.DocumentElement, false,
-                out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
-                out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out createDate, out updateDate, out level, out isDraft,out publishedContentType,
-                out properties, GetPublishedContentType);
-        }
-
-        [Benchmark(OperationsPerInvoke = 10)]
-        public void Enhanced_10000_Children()
-        {
-            XmlPublishedContent.InitializeNode(null, _xml10000.DocumentElement, false,
-                out id, out key, out template, out sortOrder, out name, out writerName, out urlName,
-                out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path,
-                out createDate, out updateDate, out level, out isDraft,out publishedContentType,
-                out properties, GetPublishedContentType);
-        }
-
-
-        internal static void OriginalInitializeNode(XmlNode xmlNode, bool legacy, bool isPreviewing,
-            out int id, out Guid key, out int template, out int sortOrder, out string name, out string writerName, out string urlName,
-            out string creatorName, out int creatorId, out int writerId, out string docTypeAlias, out int docTypeId, out string path,
-            out Guid version, out DateTime createDate, out DateTime updateDate, out int level, out bool isDraft, out bool isPublished,
-            out PublishedContentType contentType, out Dictionary<string, IPublishedProperty> properties)
-        {
-            //initialize the out params with defaults:
-            writerName = null;
-            docTypeAlias = null;
-            id = template = sortOrder = template = creatorId = writerId = docTypeId = level = default(int);
-            key = version = default(Guid);
-            name = writerName = urlName = creatorName = docTypeAlias = path = null;
-            createDate = updateDate = default(DateTime);
-            isDraft = false;
-            isPublished = true;
-            contentType = null;
-            properties = null;
-
-            //return if this is null
-            if (xmlNode == null)
-            {
-                return;
-            }
-
-            if (xmlNode.Attributes != null)
-            {
-                id = int.Parse(xmlNode.Attributes.GetNamedItem("id").Value);
-                if (xmlNode.Attributes.GetNamedItem("key") != null) // because, migration
-                    key = Guid.Parse(xmlNode.Attributes.GetNamedItem("key").Value);
-                if (xmlNode.Attributes.GetNamedItem("template") != null)
-                    template = int.Parse(xmlNode.Attributes.GetNamedItem("template").Value);
-                if (xmlNode.Attributes.GetNamedItem("sortOrder") != null)
-                    sortOrder = int.Parse(xmlNode.Attributes.GetNamedItem("sortOrder").Value);
-                if (xmlNode.Attributes.GetNamedItem("nodeName") != null)
-                    name = xmlNode.Attributes.GetNamedItem("nodeName").Value;
-                if (xmlNode.Attributes.GetNamedItem("writerName") != null)
-                    writerName = xmlNode.Attributes.GetNamedItem("writerName").Value;
-                if (xmlNode.Attributes.GetNamedItem("urlName") != null)
-                    urlName = xmlNode.Attributes.GetNamedItem("urlName").Value;
-                // Creatorname is new in 2.1, so published xml might not have it!
-                try
-                {
-                    creatorName = xmlNode.Attributes.GetNamedItem("creatorName").Value;
-                }
-                catch
-                {
-                    creatorName = writerName;
-                }
-
-                //Added the actual userID, as a user cannot be looked up via full name only...
-                if (xmlNode.Attributes.GetNamedItem("creatorID") != null)
-                    creatorId = int.Parse(xmlNode.Attributes.GetNamedItem("creatorID").Value);
-                if (xmlNode.Attributes.GetNamedItem("writerID") != null)
-                    writerId = int.Parse(xmlNode.Attributes.GetNamedItem("writerID").Value);
-
-                if (legacy)
-                {
-                    if (xmlNode.Attributes.GetNamedItem("nodeTypeAlias") != null)
-                        docTypeAlias = xmlNode.Attributes.GetNamedItem("nodeTypeAlias").Value;
-                }
-                else
-                {
-                    docTypeAlias = xmlNode.Name;
-                }
-
-                if (xmlNode.Attributes.GetNamedItem("nodeType") != null)
-                    docTypeId = int.Parse(xmlNode.Attributes.GetNamedItem("nodeType").Value);
-                if (xmlNode.Attributes.GetNamedItem("path") != null)
-                    path = xmlNode.Attributes.GetNamedItem("path").Value;
-                if (xmlNode.Attributes.GetNamedItem("version") != null)
-                    version = new Guid(xmlNode.Attributes.GetNamedItem("version").Value);
-                if (xmlNode.Attributes.GetNamedItem("createDate") != null)
-                    createDate = DateTime.Parse(xmlNode.Attributes.GetNamedItem("createDate").Value);
-                if (xmlNode.Attributes.GetNamedItem("updateDate") != null)
-                    updateDate = DateTime.Parse(xmlNode.Attributes.GetNamedItem("updateDate").Value);
-                if (xmlNode.Attributes.GetNamedItem("level") != null)
-                    level = int.Parse(xmlNode.Attributes.GetNamedItem("level").Value);
-
-                isDraft = (xmlNode.Attributes.GetNamedItem("isDraft") != null);
-            }
-
-            // load data
-
-            var dataXPath = legacy ? "data" : "* [not(@isDoc)]";
-            var nodes = xmlNode.SelectNodes(dataXPath);
-
-            contentType = GetPublishedContentType(PublishedItemType.Content, docTypeAlias);
-
-            var propertyNodes = new Dictionary<string, XmlNode>();
-            if (nodes != null)
-                foreach (XmlNode n in nodes)
-                {
-                    var attrs = n.Attributes;
-                    if (attrs == null) continue;
-                    var alias = legacy
-                        ? attrs.GetNamedItem("alias").Value
-                        : n.Name;
-                    propertyNodes[alias.ToLowerInvariant()] = n;
-                }
-            properties = contentType.PropertyTypes.Select(p =>
-            {
-                XmlNode n;
-                return propertyNodes.TryGetValue(p.Alias.ToLowerInvariant(), out n)
-                    ? new XmlPublishedProperty(p, null, isPreviewing, n)
-                    : new XmlPublishedProperty(p, null, isPreviewing);
-            }).Cast<IPublishedProperty>().ToDictionary(
-                x => x.Alias,
-                x => x,
-                StringComparer.OrdinalIgnoreCase);
-        }
-
-        private static PublishedContentType GetPublishedContentType(PublishedItemType type, string alias)
-        {
-            var dataType = new DataType(new VoidEditor(Mock.Of<ILogger>())) { Id = 1 };
-
-            var dataTypeService = Mock.Of<IDataTypeService>();
-            Mock.Get(dataTypeService)
-                .Setup(x => x.GetDataType(It.IsAny<int>()))
-                .Returns<int>(id => id == 1 ? dataType : null);
-            Mock.Get(dataTypeService)
-                .Setup(x => x.GetAll())
-                .Returns(new[] { dataType });
-
-            var factory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), dataTypeService);
-            return factory.CreateContentType(0, alias, new string[] {},
-                new List<PublishedPropertyType>(Enumerable.Range(0, 10).Select(x => factory.CreatePropertyType("prop" + x, 1))));
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
index e868e32b0710..87ec4215ac14 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
@@ -7,12 +7,12 @@
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Services;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
@@ -66,7 +66,7 @@ protected override void Initialize()
             var xmlStore = new XmlStore(() => _xml, null, null, null);
             var appCache = new DictionaryAppCache();
             var domainCache = new DomainCache(ServiceContext.DomainService, DefaultCultureAccessor);
-            var publishedShapshot = new Umbraco.Web.PublishedCache.XmlPublishedCache.PublishedSnapshot(
+            var publishedShapshot = new PublishedSnapshot(
                 new PublishedContentCache(xmlStore, domainCache, appCache, globalSettings, new SiteDomainHelper(), umbracoContextAccessor, ContentTypesCache, null, null),
                 new PublishedMediaCache(xmlStore, ServiceContext.MediaService, ServiceContext.UserService, appCache, ContentTypesCache, Factory.GetInstance<IEntityXmlSerializer>(), umbracoContextAccessor),
                 new PublishedMemberCache(null, appCache, Current.Services.MemberService, ContentTypesCache, umbracoContextAccessor),
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
index 07a6a6ee8212..08eeb8ef4d6f 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
@@ -10,12 +10,12 @@
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Strings;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Tests.Testing;
 using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Web;
 
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
similarity index 99%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
index 74043a95190d..d3cbf1f18315 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
@@ -8,10 +8,12 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
+using Umbraco.Web.PublishedCache;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     /// <summary>
     /// An IPublishedContent that is represented all by a dictionary.
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DomainCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs
similarity index 94%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/DomainCache.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs
index 4571e9d42bad..cde2077551d1 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DomainCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs
@@ -1,11 +1,12 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Umbraco.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Services;
+using Umbraco.Web.PublishedCache;
+using Umbraco.Web.Routing;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     internal class DomainCache : IDomainCache
     {
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PreviewContent.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
similarity index 99%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/PreviewContent.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
index 515fb96679de..84b6f2b91c1d 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PreviewContent.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
@@ -7,7 +7,7 @@
 using Umbraco.Core.Logging;
 using Umbraco.Web.Composing;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     class PreviewContent
     {
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs
similarity index 99%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs
index 6fd9f1da2ba3..51c6668913a7 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs
@@ -1,17 +1,19 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Xml;
 using System.Xml.XPath;
-using Umbraco.Core.Configuration;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Xml;
+using Umbraco.Web;
+using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
-using System.Linq;
-using Umbraco.Core.Cache;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     internal class PublishedContentCache : PublishedCacheBase, IPublishedContentCache
     {
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
similarity index 99%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
index 7f9a21d24b23..8cfc06c50149 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
@@ -6,21 +6,21 @@
 using System.Threading;
 using System.Xml.XPath;
 using Examine;
-using Examine.Providers;
 using Examine.Search;
 using Lucene.Net.Store;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
 using Umbraco.Examine;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Services;
-using Umbraco.Core.Services.Implement;
+using Umbraco.Web;
 using Umbraco.Web.Composing;
+using Umbraco.Web.PublishedCache;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     /// <summary>
     /// An IPublishedMediaStore that first checks for the media in Examine, and then reverts to the database
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMemberCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMemberCache.cs
similarity index 98%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMemberCache.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMemberCache.cs
index db6d85fb2d1d..c882488f209e 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMemberCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMemberCache.cs
@@ -6,9 +6,11 @@
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
+using Umbraco.Web;
+using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Security;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     class PublishedMemberCache : IPublishedMemberCache
     {
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshot.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshot.cs
similarity index 95%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshot.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshot.cs
index b9243309a2a9..bfef1873710f 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshot.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshot.cs
@@ -1,8 +1,9 @@
 using System;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Web.PublishedCache;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     /// <summary>
     /// Implements a published snapshot.
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshotService.cs
similarity index 99%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshotService.cs
index d96bfd8a0a20..4a201ae44c19 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshotService.cs
@@ -11,11 +11,12 @@
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
-using Umbraco.Core.Strings;
+using Umbraco.Web;
 using Umbraco.Web.Cache;
+using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     /// <summary>
     /// Implements a published snapshot service.
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/RoutesCache.cs
similarity index 95%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/RoutesCache.cs
index fb227fe65fa8..71f2f421ffb4 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/RoutesCache.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     // Note: RoutesCache closely follows the caching strategy dating from v4, which
     // is obviously broken in many ways (eg it's a global cache but relying to some
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs
similarity index 98%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs
index 37a6b666d4f3..c0b9383b5789 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/SafeXmlReaderWriter.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs
@@ -3,7 +3,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Scoping;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     // TODO: should be a ScopeContextualBase
     internal class SafeXmlReaderWriter : IDisposable
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/UmbracoContextCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/UmbracoContextCache.cs
similarity index 81%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/UmbracoContextCache.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/UmbracoContextCache.cs
index 6b82a7ee3d20..fc6dbe3f3070 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/UmbracoContextCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/UmbracoContextCache.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Concurrent;
 using System.Runtime.CompilerServices;
+using Umbraco.Web;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     static class UmbracoContextCache
     {
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs
similarity index 99%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs
index 9a4c1f239c73..e1819bf0bed2 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs
@@ -7,10 +7,12 @@
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
+using Umbraco.Web.PublishedCache;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
 
     /// <summary>
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedProperty.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedProperty.cs
similarity index 98%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedProperty.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedProperty.cs
index 805f7d9325fe..0c90c8d1ffb5 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedProperty.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedProperty.cs
@@ -5,7 +5,7 @@
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Xml;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
 
     /// <summary>
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
similarity index 99%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
index 36a83347820f..3fb3d40e5bbb 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
@@ -12,7 +12,6 @@
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
@@ -20,15 +19,15 @@
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Services.Implement;
-using Umbraco.Core.Strings;
 using Umbraco.Core.Xml;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Composing;
+using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Scheduling;
 using File = System.IO.File;
 using Task = System.Threading.Tasks.Task;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     /// <summary>
     /// Represents the Xml storage for the Xml published cache.
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
similarity index 98%
rename from src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
index 83d25d3e49b4..145a19872ad0 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Threading;
-using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Web.Scheduling;
 
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
     /// <summary>
     /// This is the background task runner that persists the xml file to the file system
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index bc1d8c2b70d8..a9022554c928 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -8,7 +8,6 @@
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.UmbracoExamine;
 using Umbraco.Web;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using System.Linq;
 using System.Threading;
 using System.Xml;
@@ -23,6 +22,7 @@
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 
 namespace Umbraco.Tests.PublishedContent
 {
diff --git a/src/Umbraco.Tests/Routing/RoutesCacheTests.cs b/src/Umbraco.Tests/Routing/RoutesCacheTests.cs
index 76c2a45ab265..46af27c56e6b 100644
--- a/src/Umbraco.Tests/Routing/RoutesCacheTests.cs
+++ b/src/Umbraco.Tests/Routing/RoutesCacheTests.cs
@@ -4,9 +4,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index f223f2fbea3d..34a038cffed1 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -9,11 +9,11 @@
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.Routing
diff --git a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs
index 4928cd01dcbf..a794e226f107 100644
--- a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs
@@ -4,9 +4,9 @@
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
index dc9a52835bf9..be654b4a09d8 100644
--- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
@@ -8,8 +8,8 @@
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.Routing
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index bb06ff894bbe..3d3533697c39 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -6,9 +6,9 @@
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Core.Services;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
index 11479ea3eb6b..f1fd0c592b83 100644
--- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
@@ -12,11 +12,11 @@
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Sync;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Cache;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 
 namespace Umbraco.Tests.Scoping
 {
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 76b163a2df32..2bfc1b6dc801 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -19,7 +19,6 @@
 using Umbraco.Core.Services;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Security;
 using Umbraco.Web.Routing;
 using File = System.IO.File;
@@ -30,6 +29,7 @@
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.Testing.Objects.Accessors;
 
 namespace Umbraco.Tests.TestHelpers
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 03d0d4f8cbf9..8c86873e0aa9 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -493,6 +493,21 @@
     <Compile Include="Web\WebExtensionMethodTests.cs" />
     <Compile Include="CoreThings\XmlExtensionsTests.cs" />
     <Compile Include="Misc\XmlHelperTests.cs" />
+    <Compile Include="LegacyXmlPublishedCache\DictionaryPublishedContent.cs" />
+    <Compile Include="LegacyXmlPublishedCache\DomainCache.cs" />
+    <Compile Include="LegacyXmlPublishedCache\PreviewContent.cs" />
+    <Compile Include="LegacyXmlPublishedCache\PublishedContentCache.cs" />
+    <Compile Include="LegacyXmlPublishedCache\PublishedMediaCache.cs" />
+    <Compile Include="LegacyXmlPublishedCache\PublishedMemberCache.cs" />
+    <Compile Include="LegacyXmlPublishedCache\PublishedSnapshot.cs" />
+    <Compile Include="LegacyXmlPublishedCache\PublishedSnapshotService.cs" />
+    <Compile Include="LegacyXmlPublishedCache\RoutesCache.cs" />
+    <Compile Include="LegacyXmlPublishedCache\SafeXmlReaderWriter.cs" />
+    <Compile Include="LegacyXmlPublishedCache\UmbracoContextCache.cs" />
+    <Compile Include="LegacyXmlPublishedCache\XmlPublishedContent.cs" />
+    <Compile Include="LegacyXmlPublishedCache\XmlPublishedProperty.cs" />
+    <Compile Include="LegacyXmlPublishedCache\XmlStore.cs" />
+    <Compile Include="LegacyXmlPublishedCache\XmlStoreFilePersister.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">
diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
index fee18cb3822e..c5c8b5c77dd4 100644
--- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
@@ -12,13 +12,13 @@
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.controller.js
deleted file mode 100644
index bb8696aca074..000000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-function XmlDataIntegrityReportController($scope, umbRequestHelper, $log, $http) {
-
-    function check(item) {
-        var action = item.check;
-        umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("xmlDataIntegrityBaseUrl", action)),
-                'Failed to retrieve data integrity status')
-            .then(function(result) {
-                item.checking = false;
-                item.invalid = result === "false";
-            });
-    }
-
-    $scope.fix = function(item) {
-        var action = item.fix;
-        if (item.fix) {
-            if (confirm("This will cause all xml structures for this type to be rebuilt. " +
-                "Depending on how much content there is in your site this could take a while. " +
-                "It is not recommended to rebuild xml structures if they are not out of sync, during times of high website traffic " +
-                "or when editors are editing content.")) {
-                item.fixing = true;
-                umbRequestHelper.resourcePromise(
-                        $http.post(umbRequestHelper.getApiUrl("xmlDataIntegrityBaseUrl", action)),
-                        'Failed to retrieve data integrity status')
-                    .then(function(result) {
-                        item.fixing = false;
-                        item.invalid = result === "false";
-                    });
-            }
-        }
-    }
-
-    $scope.items = {
-        "contentXml": {
-            label: "Content in the cmsContentXml table",
-            checking: true,
-            fixing: false,
-            fix: "FixContentXmlTable",
-            check: "CheckContentXmlTable"
-        },
-        "mediaXml": {
-            label: "Media in the cmsContentXml table",
-            checking: true,
-            fixing: false,
-            fix: "FixMediaXmlTable",
-            check: "CheckMediaXmlTable"
-        },
-        "memberXml": {
-            label: "Members in the cmsContentXml table",
-            checking: true,
-            fixing: false,
-            fix: "FixMembersXmlTable",
-            check: "CheckMembersXmlTable"
-        }
-    };
-
-    for (var i in $scope.items) {
-        check($scope.items[i]);
-    }
-}
-
-angular.module("umbraco").controller("Umbraco.Dashboard.XmlDataIntegrityReportController", XmlDataIntegrityReportController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.html
deleted file mode 100644
index 11f1834ae426..000000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="examineManagement" ng-controller="Umbraco.Dashboard.XmlDataIntegrityReportController">
-
-    <h3>Xml Cache Data integrity</h3>
-
-    <div ng-show="loading">
-        Loading...
-    </div>
-
-    <p>
-        This checks the data integrity for the xml structures for content, media and members that are stored in the cmsContentXml table.
-        This does not check the data integrity of the xml cache file, only the xml structures stored in the database used to create the xml cache file.
-    </p>
-    <div ng-repeat="(key, value) in items" style="padding: 4px 0;">
-        <span ><strong>{{value.label}}&nbsp;...</strong></span>
-        <span ng-if="value.checking" class="text-info">Checking...</span>
-        <span ng-if="!value.checking && !value.invalid" class="text-success"><strong>Ok</strong></span>
-        <span ng-if="!value.checking && value.invalid" class="text-error"><strong>Error</strong></span>
-        <div ng-show="value.fix && !value.fixing">
-            <button type="button" ng-click="fix(value)" class="btn btn-danger" ng-if="value.invalid">
-                <span>Fix</span>
-
-            </button>
-        </div>
-        <div class="umb-loader-wrapper" ng-show="value.fixing">
-            <div class="umb-loader"></div>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index a0f8cd606245..83bb152e0aa1 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -265,10 +265,6 @@ internal Dictionary<string, object> GetServerVariables()
                             "examineMgmtBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<ExamineManagementController>(
                                 controller => controller.GetIndexerDetails())
                         },
-                        {
-                            "xmlDataIntegrityBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<XmlDataIntegrityController>(
-                                controller => controller.CheckContentXmlTable())
-                        },
                         {
                             "healthCheckBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<HealthCheckController>(
                                 controller => controller.GetAllHealthChecks())
diff --git a/src/Umbraco.Web/Editors/PublishedStatusController.cs b/src/Umbraco.Web/Editors/PublishedStatusController.cs
index 937d3f31377d..a6272108e95b 100644
--- a/src/Umbraco.Web/Editors/PublishedStatusController.cs
+++ b/src/Umbraco.Web/Editors/PublishedStatusController.cs
@@ -17,9 +17,6 @@ public PublishedStatusController(IPublishedSnapshotService publishedSnapshotServ
         [HttpGet]
         public string GetPublishedStatusUrl()
         {
-            if (_publishedSnapshotService is PublishedCache.XmlPublishedCache.PublishedSnapshotService)
-                return "views/dashboard/settings/xmldataintegrityreport.html";
-
             //if (service is PublishedCache.PublishedNoCache.PublishedSnapshotService)
             //    return "views/dashboard/developer/nocache.html";
 
diff --git a/src/Umbraco.Web/Editors/XmlDataIntegrityController.cs b/src/Umbraco.Web/Editors/XmlDataIntegrityController.cs
deleted file mode 100644
index 4862b86f6903..000000000000
--- a/src/Umbraco.Web/Editors/XmlDataIntegrityController.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Web.Http;
-using Umbraco.Web.PublishedCache;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Filters;
-
-namespace Umbraco.Web.Editors
-{
-    [ValidateAngularAntiForgeryToken]
-    public class XmlDataIntegrityController : UmbracoAuthorizedApiController
-    {
-        private readonly PublishedSnapshotService _publishedSnapshotService;
-
-        public XmlDataIntegrityController(IPublishedSnapshotService publishedSnapshotService)
-        {
-            if (publishedSnapshotService == null) throw new ArgumentNullException(nameof(publishedSnapshotService));
-            _publishedSnapshotService = publishedSnapshotService as PublishedSnapshotService;
-            if (_publishedSnapshotService == null) throw new NotSupportedException("Unsupported IPublishedSnapshotService, only the Xml one is supported.");
-        }
-
-        [HttpPost]
-        public bool FixContentXmlTable()
-        {
-            _publishedSnapshotService.RebuildContentAndPreviewXml();
-            return _publishedSnapshotService.VerifyContentAndPreviewXml();
-        }
-
-        [HttpPost]
-        public bool FixMediaXmlTable()
-        {
-            _publishedSnapshotService.RebuildMediaXml();
-            return _publishedSnapshotService.VerifyMediaXml();
-        }
-
-        [HttpPost]
-        public bool FixMembersXmlTable()
-        {
-            _publishedSnapshotService.RebuildMemberXml();
-            return _publishedSnapshotService.VerifyMemberXml();
-        }
-
-        [HttpGet]
-        public bool CheckContentXmlTable()
-        {
-            return _publishedSnapshotService.VerifyContentAndPreviewXml();
-        }
-
-        [HttpGet]
-        public bool CheckMediaXmlTable()
-        {
-            return _publishedSnapshotService.VerifyMediaXml();
-        }
-
-        [HttpGet]
-        public bool CheckMembersXmlTable()
-        {
-            return _publishedSnapshotService.VerifyMemberXml();
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 91ffbe68b586..93d26a7e0e26 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -536,15 +536,6 @@
     <Compile Include="PublishedCache\PublishedContentTypeCache.cs" />
     <Compile Include="PublishedCache\DefaultCultureAccessor.cs" />
     <Compile Include="PublishedCache\UmbracoContextPublishedSnapshotAccessor.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\DictionaryPublishedContent.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\DomainCache.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedSnapshot.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedSnapshotService.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PreviewContent.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMemberCache.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\SafeXmlReaderWriter.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlStore.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlStoreFilePersister.cs" />
     <Compile Include="PublishedElementExtensions.cs" />
     <Compile Include="PublishedModels\DummyClassSoThatPublishedModelsNamespaceExists.cs" />
     <Compile Include="Routing\ContentFinderByUrl.cs" />
@@ -1023,7 +1014,6 @@
     <Compile Include="Models\PublishedContentBase.cs" />
     <Compile Include="Mvc\AreaRegistrationExtensions.cs" />
     <Compile Include="Mvc\QueryStringFilterAttribute.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedMediaCache.cs" />
     <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
     <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
     <Compile Include="Mvc\MemberAuthorizeAttribute.cs" />
@@ -1031,8 +1021,6 @@
     <Compile Include="Mvc\ControllerFactoryExtensions.cs" />
     <Compile Include="Mvc\IRenderMvcController.cs" />
     <Compile Include="Mvc\SurfaceRouteHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\RoutesCache.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\UmbracoContextCache.cs" />
     <Compile Include="Routing\UrlProviderMode.cs" />
     <Compile Include="Search\ExamineIndexModel.cs" />
     <Compile Include="Security\ValidateRequestAttempt.cs" />
@@ -1139,10 +1127,7 @@
     <Compile Include="UmbracoHelper.cs" />
     <Compile Include="Mvc\ViewContextExtensions.cs" />
     <Compile Include="Mvc\ViewDataContainerExtensions.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\PublishedContentCache.cs" />
     <Compile Include="Routing\PublishedContentNotFoundHandler.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedContent.cs" />
-    <Compile Include="PublishedCache\XmlPublishedCache\XmlPublishedProperty.cs" />
     <Compile Include="Mvc\Constants.cs" />
     <Compile Include="Mvc\IFilteredControllerFactory.cs" />
     <Compile Include="Mvc\MasterControllerFactory.cs" />
@@ -1194,7 +1179,6 @@
     <Compile Include="UmbracoWebService.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Editors\XmlDataIntegrityController.cs" />
     <Compile Include="WebViewPageExtensions.cs" />
   </ItemGroup>
   <ItemGroup>

From 2287c0e402e228836febdb123b7fce111421552b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 30 Jan 2019 08:24:47 +0100
Subject: [PATCH 163/421] #3645 - remove badge again in preview mode + added
 spinner

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 96 +++++++++----------
 .../src/preview/preview.controller.js         | 16 +++-
 2 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index fe657ae4700e..ed28a93caf03 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -937,7 +937,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -955,7 +955,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1170,7 +1170,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
       "dev": true
     },
     "array-sort": {
@@ -1216,7 +1216,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
       "dev": true
     },
     "asap": {
@@ -1269,7 +1269,7 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
       "dev": true
     },
     "asynckit": {
@@ -2379,7 +2379,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2459,7 +2459,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
       "dev": true
     },
     "continuable-cache": {
@@ -2502,7 +2502,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
       "dev": true
     },
     "core-util-is": {
@@ -3425,7 +3425,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3953,7 +3953,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -3989,7 +3989,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4153,7 +4153,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true,
           "optional": true
         }
@@ -4248,7 +4248,7 @@
     "eslint-scope": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4258,13 +4258,13 @@
     "eslint-utils": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
       "dev": true
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
       "dev": true
     },
     "espree": {
@@ -4287,7 +4287,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4296,7 +4296,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4356,7 +4356,7 @@
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
       "dev": true
     },
     "exec-buffer": {
@@ -4571,7 +4571,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -5891,7 +5891,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6461,7 +6461,7 @@
     "gulp-eslint": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
+      "integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
       "dev": true,
       "requires": {
         "eslint": "^5.0.1",
@@ -7415,7 +7415,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7566,7 +7566,7 @@
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
       "dev": true,
       "requires": {
         "eventemitter3": "^3.0.0",
@@ -7860,7 +7860,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -8155,7 +8155,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -8164,7 +8164,7 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
       "dev": true
     },
     "is-retry-allowed": {
@@ -8212,7 +8212,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8369,7 +8369,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -8496,7 +8496,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -9146,7 +9146,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -9327,7 +9327,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
       "dev": true
     },
     "minimatch": {
@@ -12855,7 +12855,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
       "dev": true
     },
     "posix-character-classes": {
@@ -13345,7 +13345,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
       "dev": true
     },
     "qs": {
@@ -13541,7 +13541,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14039,7 +14039,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
       "dev": true
     },
     "sax": {
@@ -14226,7 +14226,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
       "dev": true
     },
     "shebang-command": {
@@ -14516,7 +14516,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14796,7 +14796,7 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
+      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
       "dev": true
     },
     "stream-shift": {
@@ -14808,7 +14808,7 @@
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -14835,7 +14835,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -14850,7 +14850,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -14867,7 +14867,7 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
@@ -15409,7 +15409,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15573,7 +15573,7 @@
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -15615,7 +15615,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
       "dev": true
     },
     "unc-path-regex": {
@@ -15777,13 +15777,13 @@
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -16218,7 +16218,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",
diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 5eb985a58267..7d6584d2f1bc 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -134,9 +134,11 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         /* Change culture */
         /*****************************************************************************/
         $scope.changeCulture = function (culture) {
-          //  $scope.frameLoaded = false;
-            $location.search("culture", culture);
-            setPageUrl();
+            if($location.search().culture !== culture){
+                $scope.frameLoaded = false;
+                $location.search("culture", culture);
+                setPageUrl();
+            }
         };
         
     })
@@ -155,11 +157,19 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
 
             function iframeReady() {
                 var iframe = $element.find("#resultFrame").get(0);
+                hideUmbracoPreviewBadge(iframe);
                 angularHelper.safeApply($scope, function () {
                     vm.onLoaded({ iframe: iframe });
+                    $scope.frameLoaded = true;
                 });
             }
 
+            function hideUmbracoPreviewBadge (iframe) {
+                if (iframe && iframe.contentDocument && iframe.contentDocument.getElementById("umbracoPreviewBadge")) {
+                    iframe.contentDocument.getElementById("umbracoPreviewBadge").style.display = "none";
+                }
+            };
+
 
         },
         controllerAs: "vm",

From 7ba4fd7ad1e4841105f358cf22aea476d1842bbe Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 30 Jan 2019 08:35:19 +0100
Subject: [PATCH 164/421] Cleanup Umbraco module

---
 src/Umbraco.Core/RuntimeLevelReason.cs        |   5 +
 src/Umbraco.Core/RuntimeState.cs              |  21 +--
 .../Routing/Resources/Booting.html            |   9 --
 src/Umbraco.Web/Routing/Resources/Failed.html |   8 --
 .../Routing/Resources/HtmlPages.Designer.cs   |  99 --------------
 .../Routing/Resources/HtmlPages.resx          | 127 ------------------
 src/Umbraco.Web/Umbraco.Web.csproj            |  11 --
 src/Umbraco.Web/UmbracoInjectedModule.cs      |  33 +----
 8 files changed, 14 insertions(+), 299 deletions(-)
 delete mode 100644 src/Umbraco.Web/Routing/Resources/Booting.html
 delete mode 100644 src/Umbraco.Web/Routing/Resources/Failed.html
 delete mode 100644 src/Umbraco.Web/Routing/Resources/HtmlPages.Designer.cs
 delete mode 100644 src/Umbraco.Web/Routing/Resources/HtmlPages.resx

diff --git a/src/Umbraco.Core/RuntimeLevelReason.cs b/src/Umbraco.Core/RuntimeLevelReason.cs
index c10ac8b2064f..587334d03374 100644
--- a/src/Umbraco.Core/RuntimeLevelReason.cs
+++ b/src/Umbraco.Core/RuntimeLevelReason.cs
@@ -5,6 +5,11 @@
     /// </summary>
     public enum RuntimeLevelReason
     {
+        /// <summary>
+        /// The reason is unknown.
+        /// </summary>
+        Unknown,
+
         /// <summary>
         /// The code version is lower than the version indicated in web.config, and
         /// downgrading Umbraco is not supported.
diff --git a/src/Umbraco.Core/RuntimeState.cs b/src/Umbraco.Core/RuntimeState.cs
index b21c02fdb9a7..9ddbb0974877 100644
--- a/src/Umbraco.Core/RuntimeState.cs
+++ b/src/Umbraco.Core/RuntimeState.cs
@@ -25,7 +25,6 @@ internal class RuntimeState : IRuntimeState
         private readonly HashSet<string> _applicationUrls = new HashSet<string>();
         private readonly Lazy<IMainDom> _mainDom;
         private readonly Lazy<IServerRegistrar> _serverRegistrar;
-        private RuntimeLevel _level = RuntimeLevel.Unknown;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RuntimeState"/> class.
@@ -87,14 +86,10 @@ public RuntimeState(ILogger logger, IUmbracoSettingsSection settings, IGlobalSet
         public string FinalMigrationState { get; internal set; }
 
         /// <inheritdoc />
-        public RuntimeLevel Level
-        {
-            get => _level;
-            internal set { _level = value; if (value == RuntimeLevel.Run) _runLevel.Set(); }
-        }
+        public RuntimeLevel Level { get; internal set; } = RuntimeLevel.Unknown;
 
         /// <inheritdoc />
-        public RuntimeLevelReason Reason { get; internal set; }
+        public RuntimeLevelReason Reason { get; internal set; } = RuntimeLevelReason.Unknown;
 
         /// <summary>
         /// Ensures that the <see cref="ApplicationUrl"/> property has a value.
@@ -117,18 +112,6 @@ internal void EnsureApplicationUrl(HttpRequestBase request = null)
             ApplicationUrl = new Uri(ApplicationUrlHelper.GetApplicationUrl(_logger, _globalSettings, _settings, ServerRegistrar, request));
         }
 
-        private readonly ManualResetEventSlim _runLevel = new ManualResetEventSlim(false);
-
-        /// <summary>
-        /// Waits for the runtime level to become RuntimeLevel.Run.
-        /// </summary>
-        /// <param name="timeout">A timeout.</param>
-        /// <returns>True if the runtime level became RuntimeLevel.Run before the timeout, otherwise false.</returns>
-        internal bool WaitForRunLevel(TimeSpan timeout)
-        {
-            return _runLevel.WaitHandle.WaitOne(timeout);
-        }
-
         /// <inheritdoc />
         public BootFailedException BootFailedException { get; internal set; }
 
diff --git a/src/Umbraco.Web/Routing/Resources/Booting.html b/src/Umbraco.Web/Routing/Resources/Booting.html
deleted file mode 100644
index 7980301c6ad2..000000000000
--- a/src/Umbraco.Web/Routing/Resources/Booting.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-    <title>The website is restarting</title>
-</head>
-<body>
-    <h1>The website is restarting</h1>
-    <p>Please wait while we prepare to serve the page you have requested...</p>
-</body>
-</html>
diff --git a/src/Umbraco.Web/Routing/Resources/Failed.html b/src/Umbraco.Web/Routing/Resources/Failed.html
deleted file mode 100644
index 2f4856820dd3..000000000000
--- a/src/Umbraco.Web/Routing/Resources/Failed.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-    <title>The website cannot start</title>
-</head>
-<body>
-    <h1>The website failed to start :(</h1>
-</body>
-</html>
diff --git a/src/Umbraco.Web/Routing/Resources/HtmlPages.Designer.cs b/src/Umbraco.Web/Routing/Resources/HtmlPages.Designer.cs
deleted file mode 100644
index 206732265e6e..000000000000
--- a/src/Umbraco.Web/Routing/Resources/HtmlPages.Designer.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.Routing.Resources {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class HtmlPages {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal HtmlPages() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.Routing.Resources.HtmlPages", typeof(HtmlPages).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &lt;html&gt;
-        ///&lt;head&gt;
-        ///    &lt;title&gt;The website is restarting&lt;/title&gt;
-        ///&lt;/head&gt;
-        ///&lt;body&gt;
-        ///    &lt;h1&gt;The website is restarting&lt;/h1&gt;
-        ///    &lt;p&gt;Please wait while we prepare to serve the page you have requested...&lt;/p&gt;
-        ///&lt;/body&gt;
-        ///&lt;/html&gt;
-        ///.
-        /// </summary>
-        internal static string Booting {
-            get {
-                return ResourceManager.GetString("Booting", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &lt;html&gt;
-        ///&lt;head&gt;
-        ///    &lt;title&gt;The website is restarting&lt;/title&gt;
-        ///&lt;/head&gt;
-        ///&lt;body&gt;
-        ///    &lt;h1&gt;The website is restarting&lt;/h1&gt;
-        ///    &lt;p&gt;Please wait while we prepare to serve the page you have requested...&lt;/p&gt;
-        ///&lt;/body&gt;
-        ///&lt;/html&gt;
-        ///.
-        /// </summary>
-        internal static string Failed {
-            get {
-                return ResourceManager.GetString("Failed", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Routing/Resources/HtmlPages.resx b/src/Umbraco.Web/Routing/Resources/HtmlPages.resx
deleted file mode 100644
index ac636df30508..000000000000
--- a/src/Umbraco.Web/Routing/Resources/HtmlPages.resx
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Booting" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>booting.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
-  <data name="Failed" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>failed.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 91ffbe68b586..7c6cd630d13b 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -182,11 +182,6 @@
     <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
-    <Compile Include="Routing\Resources\HtmlPages.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>HtmlPages.resx</DependentUpon>
-    </Compile>
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />
@@ -1210,17 +1205,11 @@
     <EmbeddedResource Include="JavaScript\Main.js" />
     <EmbeddedResource Include="JavaScript\JsInitialize.js" />
     <EmbeddedResource Include="JavaScript\ServerVariables.js" />
-    <EmbeddedResource Include="Routing\Resources\HtmlPages.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>HtmlPages.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Routing\Resources\Failed.html" />
-    <EmbeddedResource Include="Routing\Resources\Booting.html" />
     <EmbeddedResource Include="JavaScript\PreviewInitialize.js" />
     <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
     <Content Include="PublishedCache\NuCache\notes.txt" />
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 6da3f90ed95d..95819e79d7c3 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -257,37 +257,18 @@ private bool EnsureDocumentRequest(HttpContextBase httpContext, Uri uri)
 
         private bool EnsureRuntime(HttpContextBase httpContext, Uri uri)
         {
-            var debug = _runtime.Debug;
             var level = _runtime.Level;
             switch (level)
             {
+                // we should never handle Unknown nor Boot: the runtime boots in Application_Start
+                // and as long as it has not booted, no request other than the initial request is
+                // going to be served (see https://stackoverflow.com/a/21402100)
+                // we should never handle BootFailed: if boot failed, the pipeline should not run
+                // at all
                 case RuntimeLevel.Unknown:
                 case RuntimeLevel.Boot:
-                    // not ready yet, but wait
-                    ReportRuntime(level, "Umbraco is booting.");
-
-                    // let requests pile up and wait for 10s then show the splash anyway
-                    //fixme: Do we want this for some insane reason? no other site in history has this
-                    if (((RuntimeState) _runtime).WaitForRunLevel(TimeSpan.FromSeconds(10))) return true;
-
-                    // redirect to booting page
-                    httpContext.Response.StatusCode = 503; // temp not available
-                    var bootHtml = Routing.Resources.HtmlPages.Booting;
-                    httpContext.Response.AddHeader("Retry-After", debug ? "1" : "30"); // seconds
-                    httpContext.Response.Write(bootHtml);
-                    httpContext.Response.Flush();
-                    return false; // cannot serve content
-
                 case RuntimeLevel.BootFailed:
-                    // redirect to death page
-                    ReportRuntime(level, "Umbraco has failed.");
-
-                    httpContext.Response.StatusCode = 503; // temp not available
-                    var deathHtml = Routing.Resources.HtmlPages.Failed;
-                    httpContext.Response.AddHeader("Retry-After", debug ? "1" : "300"); // seconds
-                    httpContext.Response.Write(deathHtml);
-                    httpContext.Response.Flush();
-                    return false; // cannot serve content
+                    throw new Exception($"panic: Unexpected runtime level: {level}.");
 
                 case RuntimeLevel.Run:
                     // ok
@@ -303,7 +284,7 @@ private bool EnsureRuntime(HttpContextBase httpContext, Uri uri)
                     return false; // cannot serve content
 
                 default:
-                    throw new NotSupportedException($"Unexpected runtime level: {Current.RuntimeState.Level}.");
+                    throw new NotSupportedException($"Unexpected runtime level: {level}.");
             }
         }
 

From 6c0321ce72959877e611ced85a1cff8ca41dec33 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 19:48:42 +1100
Subject: [PATCH 165/421] Fixing trees regression issue

---
 .../FormDataCollectionExtensions.cs           | 19 +++++++++++++++++++
 .../Trees/ApplicationTreeController.cs        | 10 +++++-----
 .../Trees/ContentTreeControllerBase.cs        |  2 +-
 src/Umbraco.Web/Trees/MemberTreeController.cs |  4 ++--
 .../Trees/TemplatesTreeController.cs          |  2 +-
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web/FormDataCollectionExtensions.cs b/src/Umbraco.Web/FormDataCollectionExtensions.cs
index 95c418525aa5..52f86dcc5918 100644
--- a/src/Umbraco.Web/FormDataCollectionExtensions.cs
+++ b/src/Umbraco.Web/FormDataCollectionExtensions.cs
@@ -81,5 +81,24 @@ public static T GetValue<T>(this FormDataCollection items, string key)
                 ? converted.Result
                 : default(T);
         }
+
+        /// <summary>
+        /// Returns the object based in the collection based on it's key. This does this with a conversion so if it doesn't convert or the query string is no there an exception is thrown
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="items"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static T GetRequiredValue<T>(this FormDataCollection items, string key)
+        {
+            var val = items.Get(key);
+            if (string.IsNullOrEmpty(val))
+                throw new InvalidOperationException($"The required query string parameter {key} is missing");
+
+            var converted = val.TryConvertTo<T>();
+            return converted.Success
+                ? converted.Result
+                : throw new InvalidOperationException($"The required query string parameter {key} cannot be converted to type {typeof(T)}");
+        }
     }
 }
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 28bc464d550c..605d5e435284 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -47,11 +47,11 @@ public ApplicationTreeController(IGlobalSettings globalSettings, UmbracoContext
         /// </summary>
         /// <param name="application">The application to load tree for</param>
         /// <param name="tree">An optional single tree alias, if specified will only load the single tree for the request app</param>
-        /// <param name="querystring"></param>
+        /// <param name="queryStrings"></param>
         /// <param name="use">Tree use.</param>
         /// <returns></returns>
         [HttpQueryStringFilter("queryStrings")]
-        public async Task<TreeRootNode> GetApplicationTrees(string application, string tree, FormDataCollection querystring, TreeUse use = TreeUse.Main)
+        public async Task<TreeRootNode> GetApplicationTrees(string application, string tree, FormDataCollection queryStrings, TreeUse use = TreeUse.Main)
         {
             application = application.CleanForXss();
 
@@ -75,7 +75,7 @@ public async Task<TreeRootNode> GetApplicationTrees(string application, string t
                 if (t == null)
                     throw new HttpResponseException(HttpStatusCode.NotFound);
 
-                var treeRootNode = await GetTreeRootNode(t, Constants.System.Root, querystring);
+                var treeRootNode = await GetTreeRootNode(t, Constants.System.Root, queryStrings);
                 if (treeRootNode != null)
                     return treeRootNode;
 
@@ -89,7 +89,7 @@ public async Task<TreeRootNode> GetApplicationTrees(string application, string t
                 var nodes = new TreeNodeCollection();
                 foreach (var t in allTrees)
                 {
-                    var node = await TryGetRootNode(t, querystring);
+                    var node = await TryGetRootNode(t, queryStrings);
                     if (node != null)
                         nodes.Add(node);
                 }
@@ -115,7 +115,7 @@ public async Task<TreeRootNode> GetApplicationTrees(string application, string t
                 var nodes = new TreeNodeCollection();
                 foreach (var t in trees)
                 {
-                    var node = await TryGetRootNode(t, querystring);
+                    var node = await TryGetRootNode(t, queryStrings);
                     if (node != null)
                         nodes.Add(node);
                 }
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index bd35fd665f57..ca2f2031bb8f 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -281,7 +281,7 @@ protected sealed override TreeNodeCollection GetTreeNodes(string id, FormDataCol
                         Services.TextService.Localize("general/recycleBin"),
                         "icon-trash",
                         RecycleBinSmells,
-                        queryStrings.GetValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/recyclebin"));
+                        queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/recyclebin"));
 
                 }
 
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index 03c68dd67a97..430c5d21114e 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -125,14 +125,14 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
             {
                 nodes.Add(
                         CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, Services.TextService.Localize("member/allMembers"), "icon-users", true,
-                            queryStrings.GetValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + Constants.Conventions.MemberTypes.AllMembersListId));
+                            queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + Constants.Conventions.MemberTypes.AllMembersListId));
 
                 if (_isUmbracoProvider)
                 {
                     nodes.AddRange(Services.MemberTypeService.GetAll()
                         .Select(memberType =>
                             CreateTreeNode(memberType.Alias, id, queryStrings, memberType.Name, "icon-users", true,
-                                queryStrings.GetValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + memberType.Alias)));
+                                queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + memberType.Alias)));
                 }
             }
 
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index 79a59435a0ae..916e5d4b4d1f 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -75,7 +75,7 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
 
             //Create the normal create action
             var item = menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
-            item.NavigateToRoute($"{queryStrings.GetValue<string>("application")}/templates/edit/{id}?create=true");
+            item.NavigateToRoute($"{queryStrings.GetRequiredValue<string>("application")}/templates/edit/{id}?create=true");
 
             if (id == Constants.System.Root.ToInvariantString())
             {

From 6ff787046b595c9b19e4d18fd588f039766173e9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 19:52:24 +1100
Subject: [PATCH 166/421] Fixing trees regression issue

---
 src/Umbraco.Web/Trees/LogViewerTreeController.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web/Trees/LogViewerTreeController.cs b/src/Umbraco.Web/Trees/LogViewerTreeController.cs
index 3d9490b9a060..7452828d0091 100644
--- a/src/Umbraco.Web/Trees/LogViewerTreeController.cs
+++ b/src/Umbraco.Web/Trees/LogViewerTreeController.cs
@@ -9,6 +9,7 @@ namespace Umbraco.Web.Trees
     [UmbracoTreeAuthorize(Constants.Trees.LogViewer)]
     [Tree(Constants.Applications.Settings, Constants.Trees.LogViewer, SortOrder= 9, TreeGroup = Constants.Trees.Groups.Settings)]
     [PluginController("UmbracoTrees")]
+    [CoreTree]
     public class LogViewerTreeController : TreeController
     {
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)

From bf7372c6ba8c3cc26fb1b4a55eee23fefff5133b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 30 Jan 2019 10:16:32 +0100
Subject: [PATCH 167/421] V8: Color corrections for several components

---
 .../src/less/components/html/umb-alert.less   |  2 +-
 .../src/less/components/umb-grid.less         | 39 ++++++++++---------
 .../less/components/umb-group-builder.less    |  2 +-
 .../src/less/components/umb-lightbox.less     |  8 +++-
 .../less/components/umb-load-indicator.less   |  6 +--
 .../less/components/umb-nested-content.less   |  6 +--
 .../src/less/components/umb-node-preview.less |  8 ++--
 .../src/less/components/umb-packages.less     | 15 ++++---
 .../src/less/components/umb-querybuilder.less |  8 ++--
 .../src/less/components/umb-range-slider.less |  3 +-
 .../src/less/components/umb-sub-views.less    |  3 +-
 .../src/less/components/umb-tabs.less         |  2 +-
 .../src/less/dashboards.less                  |  2 +-
 .../src/less/gridview.less                    | 16 ++++----
 .../src/less/healthcheck.less                 |  2 +-
 src/Umbraco.Web.UI.Client/src/less/main.less  |  4 +-
 .../src/less/variables.less                   |  4 +-
 17 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
index 934992fc6e1b..133f9da35836 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
@@ -1,7 +1,7 @@
 .umb-alert {
     padding: 15px;
     box-sizing: border-box;
-    background-color: @turquoise-washed;
+    background-color: @blueLight;
     border: 1px solid @blueMid; 
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 9dc6aa1906ae..e7f24d08fa1d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -15,7 +15,7 @@
 // sortable-helper
 .umb-grid .ui-sortable-helper {
     position: absolute !important;
-    background-color: @turquoise !important;
+    background-color: @blueMid !important;
     height: 42px !important;
     width: 42px !important;
     overflow: hidden;
@@ -47,7 +47,7 @@
     position: absolute;
     left: 0;
     right: 0;
-    background-color: @turquoise;
+    background-color: @blueMid;
     height: 2px;
     margin-bottom: 20px;
 
@@ -56,7 +56,7 @@
         top: -9px;
         font-family: "icomoon";
         font-size: 18px;
-        color: @turquoise;
+        color: @blueMid;
     }
 
     &:before {
@@ -169,7 +169,7 @@
     transition: border-color 100ms linear;
 
     &:hover {
-        border-color: @turquoise;
+        border-color: @blueMid;
         cursor: pointer;
     }
 }
@@ -202,13 +202,14 @@
     cursor: pointer;
     float: right;
     &:hover {
-        color: @turquoise-d1;
+        color: @ui-action-type-hover;
     }
 }
 
 .umb-grid .cell-tools-add {
-    color: @turquoise-d1;
+    color: @ui-action-type;
     &:focus, &:hover {
+        color: @ui-action-type-hover;
         text-decoration: none;
     }
 }
@@ -218,7 +219,7 @@
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    color: @turquoise-d1;
+    color: @ui-action-type;
 }
 
 .umb-grid .cell-tools-add.-bar {
@@ -306,7 +307,7 @@
 }
 
 .umb-control-collapsed:hover {
-    border-color: @turquoise;
+    border-color: @ui-action-border-hover
 }
 
 .umb-grid .umb-control-click-overlay {
@@ -319,7 +320,7 @@
     opacity: 0;
     cursor: pointer;
     &:hover {
-        background-color: @turquoise;
+        background-color: @ui-action-type-hover;
         opacity: 0.1;
         transition: opacity 0.1s;
     }
@@ -411,7 +412,7 @@
 
 // Row states
 .umb-grid .umb-row.-active {
-    background-color: @turquoise-d1;
+    background-color: @ui-action-type;
 
     .umb-row-title-bar {
         cursor: move;
@@ -474,7 +475,7 @@
 
     .umb-cell-content.-has-editors {
         box-shadow: 3px 3px 6px rgba(0, 0, 0, .07);
-        border-color: @turquoise;
+        border-color: @ui-action-border;
     }
 }
 
@@ -577,9 +578,9 @@
     margin: 2px;
 
     &:hover, &:hover * {
-        background: @turquoise !important;
+        background: @ui-action-type-hover !important;
         color: @white !important;
-        border-color: @turquoise !important;
+        border-color: @ui-action-type-hover !important;
         text-decoration: none;
     }
 }
@@ -709,7 +710,7 @@
 }
 
 .umb-grid .umb-control.-active {
-    border-color: @turquoise;
+    border-color: @ui-action-border;
 }
 
 .umb-grid .umb-templates-columns {
@@ -722,7 +723,7 @@
 
 .umb-grid .umb-control-bar {
     opacity: 0;
-    background: @turquoise;
+    background: @ui-action-type;
     padding: 2px 5px;
     color: @white;
     font-size: 12px;
@@ -775,7 +776,7 @@
 }
 
 .umb-grid .umb-templates-template a.tb:hover {
-    border: 5px solid @turquoise;
+    border: 5px solid @blueMid;
 }
 
 .umb-grid .umb-templates-template .tb {
@@ -805,7 +806,7 @@
 
 .umb-grid a.umb-templates-column:hover,
 .umb-grid a.umb-templates-column.selected {
-    background-color: @turquoise;
+    background-color: @blueMid;
 }
 
 
@@ -855,7 +856,7 @@
         }
 
         &:hover {
-            border-color: @turquoise;
+            border-color: @blueMid;
             cursor: pointer;
         }
 
@@ -997,7 +998,7 @@
     font-size: 12px;
 
     &:hover, &:hover * {
-        background: @turquoise;
+        background: @blueMid;
         color: @white;
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 33df17c75452..331fd9eb661d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -93,7 +93,7 @@
 }
 
 .umb-group-builder__group-title.-active {
-  border-color: @turquoise;
+  border-color: @blueMid;
 }
 
 .umb-group-builder__group-title.-placeholder {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
index dca263ea0c24..96636a309666 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
@@ -64,6 +64,11 @@
     justify-content: center;
     cursor: pointer;
     position: absolute;
+    &:hover {
+        .umb-lightbox__control-icon, &::before {
+            color: @ui-active-type-hover;
+        }
+    }
 }
 
 .umb-lightbox__control.-next {
@@ -79,6 +84,7 @@
 }
 
 .umb-lightbox__control-icon {
-    color: @turquoise;
+    color: @ui-active-type;
     font-size: 20px;
+    
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less
index 38e0b643a21a..7960ff860300 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less
@@ -20,7 +20,7 @@
    margin: 0;
    height: 6px;
    width: 6px;
-   border: 2px solid @turquoise-d1;
+   border: 2px solid @blueMid;
    border-radius: 100%;
    transform: transformZ(0);
    animation: umbLoadIndicatorAnimation 1.4s infinite;
@@ -44,7 +44,7 @@
 @keyframes umbLoadIndicatorAnimation {
   0%   {
     transform: scale(0.5);
-    background: @turquoise-d1;
+    background: @blueMid;
   }
   50%   {
     transform: scale(1);
@@ -52,6 +52,6 @@
   }
   100% {
     transform: scale(0.5);
-    background: @turquoise-d1;
+    background: @blueMid;
   }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 6ddd9d8d50a5..631ef5c2bd98 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -131,8 +131,8 @@
 .umb-nested-content__icon--active
 {
     color: @white;
-    background: @turquoise-d1;
-    border-color: @turquoise-d1;
+    background: @blueMid;
+    border-color: @blueMid;
     text-decoration: none;
 }
 
@@ -224,4 +224,4 @@
     .umb-textarea, .umb-textstring {
         width:100%;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 5b27206fc27f..b054ddf90779 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -89,16 +89,16 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    border: 1px dashed @gray-7;
-    color: @ui-action-type;
+    border: 1px dashed @ui-action-disgrete-border;
+    color: @ui-action-disgrete-type;
     font-weight: bold;
     padding: 5px 15px;
     box-sizing: border-box;
 }
 
 .umb-node-preview-add:hover {
-    color: @ui-action-type-hover;
-    border-color: @ui-action-type-hover;
+    color: @ui-action-disgrete-type-hover;
+    border-color: @ui-action-disgrete-border-hover;
     text-decoration: none;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
index a517605c4a87..45170c9602a0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
@@ -73,7 +73,7 @@
     box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
 
     &:hover {
-        border-color: @turquoise;
+        border-color: @blueMid;
     }
 }
 
@@ -236,10 +236,13 @@
 }
 
 
-.umb-packages-category:hover,
-.umb-packages-category.-active {
+.umb-packages-category:hover {
+    color: @ui-active-type-hover;
     text-decoration: none;
-    color: @turquoise;
+}
+.umb-packages-category.-active {
+    color: @ui-active-type;
+    background-color: @ui-active;
 }
 
 .umb-packages-category.-first {
@@ -403,7 +406,7 @@ a.umb-package-details__back-link {
 
 .umb-gallery__thumbnail {
     flex: 0 1 100px;
-    border: 1px solid @gray-8;
+    border: 1px solid @ui-action-disgrete-border;
     border-radius: 3px;
     margin: 5px;
     padding: 10px;
@@ -413,7 +416,7 @@ a.umb-package-details__back-link {
 
 .umb-gallery__thumbnail:hover {
     cursor: pointer;
-    border-color: @turquoise;
+    border-color: @ui-action-disgrete-border-hover;
 }
 
 /* PACKAGE LIST */
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-querybuilder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-querybuilder.less
index 151415f0db4d..4d6054009fc2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-querybuilder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-querybuilder.less
@@ -7,8 +7,8 @@
     padding: 5px 8px;
     margin: 0 5px;
     font-weight: bold;
-    background-color: @turquoise-washed;
-    border: 1px solid @turquoise-l1;
+    background-color: @ui-action;
+    border: 1px solid @ui-action-border;
     border-radius: 3px;
     text-align: center;
     display: inline-block;
@@ -16,8 +16,8 @@
 }
 
 .umb-querybuilder .row a.btn:hover {
-    background-color: @turquoise-washed;
-    border: 1px solid @turquoise-d1;
+    background-color: @ui-action-hover;
+    border: 1px solid @ui-action-border-hover;
     text-decoration: none;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-range-slider.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-range-slider.less
index 1c21c5a14838..1461d0f22332 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-range-slider.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-range-slider.less
@@ -14,7 +14,7 @@
     box-shadow: none;
     width: 20px !important;
     height: 20px !important;
-    background-color: @turquoise;
+    background-color: @blueMid;
 }
 
 .umb-range-slider .noUi-handle::before {
@@ -36,4 +36,3 @@
 .umb-range-slider .noUi-marker.noUi-marker-horizontal {
     width: 1px;
 }
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-sub-views.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-sub-views.less
index 6c64787d235e..d3ce3683564a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-sub-views.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-sub-views.less
@@ -21,7 +21,7 @@
       margin-left: 15px;
       &.is-active {
         .btn-link {
-          color: @turquoise-d1 !important;
+          color: @blueMid !important;
         }
       }
     }
@@ -37,4 +37,3 @@
   }
 
 }
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
index f22d8b3a165a..ee784787fa4c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
@@ -91,7 +91,7 @@
 }
 
 .umb-tabs-tray-item--active {
-    border-left: 2px solid @turquoise;
+    border-left: 2px solid @ui-active;
 }
 
 .umb-tab--expand > a > i {
diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards.less b/src/Umbraco.Web.UI.Client/src/less/dashboards.less
index 0ddef2e8b123..7bf38e15830e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/dashboards.less
@@ -95,7 +95,7 @@
 		}
 
 		.video_player video:hover + .video-controls .progress-bar, .video-controls:hover .progress-bar {
-			background: @turquoise-d1;
+			background: @blueMid;
 		}
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less
index 6240c8c36577..469ab2becf15 100644
--- a/src/Umbraco.Web.UI.Client/src/less/gridview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less
@@ -249,11 +249,11 @@
 }
 
 .usky-grid .infohighlight, .usky-grid  .td.last.infohighlight{
-     border: 1px dashed @turquoise !important;
+     border: 1px dashed @blueMid !important;
 }
 
 .usky-grid .warnhighlight > ins.item-label{border-color: @red; color: @red;}
-.usky-grid .infohighlight > ins.item-label{border-color: @turquoise; color: @turquoise;}
+.usky-grid .infohighlight > ins.item-label{border-color: @blueMid; color: @blueMid;}
 
 
 .usky-grid ins.item-label {
@@ -395,9 +395,9 @@
   }
 
  .usky-grid .iconBox:hover, .usky-grid .iconBox:hover *{
-          background: @turquoise !important;
+          background: @blueMid !important;
           color: @white !important;
-          border-color: @turquoise !important;
+          border-color: @blueMid !important;
           text-decoration:none;
  }
 
@@ -589,7 +589,7 @@
  }
 
  .usky-grid .uSky-templates-template a.tb:hover {
-     border:5px solid @turquoise;
+     border:5px solid @blueMid;
  }
 
  .usky-grid .uSky-templates-template .tb {
@@ -618,7 +618,7 @@
  }
 
  .usky-grid a.uSky-templates-column:hover, .usky-grid a.uSky-templates-column.selected{
-    background-color: @turquoise;
+    background-color: @blueMid;
  }
 
 
@@ -672,7 +672,7 @@
         }
 
 		&:hover {
-			border-color: @turquoise;
+			border-color: @blueMid;
 			cursor: pointer;
 		}
 
@@ -802,7 +802,7 @@
  }
 
  .usky-grid .elements li:hover, .usky-grid .elements li:hover *{
-     background: @turquoise;
+     background: @blueMid;
      color: @white;
  }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less
index 9e1362d50a96..23bbbf493165 100644
--- a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less
+++ b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less
@@ -133,7 +133,7 @@
 }
 
 .umb-healthcheck-group__details-group-title {
-	background-color: @purple-l1;
+	background-color: @blueExtraDark;
 	padding: 10px 20px;
 	display: flex;
 	align-items: center;
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index b363170ebc70..bf30b267771f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -51,10 +51,10 @@ h5.-black {
   width: auto !important;
     td {
         &.active, span.active {
-            background: @turquoise !important;
+            background: @blueMid !important;
         }
         &.today:not(.active):before {
-            border-bottom-color: @purple-l1 !important;
+            border-bottom-color: @pinkLight !important;
         }
         a[data-action] {
             padding: 0 !important;
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 8add7c9002d0..e66c3de59734 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -162,9 +162,9 @@
 
 @ui-action-disgrete:              white;
 @ui-action-disgrete-hover:        @sand-7;
-@ui-action-disgrete-type:         @gray-4;
+@ui-action-disgrete-type:         @blueExtraDark;
 @ui-action-disgrete-type-hover:   @blueMid;
-@ui-action-disgrete-border:         @gray-4;
+@ui-action-disgrete-border:         @gray-7;
 @ui-action-disgrete-border-hover:   @blueMid;
 
 @type-white:                      @white;

From c213408b925dd827777b7feb2f77b32b0f63ef2c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 20:24:42 +1100
Subject: [PATCH 168/421] Changes OperatorFactory to internal

---
 .../Models/TemplateQuery/OperatorFactory.cs   |  4 +-
 .../Models/TemplateQuery/QueryCondition.cs    | 73 +------------------
 2 files changed, 3 insertions(+), 74 deletions(-)

diff --git a/src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs b/src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs
index 0b595723f154..0bae72186a05 100644
--- a/src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs
+++ b/src/Umbraco.Web/Models/TemplateQuery/OperatorFactory.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Web.Models.TemplateQuery
 {
-    public static class OperatorFactory
+    internal static class OperatorFactory
     {
         public static Operator FromString(string stringOperator)
         {
@@ -29,4 +29,4 @@ public static Operator FromString(string stringOperator)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs b/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
index a58badcf2cf4..27cf901e494b 100644
--- a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
+++ b/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Reflection;
+using System.Collections.Generic;
 using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Web.Models.TemplateQuery
@@ -12,72 +9,4 @@ public class QueryCondition
         public OperatorTerm Term { get; set; }
         public string ConstraintValue { get; set; }
     }
-
-    internal static class QueryConditionExtensions
-    {
-        private static Lazy<MethodInfo> StringContainsMethodInfo =>
-            new Lazy<MethodInfo>(() => typeof(string).GetMethod("Contains", new[] {typeof(string)}));
-
-        public static Expression<Func<T, bool>> BuildCondition<T>(this QueryCondition condition, string parameterAlias)
-        {
-            object constraintValue;
-            switch (condition.Property.Type.ToLowerInvariant())
-            {
-                case "string":
-                    constraintValue = condition.ConstraintValue;
-                    break;
-                case "datetime":
-                    constraintValue = DateTime.Parse(condition.ConstraintValue);
-                    break;
-                case "boolean":
-                    constraintValue = Boolean.Parse(condition.ConstraintValue);
-                    break;
-                default:
-                    constraintValue = Convert.ChangeType(condition.ConstraintValue, typeof(int));
-                    break;
-            }
-
-            var parameterExpression = Expression.Parameter(typeof(T), parameterAlias);
-            var propertyExpression = Expression.Property(parameterExpression, condition.Property.Alias);
-
-            var valueExpression = Expression.Constant(constraintValue);
-            Expression bodyExpression;
-            switch (condition.Term.Operator)
-            {
-                case Operator.NotEquals:
-                    bodyExpression = Expression.NotEqual(propertyExpression, valueExpression);
-                    break;
-                case Operator.GreaterThan:
-                    bodyExpression = Expression.GreaterThan(propertyExpression, valueExpression);
-                    break;
-                case Operator.GreaterThanEqualTo:
-                    bodyExpression = Expression.GreaterThanOrEqual(propertyExpression, valueExpression);
-                    break;
-                case Operator.LessThan:
-                    bodyExpression = Expression.LessThan(propertyExpression, valueExpression);
-                    break;
-                case Operator.LessThanEqualTo:
-                    bodyExpression = Expression.LessThanOrEqual(propertyExpression, valueExpression);
-                    break;
-                case Operator.Contains:
-                    bodyExpression = Expression.Call(propertyExpression, StringContainsMethodInfo.Value,
-                        valueExpression);
-                    break;
-                case Operator.NotContains:
-                    var tempExpression = Expression.Call(propertyExpression, StringContainsMethodInfo.Value,
-                        valueExpression);
-                    bodyExpression = Expression.Equal(tempExpression, Expression.Constant(false));
-                    break;
-                default:
-                case Operator.Equals:
-                    bodyExpression = Expression.Equal(propertyExpression, valueExpression);
-                    break;
-            }
-
-            var predicate =
-                Expression.Lambda<Func<T, bool>>(bodyExpression.Reduce(), parameterExpression);
-
-            return predicate;
-        }
-    }
 }

From 7bb0eb109abd38db2759331f08ce137c18e5a916 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 20:31:44 +1100
Subject: [PATCH 169/421] moves class to separate file

---
 .../TemplateQuery/QueryConditionExtensions.cs | 74 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 2 files changed, 75 insertions(+)
 create mode 100644 src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs

diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs b/src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs
new file mode 100644
index 000000000000..f01d247b1f59
--- /dev/null
+++ b/src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace Umbraco.Web.Models.TemplateQuery
+{
+    internal static class QueryConditionExtensions
+    {
+        private static Lazy<MethodInfo> StringContainsMethodInfo =>
+            new Lazy<MethodInfo>(() => typeof(string).GetMethod("Contains", new[] {typeof(string)}));
+
+        public static Expression<Func<T, bool>> BuildCondition<T>(this QueryCondition condition, string parameterAlias)
+        {
+            object constraintValue;
+            switch (condition.Property.Type.ToLowerInvariant())
+            {
+                case "string":
+                    constraintValue = condition.ConstraintValue;
+                    break;
+                case "datetime":
+                    constraintValue = DateTime.Parse(condition.ConstraintValue);
+                    break;
+                case "boolean":
+                    constraintValue = Boolean.Parse(condition.ConstraintValue);
+                    break;
+                default:
+                    constraintValue = Convert.ChangeType(condition.ConstraintValue, typeof(int));
+                    break;
+            }
+
+            var parameterExpression = Expression.Parameter(typeof(T), parameterAlias);
+            var propertyExpression = Expression.Property(parameterExpression, condition.Property.Alias);
+
+            var valueExpression = Expression.Constant(constraintValue);
+            Expression bodyExpression;
+            switch (condition.Term.Operator)
+            {
+                case Operator.NotEquals:
+                    bodyExpression = Expression.NotEqual(propertyExpression, valueExpression);
+                    break;
+                case Operator.GreaterThan:
+                    bodyExpression = Expression.GreaterThan(propertyExpression, valueExpression);
+                    break;
+                case Operator.GreaterThanEqualTo:
+                    bodyExpression = Expression.GreaterThanOrEqual(propertyExpression, valueExpression);
+                    break;
+                case Operator.LessThan:
+                    bodyExpression = Expression.LessThan(propertyExpression, valueExpression);
+                    break;
+                case Operator.LessThanEqualTo:
+                    bodyExpression = Expression.LessThanOrEqual(propertyExpression, valueExpression);
+                    break;
+                case Operator.Contains:
+                    bodyExpression = Expression.Call(propertyExpression, StringContainsMethodInfo.Value,
+                        valueExpression);
+                    break;
+                case Operator.NotContains:
+                    var tempExpression = Expression.Call(propertyExpression, StringContainsMethodInfo.Value,
+                        valueExpression);
+                    bodyExpression = Expression.Equal(tempExpression, Expression.Constant(false));
+                    break;
+                default:
+                case Operator.Equals:
+                    bodyExpression = Expression.Equal(propertyExpression, valueExpression);
+                    break;
+            }
+
+            var predicate =
+                Expression.Lambda<Func<T, bool>>(bodyExpression.Reduce(), parameterExpression);
+
+            return predicate;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c399f3f3aee9..9bce93b0fff0 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -182,6 +182,7 @@
     <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
+    <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />

From 90eae73d9bfd4712155828cc1004716f9f227cd9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 20:33:14 +1100
Subject: [PATCH 170/421] By default allow all trees to support both main and
 dialog usages

---
 src/Umbraco.Web/Trees/TreeAttribute.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Trees/TreeAttribute.cs b/src/Umbraco.Web/Trees/TreeAttribute.cs
index 5b51d8605e65..56de7023f8a4 100644
--- a/src/Umbraco.Web/Trees/TreeAttribute.cs
+++ b/src/Umbraco.Web/Trees/TreeAttribute.cs
@@ -40,7 +40,7 @@ public TreeAttribute(string sectionAlias, string treeAlias)
         /// <summary>
         /// Gets the usage of the tree.
         /// </summary>
-        public TreeUse TreeUse { get; set; } = TreeUse.Main;
+        public TreeUse TreeUse { get; set; } = TreeUse.Main | TreeUse.Dialog;
 
         /// <summary>
         /// Gets or sets the tree icon when closed.

From 0cdccc1a9be6b631d0d684ad6f556433a94cce93 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Wed, 30 Jan 2019 22:01:57 +1100
Subject: [PATCH 171/421] V8: Removing legacy content tree menu items (#4278)

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  1 +
 src/Umbraco.Web/Models/Trees/MenuItem.cs      | 41 +++-------
 .../Trees/ContentTreeController.cs            | 20 +++--
 .../Trees/LegacyTreeDataConverter.cs          | 76 -------------------
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 5 files changed, 24 insertions(+), 115 deletions(-)
 delete mode 100644 src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 600bfc9775f3..38f43f344f3f 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -166,6 +166,7 @@
     <Content Include="Umbraco\Config\Lang\cs.xml" />
     <Content Include="Umbraco\Config\Lang\tr.xml" />
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
+    <Content Include="Config\Splashes\noNodes.aspx" />
     <Content Include="Umbraco\Install\Views\Web.config" />
     <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
     <None Include="Config\ClientDependency.Release.config">
diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs
index 9dd5524f765e..9d4c76eea125 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItem.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs
@@ -3,11 +3,8 @@
 using Umbraco.Web.Trees;
 using System.Collections.Generic;
 using Umbraco.Core;
-using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Services;
 using Umbraco.Web.Actions;
-using Umbraco.Web.Composing;
-
 
 namespace Umbraco.Web.Models.Trees
 {
@@ -157,7 +154,7 @@ public void ExecuteJsMethod(string jsToExecute)
         public void LaunchDialogView(string view, string dialogTitle)
         {
             SetDialogTitle(dialogTitle);
-            AdditionalData[ActionViewKey] = view;
+            SetActionView(view);
         }
 
         /// <summary>
@@ -186,6 +183,15 @@ private void SetDialogTitle(string dialogTitle)
             AdditionalData[DialogTitleKey] = dialogTitle;
         }
 
+        /// <summary>
+        /// Configures the menu item to launch a specific view
+        /// </summary>
+        /// <param name="view"></param>
+        private void SetActionView(string view)
+        {
+            AdditionalData[ActionViewKey] = view;
+        }
+
         /// <summary>
         /// Configures the menu item to launch a URL with the specified action (dialog or new window)
         /// </summary>
@@ -197,33 +203,6 @@ private void SetActionUrl(string url, ActionUrlMethod method = ActionUrlMethod.D
             AdditionalData[ActionUrlMethodKey] = method;
         }
 
-        internal void ConvertLegacyMenuItem(IUmbracoEntity item, string nodeType, string currentSection)
-        {
-            // try to get a URL/title from the legacy action,
-            // in some edge cases, item can be null so we'll just convert those to "-1" and "" for id and name since these edge cases don't need that.
-            var attempt = LegacyTreeDataConverter.GetUrlAndTitleFromLegacyAction(Action,
-                item == null ? "-1" : item.Id.ToInvariantString(),
-                nodeType,
-                item == null ? "" : item.Name, currentSection);
-            if (attempt)
-            {
-                var action = attempt.Result;
-                LaunchDialogUrl(action.Url, action.DialogTitle);
-            }
-            else
-            {
-                // if that doesn't work, try to get the legacy confirm view
-                var attempt2 = LegacyTreeDataConverter.GetLegacyConfirmView(Action);
-                if (attempt2)
-                {
-                    var view = attempt2.Result;
-                    var textService = Current.Services.TextService;
-                    LaunchDialogView(view, textService.Localize("defaultdialogs/confirmdelete") + " '" + (item == null ? "" : item.Name) + "' ?");
-                }
-            }
-        }
-
         #endregion
-
     }
 }
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 1609e966e581..b90e1964b8e1 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -214,7 +214,9 @@ protected override IEnumerable<IEntitySlim> GetChildEntities(string id, FormData
 
             // set names according to variations
             foreach (var entity in result)
+            {
                 EnsureName(entity, cultureVal);
+            }
 
             return result;
         }
@@ -235,7 +237,8 @@ protected MenuItemCollection GetAllNodeMenuItems(IUmbracoEntity item)
             AddActionNode<ActionSort>(item, menu, true);
             AddActionNode<ActionAssignDomain>(item, menu, opensDialog: true);
             AddActionNode<ActionRights>(item, menu, opensDialog: true);
-            AddActionNode<ActionProtect>(item, menu, true, convert: true, opensDialog: true);
+            AddActionNode<ActionProtect>(item, menu, true, opensDialog: true);
+
             if (EmailSender.CanSendRequiredEmail)
             {
 	            menu.Items.Add(new MenuItem("notify", Services.TextService)
@@ -267,7 +270,6 @@ protected MenuItemCollection GetNodeMenuItemsForDeletedContent(IUmbracoEntity it
 
             return menu;
         }
-
         
         /// <summary>
         /// set name according to variations
@@ -279,12 +281,17 @@ private void EnsureName(IEntitySlim entity, string culture)
             if (culture == null)
             {
                 if (string.IsNullOrWhiteSpace(entity.Name))
+                {
                     entity.Name = "[[" + entity.Id + "]]";
+                }
+
                 return;
             }
 
             if (!(entity is IDocumentEntitySlim docEntity))
+            {
                 throw new InvalidOperationException($"Cannot render a tree node for a culture when the entity isn't {typeof(IDocumentEntitySlim)}, instead it is {entity.GetType()}");
+            }
 
             // we are getting the tree for a given culture,
             // for those items that DO support cultures, we need to get the proper name, IF it exists
@@ -304,16 +311,15 @@ private void EnsureName(IEntitySlim entity, string culture)
             }
 
             if (string.IsNullOrWhiteSpace(entity.Name))
+            {
                 entity.Name = "[[" + entity.Id + "]]";
+            }
         }
 
-        // TODO: Remove the need for converting to legacy
-        private void AddActionNode<TAction>(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool convert = false, bool opensDialog = false)
+        private void AddActionNode<TAction>(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool opensDialog = false)
             where TAction : IAction
         {
-            var menuItem = menu.Items.Add<TAction>(Services.TextService.Localize("actions", _actions.GetAction<TAction>().Alias), hasSeparator);
-            if (convert) menuItem.ConvertLegacyMenuItem(item, "content", "content");
-            menuItem.OpensDialog = opensDialog;
+            var menuItem = menu.Items.Add<TAction>(Services.TextService.Localize("actions", _actions.GetAction<TAction>().Alias), hasSeparator, opensDialog);
         }
 
         public IEnumerable<SearchResultEntity> Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)
diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
deleted file mode 100644
index 4936ce654182..000000000000
--- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using Umbraco.Core;
-using Umbraco.Core.Services;
-using Umbraco.Web.Actions;
-
-using Umbraco.Web.Composing;
-
-namespace Umbraco.Web.Trees
-{
-    /// <summary>
-    /// Converts the legacy tree data to the new format
-    /// </summary>
-    internal class LegacyTreeDataConverter
-    {
-        // TODO: remove this whole class when everything is angularized
-
-        /// <summary>
-        /// This will look at the legacy IAction's JsFunctionName and convert it to a confirmation dialog view if possible
-        /// </summary>
-        /// <param name="action"></param>
-        /// <returns></returns>
-        internal static Attempt<string> GetLegacyConfirmView(IAction action)
-        {
-            switch (action)
-            {
-                case ActionDelete actionDelete:
-                    return Attempt.Succeed(
-                        Current.Configs.Global().Path.EnsureEndsWith('/') + "views/common/dialogs/legacydelete.html");
-            }
-
-            return Attempt<string>.Fail();
-        }
-
-        /// <summary>
-        /// This will look at a legacy IAction's JsFunctionName and convert it to a URL if possible.
-        /// </summary>
-        /// <param name="action"></param>
-        /// <param name="nodeName"></param>
-        /// <param name="currentSection"></param>
-        /// <param name="nodeId"></param>
-        /// <param name="nodeType"></param>
-        internal static Attempt<LegacyUrlAction> GetUrlAndTitleFromLegacyAction(IAction action, string nodeId, string nodeType, string nodeName, string currentSection)
-        {
-            switch (action)
-
-            {
-                case ActionNew actionNew:
-                    return Attempt.Succeed(
-                        new LegacyUrlAction(
-                            "create.aspx?nodeId=" + nodeId + "&nodeType=" + nodeType + "&nodeName=" + nodeName + "&rnd=" + DateTime.UtcNow.Ticks,
-                            Current.Services.TextService.Localize("actions/create")));
-            }
-            return Attempt<LegacyUrlAction>.Fail();
-        }
-
-        internal class LegacyUrlAction
-        {
-            public LegacyUrlAction(string url, string dialogTitle)
-                : this(url, dialogTitle, ActionUrlMethod.Dialog)
-            {
-
-            }
-
-            public LegacyUrlAction(string url, string dialogTitle, ActionUrlMethod actionMethod)
-            {
-                Url = url;
-                ActionMethod = actionMethod;
-                DialogTitle = dialogTitle;
-            }
-
-            public string Url { get; private set; }
-            public ActionUrlMethod ActionMethod { get; private set; }
-            public string DialogTitle { get; private set; }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8144056128a9..301ffffc983f 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -257,7 +257,6 @@
     <Compile Include="Security\BackOfficeUserManager.cs" />
     <Compile Include="Security\SessionIdValidator.cs" />
     <Compile Include="SignalR\PreviewHubComposer.cs" />
-    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
     <Compile Include="Trees\FilesTreeController.cs" />
     <Compile Include="Trees\TreeCollection.cs" />
     <Compile Include="JavaScript\ClientDependencyConfiguration.cs" />

From 88eb29e1991aa552012f8f1a072b800700c62192 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 30 Jan 2019 11:46:15 +0000
Subject: [PATCH 172/421] Removes EmbedProviders.config & moves into C# types
 (As its a config file that is rarely ammended IMO)

---
 src/Umbraco.Core/Media/IEmbedProvider.cs      |  20 +-
 .../Media/{Result.cs => OEmbedResult.cs}      |   6 +-
 .../Media/{Status.cs => OEmbedStatus.cs}      |   4 +-
 src/Umbraco.Core/Media/ProviderSetting.cs     |   8 -
 src/Umbraco.Core/Umbraco.Core.csproj          |   5 +-
 .../config/EmbeddedMedia.config               | 205 +++++++-----------
 .../Media/EmbedProviders/AbstractProvider.cs  |  14 --
 ...OEmbedProvider.cs => EmbedProviderBase.cs} |  42 ++--
 .../EmbedProvidersCollection.cs               |  13 ++
 .../EmbedProvidersCollectionBuilder.cs        |  17 ++
 .../Media/EmbedProviders/Flickr.cs            |  31 +++
 .../Media/EmbedProviders/GettyImages.cs       |  27 +++
 .../Media/EmbedProviders/Instagram.cs         |  25 +++
 .../Media/EmbedProviders/Kickstarter.cs       |  24 ++
 .../Media/EmbedProviders/OEmbedJson.cs        |  13 --
 .../Media/EmbedProviders/OEmbedPhoto.cs       |  22 --
 .../Media/EmbedProviders/OEmbedResponse.cs    |   8 +-
 .../Media/EmbedProviders/OEmbedRich.cs        |   6 -
 .../Media/EmbedProviders/OEmbedVideo.cs       |  15 --
 .../EmbedProviders/Settings/Dictionary.cs     |  14 --
 .../Media/EmbedProviders/Settings/String.cs   |  13 --
 .../Media/EmbedProviders/Slideshare.cs        |  24 ++
 .../Media/EmbedProviders/Twitgoo.cs           |  23 --
 .../Media/EmbedProviders/Twitter.cs           |  24 ++
 .../PropertyEditors/RteEmbedController.cs     |  88 ++++----
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  11 +
 src/Umbraco.Web/Umbraco.Web.csproj            |  20 +-
 27 files changed, 364 insertions(+), 358 deletions(-)
 rename src/Umbraco.Core/Media/{Result.cs => OEmbedResult.cs} (53%)
 rename src/Umbraco.Core/Media/{Status.cs => OEmbedStatus.cs} (55%)
 delete mode 100644 src/Umbraco.Core/Media/ProviderSetting.cs
 delete mode 100644 src/Umbraco.Web/Media/EmbedProviders/AbstractProvider.cs
 rename src/Umbraco.Web/Media/EmbedProviders/{AbstractOEmbedProvider.cs => EmbedProviderBase.cs} (73%)
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollection.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/GettyImages.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Instagram.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Kickstarter.cs
 delete mode 100644 src/Umbraco.Web/Media/EmbedProviders/OEmbedJson.cs
 delete mode 100644 src/Umbraco.Web/Media/EmbedProviders/OEmbedPhoto.cs
 delete mode 100644 src/Umbraco.Web/Media/EmbedProviders/OEmbedRich.cs
 delete mode 100644 src/Umbraco.Web/Media/EmbedProviders/OEmbedVideo.cs
 delete mode 100644 src/Umbraco.Web/Media/EmbedProviders/Settings/Dictionary.cs
 delete mode 100644 src/Umbraco.Web/Media/EmbedProviders/Settings/String.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Slideshare.cs
 delete mode 100644 src/Umbraco.Web/Media/EmbedProviders/Twitgoo.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Twitter.cs

diff --git a/src/Umbraco.Core/Media/IEmbedProvider.cs b/src/Umbraco.Core/Media/IEmbedProvider.cs
index 62faa45563aa..99b162e0b7cb 100644
--- a/src/Umbraco.Core/Media/IEmbedProvider.cs
+++ b/src/Umbraco.Core/Media/IEmbedProvider.cs
@@ -1,8 +1,24 @@
-namespace Umbraco.Core.Media
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Media
 {
     public interface IEmbedProvider
     {
-        bool SupportsDimensions { get; }
+        /// <summary>
+        /// The OEmbed API Endpoint
+        /// </summary>
+        string ApiEndpoint { get; }
+
+        /// <summary>
+        /// A string array of Regex patterns to match against the pasted OEmbed URL
+        /// </summary>
+        string[] UrlSchemeRegex { get; }
+
+        /// <summary>
+        /// A collection of querystring request parameters to append to the API Url
+        /// </summary>
+        /// <example>?key=value&key2=value2</example>
+        Dictionary<string, string> RequestParams { get; }
 
         string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0);
     }
diff --git a/src/Umbraco.Core/Media/Result.cs b/src/Umbraco.Core/Media/OEmbedResult.cs
similarity index 53%
rename from src/Umbraco.Core/Media/Result.cs
rename to src/Umbraco.Core/Media/OEmbedResult.cs
index a8683d03d581..bed07d9b5eb9 100644
--- a/src/Umbraco.Core/Media/Result.cs
+++ b/src/Umbraco.Core/Media/OEmbedResult.cs
@@ -1,10 +1,8 @@
 namespace Umbraco.Core.Media
 {
-
-    // TODO: Could definitely have done with a better name
-    public class Result
+    public class OEmbedResult
     {
-        public Status Status { get; set; }
+        public OEmbedStatus OEmbedStatus { get; set; }
         public bool SupportsDimensions { get; set; }
         public string Markup { get; set; }
     }
diff --git a/src/Umbraco.Core/Media/Status.cs b/src/Umbraco.Core/Media/OEmbedStatus.cs
similarity index 55%
rename from src/Umbraco.Core/Media/Status.cs
rename to src/Umbraco.Core/Media/OEmbedStatus.cs
index abbcca97dae2..0f1f22b0e219 100644
--- a/src/Umbraco.Core/Media/Status.cs
+++ b/src/Umbraco.Core/Media/OEmbedStatus.cs
@@ -1,8 +1,6 @@
 namespace Umbraco.Core.Media
 {
-
-    //NOTE: Could definitely have done with a better name
-    public enum Status
+    public enum OEmbedStatus
     {
         NotSupported,
         Error,
diff --git a/src/Umbraco.Core/Media/ProviderSetting.cs b/src/Umbraco.Core/Media/ProviderSetting.cs
deleted file mode 100644
index 9fef5efabfb6..000000000000
--- a/src/Umbraco.Core/Media/ProviderSetting.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Media
-{
-    public class ProviderSetting : Attribute
-    {
-    }
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 86c37ca54d8f..b71eb9755c0b 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -668,9 +668,8 @@
     <Compile Include="Manifest\DataEditorConverter.cs" />
     <Compile Include="Media\IEmbedProvider.cs" />
     <Compile Include="Media\IEmbedSettingProvider.cs" />
-    <Compile Include="Media\ProviderSetting.cs" />
-    <Compile Include="Media\Result.cs" />
-    <Compile Include="Media\Status.cs" />
+    <Compile Include="Media\OEmbedResult.cs" />
+    <Compile Include="Media\OEmbedStatus.cs" />
     <Compile Include="Migrations\IPostMigration.cs" />
     <Compile Include="Migrations\MigrationBuilder.cs" />
     <Compile Include="Migrations\MigrationPlan.cs" />
diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
index c466b14f1c1d..262dc2993fb9 100644
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.config
+++ b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
@@ -1,134 +1,77 @@
 <?xml version="1.0"?>
 <embed>
-  <!-- Flickr Settings-->
-  <provider name="Flickr" type="Umbraco.Web.Media.EmbedProviders.OEmbedPhoto, Umbraco.Web">
-    <urlShemeRegex><![CDATA[flickr\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.flickr.com/services/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- SlideShare Settings -->
-  <provider name="SlideShare" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, Umbraco.Web">
-    <urlShemeRegex><![CDATA[slideshare\.net/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.slideshare.net/api/oembed/2]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Kickstarter Settings-->
-  <provider name="Kickstarter" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[kickstarter\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.kickstarter.com/services/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Getty Images Settings-->
-  <provider name="GettyImages" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[gty\.im/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://embed.gettyimages.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Poll Everywhere Settings -->
-  <provider name="PollEverywhere" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[polleverywhere\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.polleverywhere.com/services/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Poll Daddy Settings -->
-  <provider name="PollDaddy" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[polldaddy\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://polldaddy.com/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- IFTTT Settings -->
-  <provider name="IFTTT" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[ifttt\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.ifttt.com/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Instagram Settings -->
-  <provider name="Instagram" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[instagram\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://api.instagram.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Issuu Settings -->
-  <provider name="Issuu" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-      <urlShemeRegex><![CDATA[issuu.com/(?:.*)/docs]]></urlShemeRegex>
-      <apiEndpoint><![CDATA[https://issuu.com/oembed]]></apiEndpoint>
-      <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-          <param name="format">json</param>
-      </requestParams>
-  </provider>
-  <!-- Rdio Settings -->
-  <provider name="Rdio" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[rdio\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.rdio.com/api/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- SoundCloud Settings -->
-  <provider name="SoundCloud" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, Umbraco.Web">
-    <urlShemeRegex><![CDATA[soundcloud\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://soundcloud.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider> 
-  <!-- Youtube Settings -->
-  <provider name="Youtube" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[youtu(?:\.be|be\.com)/(?:(.*)v(/|=)|(.*/)?)([a-zA-Z0-9-_]+)]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[https://www.youtube.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="iframe">1</param>
-      <param name="format">xml</param>
-      <param name="scheme">https</param>
-    </requestParams>
-  </provider>
-  <!-- StreamDotUmbracoDotCom -->
-  <provider name="StreamDotUmbracoDotCom" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[stream\.umbraco\.org/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://stream.umbraco.org/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Daily Motion -->
-  <provider name="DailyMotion" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[dailymotion\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.dailymotion.com/services/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Hulu -->
-  <provider name="Hulu" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[hulu\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.hulu.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Vimeo -->
-  <provider name="Vimeo" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[vimeo\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://vimeo.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Ted -->
-  <provider name="Ted" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[ted\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.ted.com/talks/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Screenr Settings -->
-  <provider name="Screenr" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web" supportsDimensions="False">
-    <urlShemeRegex><![CDATA[screenr\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.screenr.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Twitgoo Settings , not an OEmbed one -->
-  <provider name="Twitgoo" type="Umbraco.Web.Media.EmbedProviders.Twitgoo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[twitgoo\.com/]]></urlShemeRegex>
-  </provider>
-  <!-- Twitter Settings -->
-  <provider name="Twitter" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[twitter\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[https://publish.twitter.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-    </requestParams>
-  </provider>
+
+    <!-- Youtube Settings -->
+    <provider name="Youtube" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
+        <urlShemeRegex><![CDATA[youtu(?:\.be|be\.com)/(?:(.*)v(/|=)|(.*/)?)([a-zA-Z0-9-_]+)]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[https://www.youtube.com/oembed]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
+            <param name="iframe">1</param>
+            <param name="format">xml</param>
+            <param name="scheme">https</param>
+        </requestParams>
+    </provider>
+
+    <!-- Vimeo -->
+    <provider name="Vimeo" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
+        <urlShemeRegex><![CDATA[vimeo\.com/]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[http://vimeo.com/api/oembed.xml]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
+    </provider>
+
+    <!-- Ted -->
+    <provider name="Ted" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
+        <urlShemeRegex><![CDATA[ted\.com/]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[http://www.ted.com/talks/oembed.xml]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
+    </provider>
+
+    <!-- Issuu Settings -->
+    <provider name="Issuu" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
+        <urlShemeRegex><![CDATA[issuu.com/(?:.*)/docs]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[https://issuu.com/oembed]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
+            <param name="format">json</param>
+        </requestParams>
+    </provider>
+    
+    <!-- SoundCloud Settings -->
+    <provider name="SoundCloud" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, Umbraco.Web">
+        <urlShemeRegex><![CDATA[soundcloud\.com/]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[http://soundcloud.com/oembed]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
+    </provider>
+
+    <!-- StreamDotUmbracoDotCom -->
+    <provider name="StreamDotUmbracoDotCom" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
+        <urlShemeRegex><![CDATA[stream\.umbraco\.org/]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[http://stream.umbraco.org/oembed]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
+    </provider>
+
+    <!-- Daily Motion -->
+    <provider name="DailyMotion" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
+        <urlShemeRegex><![CDATA[dailymotion\.com/]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[http://www.dailymotion.com/services/oembed]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
+            <param name="format">xml</param>
+        </requestParams>
+    </provider>
+
+    <!-- Hulu -->
+    <provider name="Hulu" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
+        <urlShemeRegex><![CDATA[hulu\.com/]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[http://www.hulu.com/api/oembed.xml]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
+            <param name="format">xml</param>
+        </requestParams>
+    </provider>
+
+    <!-- IFTTT Settings -->
+    <provider name="IFTTT" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
+        <urlShemeRegex><![CDATA[ifttt\.com/]]></urlShemeRegex>
+        <apiEndpoint><![CDATA[http://www.ifttt.com/oembed/]]></apiEndpoint>
+        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
+    </provider>
+    
 </embed>
diff --git a/src/Umbraco.Web/Media/EmbedProviders/AbstractProvider.cs b/src/Umbraco.Web/Media/EmbedProviders/AbstractProvider.cs
deleted file mode 100644
index 32f9f5c5c995..000000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/AbstractProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Umbraco.Core.Media;
-
-namespace Umbraco.Web.Media.EmbedProviders
-{
-    public abstract class AbstractProvider : IEmbedProvider
-    {
-        public virtual bool SupportsDimensions
-        {
-            get { return true; }
-        }
-
-        public abstract string GetMarkup(string url, int maxWidth, int maxHeight);
-    }
-}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs b/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs
similarity index 73%
rename from src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
rename to src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs
index c73e73226869..9e34815def5e 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs
@@ -1,46 +1,39 @@
-using System;
-using System.Text;
-using System.Xml;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
-using System.Net;
+using System.Linq;
 using System.Net.Http;
+using System.Text;
 using System.Web;
-using Newtonsoft.Json;
+using System.Xml;
 using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Media.EmbedProviders
 {
-    // TODO: Make all Http calls async
-
-    public abstract class AbstractOEmbedProvider : IEmbedProvider
+    public abstract class EmbedProviderBase : IEmbedProvider
     {
         private static HttpClient _httpClient;
 
-        public virtual bool SupportsDimensions
-        {
-            get { return true; }
-        }
-
-        [ProviderSetting]
-        public string APIEndpoint { get; set; }
+        public abstract string ApiEndpoint { get; }
 
-        [ProviderSetting]
-        public Dictionary<string, string> RequestParams { get; set; }
+        public abstract string[] UrlSchemeRegex { get; }
 
-        public abstract string GetMarkup(string url, int maxWidth, int maxHeight);
+        public abstract Dictionary<string, string> RequestParams { get; }
+        
+        public abstract string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0);
 
-        public virtual string BuildFullUrl(string url, int maxWidth, int maxHeight)
+        public virtual string GetEmbedProviderUrl(string url, int maxWidth, int maxHeight)
         {
             if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false)
                 throw new ArgumentException("Not a valid Url");
 
             var fullUrl = new StringBuilder();
 
-            fullUrl.Append(APIEndpoint);
+            fullUrl.Append(ApiEndpoint);
             fullUrl.Append("?url=" + HttpUtility.UrlEncode(url));
 
-            foreach (var p in RequestParams)
-                fullUrl.Append(string.Format("&{0}={1}", p.Key, p.Value));
+            foreach (var param in RequestParams)
+                fullUrl.Append($"&{param.Key}={param.Value}");
 
             if (maxWidth > 0)
                 fullUrl.Append("&maxwidth=" + maxWidth);
@@ -50,7 +43,7 @@ public virtual string BuildFullUrl(string url, int maxWidth, int maxHeight)
 
             return fullUrl.ToString();
         }
-
+        
         public virtual string DownloadResponse(string url)
         {
             if (_httpClient == null)
@@ -83,6 +76,5 @@ public virtual string GetXmlProperty(XmlDocument doc, string property)
             var selectSingleNode = doc.SelectSingleNode(property);
             return selectSingleNode != null ? selectSingleNode.InnerText : string.Empty;
         }
-
     }
-}
+};
diff --git a/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollection.cs b/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollection.cs
new file mode 100644
index 000000000000..88a317c545ef
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollection.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Media;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class EmbedProvidersCollection : BuilderCollectionBase<IEmbedProvider>
+    {
+        public EmbedProvidersCollection(IEnumerable<IEmbedProvider> items)
+            : base(items)
+        { }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs b/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs
new file mode 100644
index 000000000000..d11cf5f56ffb
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs
@@ -0,0 +1,17 @@
+using Umbraco.Core.Composing;
+using Umbraco.Core.Media;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class EmbedProvidersCollectionBuilder : OrderedCollectionBuilderBase<EmbedProvidersCollectionBuilder, EmbedProvidersCollection, IEmbedProvider>
+    {
+        protected override EmbedProvidersCollectionBuilder This => this;
+
+        public override EmbedProvidersCollection CreateCollection(IFactory factory)
+        {
+            // No fancy magic here of reading package.manifest or using typeloader
+            // Have to explicitly add a OEmbedProvider to this collection
+            return base.CreateCollection(factory);
+        }        
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs b/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
new file mode 100644
index 000000000000..2ce014c639eb
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Web;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Flickr : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "http://www.flickr.com/services/oembed/";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"flickr.com\/photos\/*",
+            @"flic.kr\/p\/*"
+        };
+
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+                
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var xmlDocument = base.GetXmlResponse(requestUrl);
+
+            var imageUrl = GetXmlProperty(xmlDocument, "/oembed/url");
+            var imageWidth = GetXmlProperty(xmlDocument, "/oembed/width");
+            var imageHeight = GetXmlProperty(xmlDocument, "/oembed/height");
+            var imageTitle = GetXmlProperty(xmlDocument, "/oembed/title");
+
+            return string.Format("<img src=\"{0}\" width\"{1}\" height=\"{2}\" alt=\"{3}\" />", imageUrl, imageWidth, imageHeight, HttpUtility.HtmlEncode(imageTitle));
+        }        
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/GettyImages.cs b/src/Umbraco.Web/Media/EmbedProviders/GettyImages.cs
new file mode 100644
index 000000000000..34b383614d50
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/GettyImages.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class GettyImages : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "http://embed.gettyimages.com/oembed";
+
+        //http://gty.im/74917285
+        //http://www.gettyimages.com/detail/74917285
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"gty\.im/*",
+            @"gettyimages.com\/detail\/*"
+        };
+
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
+
+            return oembed.GetHtml();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Instagram.cs b/src/Umbraco.Web/Media/EmbedProviders/Instagram.cs
new file mode 100644
index 000000000000..1862d77cade9
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Instagram.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Instagram : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "http://api.instagram.com/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"instagram.com\/p\/*",
+            @"instagr.am\/p\/*"
+        };
+
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
+
+            return oembed.GetHtml();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Kickstarter.cs b/src/Umbraco.Web/Media/EmbedProviders/Kickstarter.cs
new file mode 100644
index 000000000000..4de45ae2e3e1
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Kickstarter.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Kickstarter : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "http://www.kickstarter.com/services/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"kickstarter\.com/projects/*"
+        };
+
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
+
+            return oembed.GetHtml();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedJson.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedJson.cs
deleted file mode 100644
index 161294be762a..000000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedJson.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Umbraco.Web.Media.EmbedProviders
-{
-    public class OEmbedJson : AbstractOEmbedProvider
-    {
-        public override string GetMarkup(string url, int maxWidth, int maxHeight)
-        {
-            string requestUrl = BuildFullUrl(url, maxWidth, maxHeight);
-
-            var jsonResponse = GetJsonResponse<OEmbedResponse>(requestUrl);
-            return jsonResponse.GetHtml();
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedPhoto.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedPhoto.cs
deleted file mode 100644
index 26dbf38d319e..000000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedPhoto.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Web;
-using System.Xml;
-
-namespace Umbraco.Web.Media.EmbedProviders
-{
-    public class OEmbedPhoto : AbstractOEmbedProvider
-    {
-        public override string GetMarkup(string url, int maxWidth, int maxHeight)
-        {
-            string requestUrl = BuildFullUrl(url, maxWidth, maxHeight);
-
-            XmlDocument doc = GetXmlResponse(requestUrl);
-            string imageUrl = GetXmlProperty(doc, "/oembed/url");
-            string imageWidth = GetXmlProperty(doc, "/oembed/width");
-            string imageHeight = GetXmlProperty(doc, "/oembed/height");
-            string imageTitle = GetXmlProperty(doc, "/oembed/title");
-
-            return string.Format("<img src=\"{0}\" width\"{1}\" height=\"{2}\" alt=\"{3}\" />",
-                imageUrl, imageWidth, imageHeight, HttpUtility.HtmlEncode(imageTitle));
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs
index e6577dea1fe8..64b18f52d38e 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs
@@ -31,18 +31,18 @@ public class OEmbedResponse
         public string ThumbnailUrl { get; set; }
 
         [JsonProperty("thumbnail_height")]
-        public int? ThumbnailHeight { get; set; }
+        public double? ThumbnailHeight { get; set; }
 
         [JsonProperty("thumbnail_width")]
-        public int? ThumbnailWidth { get; set; }
+        public double? ThumbnailWidth { get; set; }
 
         public string Html { get; set; }
 
         public string Url { get; set; }
 
-        public int? Height { get; set; }
+        public double? Height { get; set; }
 
-        public int? Width { get; set; }
+        public double? Width { get; set; }
 
         /// <summary>
         /// Gets the HTML.
diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedRich.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedRich.cs
deleted file mode 100644
index 8f578ada59d7..000000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedRich.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Umbraco.Web.Media.EmbedProviders
-{
-    public class OEmbedRich : OEmbedVideo
-    {
-    }
-}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedVideo.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedVideo.cs
deleted file mode 100644
index 53bc8602d812..000000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedVideo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Xml;
-
-namespace Umbraco.Web.Media.EmbedProviders
-{
-    public class OEmbedVideo : AbstractOEmbedProvider
-    {
-        public override string GetMarkup(string url, int maxWidth, int maxHeight)
-        {
-            string requestUrl = BuildFullUrl(url, maxWidth, maxHeight);
-
-            XmlDocument doc = GetXmlResponse(requestUrl);
-            return GetXmlProperty(doc, "/oembed/html");
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Settings/Dictionary.cs b/src/Umbraco.Web/Media/EmbedProviders/Settings/Dictionary.cs
deleted file mode 100644
index 1c0a98205ad9..000000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/Settings/Dictionary.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Linq;
-using System.Xml;
-using Umbraco.Core.Media;
-
-namespace Umbraco.Web.Media.EmbedProviders.Settings
-{
-    public class Dictionary : IEmbedSettingProvider
-    {
-        public object GetSetting(XmlNode settingNode)
-        {
-            return settingNode.ChildNodes.Cast<XmlNode>().ToDictionary(item => item.Attributes != null ? item.Attributes["name"].Value : null, item => item.InnerText);
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Settings/String.cs b/src/Umbraco.Web/Media/EmbedProviders/Settings/String.cs
deleted file mode 100644
index f1d3642d79d5..000000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/Settings/String.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Xml;
-using Umbraco.Core.Media;
-
-namespace Umbraco.Web.Media.EmbedProviders.Settings
-{
-    public class String : IEmbedSettingProvider
-    {
-        public object GetSetting(XmlNode settingNode)
-        {
-            return settingNode.InnerText;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Slideshare.cs b/src/Umbraco.Web/Media/EmbedProviders/Slideshare.cs
new file mode 100644
index 000000000000..6d3a010c7acb
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Slideshare.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Slideshare : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "http://www.slideshare.net/api/oembed/2";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"slideshare\.net/"
+        };
+
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var xmlDocument = base.GetXmlResponse(requestUrl);
+
+            return GetXmlProperty(xmlDocument, "/oembed/html");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Twitgoo.cs b/src/Umbraco.Web/Media/EmbedProviders/Twitgoo.cs
deleted file mode 100644
index 3b7816a902ca..000000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/Twitgoo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using HtmlAgilityPack;
-
-namespace Umbraco.Web.Media.EmbedProviders
-{
-    public class Twitgoo : AbstractProvider
-    {
-        public override bool SupportsDimensions
-        {
-            get { return false; }
-        }
-
-        public override string GetMarkup(string url, int maxWidth, int maxHeight)
-        {
-            var web = new HtmlWeb();
-            var doc = web.Load(url);
-
-            var img = doc.DocumentNode.SelectSingleNode("//img [@id = 'fullsize']").Attributes["src"];
-
-            return string.Format("<img src=\"{0}\"/>",
-               img.Value);
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Twitter.cs b/src/Umbraco.Web/Media/EmbedProviders/Twitter.cs
new file mode 100644
index 000000000000..9286934a4dc7
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Twitter.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Twitter : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "http://publish.twitter.com/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"twitter.com/.*/status/.*"
+        };
+
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
+
+            return oembed.GetHtml();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
index 4cebc5c82920..b3498c16ae2e 100644
--- a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
+++ b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
@@ -1,14 +1,10 @@
 using System;
-using System.Linq;
 using System.Text.RegularExpressions;
-using System.Xml;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Mvc;
 using Umbraco.Core.Media;
-using System.IO;
-using Umbraco.Core.IO;
+using Umbraco.Web.Media.EmbedProviders;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -18,60 +14,56 @@ namespace Umbraco.Web.PropertyEditors
     [PluginController("UmbracoApi")]
     public class RteEmbedController : UmbracoAuthorizedJsonController
     {
-        public Result GetEmbed(string url, int width, int height)
+        private EmbedProvidersCollection _embedCollection;
+
+        public RteEmbedController(EmbedProvidersCollection embedCollection)
         {
-            var result = new Result();
+            _embedCollection = embedCollection ?? throw new ArgumentNullException(nameof(embedCollection));
+        }
 
-            // TODO: cache embed doc
-            var xmlConfig = new XmlDocument();
-            xmlConfig.Load(IOHelper.GetRootDirectorySafe() + Path.DirectorySeparatorChar + "config" + Path.DirectorySeparatorChar + "EmbeddedMedia.config");
+        public OEmbedResult GetEmbed(string url, int width, int height)
+        {
+            var result = new OEmbedResult();
+            var foundMatch = false;
+            IEmbedProvider matchedProvider = null;
 
-            foreach (XmlNode node in xmlConfig.SelectNodes("//provider"))
+            foreach (var provider in _embedCollection)
             {
-                var regexPattern = new Regex(node.SelectSingleNode("./urlShemeRegex").InnerText, RegexOptions.IgnoreCase);
-
-                if (regexPattern.IsMatch(url))
+                //Url Scheme Regex is an array of possible regex patterns to match against the URL
+                foreach(var urlPattern in provider.UrlSchemeRegex)
                 {
-                    var prov = (IEmbedProvider)Activator.CreateInstance(Type.GetType(node.Attributes["type"].Value));
-
-                    if (node.Attributes["supportsDimensions"] != null)
-                        result.SupportsDimensions = node.Attributes["supportsDimensions"].Value == "True";
-                    else
-                        result.SupportsDimensions = prov.SupportsDimensions;
-
-                    var settings = node.ChildNodes.Cast<XmlNode>().ToDictionary(settingNode => settingNode.Name);
-
-                    foreach (var prop in prov.GetType().GetProperties().Where(prop => prop.IsDefined(typeof(ProviderSetting), true)))
+                    var regexPattern = new Regex(urlPattern, RegexOptions.IgnoreCase);
+                    if (regexPattern.IsMatch(url))
                     {
+                        foundMatch = true;
+                        matchedProvider = provider;
+                        break;
+                    }
+                }
 
-                        if (settings.Any(s => s.Key.ToLower() == prop.Name.ToLower()))
-                        {
-                            var setting = settings.FirstOrDefault(s => s.Key.ToLower() == prop.Name.ToLower()).Value;
-                            var settingType = typeof(Media.EmbedProviders.Settings.String);
-
-                            if (setting.Attributes["type"] != null)
-                                settingType = Type.GetType(setting.Attributes["type"].Value);
+                if (foundMatch)
+                    break;
+            }
 
-                            var settingProv = (IEmbedSettingProvider)Activator.CreateInstance(settingType);
-                            prop.SetValue(prov, settingProv.GetSetting(settings.FirstOrDefault(s => s.Key.ToLower() == prop.Name.ToLower()).Value), null);
-                        }
-                    }
-                    try
-                    {
-                        result.Markup = prov.GetMarkup(url, width, height);
-                        result.Status = Status.Success;
-                    }
-                    catch(Exception ex)
-                    {
-                        Logger.Error<RteEmbedController>(ex, "Error embedding url {Url} - width: {Width} height: {Height}", url, width, height);
-                        result.Status = Status.Error;
-                    }
+            if(foundMatch == false)
+            {
+                //No matches return/ exit
+                result.OEmbedStatus = OEmbedStatus.NotSupported;
+                return result;
+            }
 
-                    return result;
-                }
+            try
+            {
+                result.SupportsDimensions = true;
+                result.Markup = matchedProvider.GetMarkup(url, width, height);
+                result.OEmbedStatus = OEmbedStatus.Success;
+            }
+            catch(Exception ex)
+            {
+                Logger.Error<RteEmbedController>(ex, "Error embedding url {Url} - width: {Width} height: {Height}", url, width, height);
+                result.OEmbedStatus = OEmbedStatus.Error;
             }
 
-            result.Status = Status.NotSupported;
             return result;
         }
     }
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 3c593d383faf..e4c295e6d899 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -23,6 +23,7 @@
 using Umbraco.Web.Editors;
 using Umbraco.Web.Features;
 using Umbraco.Web.HealthCheck;
+using Umbraco.Web.Media.EmbedProviders;
 using Umbraco.Web.Models.PublishedContent;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
@@ -212,6 +213,16 @@ public override void Compose(Composition composition)
             // and will filter out those that are not attributed with TreeAttribute
             composition.WithCollectionBuilder<TreeCollectionBuilder>()
                 .AddTreeControllers(umbracoApiControllerTypes.Where(x => typeof(TreeControllerBase).IsAssignableFrom(x)));
+
+            // register OEmbed providers
+            // no type scanning - all explicit opt-in of adding types
+            composition.WithCollectionBuilder<EmbedProvidersCollectionBuilder>()
+                .Append<Flickr>()
+                .Append<Slideshare>()
+                .Append<Kickstarter>()
+                .Append<GettyImages>()
+                .Append<Instagram>()
+                .Append<Twitter>();
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ccf8c49485ca..759763756b8e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -143,6 +143,16 @@
     <Compile Include="Logging\WebProfilerComponent.cs" />
     <Compile Include="Logging\WebProfilerComposer.cs" />
     <Compile Include="Logging\WebProfilerProvider.cs" />
+    <Compile Include="Media\EmbedProviders\EmbedProviderBase.cs" />
+    <Compile Include="Media\EmbedProviders\EmbedProvidersCollection.cs" />
+    <Compile Include="Media\EmbedProviders\EmbedProvidersCollectionBuilder.cs" />
+    <Compile Include="Media\EmbedProviders\Flickr.cs" />
+    <Compile Include="Media\EmbedProviders\GettyImages.cs" />
+    <Compile Include="Media\EmbedProviders\Twitter.cs" />
+    <Compile Include="Media\EmbedProviders\Kickstarter.cs" />
+    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
+    <Compile Include="Media\EmbedProviders\Instagram.cs" />
+    <Compile Include="Media\EmbedProviders\Slideshare.cs" />
     <Compile Include="Media\Exif\BitConverterEx.cs" />
     <Compile Include="Media\Exif\ExifBitConverter.cs" />
     <Compile Include="Media\Exif\ExifEnums.cs" />
@@ -668,9 +678,6 @@
     <Compile Include="Security\GetUserSecondsMiddleWare.cs" />
     <Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
     <Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
     <Compile Include="Security\IUmbracoBackOfficeTwoFactorOptions.cs" />
     <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
     <Compile Include="Services\TreeService.cs" />
@@ -1097,13 +1104,6 @@
     </Compile>
     <Compile Include="HtmlHelperRenderExtensions.cs" />
     <Compile Include="Scheduling\SchedulerComponent.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractOEmbedProvider.cs" />
-    <Compile Include="Media\EmbedProviders\AbstractProvider.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedRich.cs" />
-    <Compile Include="Media\EmbedProviders\OEmbedVideo.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\Dictionary.cs" />
-    <Compile Include="Media\EmbedProviders\Settings\String.cs" />
-    <Compile Include="Media\EmbedProviders\Twitgoo.cs" />
     <Compile Include="ModelStateExtensions.cs" />
     <Compile Include="Mvc\HtmlTagWrapper.cs" />
     <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />

From 31765a7a471538afe2d03e9abddecd8b51c296ec Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 29 Jan 2019 21:38:37 +0100
Subject: [PATCH 173/421] Remove the tooltip position flickering

---
 .../directives/components/umbtooltip.directive.js    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js
index 34006a3cec47..ef7006be2ccf 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js
@@ -69,7 +69,7 @@ Use this directive to render a tooltip.
 (function() {
    'use strict';
 
-   function TooltipDirective($timeout) {
+   function TooltipDirective() {
 
       function link(scope, el, attr, ctrl) {
 
@@ -77,14 +77,6 @@ Use this directive to render a tooltip.
          scope.tooltipStyles.left = 0;
          scope.tooltipStyles.top = 0;
 
-         function activate() {
-
-            $timeout(function() {
-               setTooltipPosition(scope.event);
-            });
-
-         }
-
          function setTooltipPosition(event) {
 
             var container = $("#contentwrapper");
@@ -141,7 +133,7 @@ Use this directive to render a tooltip.
 
          }
 
-         activate();
+         setTooltipPosition(scope.event);
 
       }
 

From fccfa4f412c334ce4fae5441c3b6b60f5ae166dd Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 23:42:25 +1100
Subject: [PATCH 174/421] Removes umbraco settings: ImageTagAllowedAttributes,
 UploadAllowDirectories, ensureUniqueNaming, ImageTagAllowedAttributes,
 ScriptEditorDisable, ScriptFolderPath, UploadAllowDirectories

---
 .../UmbracoSettings/ContentElement.cs         |  21 --
 .../UmbracoSettings/ContentImagingElement.cs  |  12 -
 .../ContentScriptEditorElement.cs             |  27 --
 .../UmbracoSettings/IContentSection.cs        |  12 -
 src/Umbraco.Core/IO/IOHelper.cs               |   2 +-
 .../OriginalMediaPathScheme.cs                |   6 +-
 .../Implement/DocumentBlueprintRepository.cs  |   7 +-
 .../Implement/DocumentRepository.cs           |   8 +-
 .../Repositories/Implement/MediaRepository.cs |  10 +-
 .../Implement/ScriptRepository.cs             |   2 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 -
 .../UmbracoSettings/ContentElementTests.cs    |  34 +-
 .../Repositories/ContentTypeRepositoryTest.cs |   2 +-
 .../Repositories/DocumentRepositoryTest.cs    |   2 +-
 .../Repositories/DomainRepositoryTest.cs      |   2 +-
 .../Repositories/MediaRepositoryTest.cs       |   2 +-
 .../PublicAccessRepositoryTest.cs             |   2 +-
 .../Repositories/TagRepositoryTest.cs         |   4 +-
 .../Repositories/TemplateRepositoryTest.cs    |   2 +-
 .../Repositories/UserRepositoryTest.cs        |   4 +-
 .../Services/ContentServicePerformanceTest.cs |   8 +-
 .../Services/ContentServiceTests.cs           |   2 +-
 .../config/umbracoSettings.Release.config     |   6 +-
 .../config/umbracoSettings.config             | 315 +++++++++---------
 ...404.cs => ContentFinderByConfigured404.cs} |  12 +-
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |   2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 +-
 27 files changed, 193 insertions(+), 316 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/ContentScriptEditorElement.cs
 rename src/Umbraco.Web/Routing/{ContentFinderByLegacy404.cs => ContentFinderByConfigured404.cs} (84%)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index abeaa8542a82..de2f9d4c9ee0 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -11,15 +11,9 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         [ConfigurationProperty("imaging")]
         internal ContentImagingElement Imaging => (ContentImagingElement) this["imaging"];
 
-        [ConfigurationProperty("scripteditor")]
-        internal ContentScriptEditorElement ScriptEditor => (ContentScriptEditorElement) this["scripteditor"];
-
         [ConfigurationProperty("ResolveUrlsFromTextString")]
         internal InnerTextConfigurationElement<bool> ResolveUrlsFromTextString => GetOptionalTextElement("ResolveUrlsFromTextString", false);
 
-        [ConfigurationProperty("UploadAllowDirectories")]
-        internal InnerTextConfigurationElement<bool> UploadAllowDirectories => GetOptionalTextElement("UploadAllowDirectories", true);
-
         public IEnumerable<IContentErrorPage> Error404Collection => Errors.Error404Collection;
 
         [ConfigurationProperty("errors", IsRequired = true)]
@@ -28,9 +22,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         [ConfigurationProperty("notifications", IsRequired = true)]
         internal NotificationsElement Notifications => (NotificationsElement) base["notifications"];
 
-        [ConfigurationProperty("ensureUniqueNaming")]
-        internal InnerTextConfigurationElement<bool> EnsureUniqueNaming => GetOptionalTextElement("ensureUniqueNaming", true);
-
         [ConfigurationProperty("XmlCacheEnabled")]
         internal InnerTextConfigurationElement<bool> XmlCacheEnabled => GetOptionalTextElement("XmlCacheEnabled", true);
 
@@ -85,22 +76,10 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         IEnumerable<string> IContentSection.ImageFileTypes => Imaging.ImageFileTypes;
 
-        IEnumerable<string> IContentSection.ImageTagAllowedAttributes => Imaging.ImageTagAllowedAttributes;
-
         IEnumerable<IImagingAutoFillUploadField> IContentSection.ImageAutoFillProperties => Imaging.ImageAutoFillProperties;
 
-        bool IContentSection.ScriptEditorDisable => ScriptEditor.ScriptEditorDisable;
-
-        string IContentSection.ScriptFolderPath => ScriptEditor.ScriptFolderPath;
-
-        IEnumerable<string> IContentSection.ScriptFileTypes => ScriptEditor.ScriptFileTypes;
-
         bool IContentSection.ResolveUrlsFromTextString => ResolveUrlsFromTextString;
 
-        bool IContentSection.UploadAllowDirectories => UploadAllowDirectories;
-
-        bool IContentSection.EnsureUniqueNaming => EnsureUniqueNaming;
-
         bool IContentSection.XmlCacheEnabled => XmlCacheEnabled;
 
         bool IContentSection.ContinouslyUpdateXmlDiskCache => ContinouslyUpdateXmlDiskCache;
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
index 93537fe870eb..1814ef23e8ff 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
@@ -22,18 +22,6 @@ internal static string[] GetDefaultImageFileTypes()
             return new[] {"jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif"};
         }
 
-        [ConfigurationProperty("allowedAttributes")]
-        internal CommaDelimitedConfigurationElement ImageTagAllowedAttributes
-        {
-            get
-            {
-                return new OptionalCommaDelimitedConfigurationElement(
-                       (CommaDelimitedConfigurationElement)this["allowedAttributes"],
-                        //set the default
-                       new[] { "src", "alt", "border", "class", "style", "align", "id", "name", "onclick", "usemap" });
-            }
-        }
-
         private ImagingAutoFillPropertiesCollection _defaultImageAutoFill;
 
         [ConfigurationCollection(typeof(ImagingAutoFillPropertiesCollection), AddItemName = "uploadField")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentScriptEditorElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentScriptEditorElement.cs
deleted file mode 100644
index c218138e31f5..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentScriptEditorElement.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ContentScriptEditorElement : UmbracoConfigurationElement
-    {
-        [ConfigurationProperty("scriptFolderPath")]
-        internal InnerTextConfigurationElement<string> ScriptFolderPath
-        {
-            get { return GetOptionalTextElement("scriptFolderPath", "/scripts"); }
-        }
-
-        [ConfigurationProperty("scriptFileTypes")]
-        internal OptionalCommaDelimitedConfigurationElement ScriptFileTypes
-        {
-            get { return GetOptionalDelimitedElement("scriptFileTypes", new[] {"js", "xml"}); }
-        }
-
-        [ConfigurationProperty("scriptDisableEditor")]
-        internal InnerTextConfigurationElement<bool> ScriptEditorDisable
-        {
-            get { return GetOptionalTextElement("scriptDisableEditor", false); }
-        }
-
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index 00dc7f073d13..7701bc64cde5 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -11,24 +11,12 @@ public interface IContentSection : IUmbracoConfigurationSection
 
         IEnumerable<string> ImageFileTypes { get; }
 
-        IEnumerable<string> ImageTagAllowedAttributes { get; }
-
         IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
         
-        string ScriptFolderPath { get; }
-
-        IEnumerable<string> ScriptFileTypes { get; }
-
-        bool ScriptEditorDisable { get; }
-
         bool ResolveUrlsFromTextString { get; }
 
-        bool UploadAllowDirectories { get; }
-
         IEnumerable<IContentErrorPage> Error404Collection { get; }
 
-        bool EnsureUniqueNaming { get; }
-
         bool XmlCacheEnabled { get; }
 
         bool ContinouslyUpdateXmlDiskCache { get; }
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index a92b5562404c..53aa5a8179a7 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -185,7 +185,7 @@ internal static bool VerifyEditPath(string filePath, IEnumerable<string> validDi
         /// <param name="filePath">The filepath to validate.</param>
         /// <param name="validFileExtensions">The valid extensions.</param>
         /// <returns>A value indicating whether the filepath is valid.</returns>
-        internal static bool VerifyFileExtension(string filePath, List<string> validFileExtensions)
+        internal static bool VerifyFileExtension(string filePath, IEnumerable<string> validFileExtensions)
         {
             var ext = Path.GetExtension(filePath);
             return ext != null && validFileExtensions.Contains(ext.TrimStart('.'));
diff --git a/src/Umbraco.Core/IO/MediaPathSchemes/OriginalMediaPathScheme.cs b/src/Umbraco.Core/IO/MediaPathSchemes/OriginalMediaPathScheme.cs
index 1948a9f66294..52f84e990187 100644
--- a/src/Umbraco.Core/IO/MediaPathSchemes/OriginalMediaPathScheme.cs
+++ b/src/Umbraco.Core/IO/MediaPathSchemes/OriginalMediaPathScheme.cs
@@ -31,7 +31,7 @@ public string GetFilePath(IMediaFileSystem fileSystem, Guid itemGuid, Guid prope
                 // prevpath should be "<int>/<filename>" OR "<int>-<filename>"
                 // and we want to reuse the "<int>" part, so try to find it
 
-                var sep = Current.Configs.Settings().Content.UploadAllowDirectories ? "/" : "-";
+                const string sep = "/";
                 var pos = previous.IndexOf(sep, StringComparison.Ordinal);
                 var s = pos > 0 ? previous.Substring(0, pos) : null;
 
@@ -45,9 +45,7 @@ public string GetFilePath(IMediaFileSystem fileSystem, Guid itemGuid, Guid prope
             if (directory == null)
                 throw new InvalidOperationException("Cannot use a null directory.");
 
-            return Current.Configs.Settings().Content.UploadAllowDirectories
-                ? Path.Combine(directory, filename).Replace('\\', '/')
-                : directory + "-" + filename;
+            return Path.Combine(directory, filename).Replace('\\', '/');
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs
index 7176e092c9aa..d137d7ac76b8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs
@@ -17,12 +17,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     /// </remarks>
     internal class DocumentBlueprintRepository : DocumentRepository, IDocumentBlueprintRepository
     {
-        public DocumentBlueprintRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, ILanguageRepository languageRepository, IContentSection settings)
-            : base(scopeAccessor, appCaches, logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, settings)
+        public DocumentBlueprintRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, ILanguageRepository languageRepository)
+            : base(scopeAccessor, appCaches, logger, contentTypeRepository, templateRepository, tagRepository, languageRepository)
         {
-            EnsureUniqueNaming = false; // duplicates are allowed
         }
 
+        protected override bool EnsureUniqueNaming => false; // duplicates are allowed
+
         protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DocumentBlueprint;
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index dcac7f4ff40d..6af7031883b8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -30,7 +30,7 @@ internal class DocumentRepository : ContentRepositoryBase<int, IContent, Documen
         private readonly ContentByGuidReadRepository _contentByGuidReadRepository;
         private readonly IScopeAccessor _scopeAccessor;
 
-        public DocumentRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, ILanguageRepository languageRepository, IContentSection settings)
+        public DocumentRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, ILanguageRepository languageRepository)
             : base(scopeAccessor, appCaches, languageRepository, logger)
         {
             _contentTypeRepository = contentTypeRepository ?? throw new ArgumentNullException(nameof(contentTypeRepository));
@@ -39,12 +39,14 @@ public DocumentRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILo
             _appCaches = appCaches;
             _scopeAccessor = scopeAccessor;
             _contentByGuidReadRepository = new ContentByGuidReadRepository(this, scopeAccessor, appCaches, logger);
-            EnsureUniqueNaming = settings.EnsureUniqueNaming;
         }
 
         protected override DocumentRepository This => this;
 
-        public bool EnsureUniqueNaming { get; set; }
+        /// <summary>
+        /// Default is to always ensure all documents have unique names
+        /// </summary>
+        protected virtual bool EnsureUniqueNaming { get; } = true;
 
         // note: is ok to 'new' the repo here as it's a sub-repo really
         private PermissionRepository<IContent> PermissionRepository => _permissionRepository
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
index 38558e1ca5f6..65043c4c674a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
@@ -26,18 +26,16 @@ internal class MediaRepository : ContentRepositoryBase<int, IMedia, MediaReposit
         private readonly ITagRepository _tagRepository;
         private readonly MediaByGuidReadRepository _mediaByGuidReadRepository;
 
-        public MediaRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IMediaTypeRepository mediaTypeRepository, ITagRepository tagRepository, IContentSection contentSection, ILanguageRepository languageRepository)
+        public MediaRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IMediaTypeRepository mediaTypeRepository, ITagRepository tagRepository, ILanguageRepository languageRepository)
             : base(scopeAccessor, cache, languageRepository, logger)
         {
             _mediaTypeRepository = mediaTypeRepository ?? throw new ArgumentNullException(nameof(mediaTypeRepository));
             _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
             _mediaByGuidReadRepository = new MediaByGuidReadRepository(this, scopeAccessor, cache, logger);
-            EnsureUniqueNaming = contentSection.EnsureUniqueNaming;
         }
 
         protected override MediaRepository This => this;
 
-        public bool EnsureUniqueNaming { get; set; }
 
         #region Repository Base
 
@@ -543,10 +541,6 @@ private IMedia MapDtoToContent(ContentDto dto)
             media.ResetDirtyProperties(false);
             return media;
         }
-
-        protected override string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
-        {
-            return EnsureUniqueNaming == false ? nodeName : base.EnsureUniqueNodeName(parentId, nodeName, id);
-        }
+        
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
index 85b41a2a1c92..5806a179704b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
@@ -102,7 +102,7 @@ public bool ValidateScript(Script script)
             // validate path & extension
             var validDir = SystemDirectories.Scripts;
             var isValidPath = IOHelper.VerifyEditPath(fullPath, validDir);
-            var validExts = _contentConfig.ScriptFileTypes.ToList();
+            var validExts = new[] {"js"};
             var isValidExtension = IOHelper.VerifyFileExtension(script.Path, validExts);
             return isValidPath && isValidExtension;
         }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 366326cd8b23..1f10085e14ec 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -249,7 +249,6 @@
     <Compile Include="Configuration\UmbracoSettings\ContentErrorPageElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentErrorsElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentScriptEditorElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentSectionExtensions.cs" />
     <Compile Include="Configuration\UmbracoSettings\DisabledLogTypesCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ExternalLoggerElement.cs" />
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index d1b86c6c37cc..dceb6a2a8f60 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -42,32 +42,12 @@ public virtual void Can_Set_Multiple()
             Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(2).HasContentId);
         }
 
-        [Test]
-        public void ScriptFolderPath()
-        {
-            Assert.AreEqual(SettingsSection.Content.ScriptFolderPath, "/scripts");
-        }
-        [Test]
-        public void ScriptFileTypes()
-        {
-            Assert.IsTrue(SettingsSection.Content.ScriptFileTypes.All(x => "js,xml".Split(',').Contains(x)));
-        }
-        [Test]
-        public void DisableScriptEditor()
-        {
-            Assert.AreEqual(SettingsSection.Content.ScriptEditorDisable, false);
-        }
-
         [Test]
         public void ImageFileTypes()
         {
             Assert.IsTrue(SettingsSection.Content.ImageFileTypes.All(x => "jpeg,jpg,gif,bmp,png,tiff,tif".Split(',').Contains(x)));
         }
-        [Test]
-        public void AllowedAttributes()
-        {
-            Assert.IsTrue(SettingsSection.Content.ImageTagAllowedAttributes.All(x => "src,alt,border,class,style,align,id,name,onclick,usemap".Split(',').Contains(x)));
-        }
+        
         [Test]
         public virtual void ImageAutoFillProperties()
         {
@@ -83,12 +63,7 @@ public virtual void ImageAutoFillProperties()
             Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).LengthFieldAlias, "umbracoBytes2");
             Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).ExtensionFieldAlias, "umbracoExtension2");
         }
-
-        [Test]
-        public void UploadAllowDirectories()
-        {
-            Assert.IsTrue(SettingsSection.Content.UploadAllowDirectories);
-        }
+        
         [Test]
         public void DefaultDocumentTypeProperty()
         {
@@ -104,11 +79,6 @@ public void CloneXmlContent()
         {
             Assert.IsTrue(SettingsSection.Content.CloneXmlContent);
         }
-        [Test]
-        public void EnsureUniqueNaming()
-        {
-            Assert.IsTrue(SettingsSection.Content.EnsureUniqueNaming);
-        }
 
         [Test]
         public void ForceSafeAliases()
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index 96809c7bf6d9..2d45c24d0f0c 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -37,7 +37,7 @@ private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out Co
             var tagRepository = new TagRepository(scopeAccessor, cacheHelper, Logger);
             contentTypeRepository = new ContentTypeRepository(scopeAccessor, cacheHelper, Logger, templateRepository);
             var languageRepository = new LanguageRepository(scopeAccessor, cacheHelper, Logger);
-            var repository = new DocumentRepository(scopeAccessor, cacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(scopeAccessor, cacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
index bb2d981b074f..c2bfd77266fa 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
@@ -68,7 +68,7 @@ private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out Co
             var tagRepository = new TagRepository(scopeAccessor, appCaches, Logger);
             contentTypeRepository = new ContentTypeRepository(scopeAccessor, appCaches, Logger, templateRepository);
             var languageRepository = new LanguageRepository(scopeAccessor, appCaches, Logger);
-            var repository = new DocumentRepository(scopeAccessor, appCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(scopeAccessor, appCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
index 28df4b366add..d0da875332b6 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
@@ -24,7 +24,7 @@ private DomainRepository CreateRepository(IScopeProvider provider, out ContentTy
             var tagRepository = new TagRepository(accessor, Core.Cache.AppCaches.Disabled, Logger);
             contentTypeRepository = new ContentTypeRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, templateRepository);
             languageRepository = new LanguageRepository(accessor, Core.Cache.AppCaches.Disabled, Logger);
-            documentRepository = new DocumentRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, Mock.Of<IContentSection>());
+            documentRepository = new DocumentRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             var domainRepository = new DomainRepository(accessor, Core.Cache.AppCaches.Disabled, Logger);
             return domainRepository;
         }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index eaf0425edf7f..cbd591950a4e 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -37,7 +37,7 @@ private MediaRepository CreateRepository(IScopeProvider provider, out MediaTypeR
 
             mediaTypeRepository = new MediaTypeRepository(scopeAccessor, appCaches, Logger);
             var tagRepository = new TagRepository(scopeAccessor, appCaches, Logger);
-            var repository = new MediaRepository(scopeAccessor, appCaches, Logger, mediaTypeRepository, tagRepository, Mock.Of<IContentSection>(), Mock.Of<ILanguageRepository>());
+            var repository = new MediaRepository(scopeAccessor, appCaches, Logger, mediaTypeRepository, tagRepository, Mock.Of<ILanguageRepository>());
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
index b140aa078e99..684c8f9a2276 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
@@ -309,7 +309,7 @@ private DocumentRepository CreateRepository(IScopeProvider provider, out Content
             var tagRepository = new TagRepository(accessor, AppCaches, Logger);
             contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, templateRepository);
             var languageRepository = new LanguageRepository(accessor, AppCaches, Logger);
-            var repository = new DocumentRepository(accessor, AppCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(accessor, AppCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
index 6acd63b2b3a1..ddbf3bfc9d9c 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
@@ -957,7 +957,7 @@ private DocumentRepository CreateContentRepository(IScopeProvider provider, out
             var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger);
             contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, templateRepository);
             var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger);
-            var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
 
@@ -966,7 +966,7 @@ private MediaRepository CreateMediaRepository(IScopeProvider provider, out Media
             var accessor = (IScopeAccessor) provider;
             var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger);
             mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches.Disabled, Logger);
-            var repository = new MediaRepository(accessor, AppCaches.Disabled, Logger, mediaTypeRepository, tagRepository, Mock.Of<IContentSection>(), Mock.Of<ILanguageRepository>());
+            var repository = new MediaRepository(accessor, AppCaches.Disabled, Logger, mediaTypeRepository, tagRepository, Mock.Of<ILanguageRepository>());
             return repository;
         }
     }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
index a9fbfdf32215..8f0150277d73 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
@@ -240,7 +240,7 @@ public void Can_Perform_Delete_When_Assigned_To_Doc()
                 var tagRepository = new TagRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger);
                 var contentTypeRepository = new ContentTypeRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, templateRepository);
                 var languageRepository = new LanguageRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger);
-                var contentRepo = new DocumentRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, Mock.Of<IContentSection>());
+                var contentRepo = new DocumentRepository((IScopeAccessor) ScopeProvider, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
 
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index 779ec45a35e9..8f750f9238e4 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -28,7 +28,7 @@ private MediaRepository CreateMediaRepository(IScopeProvider provider, out IMedi
             var accessor = (IScopeAccessor) provider;
             mediaTypeRepository = new MediaTypeRepository(accessor, AppCaches, Mock.Of<ILogger>());
             var tagRepository = new TagRepository(accessor, AppCaches, Mock.Of<ILogger>());
-            var repository = new MediaRepository(accessor, AppCaches, Mock.Of<ILogger>(), mediaTypeRepository, tagRepository, Mock.Of<IContentSection>(), Mock.Of<ILanguageRepository>());
+            var repository = new MediaRepository(accessor, AppCaches, Mock.Of<ILogger>(), mediaTypeRepository, tagRepository, Mock.Of<ILanguageRepository>());
             return repository;
         }
 
@@ -45,7 +45,7 @@ private DocumentRepository CreateContentRepository(IScopeProvider provider, out
             var tagRepository = new TagRepository(accessor, AppCaches, Logger);
             contentTypeRepository = new ContentTypeRepository(accessor, AppCaches, Logger, templateRepository);
             var languageRepository = new LanguageRepository(accessor, AppCaches, Logger);
-            var repository = new DocumentRepository(accessor, AppCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(accessor, AppCaches, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
index bf74f6fd59d9..cb7a984ff37b 100644
--- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
+++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
@@ -167,7 +167,7 @@ public void Getting_100_Uncached_Items()
                 var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
                 var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, tRepository);
                 var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
-                var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository, Mock.Of<IContentSection>());
+                var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
 
                 // Act
                 Stopwatch watch = Stopwatch.StartNew();
@@ -200,7 +200,7 @@ public void Getting_1000_Uncached_Items()
                 var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
                 var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, tRepository);
                 var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
-                var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository, Mock.Of<IContentSection>());
+                var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
 
                 // Act
                 Stopwatch watch = Stopwatch.StartNew();
@@ -231,7 +231,7 @@ public void Getting_100_Cached_Items()
                 var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
                 var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, tRepository);
                 var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
-                var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository, Mock.Of<IContentSection>());
+                var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
 
                 // Act
                 var contents = repository.GetMany();
@@ -265,7 +265,7 @@ public void Getting_1000_Cached_Items()
                 var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
                 var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, tRepository);
                 var languageRepository = new LanguageRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
-                var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository, Mock.Of<IContentSection>());
+                var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
 
                 // Act
                 var contents = repository.GetMany();
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index f633c003bac6..37d34557bb8f 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -3041,7 +3041,7 @@ private DocumentRepository CreateRepository(IScopeProvider provider, out Content
             var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger);
             contentTypeRepository = new ContentTypeRepository(accessor, AppCaches.Disabled, Logger, templateRepository);
             var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger);
-            var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(accessor, AppCaches.Disabled, Logger, contentTypeRepository, templateRepository, tagRepository, languageRepository);
             return repository;
         }
     }
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 3a1312898b78..616eca9d6b9a 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -18,14 +18,14 @@
       <error404>1</error404>
       <!--
         The value for error pages can be:
-        * A content item's integer ID   (example: 1234)
         * A content item's GUID ID      (example: 26C1D84F-C900-4D53-B167-E25CC489DAC8)
         * An XPath statement            (example: //errorPages[@nodeName='My cool error']
+        * A content item's integer ID   (example: 1234)
       -->
       <!--
         <error404>
-            <errorPage culture="default">1</errorPage>
-            <errorPage culture="en-US">200</errorPage>
+            <errorPage culture="default">26C1D84F-C900-4D53-B167-E25CC489DAC8</errorPage>
+            <errorPage culture="en-US">D820E120-6865-4D88-BFFE-48801A6AC375</errorPage>
         </error404>
        -->
     </errors>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 026bfa17b507..07aee4481ca5 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -5,189 +5,174 @@
         <tours enable="true"></tours>
     </backOffice>
 
-  <content>
-    <imaging>
-      <!-- what file extension that should cause umbraco to create thumbnails -->
-      <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif,svg</imageFileTypes>
-      <!-- what attributes that are allowed in the editor on an img tag -->
-      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
-      <!-- automatically updates dimension, filesize and extension attributes on upload -->
-      <autoFillImageProperties>
-        <uploadField alias="umbracoFile">
-          <widthFieldAlias>umbracoWidth</widthFieldAlias> 
-          <heightFieldAlias>umbracoHeight</heightFieldAlias>
-          <lengthFieldAlias>umbracoBytes</lengthFieldAlias>
-          <extensionFieldAlias>umbracoExtension</extensionFieldAlias>
-        </uploadField>
-      </autoFillImageProperties>
-
-    </imaging>
-    <scripteditor>
-      <!-- Path to script folder - no ending "/" -->
-      <scriptFolderPath>/scripts</scriptFolderPath>
-      <!-- what files can be opened/created in the script editor -->
-      <scriptFileTypes>js,xml</scriptFileTypes>
-      <!-- disable the codemirror editor and use a simple textarea instead -->
-      <scriptDisableEditor>false</scriptDisableEditor>
-    </scripteditor>
-
-    <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
-		should be set to false if the application pool's user account hasn't got readrights of the driveroot up to the /media directory -->
-    <UploadAllowDirectories>True</UploadAllowDirectories>
-    <errors>
-      <!-- the id of the page that should be shown if the page is not found -->
-      <!--<error404>
+    <content>
+        <imaging>
+            <!-- what file extension should umbraco determine are images for uploaded files -->
+            <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif,svg</imageFileTypes>
+            <!-- defines the property that contains an image with a URL and the properties to update with it's dimensions -->
+            <autoFillImageProperties>
+                <uploadField alias="umbracoFile">
+                    <widthFieldAlias>umbracoWidth</widthFieldAlias>
+                    <heightFieldAlias>umbracoHeight</heightFieldAlias>
+                    <lengthFieldAlias>umbracoBytes</lengthFieldAlias>
+                    <extensionFieldAlias>umbracoExtension</extensionFieldAlias>
+                </uploadField>
+            </autoFillImageProperties>
+
+        </imaging>
+
+        <errors>
+            <!-- the id of the page that should be shown if the page is not found -->
+            <!--<error404>
                    <errorPage culture="default">1</errorPage>
                    <errorPage culture="en-US">200</errorPage>
             </error404>-->
-      <error404>
-        <errorPage culture="default">1</errorPage>
-        <errorPage culture="fr-FR">1079</errorPage>
-        <errorPage culture="en-US">1080</errorPage>
-      </error404>
-    </errors>
-    <notifications>
-      <!-- the email that should be used as from mail when umbraco sends a notification -->
-      <!-- you can add a display name to the email like this: <email>Your display name here &lt;your@email.here&gt;</email> -->
-      <email>your@email.here</email>
-    </notifications>
-
-    <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
-    <ensureUniqueNaming>True</ensureUniqueNaming>
-
-    <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
-    <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
-    <ForceSafeAliases>true</ForceSafeAliases>
-
-    <!-- Enable / disable xml content cache -->
-    <XmlCacheEnabled>True</XmlCacheEnabled>
-
-    <!-- Update disk cache every time content has changed -->
-    <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
-
-    <!-- Update in-memory cache if xml file is changed -->
-    <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
-
-    <!-- Show property descriptions in editing view "icon|text|none" -->
-    <PropertyContextHelpOption>text</PropertyContextHelpOption>
-
-    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
-    <PreviewBadge>
-      <![CDATA[
+            <error404>
+                <errorPage culture="default">1</errorPage>
+                <errorPage culture="fr-FR">1079</errorPage>
+                <errorPage culture="en-US">1080</errorPage>
+            </error404>
+        </errors>
+        <notifications>
+            <!-- the email that should be used as from mail when umbraco sends a notification -->
+            <!-- you can add a display name to the email like this: <email>Your display name here &lt;your@email.here&gt;</email> -->
+            <email>your@email.here</email>
+        </notifications>
+
+        <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
+        <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
+        <ForceSafeAliases>true</ForceSafeAliases>
+
+        <!-- Enable / disable xml content cache -->
+        <XmlCacheEnabled>True</XmlCacheEnabled>
+
+        <!-- Update disk cache every time content has changed -->
+        <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
+
+        <!-- Update in-memory cache if xml file is changed -->
+        <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
+
+        <!-- Show property descriptions in editing view "icon|text|none" -->
+        <PropertyContextHelpOption>text</PropertyContextHelpOption>
+
+        <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
+        <PreviewBadge>
+            <![CDATA[
       <a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{0}/assets/img/preview-mode-badge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/preview/end?redir={1}'"><span style="display:none;">In Preview Mode - click to end</span></a>
-    ]]></PreviewBadge>
+    ]]>
+        </PreviewBadge>
 
 
-    <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
-    <!-- Setting this to true can increase render time for pages with a large number of links -->
-    <!-- If running Umbraco in virtual directory this *must* be set to true! -->
-    <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
+        <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
+        <!-- Setting this to true can increase render time for pages with a large number of links -->
+        <!-- If running Umbraco in virtual directory this *must* be set to true! -->
+        <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
 
-    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
+        <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
          - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
          - silent - Silently suppress the error and do not render the offending macro.
          - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
                     error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
          Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
-    <MacroErrors>throw</MacroErrors>
+        <MacroErrors>throw</MacroErrors>
 
-    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
+        <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
+        <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
 
-    <!-- If completed, only the file extensions listed below will be allowed to be uploaded.  If empty, disallowedUploadFiles will apply to prevent upload of specific file extensions. -->
-    <allowedUploadFiles></allowedUploadFiles>
+        <!-- If completed, only the file extensions listed below will be allowed to be uploaded.  If empty, disallowedUploadFiles will apply to prevent upload of specific file extensions. -->
+        <allowedUploadFiles></allowedUploadFiles>
 
-    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
-    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
+        <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
+        <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
 
-    <showDeprecatedPropertyEditors>false</showDeprecatedPropertyEditors>
+        <showDeprecatedPropertyEditors>false</showDeprecatedPropertyEditors>
 
-    <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
-    <!--
+        <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
+        <!--
     <EnablePropertyValueConverters>true</EnablePropertyValueConverters>
     -->
 
-    <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
-    <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
-
-  </content>
-
-  <security>
-    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-    <keepUserLoggedIn>true</keepUserLoggedIn>
-
-    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
-    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
-
-    <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
-    <allowPasswordReset>true</allowPasswordReset>
-
-  </security>
-
-  <requestHandler>
-    <!-- this will ensure that urls are unique when running with multiple root nodes -->
-    <useDomainPrefixes>false</useDomainPrefixes>
-    <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-    <addTrailingSlash>true</addTrailingSlash>
-    <urlReplacing removeDoubleDashes="true" toAscii="try">
-      <char org=" ">-</char>
-      <char org="&quot;"></char>
-      <char org="'"></char>
-      <char org="%"></char>
-      <char org="."></char>
-      <char org=";"></char>
-      <char org="/"></char>
-      <char org="\"></char>
-      <char org=":"></char>
-      <char org="#"></char>
-      <char org="+">plus</char>
-      <char org="*">star</char>
-      <char org="&amp;"></char>
-      <char org="?"></char>
-      <char org="æ">ae</char>
-      <char org="ø">oe</char>
-      <char org="Ã¥">aa</char>
-      <char org="ä">ae</char>
-      <char org="ö">oe</char>
-      <char org="ü">ue</char>
-      <char org="ß">ss</char>
-      <char org="Ä">ae</char>
-      <char org="Ö">oe</char>
-      <char org="|">-</char>
-      <char org="&lt;"></char>
-      <char org="&gt;"></char>
-    </urlReplacing>
-  </requestHandler>
-
-  <!--
+        <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
+        <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
+
+    </content>
+
+    <security>
+        <!-- set to true to auto update login interval (and there by disabling the lock screen -->
+        <keepUserLoggedIn>true</keepUserLoggedIn>
+
+        <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
+        <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
+
+        <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
+        <allowPasswordReset>true</allowPasswordReset>
+
+    </security>
+
+    <requestHandler>
+        <!-- this will ensure that urls are unique when running with multiple root nodes -->
+        <useDomainPrefixes>false</useDomainPrefixes>
+        <!-- this will add a trailing slash (/) to urls when in directory url mode -->
+        <addTrailingSlash>true</addTrailingSlash>
+        <urlReplacing removeDoubleDashes="true" toAscii="try">
+            <char org=" ">-</char>
+            <char org="&quot;"></char>
+            <char org="'"></char>
+            <char org="%"></char>
+            <char org="."></char>
+            <char org=";"></char>
+            <char org="/"></char>
+            <char org="\"></char>
+            <char org=":"></char>
+            <char org="#"></char>
+            <char org="+">plus</char>
+            <char org="*">star</char>
+            <char org="&amp;"></char>
+            <char org="?"></char>
+            <char org="æ">ae</char>
+            <char org="ø">oe</char>
+            <char org="Ã¥">aa</char>
+            <char org="ä">ae</char>
+            <char org="ö">oe</char>
+            <char org="ü">ue</char>
+            <char org="ß">ss</char>
+            <char org="Ä">ae</char>
+            <char org="Ö">oe</char>
+            <char org="|">-</char>
+            <char org="&lt;"></char>
+            <char org="&gt;"></char>
+        </urlReplacing>
+    </requestHandler>
+
+    <!--
 		Now that we have external logging enabled, this section is only used for what gets logged to the umbracoLog table
 		which currently logs items used in the audit trail and roll back scenarios.
 		-->
-  <logging>
-    <enableLogging>true</enableLogging>
-    <enableAsyncLogging>true</enableAsyncLogging>
-    <disabledLogTypes>
-      <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
-    </disabledLogTypes>
-    <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
-    <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
-    <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
-  </logging>
-
-  <scheduledTasks>
-    <!-- add tasks that should be called with an interval (seconds) -->
-    <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
-  </scheduledTasks>
-
-  <providers>
-    <users>
-      <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
-      <!-- specify it here (remember to add it to the web.config as well) -->
-      <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
-    </users>
-  </providers>
-
-  <!--
+    <logging>
+        <enableLogging>true</enableLogging>
+        <enableAsyncLogging>true</enableAsyncLogging>
+        <disabledLogTypes>
+            <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
+        </disabledLogTypes>
+        <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
+        <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
+        <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
+    </logging>
+
+    <scheduledTasks>
+        <!-- add tasks that should be called with an interval (seconds) -->
+        <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
+    </scheduledTasks>
+
+    <providers>
+        <users>
+            <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
+            <!-- specify it here (remember to add it to the web.config as well) -->
+            <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
+        </users>
+    </providers>
+
+    <!--
     web.routing
       @trySkipIisCustomErrors
         Tries to skip IIS custom errors.
@@ -220,10 +205,10 @@
         Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
         path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
   -->
-  <web.routing
-    trySkipIisCustomErrors="false"
-    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
-    umbracoApplicationUrl="">
-  </web.routing>
+    <web.routing
+      trySkipIisCustomErrors="false"
+      internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
+      umbracoApplicationUrl="">
+    </web.routing>
 
 </settings>
diff --git a/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
similarity index 84%
rename from src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
rename to src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
index 1f01270bc6fb..382ee6fe122c 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
@@ -11,14 +11,14 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Provides an implementation of <see cref="IContentFinder"/> that runs the legacy 404 logic.
     /// </summary>
-    public class ContentFinderByLegacy404 : IContentLastChanceFinder
+    public class ContentFinderByConfigured404 : IContentLastChanceFinder
     {
 
         private readonly ILogger _logger;
         private readonly IEntityService _entityService;
         private readonly IContentSection _contentConfigSection;
 
-        public ContentFinderByLegacy404(ILogger logger, IEntityService entityService, IContentSection contentConfigSection)
+        public ContentFinderByConfigured404(ILogger logger, IEntityService entityService, IContentSection contentConfigSection)
         {
             _logger = logger;
             _entityService = entityService;
@@ -32,7 +32,7 @@ public ContentFinderByLegacy404(ILogger logger, IEntityService entityService, IC
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         public bool TryFindContent(PublishedRequest frequest)
         {
-            _logger.Debug<ContentFinderByLegacy404>("Looking for a page to handle 404.");
+            _logger.Debug<ContentFinderByConfigured404>("Looking for a page to handle 404.");
 
             // try to find a culture as best as we can
             var errorCulture = CultureInfo.CurrentUICulture;
@@ -70,17 +70,17 @@ public bool TryFindContent(PublishedRequest frequest)
 
             if (error404.HasValue)
             {
-                _logger.Debug<ContentFinderByLegacy404>("Got id={ErrorNodeId}.", error404.Value);
+                _logger.Debug<ContentFinderByConfigured404>("Got id={ErrorNodeId}.", error404.Value);
 
                 content = frequest.UmbracoContext.ContentCache.GetById(error404.Value);
 
-                _logger.Debug<ContentFinderByLegacy404>(content == null
+                _logger.Debug<ContentFinderByConfigured404>(content == null
                     ? "Could not find content with that id."
                     : "Found corresponding content.");
             }
             else
             {
-                _logger.Debug<ContentFinderByLegacy404>("Got nothing.");
+                _logger.Debug<ContentFinderByConfigured404>("Got nothing.");
             }
 
             frequest.PublishedContent = content;
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 3c593d383faf..de3ca47b383d 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -151,7 +151,7 @@ public override void Compose(Composition composition)
                 .Append<DefaultUrlProvider>()
                 .Append<CustomRouteUrlProvider>();
 
-            composition.RegisterUnique<IContentLastChanceFinder, ContentFinderByLegacy404>();
+            composition.RegisterUnique<IContentLastChanceFinder, ContentFinderByConfigured404>();
 
             composition.WithCollectionBuilder<ContentFinderCollectionBuilder>()
                 // all built-in finders in the correct order,
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8144056128a9..c235f8652a48 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1100,7 +1100,7 @@
     <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
     <Compile Include="RouteCollectionExtensions.cs" />
     <Compile Include="Routing\AliasUrlProvider.cs" />
-    <Compile Include="Routing\ContentFinderByLegacy404.cs" />
+    <Compile Include="Routing\ContentFinderByConfigured404.cs" />
     <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
     <Compile Include="Routing\ISiteDomainHelper.cs" />
     <Compile Include="Routing\RoutableAttemptEventArgs.cs" />

From 3dce2c870e79741f55fe6b538d23722990e35cbc Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 23:52:35 +1100
Subject: [PATCH 175/421] removes XmlCacheEnabled,
 ContinouslyUpdateXmlDiskCache, XmlContentCheckForDiskChanges from umb
 settings

---
 .../UmbracoSettings/ContentElement.cs         | 15 ------------
 .../UmbracoSettings/IContentSection.cs        |  6 -----
 .../ContentElementDefaultTests.cs             |  7 +-----
 .../UmbracoSettings/ContentElementTests.cs    | 15 ------------
 .../UmbracoSettings/umbracoSettings.config    | 24 +------------------
 .../LegacyXmlPublishedCache/XmlStore.cs       |  6 ++---
 src/Umbraco.Tests/Scoping/ScopedXmlTests.cs   |  9 -------
 .../config/umbracoSettings.config             | 10 +-------
 8 files changed, 6 insertions(+), 86 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index de2f9d4c9ee0..d0e80e2c0d53 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -22,15 +22,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         [ConfigurationProperty("notifications", IsRequired = true)]
         internal NotificationsElement Notifications => (NotificationsElement) base["notifications"];
 
-        [ConfigurationProperty("XmlCacheEnabled")]
-        internal InnerTextConfigurationElement<bool> XmlCacheEnabled => GetOptionalTextElement("XmlCacheEnabled", true);
-
-        [ConfigurationProperty("ContinouslyUpdateXmlDiskCache")]
-        internal InnerTextConfigurationElement<bool> ContinouslyUpdateXmlDiskCache => GetOptionalTextElement("ContinouslyUpdateXmlDiskCache", true);
-
-        [ConfigurationProperty("XmlContentCheckForDiskChanges")]
-        internal InnerTextConfigurationElement<bool> XmlContentCheckForDiskChanges => GetOptionalTextElement("XmlContentCheckForDiskChanges", false);
-
         [ConfigurationProperty("PropertyContextHelpOption")]
         internal InnerTextConfigurationElement<string> PropertyContextHelpOption => GetOptionalTextElement("PropertyContextHelpOption", "text");
 
@@ -80,12 +71,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         bool IContentSection.ResolveUrlsFromTextString => ResolveUrlsFromTextString;
 
-        bool IContentSection.XmlCacheEnabled => XmlCacheEnabled;
-
-        bool IContentSection.ContinouslyUpdateXmlDiskCache => ContinouslyUpdateXmlDiskCache;
-
-        bool IContentSection.XmlContentCheckForDiskChanges => XmlContentCheckForDiskChanges;
-
         string IContentSection.PropertyContextHelpOption => PropertyContextHelpOption;
 
         bool IContentSection.ForceSafeAliases => ForceSafeAliases;
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index 7701bc64cde5..5fb3ff538e70 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -17,12 +17,6 @@ public interface IContentSection : IUmbracoConfigurationSection
 
         IEnumerable<IContentErrorPage> Error404Collection { get; }
 
-        bool XmlCacheEnabled { get; }
-
-        bool ContinouslyUpdateXmlDiskCache { get; }
-
-        bool XmlContentCheckForDiskChanges { get; }
-
         string PropertyContextHelpOption { get; }
 
         bool ForceSafeAliases { get; }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
index 31772ef737b4..5fb896abb2be 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
@@ -35,11 +35,6 @@ public override void ImageAutoFillProperties()
             Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).LengthFieldAlias == "umbracoBytes");
             Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).ExtensionFieldAlias == "umbracoExtension");
         }
-
-        [Test]
-        public override void XmlContentCheckForDiskChanges()
-        {
-            Assert.IsTrue(SettingsSection.Content.XmlContentCheckForDiskChanges == false);
-        }
+        
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index dceb6a2a8f60..4f34b3216440 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -85,21 +85,6 @@ public void ForceSafeAliases()
         {
             Assert.IsTrue(SettingsSection.Content.ForceSafeAliases);
         }
-        [Test]
-        public void XmlCacheEnabled()
-        {
-            Assert.IsTrue(SettingsSection.Content.XmlCacheEnabled);
-        }
-        [Test]
-        public void ContinouslyUpdateXmlDiskCache()
-        {
-            Assert.IsTrue(SettingsSection.Content.ContinouslyUpdateXmlDiskCache);
-        }
-        [Test]
-        public virtual void XmlContentCheckForDiskChanges()
-        {
-            Assert.IsTrue(SettingsSection.Content.XmlContentCheckForDiskChanges);
-        }
         
         [Test]
         public void PropertyContextHelpOption()
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index b3ca1524c923..85d1321bfbf2 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -4,8 +4,6 @@
     <imaging>
       <!-- what file extension that should cause umbraco to create thumbnails -->
       <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
-      <!-- what attributes that are allowed in the editor on an img tag -->
-      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
       <!-- automatically updates dimension, filesize and extension attributes on upload -->
       <autoFillImageProperties>
         <uploadField alias="umbracoFile">
@@ -22,18 +20,7 @@
         </uploadField>
       </autoFillImageProperties>      
     </imaging>
-    <scripteditor>
-      <!-- Path to script folder - no ending "/" -->
-      <scriptFolderPath>/scripts</scriptFolderPath>
-      <!-- what files can be opened/created in the script editor -->
-      <scriptFileTypes>js,xml</scriptFileTypes>
-      <!-- disable the codemirror editor and use a simple textarea instead -->
-      <scriptDisableEditor>false</scriptDisableEditor>
-    </scripteditor>
-
-    <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
-		should be set to false if the application pool's user account hasn't got readrights of the driveroot up to the /media directory -->
-    <UploadAllowDirectories>True</UploadAllowDirectories>
+   
     <errors>
       <!-- the id of the page that should be shown if the page is not found -->
       <!--<error404>
@@ -56,15 +43,6 @@
     <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
     <ensureUniqueNaming>True</ensureUniqueNaming>
 
-    <!-- Enable / disable xml content cache -->
-    <XmlCacheEnabled>True</XmlCacheEnabled>
-
-    <!-- Update disk cache every time content has changed -->
-    <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
-
-    <!-- Update in-memory cache if xml file is changed -->
-    <XmlContentCheckForDiskChanges>True</XmlContentCheckForDiskChanges>
-
     <!-- Show property descriptions in editing view "icon|text|none" -->
     <PropertyContextHelpOption>text</PropertyContextHelpOption>
 
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
index 3fb3d40e5bbb..e7aa4a216ee8 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
@@ -254,13 +254,13 @@ public void Dispose()
         private readonly bool _xmlFileEnabled = true;
 
         // whether the disk cache is enabled
-        private bool XmlFileEnabled => _xmlFileEnabled && Current.Configs.Settings().Content.XmlCacheEnabled;
+        private bool XmlFileEnabled => true;
 
         // whether the disk cache is enabled and to update the disk cache when xml changes
-        private bool SyncToXmlFile => XmlFileEnabled && Current.Configs.Settings().Content.ContinouslyUpdateXmlDiskCache;
+        private bool SyncToXmlFile => true;
 
         // whether the disk cache is enabled and to reload from disk cache if it changes
-        private bool SyncFromXmlFile => XmlFileEnabled && Current.Configs.Settings().Content.XmlContentCheckForDiskChanges;
+        private bool SyncFromXmlFile => false;
 
         // whether _xml is immutable or not (achieved by cloning before changing anything)
         private static bool XmlIsImmutable => Current.Configs.Settings().Content.CloneXmlContent;
diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
index f1fd0c592b83..1d07ec074fed 100644
--- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
@@ -85,10 +85,6 @@ public void TestScope(bool complete)
             Assert.AreSame(umbracoContext, Umbraco.Web.Composing.Current.UmbracoContext);
             Assert.AreSame(XmlStore, ((PublishedContentCache) umbracoContext.ContentCache).XmlStore);
 
-            // settings
-            var contentMock = Mock.Get(Factory.GetInstance<IUmbracoSettingsSection>().Content);
-            contentMock.Setup(x => x.XmlCacheEnabled).Returns(false);
-
             // create document type, document
             var contentType = new ContentType(-1) { Alias = "CustomDocument", Name = "Custom Document" };
             Current.Services.ContentTypeService.Save(contentType);
@@ -203,11 +199,6 @@ public void TestScopeMany(bool complete)
             Assert.AreSame(umbracoContext, Umbraco.Web.Composing.Current.UmbracoContext);
             Assert.AreSame(XmlStore, ((PublishedContentCache)umbracoContext.ContentCache).XmlStore);
 
-            // settings
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var contentMock = Mock.Get(Factory.GetInstance<IUmbracoSettingsSection>().Content);
-            contentMock.Setup(x => x.XmlCacheEnabled).Returns(false);
-
             // create document type
             var contentType = new ContentType(-1) { Alias = "CustomDocument", Name = "Custom Document" };
             Current.Services.ContentTypeService.Save(contentType);
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 07aee4481ca5..9a7d39a5a4dc 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -41,17 +41,9 @@
 
         <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
         <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
+        <!-- fixme: remove this -->
         <ForceSafeAliases>true</ForceSafeAliases>
 
-        <!-- Enable / disable xml content cache -->
-        <XmlCacheEnabled>True</XmlCacheEnabled>
-
-        <!-- Update disk cache every time content has changed -->
-        <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
-
-        <!-- Update in-memory cache if xml file is changed -->
-        <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
-
         <!-- Show property descriptions in editing view "icon|text|none" -->
         <PropertyContextHelpOption>text</PropertyContextHelpOption>
 

From fe2af90caa9374f0cc160469a1351c833f55b4a4 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 30 Jan 2019 13:56:50 +0100
Subject: [PATCH 176/421] #4229 - If the property do not support variantions,
 we need to validate the default language

---
 src/Umbraco.Core/Models/ContentBase.cs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index ca1152a9a42b..2187842aa15f 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -380,9 +380,22 @@ public virtual Property[] ValidateProperties(string culture = "*")
         {
             var alsoInvariant = culture != null && culture != "*";
 
-            return Properties.Where(x => // select properties...
-                    x.PropertyType.SupportsVariation(culture, "*", true) && // that support the variation
-                    (!x.IsValid(culture) || (alsoInvariant && !x.IsValid(null)))) // and are not valid
+            return Properties.Where(x =>
+                {
+                    var supportVariation = x.PropertyType.SupportsVariation(culture, "*", true);
+
+                    if (supportVariation)
+                    {
+                        // If the property support variation then we report an error
+                        // when property is invalid for current culture OR property is invalid for invariant
+                        return !x.IsValid(culture) || (alsoInvariant && !x.IsValid(null));
+                    }
+
+                    // Else we report error if the property is invalid for the default language
+                    return !x.IsValid();
+
+
+                })
                 .ToArray();
         }
 

From f1b168fc46bdd2023af94e1469592fdfa4ff592f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Jan 2019 23:58:54 +1100
Subject: [PATCH 177/421] removes ForceSafeAliases from umbraco settings,
 etc...

---
 .../UmbracoSettings/ContentElement.cs         |  5 ----
 .../UmbracoSettings/IContentSection.cs        |  2 --
 .../Services/Implement/EntityXmlSerializer.cs |  9 +++-----
 src/Umbraco.Core/StringExtensions.cs          | 23 -------------------
 .../Strings/DefaultShortStringHelperConfig.cs |  6 +----
 .../UmbracoSettings/ContentElementTests.cs    |  6 -----
 .../UmbracoSettings/umbracoSettings.config    |  2 --
 src/Umbraco.Tests/Models/ContentXmlTest.cs    |  2 +-
 src/Umbraco.Tests/Models/MediaXmlTest.cs      |  2 +-
 .../TestHelpers/SettingsForTests.cs           |  1 -
 .../config/umbracoSettings.config             |  5 ----
 11 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index d0e80e2c0d53..a01471888242 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -25,9 +25,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         [ConfigurationProperty("PropertyContextHelpOption")]
         internal InnerTextConfigurationElement<string> PropertyContextHelpOption => GetOptionalTextElement("PropertyContextHelpOption", "text");
 
-        [ConfigurationProperty("ForceSafeAliases")]
-        internal InnerTextConfigurationElement<bool> ForceSafeAliases => GetOptionalTextElement("ForceSafeAliases", true);
-
         [ConfigurationProperty("PreviewBadge")]
         internal InnerTextConfigurationElement<string> PreviewBadge => GetOptionalTextElement("PreviewBadge", DefaultPreviewBadge);
 
@@ -73,8 +70,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         string IContentSection.PropertyContextHelpOption => PropertyContextHelpOption;
 
-        bool IContentSection.ForceSafeAliases => ForceSafeAliases;
-
         string IContentSection.PreviewBadge => PreviewBadge;
 
         MacroErrorBehaviour IContentSection.MacroErrorBehaviour => MacroErrors;
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index 5fb3ff538e70..8e77d9b722f5 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -19,8 +19,6 @@ public interface IContentSection : IUmbracoConfigurationSection
 
         string PropertyContextHelpOption { get; }
 
-        bool ForceSafeAliases { get; }
-
         string PreviewBadge { get; }
 
         MacroErrorBehaviour MacroErrorBehaviour { get; }
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 6a8514f0a027..863ecc0b1bee 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -51,8 +51,7 @@ public XElement Serialize(IContent content,
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
 
-            // nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
-            var nodeName = content.ContentType.Alias.ToSafeAliasWithForcingCheck();
+            var nodeName = content.ContentType.Alias.ToSafeAlias();
 
             var xml = SerializeContentBase(content, content.GetUrlSegment(_urlSegmentProviders), nodeName, published);
 
@@ -98,8 +97,7 @@ public XElement Serialize(
             if (media == null) throw new ArgumentNullException(nameof(media));
             if (_urlSegmentProviders == null) throw new ArgumentNullException(nameof(_urlSegmentProviders));
 
-            // nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
-            var nodeName = media.ContentType.Alias.ToSafeAliasWithForcingCheck();
+            var nodeName = media.ContentType.Alias.ToSafeAlias();
 
             const bool published = false; // always false for media
             var xml = SerializeContentBase(media, media.GetUrlSegment(_urlSegmentProviders), nodeName, published);
@@ -134,8 +132,7 @@ public XElement Serialize(
         /// </summary>
         public XElement Serialize(IMember member)
         {
-            // nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
-            var nodeName = member.ContentType.Alias.ToSafeAliasWithForcingCheck();
+            var nodeName = member.ContentType.Alias.ToSafeAlias();
 
             const bool published = false; // always false for member
             var xml = SerializeContentBase(member, "", nodeName, published);
diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index 95c8d3e17f80..b80149a4ef8b 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -1108,29 +1108,6 @@ public static string ToSafeAlias(this string alias, string culture)
             return Current.ShortStringHelper.CleanStringForSafeAlias(alias, culture);
         }
 
-        /// <summary>
-        /// Cleans (but only if required) a string to produce a string that can safely be used in an alias.
-        /// </summary>
-        /// <param name="alias">The text to filter.</param>
-        /// <returns>The safe alias.</returns>
-        /// <remarks>Checks <c>UmbracoSettings.ForceSafeAliases</c> to determine whether it should filter the text.</remarks>
-        public static string ToSafeAliasWithForcingCheck(this string alias)
-        {
-            return Current.Configs.Settings().Content.ForceSafeAliases ? alias.ToSafeAlias() : alias;
-        }
-
-        /// <summary>
-        /// Cleans (but only if required) a string, in the context of a specified culture, to produce a string that can safely be used in an alias.
-        /// </summary>
-        /// <param name="alias">The text to filter.</param>
-        /// <param name="culture">The culture.</param>
-        /// <returns>The safe alias.</returns>
-        /// <remarks>Checks <c>UmbracoSettings.ForceSafeAliases</c> to determine whether it should filter the text.</remarks>
-        public static string ToSafeAliasWithForcingCheck(this string alias, string culture)
-        {
-            return Current.Configs.Settings().Content.ForceSafeAliases ? alias.ToSafeAlias(culture) : alias;
-        }
-
         // the new methods to get a url segment
 
         /// <summary>
diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
index f75b8e4d1fe2..e75e00defb7c 100644
--- a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
+++ b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
@@ -14,7 +14,6 @@ public DefaultShortStringHelperConfig Clone()
             var config = new DefaultShortStringHelperConfig
             {
                 DefaultCulture = DefaultCulture,
-                ForceSafeAliases = ForceSafeAliases,
                 UrlReplaceCharacters = UrlReplaceCharacters
             };
 
@@ -31,9 +30,7 @@ public DefaultShortStringHelperConfig Clone()
         public string DefaultCulture { get; set; } = ""; // invariant
 
         public Dictionary<string, string> UrlReplaceCharacters { get; set; }
-
-        public bool ForceSafeAliases { get; set; }
-
+        
         public DefaultShortStringHelperConfig WithConfig(Config config)
         {
             return WithConfig(DefaultCulture, CleanStringType.RoleMask, config);
@@ -62,7 +59,6 @@ public DefaultShortStringHelperConfig WithConfig(string culture, CleanStringType
         /// <returns>The short string helper.</returns>
         public DefaultShortStringHelperConfig WithDefault(IUmbracoSettingsSection umbracoSettings)
         {
-            ForceSafeAliases = umbracoSettings.Content.ForceSafeAliases;
             UrlReplaceCharacters = umbracoSettings.RequestHandler.CharCollection
                 .Where(x => string.IsNullOrEmpty(x.Char) == false)
                 .ToDictionary(x => x.Char, x => x.Replacement);
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 4f34b3216440..1933911bb276 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -79,12 +79,6 @@ public void CloneXmlContent()
         {
             Assert.IsTrue(SettingsSection.Content.CloneXmlContent);
         }
-
-        [Test]
-        public void ForceSafeAliases()
-        {
-            Assert.IsTrue(SettingsSection.Content.ForceSafeAliases);
-        }
         
         [Test]
         public void PropertyContextHelpOption()
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 85d1321bfbf2..ee12a66ba8b6 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -48,8 +48,6 @@
 
     <cloneXmlContent>true</cloneXmlContent>
 
-    <ForceSafeAliases>true</ForceSafeAliases>
-
     <PreviewBadge>
       <![CDATA[
       <a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{0}/assets/img/preview-mode-badge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/preview/end?redir={1}'"><span style="display:none;">In Preview Mode - click to end</span></a>
diff --git a/src/Umbraco.Tests/Models/ContentXmlTest.cs b/src/Umbraco.Tests/Models/ContentXmlTest.cs
index 5cc86a43225a..fbef2cc1038c 100644
--- a/src/Umbraco.Tests/Models/ContentXmlTest.cs
+++ b/src/Umbraco.Tests/Models/ContentXmlTest.cs
@@ -27,7 +27,7 @@ public void Can_Generate_Xml_Representation_Of_Content()
             var content = MockedContent.CreateTextpageContent(contentType, "Root Home", -1);
             ServiceContext.ContentService.Save(content, Constants.Security.SuperUserId);
 
-            var nodeName = content.ContentType.Alias.ToSafeAliasWithForcingCheck();
+            var nodeName = content.ContentType.Alias.ToSafeAlias();
             var urlName = content.GetUrlSegment(new[]{new DefaultUrlSegmentProvider() });
 
             // Act
diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs
index d0d00c64a6cf..3ae9414dc187 100644
--- a/src/Umbraco.Tests/Models/MediaXmlTest.cs
+++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs
@@ -47,7 +47,7 @@ public void Can_Generate_Xml_Representation_Of_Media()
             media.SetValue(Constants.Conventions.Media.Bytes, "100");
             media.SetValue(Constants.Conventions.Media.Extension, "png");
 
-            var nodeName = media.ContentType.Alias.ToSafeAliasWithForcingCheck();
+            var nodeName = media.ContentType.Alias.ToSafeAlias();
             var urlName = media.GetUrlSegment(new[] { new DefaultUrlSegmentProvider() });
 
             // Act
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index ad6699b6d525..df4ec37a1915 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -51,7 +51,6 @@ public static IUmbracoSettingsSection GenerateMockUmbracoSettings()
             settings.Setup(x => x.WebRouting).Returns(routing.Object);
 
             //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
-            settings.Setup(x => x.Content.ForceSafeAliases).Returns(true);
             settings.Setup(x => x.Content.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
             settings.Setup(x => x.Content.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
             settings.Setup(x => x.RequestHandler.AddTrailingSlash).Returns(true);
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 9a7d39a5a4dc..fcc2dd6bfb72 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -39,11 +39,6 @@
             <email>your@email.here</email>
         </notifications>
 
-        <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
-        <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
-        <!-- fixme: remove this -->
-        <ForceSafeAliases>true</ForceSafeAliases>
-
         <!-- Show property descriptions in editing view "icon|text|none" -->
         <PropertyContextHelpOption>text</PropertyContextHelpOption>
 

From 69af591b781d552d78872c7b5bf2fb27455e6d08 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 30 Jan 2019 14:01:22 +0100
Subject: [PATCH 178/421] v8: Fix general localization (#4274)

---
 .../umbmembergroupnodeinfo.directive.js       |  58 ++++++++++
 .../src/views/common/drawers/help/help.html   | 105 +++++++++---------
 .../member/umb-membergroup-node-info.html     |  30 +++++
 .../views/macros/macros.edit.controller.js    |  42 ++++---
 .../views/macro.parameters.controller.js      |   1 -
 .../src/views/macros/views/parameters.html    |   4 +-
 .../src/views/membergroups/edit.html          |   5 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  41 +++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  44 +++++---
 .../Umbraco/config/lang/en_us.xml             |  22 ++--
 .../Editors/MemberGroupController.cs          |   6 +-
 11 files changed, 249 insertions(+), 109 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js
new file mode 100644
index 000000000000..10e1291731ae
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js
@@ -0,0 +1,58 @@
+(function () {
+    'use strict';
+
+    function MemberGroupNodeInfoDirective(eventsService, userService, dateHelper) {
+
+        function link(scope, element, attrs, ctrl) {
+
+            var evts = [];
+
+            function onInit() {
+
+                // make sure dates are formatted to the user's locale
+                formatDatesToLocal();
+            }
+
+            function formatDatesToLocal() {
+                // get current backoffice user and format dates
+                userService.getCurrentUser().then(function (currentUser) {
+                    scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
+                    scope.node.updateDateFormatted = dateHelper.getLocalDate(scope.node.updateDate, currentUser.locale, 'LLL');
+                });
+            }
+
+            // watch for content updates - reload content when node is saved, published etc.
+            scope.$watch('node.updateDate', function(newValue, oldValue){
+                if(!newValue) { return; }
+                if(newValue === oldValue) { return; }
+
+                // Update the create and update dates
+                formatDatesToLocal();
+            });
+
+            //ensure to unregister from all events!
+            scope.$on('$destroy', function () {
+                for (var e in evts) {
+                    eventsService.unsubscribe(evts[e]);
+                }
+            });
+
+            onInit();
+        }
+
+        var directive = {
+            restrict: 'E',
+            replace: true,
+            templateUrl: 'views/components/member/umb-membergroup-node-info.html',
+            scope: {
+                node: "="
+            },
+            link: link
+        };
+
+        return directive;
+    }
+
+    angular.module('umbraco.directives').directive('umbMembergroupNodeInfo', MemberGroupNodeInfoDirective);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
index 0e777a5b9f1f..f38bb78929ba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
@@ -8,7 +8,7 @@
 
         <umb-drawer-content>
 
-            <!-- Tours -->
+        <!-- Tours -->
         <div class="umb-help-section" ng-if="vm.tours" data-element="help-tours">
 
             <h5 class="umb-help-section__title">Tours</h5>
@@ -47,72 +47,71 @@ <h5 class="umb-help-list-item__group-title">
                     </div>
                 </div>
 
-            </div>
-
+        </div>
 
-            <!-- Show in custom help dashboard -->
+        <!-- Show in custom help dashboard -->
         <div class="umb-help-section" data-element="help-custom-dashboard" ng-if="vm.customDashboard.length > 0">
-                <div ng-repeat="tab in vm.customDashboard">
-                    <div ng-repeat="property in tab.properties">
-                        <div>
-                            <h5 ng-if="property.caption">{{property.caption}}</h5>
-                            <div ng-include="property.path"></div>
-                        </div>
+            <div ng-repeat="tab in vm.customDashboard">
+                <div ng-repeat="property in tab.properties">
+                    <div>
+                        <h5 ng-if="property.caption">{{property.caption}}</h5>
+                        <div ng-include="property.path"></div>
                     </div>
                 </div>
             </div>
+        </div>
 
-            <!--  Help Content -->
+        <!--  Help Content -->
         <div class="umb-help-section" data-element="help-articles" ng-if="vm.topics.length > 0">
             <h5 class="umb-help-section__title">Articles</h5>
-                <ul class="umb-help-list">
-                    <li class="umb-help-list-item" ng-repeat="topic in vm.topics track by $index">
-                    <a class="umb-help-list-item__content" data-element="help-article-{{topic.name}}" target="_blank" ng-href="{{topic.url}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
-                            <span>
-                                <span class="umb-help-list-item__title">
-                                    <span class="bold">{{topic.name}}</span>
-                                    <span class="umb-help-list-item__open-icon icon-out"></span>
-                                </span>
-                                <span class="umb-help-list-item__description">{{topic.description}}</span>
+            <ul class="umb-help-list">
+                <li class="umb-help-list-item" ng-repeat="topic in vm.topics track by $index">
+                <a class="umb-help-list-item__content" data-element="help-article-{{topic.name}}" target="_blank" ng-href="{{topic.url}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
+                        <span>
+                            <span class="umb-help-list-item__title">
+                                <span class="bold">{{topic.name}}</span>
+                                <span class="umb-help-list-item__open-icon icon-out"></span>
                             </span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-
-            <!--  Umbraco tv content -->
+                            <span class="umb-help-list-item__description">{{topic.description}}</span>
+                        </span>
+                    </a>
+                </li>
+            </ul>
+        </div>
+
+        <!--  Umbraco tv content -->
         <div class="umb-help-section" data-element="help-videos" ng-if="vm.hasAccessToSettings">
             <h5 class="umb-help-section__title" ng-if="vm.videos.length > 0">Videos</h5>
-                <ul class="umb-help-list">
-                    <li class="umb-help-list-item" ng-repeat="video in vm.videos track by $index">
-                    <a class="umb-help-list-item__content" data-element="help-article-{{video.title}}" target="_blank" ng-href="{{video.link}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
-                            <i class="umb-help-list-item__icon icon-tv-old"></i>
-                            <span class="umb-help-list-item__title">{{video.title}}</span>
-                            <i class="umb-help-list-item__open-icon icon-out"></i>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-
-            <!--  Links -->
+            <ul class="umb-help-list">
+                <li class="umb-help-list-item" ng-repeat="video in vm.videos track by $index">
+                <a class="umb-help-list-item__content" data-element="help-article-{{video.title}}" target="_blank" ng-href="{{video.link}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
+                        <i class="umb-help-list-item__icon icon-tv-old"></i>
+                        <span class="umb-help-list-item__title">{{video.title}}</span>
+                        <i class="umb-help-list-item__open-icon icon-out"></i>
+                    </a>
+                </li>
+            </ul>
+        </div>
+
+        <!--  Links -->
         <div class="umb-help-section" data-element="help-links" ng-if="vm.hasAccessToSettings">
             <a data-element="help-link-umbraco-tv" class="umb-help-badge" target="_blank" href="https://umbraco.tv?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
-                    <i class="umb-help-badge__icon icon-tv-old"></i>
-                    <div class="umb-help-badge__title">Visit umbraco.tv</div>
-                    <small>
-                        <localize key="help_theBestUmbracoVideoTutorials">The best Umbraco video tutorials</localize>
-                    </small>
-                </a>
+                <i class="umb-help-badge__icon icon-tv-old"></i>
+                <div class="umb-help-badge__title">Visit umbraco.tv</div>
+                <small>
+                    <localize key="help_theBestUmbracoVideoTutorials">The best Umbraco video tutorials</localize>
+                </small>
+            </a>
 
             <a data-element="help-link-our-umbraco" class="umb-help-badge" target="_blank" href="https://our.umbraco.com?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=our">
-                    <i class="umb-help-badge__icon icon-favorite"></i>
+                <i class="umb-help-badge__icon icon-favorite"></i>
                     
-                    <div class="umb-help-badge__title">Visit our.umbraco.com</div>
-                    <small>
-                        <localize key="defaultdialogs_theFriendliestCommunity">The friendliest community</localize>
-                    </small>
-                </a>
-            </div>
+                <div class="umb-help-badge__title">Visit our.umbraco.com</div>
+                <small>
+                    <localize key="defaultdialogs_theFriendliestCommunity">The friendliest community</localize>
+                </small>
+            </a>
+        </div>
 
         </umb-drawer-content>
 
@@ -123,7 +122,7 @@ <h5 class="umb-help-section__title" ng-if="vm.videos.length > 0">Videos</h5>
                     alias="close"
                     type="button"
                     button-style="link"
-                    label="Close"
+                    label-key="general_close"
                     action="vm.closeDrawer()">
                 </umb-button>
             </div>
@@ -132,4 +131,4 @@ <h5 class="umb-help-section__title" ng-if="vm.videos.length > 0">Videos</h5>
 
     </umb-drawer-view>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html
new file mode 100644
index 000000000000..1f10cf0599c6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html
@@ -0,0 +1,30 @@
+<div class="umb-package-details">
+    <div class="umb-package-details__main-content">
+        <umb-box>
+            <umb-box-header title-key="content_membergroup"></umb-box-header>
+            <umb-box-content class="block-form">
+
+                <umb-empty-state size="small">
+                    <localize key="member_memberGroupNoProperties">Member groups have no additional properties for editing.</localize>
+                </umb-empty-state>
+
+            </umb-box-content>
+        </umb-box>
+
+    </div>
+
+    <div class="umb-package-details__sidebar">
+        <umb-box data-element="node-info-general">
+            <umb-box-header title-key="general_general"></umb-box-header>
+            <umb-box-content class="block-form">
+
+                <umb-control-group ng-if="node.id !== 0" data-element="node-info-id" label="Id">
+                    <div>{{ node.id }}</div>
+                    <small>{{ node.key }}</small>
+                </umb-control-group>
+
+            </umb-box-content>
+        </umb-box>
+    </div>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js
index 978025ceb4a1..fd998ce4ba0b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js
@@ -16,8 +16,7 @@ function MacrosEditController($scope, $q, $routeParams, macroResource, editorSta
     vm.page.loading = false;
     vm.page.saveButtonState = "init";
     vm.page.menu = {}
-
- 
+    vm.labels = {};
 
     function toggleValue(key) {
         vm.macro[key] = !vm.macro[key];
@@ -132,21 +131,32 @@ function MacrosEditController($scope, $q, $routeParams, macroResource, editorSta
             vm.page.loading = false;
         });
 
-        vm.page.navigation = [
-            {
-                "name": "Settings",
-                "alias": "settings",
-                "icon": "icon-settings",
-                "view": "views/macros/views/settings.html",
-                "active": true
-            },
-            {
-                "name": "Parameters",
-                "alias": "parameters",
-                "icon": "icon-list",
-                "view": "views/macros/views/parameters.html"
-            }
+        var labelKeys = [
+            "general_settings",
+            "macro_parameters"
         ];
+
+        localizationService.localizeMany(labelKeys).then(function (values) {
+            // navigation
+            vm.labels.settings = values[0];
+            vm.labels.parameters = values[1];
+
+            vm.page.navigation = [
+                {
+                    "name": vm.labels.settings,
+                    "alias": "settings",
+                    "icon": "icon-settings",
+                    "view": "views/macros/views/settings.html",
+                    "active": true
+                },
+                {
+                    "name": vm.labels.parameters,
+                    "alias": "parameters",
+                    "icon": "icon-list",
+                    "view": "views/macros/views/parameters.html"
+                }
+            ];
+        });
     }
 
     init();      
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js
index 851b537c3b5a..9ae13399fa84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js
@@ -47,7 +47,6 @@ function MacrosParametersController($scope, editorService) {
             parameter.key = newParameter.key;
             parameter.label = newParameter.label;
             parameter.editor = newParameter.editor;
-            parameter.editor = newParameter.editor;
             $scope.model.setDirty();
         });
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html
index 91231a49b750..543059e5a805 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html
@@ -2,8 +2,8 @@
     <umb-box-content>
         <div class="sub-view-columns">
             <div class="sub-view-column-left">
-                <h5>Parameters</h5>
-                <small>Define the parameters hat should be available when using his macro</small>
+                <h5><localize key="macro_parameters">Parameters</localize></h5>
+                <small>Define the parameters that should be available when using this macro.</small>
             </div>
             <div class="sub-view-column-right">
                 <div class="umb-property-editor umb-stylesheet-rules form-horizontal" ng-controller="Umbraco.Editors.Macros.ParametersController" >
diff --git a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html
index bf9e5e67b615..ae61b1252252 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html
@@ -19,10 +19,11 @@
 
             <umb-editor-container class="form-horizontal">
 
-                <p><localize key="member_memberGroupNoProperties">Member groups have no additional properties for editing.</localize></p>
+                <umb-membergroup-node-info ng-if="content"
+                                           node="content">
+                </umb-membergroup-node-info>
 
             </umb-editor-container>
-            
 
             <umb-editor-footer>
 
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 3c57fa35d8ee..f4568841c998 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -300,6 +300,7 @@
   <area alias="member">
     <key alias="createNewMember">Opret et nyt medlem</key>
     <key alias="allMembers">Alle medlemmer</key>
+    <key alias="memberGroupNoProperties">Medlemgrupper har ingen yderligere egenskaber til redigering.</key>
   </area>
   <area alias="create">
     <key alias="chooseNode">Hvor ønsker du at oprette den nye %0%</key>
@@ -622,6 +623,7 @@
     <key alias="searchNoResult">Beklager, vi kan ikke finde det, du leder efter.</key>
     <key alias="noItemsInList">Ingen elementer er blevet tilføjet</key>
     <key alias="server">Server</key>
+    <key alias="settings">Indstillinger</key>
     <key alias="show">Vis</key>
     <key alias="showPageOnSend">Hvilken side skal vises efter at formularen er sendt</key>
     <key alias="size">Størrelse</key>
@@ -1020,6 +1022,11 @@ Mange hilsner fra Umbraco robotten
     <key alias="sortPleaseWait"><![CDATA[Vent venligst mens siderne sorteres. Det kan tage et stykke tid.]]></key>
   </area>
   <area alias="speechBubbles">
+    <key alias="validationFailedHeader">Validering</key>
+    <key alias="validationFailedMessage">Valideringsfejl skal rettes før elementet kan gemmes</key>
+    <key alias="operationFailedHeader">Fejlet</key>
+    <key alias="operationSavedHeader">Gemt</key>
+    <key alias="invalidUserPermissionsText">Utilstrækkelige brugerrettigheder, kunne ikke fuldføre handlingen</key>
     <key alias="operationCancelledHeader">Annulleret</key>
     <key alias="operationCancelledText">Handlingen blev annulleret af et 3. part tilføjelsesprogram</key>
     <key alias="contentTypeDublicatePropertyType">Property type eksisterer allerede</key>
@@ -1044,12 +1051,14 @@ Mange hilsner fra Umbraco robotten
     <key alias="editMediaSaved">Medie gemt</key>
     <key alias="editMediaSavedText">Medie gemt uden problemer</key>
     <key alias="editMemberSaved">Medlem gemt</key>
+    <key alias="editMemberGroupSaved">Medlemsgruppe gemt</key>
     <key alias="editStylesheetPropertySaved">Stylesheetegenskab gemt</key>
     <key alias="editStylesheetSaved">Stylesheet gemt</key>
     <key alias="editTemplateSaved">Skabelon gemt</key>
     <key alias="editUserError">Der er opstået en fejl under redigering</key>
     <key alias="editUserSaved">Bruger gemt</key>
     <key alias="editUserTypeSaved">Brugertype gemt</key>
+    <key alias="editUserGroupSaved">Brugergruppe gemt</key>
     <key alias="fileErrorHeader">Fil ikke gemt</key>
     <key alias="fileErrorText">Filen kunne ikke gemmes. Tjek filrettighederne</key>
     <key alias="fileSavedHeader">Fil gemt</key>
@@ -1057,6 +1066,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="languageSaved">Sprog gemt</key>
     <key alias="mediaTypeSavedHeader">Medietype gemt</key>
     <key alias="memberTypeSavedHeader">Medlemstype gemt</key>
+    <key alias="memberGroupSavedHeader">Medlemsgruppe gemt</key>
     <key alias="templateErrorHeader">Skabelon ikke gemt</key>
     <key alias="templateErrorText">Undgå venligst at du har 2 templates med samme alias</key>
     <key alias="templateSavedHeader">Skabelon gemt</key>
@@ -1215,6 +1225,7 @@ Mange hilsner fra Umbraco robotten
   <area alias="contentTypeEditor">
     <key alias="compositions">Kompositioner</key>
     <key alias="noTabs">Du har ikke tilføjet nogle faner</key>
+    <key alias="addGroup">Tilføj gruppe</key>
     <key alias="inheritedFrom">Nedarvet fra</key>
     <key alias="addProperty">Tilføj egenskab</key>
     <key alias="requiredLabel">Påkrævet label</key>
@@ -1255,16 +1266,19 @@ Mange hilsner fra Umbraco robotten
     <key alias="elementDoesNotSupport">Dette benyttes ikke for en Element-type</key>
   </area>
   <area alias="languages">
-      <key alias="addLanguage">Tilføj sprog</key>
-      <key alias="mandatoryLanguage">Påkrævet sprog</key>
-      <key alias="mandatoryLanguageHelp">Egenskaber på dette sprog skal være udfyldt før noden kan blive udgivet.</key>
-      <key alias="defaultLanguage">Standard sprog</key>
-      <key alias="defaultLanguageHelp">Et Umbraco site kan kun have et standard sprog.</key>
-      <key alias="changingDefaultLanguageWarning">Ved at skifte standardsprog kan resultere i standard indhold mangler.</key>
-      <key alias="fallsbackToLabel">Fallsback til</key>
-      <key alias="noFallbackLanguageOption">Ingen fallback sprog</key>
-      <key alias="fallbackLanguageDescription">For at tillade flersproget indhold til at falde tilbage på et andet sprog, hvis det ikke er tilgængelig i det anmodet sprog, vælg det her.</key>
-      <key alias="fallbackLanguage">Fallback sprog</key>
+    <key alias="addLanguage">Tilføj sprog</key>
+    <key alias="mandatoryLanguage">Påkrævet sprog</key>
+    <key alias="mandatoryLanguageHelp">Egenskaber på dette sprog skal være udfyldt før noden kan blive udgivet.</key>
+    <key alias="defaultLanguage">Standard sprog</key>
+    <key alias="defaultLanguageHelp">Et Umbraco site kan kun have et standard sprog.</key>
+    <key alias="changingDefaultLanguageWarning">Ved at skifte standardsprog kan resultere i standard indhold mangler.</key>
+    <key alias="fallsbackToLabel">Fallsback til</key>
+    <key alias="noFallbackLanguageOption">Ingen fallback sprog</key>
+    <key alias="fallbackLanguageDescription">For at tillade flersproget indhold til at falde tilbage på et andet sprog, hvis det ikke er tilgængelig i det anmodet sprog, vælg det her.</key>
+    <key alias="fallbackLanguage">Fallback sprog</key>
+  </area>
+  <area alias="macro">
+    <key alias="parameters">Parametre</key>
   </area>
   <area alias="templateEditor">
     <key alias="alternativeField">Alternativt felt</key>
@@ -1337,7 +1351,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="packager">Pakker</key>
     <key alias="packages">Pakker</key>
     <key alias="partialViews">Partial Views</key>
-    <key alias="partialViewMacros">Partial View Makro Filer</key>
+    <key alias="partialViewMacros">Partial View makrofiler</key>
     <key alias="repositories">Installer fra "repository"</key>
     <key alias="runway">Installer Runway</key>
     <key alias="runwayModules">Runway-moduler</key>
@@ -1346,8 +1360,11 @@ Mange hilsner fra Umbraco robotten
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Skabeloner</key>
     <key alias="userPermissions">Brugertilladelser</key>
-    <key alias="userTypes">Bruger Typer</key>
+    <key alias="userTypes">Brugertyper</key>
     <key alias="users">Brugere</key>
+    <key alias="settingsGroup">Indstillinger</key>
+    <key alias="templatingGroup">Design og layout</key>
+    <key alias="thirdPartyGroup">Tredjepart</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">Ny opdatering er klar</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 8135591c0cd9..47b969dacf79 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -303,10 +303,10 @@
     <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
     <key alias="maxFileSize">Max file size is</key>
     <key alias="mediaRoot">Media root</key>
-        <key alias="moveFailed">Failed to move media</key>
-        <key alias="copyFailed">Failed to copy media</key>
-        <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
-        <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
+    <key alias="moveFailed">Failed to move media</key>
+    <key alias="copyFailed">Failed to copy media</key>
+    <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
+    <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>
@@ -324,7 +324,7 @@
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
     <key alias="newFolder">New folder</key>
     <key alias="newDataType">New data type</key>
-        <key alias="newJavascriptFile">New JavaScript file</key>
+    <key alias="newJavascriptFile">New JavaScript file</key>
     <key alias="newEmptyPartialView">New empty partial view</key>
     <key alias="newPartialViewMacro">New partial view macro</key>
     <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
@@ -653,7 +653,7 @@
     <key alias="rights">Permissions</key>
     <key alias="scheduledPublishing">Scheduled Publishing</key>
     <key alias="search">Search</key>
-        <key alias="searchNoResult">Sorry, we can not find what you are looking for.</key>
+    <key alias="searchNoResult">Sorry, we can not find what you are looking for.</key>
     <key alias="noItemsInList">No items have been added</key>
     <key alias="server">Server</key>
     <key alias="settings">Settings</key>
@@ -1219,11 +1219,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="externalLinkPlaceholder">Enter the link</key>
   </area>
   <area alias="imagecropper">
-        <key alias="reset">Reset crop</key>
+    <key alias="reset">Reset crop</key>
     <key alias="saveCrop">Save crop</key>
     <key alias="addCrop">Add new crop</key>
-        <key alias="updateEditCrop">Done</key>
-        <key alias="undoEditCrop">Undo edits</key>
+    <key alias="updateEditCrop">Done</key>
+    <key alias="undoEditCrop">Undo edits</key>
   </area>
   <area alias="rollback">
     <key alias="headline">Select a version to compare with the current version</key>
@@ -1315,7 +1315,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="editContentSendToPublish">Sent For Approval</key>
     <key alias="editContentSendToPublishText">Changes have been sent for approval</key>
     <key alias="editMediaSaved">Media saved</key>
-        <key alias="editMemberGroupSaved">Member group saved</key>
+    <key alias="editMemberGroupSaved">Member group saved</key>
     <key alias="editMediaSavedText">Media saved without any errors</key>
     <key alias="editMemberSaved">Member saved</key>
     <key alias="editStylesheetPropertySaved">Stylesheet Property Saved</key>
@@ -1332,6 +1332,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="languageSaved">Language saved</key>
     <key alias="mediaTypeSavedHeader">Media Type saved</key>
     <key alias="memberTypeSavedHeader">Member Type saved</key>
+    <key alias="memberGroupSavedHeader">Member Group saved</key>
     <key alias="templateErrorHeader">Template not saved</key>
     <key alias="templateErrorText">Please make sure that you do not have 2 templates with the same alias</key>
     <key alias="templateSavedHeader">Template saved</key>
@@ -1493,6 +1494,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="contentTypeEditor">
     <key alias="compositions">Compositions</key>
     <key alias="noTabs">You have not added any tabs</key>
+    <key alias="addGroup">Add group</key>
     <key alias="inheritedFrom">Inherited from</key>
     <key alias="addProperty">Add property</key>
     <key alias="requiredLabel">Required label</key>
@@ -1543,6 +1545,21 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree</key>
     <key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
   </area>
+  <area alias="languages">
+    <key alias="addLanguage">Add language</key>
+    <key alias="mandatoryLanguage">Mandatory language</key>
+    <key alias="mandatoryLanguageHelp">Properties on this language have to be filled out before the node can be published.</key>
+    <key alias="defaultLanguage">Default language</key>
+    <key alias="defaultLanguageHelp">An Umbraco site can only have one default language set.</key>
+    <key alias="changingDefaultLanguageWarning">Switching default language may result in default content missing.</key>
+    <key alias="fallsbackToLabel">Falls back to</key>
+    <key alias="noFallbackLanguageOption">No fall back language</key>
+    <key alias="fallbackLanguageDescription">To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.</key>
+    <key alias="fallbackLanguage">Fall back language</key>
+  </area>
+  <area alias="macro">
+    <key alias="parameters">Parameters</key>
+  </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Building models</key>
     <key alias="waitingMessage">this can take a bit of time, don't worry</key>
@@ -1654,10 +1671,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Templates</key>
+    <key alias="logViewer">Log Viewer</key>
     <key alias="users">Users</key>
-        <key alias="settingsGroup">Settings</key>
-        <key alias="templatingGroup">Templating</key>
-        <key alias="thirdPartyGroup">Third Party</key>
+    <key alias="settingsGroup">Settings</key>
+    <key alias="templatingGroup">Templating</key>
+    <key alias="thirdPartyGroup">Third Party</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">New update ready</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 48ea15e3dc77..197dbdc003ac 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -307,11 +307,11 @@
     <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
     <key alias="maxFileSize">Max file size is</key>
     <key alias="mediaRoot">Media root</key>
-        <key alias="moveFailed">Failed to move media</key>
-        <key alias="moveToSameFolderFailed">Parent and destination folders cannot be the same</key>
-        <key alias="copyFailed">Failed to copy media</key>
-        <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
-        <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
+    <key alias="moveFailed">Failed to move media</key>
+    <key alias="moveToSameFolderFailed">Parent and destination folders cannot be the same</key>
+    <key alias="copyFailed">Failed to copy media</key>
+    <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
+    <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>
@@ -1337,6 +1337,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="languageSaved">Language saved</key>
     <key alias="mediaTypeSavedHeader">Media Type saved</key>
     <key alias="memberTypeSavedHeader">Member Type saved</key>
+    <key alias="memberGroupSavedHeader">Member Group saved</key>
     <key alias="templateErrorHeader">Template not saved</key>
     <key alias="templateErrorText">Please make sure that you do not have 2 templates with the same alias</key>
     <key alias="templateSavedHeader">Template saved</key>
@@ -1572,6 +1573,9 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="fallbackLanguageDescription">To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.</key>
     <key alias="fallbackLanguage">Fall back language</key>
   </area>
+  <area alias="macro">
+    <key alias="parameters">Parameters</key>
+  </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Building models</key>
     <key alias="waitingMessage">this can take a bit of time, don't worry</key>
@@ -1685,9 +1689,9 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="templates">Templates</key>
     <key alias="logViewer">Log Viewer</key>
     <key alias="users">Users</key>
-        <key alias="settingsGroup">Settings</key>
-        <key alias="templatingGroup">Templating</key>
-        <key alias="thirdPartyGroup">Third Party</key>
+    <key alias="settingsGroup">Settings</key>
+    <key alias="templatingGroup">Templating</key>
+    <key alias="thirdPartyGroup">Third Party</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">New update ready</key>
@@ -1774,7 +1778,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="userInvitedSuccessHelp">An invitation has been sent to the new user with details about how to log in to Umbraco.</key>
     <key alias="userinviteWelcomeMessage">Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar.</key>
     <key alias="userinviteExpiredMessage">Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.</key>
-        <key alias="userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</key>
+    <key alias="userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</key>
     <key alias="writer">Writer</key>
     <key alias="change">Change</key>
     <key alias="yourProfile" version="7.0">Your profile</key>
diff --git a/src/Umbraco.Web/Editors/MemberGroupController.cs b/src/Umbraco.Web/Editors/MemberGroupController.cs
index 6feaab540b17..caf158f6de06 100644
--- a/src/Umbraco.Web/Editors/MemberGroupController.cs
+++ b/src/Umbraco.Web/Editors/MemberGroupController.cs
@@ -93,7 +93,11 @@ public MemberGroupDisplay PostSave(MemberGroupSave saveModel)
             service.Save(memberGroup);
 
             var display = Mapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
-            display.AddSuccessNotification(Services.TextService.Localize("speechBubbles/memberGroupSaved"), string.Empty);
+
+            display.AddSuccessNotification(
+                            Services.TextService.Localize("speechBubbles/memberGroupSavedHeader"),
+                            string.Empty);
+
             return display;
         }
     }

From c8d9e59436e4dfb88be47ae1f6f88ea7dd616a89 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 30 Jan 2019 14:00:54 +0100
Subject: [PATCH 179/421] Fix SqlServer version detection

---
 .../Persistence/SqlSyntax/SqlServerSyntaxProvider.cs           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index 8b8550b6947f..4e9417c760b8 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -134,7 +134,8 @@ internal ServerVersionInfo GetSetVersion(string connectionString, string provide
                     using (var reader = command.ExecuteReader())
                     {
                         reader.Read();
-                        version = new ServerVersionInfo(reader.GetString(0), reader.GetString(2), reader.GetString(3), (EngineEdition) reader.GetInt32(5), reader.GetString(7), reader.GetString(9));
+                        // InstanceName can be NULL for the default instance
+                        version = new ServerVersionInfo(reader.GetString(0), reader.GetString(2), reader.IsDBNull(3) ? "(default)" : reader.GetString(3), (EngineEdition) reader.GetInt32(5), reader.GetString(7), reader.GetString(9));
                     }
                     connection.Close();
                 }

From 357da8ac6ea0cf8ada54d7f64122ee891badf264 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 00:03:03 +1100
Subject: [PATCH 180/421] removes PropertyContextHelpOption from umbraco
 settings

---
 .../Configuration/UmbracoSettings/ContentElement.cs         | 2 --
 .../Configuration/UmbracoSettings/IContentSection.cs        | 4 +---
 .../Configurations/UmbracoSettings/ContentElementTests.cs   | 5 -----
 .../Configurations/UmbracoSettings/umbracoSettings.config   | 6 ------
 src/Umbraco.Web.UI/config/umbracoSettings.config            | 3 ---
 5 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index a01471888242..6e18c369d803 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -68,8 +68,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         bool IContentSection.ResolveUrlsFromTextString => ResolveUrlsFromTextString;
 
-        string IContentSection.PropertyContextHelpOption => PropertyContextHelpOption;
-
         string IContentSection.PreviewBadge => PreviewBadge;
 
         MacroErrorBehaviour IContentSection.MacroErrorBehaviour => MacroErrors;
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index 8e77d9b722f5..147f5745dac3 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -16,9 +16,7 @@ public interface IContentSection : IUmbracoConfigurationSection
         bool ResolveUrlsFromTextString { get; }
 
         IEnumerable<IContentErrorPage> Error404Collection { get; }
-
-        string PropertyContextHelpOption { get; }
-
+        
         string PreviewBadge { get; }
 
         MacroErrorBehaviour MacroErrorBehaviour { get; }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 1933911bb276..f6aa1fe85232 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -80,11 +80,6 @@ public void CloneXmlContent()
             Assert.IsTrue(SettingsSection.Content.CloneXmlContent);
         }
         
-        [Test]
-        public void PropertyContextHelpOption()
-        {
-            Assert.AreEqual(SettingsSection.Content.PropertyContextHelpOption, "text");
-        }
         [Test]
         public void PreviewBadge()
         {
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index ee12a66ba8b6..fb723117ba4c 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -40,12 +40,6 @@
       <disableHtmlEmail>true</disableHtmlEmail>
     </notifications>
 
-    <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
-    <ensureUniqueNaming>True</ensureUniqueNaming>
-
-    <!-- Show property descriptions in editing view "icon|text|none" -->
-    <PropertyContextHelpOption>text</PropertyContextHelpOption>
-
     <cloneXmlContent>true</cloneXmlContent>
 
     <PreviewBadge>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index fcc2dd6bfb72..346f5021fba7 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -39,9 +39,6 @@
             <email>your@email.here</email>
         </notifications>
 
-        <!-- Show property descriptions in editing view "icon|text|none" -->
-        <PropertyContextHelpOption>text</PropertyContextHelpOption>
-
         <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
         <PreviewBadge>
             <![CDATA[

From 14a216778ec71c8e264546e3af039a20e25af156 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 30 Jan 2019 14:08:50 +0100
Subject: [PATCH 181/421] V8: Align delete dialogs with the other dialogs (take
 two) (#4288)

---
 .../src/views/components/umb-confirm.html                   | 1 -
 src/Umbraco.Web.UI.Client/src/views/content/delete.html     | 4 ++--
 .../src/views/content/emptyrecyclebin.html                  | 2 +-
 .../src/views/contentblueprints/delete.html                 | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html   | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html  | 6 +++---
 .../src/views/documenttypes/delete.html                     | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/macros/delete.html      | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/media/delete.html       | 4 ++--
 .../src/views/media/emptyrecyclebin.html                    | 2 +-
 src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html  | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/member/delete.html      | 4 ++--
 .../src/views/membergroups/delete.html                      | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html | 4 ++--
 .../src/views/partialviewmacros/delete.html                 | 4 ++--
 .../src/views/partialviews/delete.html                      | 4 ++--
 .../src/views/relationtypes/delete.html                     | 2 +-
 src/Umbraco.Web.UI.Client/src/views/scripts/delete.html     | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.html | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/templates/delete.html   | 4 ++--
 20 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
index 70839f2625e6..8426d03acf60 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
@@ -1,6 +1,5 @@
 <div>
     <p ng-hide="!caption" class="umb-abstract">{{caption}}</p>
-
     <div class="umb-pane btn-toolbar umb-btn-toolbar">
     	<div class="control-group umb-control-group">
     		<a ng-if="showCancel" href class="btn btn-link" ng-click="onCancel()"><localize key="general_cancel">Cancel</localize></a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
index 047776de5485..28c162854cab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Content.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
 
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <div class="umb-alert umb-alert--warning">
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
index cdde683cf19b..524bb0635400 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
@@ -5,7 +5,7 @@
                 <div class="umb-loader"></div>
             </div>
 
-            <p class="umb-abstract">
+            <p class="abstract">
                 <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
                 <localize key="general_areyousure">Are you sure?</localize>
             </p>
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/delete.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/delete.html
index 44a31254d218..324fb2ae9fc6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.ContentBlueprint.DeleteController">
     <div class="umb-dialog-body">
 
-        <p class="umb-abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel">
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
index debd3ccb8c61..797dff56518f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DataType.DeleteController">
     <div class="umb-dialog-body">
         
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong>?
         </p>
 
         <ng-switch on="currentNode.nodeType">
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html
index 61c26c09a750..2cb9bbffe205 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html
@@ -1,12 +1,12 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Dictionary.DeleteController as vm" >
   <div class="umb-dialog-body" auto-scale="90">
         
-    <p class="umb-abstract">
-      <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+    <p class="abstract">
+      <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
     </p>
 
     <umb-confirm on-confirm="vm.performDelete" on-cancel="vm.cancel">    
     </umb-confirm>
 
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
index d0826bf80acc..2a0185e186f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
@@ -2,9 +2,9 @@
 
     <div class="umb-dialog-body">
 
-        <p class="umb-abstract">
+        <p class="abstract">
             <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>
-            <strong>{{currentNode.name}}</strong> ?
+            <strong>{{currentNode.name}}</strong>?
         </p>
 
         <ng-switch on="currentNode.nodeType">
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/delete.html b/src/Umbraco.Web.UI.Client/src/views/macros/delete.html
index 2d097e110b99..9d16e2d4e69e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Macros.DeleteController as vm">
     <div class="umb-dialog-body" auto-scale="90">
 
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{vm.name}}</strong> ?
+        <p class="abstract">
+            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{vm.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="vm.performDelete" on-cancel="cancel"></umb-confirm>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
index 3c9716eb3f7f..af33574f558f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Media.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
         
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
index cc7d261a95bc..9d1b28edc976 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
@@ -6,7 +6,7 @@
                 <div class="umb-loader"></div>
             </div>
 
-            <p class="umb-abstract">
+            <p class="abstract">
                 <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
                 <localize key="general_areyousure">Are you sure?</localize>
             </p>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
index 6d33b6ae0caf..608eb5b0baf2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MediaTypes.DeleteController">
     <div class="umb-dialog-body">
 
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong>?
         </p>
 
         <ng-switch on="currentNode.nodeType">
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/delete.html b/src/Umbraco.Web.UI.Client/src/views/member/delete.html
index ce7a118dd968..a58b2edace23 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Member.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
         
-        <p class="umb-abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
diff --git a/src/Umbraco.Web.UI.Client/src/views/membergroups/delete.html b/src/Umbraco.Web.UI.Client/src/views/membergroups/delete.html
index 8b637a71dd6d..fff0348b8778 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membergroups/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membergroups/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MemberGroups.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
 
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel">
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
index f1dad26a22ac..14be5a07617d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MemberTypes.DeleteController">
     <div class="umb-dialog-body">
 
-        <p class="umb-abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <p>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.html
index 6b66a488210c..0adbc2aaa2ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.PartialViewMacros.DeleteController">
     <div class="umb-dialog-body">
 
-        <p class="umb-abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel">
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.html
index c0fdf2c77f3b..fa1baa1effc4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.html
@@ -8,8 +8,8 @@
             </div>
         </div>
 
-        <p class="umb-abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel">
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/delete.html
index e0fdbc67519c..b937d0869d10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/delete.html
@@ -1,7 +1,7 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.RelationTypes.DeleteController as vm">
     <div class="umb-dialog-body" auto-scale="90">
 
-        <p class="umb-abstract">
+        <p class="abstract">
             <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.html b/src/Umbraco.Web.UI.Client/src/views/scripts/delete.html
index 187db7f4430c..aae686d5ce91 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Scripts.DeleteController">
     <div class="umb-dialog-body">
 
-        <p class="umb-abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel">
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.html
index fd6f6edd7806..d32a7197e135 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.StyleSheets.DeleteController">
     <div class="umb-dialog-body">
 
-        <p class="umb-abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel">
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/delete.html b/src/Umbraco.Web.UI.Client/src/views/templates/delete.html
index c98677f76479..7c3af5937e7a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/delete.html
@@ -8,8 +8,8 @@
             </div>
         </div>
 
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong> ?
+        <p class="abstract">
+            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong>?
         </p>
 
         <umb-confirm on-confirm="performDelete" on-cancel="cancel">

From d852422328d412afaff3c71bfe8e48bce4dddfee Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 00:09:30 +1100
Subject: [PATCH 182/421] removes CloneXmlContent from umbraco settings

---
 build/NuSpecs/tools/Web.config.install.xdt                | 8 +++-----
 .../Configuration/UmbracoSettings/ContentElement.cs       | 7 +------
 .../Configuration/UmbracoSettings/IContentSection.cs      | 2 --
 .../Configurations/UmbracoSettings/ContentElementTests.cs | 5 -----
 .../Configurations/UmbracoSettings/umbracoSettings.config | 2 --
 src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs     | 2 +-
 6 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index 2f6fb8f61c0c..74a614275f8c 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -4,13 +4,11 @@
   <configSections>
     <section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
 
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
-      <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </sectionGroup>
+    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
       <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+      <section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
       <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
     </sectionGroup>
   </configSections>
@@ -25,7 +23,7 @@
 
   <umbracoConfiguration xdt:Transform="InsertIfMissing">
     <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
     <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
   </umbracoConfiguration>
 
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index 6e18c369d803..356b009d5c26 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -36,10 +36,7 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         [ConfigurationProperty("allowedUploadFiles")]
         internal CommaDelimitedConfigurationElement AllowedUploadFiles => GetOptionalDelimitedElement("allowedUploadFiles", new string[0]);
-
-        [ConfigurationProperty("cloneXmlContent")]
-        internal InnerTextConfigurationElement<bool> CloneXmlContent => GetOptionalTextElement("cloneXmlContent", true);
-
+        
         [ConfigurationProperty("GlobalPreviewStorageEnabled")]
         internal InnerTextConfigurationElement<bool> GlobalPreviewStorageEnabled => GetOptionalTextElement("GlobalPreviewStorageEnabled", false);
 
@@ -76,8 +73,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         IEnumerable<string> IContentSection.AllowedUploadFiles => AllowedUploadFiles;
 
-        bool IContentSection.CloneXmlContent => CloneXmlContent;
-
         bool IContentSection.GlobalPreviewStorageEnabled => GlobalPreviewStorageEnabled;
 
         string IContentSection.DefaultDocumentTypeProperty => DefaultDocumentTypeProperty;
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index 147f5745dac3..4f3013b96661 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -25,8 +25,6 @@ public interface IContentSection : IUmbracoConfigurationSection
 
         IEnumerable<string> AllowedUploadFiles { get; }
 
-        bool CloneXmlContent { get; }
-
         bool GlobalPreviewStorageEnabled { get; }
 
         string DefaultDocumentTypeProperty { get; }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index f6aa1fe85232..8d6aa0af6b5e 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -74,11 +74,6 @@ public void GlobalPreviewStorageEnabled()
         {
             Assert.IsFalse(SettingsSection.Content.GlobalPreviewStorageEnabled);
         }
-        [Test]
-        public void CloneXmlContent()
-        {
-            Assert.IsTrue(SettingsSection.Content.CloneXmlContent);
-        }
         
         [Test]
         public void PreviewBadge()
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index fb723117ba4c..7acb547b1cf6 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -40,8 +40,6 @@
       <disableHtmlEmail>true</disableHtmlEmail>
     </notifications>
 
-    <cloneXmlContent>true</cloneXmlContent>
-
     <PreviewBadge>
       <![CDATA[
       <a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{0}/assets/img/preview-mode-badge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/preview/end?redir={1}'"><span style="display:none;">In Preview Mode - click to end</span></a>
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
index e7aa4a216ee8..6dec9f244804 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
@@ -263,7 +263,7 @@ public void Dispose()
         private bool SyncFromXmlFile => false;
 
         // whether _xml is immutable or not (achieved by cloning before changing anything)
-        private static bool XmlIsImmutable => Current.Configs.Settings().Content.CloneXmlContent;
+        private static bool XmlIsImmutable => true;
 
         // whether to keep version of everything (incl. medias & members) in cmsPreviewXml
         // for audit purposes - false by default, not in umbracoSettings.config

From 82ba3604353cd36e565808b96e23c76f51bf72cb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 00:16:15 +1100
Subject: [PATCH 183/421] removes defaultDocumentTypeProperty from umbraco
 settings

---
 .../Configuration/UmbracoSettings/ContentElement.cs        | 7 +------
 .../Configuration/UmbracoSettings/IContentSection.cs       | 4 +---
 .../Configurations/UmbracoSettings/ContentElementTests.cs  | 5 -----
 .../Configurations/UmbracoSettings/umbracoSettings.config  | 2 --
 src/Umbraco.Web.UI/config/umbracoSettings.config           | 3 ---
 5 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index 356b009d5c26..6ad44da75ac3 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -39,10 +39,7 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         
         [ConfigurationProperty("GlobalPreviewStorageEnabled")]
         internal InnerTextConfigurationElement<bool> GlobalPreviewStorageEnabled => GetOptionalTextElement("GlobalPreviewStorageEnabled", false);
-
-        [ConfigurationProperty("defaultDocumentTypeProperty")]
-        internal InnerTextConfigurationElement<string> DefaultDocumentTypeProperty => GetOptionalTextElement("defaultDocumentTypeProperty", "Textstring");
-
+        
         [ConfigurationProperty("showDeprecatedPropertyEditors")]
         internal InnerTextConfigurationElement<bool> ShowDeprecatedPropertyEditors => GetOptionalTextElement("showDeprecatedPropertyEditors", false);
 
@@ -75,8 +72,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         bool IContentSection.GlobalPreviewStorageEnabled => GlobalPreviewStorageEnabled;
 
-        string IContentSection.DefaultDocumentTypeProperty => DefaultDocumentTypeProperty;
-
         bool IContentSection.ShowDeprecatedPropertyEditors => ShowDeprecatedPropertyEditors;
 
         bool IContentSection.EnableInheritedDocumentTypes => EnableInheritedDocumentTypes;
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index 4f3013b96661..a9ef8f5d922d 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -26,9 +26,7 @@ public interface IContentSection : IUmbracoConfigurationSection
         IEnumerable<string> AllowedUploadFiles { get; }
 
         bool GlobalPreviewStorageEnabled { get; }
-
-        string DefaultDocumentTypeProperty { get; }
-
+        
         /// <summary>
         /// Gets a value indicating whether to show deprecated property editors in
         /// a datatype list of available editors.
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 8d6aa0af6b5e..22b301dc3186 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -64,11 +64,6 @@ public virtual void ImageAutoFillProperties()
             Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).ExtensionFieldAlias, "umbracoExtension2");
         }
         
-        [Test]
-        public void DefaultDocumentTypeProperty()
-        {
-            Assert.AreEqual(SettingsSection.Content.DefaultDocumentTypeProperty, "Textstring");
-        }
         [Test]
         public void GlobalPreviewStorageEnabled()
         {
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 7acb547b1cf6..47bcfa3ac4a0 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -59,8 +59,6 @@
     <!-- If completed, only the file extensions listed below will be allowed to be uploaded.  If empty, disallowedUploadFiles will apply to prevent upload of specific file extensions. -->
     <allowedUploadFiles>jpg,png,gif</allowedUploadFiles>    
 
-    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
-    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
   </content>
 
   <security>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 346f5021fba7..4f6474b6586f 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -66,9 +66,6 @@
         <!-- If completed, only the file extensions listed below will be allowed to be uploaded.  If empty, disallowedUploadFiles will apply to prevent upload of specific file extensions. -->
         <allowedUploadFiles></allowedUploadFiles>
 
-        <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
-        <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
-
         <showDeprecatedPropertyEditors>false</showDeprecatedPropertyEditors>
 
         <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->

From 0016962bc260190e7398a2aa0f5cb15c050170e6 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 30 Jan 2019 14:27:58 +0100
Subject: [PATCH 184/421] v8: Edit macro parameters (#4317)

---
 .../src/less/components/umb-stylesheet.less   |  1 -
 .../macros/infiniteeditors/parameter.html     |  2 +-
 .../views/macro.parameters.controller.js      | 30 ++++++++++++++-----
 .../src/views/macros/views/parameters.html    | 13 ++++----
 .../src/views/macros/views/settings.html      |  2 +-
 .../views/rules/rules.controller.js           |  2 +-
 .../views/stylesheets/views/rules/rules.html  |  3 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 10 +++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 11 +++++--
 .../Umbraco/config/lang/en_us.xml             | 13 ++++----
 10 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less
index ad7f4ea1a29c..38ceba2a59c0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less
@@ -7,7 +7,6 @@
     padding: 6px;
     margin: 10px 0 !important;
     background: @gray-10;
-    cursor: pointer;
     border-radius: @baseBorderRadius;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html b/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html
index 402c3c498408..ae46bf605777 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html
@@ -21,7 +21,7 @@
                             <input type="text" ng-model="model.parameter.label" umb-auto-focus required />
                         </umb-control-group>
 
-                        <umb-control-group label="key" description="">
+                        <umb-control-group label="@general_alias" description="">
                             <input type="text" ng-model="model.parameter.key" required />
                         </umb-control-group>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js
index 9ae13399fa84..b651d05eda4d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js
@@ -6,17 +6,17 @@
  * @description
  * The controller for editing macros parameters
  */
-function MacrosParametersController($scope, editorService) {
+function MacrosParametersController($scope, editorService, localizationService) {
 
     $scope.sortableOptions = {
         axis: 'y',
         containment: 'parent',
         cursor: 'move',
-        items: 'div.umb-stylesheet-rules__listitem',
+        items: '> div.control-group',
         handle: '.handle',
         tolerance: 'pointer',
         update: function (e, ui) {
-            $scope.model.setDirty();
+            setDirty();
         }
     };
 
@@ -25,29 +25,29 @@ function MacrosParametersController($scope, editorService) {
         evt.preventDefault();
 
         $scope.model.macro.parameters = _.without($scope.model.macro.parameters, parameter);
-        $scope.model.setDirty();
+        setDirty();
     }
 
     $scope.add = function (evt) {
         evt.preventDefault();
 
-        openOverlay({}, 'Add parameter', (newParameter) => {
+        openOverlay({}, $scope.labels.addParameter, (newParameter) => {
             if (!$scope.model.macro.parameters) {
                 $scope.model.macro.parameters = [];
             }
             $scope.model.macro.parameters.push(newParameter);
-            $scope.model.setDirty();
+            setDirty();
         });
     }
 
     $scope.edit = function (parameter, evt) {
         evt.preventDefault();
 
-        openOverlay(parameter,'Edit parameter', (newParameter) => {
+        openOverlay(parameter, $scope.labels.editParameter, (newParameter) => {
             parameter.key = newParameter.key;
             parameter.label = newParameter.label;
             parameter.editor = newParameter.editor;
-            $scope.model.setDirty();
+            setDirty();
         });
     }
 
@@ -72,6 +72,20 @@ function MacrosParametersController($scope, editorService) {
 
     }
 
+    function setDirty() {
+        $scope.model.setDirty();
+    }
+
+    function init() {
+        localizationService.localizeMany(["macro_addParameter", "macro_editParameter"]).then(function (data) {
+            $scope.labels = {
+                addParameter: data[0],
+                editParameter: data[1]
+            }
+        });
+    }
+
+    init();
 }
 
 angular.module("umbraco").controller("Umbraco.Editors.Macros.ParametersController", MacrosParametersController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html
index 543059e5a805..0aa4a47fc056 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html
@@ -3,17 +3,18 @@
         <div class="sub-view-columns">
             <div class="sub-view-column-left">
                 <h5><localize key="macro_parameters">Parameters</localize></h5>
-                <small>Define the parameters that should be available when using this macro.</small>
+                <small><localize key="macro_parametersDescription">Define the parameters that should be available when using this macro.</localize></small>
             </div>
             <div class="sub-view-column-right">
-                <div class="umb-property-editor umb-stylesheet-rules form-horizontal" ng-controller="Umbraco.Editors.Macros.ParametersController" >
+                <div class="umb-property-editor form-horizontal" ng-controller="Umbraco.Editors.Macros.ParametersController">
                     <div ui-sortable="sortableOptions" ng-model="model.macro.parameters">
-                        <div class="umb-stylesheet-rules__listitem" ng-click="edit(parameter, $event)" ng-repeat="parameter in model.macro.parameters">
+                        <div class="control-group umb-prevalues-multivalues__listitem" ng-repeat="parameter in model.macro.parameters track by $id(parameter)">
                             <i class="icon icon-navigation handle"></i>
-                            <div class="umb-stylesheet-rules__left">
-                                {{parameter.label}}
+                            <div class="umb-prevalues-multivalues__left">
+                                <span>{{parameter.label}}</span>&nbsp;<span class="muted">({{parameter.key}})</span>:&nbsp;<small>{{parameter.editor}}</small>
                             </div>
-                            <div class="umb-stylesheet-rules__right">
+                            <div class="umb-prevalues-multivalues__right">
+                                <a class="umb-node-preview__action" ng-click="edit(parameter, $event)"><localize key="general_edit">Edit</localize></a>
                                 <a class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(parameter, $event)"><localize key="general_remove">Remove</localize></a>
                             </div>
                         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
index 59ccf2bc7ea3..0b214b9deef3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
@@ -31,7 +31,7 @@
     <umb-box-header title="Cache settings"></umb-box-header>
     <umb-box-content>
         <umb-control-group label="Cache period">
-           <input type="number" ng-model="model.macro.cachePeriod"/>
+           <input type="number" min="0" ng-model="model.macro.cachePeriod"/>
         </umb-control-group>
         <umb-control-group label="Cache by page">
             <umb-toggle checked="model.macro.cacheByPage" on-click="model.toggle('cacheByPage')"></umb-toggle>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js
index b3aeedeb6e89..7a3a51cf2e10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js
@@ -67,7 +67,7 @@ angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.RulesControlle
         }
 
         function init() {
-            localizationService.localizeMany(["stylesheet_overlayTitleAddRule", "stylesheet_overlayTitleEditRule"]).then(function (data) {
+            localizationService.localizeMany(["stylesheet_addRule", "stylesheet_editRule"]).then(function (data) {
                 $scope.labels = {
                     addRule: data[0],
                     editRule: data[1]
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html
index 018d4d3741b5..213499740f91 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html
@@ -8,12 +8,13 @@ <h5><localize key="stylesheet_editorRules">Rich text editor styles</localize></h
             <div class="sub-view-column-right">
                 <div class="umb-property-editor umb-stylesheet-rules form-horizontal" ng-controller="Umbraco.Editors.StyleSheets.RulesController">
                     <div ui-sortable="sortableOptions" ng-model="model.stylesheet.rules">
-                        <div class="umb-stylesheet-rules__listitem" ng-click="edit(rule, $event)" ng-repeat="rule in model.stylesheet.rules">
+                        <div class="umb-stylesheet-rules__listitem" ng-repeat="rule in model.stylesheet.rules track by $id(rule)">
                             <i class="icon icon-navigation handle"></i>
                             <div class="umb-stylesheet-rules__left">
                                 {{rule.name}}
                             </div>
                             <div class="umb-stylesheet-rules__right">
+                                <a class="umb-node-preview__action" ng-click="edit(rule, $event)"><localize key="general_edit">Edit</localize></a>
                                 <a class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(rule, $event)"><localize key="general_remove">Remove</localize></a>
                             </div>
                         </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index f4568841c998..a507366b56ec 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -320,6 +320,7 @@
     <key alias="newPartialViewMacroFromSnippet">Ny partial view makro fra snippet</key>
     <key alias="newPartialViewMacroNoMacro">Ny partial view makro (uden makro)</key>
     <key alias="newStyleSheetFile">Ny stylesheet-fil</key>
+    <key alias="newRteStyleSheetFile">Ny Rich Text Editor stylesheet-fil</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Til dit website</key>
@@ -1088,15 +1089,17 @@ Mange hilsner fra Umbraco robotten
     <key alias="unlockUserSuccess">%0% er nu låst op</key>
   </area>
   <area alias="stylesheet">
+    <key alias="addRule">Tilføj style</key>
+    <key alias="editRule">Redigér style</key>
     <key alias="editorRules">Teksteditor-styles</key>
     <key alias="editorRulesHelp">Definér de styles, der skal være tilgængelige i teksteditoren for dette stylesheet</key>
     <key alias="selector">Selector</key>
     <key alias="selectorHelp">Bruger CSS-syntaks, f.eks. "h1" eller ".redheader"</key>
     <key alias="editstylesheet">Rediger stylesheet</key>
     <key alias="editstylesheetproperty">Rediger CSS-egenskab</key>
-    <key alias="overlayTitleAddRule">Tilføj style</key>
-    <key alias="overlayTitleEditRule">Redigér style</key>
     <key alias="nameHelp">Det navn der vises i teksteditoren</key>
+    <key alias="preview">Forhåndsvisning</key>
+    <key alias="previewHelp">Hvordan teksten vil se ud i teksteditoren.</key>
     <key alias="styles">Styles</key>
     <key alias="stylesHelp">Den CSS der skal anvendes i teksteditoren, f.eks. "color:red;"</key>
     <key alias="tabCode">Kode</key>
@@ -1278,7 +1281,10 @@ Mange hilsner fra Umbraco robotten
     <key alias="fallbackLanguage">Fallback sprog</key>
   </area>
   <area alias="macro">
+    <key alias="addParameter">Tilføj parameter</key>
+    <key alias="editParameter">Rediger parameter</key>
     <key alias="parameters">Parametre</key>
+    <key alias="parametersDescription">Definer de parametre, der skal være tilgængelige, når du bruger denne makro.</key>
   </area>
   <area alias="templateEditor">
     <key alias="alternativeField">Alternativt felt</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 47b969dacf79..e89ef4492368 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -331,6 +331,7 @@
     <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
     <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
     <key alias="newStyleSheetFile">New style sheet file</key>
+    <key alias="newRteStyleSheetFile">New Rich Text Editor style sheet file</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Browse your website</key>
@@ -1361,13 +1362,15 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="documentTypeExportedError">An error occurred while exporting the document type</key>
   </area>
   <area alias="stylesheet">
+    <key alias="addRule">Add style</key>
+    <key alias="editRule">Edit style</key>
     <key alias="editorRules">Rich text editor styles</key>
     <key alias="editorRulesHelp">Define the styles that should be available in the rich text editor for this stylesheet</key>
     <key alias="editstylesheet">Edit stylesheet</key>
     <key alias="editstylesheetproperty">Edit stylesheet property</key>
     <key alias="nameHelp">The name displayed in the editor style selector</key>
-    <key alias="overlayTitleAddRule">Add style</key>
-    <key alias="overlayTitleEditRule">Edit style</key>
+    <key alias="preview">Preview</key>
+    <key alias="previewHelp">How the text will look like in the rich text editor.</key>
     <key alias="selector">Selector</key>
     <key alias="selectorHelp">Uses CSS syntax, e.g. "h1" or ".redHeader"</key>
     <key alias="styles">Styles</key>
@@ -1557,8 +1560,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="fallbackLanguageDescription">To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.</key>
     <key alias="fallbackLanguage">Fall back language</key>
   </area>
+
   <area alias="macro">
+    <key alias="addParameter">Add parameter</key>
+    <key alias="editParameter">Edit parameter</key>
     <key alias="parameters">Parameters</key>
+    <key alias="parametersDescription">Define the parameters that should be available when using this macro.</key>
   </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Building models</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 197dbdc003ac..bb8d9b12eb75 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1375,21 +1375,21 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="scheduleErrExpireDate2">The expire date cannot be before the release date</key>
   </area>
   <area alias="stylesheet">
+    <key alias="addRule">Add style</key>
+    <key alias="editRule">Edit style</key>
     <key alias="editorRules">Rich text editor styles</key>
     <key alias="editorRulesHelp">Define the styles that should be available in the rich text editor for this stylesheet</key>
     <key alias="editstylesheet">Edit stylesheet</key>
     <key alias="editstylesheetproperty">Edit stylesheet property</key>
     <key alias="nameHelp">The name displayed in the editor style selector</key>
-    <key alias="overlayTitleAddRule">Add style</key>
-    <key alias="overlayTitleEditRule">Edit style</key>
+    <key alias="preview">Preview</key>
+    <key alias="previewHelp">How the text will look like in the rich text editor.</key>
     <key alias="selector">Selector</key>
     <key alias="selectorHelp">Uses CSS syntax, e.g. "h1" or ".redHeader"</key>
     <key alias="styles">Styles</key>
     <key alias="stylesHelp">The CSS that should be applied in the rich text editor, e.g. "color:red;"</key>
     <key alias="tabCode">Code</key>
-    <key alias="tabRules">Rich Text Editor</key>
-    <key alias="preview">Preview</key>
-    <key alias="previewHelp">How the text will look like in the rich text editor.</key>
+    <key alias="tabRules">Rich Text Editor</key>   
   </area>
   <area alias="template">
     <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
@@ -1574,7 +1574,10 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="fallbackLanguage">Fall back language</key>
   </area>
   <area alias="macro">
+    <key alias="addParameter">Add parameter</key>
+    <key alias="editParameter">Edit parameter</key>
     <key alias="parameters">Parameters</key>
+    <key alias="parametersDescription">Define the parameters that should be available when using this macro.</key>
   </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Building models</key>

From 9571f48bd3e9f4d791588f82768c0fb03331853e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 00:30:28 +1100
Subject: [PATCH 185/421] Removes AutoLegacy routing and the legacy
 UseDomainPrefixes from umbraco settings

---
 .../UmbracoSettings/IRequestHandlerSection.cs |  2 --
 .../UmbracoSettings/RequestHandlerElement.cs  | 11 -------
 .../RequestHandlerElementTests.cs             |  6 ----
 .../umbracoSettings.minimal.config            |  3 --
 src/Umbraco.Tests/Routing/UrlProviderTests.cs | 31 ++-----------------
 .../Routing/UrlsProviderWithDomainsTests.cs   | 26 +++-------------
 .../Routing/UrlsWithNestedDomains.cs          |  2 --
 .../TestHelpers/SettingsForTests.cs           |  1 -
 .../config/umbracoSettings.Release.config     |  3 --
 .../config/umbracoSettings.config             |  5 ---
 src/Umbraco.Web/Routing/DefaultUrlProvider.cs |  7 -----
 src/Umbraco.Web/Routing/UrlProviderMode.cs    |  5 ---
 12 files changed, 6 insertions(+), 96 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
index f6d78eecf2e5..075c347b68a3 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
@@ -4,8 +4,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     public interface IRequestHandlerSection : IUmbracoConfigurationSection
     {
-        bool UseDomainPrefixes { get; }
-
         bool AddTrailingSlash { get; }
 
         bool RemoveDoubleDashes { get; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs
index b05a31537b1c..a5383dba87a8 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs
@@ -7,12 +7,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     internal class RequestHandlerElement : UmbracoConfigurationElement, IRequestHandlerSection
     {
-        [ConfigurationProperty("useDomainPrefixes")]
-        public InnerTextConfigurationElement<bool> UseDomainPrefixes
-        {
-            get { return GetOptionalTextElement("useDomainPrefixes", false); }
-        }
-
         [ConfigurationProperty("addTrailingSlash")]
         public InnerTextConfigurationElement<bool> AddTrailingSlash
         {
@@ -94,11 +88,6 @@ internal static CharCollection GetDefaultCharReplacements()
             return collection;
         }
 
-        bool IRequestHandlerSection.UseDomainPrefixes
-        {
-            get { return UseDomainPrefixes; }
-        }
-
         bool IRequestHandlerSection.AddTrailingSlash
         {
             get { return AddTrailingSlash; }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
index ec2ae22e41b8..2d4d24f3deec 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
@@ -7,12 +7,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
     [TestFixture]
     public class RequestHandlerElementTests : UmbracoSettingsTests
     {
-        [Test]
-        public void UseDomainPrefixes()
-        {
-            Assert.IsTrue(SettingsSection.RequestHandler.UseDomainPrefixes == false);
-
-        }
         [Test]
         public void AddTrailingSlash()
         {
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
index bee7133051a6..cd9738c58f9e 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
@@ -15,9 +15,6 @@
     <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Imaging -->
     <imaging/>
     
-    <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Scripteditor -->
-    <scripteditor/>    
-    
     <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Errors -->
     <errors>
       <error404>1</error404>
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index 34a038cffed1..236c198b3a78 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -114,8 +114,6 @@ public void Get_Url_Not_Hiding_Top_Level(int nodeId, string niceUrlMatch)
                 new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object, new SiteDomainHelper())
             }, globalSettings: globalSettings.Object);
 
-            var requestMock = Mock.Get(umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var result = umbracoContext.UrlProvider.GetUrl(nodeId);
             Assert.AreEqual(niceUrlMatch, result);
@@ -144,9 +142,7 @@ public void Get_Url_Hiding_Top_Level(int nodeId, string niceUrlMatch)
                 new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object, new SiteDomainHelper())
             }, globalSettings: globalSettings.Object);
 
-            var requestMock = Mock.Get(umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
-
+            
             var result = umbracoContext.UrlProvider.GetUrl(nodeId);
             Assert.AreEqual(niceUrlMatch, result);
         }
@@ -161,8 +157,6 @@ public void Get_Url_For_Culture_Variant_Without_Domains_Non_Current_Url()
 
             var umbracoSettings = Current.Configs.Settings();
 
-            var requestMock = Mock.Get(umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new TestPublishedContent(contentType, 1234, Guid.NewGuid(), new Dictionary<string, object>(), false);
@@ -209,9 +203,6 @@ public void Get_Url_For_Culture_Variant_With_Current_Url()
 
             var umbracoSettings = Current.Configs.Settings();
 
-            var requestMock = Mock.Get(umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
-
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new TestPublishedContent(contentType, 1234, Guid.NewGuid(), new Dictionary<string, object>(), false);
 
@@ -266,9 +257,6 @@ public void Get_Url_For_Culture_Variant_Non_Current_Url()
 
             var umbracoSettings = Current.Configs.Settings();
 
-            var requestMock = Mock.Get(umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
-
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new TestPublishedContent(contentType, 1234, Guid.NewGuid(), new Dictionary<string, object>(), false);
 
@@ -319,9 +307,6 @@ public void Get_Url_Relative_Or_Absolute()
 
             var umbracoSettings = Current.Configs.Settings();
 
-            var requestMock = Mock.Get(umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
-
             var umbracoContext = GetUmbracoContext("http://example.com/test", 1111, umbracoSettings: umbracoSettings, urlProviders: new[]
             {
                 new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object, new SiteDomainHelper())
@@ -329,10 +314,6 @@ public void Get_Url_Relative_Or_Absolute()
 
             Assert.AreEqual("/home/sub1/custom-sub-1/", umbracoContext.UrlProvider.GetUrl(1177));
 
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(true);
-            Assert.AreEqual("http://example.com/home/sub1/custom-sub-1/", umbracoContext.UrlProvider.GetUrl(1177));
-
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
             umbracoContext.UrlProvider.Mode = UrlProviderMode.Absolute;
             Assert.AreEqual("http://example.com/home/sub1/custom-sub-1/", umbracoContext.UrlProvider.GetUrl(1177));
         }
@@ -351,17 +332,9 @@ public void Get_Url_Unpublished()
             }, globalSettings: globalSettings.Object);
 
             //mock the Umbraco settings that we need
-            var requestMock = Mock.Get(umbracoSettings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
-
+            
             Assert.AreEqual("#", umbracoContext.UrlProvider.GetUrl(999999));
 
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(true);
-
-            Assert.AreEqual("#", umbracoContext.UrlProvider.GetUrl(999999));
-
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
-
             umbracoContext.UrlProvider.Mode = UrlProviderMode.Absolute;
 
             Assert.AreEqual("#", umbracoContext.UrlProvider.GetUrl(999999));
diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
index be654b4a09d8..c01ee83d6af3 100644
--- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
@@ -176,8 +176,6 @@ protected override string GetXmlContent(int templateId)
         public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
         {
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var request = Mock.Get(settings.RequestHandler);
-            request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -210,9 +208,7 @@ public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, s
         public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
         {
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var request = Mock.Get(settings.RequestHandler);
-            request.Setup(x => x.UseDomainPrefixes).Returns(false);
-
+            
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
@@ -236,8 +232,6 @@ public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool
         public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
         {
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var request = Mock.Get(settings.RequestHandler);
-            request.Setup(x => x.UseDomainPrefixes).Returns(false);
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -268,9 +262,7 @@ public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, str
         public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
         {
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var request = Mock.Get(settings.RequestHandler);
-            request.Setup(x => x.UseDomainPrefixes).Returns(false);
-
+            
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
@@ -290,9 +282,7 @@ public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute,
         public void Get_Url_DomainsAndCache()
         {
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var request = Mock.Get(settings.RequestHandler);
-            request.Setup(x => x.UseDomainPrefixes).Returns(false);
-
+            
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
@@ -355,9 +345,7 @@ private static void CheckRoute(IDictionary<int, string> routes, IDictionary<stri
         public void Get_Url_Relative_Or_Absolute()
         {
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var requestMock = Mock.Get(settings.RequestHandler);
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
-
+            
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
@@ -371,12 +359,6 @@ public void Get_Url_Relative_Or_Absolute()
             Assert.AreEqual("/en/1001-1-1/", umbracoContext.UrlProvider.GetUrl(100111));
             Assert.AreEqual("http://domain3.com/en/1003-1-1/", umbracoContext.UrlProvider.GetUrl(100311));
 
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(true);
-
-            Assert.AreEqual("http://domain1.com/en/1001-1-1/", umbracoContext.UrlProvider.GetUrl(100111));
-            Assert.AreEqual("http://domain3.com/en/1003-1-1/", umbracoContext.UrlProvider.GetUrl(100311));
-
-            requestMock.Setup(x => x.UseDomainPrefixes).Returns(false);
             umbracoContext.UrlProvider.Mode = UrlProviderMode.Absolute;
 
             Assert.AreEqual("http://domain1.com/en/1001-1-1/", umbracoContext.UrlProvider.GetUrl(100111));
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index 3d3533697c39..0eb621bd9314 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -34,8 +34,6 @@ public void DoNotPolluteCache()
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
             var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var request = Mock.Get(settings.RequestHandler);
-            request.Setup(x => x.UseDomainPrefixes).Returns(true);
 
             SetDomains1();
 
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index df4ec37a1915..a989289cd331 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -54,7 +54,6 @@ public static IUmbracoSettingsSection GenerateMockUmbracoSettings()
             settings.Setup(x => x.Content.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
             settings.Setup(x => x.Content.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
             settings.Setup(x => x.RequestHandler.AddTrailingSlash).Returns(true);
-            settings.Setup(x => x.RequestHandler.UseDomainPrefixes).Returns(false);
             settings.Setup(x => x.RequestHandler.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements());
             settings.Setup(x => x.WebRouting.UrlProviderMode).Returns("AutoLegacy");
             settings.Setup(x => x.Providers.DefaultBackOfficeUserProvider).Returns("UsersMembershipProvider");
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 616eca9d6b9a..1b5104d07461 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -59,9 +59,6 @@
     <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
     <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
 
-    <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
-    <EnablePropertyValueConverters>true</EnablePropertyValueConverters>
-
     <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
     <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
 
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 4f6474b6586f..fd3573ce8d38 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -68,11 +68,6 @@
 
         <showDeprecatedPropertyEditors>false</showDeprecatedPropertyEditors>
 
-        <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
-        <!--
-    <EnablePropertyValueConverters>true</EnablePropertyValueConverters>
-    -->
-
         <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
         <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
 
diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
index 5045b1af965c..9e13d3b9c1f3 100644
--- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
@@ -127,13 +127,6 @@ Uri AssembleUrl(DomainAndUri domainUri, string path, Uri current, UrlProviderMod
 
             // ignore vdir at that point, UriFromUmbraco will do it
 
-            if (mode == UrlProviderMode.AutoLegacy)
-            {
-                mode = _requestSettings.UseDomainPrefixes
-                    ? UrlProviderMode.Absolute
-                    : UrlProviderMode.Auto;
-            }
-
             if (domainUri == null) // no domain was found
             {
                 if (current == null)
diff --git a/src/Umbraco.Web/Routing/UrlProviderMode.cs b/src/Umbraco.Web/Routing/UrlProviderMode.cs
index 942f14e373ff..b45dc7c77770 100644
--- a/src/Umbraco.Web/Routing/UrlProviderMode.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderMode.cs
@@ -12,11 +12,6 @@
     /// </remarks>
     public enum UrlProviderMode
     {
-        /// <summary>
-        /// Indicates that the url provider should determine automatically whether to return relative or absolute urls,
-        /// and also respect the legacy <c>useDomainPrefixes</c> setting.
-        /// </summary>
-        AutoLegacy,
 
         /// <summary>
         /// Indicates that the url provider should produce relative urls exclusively.

From 7a50856d32de80481fa34484f3f1cd3558bd3c59 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 00:33:02 +1100
Subject: [PATCH 186/421] Removes AutoLegacy routing and the legacy
 UseDomainPrefixes from umbraco settings

---
 .../Configurations/UmbracoSettings/umbracoSettings.config       | 2 --
 src/Umbraco.Web.UI/config/umbracoSettings.Release.config        | 2 --
 src/Umbraco.Web.UI/config/umbracoSettings.config                | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 47bcfa3ac4a0..4561ed10bd90 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -74,8 +74,6 @@
   </security>
 
   <requestHandler>
-    <!-- this will ensure that urls are unique when running with multiple root nodes -->
-    <useDomainPrefixes>false</useDomainPrefixes>
     <!-- this will add a trailing slash (/) to urls when in directory url mode -->
     <addTrailingSlash>true</addTrailingSlash>
     <urlReplacing removeDoubleDashes="true">
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 1b5104d07461..ba16e34c3cde 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -74,8 +74,6 @@
   </security>
 
   <requestHandler>
-    <!-- this will ensure that urls are unique when running with multiple root nodes -->
-    <useDomainPrefixes>false</useDomainPrefixes>
     <!-- this will add a trailing slash (/) to urls when in directory url mode -->
     <addTrailingSlash>true</addTrailingSlash>
     <!-- this ensures that all url segments are turned to ASCII as much as we can -->
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index fd3573ce8d38..2a189c1515c1 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -86,8 +86,6 @@
     </security>
 
     <requestHandler>
-        <!-- this will ensure that urls are unique when running with multiple root nodes -->
-        <useDomainPrefixes>false</useDomainPrefixes>
         <!-- this will add a trailing slash (/) to urls when in directory url mode -->
         <addTrailingSlash>true</addTrailingSlash>
         <urlReplacing removeDoubleDashes="true" toAscii="try">

From 1c8b4412e388ba452976bafd7fe4d08b6a80c8fe Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 00:57:10 +1100
Subject: [PATCH 187/421] Removes scheduled tasks

---
 .../UmbracoSettings/IScheduledTask.cs         |  13 --
 .../UmbracoSettings/IScheduledTasksSection.cs |  11 --
 .../IUmbracoSettingsSection.cs                |   2 -
 .../UmbracoSettings/ScheduledTaskElement.cs   |  31 -----
 .../ScheduledTasksCollection.cs               |  31 -----
 .../UmbracoSettings/ScheduledTasksElement.cs  |  26 ----
 .../UmbracoSettings/UmbracoSettingsSection.cs |  11 --
 .../UmbracoSettings/WebRoutingElement.cs      |   2 +-
 src/Umbraco.Core/Sync/ApplicationUrlHelper.cs |  16 ---
 src/Umbraco.Core/Umbraco.Core.csproj          |   5 -
 .../ScheduledTasksElementDefaultTests.cs      |  20 ---
 .../ScheduledTasksElementTests.cs             |  24 ----
 .../WebRoutingElementDefaultTests.cs          |   2 +-
 .../UmbracoSettings/WebRoutingElementTests.cs |   2 +-
 .../UmbracoSettings/umbracoSettings.config    |   6 -
 .../umbracoSettings.minimal.config            |   3 -
 .../Misc/ApplicationUrlHelperTests.cs         |  48 +------
 .../TestHelpers/SettingsForTests.cs           |   4 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   2 -
 .../Web/Mvc/SurfaceControllerTests.cs         |   4 +-
 .../Web/TemplateUtilitiesTests.cs             |   2 +-
 .../config/umbracoSettings.Release.config     |   7 -
 .../config/umbracoSettings.config             |   5 -
 src/Umbraco.Web/Routing/UrlProviderMode.cs    |   5 +-
 src/Umbraco.Web/Scheduling/ScheduledTasks.cs  | 127 ------------------
 .../Scheduling/SchedulerComponent.cs          |  10 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 -
 27 files changed, 14 insertions(+), 406 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTask.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTasksSection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTaskElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTasksCollection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTasksElement.cs
 delete mode 100644 src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementDefaultTests.cs
 delete mode 100644 src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementTests.cs
 delete mode 100644 src/Umbraco.Web/Scheduling/ScheduledTasks.cs

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTask.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTask.cs
deleted file mode 100644
index 22fa0288bc47..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTask.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScheduledTask
-    {
-        string Alias { get; }
-
-        bool Log { get; }
-
-        int Interval { get; }
-
-        string Url { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTasksSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTasksSection.cs
deleted file mode 100644
index e4a52e1fb1a7..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTasksSection.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScheduledTasksSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IScheduledTask> Tasks { get; }
-
-        string BaseUrl { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
index 33416d38cce0..db3f937a3509 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
@@ -14,8 +14,6 @@ public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
         
         ILoggingSection Logging { get; }
 
-        IScheduledTasksSection ScheduledTasks { get; }
-
         IProvidersSection Providers { get; }
 
         IWebRoutingSection WebRouting { get; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTaskElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTaskElement.cs
deleted file mode 100644
index a7ecd6f84ed8..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTaskElement.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ScheduledTaskElement : ConfigurationElement, IScheduledTask
-    {
-        [ConfigurationProperty("alias")]
-        public string Alias
-        {
-            get { return (string)base["alias"]; }
-        }
-
-        [ConfigurationProperty("log")]
-        public bool Log
-        {
-            get { return (bool)base["log"]; }
-        }
-
-        [ConfigurationProperty("interval")]
-        public int Interval
-        {
-            get { return (int)base["interval"]; }
-        }
-
-        [ConfigurationProperty("url")]
-        public string Url
-        {
-            get { return (string)base["url"]; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTasksCollection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTasksCollection.cs
deleted file mode 100644
index 9e9a037c0f7e..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTasksCollection.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ScheduledTasksCollection : ConfigurationElementCollection, IEnumerable<IScheduledTask>
-    {
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new ScheduledTaskElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((ScheduledTaskElement)element).Alias;
-        }
-
-        IEnumerator<IScheduledTask> IEnumerable<IScheduledTask>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IScheduledTask;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTasksElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTasksElement.cs
deleted file mode 100644
index 5c83939a7f00..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ScheduledTasksElement.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ScheduledTasksElement : ConfigurationElement, IScheduledTasksSection
-    {
-        [ConfigurationCollection(typeof(ScheduledTasksCollection), AddItemName = "task")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        internal ScheduledTasksCollection Tasks
-        {
-            get { return (ScheduledTasksCollection)base[""]; }
-        }
-
-        IEnumerable<IScheduledTask> IScheduledTasksSection.Tasks
-        {
-            get { return Tasks; }
-        }
-
-        [ConfigurationProperty("baseUrl", IsRequired = false, DefaultValue = null)]
-        public string BaseUrl
-        {
-            get { return (string)base["baseUrl"]; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index 9ed635f6a9d3..929babef8332 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -34,12 +34,6 @@ internal LoggingElement Logging
             get { return (LoggingElement)this["logging"]; }
         }
 
-        [ConfigurationProperty("scheduledTasks")]
-        internal ScheduledTasksElement ScheduledTasks
-        {
-            get { return (ScheduledTasksElement)this["scheduledTasks"]; }
-        }
-
         [ConfigurationProperty("providers")]
         internal ProvidersElement Providers
         {
@@ -77,11 +71,6 @@ ILoggingSection IUmbracoSettingsSection.Logging
             get { return Logging; }
         }
 
-        IScheduledTasksSection IUmbracoSettingsSection.ScheduledTasks
-        {
-            get { return ScheduledTasks; }
-        }
-        
         IProvidersSection IUmbracoSettingsSection.Providers
         {
             get { return Providers; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs
index b4bd82133816..7b7102f2e719 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs
@@ -22,7 +22,7 @@ internal class WebRoutingElement : ConfigurationElement, IWebRoutingSection
         [ConfigurationProperty("disableRedirectUrlTracking", DefaultValue = "false")]
         public bool DisableRedirectUrlTracking => (bool) base["disableRedirectUrlTracking"];
 
-        [ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
+        [ConfigurationProperty("urlProviderMode", DefaultValue = "Auto")]
         public string UrlProviderMode => (string) base["urlProviderMode"];
 
         [ConfigurationProperty("umbracoApplicationUrl", DefaultValue = null)]
diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
index a10c9678669c..9cd4a58c6579 100644
--- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
+++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
@@ -66,22 +66,6 @@ internal static string TryGetApplicationUrl(IUmbracoSettingsSection settings, IL
                 return umbracoApplicationUrl;
             }
 
-            // try umbracoSettings:settings/scheduledTasks/@baseUrl
-            // which is assumed to:
-            // - end with SystemDirectories.Umbraco
-            // - NOT contain any scheme (because, legacy)
-            // - end or not with a slash, it will be taken care of
-            // eg "mysite.com/umbraco"
-            url = settings.ScheduledTasks.BaseUrl;
-            if (url.IsNullOrWhiteSpace() == false)
-            {
-                var ssl = globalSettings.UseHttps ? "s" : "";
-                url = "http" + ssl + "://" + url;
-                var umbracoApplicationUrl = url.TrimEnd('/');
-                logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: {UmbracoAppUrl} (using scheduledTasks/@baseUrl)", umbracoApplicationUrl);
-                return umbracoApplicationUrl;
-            }
-
             // try the server registrar
             // which is assumed to return a url that:
             // - end with SystemDirectories.Umbraco
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1f10085e14ec..35ef18d3e83e 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -265,8 +265,6 @@
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillUploadFieldElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\IProvidersSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IRequestHandlerSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IScheduledTask.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IScheduledTasksSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ISecuritySection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ITourSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IUmbracoSettingsSection.cs" />
@@ -276,9 +274,6 @@
     <Compile Include="Configuration\UmbracoSettings\NotificationsElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ProvidersElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\RequestHandlerElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ScheduledTaskElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ScheduledTasksCollection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ScheduledTasksElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\SecurityElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\TourConfigElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\UmbracoConfigurationElement.cs" />
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementDefaultTests.cs
deleted file mode 100644
index c5947207c578..000000000000
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementDefaultTests.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-
-namespace Umbraco.Tests.Configurations.UmbracoSettings
-{
-    [TestFixture]
-    public class ScheduledTasksElementDefaultTests : ScheduledTasksElementTests
-    {
-        protected override bool TestingDefaults
-        {
-            get { return true; }
-        }
-
-        [Test]
-        public override void Tasks()
-        {
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.Any() == false);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementTests.cs
deleted file mode 100644
index b040e124d92e..000000000000
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ScheduledTasksElementTests.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-
-namespace Umbraco.Tests.Configurations.UmbracoSettings
-{
-    [TestFixture]
-    public class ScheduledTasksElementTests : UmbracoSettingsTests
-    {
-        [Test]
-        public virtual void Tasks()
-        {
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.Count() == 2);
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.ElementAt(0).Alias == "test60");
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.ElementAt(0).Log == true);
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.ElementAt(0).Interval == 60);
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.ElementAt(0).Url == "http://localhost/umbraco/test.aspx");
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.ElementAt(1).Alias == "testtest");
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.ElementAt(1).Log == false);
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.ElementAt(1).Interval == 61);
-            Assert.IsTrue(SettingsSection.ScheduledTasks.Tasks.ElementAt(1).Url == "http://localhost/umbraco/test1.aspx");
-        }
-
-    }
-}
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs
index 6ff2dc8340b4..b593e9082ef4 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs
@@ -14,7 +14,7 @@ protected override bool TestingDefaults
         [Test]
         public override void UrlProviderMode()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "AutoLegacy");
+            Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "Auto");
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
index f7dce4cb8054..dad1173c3fec 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
@@ -20,7 +20,7 @@ public void InternalRedirectPreservesTemplate()
         [Test]
         public virtual void UrlProviderMode()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "AutoLegacy");
+            Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "Auto");
         }
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 4561ed10bd90..5367fe3ece82 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -119,12 +119,6 @@
     <externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" />
   </logging>
 
-  <scheduledTasks>
-    <!-- add tasks that should be called with an interval (seconds) -->
-    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>
-    <task log="false" alias="testtest" interval="61" url="http://localhost/umbraco/test1.aspx"/>
-  </scheduledTasks>
-
   <providers>
     <users>
       <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
index cd9738c58f9e..6119926eaaea 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
@@ -37,9 +37,6 @@
   <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Logging -->
   <logging/>
 
-  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#ScheduledTasks -->
-  <scheduledTasks/>
-
   <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Providers -->
   <providers/>
 
diff --git a/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs b/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
index 47c854333a73..79878a59a146 100644
--- a/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
+++ b/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
@@ -37,8 +37,7 @@ public void SetApplicationUrlViaServerRegistrar()
             // no applicable settings, but a provider
 
             var settings = Mock.Of<IUmbracoSettingsSection>(section =>
-                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string)null)
-                && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>());
+                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string)null));
 
             var globalConfig = Mock.Get(SettingsForTests.GenerateMockGlobalSettings());
             globalConfig.Setup(x => x.UseHttps).Returns(true);
@@ -59,8 +58,7 @@ public void SetApplicationUrlViaProvider()
             // no applicable settings, but a provider
 
             var settings = Mock.Of<IUmbracoSettingsSection>(section =>
-                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null)
-                && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>());
+                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null));
 
             var globalConfig = Mock.Get(SettingsForTests.GenerateMockGlobalSettings());
             globalConfig.Setup(x => x.UseHttps).Returns(true);
@@ -82,8 +80,7 @@ public void SetApplicationUrlWhenNoSettings()
             // no applicable settings, cannot set url
 
             var settings = Mock.Of<IUmbracoSettingsSection>(section =>
-                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null)
-                && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>());
+                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null));
 
             var globalConfig = Mock.Get(SettingsForTests.GenerateMockGlobalSettings());
             globalConfig.Setup(x => x.UseHttps).Returns(true);
@@ -93,47 +90,12 @@ public void SetApplicationUrlWhenNoSettings()
             // still NOT set
             Assert.IsNull(url);
         }
-
-        [Test]
-        public void SetApplicationUrlFromStSettingsNoSsl()
-        {
-            var settings = Mock.Of<IUmbracoSettingsSection>(section =>
-                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null)
-                && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>(tasksSection => tasksSection.BaseUrl == "mycoolhost.com/umbraco"));
-
-            var globalConfig = Mock.Get(SettingsForTests.GenerateMockGlobalSettings());
-            globalConfig.Setup(x => x.UseHttps).Returns(false);
-
-
-
-            var url = ApplicationUrlHelper.TryGetApplicationUrl(settings, Mock.Of<ILogger>(), globalConfig.Object, Mock.Of<IServerRegistrar>());
-
-            Assert.AreEqual("http://mycoolhost.com/umbraco", url);
-        }
-
-        [Test]
-        public void SetApplicationUrlFromStSettingsSsl()
-        {
-            var settings = Mock.Of<IUmbracoSettingsSection>(section =>
-                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null)
-                && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>(tasksSection => tasksSection.BaseUrl == "mycoolhost.com/umbraco/"));
-
-            var globalConfig = Mock.Get(SettingsForTests.GenerateMockGlobalSettings());
-            globalConfig.Setup(x => x.UseHttps).Returns(true);
-
-
-
-            var url = ApplicationUrlHelper.TryGetApplicationUrl(settings, Mock.Of<ILogger>(), globalConfig.Object, Mock.Of<IServerRegistrar>());
-
-            Assert.AreEqual("https://mycoolhost.com/umbraco", url);
-        }
-
+        
         [Test]
         public void SetApplicationUrlFromWrSettingsSsl()
         {
             var settings = Mock.Of<IUmbracoSettingsSection>(section =>
-                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == "httpx://whatever.com/umbraco/")
-                && section.ScheduledTasks == Mock.Of<IScheduledTasksSection>(tasksSection => tasksSection.BaseUrl == "mycoolhost.com/umbraco"));
+                section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == "httpx://whatever.com/umbraco/"));
 
             var globalConfig = Mock.Get(SettingsForTests.GenerateMockGlobalSettings());
             globalConfig.Setup(x => x.UseHttps).Returns(true);
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index a989289cd331..86a767f84ab3 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -38,7 +38,6 @@ public static IUmbracoSettingsSection GenerateMockUmbracoSettings()
             var security = new Mock<ISecuritySection>();
             var requestHandler = new Mock<IRequestHandlerSection>();
             var logging = new Mock<ILoggingSection>();
-            var tasks = new Mock<IScheduledTasksSection>();
             var providers = new Mock<IProvidersSection>();
             var routing = new Mock<IWebRoutingSection>();
 
@@ -46,7 +45,6 @@ public static IUmbracoSettingsSection GenerateMockUmbracoSettings()
             settings.Setup(x => x.Security).Returns(security.Object);
             settings.Setup(x => x.RequestHandler).Returns(requestHandler.Object);
             settings.Setup(x => x.Logging).Returns(logging.Object);
-            settings.Setup(x => x.ScheduledTasks).Returns(tasks.Object);
             settings.Setup(x => x.Providers).Returns(providers.Object);
             settings.Setup(x => x.WebRouting).Returns(routing.Object);
 
@@ -55,7 +53,7 @@ public static IUmbracoSettingsSection GenerateMockUmbracoSettings()
             settings.Setup(x => x.Content.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
             settings.Setup(x => x.RequestHandler.AddTrailingSlash).Returns(true);
             settings.Setup(x => x.RequestHandler.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements());
-            settings.Setup(x => x.WebRouting.UrlProviderMode).Returns("AutoLegacy");
+            settings.Setup(x => x.WebRouting.UrlProviderMode).Returns("Auto");
             settings.Setup(x => x.Providers.DefaultBackOfficeUserProvider).Returns("UsersMembershipProvider");
 
             return settings.Object;
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8c86873e0aa9..83d2e83d9400 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -302,8 +302,6 @@
     <Compile Include="Configurations\UmbracoSettings\ProvidersElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\RequestHandlerElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\RequestHandlerElementTests.cs" />
-    <Compile Include="Configurations\UmbracoSettings\ScheduledTasksElementDefaultTests.cs" />
-    <Compile Include="Configurations\UmbracoSettings\ScheduledTasksElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\SecurityElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\SecurityElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\UmbracoSettingsTests.cs" />
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 03844b5d722d..69f6c5d13ea7 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -120,7 +120,7 @@ public void Can_Lookup_Content()
                 new Mock<HttpContextBase>().Object,
                 publishedSnapshotService.Object,
                 new Mock<WebSecurity>(null, null, globalSettings).Object,
-                Mock.Of<IUmbracoSettingsSection>(section => section.WebRouting == Mock.Of<IWebRoutingSection>(routingSection => routingSection.UrlProviderMode == "AutoLegacy")),
+                Mock.Of<IUmbracoSettingsSection>(section => section.WebRouting == Mock.Of<IWebRoutingSection>(routingSection => routingSection.UrlProviderMode == "Auto")),
                 Enumerable.Empty<IUrlProvider>(),
                 globalSettings,
                 new TestVariationContextAccessor(),
@@ -145,7 +145,7 @@ public void Can_Lookup_Content()
         [Test]
         public void Mock_Current_Page()
         {
-            var webRoutingSettings = Mock.Of<IWebRoutingSection>(section => section.UrlProviderMode == "AutoLegacy");
+            var webRoutingSettings = Mock.Of<IWebRoutingSection>(section => section.UrlProviderMode == "Auto");
             var globalSettings = TestObjects.GetGlobalSettings();
 
             var umbracoContext = UmbracoContext.EnsureContext(
diff --git a/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs b/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
index 4bcad4f4d3b2..aa44e7d08590 100644
--- a/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
+++ b/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
@@ -102,7 +102,7 @@ public void ParseLocalLinks(string input, string result)
                 snapshotService,
                 new Mock<WebSecurity>(null, null, globalSettings).Object,
                 //setup a quick mock of the WebRouting section
-                Mock.Of<IUmbracoSettingsSection>(section => section.WebRouting == Mock.Of<IWebRoutingSection>(routingSection => routingSection.UrlProviderMode == "AutoLegacy")),
+                Mock.Of<IUmbracoSettingsSection>(section => section.WebRouting == Mock.Of<IWebRoutingSection>(routingSection => routingSection.UrlProviderMode == "Auto")),
                 //pass in the custom url provider
                 new[]{ testUrlProvider.Object },
                 globalSettings,
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index ba16e34c3cde..c42a5f766813 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -74,17 +74,10 @@
   </security>
 
   <requestHandler>
-    <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-    <addTrailingSlash>true</addTrailingSlash>
     <!-- this ensures that all url segments are turned to ASCII as much as we can -->
     <urlReplacing toAscii="try" />
   </requestHandler>
 
-  <scheduledTasks>
-    <!-- add tasks that should be called with an interval (seconds) -->
-    <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
-  </scheduledTasks>
-
   <!--
     web.routing
       @trySkipIisCustomErrors
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 2a189c1515c1..c4b25919d2c9 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -133,11 +133,6 @@
         <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
     </logging>
 
-    <scheduledTasks>
-        <!-- add tasks that should be called with an interval (seconds) -->
-        <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
-    </scheduledTasks>
-
     <providers>
         <users>
             <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
diff --git a/src/Umbraco.Web/Routing/UrlProviderMode.cs b/src/Umbraco.Web/Routing/UrlProviderMode.cs
index b45dc7c77770..ac29aed3fb49 100644
--- a/src/Umbraco.Web/Routing/UrlProviderMode.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderMode.cs
@@ -1,14 +1,11 @@
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Specifies the type of urls that the url provider should produce.
+    /// Specifies the type of urls that the url provider should produce, Auto is the default
     /// </summary>
     /// <remarks>
-    /// <para>The <c>AutoLegacy</c> option is equivalent to <c>Auto</c> but it also respects the legacy <c>useDomainPrefixes</c> setting.
-    /// When that setting is true, then all urls are absolute. Otherwise, urls will be relative or absolute, depending on hostnames.</para>
     /// <para>The <c>Relative</c> option can lead to invalid results when combined with hostnames, but it is the only way to reproduce
     /// the true, pre-4.10, always-relative behavior of Umbraco.</para>
-    /// <para>For the time being, the default option is <c>AutoLegacy</c> although in the future it will be <c>Auto</c>.</para>
     /// </remarks>
     public enum UrlProviderMode
     {
diff --git a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
deleted file mode 100644
index a26b8b23ac9c..000000000000
--- a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using Umbraco.Core;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Sync;
-
-namespace Umbraco.Web.Scheduling
-{
-    // TODO: No scheduled task (i.e. URL) would be secured, so if people are actually using these each task
-    // would need to be a publicly available task (URL) which isn't really very good :(
-    // We should really be using the AdminTokenAuthorizeAttribute for this stuff
-
-    internal class ScheduledTasks : RecurringTaskBase
-    {
-        private static HttpClient _httpClient;
-        private readonly IRuntimeState _runtime;
-        private readonly IUmbracoSettingsSection _settings;
-        private readonly IProfilingLogger _logger;
-        private static readonly Hashtable ScheduledTaskTimes = new Hashtable();
-
-        public ScheduledTasks(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
-            IRuntimeState runtime, IUmbracoSettingsSection settings, IProfilingLogger logger)
-            : base(runner, delayMilliseconds, periodMilliseconds)
-        {
-            _runtime = runtime;
-            _settings = settings;
-            _logger = logger;
-        }
-
-        private async Task ProcessTasksAsync(CancellationToken token)
-        {
-            var scheduledTasks = _settings.ScheduledTasks.Tasks;
-            foreach (var t in scheduledTasks)
-            {
-                var runTask = false;
-                if (ScheduledTaskTimes.ContainsKey(t.Alias) == false)
-                {
-                    runTask = true;
-                    ScheduledTaskTimes.Add(t.Alias, DateTime.Now);
-                }
-
-                // Add 1 second to timespan to compensate for differences in timer
-                else if (
-                    new TimeSpan(
-                        DateTime.Now.Ticks - ((DateTime)ScheduledTaskTimes[t.Alias]).Ticks).TotalSeconds + 1 >= t.Interval)
-                {
-                    runTask = true;
-                    ScheduledTaskTimes[t.Alias] = DateTime.Now;
-                }
-
-                if (runTask)
-                {
-                    var taskResult = await GetTaskByHttpAync(t.Url, token);
-                    if (t.Log)
-                        _logger.Info<ScheduledTasks>("{TaskAlias} has been called with response: {TaskResult}", t.Alias, taskResult);
-                }
-            }
-        }
-
-        private async Task<bool> GetTaskByHttpAync(string url, CancellationToken token)
-        {
-            if (_httpClient == null)
-                _httpClient = new HttpClient
-                {
-                    BaseAddress = _runtime.ApplicationUrl
-                };
-
-            var request = new HttpRequestMessage(HttpMethod.Get, url);
-
-            // TODO: pass custom the authorization header, currently these aren't really secured!
-            //request.Headers.Authorization = AdminTokenAuthorizeAttribute.GetAuthenticationHeaderValue(_appContext);
-
-            try
-            {
-                var result = await _httpClient.SendAsync(request, token).ConfigureAwait(false); // ConfigureAwait(false) is recommended? http://blog.stephencleary.com/2012/07/dont-block-on-async-code.html
-                return result.StatusCode == HttpStatusCode.OK;
-            }
-            catch (Exception ex)
-            {
-                    _logger.Error<ScheduledTasks>(ex, "An error occurred calling web task for url: {Url}", url);
-
-            }
-            return false;
-        }
-
-        public override async Task<bool> PerformRunAsync(CancellationToken token)
-        {
-            switch (_runtime.ServerRole)
-            {
-                case ServerRole.Replica:
-                    _logger.Debug<ScheduledTasks>("Does not run on replica servers.");
-                    return true; // DO repeat, server role can change
-                case ServerRole.Unknown:
-                    _logger.Debug<ScheduledTasks>("Does not run on servers with unknown role.");
-                    return true; // DO repeat, server role can change
-            }
-
-            // ensure we do not run if not main domain, but do NOT lock it
-            if (_runtime.IsMainDom == false)
-            {
-                _logger.Debug<ScheduledTasks>("Does not run if not MainDom.");
-                return false; // do NOT repeat, going down
-            }
-
-            using (_logger.DebugDuration<ScheduledTasks>("Scheduled tasks executing", "Scheduled tasks complete"))
-            {
-                try
-                {
-                    await ProcessTasksAsync(token);
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<ScheduledTasks>(ex, "Error executing scheduled task");
-                }
-            }
-
-            return true; // repeat
-        }
-
-        public override bool IsAsync => true;
-    }
-}
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
index d400ccc07761..697c80e76d81 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
@@ -91,7 +91,6 @@ private void RegisterBackgroundTasks()
 
                 tasks.Add(RegisterKeepAlive());
                 tasks.Add(RegisterScheduledPublishing());
-                tasks.Add(RegisterTaskRunner(settings));
                 tasks.Add(RegisterLogScrubber(settings));
 
                 var healthCheckConfig = Current.Configs.HealthChecks();
@@ -119,14 +118,7 @@ private IBackgroundTask RegisterScheduledPublishing()
             _publishingRunner.TryAdd(task);
             return task;
         }
-
-        private IBackgroundTask RegisterTaskRunner(IUmbracoSettingsSection settings)
-        {
-            var task = new ScheduledTasks(_tasksRunner, 60000, 60000, _runtime, settings, _logger);
-            _tasksRunner.TryAdd(task);
-            return task;
-        }
-
+        
         private IBackgroundTask RegisterHealthCheckNotifier(IHealthChecks healthCheckConfig,
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
             IProfilingLogger logger)
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index a7ed8f5e1278..849d82940f9e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -924,7 +924,6 @@
     <Compile Include="Scheduling\KeepAlive.cs" />
     <Compile Include="Scheduling\LogScrubber.cs" />
     <Compile Include="Scheduling\ScheduledPublishing.cs" />
-    <Compile Include="Scheduling\ScheduledTasks.cs" />
     <Compile Include="Scheduling\TaskEventArgs.cs" />
     <Compile Include="Security\MembershipHelper.cs" />
     <Compile Include="Editors\SectionController.cs" />

From f28c60ced3289c472dfb79ad25b7f862c868a6e1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 01:11:15 +1100
Subject: [PATCH 188/421] Removes all irrelevant logging settings from umbraco
 settings

---
 .../UmbracoSettings/ExternalLoggerElement.cs  | 25 -------
 .../UmbracoSettings/ILoggingSection.cs        |  8 --
 .../UmbracoSettings/LoggingElement.cs         | 73 +------------------
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 -
 .../LoggingElementDefaultTests.cs             | 10 ---
 .../UmbracoSettings/LoggingElementTests.cs    | 27 +------
 .../UmbracoSettings/umbracoSettings.config    |  9 ---
 .../config/umbracoSettings.config             | 15 ----
 src/Umbraco.Web/Scheduling/LogScrubber.cs     | 11 +--
 9 files changed, 3 insertions(+), 176 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/ExternalLoggerElement.cs

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ExternalLoggerElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ExternalLoggerElement.cs
deleted file mode 100644
index 00cf29a751c7..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ExternalLoggerElement.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ExternalLoggerElement : ConfigurationElement
-    {
-        [ConfigurationProperty("assembly")]
-        internal string Assembly
-        {
-            get { return (string)base["assembly"]; }
-        }
-
-        [ConfigurationProperty("type")]
-        internal string Type
-        {
-            get { return (string)base["type"]; }
-        }
-
-        [ConfigurationProperty("logAuditTrail")]
-        internal bool LogAuditTrail
-        {
-            get { return (bool)base["logAuditTrail"]; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs
index 220f4b9d5b0b..6c1be8ade5d3 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs
@@ -4,14 +4,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     public interface ILoggingSection : IUmbracoConfigurationSection
     {
-        bool AutoCleanLogs { get; }
-
-        bool EnableLogging { get; }
-
-        int CleaningMiliseconds { get; }
-
         int MaxLogAge { get; }
-
-        IEnumerable<ILogType> DisabledLogTypes { get; }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs
index 7632f241e128..abe10d830e9e 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs
@@ -6,87 +6,16 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     internal class LoggingElement : UmbracoConfigurationElement, ILoggingSection
     {
 
-        [ConfigurationProperty("autoCleanLogs")]
-        internal InnerTextConfigurationElement<bool> AutoCleanLogs
-        {
-            get { return GetOptionalTextElement("autoCleanLogs", false); }
-        }
-
-        [ConfigurationProperty("enableLogging")]
-        internal InnerTextConfigurationElement<bool> EnableLogging
-        {
-            get { return GetOptionalTextElement("enableLogging", true); }
-        }
-
-        [ConfigurationProperty("enableAsyncLogging")]
-        internal InnerTextConfigurationElement<bool> EnableAsyncLogging
-        {
-            get { return GetOptionalTextElement("enableAsyncLogging", true); }
-        }
-
-        [ConfigurationProperty("cleaningMiliseconds")]
-        internal InnerTextConfigurationElement<int> CleaningMiliseconds
-        {
-            get { return GetOptionalTextElement("cleaningMiliseconds", -1); }
-        }
-
         [ConfigurationProperty("maxLogAge")]
         internal InnerTextConfigurationElement<int> MaxLogAge
         {
             get { return GetOptionalTextElement("maxLogAge", -1); }
         }
-
-        [ConfigurationCollection(typeof(DisabledLogTypesCollection), AddItemName = "logTypeAlias")]
-        [ConfigurationProperty("disabledLogTypes", IsDefaultCollection = true)]
-        internal DisabledLogTypesCollection DisabledLogTypes
-        {
-            get { return (DisabledLogTypesCollection)base["disabledLogTypes"]; }
-        }
-
-        [ConfigurationProperty("externalLogger", IsRequired = false)]
-        internal ExternalLoggerElement ExternalLogger
-        {
-            get { return (ExternalLoggerElement) base["externalLogger"]; }
-        }
-
-        public bool ExternalLoggerIsConfigured
-        {
-            get
-            {
-                var externalLoggerProperty = Properties["externalLogger"];
-                var externalLogger = this[externalLoggerProperty] as ConfigurationElement;
-                if (externalLogger != null && externalLogger.ElementInformation.IsPresent)
-                {
-                    return true;
-                }
-                return false;
-            }
-        }
-
-        bool ILoggingSection.AutoCleanLogs
-        {
-            get { return AutoCleanLogs; }
-        }
-
-        bool ILoggingSection.EnableLogging
-        {
-            get { return EnableLogging; }
-        }
-
-        int ILoggingSection.CleaningMiliseconds
-        {
-            get { return CleaningMiliseconds; }
-        }
-
+        
         int ILoggingSection.MaxLogAge
         {
             get { return MaxLogAge; }
         }
 
-        IEnumerable<ILogType> ILoggingSection.DisabledLogTypes
-        {
-            get { return DisabledLogTypes; }
-        }
-
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 35ef18d3e83e..049ca914d450 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -251,7 +251,6 @@
     <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentSectionExtensions.cs" />
     <Compile Include="Configuration\UmbracoSettings\DisabledLogTypesCollection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ExternalLoggerElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\FileExtensionElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\IBackOfficeSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IChar.cs" />
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs
index 7eb5a9c4c57e..c0819ad82823 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs
@@ -11,16 +11,6 @@ protected override bool TestingDefaults
             get { return true; }
         }
 
-        [Test]
-        public override void DisabledLogTypes()
-        {
-            Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.Any() == false);
-        }
-        [Test]
-        public override void CleaningMiliseconds()
-        {
-            Assert.IsTrue(SettingsSection.Logging.CleaningMiliseconds == -1);
-        }
         [Test]
         public override void MaxLogAge()
         {
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs
index 2fd32e4a369a..31edc87a7cbe 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs
@@ -6,32 +6,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
     [TestFixture]
     public class LoggingElementTests : UmbracoSettingsTests
     {
-        [Test]
-        public void EnableLogging()
-        {
-            Assert.IsTrue(SettingsSection.Logging.EnableLogging == true);
-        }
-
-        [Test]
-        public virtual void DisabledLogTypes()
-        {
-            Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.Count() == 2);
-            Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.ElementAt(0).LogTypeAlias == "[alias-of-log-type-in-lowercase]");
-            Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.ElementAt(1).LogTypeAlias == "anotherlogalias");
-        }
-
-        [Test]
-        public void AutoCleanLogs()
-        {
-            Assert.IsTrue(SettingsSection.Logging.AutoCleanLogs == false);
-        }
-
-        [Test]
-        public virtual void CleaningMiliseconds()
-        {
-            Assert.IsTrue(SettingsSection.Logging.CleaningMiliseconds == 86400);
-
-        }
+        
         [Test]
         public virtual void MaxLogAge()
         {
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 5367fe3ece82..7aeb779e0b6d 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -107,16 +107,7 @@
   </requestHandler>
 
   <logging>
-    <autoCleanLogs>false</autoCleanLogs>
-    <enableLogging>true</enableLogging>
-    <enableAsyncLogging>true</enableAsyncLogging>
-    <disabledLogTypes>
-      <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias>
-      <logTypeAlias>anotherlogalias</logTypeAlias>
-    </disabledLogTypes>
-    <cleaningMiliseconds>86400</cleaningMiliseconds>
     <maxLogAge>1440</maxLogAge>
-    <externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" />
   </logging>
 
   <providers>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index c4b25919d2c9..fa60e31a08af 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -118,21 +118,6 @@
         </urlReplacing>
     </requestHandler>
 
-    <!--
-		Now that we have external logging enabled, this section is only used for what gets logged to the umbracoLog table
-		which currently logs items used in the audit trail and roll back scenarios.
-		-->
-    <logging>
-        <enableLogging>true</enableLogging>
-        <enableAsyncLogging>true</enableAsyncLogging>
-        <disabledLogTypes>
-            <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
-        </disabledLogTypes>
-        <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
-        <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
-        <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
-    </logging>
-
     <providers>
         <users>
             <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs
index ae2780998727..c39f9df1b319 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs
@@ -49,16 +49,7 @@ private int GetLogScrubbingMaximumAge(IUmbracoSettingsSection settings)
 
         public static int GetLogScrubbingInterval(IUmbracoSettingsSection settings, ILogger logger)
         {
-            var interval = 4 * 60 * 60 * 1000; // 4 hours, in milliseconds
-            try
-            {
-                if (settings.Logging.CleaningMiliseconds > -1)
-                    interval = settings.Logging.CleaningMiliseconds;
-            }
-            catch (Exception ex)
-            {
-                logger.Error<LogScrubber>(ex, "Unable to locate a log scrubbing interval. Defaulting to 4 hours.");
-            }
+            const int interval = 4 * 60 * 60 * 1000; // 4 hours, in milliseconds
             return interval;
         }
 

From 2a54b2931cc6b35ac7c443689ba2e9c2a8d9fbc5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 01:20:19 +1100
Subject: [PATCH 189/421] Removes providers section from umbraco settings

---
 .../UmbracoSettings/IProvidersSection.cs      |  9 ---
 .../IUmbracoSettingsSection.cs                |  2 -
 .../UmbracoSettings/ProvidersElement.cs       | 18 -----
 .../UmbracoSettings/UmbracoSettingsSection.cs | 70 ++++---------------
 .../UmbracoSettings/UserProviderElement.cs    | 21 ------
 src/Umbraco.Core/Constants-Security.cs        |  2 +
 .../Security/MembershipProviderExtensions.cs  |  6 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |  3 -
 .../ProvidersElementDefaultTests.cs           | 14 ----
 .../UmbracoSettings/ProvidersElementTests.cs  | 15 ----
 .../UmbracoSettings/umbracoSettings.config    |  8 ---
 .../umbracoSettings.minimal.config            |  3 -
 .../TestHelpers/SettingsForTests.cs           |  3 -
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 -
 .../config/umbracoSettings.config             |  8 ---
 .../Providers/UsersMembershipProvider.cs      | 15 +---
 16 files changed, 20 insertions(+), 179 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/IProvidersSection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/ProvidersElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/UserProviderElement.cs
 delete mode 100644 src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementDefaultTests.cs
 delete mode 100644 src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementTests.cs

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IProvidersSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IProvidersSection.cs
deleted file mode 100644
index 6fdac94af1b8..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IProvidersSection.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IProvidersSection : IUmbracoConfigurationSection
-    {
-        string DefaultBackOfficeUserProvider { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
index db3f937a3509..81d27e7baeba 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
@@ -14,8 +14,6 @@ public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
         
         ILoggingSection Logging { get; }
 
-        IProvidersSection Providers { get; }
-
         IWebRoutingSection WebRouting { get; }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ProvidersElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ProvidersElement.cs
deleted file mode 100644
index 87876b1e0ae6..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ProvidersElement.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ProvidersElement : ConfigurationElement, IProvidersSection
-    {
-        [ConfigurationProperty("users")]
-        public UserProviderElement Users
-        {
-            get { return (UserProviderElement)base["users"]; }
-        }
-
-        public string DefaultBackOfficeUserProvider
-        {
-            get { return Users.DefaultBackOfficeProvider; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index 929babef8332..7cf80963454e 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -5,80 +5,34 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     public class UmbracoSettingsSection : ConfigurationSection, IUmbracoSettingsSection
     {
         [ConfigurationProperty("backOffice")]
-        internal BackOfficeElement BackOffice
-        {
-            get { return (BackOfficeElement)this["backOffice"]; }
-        }
+        internal BackOfficeElement BackOffice => (BackOfficeElement)this["backOffice"];
 
         [ConfigurationProperty("content")]
-        internal ContentElement Content
-        {
-            get { return (ContentElement)this["content"]; }
-        }
+        internal ContentElement Content => (ContentElement)this["content"];
 
         [ConfigurationProperty("security")]
-        internal SecurityElement Security
-        {
-            get { return (SecurityElement)this["security"]; }
-        }
+        internal SecurityElement Security => (SecurityElement)this["security"];
 
         [ConfigurationProperty("requestHandler")]
-        internal RequestHandlerElement RequestHandler
-        {
-            get { return (RequestHandlerElement)this["requestHandler"]; }
-        }
+        internal RequestHandlerElement RequestHandler => (RequestHandlerElement)this["requestHandler"];
 
         [ConfigurationProperty("logging")]
-        internal LoggingElement Logging
-        {
-            get { return (LoggingElement)this["logging"]; }
-        }
+        internal LoggingElement Logging => (LoggingElement)this["logging"];
 
-        [ConfigurationProperty("providers")]
-        internal ProvidersElement Providers
-        {
-            get { return (ProvidersElement)this["providers"]; }
-        }
 
         [ConfigurationProperty("web.routing")]
-        internal WebRoutingElement WebRouting
-        {
-            get { return (WebRoutingElement)this["web.routing"]; }
-        }
+        internal WebRoutingElement WebRouting => (WebRoutingElement)this["web.routing"];
 
-        IContentSection IUmbracoSettingsSection.Content
-        {
-            get { return Content; }
-        }
+        IContentSection IUmbracoSettingsSection.Content => Content;
 
-        ISecuritySection IUmbracoSettingsSection.Security
-        {
-            get { return Security; }
-        }
+        ISecuritySection IUmbracoSettingsSection.Security => Security;
 
-        IRequestHandlerSection IUmbracoSettingsSection.RequestHandler
-        {
-            get { return RequestHandler; }
-        }
+        IRequestHandlerSection IUmbracoSettingsSection.RequestHandler => RequestHandler;
 
-        IBackOfficeSection IUmbracoSettingsSection.BackOffice
-        {
-            get { return BackOffice; }
-        }
+        IBackOfficeSection IUmbracoSettingsSection.BackOffice => BackOffice;
 
-        ILoggingSection IUmbracoSettingsSection.Logging
-        {
-            get { return Logging; }
-        }
+        ILoggingSection IUmbracoSettingsSection.Logging => Logging;
 
-        IProvidersSection IUmbracoSettingsSection.Providers
-        {
-            get { return Providers; }
-        }
-
-        IWebRoutingSection IUmbracoSettingsSection.WebRouting
-        {
-            get { return WebRouting; }
-        }
+        IWebRoutingSection IUmbracoSettingsSection.WebRouting => WebRouting;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UserProviderElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UserProviderElement.cs
deleted file mode 100644
index eedb7b4ccf37..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/UserProviderElement.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class UserProviderElement : ConfigurationElement
-    {
-        [ConfigurationProperty("DefaultBackofficeProvider")]
-        internal InnerTextConfigurationElement<string> DefaultBackOfficeProvider
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                      (InnerTextConfigurationElement<string>)this["DefaultBackofficeProvider"],
-                        //set the default
-                      "UsersMembershipProvider");
-            }
-        }
-
-
-    }
-}
diff --git a/src/Umbraco.Core/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs
index f1b9f5cce343..80f18eb2e064 100644
--- a/src/Umbraco.Core/Constants-Security.cs
+++ b/src/Umbraco.Core/Constants-Security.cs
@@ -7,6 +7,8 @@ public static partial class Constants
     {
         public static class Security
         {
+            public const string UserMembershipProviderName = "UsersMembershipProvider";
+
             /// <summary>
             /// Gets the identifier of the 'super' user.
             /// </summary>
diff --git a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
index 8fc2cb77e446..367e6f5c5a30 100644
--- a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
+++ b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
@@ -88,11 +88,11 @@ public static MembershipProvider GetMembersMembershipProvider()
         /// <returns></returns>
         public static MembershipProvider GetUsersMembershipProvider()
         {
-            if (Membership.Providers[Current.Configs.Settings().Providers.DefaultBackOfficeUserProvider] == null)
+            if (Membership.Providers[Constants.Security.UserMembershipProviderName] == null)
             {
-                throw new InvalidOperationException("No membership provider found with name " + Current.Configs.Settings().Providers.DefaultBackOfficeUserProvider);
+                throw new InvalidOperationException("No membership provider found with name " + Constants.Security.UserMembershipProviderName);
             }
-            return Membership.Providers[Current.Configs.Settings().Providers.DefaultBackOfficeUserProvider];
+            return Membership.Providers[Constants.Security.UserMembershipProviderName];
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 049ca914d450..c90641adebbf 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -262,7 +262,6 @@
     <Compile Include="Configuration\UmbracoSettings\ILogType.cs" />
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillPropertiesCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillUploadFieldElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IProvidersSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IRequestHandlerSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ISecuritySection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ITourSection.cs" />
@@ -271,14 +270,12 @@
     <Compile Include="Configuration\UmbracoSettings\LoggingElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\LogTypeElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\NotificationsElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ProvidersElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\RequestHandlerElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\SecurityElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\TourConfigElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\UmbracoConfigurationElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\UmbracoSettingsSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\UrlReplacingElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\UserProviderElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\WebRoutingElement.cs" />
     <Compile Include="Configuration\UmbracoVersion.cs" />
     <Compile Include="Constants-Applications.cs" />
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementDefaultTests.cs
deleted file mode 100644
index e01d2275b4aa..000000000000
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementDefaultTests.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NUnit.Framework;
-
-namespace Umbraco.Tests.Configurations.UmbracoSettings
-{
-    [TestFixture]
-    public class ProvidersElementDefaultTests : ProvidersElementTests
-    {
-        protected override bool TestingDefaults
-        {
-            get { return true; }
-        }
-
-    }
-}
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementTests.cs
deleted file mode 100644
index d879b8dcb845..000000000000
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementTests.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using NUnit.Framework;
-using Umbraco.Core;
-
-namespace Umbraco.Tests.Configurations.UmbracoSettings
-{
-    [TestFixture]
-    public class ProvidersElementTests : UmbracoSettingsTests
-    {
-        [Test]
-        public void Users()
-        {
-            Assert.IsTrue(SettingsSection.Providers.DefaultBackOfficeUserProvider == "UsersMembershipProvider");
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 7aeb779e0b6d..ac022a5489ff 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -110,14 +110,6 @@
     <maxLogAge>1440</maxLogAge>
   </logging>
 
-  <providers>
-    <users>
-      <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
-      <!-- specify it here (remember to add it to the web.config as well) -->
-      <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
-    </users>
-  </providers>
-
   <!-- 
     web.routing
       @trySkipIisCustomErrors
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
index 6119926eaaea..d94a124c896b 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
@@ -37,9 +37,6 @@
   <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Logging -->
   <logging/>
 
-  <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#Providers -->
-  <providers/>
-
   <!-- https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/#WebRouting -->
   <web.routing/>
   
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index 86a767f84ab3..97fffe11dded 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -38,14 +38,12 @@ public static IUmbracoSettingsSection GenerateMockUmbracoSettings()
             var security = new Mock<ISecuritySection>();
             var requestHandler = new Mock<IRequestHandlerSection>();
             var logging = new Mock<ILoggingSection>();
-            var providers = new Mock<IProvidersSection>();
             var routing = new Mock<IWebRoutingSection>();
 
             settings.Setup(x => x.Content).Returns(content.Object);
             settings.Setup(x => x.Security).Returns(security.Object);
             settings.Setup(x => x.RequestHandler).Returns(requestHandler.Object);
             settings.Setup(x => x.Logging).Returns(logging.Object);
-            settings.Setup(x => x.Providers).Returns(providers.Object);
             settings.Setup(x => x.WebRouting).Returns(routing.Object);
 
             //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
@@ -54,7 +52,6 @@ public static IUmbracoSettingsSection GenerateMockUmbracoSettings()
             settings.Setup(x => x.RequestHandler.AddTrailingSlash).Returns(true);
             settings.Setup(x => x.RequestHandler.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements());
             settings.Setup(x => x.WebRouting.UrlProviderMode).Returns("Auto");
-            settings.Setup(x => x.Providers.DefaultBackOfficeUserProvider).Returns("UsersMembershipProvider");
 
             return settings.Object;
         }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 83d2e83d9400..42e4aa28c7c1 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -298,8 +298,6 @@
     <Compile Include="Configurations\UmbracoSettings\ContentElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\LoggingElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\LoggingElementTests.cs" />
-    <Compile Include="Configurations\UmbracoSettings\ProvidersElementDefaultTests.cs" />
-    <Compile Include="Configurations\UmbracoSettings\ProvidersElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\RequestHandlerElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\RequestHandlerElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\SecurityElementDefaultTests.cs" />
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index fa60e31a08af..668a98c7cf2b 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -118,14 +118,6 @@
         </urlReplacing>
     </requestHandler>
 
-    <providers>
-        <users>
-            <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
-            <!-- specify it here (remember to add it to the web.config as well) -->
-            <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
-        </users>
-    </providers>
-
     <!--
     web.routing
       @trySkipIisCustomErrors
diff --git a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
index f5002cdcd3e8..f3aa5dd83896 100644
--- a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
@@ -36,10 +36,7 @@ public UsersMembershipProvider(IMembershipMemberService<IUser> memberService, IM
         private volatile bool _hasDefaultMember = false;
         private static readonly object Locker = new object();
 
-        public override string ProviderName
-        {
-            get { return Current.Configs.Settings().Providers.DefaultBackOfficeUserProvider; }
-        }
+        public override string ProviderName => Constants.Security.UserMembershipProviderName;
 
         protected override MembershipUser ConvertToMembershipUser(IUser entity)
         {
@@ -55,18 +52,12 @@ protected override MembershipUser ConvertToMembershipUser(IUser entity)
         /// </summary>
         /// <value></value>
         /// <returns>true if the membership provider supports password reset; otherwise, false. The default is FALSE for users.</returns>
-        public override bool EnablePasswordReset
-        {
-            get { return _enablePasswordReset; }
-        }
+        public override bool EnablePasswordReset => _enablePasswordReset;
 
         /// <summary>
         /// For backwards compatibility, this provider supports this option by default it is FALSE for users
         /// </summary>
-        public override bool AllowManuallyChangingPassword
-        {
-            get { return _allowManuallyChangingPassword; }
-        }
+        public override bool AllowManuallyChangingPassword => _allowManuallyChangingPassword;
 
         public override void Initialize(string name, System.Collections.Specialized.NameValueCollection config)
         {

From 6b2831c606d5724b2a790e67c3e27f47764006aa Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 01:30:17 +1100
Subject: [PATCH 190/421] kill more useless umbraco settings

---
 .../AppCodeFileExtensionsCollection.cs        | 36 -------------------
 .../AppCodeFileExtensionsElement.cs           | 17 ---------
 .../UmbracoSettings/BackOfficeElement.cs      | 12 ++-----
 .../UmbracoSettings/CharElement.cs            | 20 ++++-------
 .../UmbracoSettings/ContentElement.cs         | 19 ----------
 .../DisabledLogTypesCollection.cs             | 31 ----------------
 .../UmbracoSettings/IContentSection.cs        |  6 ----
 src/Umbraco.Core/Umbraco.Core.csproj          |  3 --
 .../UmbracoSettings/ContentElementTests.cs    |  6 ----
 .../Trees/ContentTypeTreeController.cs        | 11 ++----
 .../Trees/MediaTypeTreeController.cs          | 26 ++++----------
 11 files changed, 18 insertions(+), 169 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/AppCodeFileExtensionsCollection.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/AppCodeFileExtensionsElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/DisabledLogTypesCollection.cs

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/AppCodeFileExtensionsCollection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/AppCodeFileExtensionsCollection.cs
deleted file mode 100644
index 06051b54e0da..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/AppCodeFileExtensionsCollection.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class AppCodeFileExtensionsCollection : ConfigurationElementCollection, IEnumerable<IFileExtension>
-    {
-        internal void Add(FileExtensionElement element)
-        {
-            base.BaseAdd(element);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new FileExtensionElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((FileExtensionElement)element).Value;
-        }
-
-        IEnumerator<IFileExtension> IEnumerable<IFileExtension>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IFileExtension;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/AppCodeFileExtensionsElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/AppCodeFileExtensionsElement.cs
deleted file mode 100644
index decddad8ed58..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/AppCodeFileExtensionsElement.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class AppCodeFileExtensionsElement : ConfigurationElement
-    {
-        [ConfigurationCollection(typeof(AppCodeFileExtensionsCollection), AddItemName = "ext")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        internal AppCodeFileExtensionsCollection AppCodeFileExtensionsCollection
-        {
-            get { return (AppCodeFileExtensionsCollection)base[""]; }
-            set { base[""] = value; }
-        }
-
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
index d1d2a26a96fc..79bff51d0558 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
@@ -5,14 +5,8 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     internal class BackOfficeElement : UmbracoConfigurationElement, IBackOfficeSection
     {
         [ConfigurationProperty("tours")]
-        internal TourConfigElement Tours
-        {
-            get { return (TourConfigElement)this["tours"]; }
-        }
+        internal TourConfigElement Tours => (TourConfigElement)this["tours"];
 
-        ITourSection IBackOfficeSection.Tours
-        {
-            get { return Tours; }
-        }
+        ITourSection IBackOfficeSection.Tours => Tours;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/CharElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/CharElement.cs
index 7a13d76aafe8..1ff63ac01720 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/CharElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/CharElement.cs
@@ -7,26 +7,18 @@ internal class CharElement : InnerTextConfigurationElement<string>, IChar
 
         internal string Char
         {
-            get { return _char ?? (_char = (string)RawXml.Attribute("org")); }
-            set { _char = value; }
+            get => _char ?? (_char = (string)RawXml.Attribute("org"));
+            set => _char = value;
         }
 
         internal string Replacement
         {
-            get { return _replacement ?? (_replacement = Value); }
-            set { _replacement = value; }
+            get => _replacement ?? (_replacement = Value);
+            set => _replacement = value;
         }
 
-        string IChar.Char
-        {
-            get { return Char; }
-
-        }
+        string IChar.Char => Char;
 
-        string IChar.Replacement
-        {
-            get { return Replacement; }
-
-        }
+        string IChar.Replacement => Replacement;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index 6ad44da75ac3..5163dda1f6b2 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -22,9 +22,6 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         [ConfigurationProperty("notifications", IsRequired = true)]
         internal NotificationsElement Notifications => (NotificationsElement) base["notifications"];
 
-        [ConfigurationProperty("PropertyContextHelpOption")]
-        internal InnerTextConfigurationElement<string> PropertyContextHelpOption => GetOptionalTextElement("PropertyContextHelpOption", "text");
-
         [ConfigurationProperty("PreviewBadge")]
         internal InnerTextConfigurationElement<string> PreviewBadge => GetOptionalTextElement("PreviewBadge", DefaultPreviewBadge);
 
@@ -37,18 +34,9 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
         [ConfigurationProperty("allowedUploadFiles")]
         internal CommaDelimitedConfigurationElement AllowedUploadFiles => GetOptionalDelimitedElement("allowedUploadFiles", new string[0]);
         
-        [ConfigurationProperty("GlobalPreviewStorageEnabled")]
-        internal InnerTextConfigurationElement<bool> GlobalPreviewStorageEnabled => GetOptionalTextElement("GlobalPreviewStorageEnabled", false);
-        
         [ConfigurationProperty("showDeprecatedPropertyEditors")]
         internal InnerTextConfigurationElement<bool> ShowDeprecatedPropertyEditors => GetOptionalTextElement("showDeprecatedPropertyEditors", false);
 
-        [ConfigurationProperty("EnableInheritedDocumentTypes")]
-        internal InnerTextConfigurationElement<bool> EnableInheritedDocumentTypes => GetOptionalTextElement("EnableInheritedDocumentTypes", true);
-
-        [ConfigurationProperty("EnableInheritedMediaTypes")]
-        internal InnerTextConfigurationElement<bool> EnableInheritedMediaTypes => GetOptionalTextElement("EnableInheritedMediaTypes", true);
-
         [ConfigurationProperty("loginBackgroundImage")]
         internal InnerTextConfigurationElement<string> LoginBackgroundImage => GetOptionalTextElement("loginBackgroundImage", string.Empty);
 
@@ -70,15 +58,8 @@ internal class ContentElement : UmbracoConfigurationElement, IContentSection
 
         IEnumerable<string> IContentSection.AllowedUploadFiles => AllowedUploadFiles;
 
-        bool IContentSection.GlobalPreviewStorageEnabled => GlobalPreviewStorageEnabled;
-
         bool IContentSection.ShowDeprecatedPropertyEditors => ShowDeprecatedPropertyEditors;
 
-        bool IContentSection.EnableInheritedDocumentTypes => EnableInheritedDocumentTypes;
-
-        bool IContentSection.EnableInheritedMediaTypes => EnableInheritedMediaTypes;
-
-        
         string IContentSection.LoginBackgroundImage => LoginBackgroundImage;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/DisabledLogTypesCollection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/DisabledLogTypesCollection.cs
deleted file mode 100644
index 4d79685ff2aa..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/DisabledLogTypesCollection.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class DisabledLogTypesCollection : ConfigurationElementCollection, IEnumerable<ILogType>
-    {
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new LogTypeElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((LogTypeElement)element).Value;
-        }
-
-        IEnumerator<ILogType> IEnumerable<ILogType>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as ILogType;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index a9ef8f5d922d..228b0923dc61 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -25,18 +25,12 @@ public interface IContentSection : IUmbracoConfigurationSection
 
         IEnumerable<string> AllowedUploadFiles { get; }
 
-        bool GlobalPreviewStorageEnabled { get; }
-        
         /// <summary>
         /// Gets a value indicating whether to show deprecated property editors in
         /// a datatype list of available editors.
         /// </summary>
         bool ShowDeprecatedPropertyEditors { get; }
 
-        bool EnableInheritedDocumentTypes { get; }
-
-        bool EnableInheritedMediaTypes { get; }
-
         string LoginBackgroundImage { get; }
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index c90641adebbf..241459c433c4 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -239,8 +239,6 @@
     <Compile Include="Configuration\OptionalInnerTextConfigurationElement.cs" />
     <Compile Include="Configuration\RawXmlConfigurationElement.cs" />
     <Compile Include="Configuration\UmbracoConfigurationSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\AppCodeFileExtensionsCollection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\AppCodeFileExtensionsElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\BackOfficeElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\CharCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\CharElement.cs" />
@@ -250,7 +248,6 @@
     <Compile Include="Configuration\UmbracoSettings\ContentErrorsElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentSectionExtensions.cs" />
-    <Compile Include="Configuration\UmbracoSettings\DisabledLogTypesCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\FileExtensionElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\IBackOfficeSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IChar.cs" />
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 22b301dc3186..26e6a1ad8a8f 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -64,12 +64,6 @@ public virtual void ImageAutoFillProperties()
             Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).ExtensionFieldAlias, "umbracoExtension2");
         }
         
-        [Test]
-        public void GlobalPreviewStorageEnabled()
-        {
-            Assert.IsFalse(SettingsSection.Content.GlobalPreviewStorageEnabled);
-        }
-        
         [Test]
         public void PreviewBadge()
         {
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index f179cb3ac6fd..66cb9fe36e76 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -72,8 +72,6 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
         {
             var menu = new MenuItemCollection();
 
-            var enableInheritedDocumentTypes = Current.Configs.Settings().Content.EnableInheritedDocumentTypes;
-
             if (id == Constants.System.Root.ToInvariantString())
             {
                 //set the default to create
@@ -117,10 +115,7 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
                 var ct = Services.ContentTypeService.Get(int.Parse(id));
                 var parent = ct == null ? null : Services.ContentTypeService.Get(ct.ParentId);
 
-                if (enableInheritedDocumentTypes)
-                {
-                    menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
-                }
+                menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
                 //no move action if this is a child doc type
                 if (parent == null)
                 {
@@ -134,8 +129,8 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
                     OpensDialog = true
                 });
                 menu.Items.Add<ActionDelete>(Services.TextService, true, opensDialog: true);
-                if (enableInheritedDocumentTypes)
-                    menu.Items.Add(new RefreshNode(Services.TextService, true));
+                menu.Items.Add(new RefreshNode(Services.TextService, true));
+
             }
 
             return menu;
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index 5901d713eca8..30db2ea12aee 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -65,8 +65,6 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
         {
             var menu = new MenuItemCollection();
 
-            var enableInheritedMediaTypes = Current.Configs.Settings().Content.EnableInheritedMediaTypes;
-
             if (id == Constants.System.Root.ToInvariantString())
             {
                 // set the default to create
@@ -103,30 +101,18 @@ protected override MenuItemCollection GetMenuForNode(string id, FormDataCollecti
                 var ct = Services.MediaTypeService.Get(int.Parse(id));
                 var parent = ct == null ? null : Services.MediaTypeService.Get(ct.ParentId);
 
-                if (enableInheritedMediaTypes)
-                {
-                    menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
+                menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
 
-                    // no move action if this is a child doc type
-                    if (parent == null)
-                    {
-                        menu.Items.Add<ActionMove>(Services.TextService, true, opensDialog: true);
-                    }
-                }
-                else
+                // no move action if this is a child doc type
+                if (parent == null)
                 {
-                    menu.Items.Add<ActionMove>(Services.TextService, opensDialog: true);
-                    // no move action if this is a child doc type
-                    if (parent == null)
-                    {
-                        menu.Items.Add<ActionMove>(Services.TextService, true, opensDialog: true);
-                    }
+                    menu.Items.Add<ActionMove>(Services.TextService, true, opensDialog: true);
                 }
 
                 menu.Items.Add<ActionCopy>(Services.TextService, opensDialog: true);
                 menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
-                if (enableInheritedMediaTypes)
-                    menu.Items.Add(new RefreshNode(Services.TextService, true));
+                menu.Items.Add(new RefreshNode(Services.TextService, true));
+
             }
 
             return menu;

From f8fd255239a0fe68296a5a454ffb671d894e245d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 01:37:38 +1100
Subject: [PATCH 191/421] Last cleanup of unused umbraco settings

---
 .../ContentErrorPageElement.cs                | 19 ++----
 .../UmbracoSettings/ContentImagingElement.cs  | 15 ++---
 .../UmbracoSettings/FileExtensionElement.cs   | 21 -------
 .../UmbracoSettings/IFileExtension.cs         |  7 ---
 .../Configuration/UmbracoSettings/ILogType.cs |  7 ---
 .../UmbracoSettings/IRequestHandlerSection.cs |  2 -
 .../ImagingAutoFillUploadFieldElement.cs      | 50 ++++------------
 .../UmbracoSettings/LogTypeElement.cs         | 11 ----
 .../UmbracoSettings/LoggingElement.cs         | 11 +---
 .../UmbracoSettings/NotificationsElement.cs   | 11 +---
 .../UmbracoSettings/RequestHandlerElement.cs  | 30 ++--------
 .../UmbracoSettings/SecurityElement.cs        | 60 ++++---------------
 .../UmbracoSettings/TourConfigElement.cs      |  7 +--
 .../UmbracoSettings/UrlReplacingElement.cs    | 14 ++---
 src/Umbraco.Core/Umbraco.Core.csproj          |  4 --
 .../RequestHandlerElementTests.cs             |  5 --
 16 files changed, 48 insertions(+), 226 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/FileExtensionElement.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/IFileExtension.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/ILogType.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/LogTypeElement.cs

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentErrorPageElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentErrorPageElement.cs
index c12dbdddd480..96cea71a8e51 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentErrorPageElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentErrorPageElement.cs
@@ -15,15 +15,9 @@ public ContentErrorPageElement()
 
         }
 
-        public bool HasContentId
-        {
-            get { return ContentId != int.MinValue; }
-        }
+        public bool HasContentId => ContentId != int.MinValue;
 
-        public bool HasContentKey
-        {
-            get { return ContentKey != Guid.Empty; }
-        }
+        public bool HasContentKey => ContentKey != Guid.Empty;
 
         public int ContentId
         {
@@ -51,15 +45,12 @@ public Guid ContentKey
             }
         }
 
-        public string ContentXPath
-        {
-            get { return Value; }
-        }
+        public string ContentXPath => Value;
 
         public string Culture
         {
-            get { return (string) RawXml.Attribute("culture"); }
-            set { RawXml.Attribute("culture").Value = value; }
+            get => (string) RawXml.Attribute("culture");
+            set => RawXml.Attribute("culture").Value = value;
         }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
index 1814ef23e8ff..67562c411adb 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
@@ -6,16 +6,11 @@ internal class ContentImagingElement : ConfigurationElement
     {
 
         [ConfigurationProperty("imageFileTypes")]
-        internal CommaDelimitedConfigurationElement ImageFileTypes
-        {
-            get
-            {
-                return new OptionalCommaDelimitedConfigurationElement(
-                       (CommaDelimitedConfigurationElement)this["imageFileTypes"],
-                        //set the default
-                       GetDefaultImageFileTypes());
-            }
-        }
+        internal CommaDelimitedConfigurationElement ImageFileTypes =>
+            new OptionalCommaDelimitedConfigurationElement(
+                (CommaDelimitedConfigurationElement)this["imageFileTypes"],
+                //set the default
+                GetDefaultImageFileTypes());
 
         internal static string[] GetDefaultImageFileTypes()
         {
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/FileExtensionElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/FileExtensionElement.cs
deleted file mode 100644
index 225a7d7aedbc..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/FileExtensionElement.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class FileExtensionElement : InnerTextConfigurationElement<string>, IFileExtension
-    {
-        public FileExtensionElement()
-        {
-        }
-
-        internal FileExtensionElement(XElement rawXml)
-            : base(rawXml)
-        {
-        }
-
-        string IFileExtension.Extension
-        {
-            get { return Value; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IFileExtension.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IFileExtension.cs
deleted file mode 100644
index 0431fcc2054e..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IFileExtension.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IFileExtension
-    {
-        string Extension { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ILogType.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ILogType.cs
deleted file mode 100644
index f3624736fedd..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ILogType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILogType
-    {
-        string LogTypeAlias { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
index 075c347b68a3..2393c5af63fa 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
@@ -6,8 +6,6 @@ public interface IRequestHandlerSection : IUmbracoConfigurationSection
     {
         bool AddTrailingSlash { get; }
 
-        bool RemoveDoubleDashes { get; }
-
         bool ConvertUrlsToAscii { get; }
 
         bool TryConvertUrlsToAscii { get; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ImagingAutoFillUploadFieldElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ImagingAutoFillUploadFieldElement.cs
index 0573cb4efe40..9b4c45b5c671 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ImagingAutoFillUploadFieldElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ImagingAutoFillUploadFieldElement.cs
@@ -10,58 +10,30 @@ internal class ImagingAutoFillUploadFieldElement : UmbracoConfigurationElement,
         [ConfigurationProperty("alias", IsKey = true, IsRequired = true)]
         public string Alias
         {
-            get { return (string)this["alias"]; }
-            set { this["alias"] = value; }
+            get => (string)this["alias"];
+            set => this["alias"] = value;
         }
 
         [ConfigurationProperty("widthFieldAlias")]
-        internal InnerTextConfigurationElement<string> WidthFieldAlias
-        {
-            get { return GetOptionalTextElement("widthFieldAlias", "umbracoWidth"); }
-        }
+        internal InnerTextConfigurationElement<string> WidthFieldAlias => GetOptionalTextElement("widthFieldAlias", "umbracoWidth");
 
         [ConfigurationProperty("heightFieldAlias")]
-        internal InnerTextConfigurationElement<string> HeightFieldAlias
-        {
-            get { return GetOptionalTextElement("heightFieldAlias", "umbracoHeight"); }
-        }
+        internal InnerTextConfigurationElement<string> HeightFieldAlias => GetOptionalTextElement("heightFieldAlias", "umbracoHeight");
 
         [ConfigurationProperty("lengthFieldAlias")]
-        internal InnerTextConfigurationElement<string> LengthFieldAlias
-        {
-            get { return GetOptionalTextElement("lengthFieldAlias", "umbracoBytes"); }
-        }
+        internal InnerTextConfigurationElement<string> LengthFieldAlias => GetOptionalTextElement("lengthFieldAlias", "umbracoBytes");
 
         [ConfigurationProperty("extensionFieldAlias")]
-        internal InnerTextConfigurationElement<string> ExtensionFieldAlias
-        {
-            get { return GetOptionalTextElement("extensionFieldAlias", "umbracoExtension"); }
-        }
+        internal InnerTextConfigurationElement<string> ExtensionFieldAlias => GetOptionalTextElement("extensionFieldAlias", "umbracoExtension");
 
-        string IImagingAutoFillUploadField.Alias
-        {
-            get { return Alias; }
+        string IImagingAutoFillUploadField.Alias => Alias;
 
-        }
+        string IImagingAutoFillUploadField.WidthFieldAlias => WidthFieldAlias;
 
-        string IImagingAutoFillUploadField.WidthFieldAlias
-        {
-            get { return WidthFieldAlias; }
-        }
+        string IImagingAutoFillUploadField.HeightFieldAlias => HeightFieldAlias;
 
-        string IImagingAutoFillUploadField.HeightFieldAlias
-        {
-            get { return HeightFieldAlias; }
-        }
+        string IImagingAutoFillUploadField.LengthFieldAlias => LengthFieldAlias;
 
-        string IImagingAutoFillUploadField.LengthFieldAlias
-        {
-            get { return LengthFieldAlias; }
-        }
-
-        string IImagingAutoFillUploadField.ExtensionFieldAlias
-        {
-            get { return ExtensionFieldAlias; }
-        }
+        string IImagingAutoFillUploadField.ExtensionFieldAlias => ExtensionFieldAlias;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/LogTypeElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/LogTypeElement.cs
deleted file mode 100644
index 772391da9059..000000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/LogTypeElement.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class LogTypeElement : InnerTextConfigurationElement<string>, ILogType
-    {
-
-        string ILogType.LogTypeAlias
-        {
-            get { return Value; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs
index abe10d830e9e..106b6cc13458 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs
@@ -7,15 +7,8 @@ internal class LoggingElement : UmbracoConfigurationElement, ILoggingSection
     {
 
         [ConfigurationProperty("maxLogAge")]
-        internal InnerTextConfigurationElement<int> MaxLogAge
-        {
-            get { return GetOptionalTextElement("maxLogAge", -1); }
-        }
-        
-        int ILoggingSection.MaxLogAge
-        {
-            get { return MaxLogAge; }
-        }
+        internal InnerTextConfigurationElement<int> MaxLogAge => GetOptionalTextElement("maxLogAge", -1);
 
+        int ILoggingSection.MaxLogAge => MaxLogAge;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/NotificationsElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/NotificationsElement.cs
index 534e4012ff92..afadff56548b 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/NotificationsElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/NotificationsElement.cs
@@ -5,16 +5,9 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     internal class NotificationsElement : UmbracoConfigurationElement
     {
         [ConfigurationProperty("email")]
-        internal InnerTextConfigurationElement<string> NotificationEmailAddress
-        {
-            get { return (InnerTextConfigurationElement<string>)this["email"]; }
-        }
+        internal InnerTextConfigurationElement<string> NotificationEmailAddress => (InnerTextConfigurationElement<string>)this["email"];
 
         [ConfigurationProperty("disableHtmlEmail")]
-        internal InnerTextConfigurationElement<bool> DisableHtmlEmail
-        {
-            get { return GetOptionalTextElement("disableHtmlEmail", false); }
-        }
-
+        internal InnerTextConfigurationElement<bool> DisableHtmlEmail => GetOptionalTextElement("disableHtmlEmail", false);
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs
index a5383dba87a8..263a822381e8 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs
@@ -8,10 +8,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     internal class RequestHandlerElement : UmbracoConfigurationElement, IRequestHandlerSection
     {
         [ConfigurationProperty("addTrailingSlash")]
-        public InnerTextConfigurationElement<bool> AddTrailingSlash
-        {
-            get { return GetOptionalTextElement("addTrailingSlash", true); }
-        }
+        public InnerTextConfigurationElement<bool> AddTrailingSlash => GetOptionalTextElement("addTrailingSlash", true);
 
         private UrlReplacingElement _defaultUrlReplacing;
         [ConfigurationProperty("urlReplacing")]
@@ -88,29 +85,12 @@ internal static CharCollection GetDefaultCharReplacements()
             return collection;
         }
 
-        bool IRequestHandlerSection.AddTrailingSlash
-        {
-            get { return AddTrailingSlash; }
-        }
+        bool IRequestHandlerSection.AddTrailingSlash => AddTrailingSlash;
 
-        bool IRequestHandlerSection.RemoveDoubleDashes
-        {
-            get { return UrlReplacing.RemoveDoubleDashes; }
-        }
+        bool IRequestHandlerSection.ConvertUrlsToAscii => UrlReplacing.ConvertUrlsToAscii.InvariantEquals("true");
 
-        bool IRequestHandlerSection.ConvertUrlsToAscii
-        {
-            get { return UrlReplacing.ConvertUrlsToAscii.InvariantEquals("true"); }
-        }
-
-        bool IRequestHandlerSection.TryConvertUrlsToAscii
-        {
-            get { return UrlReplacing.ConvertUrlsToAscii.InvariantEquals("try"); }
-        }
+        bool IRequestHandlerSection.TryConvertUrlsToAscii => UrlReplacing.ConvertUrlsToAscii.InvariantEquals("try");
 
-        IEnumerable<IChar> IRequestHandlerSection.CharCollection
-        {
-            get { return UrlReplacing.CharCollection; }
-        }
+        IEnumerable<IChar> IRequestHandlerSection.CharCollection => UrlReplacing.CharCollection;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs
index 6bd5be3824d5..d45a3e7d85a2 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/SecurityElement.cs
@@ -5,25 +5,16 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     internal class SecurityElement : UmbracoConfigurationElement, ISecuritySection
     {
         [ConfigurationProperty("keepUserLoggedIn")]
-        internal InnerTextConfigurationElement<bool> KeepUserLoggedIn
-        {
-            get { return GetOptionalTextElement("keepUserLoggedIn", true); }
-        }
+        internal InnerTextConfigurationElement<bool> KeepUserLoggedIn => GetOptionalTextElement("keepUserLoggedIn", true);
 
         [ConfigurationProperty("hideDisabledUsersInBackoffice")]
-        internal InnerTextConfigurationElement<bool> HideDisabledUsersInBackoffice
-        {
-            get { return GetOptionalTextElement("hideDisabledUsersInBackoffice", false); }
-        }
+        internal InnerTextConfigurationElement<bool> HideDisabledUsersInBackoffice => GetOptionalTextElement("hideDisabledUsersInBackoffice", false);
 
         /// <summary>
         /// Used to enable/disable the forgot password functionality on the back office login screen
         /// </summary>
         [ConfigurationProperty("allowPasswordReset")]
-        internal InnerTextConfigurationElement<bool> AllowPasswordReset
-        {
-            get { return GetOptionalTextElement("allowPasswordReset", true); }
-        }
+        internal InnerTextConfigurationElement<bool> AllowPasswordReset => GetOptionalTextElement("allowPasswordReset", true);
 
         /// <summary>
         /// A boolean indicating that by default the email address will be the username
@@ -33,40 +24,22 @@ internal InnerTextConfigurationElement<bool> AllowPasswordReset
         /// When this is false, the username and email fields will be shown in the user section.
         /// </remarks>
         [ConfigurationProperty("usernameIsEmail")]
-        internal InnerTextConfigurationElement<bool> UsernameIsEmail
-        {
-            get { return GetOptionalTextElement("usernameIsEmail", true); }
-        }
+        internal InnerTextConfigurationElement<bool> UsernameIsEmail => GetOptionalTextElement("usernameIsEmail", true);
 
         [ConfigurationProperty("authCookieName")]
-        internal InnerTextConfigurationElement<string> AuthCookieName
-        {
-            get { return GetOptionalTextElement("authCookieName", "UMB_UCONTEXT"); }
-        }
+        internal InnerTextConfigurationElement<string> AuthCookieName => GetOptionalTextElement("authCookieName", "UMB_UCONTEXT");
 
         [ConfigurationProperty("authCookieDomain")]
-        internal InnerTextConfigurationElement<string> AuthCookieDomain
-        {
-            get { return GetOptionalTextElement<string>("authCookieDomain", null); }
-        }
+        internal InnerTextConfigurationElement<string> AuthCookieDomain => GetOptionalTextElement<string>("authCookieDomain", null);
 
-        bool ISecuritySection.KeepUserLoggedIn
-        {
-            get { return KeepUserLoggedIn; }
-        }
+        bool ISecuritySection.KeepUserLoggedIn => KeepUserLoggedIn;
 
-        bool ISecuritySection.HideDisabledUsersInBackoffice
-        {
-            get { return HideDisabledUsersInBackoffice; }
-        }
+        bool ISecuritySection.HideDisabledUsersInBackoffice => HideDisabledUsersInBackoffice;
 
         /// <summary>
         /// Used to enable/disable the forgot password functionality on the back office login screen
         /// </summary>
-        bool ISecuritySection.AllowPasswordReset
-        {
-            get { return AllowPasswordReset; }
-        }
+        bool ISecuritySection.AllowPasswordReset => AllowPasswordReset;
 
         /// <summary>
         /// A boolean indicating that by default the email address will be the username
@@ -75,19 +48,10 @@ bool ISecuritySection.AllowPasswordReset
         /// Even if this is true and the username is different from the email in the database, the username field will still be shown.
         /// When this is false, the username and email fields will be shown in the user section.
         /// </remarks>
-        bool ISecuritySection.UsernameIsEmail
-        {
-            get { return UsernameIsEmail; }
-        }
+        bool ISecuritySection.UsernameIsEmail => UsernameIsEmail;
 
-        string ISecuritySection.AuthCookieName
-        {
-            get { return AuthCookieName; }
-        }
+        string ISecuritySection.AuthCookieName => AuthCookieName;
 
-        string ISecuritySection.AuthCookieDomain
-        {
-            get { return AuthCookieDomain; }
-        }
+        string ISecuritySection.AuthCookieDomain => AuthCookieDomain;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/TourConfigElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/TourConfigElement.cs
index fb231ec0cf1c..dab69f3da0b3 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/TourConfigElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/TourConfigElement.cs
@@ -7,11 +7,8 @@ internal class TourConfigElement : UmbracoConfigurationElement, ITourSection
         //disabled by default so that upgraders don't get it enabled by default
         // TODO: we probably just want to disable the initial one from automatically loading ?
         [ConfigurationProperty("enable", DefaultValue = false)]
-        public bool EnableTours
-        {
-            get { return (bool)this["enable"]; }
-        }
+        public bool EnableTours => (bool)this["enable"];
 
         // TODO: We could have additional filters, etc... defined here
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UrlReplacingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UrlReplacingElement.cs
index cdfa95e7801e..3e12d106ff49 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/UrlReplacingElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/UrlReplacingElement.cs
@@ -6,23 +6,17 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     internal class UrlReplacingElement : ConfigurationElement
     {
         [ConfigurationProperty("removeDoubleDashes", DefaultValue = true)]
-        internal bool RemoveDoubleDashes
-        {
-            get { return (bool) base["removeDoubleDashes"]; }
-        }
+        internal bool RemoveDoubleDashes => (bool) base["removeDoubleDashes"];
 
         [ConfigurationProperty("toAscii", DefaultValue = "false")]
-        internal string ConvertUrlsToAscii
-        {
-            get { return (string) base["toAscii"]; }
-        }
+        internal string ConvertUrlsToAscii => (string) base["toAscii"];
 
         [ConfigurationCollection(typeof(CharCollection), AddItemName = "char")]
         [ConfigurationProperty("", IsDefaultCollection = true)]
         internal CharCollection CharCollection
         {
-            get { return (CharCollection)base[""]; }
-            set { base[""] = value; }
+            get => (CharCollection)base[""];
+            set => base[""] = value;
         }
 
     }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 241459c433c4..4e6e832294d3 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -248,15 +248,12 @@
     <Compile Include="Configuration\UmbracoSettings\ContentErrorsElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentSectionExtensions.cs" />
-    <Compile Include="Configuration\UmbracoSettings\FileExtensionElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\IBackOfficeSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IChar.cs" />
     <Compile Include="Configuration\UmbracoSettings\IContentErrorPage.cs" />
     <Compile Include="Configuration\UmbracoSettings\IContentSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IFileExtension.cs" />
     <Compile Include="Configuration\UmbracoSettings\IImagingAutoFillUploadField.cs" />
     <Compile Include="Configuration\UmbracoSettings\ILoggingSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ILogType.cs" />
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillPropertiesCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillUploadFieldElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\IRequestHandlerSection.cs" />
@@ -265,7 +262,6 @@
     <Compile Include="Configuration\UmbracoSettings\IUmbracoSettingsSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IWebRoutingSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\LoggingElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\LogTypeElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\NotificationsElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\RequestHandlerElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\SecurityElement.cs" />
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
index 2d4d24f3deec..b085c4104cad 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
@@ -12,12 +12,7 @@ public void AddTrailingSlash()
         {
             Assert.IsTrue(SettingsSection.RequestHandler.AddTrailingSlash == true);
         }
-        [Test]
-        public void RemoveDoubleDashes()
-        {
-            Assert.IsTrue(SettingsSection.RequestHandler.RemoveDoubleDashes == true);
 
-        }
         [Test]
         public void CharCollection()
         {

From 4dd51f645a715b76c669f0d93070cdbdbd404d8e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 30 Jan 2019 16:12:50 +0100
Subject: [PATCH 192/421] Make sure the color picker label is stored on first
 select (#4325)

---
 .../colorpicker/colorpicker.controller.js     | 70 ++++++-------------
 .../colorpicker/colorpicker.html              |  2 +-
 2 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index 15d8906ec0a2..9b38be479186 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -12,32 +12,13 @@ function ColorPickerController($scope, angularHelper) {
     //map back to the model
     $scope.model.config = config;
     
-    function convertArrayToDictionaryArray(model) {
-        //now we need to format the items in the dictionary because we always want to have an array
-        var newItems = [];
-        for (var i = 0; i < model.length; i++) {
-            newItems.push({ id: model[i], sortOrder: 0, value: model[i] });
-        }
-
-        return newItems;
-    }
-
-
-    function convertObjectToDictionaryArray(model) {
-        //now we need to format the items in the dictionary because we always want to have an array
-        var newItems = [];
-        var vals = _.values($scope.model.config.items);
-        var keys = _.keys($scope.model.config.items);
-
-        for (var i = 0; i < vals.length; i++) {
-            var label = vals[i].value ? vals[i].value : vals[i];
-            newItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: label });
-        }
-
-        return newItems;
-    }
     $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
 
+    $scope.model.activeColor = {
+        value: "",
+        label: ""
+    };
+
     if ($scope.isConfigured) {
 
         for (var key in $scope.model.config.items) {
@@ -94,33 +75,32 @@ function ColorPickerController($scope, angularHelper) {
     $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
 
     $scope.onSelect = function (color) {
-        // Complex color (value and label)?
-        if (!$scope.model.value.hasOwnProperty("value")) {
-            // did the value change?
-            if ($scope.model.value !== color) {
-                // yes, make sure to set dirty
-                angularHelper.getCurrentForm($scope).$setDirty();
-            }
-            return;
-        }
-
         // did the value change?
         if ($scope.model.value.value === color) {
-            // no, skip the rest
+            // User clicked the currently selected color
+            // to remove the selection, they don't want
+            // to select any color after all.
+            // Unselect the color and mark as dirty
+            $scope.model.activeColor = null;
+            $scope.model.value = null;
+            angularHelper.getCurrentForm($scope).$setDirty();
+
             return;
         }
 
-        // yes, make sure to set dirty
-        angularHelper.getCurrentForm($scope).$setDirty();
-
-        // update the label according to the new color
+        // yes, update the model (label + value) according to the new color
         var selectedItem = _.find($scope.model.config.items, function (item) {
             return item.value === color;
         });
         if (!selectedItem) {
             return;
         }
-        $scope.model.value.label = selectedItem.label;
+        $scope.model.value = {
+            label: selectedItem.label,
+            value: selectedItem.value
+        };
+        // make sure to set dirty
+        angularHelper.getCurrentForm($scope).$setDirty();
     }
 
     // Finds the color best matching the model's color,
@@ -128,7 +108,7 @@ function ColorPickerController($scope, angularHelper) {
     // either the value or label was changed on the data type.
     function initActiveColor() {
 
-        // no value
+        // no value - initialize default value
         if (!$scope.model.value)
             return;
 
@@ -137,10 +117,6 @@ function ColorPickerController($scope, angularHelper) {
             $scope.model.value = { value: $scope.model.value, label: $scope.model.value };
         }
 
-        // Complex color (value and label)?
-        if (!$scope.model.value.hasOwnProperty("value"))
-            return;
-
         var modelColor = $scope.model.value.value;
         var modelLabel = $scope.model.value.label;
 
@@ -180,8 +156,8 @@ function ColorPickerController($scope, angularHelper) {
 
         // If a match was found, set it as the active color.
         if (foundItem) {
-            $scope.model.value.value = foundItem.value;
-            $scope.model.value.label = foundItem.label;
+            $scope.model.activeColor.value = foundItem.value;
+            $scope.model.activeColor.label = foundItem.label;
         }
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
index 0b6e8e7c5928..9022de84441e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
@@ -6,7 +6,7 @@
     </div>
 
     <umb-color-swatches colors="model.config.items"
-                        selected-color="model.value.value"
+                        selected-color="model.activeColor.value"
                         size="m"
                         use-label="model.useLabel"
                         on-select="onSelect(color)">

From f2e1978ddbcef6cbcce837689d4f1ba17c8bb558 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 29 Jan 2019 20:55:38 +0100
Subject: [PATCH 193/421] Support start node IDs for media picker in infinite
 editing

---
 .../prevalueeditors/mediapicker.controller.js    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
index cacb6f8a3f6f..89878e375020 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
@@ -1,6 +1,6 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
-function mediaPickerController($scope, entityResource, iconHelper, editorService) {
+function mediaPickerController($scope, entityResource, iconHelper, editorService, angularHelper) {
 
     function trim(str, chr) {
         var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
@@ -50,10 +50,12 @@ function mediaPickerController($scope, entityResource, iconHelper, editorService
 
     $scope.remove =function(index){
         $scope.renderModel.splice(index, 1);
+        syncModelValue();
     };
 
     $scope.clear = function() {
         $scope.renderModel = [];
+        syncModelValue();
     };
 
     $scope.add = function (item) {
@@ -76,19 +78,17 @@ function mediaPickerController($scope, entityResource, iconHelper, editorService
             });
 
         }	
+
+        syncModelValue();
     };
 
-    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
+    function syncModelValue() {
         var currIds = _.map($scope.renderModel, function (i) {
             return dialogOptions.idType === "udi" ? i.udi : i.id;
         });
         $scope.model.value = trim(currIds.join(), ",");
-    });
-
-    //when the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-        unsubscribe();
-    });
+        angularHelper.getCurrentForm($scope).$setDirty();
+    }
 
     //load media data
     var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];

From 23538630920eec3355949c64a7cdac6a5931a811 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 30 Jan 2019 17:35:06 +0100
Subject: [PATCH 194/421] Fix merge error

---
 .../Services/MemberGroupServiceTests.cs       | 39 ++++++-------------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Tests/Services/MemberGroupServiceTests.cs b/src/Umbraco.Tests/Services/MemberGroupServiceTests.cs
index 20205d74bcde..6199cf5bfbaa 100644
--- a/src/Umbraco.Tests/Services/MemberGroupServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberGroupServiceTests.cs
@@ -1,39 +1,24 @@
 using System;
-using System.Linq;
+using System.Threading;
 using NUnit.Framework;
-using Umbraco.Core;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Services
 {
-    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerTest)]
-    [TestFixture, RequiresSTA]
-    public class MemberGroupServiceTests : BaseServiceTest
+    [TestFixture]
+    [Apartment(ApartmentState.STA)]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
+    public class MemberGroupServiceTests : TestWithSomeContentBase
     {
-        [SetUp]
-        public override void Initialize()
-        {
-            base.Initialize();
-        }
-
-        [TearDown]
-        public override void TearDown()
-        {
-            base.TearDown();
-        }
-        
-        [Test]
-        [ExpectedException("System.InvalidOperationException")]
-        public void New_MemberGroup_Is_Not_Allowed_With_Empty_Name()
+        /// <summary>
+        /// Used to list out all ambiguous events that will require dispatching with a name
+        /// </summary>
+        [Test, Explicit]
+        public void List_Ambiguous_Events()
         {
             var service = ServiceContext.MemberGroupService;
-            
-            service.Save(new MemberGroup {Name = ""});
-
-            Assert.Fail("An exception should have been thrown");
+            Assert.Throws<InvalidOperationException>(() => service.Save(new MemberGroup { Name = "" }));
         }
     }
 }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 42e4aa28c7c1..986dad12fdd4 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -146,6 +146,7 @@
     <Compile Include="Services\ContentTypeServiceVariantsTests.cs" />
     <Compile Include="Services\EntityXmlSerializerTests.cs" />
     <Compile Include="Packaging\CreatedPackagesRepositoryTests.cs" />
+    <Compile Include="Services\MemberGroupServiceTests.cs" />
     <Compile Include="Testing\Objects\TestDataSource.cs" />
     <Compile Include="Published\PublishedSnapshotTestObjects.cs" />
     <Compile Include="Published\ModelTypeTests.cs" />

From 1a298be9fa35878a4dc44394764e52498c511b67 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 30 Jan 2019 17:47:54 +0100
Subject: [PATCH 195/421] Removes obsoleted settings that prevent v8 startup

---
 .../config/umbracoSettings.Release.config     |   6 -
 .../config/umbracoSettings.config             | 168 +++++++-----------
 2 files changed, 61 insertions(+), 113 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index c42a5f766813..eb63fdac7a08 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -36,9 +36,6 @@
       <email>your@email.here</email>
     </notifications>
 
-    <!-- Show property descriptions in editing view "icon|text|none" -->
-    <PropertyContextHelpOption>text</PropertyContextHelpOption>
-
     <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
     <PreviewBadge>
       <![CDATA[
@@ -56,9 +53,6 @@
     <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
     <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
 
-    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
-    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
-
     <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
     <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
 
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 668a98c7cf2b..eb63fdac7a08 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -1,124 +1,78 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
 
+  <!--
+    umbracoSettings.config configuration documentation can be found here:
+    https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/
+    Many of the optional settings are not explicitly listed here
+    but can be found in the online documentation.
+    -->
+
     <backOffice>
         <tours enable="true"></tours>
     </backOffice>
 
-    <content>
-        <imaging>
-            <!-- what file extension should umbraco determine are images for uploaded files -->
-            <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif,svg</imageFileTypes>
-            <!-- defines the property that contains an image with a URL and the properties to update with it's dimensions -->
-            <autoFillImageProperties>
-                <uploadField alias="umbracoFile">
-                    <widthFieldAlias>umbracoWidth</widthFieldAlias>
-                    <heightFieldAlias>umbracoHeight</heightFieldAlias>
-                    <lengthFieldAlias>umbracoBytes</lengthFieldAlias>
-                    <extensionFieldAlias>umbracoExtension</extensionFieldAlias>
-                </uploadField>
-            </autoFillImageProperties>
-
-        </imaging>
-
-        <errors>
-            <!-- the id of the page that should be shown if the page is not found -->
-            <!--<error404>
-                   <errorPage culture="default">1</errorPage>
-                   <errorPage culture="en-US">200</errorPage>
-            </error404>-->
-            <error404>
-                <errorPage culture="default">1</errorPage>
-                <errorPage culture="fr-FR">1079</errorPage>
-                <errorPage culture="en-US">1080</errorPage>
-            </error404>
-        </errors>
-        <notifications>
-            <!-- the email that should be used as from mail when umbraco sends a notification -->
-            <!-- you can add a display name to the email like this: <email>Your display name here &lt;your@email.here&gt;</email> -->
-            <email>your@email.here</email>
-        </notifications>
-
-        <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
-        <PreviewBadge>
-            <![CDATA[
+  <content>
+
+    <errors>
+      <error404>1</error404>
+      <!--
+        The value for error pages can be:
+        * A content item's GUID ID      (example: 26C1D84F-C900-4D53-B167-E25CC489DAC8)
+        * An XPath statement            (example: //errorPages[@nodeName='My cool error']
+        * A content item's integer ID   (example: 1234)
+      -->
+      <!--
+        <error404>
+            <errorPage culture="default">26C1D84F-C900-4D53-B167-E25CC489DAC8</errorPage>
+            <errorPage culture="en-US">D820E120-6865-4D88-BFFE-48801A6AC375</errorPage>
+        </error404>
+       -->
+    </errors>
+
+    <notifications>
+      <!-- the email that should be used as from mail when umbraco sends a notification -->
+      <!-- you can add a display name to the email like this: <email>Your display name here &lt;your@email.here&gt;</email> -->
+      <email>your@email.here</email>
+    </notifications>
+
+    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
+    <PreviewBadge>
+      <![CDATA[
       <a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{0}/assets/img/preview-mode-badge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/preview/end?redir={1}'"><span style="display:none;">In Preview Mode - click to end</span></a>
-    ]]>
-        </PreviewBadge>
-
-
-        <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
-        <!-- Setting this to true can increase render time for pages with a large number of links -->
-        <!-- If running Umbraco in virtual directory this *must* be set to true! -->
-        <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
+    ]]></PreviewBadge>
 
-        <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
+    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
          - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
          - silent - Silently suppress the error and do not render the offending macro.
          - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
                     error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
          Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
-        <MacroErrors>throw</MacroErrors>
-
-        <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-        <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
-
-        <!-- If completed, only the file extensions listed below will be allowed to be uploaded.  If empty, disallowedUploadFiles will apply to prevent upload of specific file extensions. -->
-        <allowedUploadFiles></allowedUploadFiles>
-
-        <showDeprecatedPropertyEditors>false</showDeprecatedPropertyEditors>
-
-        <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
-        <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
-
-    </content>
+    <MacroErrors>throw</MacroErrors>
 
-    <security>
-        <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-        <keepUserLoggedIn>true</keepUserLoggedIn>
+    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
+    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
 
-        <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
-        <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
+    <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
+    <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
 
-        <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
-        <allowPasswordReset>true</allowPasswordReset>
+  </content>
 
-    </security>
+  <security>
+    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
+    <keepUserLoggedIn>false</keepUserLoggedIn>
+    <!-- by default this is true and if not specified in config will be true. set to false to always show a separate username field in the back office user editor -->
+    <usernameIsEmail>true</usernameIsEmail>
+    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
+    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
+  </security>
 
-    <requestHandler>
-        <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-        <addTrailingSlash>true</addTrailingSlash>
-        <urlReplacing removeDoubleDashes="true" toAscii="try">
-            <char org=" ">-</char>
-            <char org="&quot;"></char>
-            <char org="'"></char>
-            <char org="%"></char>
-            <char org="."></char>
-            <char org=";"></char>
-            <char org="/"></char>
-            <char org="\"></char>
-            <char org=":"></char>
-            <char org="#"></char>
-            <char org="+">plus</char>
-            <char org="*">star</char>
-            <char org="&amp;"></char>
-            <char org="?"></char>
-            <char org="æ">ae</char>
-            <char org="ø">oe</char>
-            <char org="Ã¥">aa</char>
-            <char org="ä">ae</char>
-            <char org="ö">oe</char>
-            <char org="ü">ue</char>
-            <char org="ß">ss</char>
-            <char org="Ä">ae</char>
-            <char org="Ö">oe</char>
-            <char org="|">-</char>
-            <char org="&lt;"></char>
-            <char org="&gt;"></char>
-        </urlReplacing>
-    </requestHandler>
+  <requestHandler>
+    <!-- this ensures that all url segments are turned to ASCII as much as we can -->
+    <urlReplacing toAscii="try" />
+  </requestHandler>
 
-    <!--
+  <!--
     web.routing
       @trySkipIisCustomErrors
         Tries to skip IIS custom errors.
@@ -141,7 +95,7 @@
         will make Umbraco render the content on the current page with the template you requested, for example:
         http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the 
         "About Us" page with a template with the alias Home. Setting this setting to true will ensure that 
-        only templates that have been permitted on the document type will be allowed
+        only templates that have been permitted on the document type will be allowed        
       @disableFindContentByIdPath
         By default you can call any content Id in the url and show the content with that id, for example:
         http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting
@@ -151,10 +105,10 @@
         Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
         path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
   -->
-    <web.routing
-      trySkipIisCustomErrors="false"
-      internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
-      umbracoApplicationUrl="">
-    </web.routing>
+  <web.routing
+    trySkipIisCustomErrors="false"
+    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
+    umbracoApplicationUrl="">
+  </web.routing>
 
 </settings>

From 880faeebd3485bae962f02dffd8c1fddec44950b Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 30 Jan 2019 16:50:08 +0000
Subject: [PATCH 196/421] Adds a few more providers to the collection

---
 .../Media/IEmbedSettingProvider.cs            |  9 ------
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 -
 .../config/EmbeddedMedia.config               | 28 -------------------
 .../Media/EmbedProviders/SoundCloud.cs        | 24 ++++++++++++++++
 src/Umbraco.Web/Media/EmbedProviders/Ted.cs   | 24 ++++++++++++++++
 src/Umbraco.Web/Media/EmbedProviders/Vimeo.cs | 24 ++++++++++++++++
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  6 +++-
 src/Umbraco.Web/Umbraco.Web.csproj            |  3 ++
 8 files changed, 80 insertions(+), 39 deletions(-)
 delete mode 100644 src/Umbraco.Core/Media/IEmbedSettingProvider.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/SoundCloud.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Ted.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Vimeo.cs

diff --git a/src/Umbraco.Core/Media/IEmbedSettingProvider.cs b/src/Umbraco.Core/Media/IEmbedSettingProvider.cs
deleted file mode 100644
index b9ba611100fd..000000000000
--- a/src/Umbraco.Core/Media/IEmbedSettingProvider.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Xml;
-
-namespace Umbraco.Core.Media
-{
-    public interface IEmbedSettingProvider
-    {
-        object GetSetting(XmlNode settingNode);
-    }
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index f44db0173804..2edb39fc8686 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -647,7 +647,6 @@
     <Compile Include="Manifest\PackageManifest.cs" />
     <Compile Include="Manifest\DataEditorConverter.cs" />
     <Compile Include="Media\IEmbedProvider.cs" />
-    <Compile Include="Media\IEmbedSettingProvider.cs" />
     <Compile Include="Media\OEmbedResult.cs" />
     <Compile Include="Media\OEmbedStatus.cs" />
     <Compile Include="Migrations\IPostMigration.cs" />
diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
index 262dc2993fb9..0e2c5aa9885c 100644
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.config
+++ b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
@@ -12,20 +12,6 @@
         </requestParams>
     </provider>
 
-    <!-- Vimeo -->
-    <provider name="Vimeo" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-        <urlShemeRegex><![CDATA[vimeo\.com/]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[http://vimeo.com/api/oembed.xml]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-    </provider>
-
-    <!-- Ted -->
-    <provider name="Ted" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-        <urlShemeRegex><![CDATA[ted\.com/]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[http://www.ted.com/talks/oembed.xml]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-    </provider>
-
     <!-- Issuu Settings -->
     <provider name="Issuu" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
         <urlShemeRegex><![CDATA[issuu.com/(?:.*)/docs]]></urlShemeRegex>
@@ -35,20 +21,6 @@
         </requestParams>
     </provider>
     
-    <!-- SoundCloud Settings -->
-    <provider name="SoundCloud" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, Umbraco.Web">
-        <urlShemeRegex><![CDATA[soundcloud\.com/]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[http://soundcloud.com/oembed]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-    </provider>
-
-    <!-- StreamDotUmbracoDotCom -->
-    <provider name="StreamDotUmbracoDotCom" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-        <urlShemeRegex><![CDATA[stream\.umbraco\.org/]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[http://stream.umbraco.org/oembed]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-    </provider>
-
     <!-- Daily Motion -->
     <provider name="DailyMotion" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
         <urlShemeRegex><![CDATA[dailymotion\.com/]]></urlShemeRegex>
diff --git a/src/Umbraco.Web/Media/EmbedProviders/SoundCloud.cs b/src/Umbraco.Web/Media/EmbedProviders/SoundCloud.cs
new file mode 100644
index 000000000000..080437a24672
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/SoundCloud.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Soundcloud : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "https://soundcloud.com/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"soundcloud.com\/*"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var xmlDocument = base.GetXmlResponse(requestUrl);
+
+            return GetXmlProperty(xmlDocument, "/oembed/html");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Ted.cs b/src/Umbraco.Web/Media/EmbedProviders/Ted.cs
new file mode 100644
index 000000000000..aa14423349fc
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Ted.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Ted : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "http://www.ted.com/talks/oembed.xml";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"ted.com\/talks\/*"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var xmlDocument = base.GetXmlResponse(requestUrl);
+
+            return GetXmlProperty(xmlDocument, "/oembed/html");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Vimeo.cs b/src/Umbraco.Web/Media/EmbedProviders/Vimeo.cs
new file mode 100644
index 000000000000..806f40a10c50
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Vimeo.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Vimeo : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "https://vimeo.com/api/oembed.xml";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"vimeo\.com/"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var xmlDocument = base.GetXmlResponse(requestUrl);
+
+            return GetXmlProperty(xmlDocument, "/oembed/html");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 444a4e6098f4..5696589647da 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -222,7 +222,11 @@ public override void Compose(Composition composition)
                 .Append<Kickstarter>()
                 .Append<GettyImages>()
                 .Append<Instagram>()
-                .Append<Twitter>();
+                .Append<Twitter>()
+                .Append<Vimeo>()
+                .Append<Ted>()
+                .Append<Soundcloud>();
         }
     }
 }
+
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 4f20e30b68ac..3e767f97a89f 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -148,6 +148,9 @@
     <Compile Include="Media\EmbedProviders\EmbedProvidersCollectionBuilder.cs" />
     <Compile Include="Media\EmbedProviders\Flickr.cs" />
     <Compile Include="Media\EmbedProviders\GettyImages.cs" />
+    <Compile Include="Media\EmbedProviders\SoundCloud.cs" />
+    <Compile Include="Media\EmbedProviders\Ted.cs" />
+    <Compile Include="Media\EmbedProviders\Vimeo.cs" />
     <Compile Include="Media\EmbedProviders\Twitter.cs" />
     <Compile Include="Media\EmbedProviders\Kickstarter.cs" />
     <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />

From 396fa732835a653cb2be0f3111ade9971620c6fc Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 30 Jan 2019 18:00:40 +0100
Subject: [PATCH 197/421] There is no UI.xml

---
 build/NuSpecs/tools/install.ps1 | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1
index 0d4bb20b4842..9cc7bd5b26a1 100644
--- a/build/NuSpecs/tools/install.ps1
+++ b/build/NuSpecs/tools/install.ps1
@@ -77,10 +77,6 @@ if ($project) {
 		$splashesDestination = Join-Path $projectPath "Config\splashes\"
 		New-Item $splashesDestination -Type directory
 		Copy-Item $splashesSource $splashesDestination -Force
-        
-		$umbracoUIXMLSource = Join-Path $installPath "UmbracoFiles\Umbraco\Config\Create\UI.xml"
-		$umbracoUIXMLDestination = Join-Path $projectPath "Umbraco\Config\Create\UI.xml"
-		Copy-Item $umbracoUIXMLSource $umbracoUIXMLDestination -Force
 	} else {
 		# This part only runs for upgrades
 	
@@ -102,31 +98,6 @@ if ($project) {
 		{
 			# Not a big problem if this fails, let it go
 		}
-		
-		Try 
-		{
-			$uiXmlConfigPath = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
-			$uiXmlFile = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
-
-			$uiXml = New-Object System.Xml.XmlDocument
-			$uiXml.PreserveWhitespace = $true
-
-			$uiXml.Load($uiXmlFile)
-			$createExists = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks/create")
-
-			if($createExists.Count -eq 0) 
-			{    
-				$macrosTasksNode = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks")
-
-				#Creating: <create assembly="umbraco" type="macroTasks" />
-				$createNode = $uiXml.CreateElement("create")
-				$createNode.SetAttribute("assembly", "umbraco")
-				$createNode.SetAttribute("type", "macroTasks")
-				$macrosTasksNode.AppendChild($createNode)
-				$uiXml.Save($uiXmlFile)
-			}
-		} 
-		Catch { }
 	}
 	
 	$installFolder = Join-Path $projectPath "Install"

From b7a788e219690060f8775148f3cc678372ac3c09 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 30 Jan 2019 18:01:01 +0100
Subject: [PATCH 198/421] There is no trees.config

---
 build/NuSpecs/tools/trees.config.install.xdt | 143 -------------------
 1 file changed, 143 deletions(-)
 delete mode 100644 build/NuSpecs/tools/trees.config.install.xdt

diff --git a/build/NuSpecs/tools/trees.config.install.xdt b/build/NuSpecs/tools/trees.config.install.xdt
deleted file mode 100644
index 42adf3cb0e4a..000000000000
--- a/build/NuSpecs/tools/trees.config.install.xdt
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<trees xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--Content-->
-  <add alias="content" application="content"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="RemoveAttributes(silent)" />
-  <add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, Umbraco.Web" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, Umbraco.Web" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  
-  <!--Media-->
-  <add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, Umbraco.Web" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, Umbraco.Web" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  
-  <!--Settings-->
-  <add application="settings" alias="nodeTypes"  
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, Umbraco.Web"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing" />
-  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, Umbraco.Web" iconClosed="" iconOpen="" initialize="false" sortOrder="0" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="templates" title="Templates" type="Umbraco.Web.Trees.TemplatesTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="1" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" /> 
-  
-  <add application="settings" alias="partialViews" type="Umbraco.Web.Trees.PartialViewsTree, Umbraco.Web"
-       xdt:Locator="Match(application,alias,type)"
-       xdt:Transform="Remove()" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, Umbraco.Web" sortOrder="2"
-       xdt:Locator="Match(application,alias)"
-       xdt:Transform="InsertIfMissing"  />
-  
-  <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="8" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add alias="dictionary" application="settings"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="RemoveAttributes(action)" />
-  <add application="settings" alias="languages" title="Languages" type="Umbraco.Web.Trees.LanguageTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="5" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="settings" initialize="true" alias="mediaTypes" title="Media Types" type="Umbraco.Web.Trees.MediaTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="7" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-
-  <!--Developer-->
-  <add alias="packager" application="developer"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add alias="packagerPackages" application="developer"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add initialize="true" sortOrder="0" alias="packager" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, Umbraco.Web" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing"  />
-  
-  <!-- Before 7.4 this tree had the alias 'dataType', without the 's' on the end, this is here to rename it  -->
-  <add sortOrder="1" alias="dataTypes" application="developer" type="Umbraco.Web.Trees.DataTypeTreeController, Umbraco.Web"
-       xdt:Locator="Match(application,type)" 
-       xdt:Transform="SetAttributes(alias,sortOrder)" />
-	   
-  <!-- Yes, set the sortOrder again, like above because.. sometimes apparently we already have a dataTypes node and we can't remove more than one.. if they're equal though (same alias,application and sortOrder) it doesn't throw an error -->   
-  <add sortOrder="1" alias="dataTypes" application="developer"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes(sortOrder)" />
-
-  <add initialize="true" sortOrder="2" alias="macros" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MacroTreeController, Umbraco.Web"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, Umbraco.Web"
-       xdt:Locator="Match(application,alias,type)" 
-       xdt:Transform="Remove()" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, Umbraco.Web" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder"
-       xdt:Locator="Match(application,alias)"
-       xdt:Transform="InsertIfMissing"  />
-  
-  <add application="developer" alias="python" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-
-  <!--Users-->
- <add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, Umbraco.Web" 
-      xdt:Locator="Match(application,alias)"
-      xdt:Transform="SetAttributes()" />
-
-  <add application="users" alias="userTypes"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add application="users" alias="userPermissions" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-
-  <!--Members-->
-  <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, Umbraco.Web" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="member" alias="memberGroup"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing" />
-  <add application="member" alias="memberType"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add application="member" sortOrder="1" alias="memberTypes" initialize="true" title="Member Types" type="Umbraco.Web.Trees.MemberTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing" />
-
-  <!--Translation-->
-  <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, Umbraco.Web" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add alias="openTasks" application="translation"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="RemoveAttributes(action)" />
-  <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, Umbraco.Web" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add alias="yourTasks" application="translation"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="RemoveAttributes(action)" />
-</trees>

From 781f63b8056ffcb6f5b3297654c50b8852e3bfe5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 30 Jan 2019 18:01:16 +0100
Subject: [PATCH 199/421] There is no log4net.config

---
 .../NuSpecs/tools/log4net.config.install.xdt  | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 build/NuSpecs/tools/log4net.config.install.xdt

diff --git a/build/NuSpecs/tools/log4net.config.install.xdt b/build/NuSpecs/tools/log4net.config.install.xdt
deleted file mode 100644
index f4d3caf7fc04..000000000000
--- a/build/NuSpecs/tools/log4net.config.install.xdt
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<log4net xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <appender name="AsynchronousLog4NetAppender" xdt:Transform="Remove" xdt:Locator="Match(name)" /> 
-  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core" xdt:Transform="Insert" >
-    <appender-ref ref="rollingFile" />
-  </appender>
-  
-  <appender name="rollingFile" type="log4net.Appender.RollingFileAppender" xdt:Transform="InsertIfMissing">
-    <file value="App_Data\Logs\UmbracoTraceLog.txt" />
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <appendToFile value="true" />
-    <rollingStyle value="Date" />
-    <maximumFileSize value="5MB" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
-    </layout>
-    <encoding value="utf-8" />
-  </appender>
-</log4net>
-

From 74a1bb91231c1dcccf8995398a262162ac9b61de Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 30 Jan 2019 18:02:48 +0100
Subject: [PATCH 200/421] Update .net version, don't insert examine nor
 defaultuilanguage

---
 build/NuSpecs/tools/Web.config.install.xdt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index 74a614275f8c..2da3206e7a13 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -2,8 +2,6 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <configSections xdt:Transform="InsertIfMissing" />
   <configSections>
-    <section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
-
     <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
@@ -18,7 +16,6 @@
     <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
 	<add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
 	<add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="umbracoDefaultUILanguage" value="en-US" xdt:Locator="Match(key)" xdt:Transform="SetAttributes(value)" />
   </appSettings>
 
   <umbracoConfiguration xdt:Transform="InsertIfMissing">
@@ -40,7 +37,7 @@
     <siteMap xdt:Transform="Remove" />
     <httpRuntime xdt:Transform="InsertIfMissing" />
     <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
 
     <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
     <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>

From 2036da5e84f72d9344d7ad85a4fbbd4e9ede33df Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Thu, 31 Jan 2019 04:37:07 +1100
Subject: [PATCH 201/421] V8: kill usercontrol support, cleanup macros (#4329)

---
 src/Umbraco.Core/IO/SystemDirectories.cs      |  6 +-
 .../Upgrade/V_8_0_0/RefactorMacroColumns.cs   |  2 +-
 src/Umbraco.Core/Models/MacroTypes.cs         |  2 -
 src/Umbraco.Tests/IO/IoHelperTests.cs         |  4 +-
 src/Umbraco.Tests/Macros/MacroTests.cs        | 61 +------------
 .../src/common/services/macro.service.js      | 36 +-------
 .../common/services/macro-service.spec.js     | 30 +------
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 -
 .../Umbraco/config/lang/en_us.xml             |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/es.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml |  1 -
 .../Umbraco/config/lang/zh_tw.xml             |  1 -
 .../FolderAndFilePermissionsCheck.cs          |  1 -
 .../Install/FilePermissionHelper.cs           |  4 +-
 src/Umbraco.Web/Macros/MacroRenderer.cs       | 23 +----
 src/Umbraco.Web/Macros/MacroTagParser.cs      |  2 -
 .../Macros/UserControlMacroEngine.cs          | 90 -------------------
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  7 +-
 src/Umbraco.Web/Mvc/UmbracoPageResult.cs      | 23 -----
 src/Umbraco.Web/Templates/TemplateRenderer.cs |  4 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 27 files changed, 13 insertions(+), 294 deletions(-)
 delete mode 100644 src/Umbraco.Web/Macros/UserControlMacroEngine.cs

diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs
index 100dbc265e73..2f33d82bdc0d 100644
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Web;
+using System.Web;
 
 namespace Umbraco.Core.IO
 {
@@ -36,9 +35,6 @@ public class SystemDirectories
 
         public static string Umbraco => IOHelper.ReturnPath("umbracoPath", "~/umbraco");
 
-        [Obsolete("Usercontrols are obsolete and code should be removed")]
-        public static string UserControls => "~/usercontrols";
-
         public static string Packages => Data + "/packages";
 
         public static string Preview => Data + "/preview";
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
index 623a84252539..bd08b5387720 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
@@ -26,7 +26,7 @@ public override void Migrate()
                 //populate the new macroSource column with legacy data
                 Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroXSLT, macroType = {(int)MacroTypes.Unknown} WHERE macroXSLT IS NOT NULL").Do();
                 Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptAssembly, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptAssembly IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.UserControl} WHERE macroScriptType IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptType IS NOT NULL").Do();
                 Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroPython, macroType = {(int)MacroTypes.PartialView} WHERE macroPython IS NOT NULL").Do();
 
                 //now apply constraints (NOT NULL) to new table
diff --git a/src/Umbraco.Core/Models/MacroTypes.cs b/src/Umbraco.Core/Models/MacroTypes.cs
index 1f8ae696c546..5f8440845d42 100644
--- a/src/Umbraco.Core/Models/MacroTypes.cs
+++ b/src/Umbraco.Core/Models/MacroTypes.cs
@@ -10,8 +10,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public enum MacroTypes
     {
-        [EnumMember]
-        UserControl = 3,
         [EnumMember]
         Unknown = 4,
         [EnumMember]
diff --git a/src/Umbraco.Tests/IO/IoHelperTests.cs b/src/Umbraco.Tests/IO/IoHelperTests.cs
index 3f510dd57e36..34b18ffc5e5b 100644
--- a/src/Umbraco.Tests/IO/IoHelperTests.cs
+++ b/src/Umbraco.Tests/IO/IoHelperTests.cs
@@ -7,7 +7,6 @@ namespace Umbraco.Tests.IO
     [TestFixture]
     public class IoHelperTests
     {
-
         [TestCase("~/Scripts", "/Scripts", null)]
         [TestCase("/Scripts", "/Scripts", null)]
         [TestCase("../Scripts", "/Scripts", typeof(ArgumentException))]
@@ -42,8 +41,7 @@ public void IOHelper_MapPathTestVDirTraversal()
             Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Preview, true), IOHelper.MapPath(SystemDirectories.Preview, false));
             Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Root, true), IOHelper.MapPath(SystemDirectories.Root, false));
             Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Scripts, true), IOHelper.MapPath(SystemDirectories.Scripts, false));
-            Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Umbraco, true), IOHelper.MapPath(SystemDirectories.Umbraco, false));            
-            Assert.AreEqual(IOHelper.MapPath(SystemDirectories.UserControls, true), IOHelper.MapPath(SystemDirectories.UserControls, false));
+            Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Umbraco, true), IOHelper.MapPath(SystemDirectories.Umbraco, false));
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Macros/MacroTests.cs b/src/Umbraco.Tests/Macros/MacroTests.cs
index 0d60181c7946..9cc1d149547a 100644
--- a/src/Umbraco.Tests/Macros/MacroTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroTests.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using NUnit.Framework;
+using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Macros;
@@ -32,47 +27,7 @@ public void Setup()
             Current.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
         }
 
-        [TestCase("123", "IntProp", typeof(int))]
-        [TestCase("Hello", "StringProp", typeof(string))]
-        [TestCase("123456789.01", "DoubleProp", typeof(double))]
-        [TestCase("1234567", "FloatProp", typeof(float))]
-        [TestCase("1", "BoolProp", typeof(bool))]
-        [TestCase("true", "BoolProp", typeof(bool))]
-        [TestCase("0", "BoolProp", typeof(bool))]
-        [TestCase("false", "BoolProp", typeof(bool))]
-        [TestCase("2001-05-10", "DateProp", typeof(DateTime))]
-        [TestCase("123px", "UnitProp", typeof(Unit))]
-        [TestCase("456pt", "UnitProp", typeof(Unit))]
-        [TestCase("CEC063D3-D73E-4B7D-93ED-7F69CA9BF2D0", "GuidProp", typeof(Guid))]
-        [TestCase("CEC063D3D73E4B7D93ED7F69CA9BF2D0", "GuidProp", typeof(Guid))]
-        [TestCase("", "NullDateProp", typeof(DateTime?))]
-        [TestCase("2001-05-10", "NullDateProp", typeof(DateTime?))]
-        [TestCase("", "NullUnitProp", typeof(Unit?))]
-        [TestCase("456pt", "NullUnitProp", typeof(Unit?))]
-        public void SetUserControlProperty(string val, string macroPropName, Type convertTo)
-        {
-            var ctrl = new UserControlTest();
-            var macroModel = new MacroModel
-            {
-                Name = "test",
-                Alias = "test",
-                MacroSource = "~/usercontrols/menu.ascx"
-            };
-            macroModel.Properties.Add(new MacroPropertyModel(macroPropName, val));
-
-            UserControlMacroEngine.UpdateControlProperties(ctrl, macroModel);
-
-            var ctrlType = ctrl.GetType();
-            var prop = ctrlType.GetProperty(macroPropName);
-            var converted = val.TryConvertTo(convertTo);
-
-            Assert.IsTrue(converted.Success);
-            Assert.NotNull(prop);
-            Assert.AreEqual(converted.Result, prop.GetValue(ctrl));
-        }
-
         [TestCase("PartialView", true)]
-        [TestCase("UserControl", true)]
         [TestCase("Unknown", false)]
         public void Macro_Is_File_Based(string macroTypeString, bool expectedNonNull)
         {
@@ -102,19 +57,5 @@ public void Get_Macro_Cache_Identifier()
         {
             //var asdf  = macro.GetCacheIdentifier()
         }
-
-        private class UserControlTest : UserControl
-        {
-            public int IntProp { get; set; }
-            public string StringProp { get; set; }
-            public double DoubleProp { get; set; }
-            public float FloatProp { get; set; }
-            public bool BoolProp { get; set; }
-            public DateTime DateProp { get; set; }
-            public Unit UnitProp { get; set; }
-            public Guid GuidProp { get; set; }
-            public DateTime? NullDateProp { get; set; }
-            public Unit? NullUnitProp { get; set; }
-        }
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
index 77ed6e821e21..6c8c0a6ff2f7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
@@ -40,7 +40,7 @@ function macroService() {
 
         /**
          * @ngdoc function
-         * @name umbraco.services.macroService#generateWebFormsSyntax
+         * @name umbraco.services.macroService#generateMacroSyntax
          * @methodOf umbraco.services.macroService
          * @function    
          *
@@ -82,35 +82,6 @@ function macroService() {
 
             return macroString;
         },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.macroService#generateWebFormsSyntax
-         * @methodOf umbraco.services.macroService
-         * @function    
-         *
-         * @description
-         * generates the syntax for inserting a macro into a webforms templates
-         * 
-         * @param {object} args an object containing the macro alias and it's parameter values
-         */
-        generateWebFormsSyntax: function(args) {
-            
-            var macroString = '<umbraco:Macro ';
-
-            if (args.macroParamsDictionary) {
-                
-                _.each(args.macroParamsDictionary, function (val, key) {
-                    var keyVal = key + "=\"" + (val ? val : "") + "\" ";
-                    macroString += keyVal;
-                });
-
-            }
-
-            macroString += "Alias=\"" + args.macroAlias + "\" runat=\"server\"></umbraco:Macro>";
-
-            return macroString;
-        },
         
         /**
          * @ngdoc function
@@ -180,10 +151,7 @@ function macroService() {
             });
 
             //get the syntax based on the rendering engine
-            if (renderingEngine && renderingEngine === "WebForms") {
-                syntax = this.generateWebFormsSyntax({ macroAlias: macroAlias, macroParamsDictionary: paramDictionary });
-            }
-            else if (renderingEngine && renderingEngine === "Mvc") {
+            if (renderingEngine && renderingEngine === "Mvc") {
                 syntax = this.generateMvcSyntax({ macroAlias: macroAlias, macroParamsDictionary: paramDictionary });
             }
             else {
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js
index 44334e140a2a..3f92236169d6 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js
@@ -108,34 +108,6 @@ describe('macro service tests', function () {
                 toBe("<?UMBRACO_MACRO macroAlias=\"myMacro\" />");
 
         });
-
-        it('can generate syntax for webforms', function () {
-
-            var syntax = macroService.generateWebFormsSyntax({
-                macroAlias: "myMacro",
-                macroParamsDictionary: {
-                    param1: "value1",
-                    param2: "value2",
-                    param3: "value3"
-                }
-            });
-            
-            expect(syntax).
-                toBe("<umbraco:Macro param1=\"value1\" param2=\"value2\" param3=\"value3\" Alias=\"myMacro\" runat=\"server\"></umbraco:Macro>");
-            
-        });
-        
-        it('can generate syntax for webforms with no params', function () {
-
-            var syntax = macroService.generateWebFormsSyntax({
-                macroAlias: "myMacro",
-                macroParamsDictionary: {}
-            });
-
-            expect(syntax).
-                toBe("<umbraco:Macro Alias=\"myMacro\" runat=\"server\"></umbraco:Macro>");
-
-        });
         
         it('can generate syntax for MVC', function () {
 
@@ -167,4 +139,4 @@ describe('macro service tests', function () {
         });
 
     });
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index e89ef4492368..ad78274c919c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -544,7 +544,6 @@
     <key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
     <key alias="filePermissionsError">There is a problem with read/write access to a specific file or folder</key>
     <key alias="macroErrorLoadingPartialView">Error loading Partial View script (file: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">Error loading userControl '%0%'</key>
     <key alias="missingTitle">Please enter a title</key>
     <key alias="missingType">Please choose a type</key>
     <key alias="pictureResizeBiggerThanOrg">You're about to make the picture larger than the original size. Are you sure that you want to proceed?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index bb8d9b12eb75..36c738c42c9e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -548,7 +548,6 @@
     <key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
     <key alias="filePermissionsError">There is a problem with read/write access to a specific file or folder</key>
     <key alias="macroErrorLoadingPartialView">Error loading Partial View script (file: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">Error loading userControl '%0%'</key>
     <key alias="missingTitle">Please enter a title</key>
     <key alias="missingType">Please choose a type</key>
     <key alias="pictureResizeBiggerThanOrg">You're about to make the picture larger than the original size. Are you sure that you want to proceed?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
index 9aeab1dba498..fb7350d603f8 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -451,7 +451,6 @@
         <key alias="contentTypeAliasAndNameNotNull">Debes rellenar el alias y el nombre en el tipo de propiedad</key>
     <key alias="filePermissionsError">Hay un problema de lectura y escritura al acceder a un archivo o carpeta</key>
     <key alias="macroErrorLoadingPartialView">Error cargando Vista Parcial (archivo: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">Error cargando userControl '%0%'</key>
     <key alias="missingTitle"><![CDATA[Por favor, introduzca un título
 ]]></key>
         <key alias="missingType">Por favor, elige un tipo </key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index b6fd93df03ca..45af92a4400f 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -464,7 +464,6 @@
     <key alias="contentTypeAliasAndNameNotNull">Veuillez remplir l'alias et le nom de la nouvelle propriété!</key>
     <key alias="filePermissionsError">Il y a un problème de droits en lecture/écriture sur un fichier ou dossier spécifique</key>
     <key alias="macroErrorLoadingPartialView">Erreur de chargement du script d'une Partial View (fichier : %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">Erreur de chargement du userControl '%0%'</key>
     <key alias="missingTitle">Veuillez entrer un titre</key>
     <key alias="missingType">Veuillez choisir un type</key>
     <key alias="pictureResizeBiggerThanOrg">Vous allez définir une taille d'image supérieure à sa taille d'origine. Êtes-vous certain(e) de vouloir continuer?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
index 730e4e06b785..bf6a9eea75e1 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
@@ -344,7 +344,6 @@
     <key alias="contentTypeAliasAndNameNotNull">新しいプロパティ型のエイリアスと名前の両方を設定してください！</key>
     <key alias="filePermissionsError">特定のファイルまたはフォルタの読み込み/書き込みアクセスに問題があります</key>
     <key alias="macroErrorLoadingPartialView">Partial View スクリプトの読み込みエラー (ファイル: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">userControl の読み込みエラー '%0%'</key>
     <key alias="missingTitle">タイトルを入力してください</key>
     <key alias="missingType">型を選択してください</key>
     <key alias="pictureResizeBiggerThanOrg">元画像より大きくしようとしていますが、本当によろしいのですか？</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
index 5904958b939e..60f8e36449ce 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -376,7 +376,6 @@
     <key alias="contentTypeAliasAndNameNotNull">Zowel de alias als de naam van het nieuwe eigenschappentype moeten worden ingevuld!</key>
     <key alias="filePermissionsError">Er is een probleem met de lees/schrijfrechten op een bestand of map</key>
     <key alias="macroErrorLoadingPartialView">Error bij het laden van Partial View script (file: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">Error bij het laden van userControl '%0%'</key>
     <key alias="missingTitle">Vul een titel in</key>
     <key alias="missingType">Selecteer een type</key>
     <key alias="pictureResizeBiggerThanOrg">U wilt een afbeelding groter maken dan de originele afmetingen. Weet je zeker dat je wilt doorgaan?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
index 893bf356dd44..159bb8e7c260 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -446,7 +446,6 @@
     <key alias="contentTypeAliasAndNameNotNull">Proszę uzupełnij zarówno alias, jak i nazwę dla nowego typu właściwości</key>
     <key alias="filePermissionsError">Wystąpił problem podczas zapisu/odczytu wymaganego pliku lub folderu</key>
     <key alias="macroErrorLoadingPartialView">Wystąpił błąd podczas ładowania skryptu Częściowego Widoku (plik: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">Wystąpił błąd podczas ładowania userControl '%0%'</key>
     <key alias="missingTitle">Proszę podać tytuł</key>
     <key alias="missingType">Proszę wybrać typ</key>
     <key alias="pictureResizeBiggerThanOrg">Chcesz utworzyć obraz większy niż rozmiar oryginalny. Czy na pewno chcesz kontynuować?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
index 4854a2c3aa26..c484e33423f5 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -483,7 +483,6 @@
     <key alias="dissallowedMediaType">Использование данного типа файлов на сайте запрещено администратором</key>
     <key alias="filePermissionsError">Ошибка доступа к указанному файлу или папке</key>
     <key alias="macroErrorLoadingPartialView">Ошибка загрузки кода в частичном представлении (файл: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">Ошибка загрузки пользовательского элемента управления '%0%'</key>
     <key alias="missingTitle">Укажите заголовок</key>
     <key alias="missingType">Выберите тип</key>
     <key alias="pictureResizeBiggerThanOrg">Вы пытаетесь увеличить изображение по сравнению с его исходным размером. Уверены, что хотите сделать это?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
index 7f0f874237c4..6c4a0773a49f 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -286,7 +286,6 @@
     <key alias="contentTypeAliasAndNameNotNull">Yeni özellik tipine takma adını ve hem de doldurunuz!</key>
     <key alias="filePermissionsError">Belirli bir dosya veya klasör için okuma / yazma erişimi olan bir sorun var</key>
     <key alias="macroErrorLoadingPartialView">Error loading Partial View script (Dosya: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">Error loading userControl '%0%'</key>
     <key alias="missingTitle">Lütfen bir başlık girin</key>
     <key alias="missingType">Lütfen bir tür seçin</key>
     <key alias="pictureResizeBiggerThanOrg">Orijinal boyutundan daha resmi büyütmek üzereyiz. Devam etmek istediğinizden emin misiniz?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
index 374d8802eb91..7e3c275b06b4 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
@@ -364,7 +364,6 @@
     <key alias="contentTypeAliasAndNameNotNull">请为新的属性类型填写名称和别名！</key>
     <key alias="filePermissionsError">权限有问题，访问指定文件或文件夹失败！</key>
     <key alias="macroErrorLoadingPartialView">加载Partial视图脚本时出错(文件: %0%)</key>
-    <key alias="macroErrorLoadingUsercontrol">加载 userControl 时出错 '%0%'</key>
     <key alias="missingTitle">请输入标题</key>
     <key alias="missingType">请选择类型</key>
     <key alias="pictureResizeBiggerThanOrg">图片尺寸大于原始尺寸不会提高图片质量，您确定要把图片尺寸变大吗?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index 98279d58f35d..f7461ad9d79a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -357,7 +357,6 @@
     <key alias="contentTypeAliasAndNameNotNull">請為新的屬性類型填寫名稱和別名！</key>
     <key alias="filePermissionsError">許可權有問題，訪問指定文檔或資料夾失敗！</key>
     <key alias="macroErrorLoadingPartialView">讀取片段視圖腳本錯誤（檔案：%0%）</key>
-    <key alias="macroErrorLoadingUsercontrol">讀取使用者控制項 %0% 錯誤</key>
     <key alias="missingTitle">請輸入標題</key>
     <key alias="missingType">請選擇類型</key>
     <key alias="pictureResizeBiggerThanOrg">圖片尺寸大於原始尺寸不會提高圖片品質，您確定要把圖片尺寸變大嗎?</key>
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
index 273d19bae0de..ee6f25423534 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
@@ -68,7 +68,6 @@ private HealthCheckStatus CheckFolderPermissions()
                 { SystemDirectories.Media, PermissionCheckRequirement.Optional },
                 { SystemDirectories.Scripts, PermissionCheckRequirement.Optional },
                 { SystemDirectories.Umbraco, PermissionCheckRequirement.Optional },
-                { SystemDirectories.UserControls, PermissionCheckRequirement.Optional },
                 { SystemDirectories.MvcViews, PermissionCheckRequirement.Optional }
             };
 
diff --git a/src/Umbraco.Web/Install/FilePermissionHelper.cs b/src/Umbraco.Web/Install/FilePermissionHelper.cs
index 6c166e734ba9..e802b19c8d89 100644
--- a/src/Umbraco.Web/Install/FilePermissionHelper.cs
+++ b/src/Umbraco.Web/Install/FilePermissionHelper.cs
@@ -11,8 +11,8 @@ namespace Umbraco.Web.Install
     internal class FilePermissionHelper
     {
         // ensure that these directories exist and Umbraco can write to them
-        private static readonly string[] PermissionDirs = { SystemDirectories.Css, SystemDirectories.Config, SystemDirectories.Data, SystemDirectories.Media, SystemDirectories.UserControls, SystemDirectories.Preview };
-        private static readonly string[] PackagesPermissionsDirs = { SystemDirectories.Bin, SystemDirectories.Umbraco, SystemDirectories.UserControls, SystemDirectories.Packages };
+        private static readonly string[] PermissionDirs = { SystemDirectories.Css, SystemDirectories.Config, SystemDirectories.Data, SystemDirectories.Media, SystemDirectories.Preview };
+        private static readonly string[] PackagesPermissionsDirs = { SystemDirectories.Bin, SystemDirectories.Umbraco, SystemDirectories.Packages };
 
         // ensure Umbraco can write to these files (the directories must exist)
         private static readonly string[] PermissionFiles = { };
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 17c5859e9181..c975c4a60b4a 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -11,7 +11,6 @@
 using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Caching;
-using System.Web.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -171,8 +170,7 @@ internal static string GetMacroFileName(MacroModel model)
             switch (model.MacroType)
             {
                 case MacroTypes.PartialView:
-                case MacroTypes.UserControl:
-                    filename = model.MacroSource; //user controls & partial views are saved with their full virtual path
+                    filename = model.MacroSource; // partial views are saved with their full virtual path
                     break;
                 default:
                     // not file-based, or not supported
@@ -363,14 +361,6 @@ private Attempt<MacroContent> ExecuteMacroOfType(MacroModel model)
                         () => ExecutePartialView(model),
                         () => textService.Localize("errors/macroErrorLoadingPartialView", new[] { model.MacroSource }));
 
-                case MacroTypes.UserControl:
-                    return ExecuteMacroWithErrorWrapper(model,
-                        $"Loading UserControl: MacroSource=\"{model.MacroSource}\".",
-                        "Loaded UserControl.",
-                        () => ExecuteUserControl(model),
-                        () => textService.Localize("errors/macroErrorLoadingUsercontrol", new[] { model.MacroSource }));
-
-                //case MacroTypes.Script:
                 default:
                     return ExecuteMacroWithErrorWrapper(model,
                         $"Execute macro with unsupported type \"{model.MacroType}\".",
@@ -411,17 +401,6 @@ private static MacroContent ExecutePartialView(MacroModel macro)
             return engine.Execute(macro, content);
         }
 
-        public static MacroContent ExecuteUserControl(MacroModel macro)
-        {
-            // add tilde for v4 defined macros
-            if (string.IsNullOrEmpty(macro.MacroSource) == false
-                && macro.MacroSource.StartsWith("~") == false)
-                macro.MacroSource = "~/" + macro.MacroSource;
-
-            var engine = new UserControlMacroEngine();
-            return engine.Execute(macro);
-        }
-
         #endregion
 
         #region Execution helpers
diff --git a/src/Umbraco.Web/Macros/MacroTagParser.cs b/src/Umbraco.Web/Macros/MacroTagParser.cs
index 8e3f116614d5..7dea3674b0c9 100644
--- a/src/Umbraco.Web/Macros/MacroTagParser.cs
+++ b/src/Umbraco.Web/Macros/MacroTagParser.cs
@@ -162,8 +162,6 @@ internal static void ParseMacros(
             while (!stop)
             {
                 var tagIndex = fieldResult.ToString().ToLower().IndexOf("<?umbraco");
-                if (tagIndex < 0)
-                    tagIndex = fieldResult.ToString().ToLower().IndexOf("<umbraco:macro");
                 if (tagIndex > -1)
                 {
                     var tempElementContent = "";
diff --git a/src/Umbraco.Web/Macros/UserControlMacroEngine.cs b/src/Umbraco.Web/Macros/UserControlMacroEngine.cs
deleted file mode 100644
index f92074a91beb..000000000000
--- a/src/Umbraco.Web/Macros/UserControlMacroEngine.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.IO;
-using System.Web;
-using System.Web.UI;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Web.Composing;
-
-namespace Umbraco.Web.Macros
-{
-    class UserControlMacroEngine
-    {
-        public MacroContent Execute(MacroModel model)
-        {
-            var filename = model.MacroSource;
-
-            // ensure the file exists
-            var path = IOHelper.FindFile(filename);
-            if (File.Exists(IOHelper.MapPath(path)) == false)
-                throw new Exception($"Failed to load control, file {filename} does not exist.");
-
-            // load the control
-            var control = (UserControl)new UserControl().LoadControl(path);
-            control.ID = string.IsNullOrEmpty(model.MacroControlIdentifier)
-                ? GetControlUniqueId(filename)
-                : model.MacroControlIdentifier;
-
-            // initialize the control
-            // note: we are not setting the 'CurrentNode' property on the control anymore,
-            // as that was an INode which is gone in v8. Use UmbracoContext to access the
-            // current content.
-            Current.Logger.Info<UserControlMacroEngine>("Loaded control '{UserControlFile}' with ID '{UserControlId}'", filename, control.ID);
-            UpdateControlProperties(control, model);
-
-            return new MacroContent { Control = control };
-        }
-
-        private static string GetControlUniqueId(string filename)
-        {
-            const string key = "MacroControlUniqueId";
-
-            var x = 0;
-
-            if (HttpContext.Current != null)
-            {
-                if (HttpContext.Current.Items.Contains(key))
-                    x = (int)HttpContext.Current.Items[key];
-                x += 1;
-                HttpContext.Current.Items[key] = x;
-            }
-
-            return $"{Path.GetFileNameWithoutExtension(filename)}_{x}";
-        }
-
-        // set the control properties according to the model properties ie parameters
-        internal static void UpdateControlProperties(Control control, MacroModel model)
-        {
-            var type = control.GetType();
-
-            foreach (var modelProperty in model.Properties)
-            {
-                var controlProperty = type.GetProperty(modelProperty.Key);
-                if (controlProperty == null)
-                {
-                    Current.Logger.Warn<UserControlMacroEngine>("Control property '{UserControlProperty}' doesn't exist or isn't accessible, skip.", modelProperty.Key);
-                    continue;
-                }
-
-                var tryConvert = modelProperty.Value.TryConvertTo(controlProperty.PropertyType);
-                if (tryConvert.Success)
-                {
-                    try
-                    {
-                        controlProperty.SetValue(control, tryConvert.Result, null);
-                        Current.Logger.Debug<UserControlMacroEngine>("Set property '{UserControlProperty}' value '{UserControlPropertyValue}'", modelProperty.Key, modelProperty.Value);
-                    }
-                    catch (Exception e)
-                    {
-                        Current.Logger.Warn<UserControlMacroEngine>(e, "Failed to set property '{UserControlProperty}' value '{UserControlPropertyValue}'", modelProperty.Key, modelProperty.Value);
-                    }
-                }
-                else
-                {
-                    Current.Logger.Warn<UserControlMacroEngine>("Failed to set property '{UserControlProperty}' value '{UserControlPropertyValue}'", modelProperty.Key, modelProperty.Value);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 4cd7e3b0e0aa..215eb395736d 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -386,11 +386,8 @@ internal IHttpHandler GetHandlerForRoute(RequestContext requestContext, Publishe
 
                 var handler = GetHandlerOnMissingTemplate(request);
 
-                // if it's not null it can be either the PublishedContentNotFoundHandler (no document was
-                // found to handle 404, or document with no template was found) or the WebForms handler
-                // (a document was found and its template is WebForms)
-
-                // if it's null it means that a document was found and its template is Mvc
+                // if it's not null it's the PublishedContentNotFoundHandler (no document was found to handle 404, or document with no template was found)
+                // if it's null it means that a document was found
 
                 // if we have a handler, return now
                 if (handler != null)
diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
index d506090ecd51..75804b47bbf6 100644
--- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs
@@ -1,11 +1,9 @@
 using System;
 using System.IO;
-using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
-using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {
@@ -80,27 +78,6 @@ private static void ValidateRouteData(RouteData routeData)
             }
         }
 
-        /// <summary>
-        /// When POSTing to MVC but rendering in WebForms we need to do some trickery, we'll create a dummy viewcontext with all of the
-        /// current model state, tempdata, viewdata so that if we're rendering partial view macros within the webforms view, they will
-        /// get all of this merged into them.
-        /// </summary>
-        /// <param name="context"></param>
-        private static void EnsureViewContextForWebForms(ControllerContext context)
-        {
-            var tempDataDictionary = new TempDataDictionary();
-            tempDataDictionary.Save(context, new SessionStateTempDataProvider());
-            var viewCtx = new ViewContext(context, new DummyView(), new ViewDataDictionary(), tempDataDictionary, new StringWriter());
-
-            viewCtx.ViewData.ModelState.Merge(new ModelStateDictionary(context.Controller.ViewData.ModelState));
-
-            foreach (var d in context.Controller.ViewData)
-                viewCtx.ViewData[d.Key] = d.Value;
-
-            //now we need to add it to the special route tokens so it's picked up later
-            context.HttpContext.Request.RequestContext.RouteData.DataTokens[Constants.DataTokenCurrentViewContext] = viewCtx;
-        }
-
         /// <summary>
         /// Ensure ModelState, ViewData and TempData is copied across
         /// </summary>
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index 214612ef2d74..9279eea124fe 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Web.Compilation;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Umbraco.Core;
@@ -10,7 +9,6 @@
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Routing;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Services;
 using Umbraco.Web.Macros;
 using Current = Umbraco.Web.Composing.Current;
@@ -21,7 +19,7 @@ namespace Umbraco.Web.Templates
     /// This is used purely for the RenderTemplate functionality in Umbraco
     /// </summary>
     /// <remarks>
-    /// This allows you to render either an MVC or Webforms template based purely off of a node id and an optional alttemplate id as string output.
+    /// This allows you to render an MVC template based purely off of a node id and an optional alttemplate id as string output.
     /// </remarks>
     internal class TemplateRenderer
     {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 849d82940f9e..6b7f568566e9 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -341,7 +341,6 @@
     <Compile Include="HealthCheck\HealthCheckController.cs" />
     <Compile Include="Macros\MacroPropertyModel.cs" />
     <Compile Include="Macros\MacroRenderer.cs" />
-    <Compile Include="Macros\UserControlMacroEngine.cs" />
     <Compile Include="HealthCheck\HealthCheckGroup.cs" />
     <Compile Include="HealthCheck\HealthCheck.cs" />
     <Compile Include="HealthCheck\HealthCheckStatus.cs" />

From fe9700b3f79eeeee12cafd5e82aa91b9592a01ed Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 30 Jan 2019 21:52:12 +0000
Subject: [PATCH 202/421] A handful more providers moved across & removed any
 that no longer supported

---
 .../config/EmbeddedMedia.config               | 25 -----------------
 src/Umbraco.Web/Media/EmbedProviders/Hulu.cs  | 24 ++++++++++++++++
 src/Umbraco.Web/Media/EmbedProviders/Issuu.cs | 28 +++++++++++++++++++
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  9 +++++-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 ++
 5 files changed, 62 insertions(+), 26 deletions(-)
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Hulu.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Issuu.cs

diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
index 0e2c5aa9885c..a5edaf38349a 100644
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.config
+++ b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
@@ -11,15 +11,6 @@
             <param name="scheme">https</param>
         </requestParams>
     </provider>
-
-    <!-- Issuu Settings -->
-    <provider name="Issuu" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-        <urlShemeRegex><![CDATA[issuu.com/(?:.*)/docs]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[https://issuu.com/oembed]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-            <param name="format">json</param>
-        </requestParams>
-    </provider>
     
     <!-- Daily Motion -->
     <provider name="DailyMotion" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
@@ -29,21 +20,5 @@
             <param name="format">xml</param>
         </requestParams>
     </provider>
-
-    <!-- Hulu -->
-    <provider name="Hulu" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-        <urlShemeRegex><![CDATA[hulu\.com/]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[http://www.hulu.com/api/oembed.xml]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-            <param name="format">xml</param>
-        </requestParams>
-    </provider>
-
-    <!-- IFTTT Settings -->
-    <provider name="IFTTT" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-        <urlShemeRegex><![CDATA[ifttt\.com/]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[http://www.ifttt.com/oembed/]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-    </provider>
     
 </embed>
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Hulu.cs b/src/Umbraco.Web/Media/EmbedProviders/Hulu.cs
new file mode 100644
index 000000000000..150439832a61
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Hulu.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Hulu : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "http://www.hulu.com/api/oembed.json";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"hulu.com/watch/.*"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
+
+            return oembed.GetHtml();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Issuu.cs b/src/Umbraco.Web/Media/EmbedProviders/Issuu.cs
new file mode 100644
index 000000000000..2b3347345392
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Issuu.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class Issuu : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "https://issuu.com/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"issuu.com/.*/docs/.*"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>()
+        {
+            //ApiUrl/?format=xml
+            {"format", "xml"}
+        };
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var xmlDocument = base.GetXmlResponse(requestUrl);
+
+            return GetXmlProperty(xmlDocument, "/oembed/html");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 5696589647da..5974288daf84 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -225,7 +225,14 @@ public override void Compose(Composition composition)
                 .Append<Twitter>()
                 .Append<Vimeo>()
                 .Append<Ted>()
-                .Append<Soundcloud>();
+                .Append<Soundcloud>()
+                .Append<Issuu>()
+                .Append<Hulu>();
+
+
+                //Giphy
+                //Meetup
+                //Spotify
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3e767f97a89f..e418cf887207 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -149,7 +149,9 @@
     <Compile Include="Media\EmbedProviders\Flickr.cs" />
     <Compile Include="Media\EmbedProviders\GettyImages.cs" />
     <Compile Include="Media\EmbedProviders\SoundCloud.cs" />
+    <Compile Include="Media\EmbedProviders\Hulu.cs" />
     <Compile Include="Media\EmbedProviders\Ted.cs" />
+    <Compile Include="Media\EmbedProviders\Issuu.cs" />
     <Compile Include="Media\EmbedProviders\Vimeo.cs" />
     <Compile Include="Media\EmbedProviders\Twitter.cs" />
     <Compile Include="Media\EmbedProviders\Kickstarter.cs" />

From dcacff0124e29f0089a9a1fc20ca232e5afca290 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 11:03:25 +1100
Subject: [PATCH 203/421] Updates user section routing so that it has nice urls

---
 src/Umbraco.Web.UI.Client/src/routes.js       |  7 ++++++
 .../src/views/users/group.controller.js       |  5 ++--
 .../src/views/users/overview.controller.js    | 24 +++++++------------
 .../src/views/users/user.controller.js        |  5 ++--
 .../users/views/users/users.controller.js     |  2 +-
 src/Umbraco.Web/Trees/UserTreeController.cs   |  2 +-
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js
index c2d3ea2df86d..ecb011e3f093 100644
--- a/src/Umbraco.Web.UI.Client/src/routes.js
+++ b/src/Umbraco.Web.UI.Client/src/routes.js
@@ -164,6 +164,13 @@ app.config(function ($routeProvider) {
                     return;
                 }
 
+                //special case for the users section
+                var usersPages = ["user", "group"];
+                if ($routeParams.section.toLowerCase() === "users" && $routeParams.tree.toLowerCase() === "users" && usersPages.indexOf($routeParams.method.toLowerCase()) === -1) {
+                    $scope.templateUrl = "views/users/overview.html";
+                    return;
+                }
+
                 // Here we need to figure out if this route is for a user's package tree and if so then we need
                 // to change it's convention view path to:
                 // /App_Plugins/{mypackage}/backoffice/{treetype}/{method}.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
index 54096d413b6e..a9d9f5d4e43f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
@@ -100,7 +100,7 @@
         }
 
         function goToPage(ancestor) {
-            $location.path(ancestor.path).search("subview", ancestor.subView);
+            $location.path(ancestor.path);
         }
 
         function openSectionPicker() {
@@ -292,8 +292,7 @@
             vm.breadcrumbs = [
                 {
                     "name": vm.labels.groups,
-                    "path": "/users/users/overview",
-                    "subView": "groups"
+                    "path": "/users/users/groups"
                 },
                 {
                     "name": vm.userGroup.name
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
index 80e2322f6bd6..2268bb93b822 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
@@ -1,17 +1,11 @@
 (function () {
     "use strict";
 
-    function UsersOverviewController($scope, $location, localizationService) {
+    function UsersOverviewController($scope, $location, $routeParams, localizationService) {
 
         var vm = this;
-        var usersUri = $location.search().subview;
-        if (!usersUri) {
-            $location.search("subview", "users");
-            //exit after this, we don't want to initialize anything further since this
-            //is going to change the route
-            return;
-        }
-
+        let usersUri = $routeParams.method;
+        
         //note on the below, we dont assign a view unless it's the right route since if we did that it will load in that controller
         //for the view which is unecessary and will cause extra overhead/requests to occur
         vm.page = {};
@@ -30,7 +24,7 @@
 
             var labels = ["sections_users", "general_groups"];
 
-            localizationService.localizeMany(labels).then(function(data){
+            localizationService.localizeMany(labels).then(function (data) {
                 vm.page.labels.users = data[0];
                 vm.page.labels.groups = data[1];
 
@@ -38,8 +32,8 @@
                     {
                         "name": vm.page.labels.users,
                         "icon": "icon-user",
-                        "action": function() {
-                          $location.search("subview", "users")
+                        "action": function () {
+                            $location.path("/users/users/users").search("create", null);
                         },
                         "view": !usersUri || usersUri === "users" ? "views/users/views/users/users.html" : null,
                         "active": !usersUri || usersUri === "users",
@@ -49,7 +43,7 @@
                         "name": vm.page.labels.groups,
                         "icon": "icon-users",
                         "action": function () {
-                          $location.search("subview", "groups")
+                            $location.path("/users/users/groups").search("create", null);
                         },
                         "view": usersUri === "groups" ? "views/users/views/groups/groups.html" : null,
                         "active": usersUri === "groups",
@@ -60,11 +54,11 @@
         }
 
         function setPageName() {
-            localizationService.localize("user_userManagement").then(function(data){
+            localizationService.localize("user_userManagement").then(function (data) {
                 vm.page.name = data;
             })
         }
- 
+
         onInit();
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index dc4512a549bd..d5636c5b3fb5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -205,7 +205,7 @@
         }
 
         function goToPage(ancestor) {
-            $location.path(ancestor.path).search("subview", ancestor.subView);
+            $location.path(ancestor.path);
         }
 
         function openUserGroupPicker() {
@@ -458,8 +458,7 @@
             vm.breadcrumbs = [
                 {
                     "name": vm.labels.users,
-                    "path": "/users/users/overview",
-                    "subView": "users"
+                    "path": "/users/users/users"
                 },
                 {
                     "name": vm.user.name
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 2b531b7ef2ba..92ed10267d12 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -558,7 +558,7 @@
         }
 
         function goToUser(userId) {
-            $location.path('users/users/user/' + userId);
+            $location.path('users/users/user/' + userId).search("create", null).search("invite", null);
         }
 
         // helpers
diff --git a/src/Umbraco.Web/Trees/UserTreeController.cs b/src/Umbraco.Web/Trees/UserTreeController.cs
index 91078b2be85c..7da0b689afa4 100644
--- a/src/Umbraco.Web/Trees/UserTreeController.cs
+++ b/src/Umbraco.Web/Trees/UserTreeController.cs
@@ -21,7 +21,7 @@ protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
             var root = base.CreateRootNode(queryStrings);
 
             //this will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = string.Format("{0}/{1}/{2}", Constants.Applications.Users, Constants.Trees.Users, "overview");
+            root.RoutePath = $"{Constants.Applications.Users}/{Constants.Trees.Users}/users";
             root.Icon = "icon-users";
 
             root.HasChildren = false;

From 0e9eae6f73ab617eecea914619311d74c455e0e2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 11:05:41 +1100
Subject: [PATCH 204/421] removes a bunch of console.log that was recently
 added

---
 .../components/content/umbcontentnodeinfo.directive.js        | 2 --
 .../directives/components/editor/umbeditors.directive.js      | 4 ----
 .../directives/components/tags/umbtagseditor.directive.js     | 2 +-
 .../src/controllers/navigation.controller.js                  | 1 -
 .../propertyeditors/nestedcontent/nestedcontent.controller.js | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index 0a25471c4fe6..06a147969a6d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -246,8 +246,6 @@
             function setAuditTrailLogTypeColor(auditTrail) {
                 angular.forEach(auditTrail, function (item) {
                     
-                    console.log(item.logType);
-                    
                     switch (item.logType) {
                         case "Save":
                             item.logTypeColor = "primary";
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index ed8618d644e9..0db239c56a2a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -13,8 +13,6 @@
 
             function addEditor(editor) {
                 
-                console.log("add:", editor)
-                
                 editor.animating = true;
 
                 showOverlayOnPrevEditor();
@@ -91,8 +89,6 @@
 
             function removeEditor(editor) {
                 
-                console.log("remove: ", editor)
-                
                 editor.animating = true;
 
                 $timeout(function(){
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index 3d784c999f90..1850445bd46d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -116,7 +116,7 @@
                             });
 
                         }).bind("typeahead:opened", function (obj) {
-                            console.log("opened ");
+
                         });
                 });
 
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
index 96f31151859d..27c6208e1bf0 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
@@ -216,7 +216,6 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
 
     //Emitted when a language is created or an existing one saved/edited
     evts.push(eventsService.on("editors.languages.languageSaved", function (e, args) {
-        console.log('lang event listen args', args);
         if(args.isNew){
             //A new language has been created - reload languages for tree
             loadLanguages().then(function (languages) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 884b661beb95..0d24f9d1cc80 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -71,7 +71,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         //$scope.model.config.contentTypes;
         //$scope.model.config.minItems;
         //$scope.model.config.maxItems;
-        //console.log($scope);
 
         var inited = false;
 

From d9cb605f226fe6a0e9767a78dc828c61b51ab295 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 14:48:43 +1100
Subject: [PATCH 205/421] Fixing getting the macro to render in the rte,
 incorrect params being set

---
 .../src/common/services/macro.service.js                      | 4 ++++
 .../src/common/services/tinymce.service.js                    | 2 +-
 .../views/common/infiniteeditors/macropicker/macropicker.html | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
index 6c8c0a6ff2f7..a91f9d51e459 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
@@ -130,6 +130,10 @@ function macroService() {
 
             var paramDictionary = {};
             var macroAlias = macro.alias;
+            if (!macroAlias) {
+                throw "The macro object does not contain an alias";
+            }
+
             var syntax;
 
             _.each(macroParams, function (item) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 896a36081470..0ba795626a0f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1346,7 +1346,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     dialogData: dialogData,
                     submit: function (model) {
                         var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
-                        self.insertMacroInEditor(args.editor, macroObject, $scope);
+                        self.insertMacroInEditor(args.editor, macroObject);
                         editorService.close();
                     },
                     close: function () {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
index 7e54e2ef8e47..d6a5fbe23093 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
@@ -88,7 +88,7 @@ <h5>{{model.selectedMacro.name}}</h5>
                     type="button"
                     button-style="success"
                     label-key="general_submit"
-                    action="selectMacro(model)">
+                    action="selectMacro(model.selectedMacro)">
                 </umb-button>
             </umb-editor-footer-content-right>
         </umb-editor-footer>

From 7b55d2f1b2fce1a3bb8eadbd32028598785658e3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 15:09:31 +1100
Subject: [PATCH 206/421] New IMacroRenderer and ITemplateRenderer and hides
 underlying logic for these in internal classes. Massively cleans up the macro
 rendering logic (almost makes sense now), removes unused macro code, injects
 UmbracoHelper wherever it's needed (not creating manually), fixes
 UmbracoHelper to have it's services injected, no more empty services, allows
 setting the AssignedContentItem on the UmbracoHelper and ensures it's
 lifespan is Transient, updates all corresponding ctors. Fixes macro
 rendering, ensures the correct culture variation is assigned, and that we can
 render macros for any given IPublishedContent, not just the one assigned in
 the request.

---
 .../Routing/RenderRouteHandlerTests.cs        |   3 +-
 .../TestControllerActivatorBase.cs            |   9 +-
 .../Testing/TestingTests/MockTests.cs         |   7 +-
 .../Controllers/PluginControllerAreaTests.cs  |   8 +-
 .../Web/Mvc/SurfaceControllerTests.cs         |  13 +-
 src/Umbraco.Web/Composing/Current.cs          |   3 +
 src/Umbraco.Web/Controllers/TagsController.cs |  15 +-
 .../Controllers/UmbLoginController.cs         |   9 +-
 .../Controllers/UmbLoginStatusController.cs   |   9 +-
 .../Controllers/UmbProfileController.cs       |   4 +-
 .../Controllers/UmbRegisterController.cs      |   9 +-
 .../Editors/AuthenticationController.cs       |  15 +-
 .../Editors/BackOfficeController.cs           |   4 +-
 .../Editors/ContentTypeController.cs          |   4 +-
 .../Editors/ContentTypeControllerBase.cs      |   4 +-
 .../Editors/DashboardController.cs            |  12 +-
 src/Umbraco.Web/Editors/EntityController.cs   |   4 +-
 .../Editors/MacroRenderingController.cs       |  19 +-
 .../Editors/MediaTypeController.cs            |   3 +-
 .../Editors/MemberTypeController.cs           |   3 +-
 .../Editors/PackageInstallController.cs       |   4 +-
 src/Umbraco.Web/Editors/SectionController.cs  |   6 +-
 .../UmbracoAuthorizedJsonController.cs        |  15 +-
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |   4 +-
 src/Umbraco.Web/IUmbracoComponentRenderer.cs  |  13 +-
 src/Umbraco.Web/Macros/IMacroRenderer.cs      |  13 +
 src/Umbraco.Web/Macros/MacroModel.cs          |  15 +-
 src/Umbraco.Web/Macros/MacroRenderer.cs       | 355 ++++--------------
 .../PublishedContentHashtableConverter.cs     |  10 +-
 .../Mapping/RedirectUrlMapperProfile.cs       |   6 +-
 .../EnsurePublishedContentRequestAttribute.cs |   3 +-
 src/Umbraco.Web/Mvc/PluginController.cs       |  21 +-
 src/Umbraco.Web/Mvc/RenderMvcController.cs    |   6 +-
 src/Umbraco.Web/Mvc/SurfaceController.cs      |   4 +-
 .../Mvc/UmbracoAuthorizedController.cs        |   9 +-
 src/Umbraco.Web/Mvc/UmbracoController.cs      |  13 +-
 .../Mvc/UmbracoViewPageOfTModel.cs            |  12 +-
 .../MacroContainerValueConverter.cs           |  10 +-
 .../RteMacroRenderingValueConverter.cs        |  10 +-
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  17 +-
 .../Templates/ITemplateRenderer.cs            |  12 +
 src/Umbraco.Web/Templates/TemplateRenderer.cs |  93 +++--
 .../Trees/ApplicationTreeController.cs        |   4 +-
 src/Umbraco.Web/Trees/TreeController.cs       |   4 +-
 src/Umbraco.Web/Trees/TreeControllerBase.cs   |   9 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 +
 .../UmbracoAuthorizedHttpHandler.cs           |   7 +-
 src/Umbraco.Web/UmbracoComponentRenderer.cs   | 163 ++++----
 src/Umbraco.Web/UmbracoContext.cs             |  26 +-
 src/Umbraco.Web/UmbracoHelper.cs              | 136 +++----
 src/Umbraco.Web/UmbracoHttpHandler.cs         |  15 +-
 src/Umbraco.Web/UmbracoWebService.cs          |  18 +-
 .../WebApi/UmbracoApiController.cs            |  16 +-
 .../WebApi/UmbracoApiControllerBase.cs        |  13 +-
 .../WebApi/UmbracoAuthorizedApiController.cs  |  16 +-
 55 files changed, 458 insertions(+), 779 deletions(-)
 create mode 100644 src/Umbraco.Web/Macros/IMacroRenderer.cs
 create mode 100644 src/Umbraco.Web/Templates/ITemplateRenderer.cs

diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 71e3836b3d81..3f44c6764eeb 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -172,8 +172,7 @@ public void Umbraco_Route_User_Defined_Controller_Action(string templateName)
         /// </summary>
         public class CustomDocumentController : RenderMvcController
         {
-            public CustomDocumentController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
-                : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger)
+            public CustomDocumentController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger, umbracoHelper)
             {
             }
 
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
index 602b5907d844..4363996a46f1 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
@@ -152,13 +152,12 @@ IHttpController IHttpControllerActivator.Create(HttpRequestMessage request, Http
 
             var membershipHelper = new MembershipHelper(new TestUmbracoContextAccessor(umbCtx), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), null, Mock.Of<AppCaches>(), Mock.Of<ILogger>());
 
-            var umbHelper = new UmbracoHelper(umbCtx,
-                Mock.Of<IPublishedContent>(),
+            var umbHelper = new UmbracoHelper(umbCtx,                
                 Mock.Of<ITagQuery>(),
-                Mock.Of<ICultureDictionary>(),
+                Mock.Of<ICultureDictionaryFactory>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                membershipHelper,
-                serviceContext);
+                Mock.Of<IPublishedContentQuery>(),
+                membershipHelper);
 
             return CreateController(controllerType, request, umbHelper);
         }
diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
index 575f14e81883..b65e503f34b7 100644
--- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
+++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
@@ -61,12 +61,11 @@ public void Can_Mock_Umbraco_Helper()
 
             // ReSharper disable once UnusedVariable
             var helper = new UmbracoHelper(umbracoContext,
-                Mock.Of<IPublishedContent>(),
                 Mock.Of<ITagQuery>(),
-                Mock.Of<ICultureDictionary>(),
+                Mock.Of<ICultureDictionaryFactory>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), null, Mock.Of<AppCaches>(), Mock.Of<ILogger>()),
-                ServiceContext.CreatePartial());
+                Mock.Of<IPublishedContentQuery>(),
+                new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), null, Mock.Of<AppCaches>(), Mock.Of<ILogger>()));
             Assert.Pass();
         }
 
diff --git a/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs b/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
index 01525f12da65..4c738df003a8 100644
--- a/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
@@ -54,7 +54,7 @@ public void Ensure_Same_Area2()
         public class Plugin1Controller : PluginController
         {
             public Plugin1Controller(UmbracoContext umbracoContext)
-                : base(umbracoContext, null, null, null, null, null)
+                : base(umbracoContext, null, null, null, null, null, null)
             {
             }
         }
@@ -63,7 +63,7 @@ public Plugin1Controller(UmbracoContext umbracoContext)
         public class Plugin2Controller : PluginController
         {
             public Plugin2Controller(UmbracoContext umbracoContext)
-                : base(umbracoContext, null, null, null, null, null)
+                : base(umbracoContext, null, null, null, null, null, null)
             {
             }
         }
@@ -72,7 +72,7 @@ public Plugin2Controller(UmbracoContext umbracoContext)
         public class Plugin3Controller : PluginController
         {
             public Plugin3Controller(UmbracoContext umbracoContext)
-                : base(umbracoContext, null, null, null, null, null)
+                : base(umbracoContext, null, null, null, null, null, null)
             {
             }
         }
@@ -80,7 +80,7 @@ public Plugin3Controller(UmbracoContext umbracoContext)
         public class Plugin4Controller : PluginController
         {
             public Plugin4Controller(UmbracoContext umbracoContext)
-                : base(umbracoContext, null, null, null, null, null)
+                : base(umbracoContext, null, null, null, null, null, null)
             {
             }
         }
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 69f6c5d13ea7..e80385b533cf 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -128,12 +128,11 @@ public void Can_Lookup_Content()
 
             var helper = new UmbracoHelper(
                 umbracoContext,
-                Mock.Of<IPublishedContent>(),
                 Mock.Of<ITagQuery>(),
-                Mock.Of<ICultureDictionary>(),
+                Mock.Of<ICultureDictionaryFactory>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), null, Mock.Of<AppCaches>(), Mock.Of<ILogger>()),
-                ServiceContext.CreatePartial());
+                Mock.Of<IPublishedContentQuery>(),
+                new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), null, Mock.Of<AppCaches>(), Mock.Of<ILogger>()));
 
             var ctrl = new TestSurfaceController(umbracoContext, helper);
             var result = ctrl.GetContent(2) as PublishedContentResult;
@@ -185,12 +184,8 @@ public void Mock_Current_Page()
         public class TestSurfaceController : SurfaceController
         {
             public TestSurfaceController(UmbracoContext ctx, UmbracoHelper helper = null)
-                : base(ctx, null, ServiceContext.CreatePartial(), Mock.Of<AppCaches>(), null, null)
+                : base(ctx, null, ServiceContext.CreatePartial(), Mock.Of<AppCaches>(), null, null, helper)
             {
-                if (helper != null)
-                {
-                   Umbraco = helper;
-                }
             }
 
             public ActionResult Index()
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index b394684f56fd..d4fe51b3f1b1 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -94,6 +94,9 @@ public static void ClearUmbracoContext()
         public static UmbracoContext UmbracoContext
             => UmbracoContextAccessor.UmbracoContext;
 
+        public static UmbracoHelper UmbracoHelper
+            => Factory.GetInstance<UmbracoHelper>();
+
         public static DistributedCache DistributedCache
             => Factory.GetInstance<DistributedCache>();
 
diff --git a/src/Umbraco.Web/Controllers/TagsController.cs b/src/Umbraco.Web/Controllers/TagsController.cs
index 29518a594d0f..5dca84eee1ff 100644
--- a/src/Umbraco.Web/Controllers/TagsController.cs
+++ b/src/Umbraco.Web/Controllers/TagsController.cs
@@ -20,18 +20,13 @@ namespace Umbraco.Web.Controllers
     // TODO: This controller should be moved to a more suitable place.
     public class TagsController : UmbracoApiController
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TagsController"/> with auto dependencies.
-        /// </summary>
         public TagsController()
-        { }
+        {
+        }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TagsController"/> with all its dependencies.
-        /// </summary>
-        public TagsController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
-        { }
+        public TagsController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
 
         /// <summary>
         /// Get every tag stored in the database (with optional group)
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index 97444dbc6a4f..ea526f47a96c 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -12,11 +12,12 @@ namespace Umbraco.Web.Controllers
     public class UmbLoginController : SurfaceController
     {
         public UmbLoginController()
-        { }
+        {
+        }
 
-        public UmbLoginController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
-            : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger)
-        { }
+        public UmbLoginController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper) : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+        {
+        }
 
         [HttpPost]
         [ValidateAntiForgeryToken]
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index fddefbe4a996..e63f15b9c99a 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -14,11 +14,12 @@ namespace Umbraco.Web.Controllers
     public class UmbLoginStatusController : SurfaceController
     {
         public UmbLoginStatusController()
-        { }
+        {
+        }
 
-        public UmbLoginStatusController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
-            : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger)
-        { }
+        public UmbLoginStatusController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper) : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+        {
+        }
 
         [HttpPost]
         [ValidateAntiForgeryToken]
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index f22192a1ccb2..d30f08040ebc 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -17,8 +17,8 @@ public class UmbProfileController : SurfaceController
         public UmbProfileController()
         { }
 
-        public UmbProfileController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
-            : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger)
+        public UmbProfileController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+            : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
         { }
 
         [HttpPost]
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index 726797c26a1c..a60b5cffdb2c 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -14,11 +14,12 @@ namespace Umbraco.Web.Controllers
     public class UmbRegisterController : SurfaceController
     {
         public UmbRegisterController()
-        { }
+        {
+        }
 
-        public UmbRegisterController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
-            : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger)
-        { }
+        public UmbRegisterController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper) : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+        {
+        }
 
         [HttpPost]
         [ValidateAntiForgeryToken]
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index 5804a00a792d..f5652cc5fbad 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -43,18 +43,9 @@ public class AuthenticationController : UmbracoApiController
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
         private BackOfficeSignInManager _signInManager;
 
-        /// <summary>
-        /// Initializes a new instance of the new <see cref="AuthenticationController"/> class with auto dependencies.
-        /// </summary>
-        public AuthenticationController()
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthenticationController"/> class with all its dependencies.
-        /// </summary>
-        public AuthenticationController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
-        { }
+        public AuthenticationController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
 
         protected BackOfficeUserManager<BackOfficeIdentityUser> UserManager => _userManager
             ?? (_userManager = TryGetOwinContext().Result.GetBackOfficeUserManager());
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 462b5bbc9c90..abe793069314 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -49,8 +49,8 @@ public class BackOfficeController : UmbracoController
         private const string TokenPasswordResetCode = "PasswordResetCode";
         private static readonly string[] TempDataTokenNames = { TokenExternalSignInError, TokenPasswordResetCode };
 
-        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger)
+        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger, umbracoHelper)
         {
             _manifestParser = manifestParser;
             _features = features;
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index e2d268450ce2..faaf14319f14 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -54,8 +54,8 @@ public ContentTypeController(IEntityXmlSerializer serializer,
             UmbracoContext umbracoContext,
             ISqlContext sqlContext, PropertyEditorCollection propertyEditors,
             ServiceContext services, AppCaches appCaches,
-            IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(cultureDictionaryFactory, globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+            IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+            : base(cultureDictionaryFactory, globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _serializer = serializer;
             _propertyEditors = propertyEditors;
diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
index fe91f9fff6f0..b3baaf3e0339 100644
--- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
@@ -33,8 +33,8 @@ public abstract class ContentTypeControllerBase<TContentType> : UmbracoAuthorize
         private readonly ICultureDictionaryFactory _cultureDictionaryFactory;
         private ICultureDictionary _cultureDictionary;
 
-        protected ContentTypeControllerBase(ICultureDictionaryFactory cultureDictionaryFactory, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        protected ContentTypeControllerBase(ICultureDictionaryFactory cultureDictionaryFactory, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _cultureDictionaryFactory = cultureDictionaryFactory;
         }
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index 8ae59b974c6f..9a9ab72845b4 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -31,18 +31,12 @@ namespace Umbraco.Web.Editors
     public class DashboardController : UmbracoApiController
     {
         private readonly IDashboardService _dashboardService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DashboardController"/> with auto dependencies.
-        /// </summary>
-        public DashboardController()
-        { }
-
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardController"/> with all its dependencies.
         /// </summary>
-        public DashboardController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, IDashboardService dashboardService)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        public DashboardController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, IDashboardService dashboardService, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _dashboardService = dashboardService;
         }
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index ca747e83f55a..97d800a8451d 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -45,8 +45,8 @@ public class EntityController : UmbracoAuthorizedJsonController
         private readonly ITreeService _treeService;
 
         public EntityController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState,
-            ITreeService treeService)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+            ITreeService treeService, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _treeService = treeService;
         }
diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index 65abde759a13..f88a84dd7203 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -32,9 +32,12 @@ public class MacroRenderingController : UmbracoAuthorizedJsonController, IRequir
     {
         private readonly IMacroService _macroService;
         private readonly IContentService _contentService;
+        private readonly IUmbracoComponentRenderer _componentRenderer;
         private readonly IVariationContextAccessor _variationContextAccessor;
-        public MacroRenderingController(IVariationContextAccessor variationContextAccessor, IMacroService macroService, IContentService contentService)
+
+        public MacroRenderingController(IUmbracoComponentRenderer componentRenderer, IVariationContextAccessor variationContextAccessor, IMacroService macroService, IContentService contentService)
         {
+            _componentRenderer = componentRenderer;
             _variationContextAccessor = variationContextAccessor;
             _macroService = macroService;
             _contentService = contentService;
@@ -103,17 +106,14 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
 
             var doc = _contentService.GetById(pageId);
             if (doc == null)
-            {
                 throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
 
             var m = _macroService.GetByAlias(macroAlias);
             if (m == null)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
-            var macro = new MacroModel(m);
 
             //if it isn't supposed to be rendered in the editor then return an empty string
-            if (macro.RenderInEditor == false)
+            if (!m.UseInEditor)
             {
                 var response = Request.CreateResponse();
                 //need to create a specific content result formatted as HTML since this controller has been configured
@@ -132,23 +132,24 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
             // to set the current culture to the culture related to the content item. This is hacky but it works.
             var publishedContent = UmbracoContext.ContentCache.GetById(doc.Id);
             var culture = publishedContent?.GetCulture();
+            _variationContextAccessor.VariationContext = new VariationContext(); //must have an active variation context!
             if (culture != null)
             {
                 Thread.CurrentThread.CurrentCulture = Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(culture.Culture);
+                _variationContextAccessor.VariationContext = new VariationContext(Thread.CurrentThread.CurrentCulture.Name);
             }
 
-            var legacyPage = new global::Umbraco.Web.Macros.PublishedContentHashtableConverter(doc, _variationContextAccessor);
 
+            //fixme: don't think we need this anymore
+            var legacyPage = new PublishedContentHashtableConverter(doc, _variationContextAccessor);
             UmbracoContext.HttpContext.Items["pageElements"] = legacyPage.Elements;
             UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = null;
 
-            var renderer = new UmbracoComponentRenderer(UmbracoContext);
-
             var result = Request.CreateResponse();
             //need to create a specific content result formatted as HTML since this controller has been configured
             //with only json formatters.
             result.Content = new StringContent(
-                renderer.RenderMacro(macro, macroParams, legacyPage).ToString(),
+                _componentRenderer.RenderMacro(doc.Id, m.Alias, macroParams).ToString(),
                 Encoding.UTF8,
                 "text/html");
             return result;
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index bb126ed1ddc4..d041db1862dc 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -37,8 +37,7 @@ namespace Umbraco.Web.Editors
     [MediaTypeControllerControllerConfiguration]
     public class MediaTypeController : ContentTypeControllerBase<IMediaType>
     {
-        public MediaTypeController(ICultureDictionaryFactory cultureDictionaryFactory, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(cultureDictionaryFactory, globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        public MediaTypeController(ICultureDictionaryFactory cultureDictionaryFactory, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(cultureDictionaryFactory, globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
         }
 
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index b200f17372d6..a1a9a975726b 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -30,8 +30,7 @@ namespace Umbraco.Web.Editors
     [UmbracoTreeAuthorize(new string[] { Constants.Trees.MemberTypes, Constants.Trees.Members})]    
     public class MemberTypeController : ContentTypeControllerBase<IMemberType>
     {
-        public MemberTypeController(ICultureDictionaryFactory cultureDictionaryFactory, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(cultureDictionaryFactory, globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        public MemberTypeController(ICultureDictionaryFactory cultureDictionaryFactory, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(cultureDictionaryFactory, globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
         }
 
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index e96665ebb524..63be647a1268 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -36,8 +36,8 @@ public class PackageInstallController : UmbracoAuthorizedJsonController
     {
         public PackageInstallController(IGlobalSettings globalSettings, UmbracoContext umbracoContext,
             ISqlContext sqlContext, ServiceContext services, AppCaches appCaches,
-            IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+            IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
         }
 
diff --git a/src/Umbraco.Web/Editors/SectionController.cs b/src/Umbraco.Web/Editors/SectionController.cs
index f6973fcbb94c..0a2f17cd15fa 100644
--- a/src/Umbraco.Web/Editors/SectionController.cs
+++ b/src/Umbraco.Web/Editors/SectionController.cs
@@ -27,8 +27,8 @@ public class SectionController : UmbracoAuthorizedJsonController
         private readonly ITreeService _treeService;
 
         public SectionController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState,
-            IDashboardService dashboardService, ISectionService sectionService, ITreeService treeService)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+            IDashboardService dashboardService, ISectionService sectionService, ITreeService treeService, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _dashboardService = dashboardService;
             _sectionService = sectionService;
@@ -43,7 +43,7 @@ public IEnumerable<Section> GetSections()
             
             // this is a bit nasty since we'll be proxying via the app tree controller but we sort of have to do that
             // since tree's by nature are controllers and require request contextual data
-            var appTreeController = new ApplicationTreeController(GlobalSettings, UmbracoContext, SqlContext, Services, AppCaches, Logger, RuntimeState, _treeService)
+            var appTreeController = new ApplicationTreeController(GlobalSettings, UmbracoContext, SqlContext, Services, AppCaches, Logger, RuntimeState, _treeService, Umbraco)
             {
                 ControllerContext = ControllerContext
             };
diff --git a/src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs b/src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs
index f76f62a99b96..32e56965b37d 100644
--- a/src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs
+++ b/src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs
@@ -20,24 +20,11 @@ namespace Umbraco.Web.Editors
     [AngularJsonOnlyConfiguration]
     public abstract class UmbracoAuthorizedJsonController : UmbracoAuthorizedApiController
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoAuthorizedJsonController"/> with auto dependencies.
-        /// </summary>
         protected UmbracoAuthorizedJsonController()
         {
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoAuthorizedJsonController"/> class with all its dependencies.
-        /// </summary>
-        /// <param name="globalSettings"></param>
-        /// <param name="umbracoContext"></param>
-        /// <param name="sqlContext"></param>
-        /// <param name="services"></param>
-        /// <param name="appCaches"></param>
-        /// <param name="logger"></param>
-        /// <param name="runtimeState"></param>
-        protected UmbracoAuthorizedJsonController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        protected UmbracoAuthorizedJsonController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
         }
     }
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index c5d2a65cb976..44d0cc27ca90 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -92,13 +92,13 @@ public static IHtmlString CachedPartial(
                 {
                     throw new InvalidOperationException("Cannot cache by page if the UmbracoContext has not been initialized, this parameter can only be used in the context of an Umbraco request");
                 }
-                cacheKey.AppendFormat("{0}-", UmbracoContext.Current.PageId);
+                cacheKey.AppendFormat("{0}-", UmbracoContext.Current.PublishedRequest?.PublishedContent?.Id ?? 0);
             }
             if (cacheByMember)
             {
                 var helper = Current.Factory.GetInstance<MembershipHelper>();
                 var currentMember = helper.GetCurrentMember();
-                cacheKey.AppendFormat("m{0}-", currentMember == null ? 0 : currentMember.Id);
+                cacheKey.AppendFormat("m{0}-", currentMember?.Id ?? 0);
             }
             if (contextualKeyBuilder != null)
             {
diff --git a/src/Umbraco.Web/IUmbracoComponentRenderer.cs b/src/Umbraco.Web/IUmbracoComponentRenderer.cs
index dc91cacdc016..4dc9036e6be2 100644
--- a/src/Umbraco.Web/IUmbracoComponentRenderer.cs
+++ b/src/Umbraco.Web/IUmbracoComponentRenderer.cs
@@ -12,32 +12,35 @@ public interface IUmbracoComponentRenderer
         /// <summary>
         /// Renders the template for the specified pageId and an optional altTemplateId
         /// </summary>
-        /// <param name="pageId"></param>
+        /// <param name="contentId"></param>
         /// <param name="altTemplateId">If not specified, will use the template assigned to the node</param>
         /// <returns></returns>
-        IHtmlString RenderTemplate(int pageId, int? altTemplateId = null);
+        IHtmlString RenderTemplate(int contentId, int? altTemplateId = null);
 
         /// <summary>
         /// Renders the macro with the specified alias.
         /// </summary>
+        /// <param name="contentId"></param>
         /// <param name="alias">The alias.</param>
         /// <returns></returns>
-        IHtmlString RenderMacro(string alias);
+        IHtmlString RenderMacro(int contentId, string alias);
 
         /// <summary>
         /// Renders the macro with the specified alias, passing in the specified parameters.
         /// </summary>
+        /// <param name="contentId"></param>
         /// <param name="alias">The alias.</param>
         /// <param name="parameters">The parameters.</param>
         /// <returns></returns>
-        IHtmlString RenderMacro(string alias, object parameters);
+        IHtmlString RenderMacro(int contentId, string alias, object parameters);
 
         /// <summary>
         /// Renders the macro with the specified alias, passing in the specified parameters.
         /// </summary>
+        /// <param name="contentId"></param>
         /// <param name="alias">The alias.</param>
         /// <param name="parameters">The parameters.</param>
         /// <returns></returns>
-        IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters);
+        IHtmlString RenderMacro(int contentId, string alias, IDictionary<string, object> parameters);
     }
 }
diff --git a/src/Umbraco.Web/Macros/IMacroRenderer.cs b/src/Umbraco.Web/Macros/IMacroRenderer.cs
new file mode 100644
index 000000000000..d85831540373
--- /dev/null
+++ b/src/Umbraco.Web/Macros/IMacroRenderer.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Web.Macros
+{
+    /// <summary>
+    /// Renders a macro
+    /// </summary>
+    public interface IMacroRenderer
+    {
+        MacroContent Render(string macroAlias, IPublishedContent content, IDictionary<string, object> macroParams);
+    }
+}
diff --git a/src/Umbraco.Web/Macros/MacroModel.cs b/src/Umbraco.Web/Macros/MacroModel.cs
index bea07cebc55e..dd9a73b1473d 100644
--- a/src/Umbraco.Web/Macros/MacroModel.cs
+++ b/src/Umbraco.Web/Macros/MacroModel.cs
@@ -1,22 +1,25 @@
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using Umbraco.Core;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models;
-using Umbraco.Core.Services.Implement;
 
 namespace Umbraco.Web.Macros
 {
     public class MacroModel
     {
+        /// <summary>
+        /// The Macro Id
+        /// </summary>
         public int Id { get; set; }
 
+        /// <summary>
+        /// The Macro Name
+        /// </summary>
         public string Name { get; set; }
 
+        /// <summary>
+        /// The Macro Alias
+        /// </summary>
         public string Alias { get; set; }
 
-        public string MacroControlIdentifier { get; set; }
-
         public MacroTypes MacroType { get; set; }
 
         public string MacroSource { get; set; }
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index c975c4a60b4a..b0ea90f9c14c 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -3,45 +3,44 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
-using System.Net.Security;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using System.Text.RegularExpressions;
-using System.Web;
 using System.Web.Caching;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Macros;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Macros
 {
-    public class MacroRenderer
+    internal class MacroRenderer : IMacroRenderer
     {
         private readonly IProfilingLogger _plogger;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly IContentSection _contentSection;
+        private readonly ILocalizedTextService _textService;
+        private readonly AppCaches _appCaches;
+        private readonly IMacroService _macroService;
 
-        // TODO: there are many more things that would need to be injected in here
-
-        public MacroRenderer(IProfilingLogger plogger)
+        public MacroRenderer(IProfilingLogger plogger, IUmbracoContextAccessor umbracoContextAccessor, IContentSection contentSection, ILocalizedTextService textService, AppCaches appCaches, IMacroService macroService)
         {
-            _plogger = plogger;
+            _plogger = plogger ?? throw new ArgumentNullException(nameof(plogger));
+            _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
+            _contentSection = contentSection ?? throw new ArgumentNullException(nameof(contentSection));
+            _textService = textService;
+            _appCaches = appCaches ?? throw new ArgumentNullException(nameof(appCaches));
+            _macroService = macroService ?? throw new ArgumentNullException(nameof(macroService));
         }
 
-        // probably can do better - just porting from v7
-        public IList<Exception> Exceptions { get; } = new List<Exception>();
-
         #region MacroContent cache
 
         // gets this macro content cache identifier
-        private static string GetContentCacheIdentifier(MacroModel model, int pageId)
+        private string GetContentCacheIdentifier(MacroModel model, int pageId)
         {
             var id = new StringBuilder();
 
@@ -55,8 +54,9 @@ private static string GetContentCacheIdentifier(MacroModel model, int pageId)
             {
                 object key = 0;
 
-                if (HttpContext.Current.User.Identity.IsAuthenticated)
+                if (_umbracoContextAccessor.UmbracoContext.HttpContext?.User?.Identity?.IsAuthenticated ?? false)
                 {
+                    //ugh, membershipproviders :(
                     var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
                     var member = Core.Security.MembershipProviderExtensions.GetCurrentUser(provider);
                     key = member?.ProviderUserKey ?? 0;
@@ -71,34 +71,19 @@ private static string GetContentCacheIdentifier(MacroModel model, int pageId)
             return id.ToString();
         }
 
-        private static string GenerateCacheKeyFromCode(string input)
-        {
-            if (string.IsNullOrEmpty(input)) throw new ArgumentNullException(nameof(input));
-
-            // step 1, calculate MD5 hash from input
-            var md5 = MD5.Create();
-            var inputBytes = Encoding.ASCII.GetBytes(input);
-            var hash = md5.ComputeHash(inputBytes);
-
-            // step 2, convert byte array to hex string
-            var sb = new StringBuilder();
-            foreach (var h in hash) sb.Append(h.ToString("X2"));
-            return sb.ToString();
-        }
-
         // gets this macro content from the cache
         // ensuring that it is appropriate to use the cache
-        private static MacroContent GetMacroContentFromCache(MacroModel model)
+        private MacroContent GetMacroContentFromCache(MacroModel model)
         {
             // only if cache is enabled
-            if (UmbracoContext.Current.InPreviewMode || model.CacheDuration <= 0) return null;
+            if (_umbracoContextAccessor.UmbracoContext.InPreviewMode || model.CacheDuration <= 0) return null;
 
-            var cache = Current.AppCaches.RuntimeCache;
+            var cache = _appCaches.RuntimeCache;
             var macroContent = cache.GetCacheItem<MacroContent>(CacheKeys.MacroContentCacheKey + model.CacheIdentifier);
 
             if (macroContent == null) return null;
 
-            Current.Logger.Debug<MacroRenderer>("Macro content loaded from cache '{MacroCacheId}'", model.CacheIdentifier);
+            _plogger.Debug<MacroRenderer>("Macro content loaded from cache '{MacroCacheId}'", model.CacheIdentifier);
 
             // ensure that the source has not changed
             // note: does not handle dependencies, and never has
@@ -107,13 +92,13 @@ private static MacroContent GetMacroContentFromCache(MacroModel model)
             {
                 if (macroSource.Exists == false)
                 {
-                    Current.Logger.Debug<MacroRenderer>("Macro source does not exist anymore, ignore cache.");
+                    _plogger.Debug<MacroRenderer>("Macro source does not exist anymore, ignore cache.");
                     return null;
                 }
 
                 if (macroContent.Date < macroSource.LastWriteTime)
                 {
-                    Current.Logger.Debug<MacroRenderer>("Macro source has changed, ignore cache.");
+                    _plogger.Debug<MacroRenderer>("Macro source has changed, ignore cache.");
                     return null;
                 }
             }
@@ -126,10 +111,10 @@ private static MacroContent GetMacroContentFromCache(MacroModel model)
         }
 
         // stores macro content into the cache
-        private static void AddMacroContentToCache(MacroModel model, MacroContent macroContent)
+        private void AddMacroContentToCache(MacroModel model, MacroContent macroContent)
         {
             // only if cache is enabled
-            if (UmbracoContext.Current.InPreviewMode || model.CacheDuration <= 0) return;
+            if (_umbracoContextAccessor.UmbracoContext.InPreviewMode || model.CacheDuration <= 0) return;
 
             // just make sure...
             if (macroContent == null) return;
@@ -150,7 +135,7 @@ private static void AddMacroContentToCache(MacroModel model, MacroContent macroC
             // remember when we cache the content
             macroContent.Date = DateTime.Now;
 
-            var cache = Current.AppCaches.RuntimeCache;
+            var cache = _appCaches.RuntimeCache;
             cache.Insert(
                 CacheKeys.MacroContentCacheKey + model.CacheIdentifier,
                 () => macroContent,
@@ -158,7 +143,7 @@ private static void AddMacroContentToCache(MacroModel model, MacroContent macroC
                 priority: CacheItemPriority.NotRemovable
                 );
 
-            Current.Logger.Debug<MacroRenderer>("Macro content saved to cache '{MacroCacheId}'", model.CacheIdentifier);
+            _plogger.Debug<MacroRenderer>("Macro content saved to cache '{MacroCacheId}'", model.CacheIdentifier);
         }
 
         // gets the macro source file name
@@ -183,7 +168,7 @@ internal static string GetMacroFileName(MacroModel model)
 
         // gets the macro source file
         // null if macro is not file-based
-        internal static FileInfo GetMacroFile(MacroModel model)
+        private static FileInfo GetMacroFile(MacroModel model)
         {
             var filename = GetMacroFileName(model);
             if (filename == null) return null;
@@ -195,29 +180,17 @@ internal static FileInfo GetMacroFile(MacroModel model)
             return file.Exists ? file : null;
         }
 
-        #endregion
-
-        #region MacroModel properties
-
         // updates the model properties values according to the attributes
-        private static void UpdateMacroModelProperties(MacroModel model, Hashtable attributes)
+        private static void UpdateMacroModelProperties(MacroModel model, IDictionary<string, object> macroParams)
         {
             foreach (var prop in model.Properties)
             {
                 var key = prop.Key.ToLowerInvariant();
-                prop.Value = attributes.ContainsKey(key)
-                    ? attributes[key]?.ToString() ?? string.Empty
+                prop.Value = macroParams.ContainsKey(key)
+                    ? macroParams[key]?.ToString() ?? string.Empty
                     : string.Empty;
             }
-        }
-
-        // generates the model properties according to the attributes
-        public static void GenerateMacroModelPropertiesFromAttributes(MacroModel model, Hashtable attributes)
-        {
-            foreach (string key in attributes.Keys)
-                model.Properties.Add(new MacroPropertyModel(key, attributes[key].ToString()));
-        }
-
+        } 
         #endregion
 
         #region Render/Execute
@@ -226,16 +199,23 @@ public static void GenerateMacroModelPropertiesFromAttributes(MacroModel model,
         // referring to IPublishedContent we're rendering the macro against,
         // this is all so convoluted ;-(
 
-        public MacroContent Render(MacroModel macro, Hashtable pageElements, int pageId, Hashtable attributes)
+        public MacroContent Render(string macroAlias, IPublishedContent content, IDictionary<string, object> macroParams)
         {
-            UpdateMacroModelProperties(macro, attributes);
-            return Render(macro, pageElements, pageId);
+            var m = _macroService.GetByAlias(macroAlias);
+            if (m == null)
+                throw new InvalidOperationException("No macro found by alias " + macroAlias);
+
+            var page = new PublishedContentHashtableConverter(content);
+
+            var macro = new MacroModel(m);
+
+            UpdateMacroModelProperties(macro, macroParams);
+            return Render(macro, content, page.Elements);
         }
 
-        public MacroContent Render(MacroModel macro, Hashtable pageElements, int pageId)
+        private MacroContent Render(MacroModel macro, IPublishedContent content, IDictionary pageElements)
         {
-            // trigger MacroRendering event so that the model can be manipulated before rendering
-            OnMacroRendering(new MacroRenderingEventArgs(pageElements, pageId));
+            if (content == null) throw new ArgumentNullException(nameof(content));
 
             var macroInfo = $"Render Macro: {macro.Name}, type: {macro.MacroType}, cache: {macro.CacheDuration}";
             using (_plogger.DebugDuration<MacroRenderer>(macroInfo, "Rendered Macro."))
@@ -244,7 +224,7 @@ public MacroContent Render(MacroModel macro, Hashtable pageElements, int pageId)
                 foreach (var prop in macro.Properties)
                     prop.Value = ParseAttribute(pageElements, prop.Value);
 
-                macro.CacheIdentifier = GetContentCacheIdentifier(macro, pageId);
+                macro.CacheIdentifier = GetContentCacheIdentifier(macro, content.Id);
 
                 // get the macro from cache if it is there
                 var macroContent = GetMacroContentFromCache(macro);
@@ -258,7 +238,7 @@ public MacroContent Render(MacroModel macro, Hashtable pageElements, int pageId)
                 // this will take care of errors
                 // it may throw, if we actually want to throw, so better not
                 // catch anything here and let the exception be thrown
-                var attempt = ExecuteMacroOfType(macro);
+                var attempt = ExecuteMacroOfType(macro, content);
 
                 // by convention ExecuteMacroByType must either throw or return a result
                 // just check to avoid internal errors
@@ -300,8 +280,6 @@ private Attempt<MacroContent> ExecuteProfileMacroWithErrorWrapper(MacroModel mac
             }
             catch (Exception e)
             {
-                Exceptions.Add(e);
-
                 _plogger.Warn<MacroRenderer>(e, "Failed {MsgIn}", msgIn);
 
                 var macroErrorEventArgs = new MacroErrorEventArgs
@@ -310,11 +288,9 @@ private Attempt<MacroContent> ExecuteProfileMacroWithErrorWrapper(MacroModel mac
                     Alias = macro.Alias,
                     MacroSource = macro.MacroSource,
                     Exception = e,
-                    Behaviour = Current.Configs.Settings().Content.MacroErrorBehaviour
+                    Behaviour = _contentSection.MacroErrorBehaviour
                 };
 
-                OnError(macroErrorEventArgs);
-
                 switch (macroErrorEventArgs.Behaviour)
                 {
                     case MacroErrorBehaviour.Inline:
@@ -341,16 +317,17 @@ private Attempt<MacroContent> ExecuteProfileMacroWithErrorWrapper(MacroModel mac
         /// <remarks>Returns an attempt that is successful if the macro ran successfully. If the macro failed
         /// to run properly, the attempt fails, though it may contain a content. But for instance that content
         /// should not be cached. In that case the attempt may also contain an exception.</remarks>
-        private Attempt<MacroContent> ExecuteMacroOfType(MacroModel model)
+        private Attempt<MacroContent> ExecuteMacroOfType(MacroModel model, IPublishedContent content)
         {
+            if (model == null) throw new ArgumentNullException(nameof(model));
+            
             // ensure that we are running against a published node (ie available in XML)
             // that may not be the case if the macro is embedded in a RTE of an unpublished document
 
-            if (UmbracoContext.Current.PublishedRequest == null
-                || UmbracoContext.Current.PublishedRequest.HasPublishedContent == false)
-                return Attempt.Fail(new MacroContent { Text = "[macro]" });
+            if (content == null)
+                return Attempt.Fail(new MacroContent { Text = "[macro failed (no content)]" });
 
-            var textService = Current.Services.TextService;
+            var textService = _textService;
 
             switch (model.MacroType)
             {
@@ -358,7 +335,7 @@ private Attempt<MacroContent> ExecuteMacroOfType(MacroModel model)
                     return ExecuteMacroWithErrorWrapper(model,
                         $"Executing PartialView: MacroSource=\"{model.MacroSource}\".",
                         "Executed PartialView.",
-                        () => ExecutePartialView(model),
+                        () => ExecutePartialView(model, content),
                         () => textService.Localize("errors/macroErrorLoadingPartialView", new[] { model.MacroSource }));
 
                 default:
@@ -370,21 +347,6 @@ private Attempt<MacroContent> ExecuteMacroOfType(MacroModel model)
             }
         }
 
-        // raised when a macro triggers an error
-        public static event TypedEventHandler<MacroRenderer, MacroErrorEventArgs> Error;
-
-        protected void OnError(MacroErrorEventArgs e)
-        {
-            Error?.Invoke(this, e);
-        }
-
-        // raised before the macro renders, allowing devs to modify it
-        public static event TypedEventHandler<MacroRenderer, MacroRenderingEventArgs> MacroRendering;
-
-        protected void OnMacroRendering(MacroRenderingEventArgs e)
-        {
-            MacroRendering?.Invoke(this, e);
-        }
 
         #endregion
 
@@ -394,10 +356,9 @@ protected void OnMacroRendering(MacroRenderingEventArgs e)
         /// Renders a PartialView Macro.
         /// </summary>
         /// <returns>The text output of the macro execution.</returns>
-        private static MacroContent ExecutePartialView(MacroModel macro)
+        private MacroContent ExecutePartialView(MacroModel macro, IPublishedContent content)
         {
             var engine = new PartialViewMacroEngine();
-            var content = UmbracoContext.Current.PublishedRequest.PublishedContent;
             return engine.Execute(macro, content);
         }
 
@@ -407,8 +368,9 @@ private static MacroContent ExecutePartialView(MacroModel macro)
 
         // parses attribute value looking for [@requestKey], [%sessionKey], [#pageElement], [$recursiveValue]
         // supports fallbacks eg "[@requestKey],[%sessionKey],1234"
-        public static string ParseAttribute(IDictionary pageElements, string attributeValue)
+        private string ParseAttribute(IDictionary pageElements, string attributeValue)
         {
+            if (pageElements == null) throw new ArgumentNullException(nameof(pageElements));
 
             // check for potential querystring/cookie variables
             attributeValue = attributeValue.Trim();
@@ -431,7 +393,7 @@ public static string ParseAttribute(IDictionary pageElements, string attributeVa
                 return attributeValue;
             }
 
-            var context = HttpContext.Current;
+            var context = _umbracoContextAccessor.UmbracoContext.HttpContext;
 
             foreach (var token in tokens)
             {
@@ -458,11 +420,9 @@ public static string ParseAttribute(IDictionary pageElements, string attributeVa
                             attributeValue = context?.Request.GetCookieValue(name);
                         break;
                     case '#':
-                        if (pageElements == null) pageElements = GetPageElements();
                         attributeValue = pageElements[name]?.ToString();
                         break;
                     case '$':
-                        if (pageElements == null) pageElements = GetPageElements();
                         attributeValue = pageElements[name]?.ToString();
                         if (string.IsNullOrEmpty(attributeValue))
                             attributeValue = ParseAttributeOnParents(pageElements, name);
@@ -477,12 +437,13 @@ public static string ParseAttribute(IDictionary pageElements, string attributeVa
             return attributeValue;
         }
 
-        private static string ParseAttributeOnParents(IDictionary pageElements, string name)
+        private string ParseAttributeOnParents(IDictionary pageElements, string name)
         {
+            if (pageElements == null) throw new ArgumentNullException(nameof(pageElements));
             // this was, and still is, an ugly piece of nonsense
 
             var value = string.Empty;
-            var cache = UmbracoContext.Current.ContentCache; // should be injected
+            var cache = _umbracoContextAccessor.UmbracoContext.ContentCache;
 
             var splitpath = (string[])pageElements["splitpath"];
             for (var i = splitpath.Length - 1; i > 0; i--) // at 0 we have root (-1)
@@ -495,195 +456,9 @@ private static string ParseAttributeOnParents(IDictionary pageElements, string n
 
             return value;
         }
-
-        private static IDictionary GetPageElements()
-        {
-            IDictionary pageElements = null;
-            if (HttpContext.Current.Items["pageElements"] != null)
-                pageElements = (IDictionary)HttpContext.Current.Items["pageElements"];
-            return pageElements;
-        }
-
-        #endregion
-
-        #region RTE macros
-
-        public static string RenderMacroStartTag(Hashtable attributes, int pageId, Guid versionId)
-        {
-            var div = "<div ";
-
-            var ide = attributes.GetEnumerator();
-            while (ide.MoveNext())
-            {
-                div += $"umb_{ide.Key}=\"{EncodeMacroAttribute((ide.Value ?? String.Empty).ToString())}\" ";
-            }
-
-            div += $"ismacro=\"true\" onresizestart=\"return false;\" umbVersionId=\"{versionId}\" umbPageid=\"{pageId}\""
-                + " title=\"This is rendered content from macro\" class=\"umbMacroHolder\"><!-- startUmbMacro -->";
-
-            return div;
-        }
-
-        private static string EncodeMacroAttribute(string attributeContents)
-        {
-            // replace line breaks
-            attributeContents = attributeContents.Replace("\n", "\\n").Replace("\r", "\\r");
-
-            // replace quotes
-            attributeContents = attributeContents.Replace("\"", "&quot;");
-
-            // replace tag start/ends
-            attributeContents = attributeContents.Replace("<", "&lt;").Replace(">", "&gt;");
-
-            return attributeContents;
-        }
-
-        public static string RenderMacroEndTag()
-        {
-            return "<!-- endUmbMacro --></div>";
-        }
-
-        private static readonly Regex HrefRegex = new Regex("href=\"([^\"]*)\"",
-            RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
-
-        public static string GetRenderedMacro(int macroId, Hashtable elements, Hashtable attributes, int pageId, IMacroService macroService, IProfilingLogger plogger)
-        {
-            var m = macroService.GetById(macroId);
-            if (m == null) return string.Empty;
-            var model = new MacroModel(m);
-
-            // get as text, will render the control if any
-            var renderer = new MacroRenderer(plogger);
-            var macroContent = renderer.Render(model, elements, pageId);
-            var text = macroContent.GetAsText();
-
-            // remove hrefs
-            text = HrefRegex.Replace(text, match => "href=\"javascript:void(0)\"");
-
-            return text;
-        }
-
-        public static string MacroContentByHttp(int pageId, Guid pageVersion, Hashtable attributes, IMacroService macroService)
-        {
-            // though... we only support FullTrust now?
-            if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted)
-                return "<span style='color: red'>Cannot render macro content in the rich text editor when the application is running in a Partial Trust environment</span>";
-
-            var tempAlias = attributes["macroalias"]?.ToString() ?? attributes["macroAlias"].ToString();
-
-            var m = macroService.GetByAlias(tempAlias);
-            if (m == null) return string.Empty;
-            var macro = new MacroModel(m);
-            if (macro.RenderInEditor == false)
-                return ShowNoMacroContent(macro);
-
-            var querystring = $"umbPageId={pageId}&umbVersionId={pageVersion}";
-            var ide = attributes.GetEnumerator();
-            while (ide.MoveNext())
-                querystring += $"&umb_{ide.Key}={HttpContext.Current.Server.UrlEncode((ide.Value ?? String.Empty).ToString())}";
-
-            // create a new 'HttpWebRequest' object to the mentioned URL.
-            var useSsl = Current.Configs.Global().UseHttps;
-            var protocol = useSsl ? "https" : "http";
-            var currentRequest = HttpContext.Current.Request;
-            var serverVars = currentRequest.ServerVariables;
-            var umbracoDir = IOHelper.ResolveUrl(SystemDirectories.Umbraco);
-            var url = $"{protocol}://{serverVars["SERVER_NAME"]}:{serverVars["SERVER_PORT"]}{umbracoDir}/macroResultWrapper.aspx?{querystring}";
-
-            var myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
-
-            // allows for validation of SSL conversations (to bypass SSL errors in debug mode!)
-            ServicePointManager.ServerCertificateValidationCallback += ValidateRemoteCertificate;
-
-            // propagate the user's context
-            // TODO: this is the worst thing ever.
-            // also will not work if people decide to put their own custom auth system in place.
-            var inCookie = currentRequest.Cookies[Current.Configs.Settings().Security.AuthCookieName];
-            if (inCookie == null) throw new NullReferenceException("No auth cookie found");
-            var cookie = new Cookie(inCookie.Name, inCookie.Value, inCookie.Path, serverVars["SERVER_NAME"]);
-            myHttpWebRequest.CookieContainer = new CookieContainer();
-            myHttpWebRequest.CookieContainer.Add(cookie);
-
-            // assign the response object of 'HttpWebRequest' to a 'HttpWebResponse' variable.
-            HttpWebResponse myHttpWebResponse = null;
-            var text = string.Empty;
-            try
-            {
-                myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
-                if (myHttpWebResponse.StatusCode == HttpStatusCode.OK)
-                {
-                    var streamResponse = myHttpWebResponse.GetResponseStream();
-                    if (streamResponse == null)
-                        throw new Exception("Internal error, no response stream.");
-                    var streamRead = new StreamReader(streamResponse);
-                    var readBuff = new char[256];
-                    var count = streamRead.Read(readBuff, 0, 256);
-                    while (count > 0)
-                    {
-                        var outputData = new string(readBuff, 0, count);
-                        text += outputData;
-                        count = streamRead.Read(readBuff, 0, 256);
-                    }
-
-                    streamResponse.Close();
-                    streamRead.Close();
-
-                    // find the content of a form
-                    const string grabStart = "<!-- grab start -->";
-                    const string grabEnd = "<!-- grab end -->";
-
-                    var grabStartPos = text.InvariantIndexOf(grabStart) + grabStart.Length;
-                    var grabEndPos = text.InvariantIndexOf(grabEnd) - grabStartPos;
-                    text = text.Substring(grabStartPos, grabEndPos);
-                }
-                else
-                {
-                    text = ShowNoMacroContent(macro);
-                }
-            }
-            catch (Exception)
-            {
-                text = ShowNoMacroContent(macro);
-            }
-            finally
-            {
-                // release the HttpWebResponse Resource.
-                myHttpWebResponse?.Close();
-            }
-
-            return text.Replace("\n", string.Empty).Replace("\r", string.Empty);
-        }
-
-        private static string ShowNoMacroContent(MacroModel model)
-        {
-            var name = HttpUtility.HtmlEncode(model.Name); // safe
-            return $"<span style=\"color: green\"><strong>{name}</strong><br />No macro content available for WYSIWYG editing</span>";
-        }
-
-        private static bool ValidateRemoteCertificate(
-            object sender,
-            X509Certificate certificate,
-            X509Chain chain,
-            SslPolicyErrors policyErrors
-            )
-        {
-            // allow any old dodgy certificate in debug mode
-            return GlobalSettings.DebugMode || policyErrors == SslPolicyErrors.None;
-        }
-
+        
         #endregion
+        
     }
 
-    public class MacroRenderingEventArgs : EventArgs
-    {
-        public MacroRenderingEventArgs(Hashtable pageElements, int pageId)
-        {
-            PageElements = pageElements;
-            PageId = pageId;
-        }
-
-        public int PageId { get; }
-
-        public Hashtable PageElements { get; }
-    }
 }
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index ece76090d853..faf33a74cbe4 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -30,14 +30,13 @@ internal class PublishedContentHashtableConverter
         /// </remarks>
         internal PublishedContentHashtableConverter(PublishedRequest frequest)
         {
-
             if (!frequest.HasPublishedContent)
-                throw new ArgumentException("Document request has no node.", "frequest");
+                throw new ArgumentException("Document request has no node.", nameof(frequest));
 
             PopulatePageData(frequest.PublishedContent.Id,
                 frequest.PublishedContent.Name, frequest.PublishedContent.ContentType.Id, frequest.PublishedContent.ContentType.Alias,
                 frequest.PublishedContent.WriterName, frequest.PublishedContent.CreatorName, frequest.PublishedContent.CreateDate, frequest.PublishedContent.UpdateDate,
-                frequest.PublishedContent.Path, frequest.PublishedContent.Parent == null ? -1 : frequest.PublishedContent.Parent.Id);
+                frequest.PublishedContent.Path, frequest.PublishedContent.Parent?.Id ?? -1);
 
             if (frequest.HasTemplate)
             {
@@ -54,12 +53,12 @@ internal PublishedContentHashtableConverter(PublishedRequest frequest)
         /// <param name="doc"></param>
         internal PublishedContentHashtableConverter(IPublishedContent doc)
         {
-            if (doc == null) throw new ArgumentNullException("doc");
+            if (doc == null) throw new ArgumentNullException(nameof(doc));
 
             PopulatePageData(doc.Id,
                 doc.Name, doc.ContentType.Id, doc.ContentType.Alias,
                 doc.WriterName, doc.CreatorName, doc.CreateDate, doc.UpdateDate,
-                doc.Path, doc.Parent == null ? -1 : doc.Parent.Id);
+                doc.Path, doc.Parent?.Id ?? -1);
 
             if (doc.TemplateId.HasValue)
             {
@@ -132,6 +131,7 @@ private void PopulateElementData(IPublishedElement node)
         /// </summary>
         public Hashtable Elements { get; } = new Hashtable();
 
+
         #region PublishedContent
 
         private class PagePublishedProperty : PublishedPropertyBase
diff --git a/src/Umbraco.Web/Models/Mapping/RedirectUrlMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/RedirectUrlMapperProfile.cs
index 53baa1337996..5899c79b727a 100644
--- a/src/Umbraco.Web/Models/Mapping/RedirectUrlMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/RedirectUrlMapperProfile.cs
@@ -9,12 +9,14 @@ namespace Umbraco.Web.Models.Mapping
     internal class RedirectUrlMapperProfile : Profile
     {
 
-        public RedirectUrlMapperProfile()
+        public RedirectUrlMapperProfile(IUmbracoContextAccessor umbracoContextAccessor)
         {
             CreateMap<IRedirectUrl, ContentRedirectUrl>()
                 .ForMember(x => x.OriginalUrl, expression => expression.MapFrom(item => Current.UmbracoContext.UrlProvider.GetUrlFromRoute(item.ContentId, item.Url, item.Culture)))
-                .ForMember(x => x.DestinationUrl, expression => expression.MapFrom(item => item.ContentId > 0 ? new UmbracoHelper(Current.UmbracoContext, Current.Services).Url(item.ContentId, item.Culture) : "#"))
+                .ForMember(x => x.DestinationUrl, expression => expression.MapFrom(item => item.ContentId > 0 ? GetUrl(umbracoContextAccessor, item) : "#"))
                 .ForMember(x => x.RedirectId, expression => expression.MapFrom(item => item.Key));
         }
+
+        private static string GetUrl(IUmbracoContextAccessor umbracoContextAccessor, IRedirectUrl item) => umbracoContextAccessor?.UmbracoContext?.UrlProvider?.GetUrl(item.Id, item.Culture);
     }
 }
diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
index 62a7c48d2b7c..bba1522350dd 100644
--- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -79,8 +79,7 @@ public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, str
         /// <summary>
         /// Exposes an UmbracoHelper
         /// </summary>
-        protected UmbracoHelper Umbraco => _helper
-            ?? (_helper = new UmbracoHelper(Current.UmbracoContext, Current.Services));
+        protected UmbracoHelper Umbraco => _helper ?? (_helper = Current.Factory.GetInstance<UmbracoHelper>());
 
         public override void OnActionExecuted(ActionExecutedContext filterContext)
         {
diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs
index e3f4b45ce6cb..8f113dc0a429 100644
--- a/src/Umbraco.Web/Mvc/PluginController.cs
+++ b/src/Umbraco.Web/Mvc/PluginController.cs
@@ -20,8 +20,6 @@ public abstract class PluginController : Controller, IDiscoverable
         private static readonly ConcurrentDictionary<Type, PluginControllerMetadata> MetadataStorage
             = new ConcurrentDictionary<Type, PluginControllerMetadata>();
 
-        private UmbracoHelper _umbracoHelper;
-
         // for debugging purposes
         internal Guid InstanceId { get; } = Guid.NewGuid();
 
@@ -70,18 +68,7 @@ private static readonly ConcurrentDictionary<Type, PluginControllerMetadata> Met
         /// <summary>
         /// Gets the Umbraco helper.
         /// </summary>
-        public UmbracoHelper Umbraco
-        {
-            get
-            {
-                return _umbracoHelper
-                    ?? (_umbracoHelper = new UmbracoHelper(UmbracoContext, Services));
-            }
-            internal set // tests
-            {
-                _umbracoHelper = value;
-            }
-        }
+        public UmbracoHelper Umbraco { get; }
 
         /// <summary>
         /// Gets metadata for this instance.
@@ -95,12 +82,13 @@ protected PluginController()
                   Current.Factory.GetInstance<ServiceContext>(),
                   Current.Factory.GetInstance<AppCaches>(),
                   Current.Factory.GetInstance<ILogger>(),
-                  Current.Factory.GetInstance<IProfilingLogger>()
+                  Current.Factory.GetInstance<IProfilingLogger>(),
+                  Current.Factory.GetInstance<UmbracoHelper>()
             )
         {
         }
 
-        protected PluginController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
+        protected PluginController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
         {
             UmbracoContext = umbracoContext;
             DatabaseFactory = databaseFactory;
@@ -108,6 +96,7 @@ protected PluginController(UmbracoContext umbracoContext, IUmbracoDatabaseFactor
             AppCaches = appCaches;
             Logger = logger;
             ProfilingLogger = profilingLogger;
+            Umbraco = umbracoHelper;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index e5ad2bb01ec2..da7e3b08fcd5 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -23,8 +23,8 @@ public RenderMvcController()
             ActionInvoker = new RenderActionInvoker();
         }
 
-        public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
-            : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger)
+        public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger, umbracoHelper)
         {
             ActionInvoker = new RenderActionInvoker();
         }
@@ -32,7 +32,7 @@ public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbrac
         /// <summary>
         /// Gets the Umbraco context.
         /// </summary>
-        public override UmbracoContext UmbracoContext => PublishedRequest.UmbracoContext;
+        public override UmbracoContext UmbracoContext => PublishedRequest.UmbracoContext; //TODO: Why?
 
         /// <summary>
         /// Gets the current content item.
diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs
index 2bf73b7dd1ba..05c095940c18 100644
--- a/src/Umbraco.Web/Mvc/SurfaceController.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceController.cs
@@ -19,8 +19,8 @@ public abstract class SurfaceController : PluginController
         protected SurfaceController()
         { }
 
-        protected SurfaceController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
-            : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger)
+        protected SurfaceController(UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+            : base(umbracoContext, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
         { }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
index 89364fe9cf18..a54958c4f745 100644
--- a/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
@@ -18,10 +18,11 @@ namespace Umbraco.Web.Mvc
     public abstract class UmbracoAuthorizedController : UmbracoController
     {
         protected UmbracoAuthorizedController()
-        { }
+        {
+        }
 
-        protected UmbracoAuthorizedController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
-            : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger)
-        { }
+        protected UmbracoAuthorizedController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger, umbracoHelper)
+        {
+        }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/UmbracoController.cs b/src/Umbraco.Web/Mvc/UmbracoController.cs
index 4d70263cb81f..61198bd2633e 100644
--- a/src/Umbraco.Web/Mvc/UmbracoController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoController.cs
@@ -17,15 +17,13 @@ namespace Umbraco.Web.Mvc
     /// </summary>
     public abstract class UmbracoController : Controller
     {
-        private UmbracoHelper _umbracoHelper;
-
         // for debugging purposes
         internal Guid InstanceId { get; } = Guid.NewGuid();
 
         /// <summary>
         /// Gets or sets the Umbraco context.
         /// </summary>
-        public virtual IGlobalSettings GlobalSettings { get; set; }
+        public IGlobalSettings GlobalSettings { get; set; }
 
         /// <summary>
         /// Gets or sets the Umbraco context.
@@ -62,8 +60,7 @@ public abstract class UmbracoController : Controller
         /// <summary>
         /// Gets the Umbraco helper.
         /// </summary>
-        public UmbracoHelper Umbraco => _umbracoHelper
-            ?? (_umbracoHelper = new UmbracoHelper(UmbracoContext, Services));
+        public UmbracoHelper Umbraco { get; }
 
         /// <summary>
         /// Gets the web security helper.
@@ -77,12 +74,13 @@ protected UmbracoController()
                   Current.Factory.GetInstance<ServiceContext>(),
                   Current.Factory.GetInstance<AppCaches>(),
                   Current.Factory.GetInstance<ILogger>(),
-                  Current.Factory.GetInstance<IProfilingLogger>()
+                  Current.Factory.GetInstance<IProfilingLogger>(),
+                  Current.Factory.GetInstance<UmbracoHelper>()
             )
         {
         }
 
-        protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
+        protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
         {
             GlobalSettings = globalSettings;
             UmbracoContext = umbracoContext;
@@ -90,6 +88,7 @@ protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbra
             AppCaches = appCaches;
             Logger = logger;
             ProfilingLogger = profilingLogger;
+            Umbraco = umbracoHelper;
         }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
index a16f9661aa55..2dcb883ed301 100644
--- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
@@ -7,6 +7,7 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Dictionary;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
@@ -84,7 +85,7 @@ internal PublishedRequest PublishedRequest
         /// <summary>
         /// Gets the Umbraco helper.
         /// </summary>
-        public virtual UmbracoHelper Umbraco
+        public UmbracoHelper Umbraco
         {
             get
             {
@@ -94,9 +95,12 @@ public virtual UmbracoHelper Umbraco
                 var content = model as IPublishedContent;
                 if (content == null && model is IContentModel)
                     content = ((IContentModel) model).Content;
-                _helper = content == null
-                    ? new UmbracoHelper(UmbracoContext, Services)
-                    : new UmbracoHelper(UmbracoContext, Services, content);
+
+                _helper = Current.UmbracoHelper;
+
+                if (content != null)
+                    _helper.AssignedContentItem = content;
+                
                 return _helper;
             }
         }
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
index 5a0fc87cb021..e6e66b79ff91 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
@@ -20,12 +20,12 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
     public class MacroContainerValueConverter : PropertyValueConverterBase
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly ServiceContext _services;
+        private readonly IMacroRenderer _macroRenderer;
 
-        public MacroContainerValueConverter(IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services)
+        public MacroContainerValueConverter(IUmbracoContextAccessor umbracoContextAccessor, IMacroRenderer macroRenderer)
         {
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
-            _services = services ?? throw new ArgumentNullException(nameof(services));
+            _macroRenderer = macroRenderer ?? throw new ArgumentNullException(nameof(macroRenderer));
         }
 
         public override bool IsConverter(PublishedPropertyType propertyType)
@@ -48,14 +48,14 @@ string RenderMacros(string source, bool preview)
             {
                 var sb = new StringBuilder();
 
-                var umbracoHelper = new UmbracoHelper(umbracoContext, _services);
                 MacroTagParser.ParseMacros(
                     source,
                     //callback for when text block is found
                     textBlock => sb.Append(textBlock),
                     //callback for when macro syntax is found
-                    (macroAlias, macroAttributes) => sb.Append(umbracoHelper.RenderMacro(
+                    (macroAlias, macroAttributes) => sb.Append(_macroRenderer.Render(
                         macroAlias,
+                        umbracoContext.PublishedRequest?.PublishedContent,
                         //needs to be explicitly casted to Dictionary<string, object>
                         macroAttributes.ConvertTo(x => (string)x, x => x)).ToString()));
 
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
index 7a089b6f9e09..e636369c74e3 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
     public class RteMacroRenderingValueConverter : TinyMceValueConverter
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly ServiceContext _services;
+        private readonly IMacroRenderer _macroRenderer;
 
         public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType)
         {
@@ -30,10 +30,10 @@ public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType p
             return PropertyCacheLevel.Snapshot;
         }
 
-        public RteMacroRenderingValueConverter(IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services)
+        public RteMacroRenderingValueConverter(IUmbracoContextAccessor umbracoContextAccessor, IMacroRenderer macroRenderer)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
-            _services = services;
+            _macroRenderer = macroRenderer;
         }
 
         // NOT thread-safe over a request because it modifies the
@@ -47,14 +47,14 @@ private string RenderRteMacros(string source, bool preview)
             {
                 var sb = new StringBuilder();
 
-                var umbracoHelper = new UmbracoHelper(umbracoContext, _services);
                 MacroTagParser.ParseMacros(
                     source,
                     //callback for when text block is found
                     textBlock => sb.Append(textBlock),
                     //callback for when macro syntax is found
-                    (macroAlias, macroAttributes) => sb.Append(umbracoHelper.RenderMacro(
+                    (macroAlias, macroAttributes) => sb.Append(_macroRenderer.Render(
                         macroAlias,
+                        umbracoContext.PublishedRequest?.PublishedContent,
                         //needs to be explicitly casted to Dictionary<string, object>
                         macroAttributes.ConvertTo(x => (string)x, x => x)).ToString()));
 
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index de3ca47b383d..27c42e2c912a 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -23,6 +23,7 @@
 using Umbraco.Web.Editors;
 using Umbraco.Web.Features;
 using Umbraco.Web.HealthCheck;
+using Umbraco.Web.Macros;
 using Umbraco.Web.Models.PublishedContent;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
@@ -32,6 +33,7 @@
 using Umbraco.Web.Security.Providers;
 using Umbraco.Web.Services;
 using Umbraco.Web.SignalR;
+using Umbraco.Web.Templates;
 using Umbraco.Web.Tour;
 using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
@@ -85,8 +87,19 @@ public override void Compose(Composition composition)
             // TODO: stop doing this
             composition.Register(factory => factory.GetInstance<IUmbracoContextAccessor>().UmbracoContext, Lifetime.Request);
 
-            // register the umbraco helper
-            composition.RegisterUnique<UmbracoHelper>();
+            composition.Register<IPublishedContentQuery>(factory =>
+            {
+                var umbCtx = factory.GetInstance<IUmbracoContextAccessor>();
+                return new PublishedContentQuery(umbCtx.UmbracoContext.ContentCache, umbCtx.UmbracoContext.MediaCache, factory.GetInstance<IVariationContextAccessor>());
+            }, Lifetime.Request);
+            composition.Register<ITagQuery, TagQuery>(Lifetime.Request);
+
+            composition.RegisterUnique<ITemplateRenderer, TemplateRenderer>();
+            composition.RegisterUnique<IMacroRenderer, MacroRenderer>();
+            composition.RegisterUnique<IUmbracoComponentRenderer, UmbracoComponentRenderer>();
+
+            // register the umbraco helper - this is Transient! very important!
+            composition.Register<UmbracoHelper>();
 
             // register distributed cache
             composition.RegisterUnique(f => new DistributedCache());
diff --git a/src/Umbraco.Web/Templates/ITemplateRenderer.cs b/src/Umbraco.Web/Templates/ITemplateRenderer.cs
new file mode 100644
index 000000000000..f01edc58ede4
--- /dev/null
+++ b/src/Umbraco.Web/Templates/ITemplateRenderer.cs
@@ -0,0 +1,12 @@
+using System.IO;
+
+namespace Umbraco.Web.Templates
+{
+    /// <summary>
+    /// This is used purely for the RenderTemplate functionality in Umbraco
+    /// </summary>
+    public interface ITemplateRenderer
+    {
+        void Render(int pageId, int? altTemplateId, StringWriter writer);
+    }
+}
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index 9279eea124fe..facafdea635f 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -9,6 +10,7 @@
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Routing;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Services;
 using Umbraco.Web.Macros;
 using Current = Umbraco.Web.Composing.Current;
@@ -21,92 +23,81 @@ namespace Umbraco.Web.Templates
     /// <remarks>
     /// This allows you to render an MVC template based purely off of a node id and an optional alttemplate id as string output.
     /// </remarks>
-    internal class TemplateRenderer
+    internal class TemplateRenderer : ITemplateRenderer
     {
-        private readonly UmbracoContext _umbracoContext;
-        private object _oldPageElements;
-        private PublishedRequest _oldPublishedRequest;
-        private object _oldAltTemplate;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly PublishedRouter _publishedRouter;
+        private readonly IFileService _fileService;
+        private readonly ILocalizationService _languageService;
+        private readonly IWebRoutingSection _webRoutingSection;
 
-        public TemplateRenderer(UmbracoContext umbracoContext, int pageId, int? altTemplateId)
+        public TemplateRenderer(IUmbracoContextAccessor umbracoContextAccessor, PublishedRouter publishedRouter, IFileService fileService, ILocalizationService textService, IWebRoutingSection webRoutingSection)
         {
-            PageId = pageId;
-            AltTemplateId = altTemplateId;
-            _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
+            _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
+            _publishedRouter = publishedRouter ?? throw new ArgumentNullException(nameof(publishedRouter));
+            _fileService = fileService ?? throw new ArgumentNullException(nameof(fileService));
+            _languageService = textService ?? throw new ArgumentNullException(nameof(textService));
+            _webRoutingSection = webRoutingSection ?? throw new ArgumentNullException(nameof(webRoutingSection));
         }
-
-        private IFileService FileService => Current.Services.FileService; // TODO: inject
-        private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>(); // TODO: inject
-
-
-        /// <summary>
-        /// Gets/sets the page id for the template to render
-        /// </summary>
-        public int PageId { get; }
-
-        /// <summary>
-        /// Gets/sets the alt template to render if there is one
-        /// </summary>
-        public int? AltTemplateId { get; }
-
-        public void Render(StringWriter writer)
+        
+        public void Render(int pageId, int? altTemplateId, StringWriter writer)
         {
             if (writer == null) throw new ArgumentNullException(nameof(writer));
 
             // instantiate a request and process
             // important to use CleanedUmbracoUrl - lowercase path-only version of the current url, though this isn't going to matter
             // terribly much for this implementation since we are just creating a doc content request to modify it's properties manually.
-            var contentRequest = PublishedRouter.CreateRequest(_umbracoContext);
+            var contentRequest = _publishedRouter.CreateRequest(_umbracoContextAccessor.UmbracoContext);
 
-            var doc = contentRequest.UmbracoContext.ContentCache.GetById(PageId);
+            var doc = contentRequest.UmbracoContext.ContentCache.GetById(pageId);
 
             if (doc == null)
             {
-                writer.Write("<!-- Could not render template for Id {0}, the document was not found -->", PageId);
+                writer.Write("<!-- Could not render template for Id {0}, the document was not found -->", pageId);
                 return;
             }
 
             //in some cases the UmbracoContext will not have a PublishedContentRequest assigned to it if we are not in the
             //execution of a front-end rendered page. In this case set the culture to the default.
             //set the culture to the same as is currently rendering
-            if (_umbracoContext.PublishedRequest == null)
+            if (_umbracoContextAccessor.UmbracoContext.PublishedRequest == null)
             {
-                var defaultLanguage = Current.Services.LocalizationService.GetAllLanguages().FirstOrDefault();
+                var defaultLanguage = _languageService.GetAllLanguages().FirstOrDefault();
                 contentRequest.Culture = defaultLanguage == null
                     ? CultureInfo.CurrentUICulture
                     : defaultLanguage.CultureInfo;
             }
             else
             {
-                contentRequest.Culture = _umbracoContext.PublishedRequest.Culture;
+                contentRequest.Culture = _umbracoContextAccessor.UmbracoContext.PublishedRequest.Culture;
             }
 
             //set the doc that was found by id
             contentRequest.PublishedContent = doc;
             //set the template, either based on the AltTemplate found or the standard template of the doc
-            var templateId = Current.Configs.Settings().WebRouting.DisableAlternativeTemplates || !AltTemplateId.HasValue
+            var templateId = _webRoutingSection.DisableAlternativeTemplates || !altTemplateId.HasValue
                 ? doc.TemplateId
-                : AltTemplateId.Value;
+                : altTemplateId.Value;
             if (templateId.HasValue)
-                contentRequest.TemplateModel = FileService.GetTemplate(templateId.Value);
+                contentRequest.TemplateModel = _fileService.GetTemplate(templateId.Value);
 
             //if there is not template then exit
             if (contentRequest.HasTemplate == false)
             {
-                if (AltTemplateId.HasValue == false)
+                if (altTemplateId.HasValue == false)
                 {
                     writer.Write("<!-- Could not render template for Id {0}, the document's template was not found with id {0}-->", doc.TemplateId);
                 }
                 else
                 {
-                    writer.Write("<!-- Could not render template for Id {0}, the altTemplate was not found with id {0}-->", AltTemplateId);
+                    writer.Write("<!-- Could not render template for Id {0}, the altTemplate was not found with id {0}-->", altTemplateId);
                 }
                 return;
             }
 
             //First, save all of the items locally that we know are used in the chain of execution, we'll need to restore these
             //after this page has rendered.
-            SaveExistingItems();
+            SaveExistingItems(out var oldPageElements, out var oldPublishedRequest, out var oldAltTemplate);
 
             try
             {
@@ -119,7 +110,7 @@ public void Render(StringWriter writer)
             finally
             {
                 //restore items on context objects to continuing rendering the parent template
-                RestoreItems();
+                RestoreItems(oldPageElements, oldPublishedRequest, oldAltTemplate);
             }
 
         }
@@ -134,11 +125,11 @@ private void ExecuteTemplateRendering(TextWriter sw, PublishedRequest request)
             //var queryString = _umbracoContext.HttpContext.Request.QueryString.AllKeys
             //    .ToDictionary(key => key, key => context.Request.QueryString[key]);
 
-            var requestContext = new RequestContext(_umbracoContext.HttpContext, new RouteData()
+            var requestContext = new RequestContext(_umbracoContextAccessor.UmbracoContext.HttpContext, new RouteData()
             {
                 Route = RouteTable.Routes["Umbraco_default"]
             });
-            var routeHandler = new RenderRouteHandler(_umbracoContext, ControllerBuilder.Current.GetControllerFactory());
+            var routeHandler = new RenderRouteHandler(_umbracoContextAccessor, ControllerBuilder.Current.GetControllerFactory());
             var routeDef = routeHandler.GetUmbracoRouteDefinition(requestContext, request);
             var renderModel = new ContentModel(request.PublishedContent);
             //manually add the action/controller, this is required by mvc
@@ -184,31 +175,31 @@ private void SetNewItemsOnContextObjects(PublishedRequest request)
             // handlers like default.aspx will want it and most macros currently need it
             request.LegacyContentHashTable = new PublishedContentHashtableConverter(request);
             //now, set the new ones for this page execution
-            _umbracoContext.HttpContext.Items["pageElements"] = request.LegacyContentHashTable.Elements;
-            _umbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = null;
-            _umbracoContext.PublishedRequest = request;
+            _umbracoContextAccessor.UmbracoContext.HttpContext.Items["pageElements"] = request.LegacyContentHashTable.Elements;
+            _umbracoContextAccessor.UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = null;
+            _umbracoContextAccessor.UmbracoContext.PublishedRequest = request;
         }
 
         /// <summary>
         /// Save all items that we know are used for rendering execution to variables so we can restore after rendering
         /// </summary>
-        private void SaveExistingItems()
+        private void SaveExistingItems(out object oldPageElements, out PublishedRequest oldPublishedRequest, out object oldAltTemplate)
         {
             //Many objects require that these legacy items are in the http context items... before we render this template we need to first
             //save the values in them so that we can re-set them after we render so the rest of the execution works as per normal
-            _oldPageElements = _umbracoContext.HttpContext.Items["pageElements"];
-            _oldPublishedRequest = _umbracoContext.PublishedRequest;
-            _oldAltTemplate = _umbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate];
+            oldPageElements = _umbracoContextAccessor.UmbracoContext.HttpContext.Items["pageElements"];
+            oldPublishedRequest = _umbracoContextAccessor.UmbracoContext.PublishedRequest;
+            oldAltTemplate = _umbracoContextAccessor.UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate];
         }
 
         /// <summary>
         /// Restores all items back to their context's to continue normal page rendering execution
         /// </summary>
-        private void RestoreItems()
+        private void RestoreItems(object oldPageElements, PublishedRequest oldPublishedRequest, object oldAltTemplate)
         {
-            _umbracoContext.PublishedRequest = _oldPublishedRequest;
-            _umbracoContext.HttpContext.Items["pageElements"] = _oldPageElements;
-            _umbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = _oldAltTemplate;
+            _umbracoContextAccessor.UmbracoContext.PublishedRequest = oldPublishedRequest;
+            _umbracoContextAccessor.UmbracoContext.HttpContext.Items["pageElements"] = oldPageElements;
+            _umbracoContextAccessor.UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = oldAltTemplate;
         }
     }
 }
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 605d5e435284..68d7fbb3fd5a 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -36,8 +36,8 @@ public class ApplicationTreeController : UmbracoAuthorizedApiController
 
         public ApplicationTreeController(IGlobalSettings globalSettings, UmbracoContext umbracoContext,
             ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger,
-            IRuntimeState runtimeState, ITreeService treeService)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+            IRuntimeState runtimeState, ITreeService treeService, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _treeService = treeService;
         }
diff --git a/src/Umbraco.Web/Trees/TreeController.cs b/src/Umbraco.Web/Trees/TreeController.cs
index e6d948e19a3d..be0b86298883 100644
--- a/src/Umbraco.Web/Trees/TreeController.cs
+++ b/src/Umbraco.Web/Trees/TreeController.cs
@@ -18,8 +18,8 @@ public abstract class TreeController : TreeControllerBase
 
         private readonly TreeAttribute _treeAttribute;
 
-        protected TreeController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
+        protected TreeController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _treeAttribute = GetTreeAttribute();
         }
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 8632c15d2478..e3946ce532e2 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -27,11 +27,12 @@ namespace Umbraco.Web.Trees
     public abstract class TreeControllerBase : UmbracoAuthorizedApiController, ITree
     {
         protected TreeControllerBase()
-        { }
+        {
+        }
 
-        protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
-        { }
+        protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
 
         /// <summary>
         /// The method called to render the contents of the tree structure
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f078e9d79fa3..9b685550a83e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -143,6 +143,7 @@
     <Compile Include="Logging\WebProfilerComponent.cs" />
     <Compile Include="Logging\WebProfilerComposer.cs" />
     <Compile Include="Logging\WebProfilerProvider.cs" />
+    <Compile Include="Macros\IMacroRenderer.cs" />
     <Compile Include="Media\Exif\BitConverterEx.cs" />
     <Compile Include="Media\Exif\ExifBitConverter.cs" />
     <Compile Include="Media\Exif\ExifEnums.cs" />
@@ -194,6 +195,7 @@
     <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerValueEditor.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerValueConverter.cs" />
+    <Compile Include="Templates\ITemplateRenderer.cs" />
     <Compile Include="Trees\BackOfficeSectionCollectionBuilder.cs" />
     <Compile Include="Trees\MediaBackOfficeSection.cs" />
     <Compile Include="Trees\MembersBackOfficeSection.cs" />
diff --git a/src/Umbraco.Web/UmbracoAuthorizedHttpHandler.cs b/src/Umbraco.Web/UmbracoAuthorizedHttpHandler.cs
index 1d8475111f7a..b18ba5579969 100644
--- a/src/Umbraco.Web/UmbracoAuthorizedHttpHandler.cs
+++ b/src/Umbraco.Web/UmbracoAuthorizedHttpHandler.cs
@@ -2,6 +2,7 @@
 using System.Security;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
 using Umbraco.Web.Security;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
@@ -11,10 +12,10 @@ namespace Umbraco.Web
     public abstract class UmbracoAuthorizedHttpHandler : UmbracoHttpHandler
     {
         protected UmbracoAuthorizedHttpHandler()
-        { }
+        {
+        }
 
-        protected UmbracoAuthorizedHttpHandler(UmbracoContext umbracoContext, ServiceContext services)
-            : base(umbracoContext, services)
+        protected UmbracoAuthorizedHttpHandler(UmbracoContext umbracoContext, UmbracoHelper umbracoHelper, ServiceContext service, IProfilingLogger plogger) : base(umbracoContext, umbracoHelper, service, plogger)
         {
         }
 
diff --git a/src/Umbraco.Web/UmbracoComponentRenderer.cs b/src/Umbraco.Web/UmbracoComponentRenderer.cs
index f59962a0f2c0..4ce25acb29d7 100644
--- a/src/Umbraco.Web/UmbracoComponentRenderer.cs
+++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Collections;
 using System.IO;
 using System.Web;
@@ -6,6 +7,9 @@
 using Umbraco.Core;
 using Umbraco.Web.Templates;
 using System.Collections.Generic;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Macros;
 
@@ -20,31 +24,34 @@ namespace Umbraco.Web
     /// </remarks>
     internal class UmbracoComponentRenderer : IUmbracoComponentRenderer
     {
-        private readonly UmbracoContext _umbracoContext;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly IMacroRenderer _macroRenderer;
+        private readonly ITemplateRenderer _templateRenderer;
 
-        public UmbracoComponentRenderer(UmbracoContext umbracoContext)
+        public UmbracoComponentRenderer(IUmbracoContextAccessor umbracoContextAccessor, IMacroRenderer macroRenderer, ITemplateRenderer templateRenderer)
         {
-            _umbracoContext = umbracoContext;
+            _umbracoContextAccessor = umbracoContextAccessor;
+            _macroRenderer = macroRenderer;
+            _templateRenderer = templateRenderer ?? throw new ArgumentNullException(nameof(templateRenderer));
         }
 
         /// <summary>
         /// Renders the template for the specified pageId and an optional altTemplateId
         /// </summary>
-        /// <param name="pageId"></param>
+        /// <param name="contentId"></param>
         /// <param name="altTemplateId">If not specified, will use the template assigned to the node</param>
         /// <returns></returns>
-        public IHtmlString RenderTemplate(int pageId, int? altTemplateId = null)
+        public IHtmlString RenderTemplate(int contentId, int? altTemplateId = null)
         {
-            var templateRenderer = new TemplateRenderer(_umbracoContext, pageId, altTemplateId);
             using (var sw = new StringWriter())
             {
                 try
                 {
-                    templateRenderer.Render(sw);
+                    _templateRenderer.Render(contentId, altTemplateId, sw);
                 }
                 catch (Exception ex)
                 {
-                    sw.Write("<!-- Error rendering template with id {0}: '{1}' -->", pageId, ex);
+                    sw.Write("<!-- Error rendering template with id {0}: '{1}' -->", contentId, ex);
                 }
                 return new HtmlString(sw.ToString());
             }
@@ -53,129 +60,107 @@ public IHtmlString RenderTemplate(int pageId, int? altTemplateId = null)
         /// <summary>
         /// Renders the macro with the specified alias.
         /// </summary>
+        /// <param name="contentId"></param>
         /// <param name="alias">The alias.</param>
         /// <returns></returns>
-        public IHtmlString RenderMacro(string alias)
+        public IHtmlString RenderMacro(int contentId, string alias)
         {
-            return RenderMacro(alias, new { });
+            return RenderMacro(contentId, alias, new { });
         }
 
         /// <summary>
         /// Renders the macro with the specified alias, passing in the specified parameters.
         /// </summary>
+        /// <param name="contentId"></param>
         /// <param name="alias">The alias.</param>
         /// <param name="parameters">The parameters.</param>
         /// <returns></returns>
-        public IHtmlString RenderMacro(string alias, object parameters)
+        public IHtmlString RenderMacro(int contentId, string alias, object parameters)
         {
-            return RenderMacro(alias, parameters.ToDictionary<object>());
+            return RenderMacro(contentId, alias, parameters.ToDictionary<object>());
         }
 
         /// <summary>
         /// Renders the macro with the specified alias, passing in the specified parameters.
         /// </summary>
+        /// <param name="contentId"></param>
         /// <param name="alias">The alias.</param>
         /// <param name="parameters">The parameters.</param>
         /// <returns></returns>
-        public IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters)
+        public IHtmlString RenderMacro(int contentId, string alias, IDictionary<string, object> parameters)
         {
+            if (contentId == default)
+                throw new ArgumentException("Invalid content id " + contentId);
 
-            if (_umbracoContext.PublishedRequest == null)
-            {
-                throw new InvalidOperationException("Cannot render a macro when there is no current PublishedContentRequest.");
-            }
-
-            return RenderMacro(alias, parameters, _umbracoContext.PublishedRequest.LegacyContentHashTable);
-        }
-
-        /// <summary>
-        /// Renders the macro with the specified alias, passing in the specified parameters.
-        /// </summary>
-        /// <param name="alias">The alias.</param>
-        /// <param name="parameters">The parameters.</param>
-        /// <param name="umbracoPage">The legacy umbraco page object that is required for some macros</param>
-        /// <returns></returns>
-        internal IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters, PublishedContentHashtableConverter umbracoPage)
-        {
-            if (alias == null) throw new ArgumentNullException("alias");
-            if (umbracoPage == null) throw new ArgumentNullException("umbracoPage");
+            var content = _umbracoContextAccessor.UmbracoContext.ContentCache?.GetById(contentId);
 
-            var m = Current.Services.MacroService.GetByAlias(alias);
-            if (m == null)
-                throw new KeyNotFoundException("Could not find macro with alias " + alias);
+            if (content == null)
+                throw new InvalidOperationException("Cannot render a macro, no content found by id " + contentId);
 
-            return RenderMacro(new MacroModel(m), parameters, umbracoPage);
+            return RenderMacro(alias, parameters, content);
         }
 
         /// <summary>
         /// Renders the macro with the specified alias, passing in the specified parameters.
         /// </summary>
-        /// <param name="m">The macro.</param>
+        /// <param name="alias">The macro alias.</param>
         /// <param name="parameters">The parameters.</param>
-        /// <param name="umbracoPage">The legacy umbraco page object that is required for some macros</param>
+        /// <param name="content">The content used for macro rendering</param>
         /// <returns></returns>
-        internal IHtmlString RenderMacro(MacroModel m, IDictionary<string, object> parameters, PublishedContentHashtableConverter umbracoPage)
+        private IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters, IPublishedContent content)
         {
-            if (umbracoPage == null) throw new ArgumentNullException(nameof(umbracoPage));
-            if (m == null) throw new ArgumentNullException(nameof(m));
-
-            if (_umbracoContext.PageId == null)
-            {
-                throw new InvalidOperationException("Cannot render a macro when UmbracoContext.PageId is null.");
-            }
-
-            var macroProps = new Hashtable();
-            foreach (var i in parameters)
-            {
-                // TODO: We are doing at ToLower here because for some insane reason the UpdateMacroModel method of macro.cs
-                // looks for a lower case match. WTF. the whole macro concept needs to be rewritten.
+            if (content == null) throw new ArgumentNullException(nameof(content));
 
-
-                //NOTE: the value could have HTML encoded values, so we need to deal with that
-                macroProps.Add(i.Key.ToLowerInvariant(), (i.Value is string) ? HttpUtility.HtmlDecode(i.Value.ToString()) : i.Value);
-            }
-            var renderer = new MacroRenderer(Current.ProfilingLogger);
-            var macroControl = renderer.Render(m, umbracoPage.Elements, _umbracoContext.PageId.Value, macroProps).GetAsControl();
+            // TODO: We are doing at ToLower here because for some insane reason the UpdateMacroModel method looks for a lower case match. the whole macro concept needs to be rewritten.
+            //NOTE: the value could have HTML encoded values, so we need to deal with that
+            var macroProps = parameters.ToDictionary(
+                x => x.Key.ToLowerInvariant(),
+                i => (i.Value is string) ? HttpUtility.HtmlDecode(i.Value.ToString()) : i.Value);
+            
+            var macroControl = _macroRenderer.Render(alias, content, macroProps).GetAsControl();
 
             string html;
-            if (macroControl is LiteralControl)
+            if (macroControl is LiteralControl control)
             {
                 // no need to execute, we already have text
-                html = (macroControl as LiteralControl).Text;
+                html = control.Text;
             }
             else
             {
-                var containerPage = new FormlessPage();
-                containerPage.Controls.Add(macroControl);
-
-                using (var output = new StringWriter())
+                using (var containerPage = new FormlessPage())
                 {
-                    // .Execute() does a PushTraceContext/PopTraceContext and writes trace output straight into 'output'
-                    // and I do not see how we could wire the trace context to the current context... so it creates dirty
-                    // trace output right in the middle of the page.
-                    //
-                    // The only thing we can do is fully disable trace output while .Execute() runs and restore afterwards
-                    // which means trace output is lost if the macro is a control (.ascx or user control) that is invoked
-                    // from within Razor -- which makes sense anyway because the control can _not_ run correctly from
-                    // within Razor since it will never be inserted into the page pipeline (which may even not exist at all
-                    // if we're running MVC).
-                    //
-                    // I'm sure there's more things that will get lost with this context changing but I guess we'll figure
-                    // those out as we go along. One thing we lose is the content type response output.
-                    // http://issues.umbraco.org/issue/U4-1599 if it is setup during the macro execution. So
-                    // here we'll save the content type response and reset it after execute is called.
-
-                    var contentType = _umbracoContext.HttpContext.Response.ContentType;
-                    var traceIsEnabled = containerPage.Trace.IsEnabled;
-                    containerPage.Trace.IsEnabled = false;
-                    _umbracoContext.HttpContext.Server.Execute(containerPage, output, true);
-                    containerPage.Trace.IsEnabled = traceIsEnabled;
-                    //reset the content type
-                    _umbracoContext.HttpContext.Response.ContentType = contentType;
-
-                    //Now, we need to ensure that local links are parsed
-                    html = TemplateUtilities.ParseInternalLinks(output.ToString(), _umbracoContext.UrlProvider);
+                    containerPage.Controls.Add(macroControl);
+
+                    using (var output = new StringWriter())
+                    {
+                        // .Execute() does a PushTraceContext/PopTraceContext and writes trace output straight into 'output'
+                        // and I do not see how we could wire the trace context to the current context... so it creates dirty
+                        // trace output right in the middle of the page.
+                        //
+                        // The only thing we can do is fully disable trace output while .Execute() runs and restore afterwards
+                        // which means trace output is lost if the macro is a control (.ascx or user control) that is invoked
+                        // from within Razor -- which makes sense anyway because the control can _not_ run correctly from
+                        // within Razor since it will never be inserted into the page pipeline (which may even not exist at all
+                        // if we're running MVC).
+                        //
+                        // I'm sure there's more things that will get lost with this context changing but I guess we'll figure
+                        // those out as we go along. One thing we lose is the content type response output.
+                        // http://issues.umbraco.org/issue/U4-1599 if it is setup during the macro execution. So
+                        // here we'll save the content type response and reset it after execute is called.
+
+                        var contentType = _umbracoContextAccessor.UmbracoContext.HttpContext.Response.ContentType;
+                        var traceIsEnabled = containerPage.Trace.IsEnabled;
+                        containerPage.Trace.IsEnabled = false;
+                        _umbracoContextAccessor.UmbracoContext.HttpContext.Server.Execute(containerPage, output, true);
+                        containerPage.Trace.IsEnabled = traceIsEnabled;
+                        //reset the content type
+                        _umbracoContextAccessor.UmbracoContext.HttpContext.Response.ContentType = contentType;
+
+                        //Now, we need to ensure that local links are parsed
+                        html = TemplateUtilities.ParseInternalLinks(output.ToString(), _umbracoContextAccessor.UmbracoContext.UrlProvider);
+                    }
                 }
+                    
             }
 
             return new HtmlString(html);
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 04a9658ee542..a1b443c3ee91 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -281,29 +281,7 @@ public bool IsDebug
                         || string.IsNullOrEmpty(request["umbdebug"]) == false);
             }
         }
-
-        /// <summary>
-        /// Gets the current page ID, or <c>null</c> if no page ID is available (e.g. a custom page).
-        /// </summary>
-        public int? PageId
-        {
-            get
-            {
-                try
-                {
-                    // This was changed but the comments used to refer to
-                    // macros in the backoffice not working with this Id
-                    // it's probably not a problem any more though. Old comment:
-                    // https://github.com/umbraco/Umbraco-CMS/blob/7a615133ff9de84ee667fb7794169af65e2b4d7a/src/Umbraco.Web/UmbracoContext.cs#L256
-                    return Current.PublishedRequest.PublishedContent.Id;
-                }
-                catch
-                {
-                    return null;
-                }
-            }
-        }
-
+        
         /// <summary>
         /// Determines whether the current user is in a preview mode and browsing the site (ie. not in the admin UI)
         /// </summary>
@@ -312,7 +290,7 @@ public bool InPreviewMode
             get
             {
                 if (_previewing.HasValue == false) DetectPreviewMode();
-                return _previewing.Value;
+                return _previewing ?? false;
             }
             private set => _previewing = value;
         }
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 9d55299ecc52..73e93300ec8f 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -8,105 +8,76 @@
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
-using Umbraco.Core.Composing;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
-using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web
 {
-    using Examine = global::Examine;
-
     /// <summary>
     /// A helper class that provides many useful methods and functionality for using Umbraco in templates
     /// </summary>
-    public class UmbracoHelper : IUmbracoComponentRenderer
+    /// <remarks>
+    /// This object is a request based lifetime
+    /// </remarks>
+    public class UmbracoHelper
     {
         private static readonly HtmlStringUtilities StringUtilities = new HtmlStringUtilities();
 
         private readonly UmbracoContext _umbracoContext;
-        private readonly IPublishedContent _currentPage;
-        private readonly ServiceContext _services;
+        private IPublishedContent _currentPage;
         
-        private IUmbracoComponentRenderer _componentRenderer;
-        private IPublishedContentQuery _query;
-        private MembershipHelper _membershipHelper;
-        private ITagQuery _tag;
+        private readonly IUmbracoComponentRenderer _componentRenderer;
+        private readonly ICultureDictionaryFactory _cultureDictionaryFactory;
         private ICultureDictionary _cultureDictionary;
 
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoHelper"/> class.
+        /// Initializes a new instance of <see cref="UmbracoHelper"/>.
         /// </summary>
-        /// <remarks>For tests.</remarks>
-        internal UmbracoHelper(UmbracoContext umbracoContext, IPublishedContent content,
-            ITagQuery tagQuery,
-            ICultureDictionary cultureDictionary,
+        /// <param name="umbracoContext">An Umbraco context.</param>
+        /// <param name="tagQuery"></param>
+        /// <param name="cultureDictionary"></param>
+        /// <param name="componentRenderer"></param>
+        /// <param name="publishedContentQuery"></param>
+        /// <param name="membershipHelper"></param>
+        /// <remarks>Sets the current page to the context's published content request's content item.</remarks>
+        public UmbracoHelper(UmbracoContext umbracoContext, ITagQuery tagQuery,
+            ICultureDictionaryFactory cultureDictionary,
             IUmbracoComponentRenderer componentRenderer,
-            MembershipHelper membershipHelper,
-            ServiceContext services)
+            IPublishedContentQuery publishedContentQuery,
+            MembershipHelper membershipHelper)
         {
             _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
-            _tag = tagQuery ?? throw new ArgumentNullException(nameof(tagQuery));
-            _cultureDictionary = cultureDictionary ?? throw new ArgumentNullException(nameof(cultureDictionary));
+            TagQuery = tagQuery ?? throw new ArgumentNullException(nameof(tagQuery));
+            _cultureDictionaryFactory = cultureDictionary ?? throw new ArgumentNullException(nameof(cultureDictionary));
             _componentRenderer = componentRenderer ?? throw new ArgumentNullException(nameof(componentRenderer));
-            _membershipHelper = membershipHelper ?? throw new ArgumentNullException(nameof(membershipHelper));
-            _currentPage = content ?? throw new ArgumentNullException(nameof(content));
-            _services = services ?? throw new ArgumentNullException(nameof(services));
+            MembershipHelper = membershipHelper ?? throw new ArgumentNullException(nameof(membershipHelper));
+            ContentQuery = publishedContentQuery ?? throw new ArgumentNullException(nameof(publishedContentQuery));
+
+            if (_umbracoContext.IsFrontEndUmbracoRequest)
+                _currentPage = _umbracoContext.PublishedRequest.PublishedContent;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoHelper"/> class.
+        /// Initializes a new empty instance of <see cref="UmbracoHelper"/>.
         /// </summary>
         /// <remarks>For tests - nothing is initialized.</remarks>
         internal UmbracoHelper()
         { }
 
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoHelper"/> class with an Umbraco context
-        /// and a specific content item.
-        /// </summary>
-        /// <param name="umbracoContext">An Umbraco context.</param>
-        /// <param name="content">A content item.</param>
-        /// <param name="services">A services context.</param>
-        /// <remarks>Sets the current page to the supplied content item.</remarks>
-        public UmbracoHelper(UmbracoContext umbracoContext, ServiceContext services, IPublishedContent content)
-            : this(umbracoContext, services)
-        {
-            _currentPage = content ?? throw new ArgumentNullException(nameof(content));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoHelper"/> class with an Umbraco context.
-        /// </summary>
-        /// <param name="umbracoContext">An Umbraco context.</param>
-        /// <param name="services">A services context.</param>
-        /// <remarks>Sets the current page to the context's published content request's content item.</remarks>
-        public UmbracoHelper(UmbracoContext umbracoContext, ServiceContext services)
-        {
-            _services = services ?? throw new ArgumentNullException(nameof(services));
-            _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
-            if (_umbracoContext.IsFrontEndUmbracoRequest)
-                _currentPage = _umbracoContext.PublishedRequest.PublishedContent;
-        }
-
         #endregion
 
         /// <summary>
         /// Gets the tag context.
         /// </summary>
-        public ITagQuery TagQuery => _tag ??
-            (_tag = new TagQuery(_services.TagService, ContentQuery));
+        public ITagQuery TagQuery { get; }
 
         /// <summary>
         /// Gets the query context.
         /// </summary>
-        public IPublishedContentQuery ContentQuery => _query ??
-            (_query = new PublishedContentQuery(UmbracoContext.ContentCache, UmbracoContext.MediaCache, UmbracoContext.VariationContextAccessor));
+        public IPublishedContentQuery ContentQuery { get; }
 
         /// <summary>
         /// Gets the Umbraco context.
@@ -124,8 +95,7 @@ public UmbracoContext UmbracoContext
         /// <summary>
         /// Gets the membership helper.
         /// </summary>
-        public MembershipHelper MembershipHelper => _membershipHelper
-            ?? (_membershipHelper = Current.Factory.GetInstance<MembershipHelper>());
+        public MembershipHelper MembershipHelper { get; }
 
         /// <summary>
         /// Gets the url provider.
@@ -133,14 +103,7 @@ public UmbracoContext UmbracoContext
         public UrlProvider UrlProvider => UmbracoContext.UrlProvider;
 
         /// <summary>
-        /// Gets the component renderer.
-        /// </summary>
-        public IUmbracoComponentRenderer UmbracoComponentRenderer => _componentRenderer
-            ?? (_componentRenderer = new UmbracoComponentRenderer(UmbracoContext));
-
-        /// <summary>
-        /// Returns the current <seealso cref="IPublishedContent"/> item
-        /// assigned to the UmbracoHelper.
+        /// Gets (or sets) the current <see cref="IPublishedContent"/> item assigned to the UmbracoHelper.
         /// </summary>
         /// <remarks>
         /// <para>
@@ -173,17 +136,18 @@ public IPublishedContent AssignedContentItem
                     );
 
             }
+            set => _currentPage = value;
         }
 
         /// <summary>
         /// Renders the template for the specified pageId and an optional altTemplateId
         /// </summary>
-        /// <param name="pageId"></param>
+        /// <param name="contentId"></param>
         /// <param name="altTemplateId">If not specified, will use the template assigned to the node</param>
         /// <returns></returns>
-        public IHtmlString RenderTemplate(int pageId, int? altTemplateId = null)
+        public IHtmlString RenderTemplate(int contentId, int? altTemplateId = null)
         {
-            return UmbracoComponentRenderer.RenderTemplate(pageId, altTemplateId);
+            return _componentRenderer.RenderTemplate(contentId, altTemplateId);
         }
 
         #region RenderMacro
@@ -195,7 +159,7 @@ public IHtmlString RenderTemplate(int pageId, int? altTemplateId = null)
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias)
         {
-            return UmbracoComponentRenderer.RenderMacro(alias, new { });
+            return _componentRenderer.RenderMacro(_umbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, new { });
         }
 
         /// <summary>
@@ -206,7 +170,7 @@ public IHtmlString RenderMacro(string alias)
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias, object parameters)
         {
-            return UmbracoComponentRenderer.RenderMacro(alias, parameters.ToDictionary<object>());
+            return _componentRenderer.RenderMacro(_umbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, parameters.ToDictionary<object>());
         }
 
         /// <summary>
@@ -217,7 +181,7 @@ public IHtmlString RenderMacro(string alias, object parameters)
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters)
         {
-            return UmbracoComponentRenderer.RenderMacro(alias, parameters);
+            return _componentRenderer.RenderMacro(_umbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, parameters);
         }
 
         #endregion
@@ -254,7 +218,7 @@ public string GetDictionaryValue(string key, string altText)
         /// Returns the ICultureDictionary for access to dictionary items
         /// </summary>
         public ICultureDictionary CultureDictionary => _cultureDictionary
-            ?? (_cultureDictionary = Current.CultureDictionaryFactory.CreateDictionary());
+            ?? (_cultureDictionary = _cultureDictionaryFactory.CreateDictionary());
 
         #endregion
 
@@ -287,6 +251,7 @@ public bool MemberIsLoggedOn()
         /// Gets the url of a content identified by its identifier.
         /// </summary>
         /// <param name="contentId">The content identifier.</param>
+        /// <param name="culture"></param>
         /// <returns>The url for the content.</returns>
         public string Url(int contentId, string culture = null)
         {
@@ -454,11 +419,9 @@ public IEnumerable<IPublishedContent> Content(params object[] ids)
         private IEnumerable<IPublishedContent> ContentForObjects(IEnumerable<object> ids)
         {
             var idsA = ids.ToArray();
-            IEnumerable<int> intIds;
-            if (ConvertIdsObjectToInts(idsA, out intIds))
+            if (ConvertIdsObjectToInts(idsA, out var intIds))
                 return ContentQuery.Content(intIds);
-            IEnumerable<Guid> guidIds;
-            if (ConvertIdsObjectToGuids(idsA, out guidIds))
+            if (ConvertIdsObjectToGuids(idsA, out var guidIds))
                 return ContentQuery.Content(guidIds);
             return Enumerable.Empty<IPublishedContent>();
         }
@@ -638,12 +601,7 @@ public IPublishedContent Media(Udi id)
 
         public IPublishedContent Media(Guid id)
         {
-            // TODO: This is horrible but until the media cache properly supports GUIDs we have no choice here and
-            // currently there won't be any way to add this method correctly to `ITypedPublishedContentQuery` without breaking an interface and adding GUID support for media
-
-            var entityService = Current.Services.EntityService; // TODO: inject
-            var mediaAttempt = entityService.GetId(id, UmbracoObjectTypes.Media);
-            return mediaAttempt.Success ? ContentQuery.Media(mediaAttempt.Result) : null;
+            return ContentQuery.Media(id);
         }
 
         /// <summary>
@@ -696,12 +654,10 @@ public IEnumerable<IPublishedContent> Media(params object[] ids)
         private IEnumerable<IPublishedContent> MediaForObjects(IEnumerable<object> ids)
         {
             var idsA = ids.ToArray();
-            IEnumerable<int> intIds;
-            if (ConvertIdsObjectToInts(idsA, out intIds))
+            if (ConvertIdsObjectToInts(idsA, out var intIds))
                 return ContentQuery.Media(intIds);
-            //IEnumerable<Guid> guidIds;
-            //if (ConvertIdsObjectToGuids(idsA, out guidIds))
-            //    return ContentQuery.Media(guidIds);
+            if (ConvertIdsObjectToGuids(idsA, out var guidIds))
+                return ContentQuery.Media(guidIds);
             return Enumerable.Empty<IPublishedContent>();
         }
 
diff --git a/src/Umbraco.Web/UmbracoHttpHandler.cs b/src/Umbraco.Web/UmbracoHttpHandler.cs
index 336b53e9e083..eca3fc303e23 100644
--- a/src/Umbraco.Web/UmbracoHttpHandler.cs
+++ b/src/Umbraco.Web/UmbracoHttpHandler.cs
@@ -14,19 +14,16 @@ public abstract class UmbracoHttpHandler : IHttpHandler
         private UrlHelper _url;
 
         protected UmbracoHttpHandler()
-            : this(Current.UmbracoContext, Current.Services)
+            : this(Current.UmbracoContext, Current.UmbracoHelper, Current.Services, Current.ProfilingLogger)
         { }
 
-        protected UmbracoHttpHandler(UmbracoContext umbracoContext, ServiceContext services)
+        protected UmbracoHttpHandler(UmbracoContext umbracoContext, UmbracoHelper umbracoHelper, ServiceContext service, IProfilingLogger plogger)
         {
-            if (umbracoContext == null) throw new ArgumentNullException(nameof(umbracoContext));
             UmbracoContext = umbracoContext;
-            Umbraco = new UmbracoHelper(umbracoContext, services);
-
-            // TODO: inject somehow
-            Logger = Current.Logger;
-            ProfilingLogger = Current.ProfilingLogger;
-            Services = Current.Services;
+            Logger = plogger;
+            ProfilingLogger = plogger;
+            Services = service;
+            Umbraco = umbracoHelper;
         }
 
         public abstract void ProcessRequest(HttpContext context);
diff --git a/src/Umbraco.Web/UmbracoWebService.cs b/src/Umbraco.Web/UmbracoWebService.cs
index b970a0e8c2ef..781e521fcd73 100644
--- a/src/Umbraco.Web/UmbracoWebService.cs
+++ b/src/Umbraco.Web/UmbracoWebService.cs
@@ -21,15 +21,19 @@ public abstract class UmbracoWebService : WebService
     {
         private UrlHelper _url;
 
-        protected UmbracoWebService()
+        protected UmbracoWebService(IProfilingLogger profilingLogger, UmbracoContext umbracoContext, UmbracoHelper umbraco, ServiceContext services, IGlobalSettings globalSettings)
         {
-            UmbracoContext = Current.UmbracoContext;
-            Umbraco = new UmbracoHelper(UmbracoContext, Current.Services);
+            Logger = profilingLogger;
+            ProfilingLogger = profilingLogger;
+            UmbracoContext = umbracoContext;
+            Umbraco = umbraco;
+            Services = services;
+            GlobalSettings = globalSettings;
+        }
 
-            Logger = Current.Logger;
-            ProfilingLogger = Current.ProfilingLogger;
-            Services = Current.Services;
-            GlobalSettings = Current.Configs.Global();
+        protected UmbracoWebService()
+        : this(Current.ProfilingLogger, Current.UmbracoContext, Current.UmbracoHelper, Current.Services, Current.Configs.Global())
+        {
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiController.cs b/src/Umbraco.Web/WebApi/UmbracoApiController.cs
index 31778d4b0c2a..2091d4720257 100644
--- a/src/Umbraco.Web/WebApi/UmbracoApiController.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoApiController.cs
@@ -13,18 +13,12 @@ namespace Umbraco.Web.WebApi
     /// </summary>
     public abstract class UmbracoApiController : UmbracoApiControllerBase, IDiscoverable
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoApiController"/> with auto dependencies.
-        /// </summary>
-        /// <remarks>Dependencies are obtained from the <see cref="Current"/> service locator.</remarks>
         protected UmbracoApiController()
-        { }
+        {
+        }
 
-        /// <summary>
-        /// Initialize a new instance of the <see cref="UmbracoApiController"/> with all its dependencies.
-        /// </summary>
-        protected UmbracoApiController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
-        { }
+        protected UmbracoApiController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
     }
 }
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
index 7e32296e1293..c6ac35267d4a 100644
--- a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
@@ -21,8 +21,6 @@ namespace Umbraco.Web.WebApi
     [FeatureAuthorize]
     public abstract class UmbracoApiControllerBase : ApiController
     {
-        private UmbracoHelper _umbracoHelper;
-
         // note: all Umbraco controllers have two constructors: one with all dependencies, which should be used,
         // and one with auto dependencies, ie no dependencies - and then dependencies are automatically obtained
         // here from the Current service locator - this is obviously evil, but it allows us to add new dependencies
@@ -40,14 +38,15 @@ protected UmbracoApiControllerBase()
                 Current.Factory.GetInstance<ServiceContext>(),
                 Current.Factory.GetInstance<AppCaches>(),
                 Current.Factory.GetInstance<IProfilingLogger>(),
-                Current.Factory.GetInstance<IRuntimeState>()
+                Current.Factory.GetInstance<IRuntimeState>(),
+                Current.Factory.GetInstance<UmbracoHelper>()
             )
         { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UmbracoApiControllerBase"/> class with all its dependencies.
         /// </summary>
-        protected UmbracoApiControllerBase(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
+        protected UmbracoApiControllerBase(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
         {
             GlobalSettings = globalSettings;
             SqlContext = sqlContext;
@@ -56,6 +55,7 @@ protected UmbracoApiControllerBase(IGlobalSettings globalSettings, UmbracoContex
             Logger = logger;
             RuntimeState = runtimeState;
             UmbracoContext = umbracoContext;
+            Umbraco = umbracoHelper;
         }
 
         /// <summary>
@@ -112,9 +112,8 @@ protected UmbracoApiControllerBase(IGlobalSettings globalSettings, UmbracoContex
         /// <summary>
         /// Gets the Umbraco helper.
         /// </summary>
-        public UmbracoHelper Umbraco => _umbracoHelper
-            ?? (_umbracoHelper = new UmbracoHelper(UmbracoContext, Services));
-
+        public UmbracoHelper Umbraco { get; }
+    
         /// <summary>
         /// Gets the web security helper.
         /// </summary>
diff --git a/src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs b/src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
index 039e462e0be0..e188fb4fef95 100644
--- a/src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
@@ -30,19 +30,13 @@ public abstract class UmbracoAuthorizedApiController : UmbracoApiController
     {
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoAuthorizedApiController"/> with auto dependencies.
-        /// </summary>
-        /// <remarks>Dependencies are obtained from the <see cref="Current"/> service locator.</remarks>
         protected UmbracoAuthorizedApiController()
-        { }
+        {
+        }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoAuthorizedApiController"/> class with all its dependencies.
-        /// </summary>
-        protected UmbracoAuthorizedApiController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState)
-            : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState)
-        { }
+        protected UmbracoAuthorizedApiController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
 
         /// <summary>
         /// Gets the user manager.

From 2f1c39ab96936db1281f9d99ae0ba2f72ac29d57 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 15:44:39 +1100
Subject: [PATCH 207/421] Removes the old/strange "pageElements" thing, it's no
 longer needed

---
 src/Umbraco.Web/Editors/MacroRenderingController.cs |  6 ------
 src/Umbraco.Web/Macros/MacroRenderer.cs             |  4 ----
 src/Umbraco.Web/Routing/PublishedRouter.cs          |  7 +------
 src/Umbraco.Web/Templates/TemplateRenderer.cs       | 13 ++++---------
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index f88a84dd7203..0fd88e2b1e13 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -139,12 +139,6 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
                 _variationContextAccessor.VariationContext = new VariationContext(Thread.CurrentThread.CurrentCulture.Name);
             }
 
-
-            //fixme: don't think we need this anymore
-            var legacyPage = new PublishedContentHashtableConverter(doc, _variationContextAccessor);
-            UmbracoContext.HttpContext.Items["pageElements"] = legacyPage.Elements;
-            UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = null;
-
             var result = Request.CreateResponse();
             //need to create a specific content result formatted as HTML since this controller has been configured
             //with only json formatters.
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index b0ea90f9c14c..9736aa283be6 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -195,10 +195,6 @@ private static void UpdateMacroModelProperties(MacroModel model, IDictionary<str
 
         #region Render/Execute
 
-        // still, this is ugly. The macro should have a Content property
-        // referring to IPublishedContent we're rendering the macro against,
-        // this is all so convoluted ;-(
-
         public MacroContent Render(string macroAlias, IPublishedContent content, IDictionary<string, object> macroParams)
         {
             var m = _macroService.GetByAlias(macroAlias);
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 14c36198d870..27baf865220f 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -207,9 +207,6 @@ public bool ConfigureRequest(PublishedRequest frequest)
             // handlers like default.aspx will want it and most macros currently need it
             frequest.LegacyContentHashTable = new PublishedContentHashtableConverter(frequest);
 
-            // used by many legacy objects
-            frequest.UmbracoContext.HttpContext.Items["pageElements"] = frequest.LegacyContentHashTable.Elements;
-
             return true;
         }
 
@@ -252,9 +249,7 @@ public void UpdateRequestOnMissingTemplate(PublishedRequest request)
             // assign the legacy page back to the docrequest
             // handlers like default.aspx will want it and most macros currently need it
             request.LegacyContentHashTable = new PublishedContentHashtableConverter(request);
-
-            // this is used by many legacy objects
-            request.UmbracoContext.HttpContext.Items["pageElements"] = request.LegacyContentHashTable.Elements;
+            
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index facafdea635f..dc8ca0b16d4f 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -97,7 +97,7 @@ public void Render(int pageId, int? altTemplateId, StringWriter writer)
 
             //First, save all of the items locally that we know are used in the chain of execution, we'll need to restore these
             //after this page has rendered.
-            SaveExistingItems(out var oldPageElements, out var oldPublishedRequest, out var oldAltTemplate);
+            SaveExistingItems(out var oldPublishedRequest, out var oldAltTemplate);
 
             try
             {
@@ -110,7 +110,7 @@ public void Render(int pageId, int? altTemplateId, StringWriter writer)
             finally
             {
                 //restore items on context objects to continuing rendering the parent template
-                RestoreItems(oldPageElements, oldPublishedRequest, oldAltTemplate);
+                RestoreItems(oldPublishedRequest, oldAltTemplate);
             }
 
         }
@@ -172,10 +172,7 @@ private string RenderUmbracoRequestToString(RequestContext requestContext)
 
         private void SetNewItemsOnContextObjects(PublishedRequest request)
         {
-            // handlers like default.aspx will want it and most macros currently need it
-            request.LegacyContentHashTable = new PublishedContentHashtableConverter(request);
             //now, set the new ones for this page execution
-            _umbracoContextAccessor.UmbracoContext.HttpContext.Items["pageElements"] = request.LegacyContentHashTable.Elements;
             _umbracoContextAccessor.UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = null;
             _umbracoContextAccessor.UmbracoContext.PublishedRequest = request;
         }
@@ -183,11 +180,10 @@ private void SetNewItemsOnContextObjects(PublishedRequest request)
         /// <summary>
         /// Save all items that we know are used for rendering execution to variables so we can restore after rendering
         /// </summary>
-        private void SaveExistingItems(out object oldPageElements, out PublishedRequest oldPublishedRequest, out object oldAltTemplate)
+        private void SaveExistingItems(out PublishedRequest oldPublishedRequest, out object oldAltTemplate)
         {
             //Many objects require that these legacy items are in the http context items... before we render this template we need to first
             //save the values in them so that we can re-set them after we render so the rest of the execution works as per normal
-            oldPageElements = _umbracoContextAccessor.UmbracoContext.HttpContext.Items["pageElements"];
             oldPublishedRequest = _umbracoContextAccessor.UmbracoContext.PublishedRequest;
             oldAltTemplate = _umbracoContextAccessor.UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate];
         }
@@ -195,10 +191,9 @@ private void SaveExistingItems(out object oldPageElements, out PublishedRequest
         /// <summary>
         /// Restores all items back to their context's to continue normal page rendering execution
         /// </summary>
-        private void RestoreItems(object oldPageElements, PublishedRequest oldPublishedRequest, object oldAltTemplate)
+        private void RestoreItems(PublishedRequest oldPublishedRequest, object oldAltTemplate)
         {
             _umbracoContextAccessor.UmbracoContext.PublishedRequest = oldPublishedRequest;
-            _umbracoContextAccessor.UmbracoContext.HttpContext.Items["pageElements"] = oldPageElements;
             _umbracoContextAccessor.UmbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = oldAltTemplate;
         }
     }

From f9e673ca4c7c26b51c7adcd0b3341d31c8fbc332 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 16:54:17 +1100
Subject: [PATCH 208/421] Updates tinymce, adds back the styles for the
 rendered macro in the rte, properly uses tinymce's noneditable plugin and
 removes a ton of code relating to the old work arounds we had, now just need
 to get the macro re-rendering

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 381 ++++++++++++++----
 src/Umbraco.Web.UI.Client/package.json        |   2 +-
 .../src/common/services/tinymce.service.js    | 184 +--------
 src/Umbraco.Web.UI.Client/src/less/rte.less   |   9 +
 4 files changed, 317 insertions(+), 259 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index fe657ae4700e..207eba38c528 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1104,6 +1104,7 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1112,7 +1113,8 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1523,6 +1525,7 @@
       "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1532,13 +1535,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1554,6 +1559,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1742,7 +1748,8 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1761,6 +1768,7 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1772,19 +1780,22 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1800,6 +1811,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1808,13 +1820,15 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1935,7 +1949,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1948,6 +1963,7 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1959,7 +1975,8 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -2220,7 +2237,8 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2316,6 +2334,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2528,6 +2547,7 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2782,6 +2802,7 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2799,6 +2820,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2807,13 +2829,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2825,6 +2849,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2834,6 +2859,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2843,6 +2869,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2856,6 +2883,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2871,13 +2899,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2889,13 +2919,15 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2907,19 +2939,22 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2928,13 +2963,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2944,6 +2981,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -2964,13 +3002,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -2981,6 +3021,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -2996,6 +3037,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3005,6 +3047,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3014,6 +3057,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3024,6 +3068,7 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3034,6 +3079,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3046,6 +3092,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3057,6 +3104,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3084,6 +3132,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3097,19 +3146,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3122,6 +3174,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3132,6 +3185,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3144,6 +3198,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3158,19 +3213,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3183,6 +3241,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3193,6 +3252,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3205,6 +3265,7 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3218,19 +3279,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3243,6 +3307,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3253,6 +3318,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3265,6 +3331,7 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3280,6 +3347,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3292,7 +3360,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3491,6 +3560,7 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3514,6 +3584,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3522,13 +3593,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3540,6 +3613,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3549,6 +3623,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3558,6 +3633,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3571,6 +3647,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3586,13 +3663,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3604,13 +3683,15 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3622,19 +3703,22 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3643,13 +3727,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3659,6 +3745,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3679,13 +3766,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3696,6 +3785,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3711,6 +3801,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3720,6 +3811,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3729,6 +3821,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3739,6 +3832,7 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3749,6 +3843,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3761,6 +3856,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3772,6 +3868,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3814,6 +3911,7 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -3826,6 +3924,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -3834,13 +3933,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3850,6 +3951,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3865,6 +3967,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3876,6 +3979,7 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -3885,7 +3989,8 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -4825,6 +4930,7 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4872,13 +4978,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5125,7 +5233,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5189,7 +5298,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5210,12 +5320,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5230,17 +5342,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5357,7 +5472,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5369,6 +5485,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5383,6 +5500,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5390,12 +5508,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5414,6 +5534,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5494,7 +5615,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5506,6 +5628,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5591,7 +5714,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5627,6 +5751,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5646,6 +5771,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5689,12 +5815,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5730,6 +5858,7 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -6036,6 +6165,7 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6059,6 +6189,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6067,19 +6198,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
+          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6089,6 +6223,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6104,6 +6239,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6123,7 +6259,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6419,6 +6556,7 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6430,13 +6568,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6452,6 +6592,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -7069,6 +7210,7 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7081,13 +7223,15 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7097,6 +7241,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -7927,7 +8072,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8062,7 +8208,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8075,7 +8222,8 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8141,7 +8289,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8171,7 +8320,8 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8201,7 +8351,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8222,7 +8373,8 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8234,7 +8386,8 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8252,7 +8405,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8573,6 +8727,7 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8581,13 +8736,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8603,6 +8760,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -8908,7 +9066,8 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lodash.isobject": {
       "version": "2.4.1",
@@ -9105,7 +9264,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9501,7 +9661,8 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12551,7 +12712,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -13262,7 +13424,8 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13394,6 +13557,7 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13406,6 +13570,7 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13415,13 +13580,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13437,6 +13604,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14053,6 +14221,7 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
+      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14198,7 +14367,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -14703,7 +14873,8 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -14747,6 +14918,7 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -14757,6 +14929,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -14765,13 +14938,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14787,6 +14962,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14803,7 +14979,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "streamroller": {
       "version": "0.7.0",
@@ -14981,6 +15158,7 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -14994,13 +15172,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15014,6 +15194,7 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15022,13 +15203,15 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -15059,6 +15242,7 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15092,6 +15276,7 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15100,13 +15285,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15119,7 +15306,8 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -15181,6 +15369,7 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15196,6 +15385,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15204,13 +15394,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15220,6 +15412,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15235,6 +15428,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15333,6 +15527,7 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15357,7 +15552,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "timsort": {
       "version": "0.3.0",
@@ -15402,9 +15598,9 @@
       }
     },
     "tinymce": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.0.tgz",
-      "integrity": "sha512-hrPeCLXY/sVCo3i64CTW8P5xbDiEI8Uii/vWpcmQWAMhex6GWWd2U+L8WIMj5tKKGdfcIQAJfpfQthc/92bcKw=="
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.2.tgz",
+      "integrity": "sha512-ZRoTGG4GAsOI73QPSNkabO7nkoYw9H6cglRB44W2mMkxSiqxYi8WJlgkUphk0fDqo6ZD6r3E+NSP4UHxF2lySg=="
     },
     "tmp": {
       "version": "0.0.33",
@@ -15420,6 +15616,7 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15429,6 +15626,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15445,7 +15643,8 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15524,6 +15723,7 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15772,7 +15972,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "upath": {
       "version": "1.1.0",
@@ -15800,6 +16001,7 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -15885,7 +16087,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -15930,6 +16133,7 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -15939,19 +16143,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15967,6 +16174,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16106,6 +16314,7 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
+      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16196,6 +16405,7 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16293,6 +16503,7 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 3f4314db0e29..f24275420ae0 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -39,7 +39,7 @@
     "npm": "^6.4.1",
     "signalr": "2.4.0",
     "spectrum-colorpicker": "1.8.0",
-    "tinymce": "4.9.0",
+    "tinymce": "4.9.2",
     "typeahead.js": "0.11.1",
     "underscore": "1.9.1"
   },
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 0ba795626a0f..b2ec94fffe23 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -502,96 +502,22 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 onPostRender: function () {
 
                     var ctrl = this;
-                    var isOnMacroElement = false;
 
 					/**
-					 if the selection comes from a different element that is not the macro's
-					 we need to check if the selection includes part of the macro, if so we'll force the selection
-					 to clear to the next element since if people can select part of the macro markup they can then modify it.
-					*/
-                    function handleSelectionChange() {
-
-                        if (!editor.selection.isCollapsed()) {
-                            var endSelection = tinymce.activeEditor.selection.getEnd();
-                            var startSelection = tinymce.activeEditor.selection.getStart();
-                            //don't proceed if it's an entire element selected
-                            if (endSelection !== startSelection) {
-
-                                //if the end selection is a macro then move the cursor
-                                //NOTE: we don't have to handle when the selection comes from a previous parent because
-                                // that is automatically taken care of with the normal onNodeChanged logic since the
-                                // evt.element will be the macro once it becomes part of the selection.
-                                var $testForMacro = $(endSelection).closest(".umb-macro-holder");
-                                if ($testForMacro.length > 0) {
-
-                                    //it came from before so move after, if there is no after then select ourselves
-                                    var next = $testForMacro.next();
-                                    if (next.length > 0) {
-                                        editor.selection.setCursorLocation($testForMacro.next().get(0));
-                                    } else {
-                                        selectMacroElement($testForMacro.get(0));
-                                    }
-
-                                }
-                            }
-                        }
-                    }
-
-                    /** helper method to select the macro element */
-                    function selectMacroElement(macroElement) {
-
-                        // move selection to top element to ensure we can't edit this
-                        editor.selection.select(macroElement);
-
-                        // check if the current selection *is* the element (ie bug)
-                        var currentSelection = editor.selection.getStart();
-                        if (tinymce.isIE) {
-                            if (!editor.dom.hasClass(currentSelection, 'umb-macro-holder')) {
-                                while (!editor.dom.hasClass(currentSelection, 'umb-macro-holder') && currentSelection.parentNode) {
-                                    currentSelection = currentSelection.parentNode;
-                                }
-                                editor.selection.select(currentSelection);
-                            }
-                        }
-                    }
-
-					/**
-					 * Add a node change handler, test if we're editing a macro and select the whole thing, then set our isOnMacroElement flag.
-					 * If we change the selection inside this method, then we end up in an infinite loop, so we have to remove ourselves
-					 * from the event listener before changing selection, however, it seems that putting a break point in this method
-					 * will always cause an 'infinite' loop as the caret keeps changing.
-					 *
-					 * TODO: I don't think we need this anymore with recent tinymce fixes: https://www.tiny.cloud/docs/plugins/noneditable/
+					 * Check if the macro is currently selected and toggle the menu button
 					 */
                     function onNodeChanged(evt) {
 
                         //set our macro button active when on a node of class umb-macro-holder
                         var $macroElement = $(evt.element).closest(".umb-macro-holder");
 
-                        handleSelectionChange();
-
-                        //set the button active
+                        //set the button active/inactive
                         ctrl.active($macroElement.length !== 0);
-
-                        if ($macroElement.length > 0) {
-                            var macroElement = $macroElement.get(0);
-
-                            //remove the event listener before re-selecting
-                            editor.off('NodeChange', onNodeChanged);
-
-                            selectMacroElement(macroElement);
-
-                            //set the flag
-                            isOnMacroElement = true;
-
-                            //re-add the event listener
-                            editor.on('NodeChange', onNodeChanged);
-                        } else {
-                            isOnMacroElement = false;
-                        }
-
                     }
 
+                    //NOTE: This could be another way to deal with the active/inactive state
+                    //editor.on('ObjectSelected', function (e) {});
+
                     /** when the contents load we need to find any macros declared and load in their content */
                     editor.on("LoadContent", function (o) {
 
@@ -602,102 +528,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                     });
 
-                    /**
-                     * This prevents any other commands from executing when the current element is the macro so the content cannot be edited
-                     *
-                     * TODO: I don't think we need this anymore with recent tinymce fixes: https://www.tiny.cloud/docs/plugins/noneditable/
-                     */
-                    editor.on('BeforeExecCommand', function (o) {
-                        if (isOnMacroElement) {
-                            if (o.preventDefault) {
-                                o.preventDefault();
-                            }
-                            if (o.stopImmediatePropagation) {
-                                o.stopImmediatePropagation();
-                            }
-                            return;
-                        }
-                    });
-
-                    /**
-                     * This double checks and ensures you can't paste content into the rendered macro
-                     *
-                     * TODO: I don't think we need this anymore with recent tinymce fixes: https://www.tiny.cloud/docs/plugins/noneditable/
-                     */
-                    editor.on("Paste", function (o) {
-                        if (isOnMacroElement) {
-                            if (o.preventDefault) {
-                                o.preventDefault();
-                            }
-                            if (o.stopImmediatePropagation) {
-                                o.stopImmediatePropagation();
-                            }
-                            return;
-                        }
-                    });
-
                     //set onNodeChanged event listener
                     editor.on('NodeChange', onNodeChanged);
 
-					/**
-					 * Listen for the keydown in the editor, we'll check if we are currently on a macro element, if so
-					 * we'll check if the key down is a supported key which requires an action, otherwise we ignore the request
-					 * so the macro cannot be edited.
-					 *
-					 * TODO: I don't think we need this anymore with recent tinymce fixes: https://www.tiny.cloud/docs/plugins/noneditable/
-					 */
-                    editor.on('KeyDown', function (e) {
-                        if (isOnMacroElement) {
-                            var macroElement = editor.selection.getNode();
-
-                            //get the 'real' element (either p or the real one)
-                            macroElement = getRealMacroElem(macroElement);
-
-                            //prevent editing
-                            e.preventDefault();
-                            e.stopPropagation();
-
-                            var moveSibling = function (element, isNext) {
-                                var $e = $(element);
-                                var $sibling = isNext ? $e.next() : $e.prev();
-                                if ($sibling.length > 0) {
-                                    editor.selection.select($sibling.get(0));
-                                    editor.selection.collapse(true);
-                                } else {
-                                    //if we're moving previous and there is no sibling, then lets recurse and just select the next one
-                                    if (!isNext) {
-                                        moveSibling(element, true);
-                                        return;
-                                    }
-
-                                    //if there is no sibling we'll generate a new p at the end and select it
-                                    editor.setContent(editor.getContent() + "<p>&nbsp;</p>");
-                                    editor.selection.select($(editor.dom.getRoot()).children().last().get(0));
-                                    editor.selection.collapse(true);
-
-                                }
-                            };
-
-                            //supported keys to move to the next or prev element (13-enter, 27-esc, 38-up, 40-down, 39-right, 37-left)
-                            //supported keys to remove the macro (8-backspace, 46-delete)
-                            // TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
-                            if ($.inArray(e.keyCode, [13, 40, 39]) !== -1) {
-                                //move to next element
-                                moveSibling(macroElement, true);
-                            } else if ($.inArray(e.keyCode, [27, 38, 37]) !== -1) {
-                                //move to prev element
-                                moveSibling(macroElement, false);
-                            } else if ($.inArray(e.keyCode, [8, 46]) !== -1) {
-                                //delete macro element
-
-                                //move first, then delete
-                                moveSibling(macroElement, false);
-                                editor.dom.remove(macroElement);
-                            }
-                            return;
-                        }
-                    });
-
                 },
 
                 /** The insert macro button click event handler */
@@ -739,6 +572,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
         insertMacroInEditor: function (editor, macroObject) {
 
+            //Important note: the TinyMce plugin "noneditable" is used here so that the macro cannot be edited,
+            // for this to work the mceNonEditable class needs to come last and we also need to use the attribute contenteditable = false
+            // (even though all the docs and examples say that is not necessary)
+
             //put the macro syntax in comments, we will parse this out on the server side to be used
             //for persisting.
             var macroSyntaxComment = "<!-- " + macroObject.syntax + " -->";
@@ -746,7 +583,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             var uniqueId = "umb-macro-" + editor.dom.uniqueId();
             var macroDiv = editor.dom.create('div',
                 {
-                    'class': 'umb-macro-holder ' + macroObject.macroAlias + ' mceNonEditable ' + uniqueId
+                    'class': 'umb-macro-holder ' + macroObject.macroAlias + " " + uniqueId + ' mceNonEditable',
+                    'contenteditable': 'false'
                 },
                 macroSyntaxComment + '<ins>Macro alias: <strong>' + macroObject.macroAlias + '</strong></ins>');
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index 9aae9840d1b7..d9888eb9d3fd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -26,7 +26,16 @@
 }
 
 /* loader for macro loading in tinymce*/
+.mce-content-body .umb-macro-holder {
+    border: 3px dotted @pinkLight;
+    padding: 7px;
+    display: block;
+    margin: 3px;
+} 
 .umb-rte .mce-content-body .umb-macro-holder.loading {
+    
+    /*fixme: this image doesn't exist*/
+
     background: url(img/loader.gif) right no-repeat;
     background-size: 18px;
     background-position-x: 99%;

From 9abd72f6231a9fc517b2cb89776448df41a2453a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 31 Jan 2019 17:12:44 +1100
Subject: [PATCH 209/421] gets macro content loading on rte load

---
 .../src/common/services/tinymce.service.js    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index b2ec94fffe23..90cb793a9128 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -474,6 +474,16 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     }
                 });
 
+            });
+
+            /** when the contents load we need to find any macros declared and load in their content */
+            editor.on("SetContent", function (o) {
+
+                //get all macro divs and load their content
+                $(editor.dom.select(".umb-macro-holder.mceNonEditable")).each(function () {
+                    createInsertMacroScope.loadMacroContent($(this), null);
+                });
+
             });
 
 			/**
@@ -518,16 +528,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     //NOTE: This could be another way to deal with the active/inactive state
                     //editor.on('ObjectSelected', function (e) {});
 
-                    /** when the contents load we need to find any macros declared and load in their content */
-                    editor.on("LoadContent", function (o) {
-
-                        //get all macro divs and load their content
-                        $(editor.dom.select(".umb-macro-holder.mceNonEditable")).each(function () {
-                            createInsertMacroScope.loadMacroContent($(this), null);
-                        });
-
-                    });
-
                     //set onNodeChanged event listener
                     editor.on('NodeChange', onNodeChanged);
 

From 7b3623a9d9c9fe8d07121a7e38c95d4d4876bace Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Wed, 30 Jan 2019 23:29:09 +0100
Subject: [PATCH 210/421] Localize edit link, remove duplicate class attributes
 and only make remove link red

---
 .../propertyeditors/imagecropper/imagecropper.prevalues.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
index d11e176c2b85..757978d32f62 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
@@ -65,8 +65,8 @@
                 <p><span>{{item.alias}}</span> <small>({{item.width}}px &times; {{item.height}}px)</small></p>
             </div>
             <div class="umb-prevalues-multivalues__right">
-                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action--red" ng-click="edit(item, $event)" class="umb-prevalues-multivalues__action">Edit</a>
-                <a class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></a>
+                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action" ng-click="edit(item, $event)"><localize key="general_edit">Edit</localize></a>
+                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></a>
             </div>
         </div>
     </div>

From d55262b322f4884e211e709f5c2df6350836d48c Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Wed, 30 Jan 2019 23:29:50 +0100
Subject: [PATCH 211/421] Revert "Localize edit link, remove duplicate class
 attributes and only make remove link red"

This reverts commit 63cc250c0f929b1f7e6f9f05fae2fd302682d418.
---
 .../propertyeditors/imagecropper/imagecropper.prevalues.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
index 757978d32f62..d11e176c2b85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
@@ -65,8 +65,8 @@
                 <p><span>{{item.alias}}</span> <small>({{item.width}}px &times; {{item.height}}px)</small></p>
             </div>
             <div class="umb-prevalues-multivalues__right">
-                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action" ng-click="edit(item, $event)"><localize key="general_edit">Edit</localize></a>
-                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></a>
+                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action--red" ng-click="edit(item, $event)" class="umb-prevalues-multivalues__action">Edit</a>
+                <a class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></a>
             </div>
         </div>
     </div>

From 3ba32dafa5f67061d15ca7d5da803be74388c172 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Wed, 30 Jan 2019 23:33:19 +0100
Subject: [PATCH 212/421] Localize edit link, remove duplicate class attributes
 and only make remove link red

---
 .../propertyeditors/imagecropper/imagecropper.prevalues.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
index d11e176c2b85..757978d32f62 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
@@ -65,8 +65,8 @@
                 <p><span>{{item.alias}}</span> <small>({{item.width}}px &times; {{item.height}}px)</small></p>
             </div>
             <div class="umb-prevalues-multivalues__right">
-                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action--red" ng-click="edit(item, $event)" class="umb-prevalues-multivalues__action">Edit</a>
-                <a class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></a>
+                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action" ng-click="edit(item, $event)"><localize key="general_edit">Edit</localize></a>
+                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></a>
             </div>
         </div>
     </div>

From a1f72826c777c130b2765b7159d080c8217ccb97 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 31 Jan 2019 08:39:59 +0100
Subject: [PATCH 213/421] Remove duplicate css class

---
 .../propertyeditors/imagecropper/imagecropper.prevalues.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
index 757978d32f62..0aa4b5e5616f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
@@ -65,7 +65,7 @@
                 <p><span>{{item.alias}}</span> <small>({{item.width}}px &times; {{item.height}}px)</small></p>
             </div>
             <div class="umb-prevalues-multivalues__right">
-                <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action" ng-click="edit(item, $event)"><localize key="general_edit">Edit</localize></a>
+                <a href="#" prevent-default class="umb-node-preview__action" ng-click="edit(item, $event)"><localize key="general_edit">Edit</localize></a>
                 <a href="#" prevent-default class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></a>
             </div>
         </div>

From 2ab391eb69abc7fc5d243e4930ce21386a81a870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 31 Jan 2019 09:37:04 +0100
Subject: [PATCH 214/421] V8: UI select colors

---
 .../editor/umbeditormenu.directive.js         |  5 +-
 .../components/tree/umbtreeitem.directive.js  | 25 +++++++--
 .../components/umbmediagrid.directive.js      | 10 ++--
 .../src/controllers/navigation.controller.js  |  6 +-
 .../src/less/buttons.less                     |  6 +-
 .../less/components/tree/umb-tree-item.less   | 40 +++++++++++++
 .../src/less/components/tree/umb-tree.less    | 19 +------
 .../src/less/components/umb-content-grid.less | 29 ++++++++--
 .../src/less/components/umb-folder-grid.less  | 25 +++++++--
 .../src/less/components/umb-media-grid.less   | 56 ++++++++++++++-----
 .../src/less/variables.less                   |  5 +-
 .../views/components/tree/umb-tree-item.html  | 14 ++---
 .../views/components/umb-content-grid.html    |  4 +-
 .../propertyeditors/listview/listview.html    | 15 ++---
 14 files changed, 181 insertions(+), 78 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
index 22939c7f2c01..9dff712ef669 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
@@ -30,8 +30,9 @@
                 }
 
                 //when the options item is selected, we need to set the current menu item in appState (since this is synonymous with a menu)
-                appState.setMenuState("currentNode", scope.currentNode);
-
+                // Niels: No i think we are wrong, we should not set the currentNode, cause it represents the currentNode of interaction.
+                //appState.setMenuState("currentNode", scope.currentNode);
+                
                 if (!scope.actions) {
                     treeService.getMenu({ treeNode: scope.currentNode })
                         .then(function (data) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
index 0f9a14d71a5a..51eb8ca285ed 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
@@ -60,10 +60,13 @@ angular.module("umbraco.directives")
                 if (!node) {
                     return '';
                 }
-
+                
                 // TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
                 // it would be better if we could cache the processing. The problem is that some of these things are dynamic.
 
+                //is this the current action node (this is not the same as the current selected node!)
+                var actionNode = appState.getMenuState("currentNode");
+                
                 var css = [];                
                 if (node.cssClasses) {
                     _.each(node.cssClasses, function(c) {
@@ -73,17 +76,27 @@ angular.module("umbraco.directives")
                 if (node.selected) {
                     css.push("umb-tree-node-checked");
                 }
+                if (node == scope.currentNode) {
+                    css.push("current");
+                    if (actionNode && actionNode.id !== node.id) {
+                        css.push("current-not-active");// when its the current node, but its not the active(current node for the given action)
+                    }
+                }
+                if (node.hasChildren) {
+                    css.push("has-children");
+                }
+                if (node.deleteAnimations) {
+                    css.push("umb-tree-item--deleted");
+                }
 
-                //is this the current action node (this is not the same as the current selected node!)
-                var actionNode = appState.getMenuState("currentNode");
                 if (actionNode) {
-                    if (actionNode.id === node.id && String(actionNode.id) !== "-1") {
+                    if (actionNode.id === node.id && String(node.id) !== "-1") {
                         css.push("active");
                     }
-
+                    
                     // special handling of root nodes with id -1 
                     // as there can be many nodes with id -1 in a tree we need to check the treeAlias instead
-                    if (String(actionNode.id) === "-1" && actionNode.metaData.treeAlias === node.metaData.treeAlias) {
+                    if (String(node.id) === "-1" && actionNode.metaData.treeAlias === node.metaData.treeAlias) {
                         css.push("active");
                     }
                 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index 308ffbf00fd8..29335f276edc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -140,11 +140,11 @@ Use this directive to generate a thumbnail grid of media items.
                     }
 
                 }
-
+                
                 if (scope.items.length > 0) {
                     setFlexValues(scope.items);
                 }
-
+                
             }
 
             function setItemData(item) {
@@ -235,7 +235,7 @@ Use this directive to generate a thumbnail grid of media items.
                 }
 
             }
-
+            
             function setFlexValues(mediaItems) {
 
                 var flexSortArray = mediaItems;
@@ -269,12 +269,12 @@ Use this directive to generate a thumbnail grid of media items.
                         "min-height": itemMinHeight + "px"
                     };
 
-                    mediaItem.flexStyle = flexStyle;
+                        mediaItem.flexStyle = flexStyle;
 
                 }
 
             }
-
+            
             scope.clickItem = function(item, $event, $index) {
                 if (scope.onClick) {
                     scope.onClick(item, $event, $index);
diff --git a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
index 96f31151859d..071d984c6a09 100644
--- a/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
@@ -34,7 +34,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
                 appState.setTreeState("selectedNode", args.node);
                 //when a node is activated, this is the same as clicking it and we need to set the
                 //current menu item to be this node as well.
-                appState.setMenuState("currentNode", args.node);
+                //appState.setMenuState("currentNode", args.node);// Niels: No, we are setting it from the dialog.
             }
         });
 
@@ -44,7 +44,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             args.event.preventDefault();
 
             //Set the current action node (this is not the same as the current selected node!)
-            appState.setMenuState("currentNode", args.node);
+            //appState.setMenuState("currentNode", args.node);// Niels: No, we are setting it from the dialog.
 
             if (args.event && args.event.altKey) {
                 args.skipDefault = true;
@@ -96,7 +96,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
                 //put this node into the tree state
                 appState.setTreeState("selectedNode", args.node);
                 //when a node is clicked we also need to set the active menu node to this node
-                appState.setMenuState("currentNode", args.node);
+                //appState.setMenuState("currentNode", args.node);
 
                 //not legacy, lets just set the route value and clear the query string if there is one.
                 $location.path(n.routePath);
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index 51dcce7b927d..a246ef585e67 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -197,7 +197,11 @@ input[type="button"] {
 }
 // Made for Umbraco, 2019
 .btn-action {
-  .buttonBackground(@pinkLight, @blueDark, @blueExtraDark, @u-white);
+  .buttonBackground(@blueExtraDark, @blueDark, @pinkLight, @u-white);
+}
+// Made for Umbraco, 2019
+.btn-selection {
+  .buttonBackground(@pinkLight, ligthen(@pinkLight, 20%), @blueExtraDark, @blueDark);
 }
 // Made for Umbraco, 2019, used for buttons that has to stand back.
 .btn-white {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 097665bdd4ba..53e724cf5456 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -2,6 +2,7 @@
     display: block;
     min-width: 100%;
     width: auto;
+    margin-top:1px;
     
     .umb-tree-item__label {
         user-select: none;
@@ -44,6 +45,38 @@
     }
 }
 
+// active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
+.umb-tree-item.active {
+    
+}
+.umb-tree-item.active > .umb-tree-item__inner {
+    //background: @ui-selected;
+    color: @ui-selected-type;
+    a {
+        color: @ui-selected-type;
+    }
+    
+    border-color: @ui-selected-border;
+    box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
+    &::before {
+        content: "";
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        border: 2px solid fade(white, 80%);
+    }
+    &:hover {
+        //background: @ui-selected-hover;
+        //border-color: @ui-selected-border-hover;// dont hover border, cause its cant be deselected in current code.
+        color: @ui-selected-type-hover;
+        a {
+            color: @ui-selected-type-hover;
+        }
+    }
+}
+
 .umb-tree-item.current > .umb-tree-item__inner {
 
     background: @ui-active;
@@ -75,3 +108,10 @@
         //border-color: @ui-active;
     }
 }
+
+.umb-tree-item.current-not-active > .umb-tree-item__inner {
+    
+    background: @ui-active-blur;
+    color:@ui-active-type;
+    
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 13e2a550895d..698a4211f5ae 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -87,23 +87,6 @@ body.touch .umb-tree {
     }
 }
 
-// active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
-.umb-tree-item > .umb-tree-item__inner.active {
-    //background: @ui-selected;
-    border-color: @ui-selected-border;
-    color: @ui-selected-type;
-    a {
-        color: @ui-selected-type;
-    }
-    &:hover {
-        //background: @ui-selected-hover;
-        border-color: @ui-selected-border-hover;
-        color: @ui-selected-type-hover;
-        a {
-            color: @ui-selected-type-hover;
-        }
-    }
-}
 .umb-tree-root, .umb-tree-item__inner {
     padding: 0;
     position: relative;
@@ -112,7 +95,7 @@ body.touch .umb-tree {
     flex-wrap: nowrap;
     align-items: center;
     
-    border:2px dashed transparent;
+    border:2px solid transparent;
     
     color: @ui-option-type;
     a {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 399a367dc5bc..b55a511f4bde 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -14,10 +14,31 @@
    user-select: none;
    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
    border-radius: 3px;
+   
+   color: @ui-option-type;
+   &:hover {
+       color:@ui-option-type-hover;
+   }
 }
 
 .umb-content-grid__item.-selected {
-    box-shadow: 0 2px 8px 0 rgba(0,0,0,0.35);
+    //box-shadow: 0 2px 8px 0 rgba(0,0,0,0.35);
+    
+    //color:@ui-selected-type;
+    
+    &::before {
+        content: "";
+        position: absolute;
+        z-index:2;
+        top: -2px;
+        left: -2px;
+        right: -2px;
+        bottom: -2px;
+        border: 2px solid @ui-selected-border;
+        border-radius: 5px;
+        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
+    }
+    
 }
 
 .umb-content-grid__icon-container {
@@ -31,12 +52,12 @@
 .umb-content-grid__icon[class^="icon-"],
 .umb-content-grid__icon[class*=" icon-"] {
    font-size: 20px;
-   color: @gray-8;
+//color: @gray-8;
    margin-right: 5px;
 }
 
 .umb-content-grid__icon.-light {
-   color: @gray-5;
+   //color: @gray-5;
 }
 
 
@@ -48,7 +69,7 @@
 .umb-content-grid__item-name {
    font-weight: bold;
    margin-bottom: 15px;
-   color: @black;
+   //color: @black;
    line-height: 1.4em;
    display: inline-flex;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
index f5ca1f84382c..d2f86affab07 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
@@ -14,7 +14,7 @@
    padding: 10px 20px;
    box-sizing: border-box;
    flex: 1 1 200px;
-   border: 2px dashed transparent;
+   //border: 2px solid transparent;
    transition: border 0.2s;
    position: relative;
    justify-content: space-between;
@@ -27,15 +27,28 @@
 }
 
 .umb-folder-grid__folder.-selected {
-    box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
+    //box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
     
     //background: @ui-selected;
     color:@ui-selected-type;
-    border-color:@ui-selected-border;
+    //border-color:@ui-selected-border;
+    
+    &::before {
+        content: "";
+        position: absolute;
+        z-index:2;
+        top: -2px;
+        left: -2px;
+        right: -2px;
+        bottom: -2px;
+        border: 2px solid @ui-selected-border;
+        border-radius: 5px;
+        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
+    }
     
     &:hover {
         color:@ui-selected-type-hover;
-        border-color:@ui-selected-border-hover;
+        //border-color:@ui-selected-border-hover;
     }
 }
 
@@ -59,12 +72,12 @@
 .umb-folder-grid__folder-icon[class*=" icon-"] {
    font-size: 20px;
    margin-right: 15px;
-   color: @black;
+   //color: @black;
 }
 
 .umb-folder-grid__folder-name {
    font-size: 13px;
-   color: @black;
+   //color: @black;
    font-weight: bold;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 8185040f2320..017313af8060 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -21,11 +21,14 @@
 
     margin: 10px;
     position: relative;
-    overflow: hidden;
+    //overflow: hidden;
+    
+    user-select: none;
+    
     cursor: pointer;
     
-    border: 2px dashed transparent;
     box-shadow: 0 1px 1px 0 rgba(0,0,0,.2);
+    //border: 2px solid transparent;
     
     transition: box-shadow 150ms ease-in-out;
 }
@@ -35,16 +38,30 @@
 }
 
 .umb-media-grid__item.-selected {
-    box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
     
     //background: @ui-selected;
     color:@ui-selected-type;
-    border-color:@ui-selected-border;
+    //border-color: @ui-selected-border;
+    //box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
     
-    &:hover {
-        color:@ui-selected-type-hover;
-        border-color:@ui-selected-border-hover;
+    &::before {
+        content: "";
+        position: absolute;
+        z-index:2;
+        top: -2px;
+        left: -2px;
+        right: -2px;
+        bottom: -2px;
+        border: 2px solid @ui-selected-border;
+        border-radius: 5px;
+        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
     }
+    
+    .umb-media-grid__item-overlay {
+        color: @ui-selected-type;
+        //background: @ui-selected-border;
+    }
+    
 }
 
 .umb-media-grid__item-file-icon > span {
@@ -64,16 +81,22 @@
 }
 
 .umb-media-grid__item-image {
-   max-width: 100% !important;
-   height: auto;
+   //max-width: 100% !important;
+   //height: auto;
    position: relative;
+   
+   object-fit: contain;
+   height: 100%;
 }
 
 .umb-media-grid__item-image-placeholder {
     width: 100%;
-    max-width: 100%;
-    height: auto;
+    //max-width: 100%;
+    //height: auto;
     position: relative;
+    
+    object-fit: contain;
+    height: 100%;
 }
 
 .umb-media-grid__image-background {
@@ -95,17 +118,18 @@
    right: 0;
    bottom: 0;
    left: 0;
-   z-index: 100;
+   z-index: 1;
    padding: 5px 10px;
    box-sizing: border-box;
    font-size: 12px;
    overflow: hidden;
    color: @black;
    white-space: nowrap;
-   border-top:1px solid @gray-9;
-   background: @white;
+   border-top:1px solid fade(black, 4%);
+   background: fade(@white, 92%);
    transition: opacity 150ms;
 }
+
 /*
 .umb-media-grid__item.-file .umb-media-grid__item-overlay {
     opacity: 1;
@@ -180,6 +204,10 @@
     align-items: center;
     color: @black;
     transition: opacity 150ms;
+    
+    &:hover {
+        color: @ui-action-disgrete-type-hover;
+    }
 }
 
 .umb-media-grid__item:hover .umb-media-grid__edit {
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index e66c3de59734..80665e4c64f8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -117,7 +117,7 @@
 @pinkRedLight:          #ff8a89;// added 2019
 @brown:                 #9d8057;// added 2019
 @brownLight:            #e4e0dd;// added 2019
-@brownGrayLight:        #f3f2f1;// added 2019
+@brownGrayLight:        #f6f4f4;// added 2019
 @orange:                #ff9412;// added 2019
 
 //@u-greyLight:           #f2ebe6;// added 2019
@@ -134,6 +134,7 @@
 
 //@ui-active:           #346ab3;
 @ui-active:             @pinkLight;
+@ui-active-blur:        @brownLight;
 @ui-active-type:        @blueExtraDark;
 @ui-active-type-hover:  @blueMid;
 
@@ -142,7 +143,7 @@
 @ui-selected-type:           @blueExtraDark;
 @ui-selected-type-hover:     @blueMid;
 @ui-selected-border:           @pinkLight;
-@ui-selected-border-hover:     @pinkLight;
+@ui-selected-border-hover:     darken(@pinkLight, 10);
 
 @ui-light-border:           @pinkLight;
 @ui-light-type:             @gray-4;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
index d3854683c8fd..9474e9835067 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
@@ -1,21 +1,19 @@
-<li class="umb-tree-item" data-element="tree-item-{{::node.dataElement}}" ng-class="{'current': (node == currentNode), 'has-children': node.hasChildren, 'umb-tree-item--deleted': node.deleteAnimations}" on-right-click="altSelect(node, $event)">
-    <div class="umb-tree-item__inner" ng-class="getNodeCssClass(node)" ng-swipe-right="options(node, $event)" ng-dblclick="load(node)" >
-        <ins data-element="tree-item-expand" 
-            ng-class="{'icon-navigation-right': !node.expanded || node.metaData.isContainer, 'icon-navigation-down': node.expanded && !node.metaData.isContainer}" 
+<li class="umb-tree-item" data-element="tree-item-{{::node.dataElement}}" ng-class="getNodeCssClass(node)" on-right-click="altSelect(node, $event)">
+    <div class="umb-tree-item__inner" ng-swipe-right="options(node, $event)" ng-dblclick="load(node)" >
+        <ins data-element="tree-item-expand"
+            ng-class="{'icon-navigation-right': !node.expanded || node.metaData.isContainer, 'icon-navigation-down': node.expanded && !node.metaData.isContainer}"
             ng-style="{'visibility': (scope.enablelistviewexpand === 'true' || node.hasChildren && (!node.metaData.isContainer || isDialog)) ? 'visible' : 'hidden'}"
             ng-click="load(node)">&nbsp;</ins>
 
         <i class="icon umb-tree-icon sprTree" ng-class="::node.cssClass" title="{{::node.routePath}}" ng-click="select(node, $event)" ng-style="::node.style"></i>
         <a class="umb-tree-item__label" ng-href="#/{{::node.routePath}}" ng-click="select(node, $event)">{{node.name}}</a>
-    
+
         <!-- NOTE: These are the 'option' elipses -->
         <a data-element="tree-item-options" class="umb-options" ng-click="options(node, $event)" ng-if="::node.menuUrl"><i></i><i></i><i></i></a>
         <div ng-show="node.loading" class="l"><div></div></div>
     </div>
-    
+
     <ul ng-class="{collapsed: !node.expanded}">
         <umb-tree-item class="umb-animated" ng-repeat="child in node.children track by child.id" enablelistviewexpand="{{enablelistviewexpand}}" tree="tree" current-node="currentNode" node="child" is-dialog="isDialog" section="{{section}}"></umb-tree-item>
     </ul>
 </li>
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
index 490c94a79d89..487be4af87e8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
@@ -5,8 +5,8 @@
       ng-repeat="item in content"
       ng-class="{'-selected': item.selected}"
       ng-click="clickItem(item, $event, $index)">
-      
-      <i ng-if="item.selected" class="icon-check umb-content-grid__checkmark"></i>
+
+      <!--<i ng-if="item.selected" class="icon-check umb-content-grid__checkmark"></i>-->
 
       <div class="umb-content-grid__content">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index dba6a41a7c9b..9a638d91fae9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -13,13 +13,13 @@
                <umb-editor-sub-header-section ng-if="(listViewAllowedTypes && listViewAllowedTypes.length > 0 && (selection.length == 0)) && (currentNodePermissions == null || currentNodePermissions.canCreate)">
 
                    <div class="btn-group" ng-show="createAllowedButtonSingle">
-                       <a class="btn btn-success" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
+                       <a class="btn btn-white" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
                            <localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
                        </a>
                    </div>
 
                    <div class="btn-group" ng-show="createAllowedButtonSingleWithBlueprints">
-                       <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" ng-href="">
+                       <a class="btn btn-white dropdown-toggle" data-toggle="dropdown" ng-href="">
                            <span ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
                                <localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
                            </span>
@@ -85,6 +85,7 @@
                        type="button"
                        label="Clear selection"
                        label-key="buttons_clearSelection"
+                       button-style="selection"
                        action="clearSelection()"
                        disabled="actionInProgress">
                    </umb-button>
@@ -139,7 +140,7 @@
                        ng-if="options.allowBulkPublish && (buttonPermissions == null || buttonPermissions.canPublish)"
                        style="margin-right: 5px;"
                        type="button"
-                       button-style="outline"
+                       button-style="selection"
                        label-key="actions_publish"
                        icon="icon-globe"
                        action="publish()"
@@ -152,7 +153,7 @@
                        ng-if="options.allowBulkUnpublish && (buttonPermissions == null || buttonPermissions.canUnpublish)"
                        style="margin-right: 5px;"
                        type="button"
-                       button-style="outline"
+                       button-style="selection"
                        label-key="actions_unpublish"
                        icon="icon-block"
                        action="unpublish()"
@@ -165,7 +166,7 @@
                        ng-if="options.allowBulkCopy && (buttonPermissions == null || buttonPermissions.canCopy)"
                        style="margin-right: 5px;"
                        type="button"
-                       button-style="outline"
+                       button-style="selection"
                        label-key="actions_copy"
                        icon="icon-documents"
                        action="copy()"
@@ -178,7 +179,7 @@
                        ng-if="options.allowBulkMove && (buttonPermissions == null || buttonPermissions.canMove)"
                        style="margin-right: 5px;"
                        type="button"
-                       button-style="outline"
+                       button-style="selection"
                        label-key="actions_move"
                        icon="icon-enter"
                        action="move()"
@@ -190,7 +191,7 @@
                    <umb-button
                        ng-if="options.allowBulkDelete && (buttonPermissions == null || buttonPermissions.canDelete)"
                        type="button"
-                       button-style="outline"
+                       button-style="selection"
                        label-key="actions_delete"
                        icon="icon-trash"
                        action="delete()"

From b558023f9ed0ef00d5b0c8e6ec4c7aab1196c61d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 31 Jan 2019 10:13:07 +0100
Subject: [PATCH 215/421] V8: UI interact vs. select

---
 src/Umbraco.Web.UI.Client/src/less/canvas-designer.less      | 1 -
 .../src/less/components/umb-content-grid.less                | 1 +
 .../src/less/components/umb-folder-grid.less                 | 1 +
 .../src/less/components/umb-media-grid.less                  | 5 +++++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index a144336a5475..146f9b8a67de 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -45,7 +45,6 @@ h4 {
 
 h5 {
     margin: 0 0 6px 0;
-    color: #535353;
     font-size: 12px;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index b55a511f4bde..5a2821eb9ecf 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -37,6 +37,7 @@
         border: 2px solid @ui-selected-border;
         border-radius: 5px;
         box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
+        pointer-events: none;
     }
     
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
index d2f86affab07..32100247a0aa 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
@@ -44,6 +44,7 @@
         border: 2px solid @ui-selected-border;
         border-radius: 5px;
         box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
+        pointer-events: none;
     }
     
     &:hover {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 017313af8060..fc6de2bf7570 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -55,6 +55,7 @@
         border: 2px solid @ui-selected-border;
         border-radius: 5px;
         box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
+        pointer-events: none;
     }
     
     .umb-media-grid__item-overlay {
@@ -128,6 +129,10 @@
    border-top:1px solid fade(black, 4%);
    background: fade(@white, 92%);
    transition: opacity 150ms;
+   
+   &:hover {
+       text-decoration: underline;
+   }
 }
 
 /*

From a36b1962c6288541fb1c1c0cefd743382ae765e2 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 31 Jan 2019 09:32:50 +0000
Subject: [PATCH 216/421] Last of providers moved across & the old config file
 gone

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |   4 -
 .../config/EmbeddedMedia.Release.config       | 134 ------------------
 .../config/EmbeddedMedia.config               |  24 ----
 .../Media/EmbedProviders/DailyMotion.cs       |  28 ++++
 .../Media/EmbedProviders/Youtube.cs           |  29 ++++
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  13 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 +
 7 files changed, 64 insertions(+), 170 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
 delete mode 100644 src/Umbraco.Web.UI/config/EmbeddedMedia.config
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Youtube.cs

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 38f43f344f3f..e0660f8f1261 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -178,9 +178,6 @@
     <Content Include="Config\imageprocessor\cache.config">
       <SubType>Designer</SubType>
     </Content>
-    <None Include="Config\EmbeddedMedia.Release.config">
-      <DependentUpon>EmbeddedMedia.config</DependentUpon>
-    </None>
     <Content Include="Config\HealthChecks.config">
       <SubType>Designer</SubType>
     </Content>
@@ -300,7 +297,6 @@
     <Content Include="Config\umbracoSettings.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\EmbeddedMedia.config" />
     <Content Include="Config\BackOfficeTours\getting-started.json" />
   </ItemGroup>
   <!-- determine VSToolsPath -->
diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
deleted file mode 100644
index 442493e3d6e5..000000000000
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0"?>
-<embed>
-  <!-- Flickr Settings-->
-  <provider name="Flickr" type="Umbraco.Web.Media.EmbedProviders.OEmbedPhoto, Umbraco.Web">
-    <urlShemeRegex><![CDATA[flickr\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.flickr.com/services/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- SlideShare Settings -->
-  <provider name="SlideShare" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, Umbraco.Web">
-    <urlShemeRegex><![CDATA[slideshare\.net/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.slideshare.net/api/oembed/2]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Kickstarter Settings-->
-  <provider name="Kickstarter" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[kickstarter\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.kickstarter.com/services/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Getty Images Settings-->
-  <provider name="GettyImages" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[gty\.im/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://embed.gettyimages.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Poll Everywhere Settings -->
-  <provider name="PollEverywhere" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[polleverywhere\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.polleverywhere.com/services/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Poll Daddy Settings -->
-  <provider name="PollDaddy" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[polldaddy\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://polldaddy.com/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- IFTTT Settings -->
-  <provider name="IFTTT" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[ifttt\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.ifttt.com/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Instagram Settings -->
-  <provider name="Instagram" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[instagram\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://api.instagram.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Issuu Settings-->
-  <provider name="Issuu" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[issuu.com/(?:.*)/docs]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[https://issuu.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-        <param name="format">json</param>
-    </requestParams>
-  </provider>
-  <!-- Rdio Settings -->
-  <provider name="Rdio" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[rdio\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.rdio.com/api/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- SoundCloud Settings -->
-  <provider name="SoundCloud" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, Umbraco.Web">
-    <urlShemeRegex><![CDATA[soundcloud\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://soundcloud.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Youtube Settings -->
-  <provider name="Youtube" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[youtu(?:\.be|be\.com)/(?:(.*)v(/|=)|(.*/)?)([a-zA-Z0-9-_]+)]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[https://www.youtube.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="iframe">1</param>
-      <param name="format">xml</param>
-      <param name="scheme">https</param>
-    </requestParams>
-  </provider>
-  <!-- StreamDotUmbracoDotCom -->
-  <provider name="StreamDotUmbracoDotCom" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[stream\.umbraco\.org/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://stream.umbraco.org/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Daily Motion -->
-  <provider name="DailyMotion" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[dailymotion\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.dailymotion.com/services/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Hulu -->
-  <provider name="Hulu" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[hulu\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.hulu.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Vimeo -->
-  <provider name="Vimeo" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[vimeo\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://vimeo.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Ted -->
-  <provider name="Ted" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[ted\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.ted.com/talks/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Screenr Settings -->
-  <provider name="Screenr" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web" supportsDimensions="False">
-    <urlShemeRegex><![CDATA[screenr\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.screenr.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Twitgoo Settings , not an OEmbed one -->
-  <provider name="Twitgoo" type="Umbraco.Web.Media.EmbedProviders.Twitgoo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[twitgoo\.com/]]></urlShemeRegex>
-  </provider>
-  <!-- Twitter Settings -->
-  <provider name="Twitter" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[twitter\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[https://publish.twitter.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-    </requestParams>
-  </provider>
-</embed>
diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
deleted file mode 100644
index a5edaf38349a..000000000000
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<embed>
-
-    <!-- Youtube Settings -->
-    <provider name="Youtube" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-        <urlShemeRegex><![CDATA[youtu(?:\.be|be\.com)/(?:(.*)v(/|=)|(.*/)?)([a-zA-Z0-9-_]+)]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[https://www.youtube.com/oembed]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-            <param name="iframe">1</param>
-            <param name="format">xml</param>
-            <param name="scheme">https</param>
-        </requestParams>
-    </provider>
-    
-    <!-- Daily Motion -->
-    <provider name="DailyMotion" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-        <urlShemeRegex><![CDATA[dailymotion\.com/]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[http://www.dailymotion.com/services/oembed]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-            <param name="format">xml</param>
-        </requestParams>
-    </provider>
-    
-</embed>
diff --git a/src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs b/src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs
new file mode 100644
index 000000000000..78ea0b866229
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class DailyMotion : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "https://www.dailymotion.com/services/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"dailymotion.com/video/.*"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>()
+        {
+            //ApiUrl/?format=xml
+            {"format", "xml"}
+        };
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var xmlDocument = base.GetXmlResponse(requestUrl);
+
+            return GetXmlProperty(xmlDocument, "/oembed/html");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs b/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs
new file mode 100644
index 000000000000..7755a36958a0
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class YouTube : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "https://www.youtube.com/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"youtu.be/.*",
+            @"youtu.be/.*"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>()
+        {
+            //ApiUrl/?format=json
+            {"format", "json"}
+        };
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
+
+            return oembed.GetHtml();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 5974288daf84..43add0f15e02 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -217,22 +217,19 @@ public override void Compose(Composition composition)
             // register OEmbed providers
             // no type scanning - all explicit opt-in of adding types
             composition.WithCollectionBuilder<EmbedProvidersCollectionBuilder>()
+                .Append<YouTube>()
+                .Append<Instagram>()
+                .Append<Twitter>()
+                .Append<Vimeo>()
+                .Append<DailyMotion>()
                 .Append<Flickr>()
                 .Append<Slideshare>()
                 .Append<Kickstarter>()
                 .Append<GettyImages>()
-                .Append<Instagram>()
-                .Append<Twitter>()
-                .Append<Vimeo>()
                 .Append<Ted>()
                 .Append<Soundcloud>()
                 .Append<Issuu>()
                 .Append<Hulu>();
-
-
-                //Giphy
-                //Meetup
-                //Spotify
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f9fdb5aabbe4..8be153889e4a 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -143,11 +143,13 @@
     <Compile Include="Logging\WebProfilerComponent.cs" />
     <Compile Include="Logging\WebProfilerComposer.cs" />
     <Compile Include="Logging\WebProfilerProvider.cs" />
+    <Compile Include="Media\EmbedProviders\YouTube.cs" />
     <Compile Include="Media\EmbedProviders\EmbedProviderBase.cs" />
     <Compile Include="Media\EmbedProviders\EmbedProvidersCollection.cs" />
     <Compile Include="Media\EmbedProviders\EmbedProvidersCollectionBuilder.cs" />
     <Compile Include="Media\EmbedProviders\Flickr.cs" />
     <Compile Include="Media\EmbedProviders\GettyImages.cs" />
+    <Compile Include="Media\EmbedProviders\DailyMotion.cs" />
     <Compile Include="Media\EmbedProviders\SoundCloud.cs" />
     <Compile Include="Media\EmbedProviders\Hulu.cs" />
     <Compile Include="Media\EmbedProviders\Ted.cs" />

From 26e0c6cb79a60a99b0170118f852458a0066e90b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 31 Jan 2019 10:43:34 +0100
Subject: [PATCH 217/421] Don't break for root relations + minimize number of
 XHR

---
 .../views/relationtypes/edit.controller.js    | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
index ed0845a77374..9ae3813bd2c3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
@@ -71,18 +71,40 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
     }
 
     function getRelationNames(relationType) {
-        if(relationType.relations) {
-            angular.forEach(relationType.relations, function(relation){
-                entityResource.getById(relation.parentId, relationType.parentObjectTypeName).then(function(entity) {
-                    relation.parentName = entity.name;
+        if (relationType.relations) {
+            // can we grab app entity types in one go?
+            if (relationType.parentObjectType === relationType.childObjectType) {
+                // yep, grab the distinct list of parent and child entities
+                var entityIds = _.uniq(_.union(_.pluck(relationType.relations, "parentId"), _.pluck(relationType.relations, "childId")));
+                entityResource.getByIds(entityIds, relationType.parentObjectTypeName).then(function (entities) {
+                    updateRelationNames(relationType, entities);
                 });
-                entityResource.getById(relation.childId, relationType.childObjectTypeName).then(function(entity) {
-                    relation.childName = entity.name;
+            } else {
+                // nope, grab the parent and child entities individually
+                var parentEntityIds = _.uniq(_.pluck(relationType.relations, "parentId"));
+                var childEntityIds = _.uniq(_.pluck(relationType.relations, "childId"));
+                entityResource.getByIds(parentEntityIds, relationType.parentObjectTypeName).then(function (entities) {
+                    updateRelationNames(relationType, entities);
                 });
-            });
+                entityResource.getByIds(childEntityIds, relationType.childObjectTypeName).then(function (entities) {
+                    updateRelationNames(relationType, entities);
+                });
+            }
         }
     }
 
+    function updateRelationNames(relationType, entities) {
+        var entitiesById = _.indexBy(entities, "id");
+        _.each(relationType.relations, function(relation) {
+            if (entitiesById[relation.parentId]) {
+                relation.parentName = entitiesById[relation.parentId].name;
+            }
+            if (entitiesById[relation.childId]) {
+                relation.childName = entitiesById[relation.childId].name;
+            }
+        });
+    }
+
     function saveRelationType() {
         vm.page.saveButtonState = "busy";
 

From a6f9598a23e41687d2d6b0f6b0e518cf830ab825 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 31 Jan 2019 09:08:51 +0100
Subject: [PATCH 218/421] Introduce IPublishedRouter

---
 .../TestControllerActivatorBase.cs            |  2 +-
 .../Testing/TestingTests/MockTests.cs         |  2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  2 +-
 .../Web/Mvc/SurfaceControllerTests.cs         |  2 +-
 .../Models/Mapping/ContentUrlResolver.cs      |  4 +-
 .../EnsurePublishedContentRequestAttribute.cs |  8 ++-
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  2 +-
 .../Mvc/UmbracoVirtualNodeRouteHandler.cs     |  2 +-
 src/Umbraco.Web/Routing/IPublishedRouter.cs   | 54 +++++++++++++++++++
 src/Umbraco.Web/Routing/PublishedRequest.cs   |  8 +--
 src/Umbraco.Web/Routing/PublishedRouter.cs    | 43 +++++----------
 .../Routing/UrlProviderExtensions.cs          |  6 +--
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  2 +-
 src/Umbraco.Web/Security/MembershipHelper.cs  | 27 +++++++---
 src/Umbraco.Web/Templates/TemplateRenderer.cs |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 src/Umbraco.Web/UmbracoInjectedModule.cs      |  4 +-
 17 files changed, 111 insertions(+), 60 deletions(-)
 create mode 100644 src/Umbraco.Web/Routing/IPublishedRouter.cs

diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
index 602b5907d844..6414ea469d06 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
@@ -150,7 +150,7 @@ IHttpController IHttpControllerActivator.Create(HttpRequestMessage request, Http
             urlHelper.Setup(provider => provider.GetUrl(It.IsAny<UmbracoContext>(), It.IsAny<IPublishedContent>(), It.IsAny<UrlProviderMode>(), It.IsAny<string>(), It.IsAny<Uri>()))
                 .Returns(UrlInfo.Url("/hello/world/1234"));
 
-            var membershipHelper = new MembershipHelper(new TestUmbracoContextAccessor(umbCtx), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), null, Mock.Of<AppCaches>(), Mock.Of<ILogger>());
+            var membershipHelper = new MembershipHelper(new TestUmbracoContextAccessor(umbCtx), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), Mock.Of<AppCaches>(), Mock.Of<ILogger>());
 
             var umbHelper = new UmbracoHelper(umbCtx,
                 Mock.Of<IPublishedContent>(),
diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
index 575f14e81883..622186a5479e 100644
--- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
+++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
@@ -65,7 +65,7 @@ public void Can_Mock_Umbraco_Helper()
                 Mock.Of<ITagQuery>(),
                 Mock.Of<ICultureDictionary>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), null, Mock.Of<AppCaches>(), Mock.Of<ILogger>()),
+                new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), Mock.Of<AppCaches>(), Mock.Of<ILogger>()),
                 ServiceContext.CreatePartial());
             Assert.Pass();
         }
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 9616a2689186..7c8d1100f8a3 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -213,7 +213,7 @@ protected virtual void ComposeWeb()
 
             // web
             Composition.RegisterUnique(_ => Umbraco.Web.Composing.Current.UmbracoContextAccessor);
-            Composition.RegisterUnique<PublishedRouter>();
+            Composition.RegisterUnique<IPublishedRouter, PublishedRouter>();
             Composition.WithCollectionBuilder<ContentFinderCollectionBuilder>();
             Composition.RegisterUnique<IContentLastChanceFinder, TestLastChanceFinder>();
             Composition.RegisterUnique<IVariationContextAccessor, TestVariationContextAccessor>();
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 69f6c5d13ea7..ec37793c103e 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -132,7 +132,7 @@ public void Can_Lookup_Content()
                 Mock.Of<ITagQuery>(),
                 Mock.Of<ICultureDictionary>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), null, Mock.Of<AppCaches>(), Mock.Of<ILogger>()),
+                new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), Mock.Of<AppCaches>(), Mock.Of<ILogger>()),
                 ServiceContext.CreatePartial());
 
             var ctrl = new TestSurfaceController(umbracoContext, helper);
diff --git a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs
index f09638330b82..42c4997d8639 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.Models.Mapping
     internal class ContentUrlResolver : IValueResolver<IContent, ContentItemDisplay, UrlInfo[]>
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly PublishedRouter _publishedRouter;
+        private readonly IPublishedRouter _publishedRouter;
         private readonly ILocalizationService _localizationService;
         private readonly ILocalizedTextService _textService;
         private readonly IContentService _contentService;
@@ -19,7 +19,7 @@ internal class ContentUrlResolver : IValueResolver<IContent, ContentItemDisplay,
 
         public ContentUrlResolver(
             IUmbracoContextAccessor umbracoContextAccessor,
-            PublishedRouter publishedRouter, 
+            IPublishedRouter publishedRouter, 
             ILocalizationService localizationService,
             ILocalizedTextService textService,
             IContentService contentService,
diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
index 62a7c48d2b7c..471cec6db708 100644
--- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -33,8 +33,7 @@ public class EnsurePublishedContentRequestAttribute : ActionFilterAttribute
         /// <param name="contentId"></param>
         public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, int contentId)
         {
-            if (umbracoContext == null) throw new ArgumentNullException(nameof(umbracoContext));
-            _umbracoContext = umbracoContext;
+            _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
             _contentId = contentId;
         }
 
@@ -63,8 +62,7 @@ public EnsurePublishedContentRequestAttribute(string dataTokenName)
         /// <param name="dataTokenName"></param>
         public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, string dataTokenName)
         {
-            if (umbracoContext == null) throw new ArgumentNullException(nameof(umbracoContext));
-            _umbracoContext = umbracoContext;
+            _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
             _dataTokenName = dataTokenName;
         }
 
@@ -74,7 +72,7 @@ public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, str
         protected UmbracoContext UmbracoContext => _umbracoContext ?? (_umbracoContext = UmbracoContext.Current);
 
         // TODO: try lazy property injection?
-        private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>();
+        private IPublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<IPublishedRouter>();
 
         /// <summary>
         /// Exposes an UmbracoHelper
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 215eb395736d..2c550effc462 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -377,7 +377,7 @@ internal IHttpHandler GetHandlerForRoute(RequestContext requestContext, Publishe
             if ((request.HasTemplate == false && Features.Disabled.DisableTemplates == false)
                 && routeDef.HasHijackedRoute == false)
             {
-                request.UpdateOnMissingTemplate(); // request will go 404
+                request.UpdateToNotFound(); // request will go 404
 
                 // HandleHttpResponseStatus returns a value indicating that the request should
                 // not be processed any further, eg because it has been redirect. then, exit.
diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
index 48e16b48d7e6..1af434e94eb5 100644
--- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Mvc
     public abstract class UmbracoVirtualNodeRouteHandler : IRouteHandler
     {
         // TODO: try lazy property injection?
-        private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>();
+        private IPublishedRouter PublishedRouter => Current.Factory.GetInstance<IPublishedRouter>();
 
         /// <summary>
         /// Returns the UmbracoContext for this route handler
diff --git a/src/Umbraco.Web/Routing/IPublishedRouter.cs b/src/Umbraco.Web/Routing/IPublishedRouter.cs
new file mode 100644
index 000000000000..df06e42e5534
--- /dev/null
+++ b/src/Umbraco.Web/Routing/IPublishedRouter.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Web.Routing
+{
+    /// <summary>
+    /// Routes requests.
+    /// </summary>
+    public interface IPublishedRouter
+    {
+        // TODO: consider this and RenderRouteHandler - move some code around?
+
+        /// <summary>
+        /// Creates a published request.
+        /// </summary>
+        /// <param name="umbracoContext">The current Umbraco context.</param>
+        /// <param name="uri">The (optional) request Uri.</param>
+        /// <returns>A published request.</returns>
+        PublishedRequest CreateRequest(UmbracoContext umbracoContext, Uri uri = null);
+
+        /// <summary>
+        /// Prepares a request for rendering.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>A value indicating whether the request was successfully prepared and can be rendered.</returns>
+        bool PrepareRequest(PublishedRequest request);
+
+        /// <summary>
+        /// Tries to route a request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>A value indicating whether the request can be routed to a document.</returns>
+        bool TryRouteRequest(PublishedRequest request);
+
+        /// <summary>
+        /// Gets a template.
+        /// </summary>
+        /// <param name="alias">The template alias</param>
+        /// <returns>The template.</returns>
+        ITemplate GetTemplate(string alias);
+
+        /// <summary>
+        /// Updates the request to "not found".
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <remarks>
+        /// <para>This method is invoked when the pipeline decides it cannot render
+        /// the request, for whatever reason, and wants to force it to be re-routed
+        /// and rendered as if no document were found (404).</para>
+        /// </remarks>
+        void UpdateRequestToNotFound(PublishedRequest request);
+    }
+}
diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs
index c5475f8b73f2..52f5820744c7 100644
--- a/src/Umbraco.Web/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedRequest.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web.Routing
     /// </summary>
     public class PublishedRequest
     {
-        private readonly PublishedRouter _publishedRouter;
+        private readonly IPublishedRouter _publishedRouter;
 
         private bool _readonly; // after prepared
         private bool _readonlyUri; // after preparing
@@ -35,7 +35,7 @@ public class PublishedRequest
         /// <param name="publishedRouter">The published router.</param>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="uri">The request <c>Uri</c>.</param>
-        internal PublishedRequest(PublishedRouter publishedRouter, UmbracoContext umbracoContext, Uri uri = null)
+        internal PublishedRequest(IPublishedRouter publishedRouter, UmbracoContext umbracoContext, Uri uri = null)
         {
             UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
             _publishedRouter = publishedRouter ?? throw new ArgumentNullException(nameof(publishedRouter));
@@ -291,11 +291,11 @@ public void ResetTemplate()
         /// </summary>
         public bool HasTemplate => TemplateModel != null;
 
-        internal void UpdateOnMissingTemplate()
+        internal void UpdateToNotFound()
         {
             var __readonly = _readonly;
             _readonly = false;
-            _publishedRouter.UpdateRequestOnMissingTemplate(this);
+            _publishedRouter.UpdateRequestToNotFound(this);
             _readonly = __readonly;
         }
 
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 14c36198d870..7dd1ec9f1a82 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Web.Security;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
@@ -18,8 +19,10 @@
 
 namespace Umbraco.Web.Routing
 {
-    // TODO: making sense to have an interface?
-    public class PublishedRouter
+    /// <summary>
+    /// Provides the default <see cref="IPublishedRouter"/> implementation.
+    /// </summary>
+    public class PublishedRouter : IPublishedRouter
     {
         private readonly IWebRoutingSection _webRoutingSection;
         private readonly ContentFinderCollection _contentFinders;
@@ -47,15 +50,9 @@ public PublishedRouter(
             _profilingLogger = proflog ?? throw new ArgumentNullException(nameof(proflog));
             _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
             _logger = proflog;
-
-            GetRolesForLogin = s => Roles.Provider.GetRolesForUser(s);
         }
 
-        // TODO: in 7.7 this is cached in the PublishedContentRequest, which ... makes little sense
-        // killing it entirely, if we need cache, just implement it properly !!
-        // this is all so weird
-        public Func<string, IEnumerable<string>> GetRolesForLogin { get; }
-
+        /// <inheritdoc />
         public PublishedRequest CreateRequest(UmbracoContext umbracoContext, Uri uri = null)
         {
             return new PublishedRequest(this, umbracoContext, uri ?? umbracoContext.CleanedUmbracoUrl);
@@ -63,10 +60,8 @@ public PublishedRequest CreateRequest(UmbracoContext umbracoContext, Uri uri = n
 
         #region Request
 
-        /// <summary>
-        /// Tries to route the request.
-        /// </summary>
-        internal bool TryRouteRequest(PublishedRequest request)
+        /// <inheritdoc />
+        public bool TryRouteRequest(PublishedRequest request)
         {
             // disabled - is it going to change the routing?
             //_pcr.OnPreparing();
@@ -96,12 +91,7 @@ private void SetVariationContext(string culture)
             _variationContextAccessor.VariationContext = new VariationContext(culture);
         }
 
-        /// <summary>
-        /// Prepares the request.
-        /// </summary>
-        /// <returns>
-        /// Returns false if the request was not successfully prepared
-        /// </returns>
+        /// <inheritdoc />
         public bool PrepareRequest(PublishedRequest request)
         {
             // note - at that point the original legacy module did something do handle IIS custom 404 errors
@@ -213,11 +203,8 @@ public bool ConfigureRequest(PublishedRequest frequest)
             return true;
         }
 
-        /// <summary>
-        /// Updates the request when there is no template to render the content.
-        /// </summary>
-        /// <remarks>This is called from Mvc when there's a document to render but no template.</remarks>
-        public void UpdateRequestOnMissingTemplate(PublishedRequest request)
+        /// <inheritdoc />
+        public void UpdateRequestToNotFound(PublishedRequest request)
         {
             // clear content
             var content = request.PublishedContent;
@@ -386,11 +373,7 @@ internal bool FindTemplateRenderingEngineInDirectory(DirectoryInfo directory, st
 
         #region Document and template
 
-        /// <summary>
-        /// Gets a template.
-        /// </summary>
-        /// <param name="alias">The template alias</param>
-        /// <returns>The template.</returns>
+        /// <inheritdoc />
         public ITemplate GetTemplate(string alias)
         {
             return _services.FileService.GetTemplate(alias);
@@ -607,7 +590,7 @@ private void EnsurePublishedContentAccess(PublishedRequest request)
                     if (loginPageId != request.PublishedContent.Id)
                         request.PublishedContent = request.UmbracoContext.PublishedSnapshot.Content.GetById(loginPageId);
                 }
-                else if (_services.PublicAccessService.HasAccess(request.PublishedContent.Id, _services.ContentService, membershipHelper.CurrentUserName, GetRolesForLogin(membershipHelper.CurrentUserName)) == false)
+                else if (_services.PublicAccessService.HasAccess(request.PublishedContent.Id, _services.ContentService, membershipHelper.CurrentUserName, membershipHelper.GetCurrentUserRoles()) == false)
                 {
                     _logger.Debug<PublishedRouter>("EnsurePublishedContentAccess: Current member has not access, redirect to error page");
                     var errorPageId = publicAccessAttempt.Result.NoAccessNodeId;
diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
index 8db657ed30e3..2a840828b652 100644
--- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
@@ -18,7 +18,7 @@ internal static class UrlProviderExtensions
         /// <para>Contains all the Urls that we can figure out (based upon domains, etc).</para>
         /// </remarks>
         public static IEnumerable<UrlInfo> GetContentUrls(this IContent content,
-            PublishedRouter publishedRouter,
+            IPublishedRouter publishedRouter,
             UmbracoContext umbracoContext,
             ILocalizationService localizationService,
             ILocalizedTextService textService,
@@ -92,7 +92,7 @@ public static IEnumerable<UrlInfo> GetContentUrls(this IContent content,
         /// <returns></returns>
         private static IEnumerable<UrlInfo> GetContentUrlsByCulture(IContent content,
             IEnumerable<string> cultures,
-            PublishedRouter publishedRouter,
+            IPublishedRouter publishedRouter,
             UmbracoContext umbracoContext,
             IContentService contentService,
             ILocalizedTextService textService,
@@ -161,7 +161,7 @@ private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IC
                 return UrlInfo.Message(textService.Localize("content/parentCultureNotPublished", new[] {parent.Name}), culture);
         }
 
-        private static bool DetectCollision(IContent content, string url, string culture, UmbracoContext umbracoContext, PublishedRouter publishedRouter, ILocalizedTextService textService, out UrlInfo urlInfo)
+        private static bool DetectCollision(IContent content, string url, string culture, UmbracoContext umbracoContext, IPublishedRouter publishedRouter, ILocalizedTextService textService, out UrlInfo urlInfo)
         {
             // test for collisions on the 'main' url
             var uri = new Uri(url.TrimEnd('/'), UriKind.RelativeOrAbsolute);
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index de3ca47b383d..4070ee9ece8f 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -178,7 +178,7 @@ public override void Compose(Composition composition)
             composition.RegisterAuto(typeof(UmbracoViewPage<>));
 
             // register published router
-            composition.RegisterUnique<PublishedRouter>();
+            composition.RegisterUnique<IPublishedRouter, PublishedRouter>();
             composition.Register(_ => Current.Configs.Settings().WebRouting);
 
             // register preview SignalR hub
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index e05361780615..daec4bb1f7f8 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -31,7 +31,6 @@ public class MembershipHelper
         private readonly IMemberTypeService _memberTypeService;
         private readonly IUserService _userService;
         private readonly IPublicAccessService _publicAccessService;
-        private readonly PublishedRouter _publishedRouter;
         private readonly AppCaches _appCaches;
         private readonly ILogger _logger;
 
@@ -46,7 +45,6 @@ public MembershipHelper
             IMemberTypeService memberTypeService,
             IUserService userService,
             IPublicAccessService publicAccessService,
-            PublishedRouter publishedRouter,
             AppCaches appCaches,
             ILogger logger
         )
@@ -57,7 +55,6 @@ ILogger logger
             _memberTypeService = memberTypeService;
             _userService = userService;
             _publicAccessService = publicAccessService;
-            _publishedRouter = publishedRouter;
             _appCaches = appCaches;
             _logger = logger;
 
@@ -116,7 +113,7 @@ private bool HasAccess(string path, RoleProvider roleProvider)
         {
             return UmbracoContext.PublishedRequest == null
                 ? _publicAccessService.HasAccess(path, CurrentUserName, roleProvider.GetRolesForUser)
-                : _publicAccessService.HasAccess(path, CurrentUserName, _publishedRouter.GetRolesForLogin);
+                : _publicAccessService.HasAccess(path, CurrentUserName, GetUserRoles);
         }
 
         /// <summary>
@@ -514,6 +511,24 @@ private IEnumerable<UmbracoProperty> GetMemberPropertiesViewModel(IMemberType me
         }
         #endregion
 
+        /// <summary>
+        /// Gets the current user's roles.
+        /// </summary>
+        /// <remarks>Roles are cached per user name, at request level.</remarks>
+        public IEnumerable<string> GetCurrentUserRoles()
+            => GetUserRoles(CurrentUserName);
+
+        /// <summary>
+        /// Gets a user's roles.
+        /// </summary>
+        /// <remarks>Roles are cached per user name, at request level.</remarks>
+        public IEnumerable<string> GetUserRoles(string userName)
+        {
+            // optimize by caching per-request (v7 cached per PublishedRequest, in PublishedRouter)
+            var key = "Umbraco.Web.Security.MembershipHelper__Roles__" + userName;
+            return _appCaches.RequestCache.GetCacheItem(key, () => Roles.Provider.GetRolesForUser(userName));
+        }
+
         /// <summary>
         /// Returns the login status model of the currently logged in member, if no member is logged in it returns null;
         /// </summary>
@@ -618,7 +633,7 @@ public virtual bool IsMemberAuthorized(
                 var provider = _membershipProvider;
 
                 string username;
-                
+
                 if (provider.IsUmbracoMembershipProvider())
                 {
                     var member = GetCurrentPersistedMember();
@@ -626,7 +641,7 @@ public virtual bool IsMemberAuthorized(
                     if (member == null)
                         return false;
                     username = member.Username;
-                    
+
                     // If types defined, check member is of one of those types
                     var allowTypesList = allowTypes as IList<string> ?? allowTypes.ToList();
                     if (allowTypesList.Any(allowType => allowType != string.Empty))
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index 9279eea124fe..7d678b93ca0f 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -36,7 +36,7 @@ public TemplateRenderer(UmbracoContext umbracoContext, int pageId, int? altTempl
         }
 
         private IFileService FileService => Current.Services.FileService; // TODO: inject
-        private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<PublishedRouter>(); // TODO: inject
+        private IPublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance<IPublishedRouter>(); // TODO: inject
 
 
         /// <summary>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f078e9d79fa3..709d938ba441 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -183,6 +183,7 @@
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
+    <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 95819e79d7c3..ba1a38448433 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -45,7 +45,7 @@ public class UmbracoInjectedModule : IHttpModule
         private readonly UrlProviderCollection _urlProviders;
         private readonly IRuntimeState _runtime;
         private readonly ILogger _logger;
-        private readonly PublishedRouter _publishedRouter;
+        private readonly IPublishedRouter _publishedRouter;
         private readonly IVariationContextAccessor _variationContextAccessor;
 
         public UmbracoInjectedModule(
@@ -56,7 +56,7 @@ public UmbracoInjectedModule(
             UrlProviderCollection urlProviders,
             IRuntimeState runtime,
             ILogger logger,
-            PublishedRouter publishedRouter,
+            IPublishedRouter publishedRouter,
             IVariationContextAccessor variationContextAccessor)
         {
             _combinedRouteCollection = new Lazy<RouteCollection>(CreateRouteCollection);

From 92d53eb527cad1faf1ce6e91ad0f49efe33d142d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 31 Jan 2019 11:10:27 +0100
Subject: [PATCH 219/421] #3648 - Besides mculture also retain cculture in
 querystring on navigation

---
 .../src/common/services/navigation.service.js                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 76fcc2d1d8c2..d9c505aa2390 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -28,7 +28,7 @@ function navigationService($routeParams, $location, $q, $timeout, $injector, eve
 
     //A list of query strings defined that when changed will not cause a reload of the route
     var nonRoutingQueryStrings = ["mculture", "cculture", "lq"];
-    var retainedQueryStrings = ["mculture"];
+    var retainedQueryStrings = ["mculture", "cculture"];
 
         
     function setMode(mode) {

From 8d55340325b457427661d0ae31d8b0a5e66b255a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 31 Jan 2019 10:23:54 +0000
Subject: [PATCH 220/421] Fix up youtube URL regex matching

---
 src/Umbraco.Web/Media/EmbedProviders/Youtube.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs b/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs
index 7755a36958a0..4e6f43704740 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs
@@ -9,7 +9,7 @@ public class YouTube : EmbedProviderBase
         public override string[] UrlSchemeRegex => new string[]
         {
             @"youtu.be/.*",
-            @"youtu.be/.*"
+            @"youtube.com/watch.*"
         };
         
         public override Dictionary<string, string> RequestParams => new Dictionary<string, string>()

From 14b97b6abe3858101a5945c46c83547efb9477a5 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 31 Jan 2019 10:24:15 +0000
Subject: [PATCH 221/421] Fix up JS as the API model had changed

---
 .../infiniteeditors/embed/embed.controller.js | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
index fb66552731b4..06a5f028efe3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
@@ -54,21 +54,22 @@
 
                     $scope.model.embed.preview = "";
 
-                    switch (response.data.Status) {
+
+                    switch (response.data.OEmbedStatus) {
                         case 0:
-                        //not supported
-                        $scope.model.embed.info = "Not supported";
-                        break;
+                            //not supported
+                            $scope.model.embed.info = "Not supported";
+                            break;
                         case 1:
-                        //error
-                        $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
-                        break;
+                            //error
+                            $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
+                            break;
                         case 2:
-                        $scope.model.embed.preview = response.data.Markup;
-                        vm.trustedPreview = $sce.trustAsHtml(response.data.Markup);
-                        $scope.model.embed.supportsDimensions = response.data.SupportsDimensions;
-                        $scope.model.embed.success = true;
-                        break;
+                            $scope.model.embed.preview = response.data.Markup;
+                            vm.trustedPreview = $sce.trustAsHtml(response.data.Markup);
+                            $scope.model.embed.supportsDimensions = response.data.SupportsDimensions;
+                            $scope.model.embed.success = true;
+                            break;
                     }
                 }, function() {
                     $scope.model.embed.supportsDimensions = false;

From 1a64c0a8034fbf5308b0ac2a5775e349bf557d13 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 31 Jan 2019 11:45:08 +0100
Subject: [PATCH 222/421] Fix disappearing media thumbnails

---
 .../src/common/directives/components/umbmediagrid.directive.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index 308ffbf00fd8..0a6953393884 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -157,7 +157,8 @@ Use this directive to generate a thumbnail grid of media items.
                     item.isFolder = !mediaHelper.hasFilePropertyType(item);
                 }
 
-                if (!item.isFolder) {
+                // if it's not a folder, get the thumbnail, extension etc. if we haven't already
+                if (!item.isFolder && !item.thumbnail) {
 
                     // handle entity
                     if(item.image) {

From 34be548aec4593433d21c31d0499c22419074023 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 31 Jan 2019 10:56:09 +0000
Subject: [PATCH 223/421] Start work on adding AppSettings keys into a
 constants class & use new prefix of Umbraco.Core.

---
 build/NuSpecs/tools/install.ps1               |  2 +-
 src/Umbraco.Core/Composing/RegisterFactory.cs |  4 ++--
 .../Configuration/GlobalSettings.cs           |  6 +++---
 src/Umbraco.Core/Constants-AppSettings.cs     | 20 +++++++++++++++++++
 .../Migrations/Upgrade/UmbracoPlan.cs         |  4 ++--
 .../Migrations/Upgrade/UmbracoUpgrader.cs     |  4 ++--
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 src/Umbraco.Tests/App.config                  |  2 +-
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |  2 +-
 .../Security/BackOfficeCookieManagerTests.cs  |  2 +-
 src/Umbraco.Web.UI/web.Template.config        |  2 +-
 11 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 src/Umbraco.Core/Constants-AppSettings.cs

diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1
index 9cc7bd5b26a1..5ca42b54a19e 100644
--- a/build/NuSpecs/tools/install.ps1
+++ b/build/NuSpecs/tools/install.ps1
@@ -54,7 +54,7 @@ if ($project) {
 			[xml]$config = Get-Content $destinationWebConfig
 			
 			$config.configuration.appSettings.ChildNodes | ForEach-Object { 
-				if($_.key -eq "umbracoConfigurationStatus") 
+				if($_.key -eq "Umbraco.Core.ConfigurationStatus") 
 				{
 					# The web.config has an umbraco-specific appSetting in it
 					# don't overwrite it and let config transforms do their thing
diff --git a/src/Umbraco.Core/Composing/RegisterFactory.cs b/src/Umbraco.Core/Composing/RegisterFactory.cs
index 8ee6e5a94c57..975de7647d9e 100644
--- a/src/Umbraco.Core/Composing/RegisterFactory.cs
+++ b/src/Umbraco.Core/Composing/RegisterFactory.cs
@@ -18,14 +18,14 @@ public static class RegisterFactory
         /// Creates a new instance of the configured container.
         /// </summary>
         /// <remarks>
-        /// To override the default LightInjectContainer, add an appSetting named umbracoContainerType with
+        /// To override the default LightInjectContainer, add an appSetting named umbracoRegisterType with
         /// a fully qualified type name to a class with a static method "Create" returning an IRegister.
         /// </remarks>
         public static IRegister Create()
         {
             Type type;
 
-            var configuredTypeName = ConfigurationManager.AppSettings["umbracoRegisterType"];
+            var configuredTypeName = ConfigurationManager.AppSettings[Constants.AppSettings.RegisterType];
             if (configuredTypeName.IsNullOrWhiteSpace())
             {
                 // try to get the web LightInject container type,
diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index b89a4d1dafd5..b9bce30cd89e 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -161,13 +161,13 @@ public string ConfigurationStatus
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoConfigurationStatus")
-                    ? ConfigurationManager.AppSettings["umbracoConfigurationStatus"]
+                return ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.ConfigurationStatus)
+                    ? ConfigurationManager.AppSettings[Constants.AppSettings.ConfigurationStatus]
                     : string.Empty;
             }
             set
             {
-                SaveSetting("umbracoConfigurationStatus", value);
+                SaveSetting(Constants.AppSettings.ConfigurationStatus, value);
             }
         }
         
diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
new file mode 100644
index 000000000000..800f476c2ad0
--- /dev/null
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Defines the identifiers for Umbraco system nodes.
+        /// </summary>
+        public static class AppSettings
+        {
+            public const string RegisterType = "Umbraco.Core.RegisterType";
+
+            public const string ConfigurationStatus = "Umbraco.Core.ConfigurationStatus"; //umbracoConfigurationStatus
+            
+
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 9bf58c8d2f99..0d0e7335911b 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -36,8 +36,8 @@ public override string InitialState
             get
             {
                 // no state in database yet - assume we have something in web.config that makes some sense
-                if (!SemVersion.TryParse(ConfigurationManager.AppSettings["umbracoConfigurationStatus"], out var currentVersion))
-                    throw new InvalidOperationException("Could not get current version from web.config umbracoConfigurationStatus appSetting.");
+                if (!SemVersion.TryParse(ConfigurationManager.AppSettings[Constants.AppSettings.ConfigurationStatus], out var currentVersion))
+                    throw new InvalidOperationException($"Could not get current version from web.config {Constants.AppSettings.ConfigurationStatus} appSetting.");
 
                 // we currently support upgrading from 7.10.0 and later
                 if (currentVersion < new SemVersion(7, 10))
diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoUpgrader.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoUpgrader.cs
index fa29e80a6b05..ac87b8c94df8 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoUpgrader.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoUpgrader.cs
@@ -35,8 +35,8 @@ public void Execute(IScopeProvider scopeProvider, IMigrationBuilder migrationBui
         public override void AfterMigrations(IScope scope, ILogger logger)
         {
             // assume we have something in web.config that makes some sense = the origin version
-            if (!SemVersion.TryParse(ConfigurationManager.AppSettings["umbracoConfigurationStatus"], out var originVersion))
-                throw new InvalidOperationException("Could not get current version from web.config umbracoConfigurationStatus appSetting.");
+            if (!SemVersion.TryParse(ConfigurationManager.AppSettings[Constants.AppSettings.ConfigurationStatus], out var originVersion))
+                throw new InvalidOperationException($"Could not get current version from web.config {Constants.AppSettings.ConfigurationStatus} appSetting.");
 
             // target version is the code version
             var targetVersion = UmbracoVersion.SemanticVersion;
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 4e6e832294d3..64a62d1cf09b 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -285,6 +285,7 @@
     <Compile Include="Constants-Security.cs" />
     <Compile Include="Constants-System.cs" />
     <Compile Include="Constants-Indexes.cs" />
+    <Compile Include="Constants-AppSettings.cs" />
     <Compile Include="Constants-Web.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Composing\RegisterExtensions.cs" />
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 4c5bb57aa25e..6607a288b525 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -4,7 +4,7 @@
   </configSections>
 
   <appSettings>
-    <add key="umbracoConfigurationStatus" value="6.0.0"/>
+    <add key="Umbraco.Core.ConfigurationStatus" value="6.0.0"/>
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
     <add key="umbracoReservedPaths" value="~/install/"/>
     <add key="umbracoPath" value="~/umbraco"/>
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 3790a49cfc9f..49bc8149a98e 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -52,7 +52,7 @@ public void StandaloneTest()
 
             // settings
             // reset the current version to 0.0.0, clear connection strings
-            ConfigurationManager.AppSettings["umbracoConfigurationStatus"] = "";
+            ConfigurationManager.AppSettings[Constants.AppSettings.ConfigurationStatus] = "";
             // FIXME: we need a better management of settings here (and, true config files?)
 
             // create the very basic and essential things we need
diff --git a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
index f0409d89282e..e32df610b9af 100644
--- a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
+++ b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
@@ -26,7 +26,7 @@ public class BackOfficeCookieManagerTests : UmbracoTestBase
         public void ShouldAuthenticateRequest_When_Not_Configured()
         {
             //should force app ctx to show not-configured
-            ConfigurationManager.AppSettings.Set("umbracoConfigurationStatus", "");
+            ConfigurationManager.AppSettings.Set(Constants.AppSettings.ConfigurationStatus, "");
 
             var globalSettings = TestObjects.GetGlobalSettings();
             var umbracoContext = new UmbracoContext(
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 2eb3551797ce..06c055b98e3f 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -30,7 +30,7 @@
     <clientDependency configSource="config\ClientDependency.config" />
 
     <appSettings>
-        <add key="umbracoConfigurationStatus" value="" />
+        <add key="Umbraco.Core.ConfigurationStatus" value="" />
 	    <add key="umbracoReservedUrls" value="" />
         <add key="umbracoReservedPaths" value="" />
         <add key="umbracoPath" value="~/umbraco" />

From d45d0a816ef23346a9b52bc912b9162be5e8de74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 31 Jan 2019 12:58:17 +0100
Subject: [PATCH 224/421] =?UTF-8?q?V8:=20UI=20=E2=80=94=20changed=20colors?=
 =?UTF-8?q?=20for=20selection=20state=20for=20rows=20in=20list-view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/less/buttons.less                      |  3 ++-
 .../less/components/umb-layout-selector.less   |  4 ++--
 .../src/less/components/umb-table.less         | 18 ++++++++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index a246ef585e67..c6a844734258 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -201,7 +201,8 @@ input[type="button"] {
 }
 // Made for Umbraco, 2019
 .btn-selection {
-  .buttonBackground(@pinkLight, ligthen(@pinkLight, 20%), @blueExtraDark, @blueDark);
+    @btnSelectionBackgroundHover: darken(@pinkLight, 10%);
+  .buttonBackground(@pinkLight, @btnSelectionBackgroundHover, @blueExtraDark, @blueDark);
 }
 // Made for Umbraco, 2019, used for buttons that has to stand back.
 .btn-white {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
index adaf45b4b0b7..cf407b667f8e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
@@ -5,7 +5,7 @@
 
 .umb-layout-selector__active-layout {
    box-sizing: border-box;
-   border: 1px solid transparent;
+   border: 1px solid @inputBorder;
    cursor: pointer;
    height: 30px;
    width: 30px;
@@ -16,7 +16,7 @@
 }
 
 .umb-layout-selector__active-layout:hover {
-   border-color: @gray-8;
+   border-color: @inputBorderFocus;
 }
 
 .umb-layout-selector__dropdown {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index c1687636d3f4..291eef43e059 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -90,13 +90,13 @@ input.umb-table__input {
 
 .umb-table-body .umb-table-row {
     color: @gray-5;
-    border-top: 1px solid @gray-8;
+    border-top: 1px solid @gray-9;
     cursor: pointer;
     font-size: 14px;
     position: relative;
     min-height: 52px;
     &:hover {
-        background-color: @gray-10;
+        background-color: @ui-option-hover;
     }
 }
 
@@ -151,12 +151,26 @@ input.umb-table__input {
 
 // Show checkmark when checked, hide file icon
 .umb-table-row--selected {
+    /*
     .umb-table-body__fileicon {
         display: none;
     }
     .umb-table-body__checkicon {
         display: inline-block;
     }
+    */
+    &::before {
+        content: "";
+        position: absolute;
+        z-index:1;
+        top: 1px;
+        left: 1px;
+        right: 1px;
+        bottom: 1px;
+        border: 2px solid @ui-selected-border;
+        box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
+        pointer-events: none;
+    }
 }
 
 // Table Row Styles

From 69f7a1b7b9b2467346af2e7c895aea5d7e7bd37a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 31 Jan 2019 12:05:56 +0000
Subject: [PATCH 225/421] Finish up remaining AppSetting keys as Constants

---
 src/Umbraco.Core/Composing/TypeFinder.cs      |  2 +-
 src/Umbraco.Core/Configuration/CoreDebug.cs   |  4 +-
 .../Configuration/GlobalSettings.cs           | 34 ++++++++---------
 .../Configuration/UmbracoVersion.cs           |  2 +-
 src/Umbraco.Core/Constants-AppSettings.cs     | 37 +++++++++++++++++++
 src/Umbraco.Core/IO/SystemFiles.cs            |  5 ++-
 src/Umbraco.Core/Models/Language.cs           |  2 +-
 .../Persistence/UmbracoDatabaseFactory.cs     |  2 +-
 .../Runtime/CoreRuntimeComposer.cs            |  2 +-
 src/Umbraco.Tests/App.config                  | 15 ++++----
 .../PublishedMediaCache.cs                    |  2 +-
 src/Umbraco.Web.UI/web.Template.config        | 14 +++----
 .../Runtime/WebRuntimeComponent.cs            |  2 +-
 ...eDirectoryBackOfficeUserPasswordChecker.cs |  1 +
 14 files changed, 81 insertions(+), 43 deletions(-)

diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 308d0ecfd7f0..5ad1e4358047 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -32,7 +32,7 @@ private static string[] AssembliesAcceptingLoadExceptions
                 if (_assembliesAcceptingLoadExceptions != null)
                     return _assembliesAcceptingLoadExceptions;
 
-                var s = ConfigurationManager.AppSettings["Umbraco.AssembliesAcceptingLoadExceptions"];
+                var s = ConfigurationManager.AppSettings[Constants.AppSettings.AssembliesAcceptingLoadExceptions];
                 return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
                     ? Array.Empty<string>()
                     : s.Split(',').Select(x => x.Trim()).ToArray();
diff --git a/src/Umbraco.Core/Configuration/CoreDebug.cs b/src/Umbraco.Core/Configuration/CoreDebug.cs
index 3e39eb6db5b6..b24e8a332968 100644
--- a/src/Umbraco.Core/Configuration/CoreDebug.cs
+++ b/src/Umbraco.Core/Configuration/CoreDebug.cs
@@ -7,8 +7,8 @@ internal class CoreDebug
         public CoreDebug()
         {
             var appSettings = System.Configuration.ConfigurationManager.AppSettings;
-            LogUncompletedScopes = string.Equals("true", appSettings["Umbraco.CoreDebug.LogUncompletedScopes"], StringComparison.OrdinalIgnoreCase);
-            DumpOnTimeoutThreadAbort = string.Equals("true", appSettings["Umbraco.CoreDebug.DumpOnTimeoutThreadAbort"], StringComparison.OrdinalIgnoreCase);
+            LogUncompletedScopes = string.Equals("true", appSettings[Constants.AppSettings.Debug.LogUncompletedScopes], StringComparison.OrdinalIgnoreCase);
+            DumpOnTimeoutThreadAbort = string.Equals("true", appSettings[Constants.AppSettings.Debug.DumpOnTimeoutThreadAbort], StringComparison.OrdinalIgnoreCase);
         }
 
         // when true, Scope logs the stack trace for any scope that gets disposed without being completed.
diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index b9bce30cd89e..e30bf85fd066 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -85,8 +85,8 @@ public string ReservedUrls
             {
                 if (_reservedUrls != null) return _reservedUrls;
 
-                var urls = ConfigurationManager.AppSettings.ContainsKey("umbracoReservedUrls")
-                    ? ConfigurationManager.AppSettings["umbracoReservedUrls"]
+                var urls = ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.ReservedUrls)
+                    ? ConfigurationManager.AppSettings[Constants.AppSettings.ReservedUrls]
                     : string.Empty;
 
                 //ensure the built on (non-changeable) reserved paths are there at all times
@@ -107,14 +107,14 @@ public string ReservedPaths
                 if (_reservedPaths != null) return _reservedPaths;
 
                 var reservedPaths = StaticReservedPaths;
-                var umbPath = ConfigurationManager.AppSettings.ContainsKey("umbracoPath") && !ConfigurationManager.AppSettings["umbracoPath"].IsNullOrWhiteSpace()
-                    ? ConfigurationManager.AppSettings["umbracoPath"]
+                var umbPath = ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.Path) && !ConfigurationManager.AppSettings[Constants.AppSettings.Path].IsNullOrWhiteSpace()
+                    ? ConfigurationManager.AppSettings[Constants.AppSettings.Path]
                     : "~/umbraco";
                 //always add the umbraco path to the list
                 reservedPaths += umbPath.EnsureEndsWith(',');
 
-                var allPaths = ConfigurationManager.AppSettings.ContainsKey("umbracoReservedPaths")
-                    ? ConfigurationManager.AppSettings["umbracoReservedPaths"]
+                var allPaths = ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.ReservedPaths)
+                    ? ConfigurationManager.AppSettings[Constants.AppSettings.ReservedPaths]
                     : string.Empty;
 
                 _reservedPaths = reservedPaths + allPaths;
@@ -133,8 +133,8 @@ public string ContentXmlFile
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXML")
-                    ? ConfigurationManager.AppSettings["umbracoContentXML"]
+                return ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.ContentXML)
+                    ? ConfigurationManager.AppSettings[Constants.AppSettings.ContentXML]
                     : "~/App_Data/umbraco.config";
             }
         }
@@ -147,8 +147,8 @@ public string Path
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoPath")
-                    ? IOHelper.ResolveUrl(ConfigurationManager.AppSettings["umbracoPath"])
+                return ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.Path)
+                    ? IOHelper.ResolveUrl(ConfigurationManager.AppSettings[Constants.AppSettings.Path])
                     : string.Empty;
             }
         }
@@ -249,7 +249,7 @@ public int TimeOutInMinutes
             {
                 try
                 {
-                    return int.Parse(ConfigurationManager.AppSettings["umbracoTimeOutInMinutes"]);
+                    return int.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.TimeOutInMinutes]);
                 }
                 catch
                 {
@@ -268,7 +268,7 @@ public int VersionCheckPeriod
             {
                 try
                 {
-                    return int.Parse(ConfigurationManager.AppSettings["umbracoVersionCheckPeriod"]);
+                    return int.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.VersionCheckPeriod]);
                 }
                 catch
                 {
@@ -287,7 +287,7 @@ public LocalTempStorage LocalTempStorageLocation
         {
             get
             {
-                var setting = ConfigurationManager.AppSettings["umbracoLocalTempStorage"];
+                var setting = ConfigurationManager.AppSettings[Constants.AppSettings.LocalTempStorage];
                 if (!string.IsNullOrWhiteSpace(setting))
                     return Enum<LocalTempStorage>.Parse(setting);
 
@@ -304,8 +304,8 @@ public string DefaultUILanguage
         {
             get
             {
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoDefaultUILanguage")
-                    ? ConfigurationManager.AppSettings["umbracoDefaultUILanguage"]
+                return ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.DefaultUILanguage)
+                    ? ConfigurationManager.AppSettings[Constants.AppSettings.DefaultUILanguage]
                     : string.Empty;
             }
         }
@@ -322,7 +322,7 @@ public bool HideTopLevelNodeFromPath
             {
                 try
                 {
-                    return bool.Parse(ConfigurationManager.AppSettings["umbracoHideTopLevelNodeFromPath"]);
+                    return bool.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.HideTopLevelNodeFromPath]);
                 }
                 catch
                 {
@@ -340,7 +340,7 @@ public bool UseHttps
             {
                 try
                 {
-                    return bool.Parse(ConfigurationManager.AppSettings["umbracoUseHttps"]);
+                    return bool.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.UseHttps]);
                 }
                 catch
                 {
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 7ab97500f057..2f615d26b388 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -82,7 +82,7 @@ public static SemVersion LocalVersion
                 try
                 {
                     // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4238 - stop having version in web.config appSettings
-                    var value = ConfigurationManager.AppSettings["umbracoConfigurationStatus"];
+                    var value = ConfigurationManager.AppSettings[Constants.AppSettings.ConfigurationStatus];
                     return value.IsNullOrWhiteSpace() ? null : SemVersion.TryParse(value, out var semver) ? semver : null;
                 }
                 catch
diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index 800f476c2ad0..67f92f404676 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -10,11 +10,48 @@ public static partial class Constants
         /// </summary>
         public static class AppSettings
         {
+            // TODO: Kill me - still used in Umbraco.Core.IO.SystemFiles:27
+            [Obsolete("We need to kill this appsetting as we do not use XML content cache umbraco.config anymore due to NuCache")]
+            public const string ContentXML = "Umbraco.Core.ContentXML"; //umbracoContentXML
+
+
             public const string RegisterType = "Umbraco.Core.RegisterType";
+            
+            public const string PublishedMediaCacheSeconds = "Umbraco.Core.PublishedMediaCacheSeconds"; //"Umbraco.PublishedMediaCache.Seconds"
+
+            public const string AssembliesAcceptingLoadExceptions = "Umbraco.Core.AssembliesAcceptingLoadExceptions"; //Umbraco.AssembliesAcceptingLoadExceptions
 
             public const string ConfigurationStatus = "Umbraco.Core.ConfigurationStatus"; //umbracoConfigurationStatus
+
+            public const string Path = "Umbraco.Core.Path"; //umbracoPath
+
+            public const string ReservedUrls = "Umbraco.Core.ReservedUrls"; //umbracoReservedUrls
+
+            public const string ReservedPaths = "Umbraco.Core.ReservedPaths"; //umbracoReservedPaths
+            
+            public const string TimeOutInMinutes = "Umbraco.Core.TimeOutInMinutes"; //umbracoTimeOutInMinutes
+
+            public const string VersionCheckPeriod = "Umbraco.Core.VersionCheckPeriod"; //umbracoVersionCheckPeriod
+
+            public const string LocalTempStorage = "Umbraco.Core.LocalTempStorage"; //umbracoLocalTempStorage
+
+            public const string DefaultUILanguage = "Umbraco.Core.DefaultUILanguage"; //umbracoDefaultUILanguage
+
+            public const string HideTopLevelNodeFromPath = "Umbraco.Core.HideTopLevelNodeFromPath"; //umbracoHideTopLevelNodeFromPath
+
+            public const string UseHttps = "Umbraco.Core.UseHttps"; //umbracoUseHttps
+
+            public const string DisableElectionForSingleServer = "Umbraco.Core.DisableElectionForSingleServer"; //umbracoDisableElectionForSingleServer
+
+            public const string DatabaseFactoryServerVersion = "Umbraco.Core.DatabaseFactoryServerVersion"; //Umbraco.DatabaseFactory.ServerVersion
             
 
+            public static class Debug
+            {
+                public const string LogUncompletedScopes = "Umbraco.Core.LogUncompletedScopes"; //"Umbraco.CoreDebug.LogUncompletedScopes"
+
+                public const string DumpOnTimeoutThreadAbort = "Umbraco.Core.DumpOnTimeoutThreadAbort"; //Umbraco.CoreDebug.DumpOnTimeoutThreadAbort
+            }
         }
     }
 }
diff --git a/src/Umbraco.Core/IO/SystemFiles.cs b/src/Umbraco.Core/IO/SystemFiles.cs
index 0e5ae8388bfe..f3376901a9fa 100644
--- a/src/Umbraco.Core/IO/SystemFiles.cs
+++ b/src/Umbraco.Core/IO/SystemFiles.cs
@@ -8,7 +8,8 @@ namespace Umbraco.Core.IO
     public class SystemFiles
     {
         public static string TinyMceConfig => SystemDirectories.Config + "/tinyMceConfig.config";
-        
+
+        // TODO: Kill this off we don't have umbraco.config XML cache we now have NuCache
         public static string GetContentCacheXml(IGlobalSettings globalSettings)
         {
             switch (globalSettings.LocalTempStorageLocation)
@@ -24,7 +25,7 @@ public static string GetContentCacheXml(IGlobalSettings globalSettings)
                         appDomainHash);
                     return Path.Combine(cachePath, "umbraco.config");
                 case LocalTempStorage.Default:
-                    return IOHelper.ReturnPath("umbracoContentXML", "~/App_Data/umbraco.config");
+                    return IOHelper.ReturnPath(Constants.AppSettings.ContentXML, "~/App_Data/umbraco.config");
                 default:
                     throw new ArgumentOutOfRangeException();
             }
diff --git a/src/Umbraco.Core/Models/Language.cs b/src/Umbraco.Core/Models/Language.cs
index 03f8f87cd336..b02eb4805c1c 100644
--- a/src/Umbraco.Core/Models/Language.cs
+++ b/src/Umbraco.Core/Models/Language.cs
@@ -67,7 +67,7 @@ public string CultureName
             // culture
             //
             // I assume that, on a site, all language names should be in the SAME language, in DB,
-            // and that would be the umbracoDefaultUILanguage (app setting) - BUT if by accident
+            // and that would be the Umbraco.Core.DefaultUILanguage (app setting) - BUT if by accident
             // ANY culture has been retrieved with another current thread culture - it's now corrupt
             //
             // so, the logic below ensures that the name always end up being the correct name
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
index eab0ae550978..3d0d49a5f0f8 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
@@ -139,7 +139,7 @@ private void DetectSqlServerVersion()
         {
             // replace NPoco database type by a more efficient one
 
-            var setting = ConfigurationManager.AppSettings["Umbraco.DatabaseFactory.ServerVersion"];
+            var setting = ConfigurationManager.AppSettings[Constants.AppSettings.DatabaseFactoryServerVersion];
             var fromSettings = false;
 
             if (setting.IsNullOrWhiteSpace() || !setting.StartsWith("SqlServer.")
diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
index ee289ddcfa38..2d1a4c1650f1 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs
@@ -76,7 +76,7 @@ public override void Compose(Composition composition)
                 // TODO: this is a hack, use proper configuration!
                 // also: we still register the full IServerMessenger because
                 // even on 1 single server we can have 2 concurrent app domains
-                var singleServer = "true".InvariantEquals(ConfigurationManager.AppSettings["umbracoDisableElectionForSingleServer"]);
+                var singleServer = "true".InvariantEquals(ConfigurationManager.AppSettings[Constants.AppSettings.DisableElectionForSingleServer]);
                 return singleServer
                     ? (IServerRegistrar) new SingleServerRegistrar(f.GetInstance<IRuntimeState>())
                     : new DatabaseServerRegistrar(
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 6607a288b525..5e366eef33df 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -5,14 +5,13 @@
 
   <appSettings>
     <add key="Umbraco.Core.ConfigurationStatus" value="6.0.0"/>
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
-    <add key="umbracoReservedPaths" value="~/install/"/>
-    <add key="umbracoPath" value="~/umbraco"/>
-    <add key="umbracoHideTopLevelNodeFromPath" value="true"/>
-    <add key="umbracoUseDirectoryUrls" value="false"/>
-    <add key="umbracoTimeOutInMinutes" value="20"/>
-    <add key="umbracoDefaultUILanguage" value="en"/>
-    <add key="umbracoUseHttps" value="false"/>
+    <add key="Umbraco.Core.ReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
+    <add key="Umbraco.Core.ReservedPaths" value="~/install/"/>
+    <add key="Umbraco.Core.Path" value="~/umbraco"/>
+    <add key="Umbraco.Core.HideTopLevelNodeFromPath" value="true"/>
+    <add key="Umbraco.Core.TimeOutInMinutes" value="20"/>
+    <add key="Umbraco.Core.DefaultUILanguage" value="en"/>
+    <add key="Umbraco.Core.UseHttps" value="false"/>
     <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false"/>
   </appSettings>
 
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
index 8cfc06c50149..c62614ef2290 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
@@ -645,7 +645,7 @@ internal class CacheValues
 
         private static void InitializeCacheConfig()
         {
-            var value = ConfigurationManager.AppSettings["Umbraco.PublishedMediaCache.Seconds"];
+            var value = ConfigurationManager.AppSettings[Constants.AppSettings.PublishedMediaCacheSeconds];
             int seconds;
             if (int.TryParse(value, out seconds) == false)
                 seconds = PublishedMediaCacheTimespanSeconds;
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 06c055b98e3f..d93089fe21da 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -31,13 +31,13 @@
 
     <appSettings>
         <add key="Umbraco.Core.ConfigurationStatus" value="" />
-	    <add key="umbracoReservedUrls" value="" />
-        <add key="umbracoReservedPaths" value="" />
-        <add key="umbracoPath" value="~/umbraco" />
-        <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-        <add key="umbracoTimeOutInMinutes" value="20" />
-        <add key="umbracoDefaultUILanguage" value="en-US" />
-        <add key="umbracoUseHttps" value="false" />
+	    <add key="Umbraco.Core.ReservedUrls" value="" />
+        <add key="Umbraco.Core.ReservedPaths" value="" />
+        <add key="Umbraco.Core.Path" value="~/umbraco" />
+        <add key="Umbraco.Core.HideTopLevelNodeFromPath" value="true" />
+        <add key="Umbraco.Core.TimeOutInMinutes" value="20" />
+        <add key="Umbraco.Core.DefaultUILanguage" value="en-US" />
+        <add key="Umbraco.Core.UseHttps" value="false" />
 
         <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
         <add key="webpages:Enabled" value="false" />
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
index 4fb8dadf1716..123cb952d7e6 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
@@ -248,7 +248,7 @@ private static void ConfigureClientDependency(IGlobalSettings globalSettings)
             XmlFileMapper.FileMapDefaultFolder = SystemDirectories.TempData.EnsureEndsWith('/') + "ClientDependency";
             BaseCompositeFileProcessingProvider.UrlTypeDefault = CompositeUrlType.Base64QueryStrings;
 
-            // Now we need to detect if we are running umbracoLocalTempStorage as EnvironmentTemp and in that case we want to change the CDF file
+            // Now we need to detect if we are running 'Umbraco.Core.LocalTempStorage' as EnvironmentTemp and in that case we want to change the CDF file
             // location to be there
             if (globalSettings.LocalTempStorageLocation == LocalTempStorage.EnvironmentTemp)
             {
diff --git a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
index 5b571f304eb1..036a1718b0d1 100644
--- a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
+++ b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
@@ -13,6 +13,7 @@ public virtual string ActiveDirectoryDomain
         {
             get
             {
+                // TODO: Verify this AppSetting key is used in .NET Framework & canot be changed to Umbraco.Core. prefix
                 return ConfigurationManager.AppSettings["ActiveDirectoryDomain"];
             }
         }

From bc7748aed618019785b62474238b7d26dfed81b9 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 31 Jan 2019 12:37:54 +0000
Subject: [PATCH 226/421] Adds in XML docs summary - still need assitance with
 a few keys so put in some TODOs

---
 src/Umbraco.Core/Composing/RegisterFactory.cs |   2 +-
 src/Umbraco.Core/Constants-AppSettings.cs     | 133 +++++++++++++-----
 .../Persistence/UmbracoDatabaseFactory.cs     |   2 +-
 3 files changed, 102 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Core/Composing/RegisterFactory.cs b/src/Umbraco.Core/Composing/RegisterFactory.cs
index 975de7647d9e..ea25d6a13590 100644
--- a/src/Umbraco.Core/Composing/RegisterFactory.cs
+++ b/src/Umbraco.Core/Composing/RegisterFactory.cs
@@ -18,7 +18,7 @@ public static class RegisterFactory
         /// Creates a new instance of the configured container.
         /// </summary>
         /// <remarks>
-        /// To override the default LightInjectContainer, add an appSetting named umbracoRegisterType with
+        /// To override the default LightInjectContainer, add an appSetting named 'Umbraco.Core.RegisterType' with
         /// a fully qualified type name to a class with a static method "Create" returning an IRegister.
         /// </remarks>
         public static IRegister Create()
diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index 67f92f404676..ac0cbde8dead 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -1,12 +1,11 @@
 using System;
-using System.ComponentModel;
 
 namespace Umbraco.Core
 {
     public static partial class Constants
     {
         /// <summary>
-        /// Defines the identifiers for Umbraco system nodes.
+        /// Specific web.config AppSetting keys for Umbraco.Core application
         /// </summary>
         public static class AppSettings
         {
@@ -14,43 +13,111 @@ public static class AppSettings
             [Obsolete("We need to kill this appsetting as we do not use XML content cache umbraco.config anymore due to NuCache")]
             public const string ContentXML = "Umbraco.Core.ContentXML"; //umbracoContentXML
 
-
+            /// <summary>
+            /// TODO: FILL ME IN
+            /// </summary>
             public const string RegisterType = "Umbraco.Core.RegisterType";
-            
-            public const string PublishedMediaCacheSeconds = "Umbraco.Core.PublishedMediaCacheSeconds"; //"Umbraco.PublishedMediaCache.Seconds"
-
-            public const string AssembliesAcceptingLoadExceptions = "Umbraco.Core.AssembliesAcceptingLoadExceptions"; //Umbraco.AssembliesAcceptingLoadExceptions
-
-            public const string ConfigurationStatus = "Umbraco.Core.ConfigurationStatus"; //umbracoConfigurationStatus
 
-            public const string Path = "Umbraco.Core.Path"; //umbracoPath
+            /// <summary>
+            /// This is used for a unit test in PublishedMediaCache
+            /// </summary>
+            public const string PublishedMediaCacheSeconds = "Umbraco.Core.PublishedMediaCacheSeconds";
+
+            /// <summary>
+            /// TODO: FILL ME IN
+            /// </summary>
+            public const string AssembliesAcceptingLoadExceptions = "Umbraco.Core.AssembliesAcceptingLoadExceptions";
+
+            /// <summary>
+            /// This will return the version number of the currently installed umbraco instance
+            /// </summary>
+            /// <remarks>
+            /// Umbraco will automatically set & modify this value when installing & upgrading
+            /// </remarks>
+            public const string ConfigurationStatus = "Umbraco.Core.ConfigurationStatus";
+
+            /// <summary>
+            /// Gets the path to umbraco's root directory (/umbraco by default).
+            /// </summary>
+            public const string Path = "Umbraco.Core.Path";
+
+            /// <summary>
+            /// The reserved urls from web.config.
+            /// </summary>
+            public const string ReservedUrls = "Umbraco.Core.ReservedUrls";
+
+            /// <summary>
+            /// The reserved paths from web.config
+            /// </summary>
+            public const string ReservedPaths = "Umbraco.Core.ReservedPaths";
+
+            /// <summary>
+            /// Set the timeout for the Umbraco backoffice in minutes
+            /// </summary>
+            public const string TimeOutInMinutes = "Umbraco.Core.TimeOutInMinutes";
+
+            /// <summary>
+            /// The number of days to check for a new version of Umbraco
+            /// </summary>
+            /// <remarks>
+            /// Default is set to 7. Setting this to 0 will never check
+            /// This is used to help track statistics
+            /// </remarks>
+            public const string VersionCheckPeriod = "Umbraco.Core.VersionCheckPeriod";
+
+            /// <summary>
+            /// This is the location type to store temporary files such as cache files or other localized files for a given machine
+            /// </summary>
+            /// <remarks>
+            /// Currently used for the xml cache file and the plugin cache files
+            /// </remarks>
+            public const string LocalTempStorage = "Umbraco.Core.LocalTempStorage";
+
+            /// <summary>
+            /// The default UI language of the backoffice such as 'en-US'
+            /// </summary>
+            public const string DefaultUILanguage = "Umbraco.Core.DefaultUILanguage";
+
+            /// <summary>
+            /// A true/false value indicating whether umbraco should hide top level nodes from generated urls.
+            /// </summary>
+            public const string HideTopLevelNodeFromPath = "Umbraco.Core.HideTopLevelNodeFromPath";
+
+            /// <summary>
+            /// A true or false indicating whether umbraco should force a secure (https) connection to the backoffice.
+            /// </summary>
+            public const string UseHttps = "Umbraco.Core.UseHttps";
+
+            /// <summary>
+            /// TODO: FILL ME IN
+            /// </summary>
+            public const string DisableElectionForSingleServer = "Umbraco.Core.DisableElectionForSingleServer";
 
-            public const string ReservedUrls = "Umbraco.Core.ReservedUrls"; //umbracoReservedUrls
-
-            public const string ReservedPaths = "Umbraco.Core.ReservedPaths"; //umbracoReservedPaths
             
-            public const string TimeOutInMinutes = "Umbraco.Core.TimeOutInMinutes"; //umbracoTimeOutInMinutes
-
-            public const string VersionCheckPeriod = "Umbraco.Core.VersionCheckPeriod"; //umbracoVersionCheckPeriod
-
-            public const string LocalTempStorage = "Umbraco.Core.LocalTempStorage"; //umbracoLocalTempStorage
-
-            public const string DefaultUILanguage = "Umbraco.Core.DefaultUILanguage"; //umbracoDefaultUILanguage
-
-            public const string HideTopLevelNodeFromPath = "Umbraco.Core.HideTopLevelNodeFromPath"; //umbracoHideTopLevelNodeFromPath
-
-            public const string UseHttps = "Umbraco.Core.UseHttps"; //umbracoUseHttps
-
-            public const string DisableElectionForSingleServer = "Umbraco.Core.DisableElectionForSingleServer"; //umbracoDisableElectionForSingleServer
-
-            public const string DatabaseFactoryServerVersion = "Umbraco.Core.DatabaseFactoryServerVersion"; //Umbraco.DatabaseFactory.ServerVersion
-            
-
+            /// <summary>
+            /// Debug specific web.config AppSetting keys for Umbraco
+            /// </summary>
+            /// <remarks>
+            /// Do not use these keys in a production environment
+            /// </remarks>
             public static class Debug
             {
-                public const string LogUncompletedScopes = "Umbraco.Core.LogUncompletedScopes"; //"Umbraco.CoreDebug.LogUncompletedScopes"
-
-                public const string DumpOnTimeoutThreadAbort = "Umbraco.Core.DumpOnTimeoutThreadAbort"; //Umbraco.CoreDebug.DumpOnTimeoutThreadAbort
+                /// <summary>
+                /// When set to true, Scope logs the stack trace for any scope that gets disposed without being completed.
+                /// this helps troubleshooting rogue scopes that we forget to complete
+                /// </summary>
+                public const string LogUncompletedScopes = "Umbraco.Core.Debug.LogUncompletedScopes";
+
+                /// <summary>
+                /// When set to true, the Logger creates a mini dump of w3wp in ~/App_Data/MiniDump whenever it logs
+                /// an error due to a ThreadAbortException that is due to a timeout.
+                /// </summary>
+                public const string DumpOnTimeoutThreadAbort = "Umbraco.Core.Debug.DumpOnTimeoutThreadAbort";
+
+                /// <summary>
+                /// TODO: FILL ME IN
+                /// </summary>
+                public const string DatabaseFactoryServerVersion = "Umbraco.Core.Debug.DatabaseFactoryServerVersion";
             }
         }
     }
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
index 3d0d49a5f0f8..681eb1232ec6 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
@@ -139,7 +139,7 @@ private void DetectSqlServerVersion()
         {
             // replace NPoco database type by a more efficient one
 
-            var setting = ConfigurationManager.AppSettings[Constants.AppSettings.DatabaseFactoryServerVersion];
+            var setting = ConfigurationManager.AppSettings[Constants.AppSettings.Debug.DatabaseFactoryServerVersion];
             var fromSettings = false;
 
             if (setting.IsNullOrWhiteSpace() || !setting.StartsWith("SqlServer.")

From 14c43d76c112a42f0de3e67de592b0f2eee6257d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 31 Jan 2019 13:37:47 +0000
Subject: [PATCH 227/421] Adds OEmbedProviders to the composition extension to
 make it easier to add/append the collection

---
 src/Umbraco.Web/CompositionExtensions.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index 6039d97a723d..4302cdaeee6b 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -6,6 +6,7 @@
 using Umbraco.Web.Dashboards;
 using Umbraco.Web.Editors;
 using Umbraco.Web.HealthCheck;
+using Umbraco.Web.Media.EmbedProviders;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
@@ -101,6 +102,13 @@ public static BackOfficeSectionCollectionBuilder Sections(this Composition compo
         public static DashboardCollectionBuilder Dashboards(this Composition composition)
             => composition.WithCollectionBuilder<DashboardCollectionBuilder>();
 
+        /// <summary>
+        /// Gets the backoffice OEmbed Providers collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static EmbedProvidersCollectionBuilder OEmbedProviders(this Composition composition)
+            => composition.WithCollectionBuilder<EmbedProvidersCollectionBuilder>();
+
         #endregion
 
         #region Uniques

From 3199aa6693655c5dc1ccc7f27230073f84bf3c08 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 31 Jan 2019 14:03:09 +0100
Subject: [PATCH 228/421] Support culture in content Saving and Publishing
 events

---
 src/Umbraco.Core/Events/EventNameExtractor.cs |  29 ++-
 src/Umbraco.Core/Models/Content.cs            |  47 ++--
 src/Umbraco.Core/Models/ContentBase.cs        |  14 +-
 .../Models/ContentCultureInfosCollection.cs   |   4 +-
 ...ContentCultureInfosCollectionExtensions.cs |  12 +
 src/Umbraco.Core/Models/IContent.cs           |  24 ++
 src/Umbraco.Core/Models/IContentBase.cs       |  17 ++
 .../Implement/DocumentRepository.cs           |   3 +
 .../Services/Implement/ContentService.cs      |   5 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 .../Services/AmbiguousEventTests.cs           |  78 ++++++
 .../Services/ContentServiceEventTests.cs      | 224 ++++++++++++++++++
 .../Services/ContentServiceTests.cs           |  32 +--
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   6 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   2 +
 15 files changed, 431 insertions(+), 67 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/ContentCultureInfosCollectionExtensions.cs
 create mode 100644 src/Umbraco.Tests/Services/AmbiguousEventTests.cs
 create mode 100644 src/Umbraco.Tests/Services/ContentServiceEventTests.cs

diff --git a/src/Umbraco.Core/Events/EventNameExtractor.cs b/src/Umbraco.Core/Events/EventNameExtractor.cs
index 5cb9ca64efbc..627426f2ee63 100644
--- a/src/Umbraco.Core/Events/EventNameExtractor.cs
+++ b/src/Umbraco.Core/Events/EventNameExtractor.cs
@@ -35,6 +35,24 @@ internal class EventNameExtractor
         /// null if not found or an ambiguous match
         /// </returns>
         public static Attempt<EventNameExtractorResult> FindEvent(Type senderType, Type argsType, Func<string, bool> exclude)
+        {
+            var events = FindEvents(senderType, argsType, exclude);
+
+            switch (events.Length)
+            {
+                case 0:
+                    return Attempt.Fail(new EventNameExtractorResult(EventNameExtractorError.NoneFound));
+
+                case 1:
+                    return Attempt.Succeed(new EventNameExtractorResult(events[0]));
+
+                default:
+                    //there's more than one left so it's ambiguous!
+                    return Attempt.Fail(new EventNameExtractorResult(EventNameExtractorError.Ambiguous));
+            }
+        }
+
+        internal static string[] FindEvents(Type senderType, Type argsType, Func<string, bool> exclude)
         {
             var found = MatchedEventNames.GetOrAdd(new Tuple<Type, Type>(senderType, argsType), tuple =>
             {
@@ -78,16 +96,7 @@ public static Attempt<EventNameExtractorResult> FindEvent(Type senderType, Type
                 }).Select(x => x.EventInfo.Name).ToArray();
             });
 
-            var filtered = found.Where(x => exclude(x) == false).ToArray();
-
-            if (filtered.Length == 0)
-                return Attempt.Fail(new EventNameExtractorResult(EventNameExtractorError.NoneFound));
-
-            if (filtered.Length == 1)
-                return Attempt.Succeed(new EventNameExtractorResult(filtered[0]));
-
-            //there's more than one left so it's ambiguous!
-            return Attempt.Fail(new EventNameExtractorResult(EventNameExtractorError.Ambiguous));
+            return found.Where(x => exclude(x) == false).ToArray();
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 0c679e5e70ec..1093ef3a0c1a 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -15,14 +15,12 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Content : ContentBase, IContent
     {
-        private IContentType _contentType;
         private int? _templateId;
         private ContentScheduleCollection _schedule;
         private bool _published;
         private PublishedState _publishedState;
-        private ContentCultureInfosCollection _publishInfos;
-        private ContentCultureInfosCollection _publishInfosOrig;
         private HashSet<string> _editedCultures;
+        private ContentCultureInfosCollection _publishInfos, _publishInfos1, _publishInfos2;
 
         private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
 
@@ -48,7 +46,7 @@ public Content(string name, IContent parent, IContentType contentType, string cu
         public Content(string name, IContent parent, IContentType contentType, PropertyCollection properties, string culture = null)
             : base(name, parent, contentType, properties, culture)
         {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
+            ContentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
             _publishedState = PublishedState.Unpublished;
             PublishedVersionId = 0;
         }
@@ -75,7 +73,7 @@ public Content(string name, int parentId, IContentType contentType, string cultu
         public Content(string name, int parentId, IContentType contentType, PropertyCollection properties, string culture = null)
             : base(name, parentId, contentType, properties, culture)
         {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
+            ContentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
             _publishedState = PublishedState.Unpublished;
             PublishedVersionId = 0;
         }
@@ -137,7 +135,6 @@ public int? TemplateId
             set => SetPropertyValueAndDetectChanges(value, ref _templateId, Ps.Value.TemplateSelector);
         }
 
-
         /// <summary>
         /// Gets or sets a value indicating whether this content item is published or not.
         /// </summary>
@@ -181,7 +178,7 @@ public PublishedState PublishedState
         /// Gets the ContentType used by this content object
         /// </summary>
         [IgnoreDataMember]
-        public IContentType ContentType => _contentType;
+        public IContentType ContentType { get; private set; }
 
         /// <inheritdoc />
         [IgnoreDataMember]
@@ -217,7 +214,7 @@ public bool IsCulturePublished(string culture)
         public bool WasCulturePublished(string culture)
             // just check _publishInfosOrig - a copy of _publishInfos
             // a non-available culture could not become published anyways
-            => _publishInfosOrig != null && _publishInfosOrig.ContainsKey(culture);
+            => _publishInfos1 != null && _publishInfos1.ContainsKey(culture);
 
         // adjust dates to sync between version, cultures etc
         // used by the repo when persisting
@@ -228,7 +225,7 @@ internal void AdjustDates(DateTime date)
                 if (_publishInfos == null || !_publishInfos.TryGetValue(culture, out var publishInfos))
                     continue;
 
-                if (_publishInfosOrig != null && _publishInfosOrig.TryGetValue(culture, out var publishInfosOrig)
+                if (_publishInfos1 != null && _publishInfos1.TryGetValue(culture, out var publishInfosOrig)
                     && publishInfosOrig.Date == publishInfos.Date)
                     continue;
 
@@ -285,6 +282,24 @@ internal void SetPublishInfo(string culture, string name, DateTime date)
             _publishInfos.AddOrUpdate(culture, name, date);
         }
 
+        // internal for repository
+        internal void AknPublishInfo()
+        {
+            _publishInfos1 = _publishInfos2 = new ContentCultureInfosCollection(_publishInfos);
+        }
+
+        /// <inheritdoc />
+        public bool IsPublishingCulture(string culture) => _publishInfos.IsCultureUpdated(_publishInfos1, culture);
+
+        /// <inheritdoc />
+        public bool IsUnpublishingCulture(string culture) => _publishInfos.IsCultureRemoved(_publishInfos1, culture);
+
+        /// <inheritdoc />
+        public bool HasPublishedCulture(string culture) => _publishInfos1.IsCultureUpdated(_publishInfos2, culture);
+
+        /// <inheritdoc />
+        public bool HasUnpublishedCulture(string culture) => _publishInfos1.IsCultureRemoved(_publishInfos2, culture);
+
         private void ClearPublishInfos()
         {
             _publishInfos = null;
@@ -300,7 +315,7 @@ private void ClearPublishInfo(string culture)
             if (_publishInfos.Count == 0) _publishInfos = null;
 
             // set the culture to be dirty - it's been modified
-            TouchCultureInfo(culture);
+            TouchCulture(culture);
         }
 
         // sets a publish edited
@@ -423,7 +438,7 @@ public void UnpublishCulture(string culture = "*")
         public void ChangeContentType(IContentType contentType)
         {
             ContentTypeId = contentType.Id;
-            _contentType = contentType;
+            ContentType = contentType;
             ContentTypeBase = contentType;
             Properties.EnsurePropertyTypes(PropertyTypes);
 
@@ -442,7 +457,7 @@ public void ChangeContentType(IContentType contentType, bool clearProperties)
             if(clearProperties)
             {
                 ContentTypeId = contentType.Id;
-                _contentType = contentType;
+                ContentType = contentType;
                 ContentTypeBase = contentType;
                 Properties.EnsureCleanPropertyTypes(PropertyTypes);
 
@@ -457,16 +472,18 @@ public void ChangeContentType(IContentType contentType, bool clearProperties)
         public override void ResetDirtyProperties(bool rememberDirty)
         {
             base.ResetDirtyProperties(rememberDirty);
-            
+
             if (ContentType != null)
                 ContentType.ResetDirtyProperties(rememberDirty);
 
             // take care of the published state
             _publishedState = _published ? PublishedState.Published : PublishedState.Unpublished;
 
+            _publishInfos2 = _publishInfos1;
+
             // Make a copy of the _publishInfos, this is purely so that we can detect
             // if this entity's previous culture publish state (regardless of the rememberDirty flag)
-            _publishInfosOrig = _publishInfos == null
+            _publishInfos1 = _publishInfos == null
                 ? null
                 : new ContentCultureInfosCollection(_publishInfos);
 
@@ -500,7 +517,7 @@ protected override void PerformDeepClone(object clone)
             var clonedContent = (Content)clone;
 
             //need to manually clone this since it's not settable
-            clonedContent._contentType = (IContentType) ContentType.DeepClone();
+            clonedContent.ContentType = (IContentType) ContentType.DeepClone();
 
             //if culture infos exist then deal with event bindings
             if (clonedContent._publishInfos != null)
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index ca1152a9a42b..e540866c3eae 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -25,7 +25,7 @@ public abstract class ContentBase : TreeEntityBase, IContentBase
         protected IContentTypeComposition ContentTypeBase;
         private int _writerId;
         private PropertyCollection _properties;
-        private ContentCultureInfosCollection _cultureInfos;
+        private ContentCultureInfosCollection _cultureInfos, _cultureInfos1, _cultureInfos2;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ContentBase"/> class.
@@ -222,7 +222,8 @@ protected void ClearCultureInfo(string culture)
                 _cultureInfos = null;
         }
 
-        protected void TouchCultureInfo(string culture)
+        /// <inheritdoc />
+        public void TouchCulture(string culture)
         {
             if (_cultureInfos == null || !_cultureInfos.TryGetValue(culture, out var infos)) return;
             _cultureInfos.AddOrUpdate(culture, infos.Name, DateTime.Now);
@@ -400,6 +401,9 @@ public override void ResetDirtyProperties(bool rememberDirty)
             foreach (var prop in Properties)
                 prop.ResetDirtyProperties(rememberDirty);
 
+            _cultureInfos2 = _cultureInfos1;
+            _cultureInfos1 = _cultureInfos == null ? null : new ContentCultureInfosCollection(_cultureInfos);
+
             // take care of culture infos
             if (_cultureInfos == null) return;
 
@@ -475,6 +479,12 @@ public override IEnumerable<string> GetWereDirtyProperties()
             return instanceProperties.Concat(propertyTypes);
         }
 
+        /// <inheritdoc />
+        public bool IsSavingCulture(string culture) => _cultureInfos.IsCultureUpdated(_cultureInfos1, culture);
+
+        /// <inheritdoc />
+        public bool HasSavedCulture(string culture) => _cultureInfos1.IsCultureUpdated(_cultureInfos2, culture);
+
         #endregion
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs b/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
index 82b0ba6475a0..287182d20e31 100644
--- a/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
+++ b/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
@@ -31,7 +31,7 @@ public ContentCultureInfosCollection(IEnumerable<ContentCultureInfos> items)
             foreach (var item in items)
                 Add(new ContentCultureInfos(item));
         }
-        
+
         /// <summary>
         /// Adds or updates a <see cref="ContentCultureInfos"/> instance.
         /// </summary>
@@ -53,7 +53,7 @@ public void AddOrUpdate(string culture, string name, DateTime date)
                     Name = name,
                     Date = date
                 });
-            }    
+            }
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Models/ContentCultureInfosCollectionExtensions.cs b/src/Umbraco.Core/Models/ContentCultureInfosCollectionExtensions.cs
new file mode 100644
index 000000000000..98a0b48d07e1
--- /dev/null
+++ b/src/Umbraco.Core/Models/ContentCultureInfosCollectionExtensions.cs
@@ -0,0 +1,12 @@
+namespace Umbraco.Core.Models
+{
+    public static class ContentCultureInfosCollectionExtensions
+    {
+        public static bool IsCultureUpdated(this ContentCultureInfosCollection to, ContentCultureInfosCollection from, string culture)
+            => to != null && to.ContainsKey(culture) &&
+               (from == null || !from.ContainsKey(culture) || from[culture].Date != to[culture].Date);
+
+        public static bool IsCultureRemoved(this ContentCultureInfosCollection to, ContentCultureInfosCollection from, string culture)
+            => (to == null || !to.ContainsKey(culture)) && from != null && from.ContainsKey(culture);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index 4363324c8da1..d0f47bc2f2ee 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -177,5 +177,29 @@ public interface IContent : IContentBase
         /// <para>Unpublishing must be finalized via the content service SavePublishing method.</para>
         /// </remarks>
         void UnpublishCulture(string culture = "*");
+
+        /// <summary>
+        /// Determines whether a culture is being published, during a Publishing event.
+        /// </summary>
+        /// <remarks>Outside of a Publishing event handler, the returned value is unspecified.</remarks>
+        bool IsPublishingCulture(string culture);
+
+        /// <summary>
+        /// Determines whether a culture is being unpublished, during a Publishing event.
+        /// </summary>
+        /// <remarks>Outside of a Publishing event handler, the returned value is unspecified.</remarks>
+        bool IsUnpublishingCulture(string culture);
+
+        /// <summary>
+        /// Determines whether a culture has been published, during a Published event.
+        /// </summary>
+        /// <remarks>Outside of a Published event handler, the returned value is unspecified.</remarks>
+        bool HasPublishedCulture(string culture);
+
+        /// <summary>
+        /// Determines whether a culture has been unpublished, during a Published event.
+        /// </summary>
+        /// <remarks>Outside of a Published event handler, the returned value is unspecified.</remarks>
+        bool HasUnpublishedCulture(string culture);
     }
 }
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index 40a1c570977e..d2a928f97853 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -143,5 +143,22 @@ public interface IContentBase : IUmbracoEntity
         /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither 'null' nor
         /// 'empty'. If the content type is invariant, then culture can be either '*' or null or empty.</para>
         Property[] ValidateProperties(string culture = "*");
+
+        /// <summary>
+        /// Determines whether a culture is being saved, during a Saving event.
+        /// </summary>
+        /// <remarks>Outside of a Saving event handler, the returned value is unspecified.</remarks>
+        bool IsSavingCulture(string culture);
+
+        /// <summary>
+        /// Determines whether a culture has been saved, during a Saved event.
+        /// </summary>
+        /// <remarks>Outside of a Saved event handler, the returned value is unspecified.</remarks>
+        bool HasSavedCulture(string culture);
+
+        /// <summary>
+        /// Updates a culture date, if the culture exists.
+        /// </summary>
+        void TouchCulture(string culture);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 6af7031883b8..70f3bd807184 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -1188,8 +1188,11 @@ private void SetVariations(Content content, IDictionary<int, List<ContentVariati
                 foreach (var v in contentVariation)
                     content.SetCultureInfo(v.Culture, v.Name, v.Date);
             if (content.PublishedVersionId > 0 && contentVariations.TryGetValue(content.PublishedVersionId, out contentVariation))
+            {
                 foreach (var v in contentVariation)
                     content.SetPublishInfo(v.Culture, v.Name, v.Date);
+                content.AknPublishInfo();
+            }
             if (documentVariations.TryGetValue(content.Id, out var documentVariation))
                 foreach (var v in documentVariation.Where(x => x.Edited))
                     content.SetCultureEdited(v.Culture);
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 266f34cc3729..804fe35dd1f9 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using Umbraco.Core.Events;
 using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
@@ -27,18 +26,16 @@ public class ContentService : RepositoryService, IContentService
         private readonly IContentTypeRepository _contentTypeRepository;
         private readonly IDocumentBlueprintRepository _documentBlueprintRepository;
         private readonly ILanguageRepository _languageRepository;
-        private readonly IMediaFileSystem _mediaFileSystem;
         private IQuery<IContent> _queryNotTrashed;
 
         #region Constructors
 
         public ContentService(IScopeProvider provider, ILogger logger,
-            IEventMessagesFactory eventMessagesFactory, IMediaFileSystem mediaFileSystem,
+            IEventMessagesFactory eventMessagesFactory,
             IDocumentRepository documentRepository, IEntityRepository entityRepository, IAuditRepository auditRepository,
             IContentTypeRepository contentTypeRepository, IDocumentBlueprintRepository documentBlueprintRepository, ILanguageRepository languageRepository)
             : base(provider, logger, eventMessagesFactory)
         {
-            _mediaFileSystem = mediaFileSystem;
             _documentRepository = documentRepository;
             _entityRepository = entityRepository;
             _auditRepository = auditRepository;
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 4e6e832294d3..e4fbfb3892bb 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -388,6 +388,7 @@
     <Compile Include="Models\Consent.cs" />
     <Compile Include="Models\ConsentExtensions.cs" />
     <Compile Include="Models\ConsentState.cs" />
+    <Compile Include="Models\ContentCultureInfosCollectionExtensions.cs" />
     <Compile Include="Models\ContentEditing\ContentApp.cs" />
     <Compile Include="Models\ContentEditing\IContentAppFactory.cs" />
     <Compile Include="Models\ContentSchedule.cs" />
diff --git a/src/Umbraco.Tests/Services/AmbiguousEventTests.cs b/src/Umbraco.Tests/Services/AmbiguousEventTests.cs
new file mode 100644
index 000000000000..e137da118825
--- /dev/null
+++ b/src/Umbraco.Tests/Services/AmbiguousEventTests.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Reflection;
+using System.Text;
+using NUnit.Framework;
+using Umbraco.Core.Events;
+using Umbraco.Core.Services.Implement;
+
+namespace Umbraco.Tests.Services
+{
+    [TestFixture]
+    public class AmbiguousEventTests
+    {
+        [Explicit]
+        [TestCase(typeof(ContentService))]
+        [TestCase(typeof(MediaService))]
+        public void ListAmbiguousEvents(Type serviceType)
+        {
+            var typedEventHandler = typeof(TypedEventHandler<,>);
+
+            // get all events
+            var events = serviceType.GetEvents(BindingFlags.Static | BindingFlags.Public);
+
+            string TypeName(Type type)
+            {
+                if (!type.IsGenericType)
+                    return type.Name;
+                var sb = new StringBuilder();
+                TypeNameSb(type, sb);
+                return sb.ToString();
+            }
+
+            void TypeNameSb(Type type, StringBuilder sb)
+            {
+                var name = type.Name;
+                var pos = name.IndexOf('`');
+                name = pos > 0 ? name.Substring(0, pos) : name;
+                sb.Append(name);
+                if (!type.IsGenericType)
+                    return;
+                sb.Append("<");
+                var first = true;
+                foreach (var arg in type.GetGenericArguments())
+                {
+                    if (first) first = false;
+                    else sb.Append(", ");
+                    TypeNameSb(arg, sb);
+                }
+                sb.Append(">");
+            }
+
+            foreach (var e in events)
+            {
+                // only continue if this is a TypedEventHandler
+                if (!e.EventHandlerType.IsGenericType) continue;
+                var typeDef = e.EventHandlerType.GetGenericTypeDefinition();
+                if (typedEventHandler != typeDef) continue;
+
+                // get the event args type
+                var eventArgsType = e.EventHandlerType.GenericTypeArguments[1];
+
+                // try to find the event back, based upon sender type + args type
+                // exclude -ing (eg Saving) events, we don't deal with them in EventDefinitionBase (they always trigger)
+                var found = EventNameExtractor.FindEvents(serviceType, eventArgsType, EventNameExtractor.MatchIngNames);
+
+                if (found.Length == 1) continue;
+
+                if (found.Length == 0)
+                {
+                    Console.WriteLine($"{typeof(ContentService).Name}  {e.Name}  {TypeName(eventArgsType)}  NotFound");
+                    continue;
+                }
+
+                Console.WriteLine($"{typeof(ContentService).Name}  {e.Name}  {TypeName(eventArgsType)}  Ambiguous");
+                Console.WriteLine("\t" + string.Join(", ", found));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Services/ContentServiceEventTests.cs b/src/Umbraco.Tests/Services/ContentServiceEventTests.cs
new file mode 100644
index 000000000000..3576425b9cf5
--- /dev/null
+++ b/src/Umbraco.Tests/Services/ContentServiceEventTests.cs
@@ -0,0 +1,224 @@
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Tests.Testing;
+
+namespace Umbraco.Tests.Services
+{
+    [TestFixture]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest,
+        PublishedRepositoryEvents = true,
+        WithApplication = true,
+        Logger = UmbracoTestOptions.Logger.Console)]
+    public class ContentServiceEventTests : TestWithSomeContentBase
+    {
+        public override void SetUp()
+        {
+            base.SetUp();
+            ContentRepositoryBase.ThrowOnWarning = true;
+        }
+
+        public override void TearDown()
+        {
+            ContentRepositoryBase.ThrowOnWarning = false;
+            base.TearDown();
+        }
+
+        [Test]
+        public void SavingTest()
+        {
+            var languageService = ServiceContext.LocalizationService;
+
+            languageService.Save(new Language("fr-FR"));
+
+            var contentTypeService = ServiceContext.ContentTypeService;
+
+            var contentType = MockedContentTypes.CreateTextPageContentType();
+            ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
+            contentType.Variations = ContentVariation.Culture;
+            foreach (var propertyType in contentType.PropertyTypes)
+                propertyType.Variations = ContentVariation.Culture;
+            contentTypeService.Save(contentType);
+
+            var contentService = ServiceContext.ContentService;
+
+            var document = new Content("content", -1, contentType);
+            document.SetCultureName("hello", "en-US");
+            document.SetCultureName("bonjour", "fr-FR");
+            contentService.Save(document);
+
+            // properties: title, bodyText, keywords, description
+            document.SetValue("title", "title-en", "en-US");
+
+            // touch the culture - required for IsSaving/HasSaved to work
+            document.TouchCulture("fr-FR");
+
+            void OnSaving(IContentService sender, SaveEventArgs<IContent> e)
+            {
+                var saved = e.SavedEntities.First();
+
+                Assert.AreSame(document, saved);
+
+                Assert.IsTrue(saved.IsSavingCulture("fr-FR"));
+                Assert.IsFalse(saved.IsSavingCulture("en-UK"));
+            }
+
+            void OnSaved(IContentService sender, SaveEventArgs<IContent> e)
+            {
+                var saved = e.SavedEntities.First();
+
+                Assert.AreSame(document, saved);
+
+                Assert.IsTrue(saved.HasSavedCulture("fr-FR"));
+                Assert.IsFalse(saved.HasSavedCulture("en-UK"));
+            }
+
+            ContentService.Saving += OnSaving;
+            ContentService.Saved += OnSaved;
+            contentService.Save(document);
+            ContentService.Saving -= OnSaving;
+            ContentService.Saved -= OnSaved;
+        }
+
+        [Test]
+        public void PublishingTest()
+        {
+            var languageService = ServiceContext.LocalizationService;
+
+            languageService.Save(new Language("fr-FR"));
+
+            var contentTypeService = ServiceContext.ContentTypeService;
+
+            var contentType = MockedContentTypes.CreateTextPageContentType();
+            ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
+            contentType.Variations = ContentVariation.Culture;
+            foreach (var propertyType in contentType.PropertyTypes)
+                propertyType.Variations = ContentVariation.Culture;
+            contentTypeService.Save(contentType);
+
+            var contentService = ServiceContext.ContentService;
+
+            var document = new Content("content", -1, contentType);
+            document.SetCultureName("hello", "en-US");
+            document.SetCultureName("bonjour", "fr-FR");
+            contentService.Save(document);
+
+            // ensure it works and does not throw
+            Assert.IsFalse(document.WasCulturePublished("fr-FR"));
+            Assert.IsFalse(document.WasCulturePublished("en-US"));
+            Assert.IsFalse(document.IsCulturePublished("fr-FR"));
+            Assert.IsFalse(document.IsCulturePublished("en-US"));
+
+            void OnPublishing(IContentService sender, PublishEventArgs<IContent> e)
+            {
+                var publishing = e.PublishedEntities.First();
+
+                Assert.AreSame(document, publishing);
+
+                Assert.IsFalse(publishing.IsPublishingCulture("en-US"));
+                Assert.IsTrue(publishing.IsPublishingCulture("fr-FR"));
+            }
+
+            void OnPublished(IContentService sender, PublishEventArgs<IContent> e)
+            {
+                var published = e.PublishedEntities.First();
+
+                Assert.AreSame(document, published);
+
+                Assert.IsFalse(published.HasPublishedCulture("en-US"));
+                Assert.IsTrue(published.HasPublishedCulture("fr-FR"));
+            }
+
+            ContentService.Publishing += OnPublishing;
+            ContentService.Published += OnPublished;
+            contentService.SaveAndPublish(document, "fr-FR");
+            ContentService.Publishing -= OnPublishing;
+            ContentService.Published -= OnPublished;
+
+            document = (Content) contentService.GetById(document.Id);
+
+            // ensure it works and does not throw
+            Assert.IsTrue(document.WasCulturePublished("fr-FR"));
+            Assert.IsFalse(document.WasCulturePublished("en-US"));
+            Assert.IsTrue(document.IsCulturePublished("fr-FR"));
+            Assert.IsFalse(document.IsCulturePublished("en-US"));
+        }
+
+        [Test]
+        public void UnpublishingTest()
+        {
+            var languageService = ServiceContext.LocalizationService;
+
+            languageService.Save(new Language("fr-FR"));
+
+            var contentTypeService = ServiceContext.ContentTypeService;
+
+            var contentType = MockedContentTypes.CreateTextPageContentType();
+            ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
+            contentType.Variations = ContentVariation.Culture;
+            foreach (var propertyType in contentType.PropertyTypes)
+                propertyType.Variations = ContentVariation.Culture;
+            contentTypeService.Save(contentType);
+
+            var contentService = ServiceContext.ContentService;
+
+            var document = new Content("content", -1, contentType);
+            document.SetCultureName("hello", "en-US");
+            document.SetCultureName("bonjour", "fr-FR");
+            contentService.SaveAndPublish(document);
+
+            // ensure it works and does not throw
+            Assert.IsTrue(document.WasCulturePublished("fr-FR"));
+            Assert.IsTrue(document.WasCulturePublished("en-US"));
+            Assert.IsTrue(document.IsCulturePublished("fr-FR"));
+            Assert.IsTrue(document.IsCulturePublished("en-US"));
+
+            void OnPublishing(IContentService sender, PublishEventArgs<IContent> e)
+            {
+                var publishing = e.PublishedEntities.First();
+
+                Assert.AreSame(document, publishing);
+
+                Assert.IsFalse(publishing.IsPublishingCulture("en-US"));
+                Assert.IsFalse(publishing.IsPublishingCulture("fr-FR"));
+
+                Assert.IsFalse(publishing.IsUnpublishingCulture("en-US"));
+                Assert.IsTrue(publishing.IsUnpublishingCulture("fr-FR"));
+            }
+
+            void OnPublished(IContentService sender, PublishEventArgs<IContent> e)
+            {
+                var published = e.PublishedEntities.First();
+
+                Assert.AreSame(document, published);
+
+                Assert.IsFalse(published.HasPublishedCulture("en-US"));
+                Assert.IsFalse(published.HasPublishedCulture("fr-FR"));
+
+                Assert.IsFalse(published.HasUnpublishedCulture("en-US"));
+                Assert.IsTrue(published.HasUnpublishedCulture("fr-FR"));
+            }
+
+            document.UnpublishCulture("fr-FR");
+
+            ContentService.Publishing += OnPublishing;
+            ContentService.Published += OnPublished;
+            contentService.SavePublishing(document);
+            ContentService.Publishing -= OnPublishing;
+            ContentService.Published -= OnPublished;
+
+            document = (Content) contentService.GetById(document.Id);
+
+            // ensure it works and does not throw
+            Assert.IsFalse(document.WasCulturePublished("fr-FR"));
+            Assert.IsTrue(document.WasCulturePublished("en-US"));
+            Assert.IsFalse(document.IsCulturePublished("fr-FR"));
+            Assert.IsTrue(document.IsCulturePublished("en-US"));
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 37d34557bb8f..e339d8d1b678 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -6,7 +6,6 @@
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
@@ -14,14 +13,11 @@
 using Umbraco.Core.Events;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories.Implement;
-using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.Testing;
-using System.Reflection;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 
 namespace Umbraco.Tests.Services
 {
@@ -60,32 +56,6 @@ protected override void Compose()
             Composition.RegisterUnique(factory => Mock.Of<ILocalizedTextService>());
         }
 
-        /// <summary>
-        /// Used to list out all ambiguous events that will require dispatching with a name
-        /// </summary>
-        [Test, Explicit]
-        public void List_Ambiguous_Events()
-        {
-            var events = ServiceContext.ContentService.GetType().GetEvents(BindingFlags.Static | BindingFlags.Public);
-            var typedEventHandler = typeof(TypedEventHandler<,>);
-            foreach(var e in events)
-            {
-                //only continue if this is a TypedEventHandler
-                if (!e.EventHandlerType.IsGenericType) continue;
-                var typeDef = e.EventHandlerType.GetGenericTypeDefinition();
-                if (typedEventHandler != typeDef) continue;
-
-                //get the event arg type
-                var eventArgType = e.EventHandlerType.GenericTypeArguments[1];
-
-                var found = EventNameExtractor.FindEvent(typeof(ContentService), eventArgType, EventNameExtractor.MatchIngNames);
-                if (!found.Success && found.Result.Error == EventNameExtractorError.Ambiguous)
-                {
-                    Console.WriteLine($"Ambiguous event, source: {typeof(ContentService)}, args: {eventArgType}");
-                }
-            }
-        }
-
         [Test]
         public void Create_Blueprint()
         {
@@ -818,7 +788,7 @@ public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_St
             content.PublishCulture(langGB.IsoCode);
             content.PublishCulture(langFr.IsoCode);
             Assert.IsTrue(ServiceContext.ContentService.SavePublishing(content).Success);
-           
+
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.AreEqual(PublishedState.Published, content.PublishedState);
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 7a9702031b86..46af5d9e717b 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -153,7 +153,7 @@ public ServiceContext GetServiceContext(
             var localizationService = GetLazyService<ILocalizationService>(factory, c => new LocalizationService(scopeProvider, logger, eventMessagesFactory, GetRepo<IDictionaryRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<ILanguageRepository>(c)));
             var userService = GetLazyService<IUserService>(factory, c => new UserService(scopeProvider, logger, eventMessagesFactory, runtimeState, GetRepo<IUserRepository>(c), GetRepo<IUserGroupRepository>(c),globalSettings));
             var dataTypeService = GetLazyService<IDataTypeService>(factory, c => new DataTypeService(scopeProvider, logger, eventMessagesFactory, GetRepo<IDataTypeRepository>(c), GetRepo<IDataTypeContainerRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IEntityRepository>(c), GetRepo<IContentTypeRepository>(c)));
-            var contentService = GetLazyService<IContentService>(factory, c => new ContentService(scopeProvider, logger, eventMessagesFactory, mediaFileSystem, GetRepo<IDocumentRepository>(c), GetRepo<IEntityRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IContentTypeRepository>(c), GetRepo<IDocumentBlueprintRepository>(c), GetRepo<ILanguageRepository>(c)));
+            var contentService = GetLazyService<IContentService>(factory, c => new ContentService(scopeProvider, logger, eventMessagesFactory, GetRepo<IDocumentRepository>(c), GetRepo<IEntityRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IContentTypeRepository>(c), GetRepo<IDocumentBlueprintRepository>(c), GetRepo<ILanguageRepository>(c)));
             var notificationService = GetLazyService<INotificationService>(factory, c => new NotificationService(scopeProvider, userService.Value, contentService.Value, localizationService.Value, logger, GetRepo<INotificationsRepository>(c), globalSettings, umbracoSettings.Content));
             var serverRegistrationService = GetLazyService<IServerRegistrationService>(factory, c => new ServerRegistrationService(scopeProvider, logger, eventMessagesFactory, GetRepo<IServerRegistrationRepository>(c)));
             var memberGroupService = GetLazyService<IMemberGroupService>(factory, c => new MemberGroupService(scopeProvider, logger, eventMessagesFactory, GetRepo<IMemberGroupRepository>(c)));
@@ -176,7 +176,7 @@ public ServiceContext GetServiceContext(
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var compiledPackageXmlParser = new CompiledPackageXmlParser(new ConflictingPackageData(macroService.Value, fileService.Value));
                 return new PackagingService(
-                    auditService.Value, 
+                    auditService.Value,
                     new PackagesRepository(contentService.Value, contentTypeService.Value, dataTypeService.Value, fileService.Value, macroService.Value, localizationService.Value,
                         new EntityXmlSerializer(contentService.Value, mediaService.Value, dataTypeService.Value, userService.Value, localizationService.Value, contentTypeService.Value, urlSegmentProviders), logger, "createdPackages.config"),
                     new PackagesRepository(contentService.Value, contentTypeService.Value, dataTypeService.Value, fileService.Value, macroService.Value, localizationService.Value,
@@ -188,7 +188,7 @@ public ServiceContext GetServiceContext(
                         new DirectoryInfo(IOHelper.GetRootDirectorySafe())));
             });
             var relationService = GetLazyService<IRelationService>(factory, c => new RelationService(scopeProvider, logger, eventMessagesFactory, entityService.Value, GetRepo<IRelationRepository>(c), GetRepo<IRelationTypeRepository>(c)));
-            var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));            
+            var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));
             var redirectUrlService = GetLazyService<IRedirectUrlService>(factory, c => new RedirectUrlService(scopeProvider, logger, eventMessagesFactory, GetRepo<IRedirectUrlRepository>(c)));
             var consentService = GetLazyService<IConsentService>(factory, c => new ConsentService(scopeProvider, logger, eventMessagesFactory, GetRepo<IConsentRepository>(c)));
 
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 986dad12fdd4..1703743c6f6a 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -141,6 +141,8 @@
     <Compile Include="PublishedContent\NuCacheTests.cs" />
     <Compile Include="Runtimes\StandaloneTests.cs" />
     <Compile Include="Routing\GetContentUrlsTests.cs" />
+    <Compile Include="Services\AmbiguousEventTests.cs" />
+    <Compile Include="Services\ContentServiceEventTests.cs" />
     <Compile Include="Services\ContentServicePublishBranchTests.cs" />
     <Compile Include="Services\ContentServiceTagsTests.cs" />
     <Compile Include="Services\ContentTypeServiceVariantsTests.cs" />

From 6bf3b19d8624f2ea991eacf632ee0edd31f1daa7 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 31 Jan 2019 15:09:57 +0100
Subject: [PATCH 229/421] #4068 - Fix for ordering of grid

---
 .../propertyeditors/grid/grid.controller.js   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index be9212828009..f7e69a268366 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -60,8 +60,8 @@ angular.module("umbraco")
             start: function (e, ui) {
 
                 // Fade out row when sorting
-                ui.item.context.style.display = "block";
-                ui.item.context.style.opacity = "0.5";
+                ui.item[0].style.display = "block";
+                ui.item[0].style.opacity = "0.5";
 
                 draggedRteSettings = {};
                 ui.item.find(".mceNoEditor").each(function () {
@@ -75,7 +75,7 @@ angular.module("umbraco")
             stop: function (e, ui) {
 
                 // Fade in row when sorting stops
-                ui.item.context.style.opacity = "1";
+                ui.item[0].style.opacity = "1";
 
                 // reset all RTEs affected by the dragging
                 ui.item.parents(".umb-column").find(".mceNoEditor").each(function () {
@@ -185,12 +185,12 @@ angular.module("umbraco")
                 startingArea = area;
 
                 // fade out control when sorting
-                ui.item.context.style.display = "block";
-                ui.item.context.style.opacity = "0.5";
+                ui.item[0].style.display = "block";
+                ui.item[0].style.opacity = "0.5";
 
                 // reset dragged RTE settings in case a RTE isn't dragged
                 draggedRteSettings = undefined;
-                ui.item.context.style.display = "block";
+                ui.item[0].style.display = "block";
                 ui.item.find(".mceNoEditor").each(function () {
                     notIncludedRte = [];
                     var editors = _.findWhere(tinyMCE.editors, { id: $(this).attr("id") });
@@ -210,7 +210,7 @@ angular.module("umbraco")
             stop: function (e, ui) {
 
                 // Fade in control when sorting stops
-                ui.item.context.style.opacity = "1";
+                ui.item[0].style.opacity = "1";
 
                 ui.item.offsetParent().find(".mceNoEditor").each(function () {
                     if ($.inArray($(this).attr("id"), notIncludedRte) < 0) {
@@ -400,7 +400,7 @@ angular.module("umbraco")
         }
 
         $scope.editGridItemSettings = function (gridItem, itemType) {
-
+            
             placeHolder = "{0}";
 
             var styles, config;
@@ -658,7 +658,7 @@ angular.module("umbraco")
         // *********************************************
         $scope.initContent = function () {
             var clear = true;
-
+            
             //settings indicator shortcut
             if (($scope.model.config.items.config && $scope.model.config.items.config.length > 0) || ($scope.model.config.items.styles && $scope.model.config.items.styles.length > 0)) {
                 $scope.hasSettings = true;
@@ -755,7 +755,7 @@ angular.module("umbraco")
         // Init layout / row
         // *********************************************
         $scope.initRow = function (row) {
-
+            
             //merge the layout data with the original config data
             //if there are no config info on this, splice it out
             var original = _.find($scope.model.config.items.layouts, function (o) { return o.name === row.name; });

From 4a480ab3918be8f0bce3c57027bd2ce750a361ba Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 31 Jan 2019 15:10:19 +0100
Subject: [PATCH 230/421] #4068 - Added interceptor to remove `$` variables
 from post data

---
 .../src/common/interceptors/_module.js        |  1 +
 ...tpostdollarvariablesrequest.interceptor.js | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
index 765f44a636d6..05263cebf238 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
@@ -6,4 +6,5 @@ angular.module('umbraco.interceptors', [])
 
         $httpProvider.interceptors.push('securityInterceptor');
         $httpProvider.interceptors.push('debugRequestInterceptor');
+        $httpProvider.interceptors.push('doNotPostDollarVariablesOnPostRequestInterceptor');
     }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
new file mode 100644
index 000000000000..0a5f6d837da5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
@@ -0,0 +1,38 @@
+(function() {
+   'use strict';
+   
+    function removeProperty(obj, propertyPrefix) {
+        for (var property in obj) {
+            if (obj.hasOwnProperty(property)) {
+                
+                if (property.startsWith(propertyPrefix) && obj[property]) {
+                    obj[property] = undefined;
+                }
+                
+                if (typeof obj[property] == "object") {
+                    removeProperty(obj[property], propertyPrefix);
+                }
+            }
+        }
+        
+    }
+    
+    function transform(data){
+        removeProperty(data, "$");
+    }
+    
+    function doNotPostDollarVariablesRequestInterceptor($q, urlHelper) {
+        return {
+            //dealing with requests:
+            'request': function(config) {
+                if(config.method === "POST"){
+                    config.transformRequest.push(transform);
+                }
+                
+                return config;
+            }
+        };
+   }
+
+    angular.module('umbraco.interceptors').factory('doNotPostDollarVariablesOnPostRequestInterceptor', doNotPostDollarVariablesRequestInterceptor);
+})();

From eeaf8d594ddc569faa5c73df4c4db700102e0943 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 31 Jan 2019 19:43:57 +0100
Subject: [PATCH 231/421] Make NC resilient towards culture variance in
 elements

---
 .../PropertyEditors/NestedContentPropertyEditor.cs     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
index 7ff6439e08e8..6dee2f78b53b 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
@@ -172,18 +172,16 @@ public override object ToEditor(Property property, IDataTypeService dataTypeServ
                             try
                             {
                                 // create a temp property with the value
+                                // - force it to be culture invariant as NC can't handle culture variant element properties
+                                propType.Variations = ContentVariation.Nothing;
                                 var tempProp = new Property(propType);
-                                // if the property varies by culture, make sure we save using the current culture
-                                var propCulture = propType.VariesByCulture() || propType.VariesByCultureAndSegment()
-                                    ? culture
-                                    : null;
-                                tempProp.SetValue(propValues[propAlias] == null ? null : propValues[propAlias].ToString(), propCulture);
+                                tempProp.SetValue(propValues[propAlias] == null ? null : propValues[propAlias].ToString());
 
                                 // convert that temp property, and store the converted value
                                 var propEditor = _propertyEditors[propType.PropertyEditorAlias];
                                 var tempConfig = dataTypeService.GetDataType(propType.DataTypeId).Configuration;
                                 var valEditor = propEditor.GetValueEditor(tempConfig);
-                                var convValue = valEditor.ToEditor(tempProp, dataTypeService, propCulture);
+                                var convValue = valEditor.ToEditor(tempProp, dataTypeService);
                                 propValues[propAlias] = convValue == null ? null : JToken.FromObject(convValue);
                             }
                             catch (InvalidOperationException)

From f74a49f5a3e1bbf411fa32128526eaa385eae991 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 10:18:53 +1100
Subject: [PATCH 232/421] Gets the macros being able to be updated, now to fix
 the Classic mode, since this now only works in distraction free mode

---
 .../src/common/services/tinymce.service.js    | 36 +++++++++++--------
 src/Umbraco.Web/Routing/PublishedRequest.cs   |  1 -
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 90cb793a9128..39d69158c9a2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -458,7 +458,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 		 */
         createInsertMacro: function (editor, callback) {
 
-            var createInsertMacroScope = this;
+            let self = this;
+            let activeMacroElement = null; //track an active macro element
 
             /** Adds custom rules for the macro plugin and custom serialization */
             editor.on('preInit', function (args) {
@@ -481,7 +482,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                 //get all macro divs and load their content
                 $(editor.dom.select(".umb-macro-holder.mceNonEditable")).each(function () {
-                    createInsertMacroScope.loadMacroContent($(this), null);
+                    self.loadMacroContent($(this), null);
                 });
 
             });
@@ -511,18 +512,18 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 tooltip: 'Insert macro',
                 onPostRender: function () {
 
-                    var ctrl = this;
-
+                    let ctrl = this;
+                    
 					/**
 					 * Check if the macro is currently selected and toggle the menu button
 					 */
                     function onNodeChanged(evt) {
 
                         //set our macro button active when on a node of class umb-macro-holder
-                        var $macroElement = $(evt.element).closest(".umb-macro-holder");
+                        activeMacroElement = getRealMacroElem(evt.element);
 
                         //set the button active/inactive
-                        ctrl.active($macroElement.length !== 0);
+                        ctrl.active(activeMacroElement !== null);
                     }
 
                     //NOTE: This could be another way to deal with the active/inactive state
@@ -543,11 +544,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                     //when we click we could have a macro already selected and in that case we'll want to edit the current parameters
                     //so we'll need to extract them and submit them to the dialog.
-                    var macroElement = editor.selection.getNode();
-                    macroElement = getRealMacroElem(macroElement);
-                    if (macroElement) {
+                    if (activeMacroElement) {
                         //we have a macro selected so we'll need to parse it's alias and parameters
-                        var contents = $(macroElement).contents();
+                        var contents = $(activeMacroElement).contents();
                         var comment = _.find(contents, function (item) {
                             return item.nodeType === 8;
                         });
@@ -557,7 +556,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                         var syntax = comment.textContent.trim();
                         var parsed = macroService.parseMacroSyntax(syntax);
                         dialogData = {
-                            macroData: parsed
+                            macroData: parsed,
+                            activeMacroElement: activeMacroElement //pass the active element along so we can retrieve it later
                         };
                     }
 
@@ -570,7 +570,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             });
         },
 
-        insertMacroInEditor: function (editor, macroObject) {
+        insertMacroInEditor: function (editor, macroObject, activeMacroElement) {
 
             //Important note: the TinyMce plugin "noneditable" is used here so that the macro cannot be edited,
             // for this to work the mceNonEditable class needs to come last and we also need to use the attribute contenteditable = false
@@ -588,7 +588,13 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 },
                 macroSyntaxComment + '<ins>Macro alias: <strong>' + macroObject.macroAlias + '</strong></ins>');
 
-            editor.selection.setNode(macroDiv);
+            //if there's an activeMacroElement then replace it, otherwise set the contents of the selected node
+            if (activeMacroElement) {
+                activeMacroElement.replaceWith(macroDiv); //directly replaces the html node
+            }
+            else {
+                editor.selection.setNode(macroDiv);
+            }
 
             var $macroDiv = $(editor.dom.select("div.umb-macro-holder." + uniqueId));
 
@@ -1126,7 +1132,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 }
             });
 
-            var self = this;
+            let self = this;
 
             //create link picker
             self.createLinkPicker(args.editor, function (currentTarget, anchorElement) {
@@ -1184,7 +1190,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                     dialogData: dialogData,
                     submit: function (model) {
                         var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
-                        self.insertMacroInEditor(args.editor, macroObject);
+                        self.insertMacroInEditor(args.editor, macroObject, dialogData.activeMacroElement);
                         editorService.close();
                     },
                     close: function () {
diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs
index c5475f8b73f2..a2ff71e6348f 100644
--- a/src/Umbraco.Web/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedRequest.cs
@@ -279,7 +279,6 @@ public void SetTemplate(ITemplate template)
         /// <summary>
         /// Resets the template.
         /// </summary>
-        /// <remarks>The <c>RenderingEngine</c> becomes unknown.</remarks>
         public void ResetTemplate()
         {
             EnsureWriteable();

From 452badab41580ca362e7fac017d2c2039116cd12 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 11:27:40 +1100
Subject: [PATCH 233/421] Fixes tag editor for proper dirty tracking and model
 updating, the models weren't being updated correctly

---
 .../tags/umbtagseditor.directive.js           | 37 ++++++++++++++-----
 .../propertyeditors/tags/tags.controller.js   |  5 +--
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index 1850445bd46d..4d10625d23cc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -52,7 +52,8 @@
 
                 vm.isLoading = false;
 
-                configureViewModel();
+                //ensure that the models are formatted correctly
+                configureViewModel(true);
 
                 // Set the visible prompt to -1 to ensure it will not be visible
                 vm.promptIsVisible = "-1";
@@ -123,9 +124,13 @@
             });
         }
 
+        /**
+         * Watch for value changes
+         * @param {any} changes
+         */
         function onChanges(changes) {
 
-            // watch for value changes externally
+            //when the model 'value' changes, sync the viewModel object
             if (changes.value) {
                 if (!changes.value.isFirstChange() && changes.value.currentValue !== changes.value.previousValue) {
 
@@ -145,13 +150,15 @@
             $element.find('.tags-' + vm.htmlId).typeahead('destroy');
         }
 
-        function configureViewModel() {
+        function configureViewModel(isInitLoad) {
             if (vm.value) {
                 if (angular.isString(vm.value) && vm.value.length > 0) {
                     if (vm.config.storageType === "Json") {
                         //json storage
                         vm.viewModel = JSON.parse(vm.value);
-                        updateModelValue(vm.viewModel);
+                        if (!isInitLoad) {
+                            updateModelValue(vm.viewModel);
+                        }
                     }
                     else {
                         //csv storage
@@ -165,7 +172,10 @@
                             return self.indexOf(v) === i;
                         });
 
-                        updateModelValue(vm.viewModel);
+                        if (!isInitLoad) {
+                            updateModelValue(vm.viewModel);
+                        }
+                        
                     }
                 }
                 else if (angular.isArray(vm.value)) {
@@ -175,13 +185,18 @@
         }
 
         function updateModelValue(val) {
-            if (val) {
-                vm.onValueChanged({ value: val });
+
+            //need to format the underlying model value for persistence based on the storage type
+            if (vm.config.storageType === "Json") {
+                val = val ? val : [];
             }
             else {
-                vm.onValueChanged({ value: [] });
+                //then it is csv and we need to format it like that
+                val = val ? val.join() : "";
             }
 
+            vm.onValueChanged({ value: val });
+
             reValidate();
         }
 
@@ -273,8 +288,10 @@
         }
 
         function reValidate() {
-            //this is required to re-validate
-            vm.tagEditorForm.tagCount.$setViewValue(vm.viewModel.length);
+            //this is required to re-validate for the mandatory validation
+            if (vm.tagEditorForm && vm.tagEditorForm.tagCount) {
+                vm.tagEditorForm.tagCount.$setViewValue(vm.viewModel.length);
+            }
         }
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
index a61930f87758..688ac7693f03 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
@@ -1,12 +1,9 @@
 angular.module("umbraco")
 .controller("Umbraco.PropertyEditors.TagsController",
-    function ($scope, angularHelper) {
+    function ($scope) {
 
         $scope.valueChanged = function(value) {
             $scope.model.value = value;
-            // the model value seems to be a reference to the same array, so we need
-            // to set the form as dirty explicitly when the content of the array changes
-            angularHelper.getCurrentForm($scope).$setDirty();
         }
 
     }

From dae8dfdc59cbf3dd423208851ef0769a2a0de991 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 11:34:28 +1100
Subject: [PATCH 234/421] fix merge

---
 src/Umbraco.Web/Templates/TemplateRenderer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index dc8ca0b16d4f..df711a084ea8 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -26,12 +26,12 @@ namespace Umbraco.Web.Templates
     internal class TemplateRenderer : ITemplateRenderer
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly PublishedRouter _publishedRouter;
+        private readonly IPublishedRouter _publishedRouter;
         private readonly IFileService _fileService;
         private readonly ILocalizationService _languageService;
         private readonly IWebRoutingSection _webRoutingSection;
 
-        public TemplateRenderer(IUmbracoContextAccessor umbracoContextAccessor, PublishedRouter publishedRouter, IFileService fileService, ILocalizationService textService, IWebRoutingSection webRoutingSection)
+        public TemplateRenderer(IUmbracoContextAccessor umbracoContextAccessor, IPublishedRouter publishedRouter, IFileService fileService, ILocalizationService textService, IWebRoutingSection webRoutingSection)
         {
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
             _publishedRouter = publishedRouter ?? throw new ArgumentNullException(nameof(publishedRouter));

From 7614ba42df7b1ef33575e58bbfc068ad50149619 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 13:32:17 +1100
Subject: [PATCH 235/421] Fixes the tag editor and tag suggestions

---
 .../tags/umbtagseditor.directive.js           | 85 +++++++------------
 .../Editors/BackOfficeServerVariables.cs      |  2 +-
 .../PropertyEditors/TagsDataController.cs     | 24 +++++-
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index 4d10625d23cc..edf54ca034a8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -24,10 +24,10 @@
 
     function umbTagsEditorController($rootScope, assetsService, umbRequestHelper, angularHelper, $timeout, $element) {
 
-        var vm = this;
+        let vm = this;
 
-        var typeahead;
-        var tagsHound;
+        let typeahead;
+        let tagsHound;
 
         vm.$onInit = onInit;
         vm.$onChanges = onChanges;
@@ -53,50 +53,51 @@
                 vm.isLoading = false;
 
                 //ensure that the models are formatted correctly
-                configureViewModel(true);
+                configureViewModel();
 
                 // Set the visible prompt to -1 to ensure it will not be visible
                 vm.promptIsVisible = "-1";
 
                 tagsHound = new Bloodhound({
-                    datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
+                    initialize: false,
+                    identify: function (obj) { return obj.id; },
+                    datumTokenizer: Bloodhound.tokenizers.obj.whitespace('text'),
                     queryTokenizer: Bloodhound.tokenizers.whitespace,
                     //pre-fetch the tags for this category
                     prefetch: {
                         url: umbRequestHelper.getApiUrl("tagsDataBaseUrl", "GetTags", { tagGroup: vm.config.group, culture: vm.culture }),
                         //TTL = 5 minutes
-                        ttl: 300000,
-                        transform: dataTransform
+                        ttl: 300000
                     },
                     //dynamically get the tags for this category (they may have changed on the server)
                     remote: {
-                        url: umbRequestHelper.getApiUrl("tagsDataBaseUrl", "GetTags", { tagGroup: vm.config.group, culture: vm.culture }),
-                        transform: dataTransform
+                        url: umbRequestHelper.getApiUrl("tagsDataBaseUrl", "GetTags", { tagGroup: vm.config.group, culture: vm.culture, query: "%QUERY" }),
+                        wildcard: "%QUERY"
                     }
                 });
 
-                tagsHound.initialize(true);
-
-                //configure the type ahead
-                $timeout(function () {
+                tagsHound.initialize().then(function() {
 
+                    //configure the type ahead
+                    
                     var sources = {
                         //see: https://github.com/twitter/typeahead.js/blob/master/doc/jquery_typeahead.md#options
-                        // name = the data set name, we'll make this the tag group name
-                        name: vm.config.group,
-                        display: "value",
+                        // name = the data set name, we'll make this the tag group name + culture
+                        name: vm.config.group + (vm.culture ? vm.culture : ""),
+                        display: "text",
                         //source: tagsHound
-                        source: function (query, cb) {
+                        source: function (query, syncCallback, asyncCallback) {
                             tagsHound.search(query,
                                 function(suggestions) {
-                                    cb(removeCurrentTagsFromSuggestions(suggestions));
+                                    syncCallback(removeCurrentTagsFromSuggestions(suggestions));
+                                }, function(suggestions) {
+                                    asyncCallback(removeCurrentTagsFromSuggestions(suggestions));
                                 });
                         }
                     };
 
                     var opts = {
-                        //This causes some strangeness as it duplicates the textbox, best leave off for now.
-                        hint: false,
+                        hint: true,
                         highlight: true,
                         cacheKey: new Date(),  // Force a cache refresh each time the control is initialized
                         minLength: 1
@@ -105,22 +106,25 @@
                     typeahead = $element.find('.tags-' + vm.htmlId).typeahead(opts, sources)
                         .bind("typeahead:selected", function (obj, datum, name) {
                             angularHelper.safeApply($rootScope, function () {
-                                addTagInternal(datum["value"]);
+                                addTagInternal(datum["text"]);
                                 vm.tagToAdd = "";
                                 // clear the typed text
                                 typeahead.typeahead('val', '');
                             });
                         }).bind("typeahead:autocompleted", function (obj, datum, name) {
                             angularHelper.safeApply($rootScope, function () {
-                                addTagInternal(datum["value"]);
+                                addTagInternal(datum["text"]);
                                 vm.tagToAdd = "";
+                                // clear the typed text
+                                typeahead.typeahead('val', '');
                             });
 
                         }).bind("typeahead:opened", function (obj) {
 
                         });
-                });
 
+                });
+                
             });
         }
 
@@ -150,15 +154,13 @@
             $element.find('.tags-' + vm.htmlId).typeahead('destroy');
         }
 
-        function configureViewModel(isInitLoad) {
+        function configureViewModel() {
             if (vm.value) {
                 if (angular.isString(vm.value) && vm.value.length > 0) {
                     if (vm.config.storageType === "Json") {
                         //json storage
                         vm.viewModel = JSON.parse(vm.value);
-                        if (!isInitLoad) {
-                            updateModelValue(vm.viewModel);
-                        }
+                        updateModelValue(vm.viewModel);
                     }
                     else {
                         //csv storage
@@ -172,9 +174,7 @@
                             return self.indexOf(v) === i;
                         });
 
-                        if (!isInitLoad) {
-                            updateModelValue(vm.viewModel);
-                        }
+                        updateModelValue(vm.viewModel);
                         
                     }
                 }
@@ -186,14 +186,7 @@
 
         function updateModelValue(val) {
 
-            //need to format the underlying model value for persistence based on the storage type
-            if (vm.config.storageType === "Json") {
-                val = val ? val : [];
-            }
-            else {
-                //then it is csv and we need to format it like that
-                val = val ? val.join() : "";
-            }
+            val = val ? val : [];
 
             vm.onValueChanged({ value: val });
 
@@ -267,23 +260,11 @@
         function hidePrompt() {
             vm.promptIsVisible = "-1";
         }
-
-        //helper method to format the data for bloodhound
-        function dataTransform(list) {
-            //transform the result to what bloodhound wants
-            var tagList = _.map(list, function (i) {
-                return { value: i.text };
-            });
-            // remove current tags from the list
-            return $.grep(tagList, function (tag) {
-                return ($.inArray(tag.value, vm.viewModel) === -1);
-            });
-        }
-
+        
         // helper method to remove current tags
         function removeCurrentTagsFromSuggestions(suggestions) {
             return $.grep(suggestions, function (suggestion) {
-                return ($.inArray(suggestion.value, vm.viewModel) === -1);
+                return ($.inArray(suggestion.text, vm.viewModel) === -1);
             });
         }
 
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 83bb152e0aa1..954491eab9ae 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -259,7 +259,7 @@ internal Dictionary<string, object> GetServerVariables()
                         },
                         {
                             "tagsDataBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<TagsDataController>(
-                                controller => controller.GetTags("", ""))
+                                controller => controller.GetTags("", "", null))
                         },
                         {
                             "examineMgmtBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<ExamineManagementController>(
diff --git a/src/Umbraco.Web/PropertyEditors/TagsDataController.cs b/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
index 15c39bf994cc..7d699077c39f 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
@@ -15,10 +17,28 @@ namespace Umbraco.Web.PropertyEditors
     [PluginController("UmbracoApi")]
     public class TagsDataController : UmbracoAuthorizedApiController
     {
-        public IEnumerable<TagModel> GetTags(string tagGroup, string culture)
+        /// <summary>
+        /// Returns all tags matching tagGroup, culture and an optional query
+        /// </summary>
+        /// <param name="tagGroup"></param>
+        /// <param name="culture"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<TagModel> GetTags(string tagGroup, string culture, string query = null)
         {
             if (culture == string.Empty) culture = null;
-            return Umbraco.TagQuery.GetAllTags(tagGroup, culture);
+
+            var result = Umbraco.TagQuery.GetAllTags(tagGroup, culture);
+
+            
+            if (!query.IsNullOrWhiteSpace())
+            {
+                //TODO: add the query to TagQuery + the tag service, this is ugly but all we can do for now.
+                //currently we are post filtering this :( but works for now
+                result = result.Where(x => x.Text.InvariantContains(query));
+            }
+
+            return result.OrderBy(x => x.Text);
         }
     }
 }

From 3eb6cd9e217b51e50396f45031260b4caa93d7c7 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 13:50:39 +1100
Subject: [PATCH 236/421] Macros are now working inline in the rte with both
 the Classic and Distraction free modes

---
 .../src/common/services/tinymce.service.js       |  6 +++++-
 src/Umbraco.Web.UI.Client/src/less/rte.less      | 16 ----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 39d69158c9a2..a0fbbc19d64a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -232,7 +232,11 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
                     body_class: 'umb-rte',
                     //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
-                    cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster
+                    cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster,
+
+                    //this is used to style the inline macro bits, sorry hard coding this form now since we don't have a standalone
+                    //stylesheet to load in for this with only these styles (the color is @pinkLight)
+                    content_style: ".mce-content-body .umb-macro-holder { border: 3px dotted #f5c1bc; padding: 7px; display: block; margin: 3px; } .umb-rte .mce-content-body .umb-macro-holder.loading {background: url(assets/img/loader.gif) right no-repeat; background-size: 18px; background-position-x: 99%;}"
                 };
 
                 if (tinyMceConfig.customConfig) {
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index d9888eb9d3fd..ba8d02c1e1e7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -25,22 +25,6 @@
     padding:10px;
 }
 
-/* loader for macro loading in tinymce*/
-.mce-content-body .umb-macro-holder {
-    border: 3px dotted @pinkLight;
-    padding: 7px;
-    display: block;
-    margin: 3px;
-} 
-.umb-rte .mce-content-body .umb-macro-holder.loading {
-    
-    /*fixme: this image doesn't exist*/
-
-    background: url(img/loader.gif) right no-repeat;
-    background-size: 18px;
-    background-position-x: 99%;
-}
-
 .umb-rte .mce-container {
     box-sizing: border-box;
 }

From d7d82ea98d41206bbe157598cab6ba5709958df0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 14:02:45 +1100
Subject: [PATCH 237/421] Allows grid rte to be distraction-free, the parameter
 was not being passed but it can be configured

---
 .../common/directives/components/grid/grid.rte.directive.js    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index 0a8846f97596..6472dd3d3841 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -30,7 +30,8 @@ angular.module("umbraco.directives")
                 promises.push(tinyMceService.getTinyMceEditorConfig({
                     htmlId: scope.uniqueId,
                     stylesheets: scope.configuration ? scope.configuration.stylesheets : null,
-                    toolbar: toolbar
+                    toolbar: toolbar,
+                    mode: scope.configuration.mode
                 }));
 
                 // pin toolbar to top of screen if we have focus and it scrolls off the screen

From c2ff32aaab2e36204f5b464d80f655cd062142be Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 15:24:07 +1100
Subject: [PATCH 238/421] Fixing tests, don't expose UmbracoContext on
 UmbracoHelper, fixing all of the editor constructors

---
 .../TestControllerActivator.cs                |   8 +-
 .../TestControllerActivatorBase.cs            |   4 +-
 .../ControllerTesting/TestRunner.cs           |   4 +-
 .../ControllerTesting/TestStartup.cs          |   4 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  17 +++
 .../Web/Controllers/ContentControllerTests.cs | 114 ++++++++++++++----
 .../Web/Controllers/UsersControllerTests.cs   |  46 +++++--
 .../BackOfficeNotificationsController.cs      |  14 ++-
 src/Umbraco.Web/Editors/CodeFileController.cs |   7 ++
 src/Umbraco.Web/Editors/ContentController.cs  |   5 +-
 .../Editors/ContentControllerBase.cs          |   7 ++
 src/Umbraco.Web/Editors/DataTypeController.cs |   5 +-
 .../Editors/DictionaryController.cs           |  10 ++
 src/Umbraco.Web/Editors/MacrosController.cs   |   7 +-
 src/Umbraco.Web/Editors/MediaController.cs    |   4 +-
 src/Umbraco.Web/Editors/MemberController.cs   |   5 +-
 .../RedirectUrlManagementController.cs        |   4 +-
 .../Editors/RelationTypeController.cs         |   9 ++
 src/Umbraco.Web/Editors/TemplateController.cs |  10 ++
 src/Umbraco.Web/Editors/UsersController.cs    |   6 +
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |  11 +-
 src/Umbraco.Web/UmbracoHelper.cs              |  17 +--
 22 files changed, 245 insertions(+), 73 deletions(-)

diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs
index 73762d4e918e..2f7e50ea1ee6 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs
@@ -7,16 +7,16 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
 {
     public class TestControllerActivator : TestControllerActivatorBase
     {
-        private readonly Func<HttpRequestMessage, UmbracoHelper, ApiController> _factory;
+        private readonly Func<HttpRequestMessage, UmbracoContext, UmbracoHelper, ApiController> _factory;
 
-        public TestControllerActivator(Func<HttpRequestMessage, UmbracoHelper, ApiController> factory)
+        public TestControllerActivator(Func<HttpRequestMessage, UmbracoContext, UmbracoHelper, ApiController> factory)
         {
             _factory = factory;
         }
 
-        protected override ApiController CreateController(Type controllerType, HttpRequestMessage msg, UmbracoHelper helper)
+        protected override ApiController CreateController(Type controllerType, HttpRequestMessage msg, UmbracoContext umbracoContext, UmbracoHelper helper)
         {
-            return _factory(msg, helper);
+            return _factory(msg, umbracoContext, helper);
         }
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
index f576c66291fc..4e352488bec4 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
@@ -159,9 +159,9 @@ IHttpController IHttpControllerActivator.Create(HttpRequestMessage request, Http
                 Mock.Of<IPublishedContentQuery>(),
                 membershipHelper);
 
-            return CreateController(controllerType, request, umbHelper);
+            return CreateController(controllerType, request, umbCtx, umbHelper);
         }
 
-        protected abstract ApiController CreateController(Type controllerType, HttpRequestMessage msg, UmbracoHelper helper);
+        protected abstract ApiController CreateController(Type controllerType, HttpRequestMessage msg, UmbracoContext umbracoContext, UmbracoHelper helper);
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
index 58344155684b..86d8cbdd5ecc 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
@@ -15,9 +15,9 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
 {
     public class TestRunner
     {
-        private readonly Func<HttpRequestMessage, UmbracoHelper, ApiController> _controllerFactory;
+        private readonly Func<HttpRequestMessage, UmbracoContext, UmbracoHelper, ApiController> _controllerFactory;
 
-        public TestRunner(Func<HttpRequestMessage, UmbracoHelper, ApiController> controllerFactory)
+        public TestRunner(Func<HttpRequestMessage, UmbracoContext, UmbracoHelper, ApiController> controllerFactory)
         {
             _controllerFactory = controllerFactory;
         }
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
index 95b5a3bfeb38..6143432faf6c 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
@@ -16,10 +16,10 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
     /// </summary>
     public class TestStartup
     {
-        private readonly Func<HttpRequestMessage, UmbracoHelper, ApiController> _controllerFactory;
+        private readonly Func<HttpRequestMessage, UmbracoContext, UmbracoHelper, ApiController> _controllerFactory;
         private readonly Action<HttpConfiguration> _initialize;
 
-        public TestStartup(Action<HttpConfiguration> initialize, Func<HttpRequestMessage, UmbracoHelper, ApiController> controllerFactory)
+        public TestStartup(Action<HttpConfiguration> initialize, Func<HttpRequestMessage, UmbracoContext, UmbracoHelper, ApiController> controllerFactory)
         {
             _controllerFactory = controllerFactory;
             _initialize = initialize;
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 7c8d1100f8a3..4294faf4f825 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -38,9 +38,11 @@
 using Umbraco.Web.Actions;
 using Umbraco.Web.Composing.Composers;
 using Umbraco.Web.ContentApps;
+using Umbraco.Web.Macros;
 using Umbraco.Web.PublishedCache;
 using Current = Umbraco.Core.Composing.Current;
 using Umbraco.Web.Routing;
+using Umbraco.Web.Templates;
 using Umbraco.Web.Trees;
 
 namespace Umbraco.Tests.Testing
@@ -228,6 +230,21 @@ protected virtual void ComposeWeb()
                 .Append<MembersBackOfficeSection>()
                 .Append<TranslationBackOfficeSection>();
             Composition.RegisterUnique<ISectionService, SectionService>();
+
+            //TODO: A lot of this is just copied from the WebRuntimeComposer, maybe we should just compose it all?
+            Composition.Register<IPublishedContentQuery>(factory =>
+            {
+                var umbCtx = factory.GetInstance<IUmbracoContextAccessor>();
+                return new PublishedContentQuery(umbCtx.UmbracoContext.ContentCache, umbCtx.UmbracoContext.MediaCache, factory.GetInstance<IVariationContextAccessor>());
+            }, Lifetime.Request);
+            Composition.Register<ITagQuery, TagQuery>(Lifetime.Request);
+
+            Composition.RegisterUnique<ITemplateRenderer, TemplateRenderer>();
+            Composition.RegisterUnique<IMacroRenderer, MacroRenderer>();
+            Composition.RegisterUnique<IUmbracoComponentRenderer, UmbracoComponentRenderer>();
+
+            // register the umbraco helper - this is Transient! very important!
+            Composition.Register<UmbracoHelper>();
         }
 
         protected virtual void ComposeWtf()
diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
index cf0bf689a132..7afb41c98347 100644
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
@@ -30,6 +30,11 @@
 using Umbraco.Web.WebApi;
 using Umbraco.Web.Trees;
 using System.Globalization;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
 using Umbraco.Web.Actions;
 
 namespace Umbraco.Tests.Web.Controllers
@@ -206,17 +211,28 @@ private IContent GetMockedContent()
         [Test]
         public async Task PostSave_Validate_Existing_Content()
         {
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => null); //do not find it
 
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
-                var usersController = new ContentController(propertyEditorCollection);
-                return usersController;
+
+                var controller = new ContentController(
+                    propertyEditorCollection,
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+                
+                return controller;
             }
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
                 content: GetMultiPartRequestContent(PublishJsonInvariant),
                 mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
@@ -232,21 +248,31 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
         [Test]
         public async Task PostSave_Validate_At_Least_One_Variant_Flagged_For_Saving()
         {
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => GetMockedContent());
 
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
-                var usersController = new ContentController(propertyEditorCollection);
-                return usersController;
+                var controller = new ContentController(
+                    propertyEditorCollection,
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+
+                return controller;
             }
 
             var json = JsonConvert.DeserializeObject<JObject>(PublishJsonInvariant);
             //remove all save flaggs
             ((JArray)json["variants"])[0]["save"] = false;
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
                 content: GetMultiPartRequestContent(JsonConvert.SerializeObject(json)),
                 mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
@@ -263,14 +289,24 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
         [Test]
         public async Task PostSave_Validate_Properties_Exist()
         {
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => GetMockedContent());
 
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
-                var usersController = new ContentController(propertyEditorCollection);
-                return usersController;
+                var controller = new ContentController(
+                    propertyEditorCollection,
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+
+                return controller;
             }
 
             var json = JsonConvert.DeserializeObject<JObject>(PublishJsonInvariant);
@@ -283,7 +319,7 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                 value = "hello"
             }));
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
                 content: GetMultiPartRequestContent(JsonConvert.SerializeObject(json)),
                 mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
@@ -297,7 +333,7 @@ public async Task PostSave_Simple_Invariant()
         {
             var content = GetMockedContent();
 
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
 
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
@@ -306,11 +342,21 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
-                var usersController = new ContentController(propertyEditorCollection);
-                return usersController;
+                var controller = new ContentController(
+                    propertyEditorCollection,
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+
+                return controller;
             }
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
                 content: GetMultiPartRequestContent(PublishJsonInvariant),
                 mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
@@ -328,7 +374,7 @@ public async Task PostSave_Validate_Empty_Name()
         {
             var content = GetMockedContent();
 
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
 
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
@@ -337,15 +383,25 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
-                var usersController = new ContentController(propertyEditorCollection);
-                return usersController;
+                var controller = new ContentController(
+                    propertyEditorCollection,
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+
+                return controller;
             }
 
             //clear out the name
             var json = JsonConvert.DeserializeObject<JObject>(PublishJsonInvariant);
             json["variants"].ElementAt(0)["name"] = null;
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
                 content: GetMultiPartRequestContent(JsonConvert.SerializeObject(json)),
                 mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
@@ -363,7 +419,7 @@ public async Task PostSave_Validate_Variants_Empty_Name()
         {
             var content = GetMockedContent();
 
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
 
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
@@ -372,15 +428,25 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
-                var usersController = new ContentController(propertyEditorCollection);
-                return usersController;
+                var controller = new ContentController(
+                    propertyEditorCollection,
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
+
+                return controller;
             }
 
             //clear out one of the names
             var json = JsonConvert.DeserializeObject<JObject>(PublishJsonVariant);
             json["variants"].ElementAt(0)["name"] = null;
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
                 content: GetMultiPartRequestContent(JsonConvert.SerializeObject(json)),
                 mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
index 857e922ac9f8..3905e6203795 100644
--- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
@@ -7,9 +7,13 @@
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Persistence.Querying;
@@ -49,7 +53,7 @@ protected override void ComposeApplication(bool withApplication)
         [Test]
         public async System.Threading.Tasks.Task Save_User()
         {
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
                 //setup some mocks
                 Umbraco.Core.Configuration.GlobalSettings.HasSmtpServer = true;
@@ -68,7 +72,15 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                 userServiceMock.Setup(service => service.GetUserById(It.IsAny<int>()))
                     .Returns((int id) => id == 1234 ? new User(1234, "Test", "test@test.com", "test@test.com", "", new List<IReadOnlyUserGroup>(), new int[0], new int[0]) : null);
 
-                var usersController = new UsersController();
+                var usersController = new UsersController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
                 return usersController;
             }
 
@@ -82,7 +94,7 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                 UserGroups = new[] { "writers" }
             };
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "PostSaveUser", HttpMethod.Post,
                 new ObjectContent<UserSave>(userSave, new JsonMediaTypeFormatter()));
             var obj = JsonConvert.DeserializeObject<UserDisplay>(response.Item2);
@@ -122,15 +134,23 @@ private void MockForGetPagedUsers()
         [Test]
         public async System.Threading.Tasks.Task GetPagedUsers_Empty()
         {
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
-                var usersController = new UsersController();
+                var usersController = new UsersController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
                 return usersController;
             }
 
             MockForGetPagedUsers();
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "GetPagedUsers", HttpMethod.Get);
 
             var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
@@ -140,7 +160,7 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
         [Test]
         public async System.Threading.Tasks.Task GetPagedUsers_10()
         {
-            ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
                 //setup some mocks
                 var userServiceMock = Mock.Get(Current.Services.UserService);
@@ -151,13 +171,21 @@ ApiController Factory(HttpRequestMessage message, UmbracoHelper helper)
                         It.IsAny<UserState[]>(), It.IsAny<string[]>(), It.IsAny<string[]>(), It.IsAny<IQuery<IUser>>()))
                     .Returns(() => users);
 
-                var usersController = new UsersController();
+                var usersController = new UsersController(
+                    Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ISqlContext>(),
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    Factory.GetInstance<IRuntimeState>(),
+                    helper);
                 return usersController;
             }
 
             MockForGetPagedUsers();
 
-            var runner = new TestRunner(Factory);
+            var runner = new TestRunner(CtrlFactory);
             var response = await runner.Execute("Users", "GetPagedUsers", HttpMethod.Get);
 
             var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
diff --git a/src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs b/src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs
index 66e7a4734aa5..d83c5c8fb630 100644
--- a/src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs
@@ -1,4 +1,10 @@
-using Umbraco.Web.WebApi;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Services;
+using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.Editors
@@ -11,5 +17,9 @@ namespace Umbraco.Web.Editors
     [AppendCurrentEventMessages]
     [PrefixlessBodyModelValidator]
     public abstract class BackOfficeNotificationsController : UmbracoAuthorizedJsonController
-    { }
+    {
+        protected BackOfficeNotificationsController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
+    }
 }
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 719f7521cb2a..4a295300683e 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -8,8 +8,12 @@
 using System.Web.Http;
 using ClientDependency.Core;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings.Css;
 using Umbraco.Web.Composing;
@@ -30,6 +34,9 @@ namespace Umbraco.Web.Editors
     [UmbracoApplicationAuthorize(Core.Constants.Applications.Settings)]
     public class CodeFileController : BackOfficeNotificationsController
     {
+        public CodeFileController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
 
         /// <summary>
         /// Used to create a brand new file
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 6cded2a253ea..ad261f0d04ca 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -11,6 +11,8 @@
 using System.Web.Security;
 using AutoMapper;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
@@ -33,6 +35,7 @@
 using Umbraco.Web.Editors.Binders;
 using Umbraco.Web.Editors.Filters;
 using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Security;
 
 namespace Umbraco.Web.Editors
@@ -54,7 +57,7 @@ public class ContentController : ContentControllerBase
 
         public object Domains { get; private set; }
 
-        public ContentController(PropertyEditorCollection propertyEditors)
+        public ContentController(PropertyEditorCollection propertyEditors, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
             _allLangs = new Lazy<IDictionary<string, ILanguage>>(() => Services.LocalizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase));
diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs
index d7c4d4f7f725..2a4d38d6f4a5 100644
--- a/src/Umbraco.Web/Editors/ContentControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs
@@ -4,9 +4,12 @@
 using System.Net.Http;
 using System.Web.Http;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
@@ -23,6 +26,10 @@ namespace Umbraco.Web.Editors
     [JsonDateTimeFormatAttribute]
     public abstract class ContentControllerBase : BackOfficeNotificationsController
     {
+        protected ContentControllerBase(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
+
         protected HttpResponseMessage HandleContentNotFound(object id, bool throwException = true)
         {
             ModelState.AddModelError("id", $"content with id: {id} was not found");
diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs
index 4446373cd396..117bc33cc4e3 100644
--- a/src/Umbraco.Web/Editors/DataTypeController.cs
+++ b/src/Umbraco.Web/Editors/DataTypeController.cs
@@ -16,8 +16,11 @@
 using Constants = Umbraco.Core.Constants;
 using System.Net.Http;
 using System.Text;
+using Umbraco.Core.Cache;
 using Umbraco.Web.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
 
 namespace Umbraco.Web.Editors
 {
@@ -36,7 +39,7 @@ public class DataTypeController : BackOfficeNotificationsController
     {
         private readonly PropertyEditorCollection _propertyEditors;
 
-        public DataTypeController(PropertyEditorCollection propertyEditors)
+        public DataTypeController(PropertyEditorCollection propertyEditors, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _propertyEditors = propertyEditors;
         }
diff --git a/src/Umbraco.Web/Editors/DictionaryController.cs b/src/Umbraco.Web/Editors/DictionaryController.cs
index 484dd47a4eb4..186b3ac4a432 100644
--- a/src/Umbraco.Web/Editors/DictionaryController.cs
+++ b/src/Umbraco.Web/Editors/DictionaryController.cs
@@ -5,7 +5,13 @@
 using System.Net.Http;
 using System.Web.Http;
 using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
@@ -28,6 +34,10 @@ namespace Umbraco.Web.Editors
     [EnableOverrideAuthorization]
     public class DictionaryController : BackOfficeNotificationsController
     {
+        public DictionaryController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
+
         /// <summary>
         /// Deletes a data type with a given ID
         /// </summary>
diff --git a/src/Umbraco.Web/Editors/MacrosController.cs b/src/Umbraco.Web/Editors/MacrosController.cs
index 7fbcdbf98aa4..38ec0ffc1b25 100644
--- a/src/Umbraco.Web/Editors/MacrosController.cs
+++ b/src/Umbraco.Web/Editors/MacrosController.cs
@@ -7,9 +7,12 @@
 using System.Net.Http;
 using System.Web.Http;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
@@ -29,9 +32,9 @@ public class MacrosController : BackOfficeNotificationsController
     {
         private readonly IMacroService _macroService;
 
-        public MacrosController(IMacroService macroService)
+        public MacrosController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
-            _macroService = macroService;
+            _macroService = Services.MacroService;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 7a787d8848d5..24b230df1309 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -21,7 +21,9 @@
 using Umbraco.Web.WebApi;
 using System.Linq;
 using System.Web.Http.Controllers;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
 using Umbraco.Core.Persistence.Querying;
@@ -47,7 +49,7 @@ namespace Umbraco.Web.Editors
     [MediaControllerControllerConfiguration]
     public class MediaController : ContentControllerBase
     {
-        public MediaController(PropertyEditorCollection propertyEditors)
+        public MediaController(PropertyEditorCollection propertyEditors, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
         }
diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs
index f4a8dfbd5665..af4061f5cdfc 100644
--- a/src/Umbraco.Web/Editors/MemberController.cs
+++ b/src/Umbraco.Web/Editors/MemberController.cs
@@ -26,7 +26,10 @@
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
 using System.Collections.Generic;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.ContentEditing;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.ContentApps;
 using Umbraco.Web.Editors.Binders;
@@ -43,7 +46,7 @@ namespace Umbraco.Web.Editors
     [OutgoingNoHyphenGuidFormat]
     public class MemberController : ContentControllerBase
     {
-        public MemberController(PropertyEditorCollection propertyEditors)
+        public MemberController(PropertyEditorCollection propertyEditors, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
         }
diff --git a/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs b/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
index aa2626ca3b8b..04a19ec437c0 100644
--- a/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
+++ b/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
@@ -35,7 +35,7 @@ public RedirectUrlManagementController(ILogger logger)
         public IHttpActionResult GetEnableState()
         {
             var enabled = Current.Configs.Settings().WebRouting.DisableRedirectUrlTracking == false;
-            var userIsAdmin = Umbraco.UmbracoContext.Security.CurrentUser.IsAdmin();
+            var userIsAdmin = UmbracoContext.Security.CurrentUser.IsAdmin();
             return Ok(new { enabled, userIsAdmin });
         }
 
@@ -92,7 +92,7 @@ public IHttpActionResult DeleteRedirectUrl(Guid id)
         [HttpPost]
         public IHttpActionResult ToggleUrlTracker(bool disable)
         {
-            var userIsAdmin = Umbraco.UmbracoContext.Security.CurrentUser.IsAdmin();
+            var userIsAdmin = UmbracoContext.Security.CurrentUser.IsAdmin();
             if (userIsAdmin == false)
             {
                 var errorMessage = "User is not a member of the administrators group and so is not allowed to toggle the URL tracker";
diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs
index ef3def188970..7113e30909f0 100644
--- a/src/Umbraco.Web/Editors/RelationTypeController.cs
+++ b/src/Umbraco.Web/Editors/RelationTypeController.cs
@@ -5,7 +5,12 @@
 using System.Web.Http;
 using AutoMapper;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
@@ -22,6 +27,10 @@ namespace Umbraco.Web.Editors
     [EnableOverrideAuthorization]
     public class RelationTypeController : BackOfficeNotificationsController
     {
+        public RelationTypeController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
+
         /// <summary>
         /// Gets a relation type by ID.
         /// </summary>
diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
index f91d27ceae27..17faf4349f6c 100644
--- a/src/Umbraco.Web/Editors/TemplateController.cs
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -4,8 +4,14 @@
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi.Filters;
@@ -17,6 +23,10 @@ namespace Umbraco.Web.Editors
     [UmbracoTreeAuthorize(Constants.Trees.Templates)]
     public class TemplateController : BackOfficeNotificationsController
     {
+        public TemplateController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
+
         /// <summary>
         /// Gets data type by alias
         /// </summary>
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index c31d005ea6a8..3789e22b49c6 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -17,10 +17,12 @@
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Security;
@@ -43,6 +45,10 @@ namespace Umbraco.Web.Editors
     [IsCurrentUserModelFilter]
     public class UsersController : UmbracoAuthorizedJsonController
     {
+        public UsersController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        {
+        }
+
         /// <summary>
         /// Returns a list of the sizes of gravatar urls for the user or null if the gravatar server cannot be reached
         /// </summary>
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 2bb093a659e9..cd87d9dd37df 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -23,16 +23,19 @@ namespace Umbraco.Web.Search
     public class UmbracoTreeSearcher
     {
         private readonly IExamineManager _examineManager;
+        private readonly UmbracoContext _umbracoContext;
         private readonly UmbracoHelper _umbracoHelper;
         private readonly ILocalizationService _languageService;
         private readonly IEntityService _entityService;
 
         public UmbracoTreeSearcher(IExamineManager examineManager,
+            UmbracoContext umbracoContext,
             UmbracoHelper umbracoHelper,
             ILocalizationService languageService,
             IEntityService entityService)
         {
             _examineManager = examineManager ?? throw new ArgumentNullException(nameof(examineManager));
+            _umbracoContext = umbracoContext;
             _umbracoHelper = umbracoHelper ?? throw new ArgumentNullException(nameof(umbracoHelper));
             _languageService = languageService;
             _entityService = entityService;
@@ -61,9 +64,7 @@ public IEnumerable<SearchResultEntity> ExamineSearch(
             string type;
             var indexName = Constants.UmbracoIndexes.InternalIndexName;
             var fields = new[] { "id", "__NodeId" };
-
-            var umbracoContext = _umbracoHelper.UmbracoContext;
-
+            
             // TODO: WE should try to allow passing in a lucene raw query, however we will still need to do some manual string
             // manipulation for things like start paths, member types, etc... 
             //if (Examine.ExamineExtensions.TryParseLuceneQuery(query))
@@ -86,12 +87,12 @@ public IEnumerable<SearchResultEntity> ExamineSearch(
                     break;
                 case UmbracoEntityTypes.Media:
                     type = "media";
-                    var allMediaStartNodes = umbracoContext.Security.CurrentUser.CalculateMediaStartNodeIds(_entityService);
+                    var allMediaStartNodes = _umbracoContext.Security.CurrentUser.CalculateMediaStartNodeIds(_entityService);
                     AppendPath(sb, UmbracoObjectTypes.Media,  allMediaStartNodes, searchFrom, _entityService);
                     break;
                 case UmbracoEntityTypes.Document:
                     type = "content";
-                    var allContentStartNodes = umbracoContext.Security.CurrentUser.CalculateContentStartNodeIds(_entityService);
+                    var allContentStartNodes = _umbracoContext.Security.CurrentUser.CalculateContentStartNodeIds(_entityService);
                     AppendPath(sb, UmbracoObjectTypes.Document, allContentStartNodes, searchFrom, _entityService);
                     break;
                 default:
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 73e93300ec8f..4b1b125a964c 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -78,20 +78,7 @@ internal UmbracoHelper()
         /// Gets the query context.
         /// </summary>
         public IPublishedContentQuery ContentQuery { get; }
-
-        /// <summary>
-        /// Gets the Umbraco context.
-        /// </summary>
-        public UmbracoContext UmbracoContext
-        {
-            get
-            {
-                if (_umbracoContext == null)
-                    throw new NullReferenceException("UmbracoContext has not been set.");
-                return _umbracoContext;
-            }
-        }
-
+        
         /// <summary>
         /// Gets the membership helper.
         /// </summary>
@@ -100,7 +87,7 @@ public UmbracoContext UmbracoContext
         /// <summary>
         /// Gets the url provider.
         /// </summary>
-        public UrlProvider UrlProvider => UmbracoContext.UrlProvider;
+        public UrlProvider UrlProvider => _umbracoContext.UrlProvider;
 
         /// <summary>
         /// Gets (or sets) the current <see cref="IPublishedContent"/> item assigned to the UmbracoHelper.

From 036ca7f1e5a20804860f7e07f98c8f78fadf639b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 15:30:38 +1100
Subject: [PATCH 239/421] fixing tests

---
 .../Web/Mvc/SurfaceControllerTests.cs         | 32 ++-----------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 0ff3662f95df..b3ae7e3dd6e2 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -77,42 +77,15 @@ public void Umbraco_Context_Not_Null()
 
             Assert.IsNotNull(ctrl.UmbracoContext);
         }
-
-        [Test]
-        public void Umbraco_Helper_Not_Null()
-        {
-            var globalSettings = TestObjects.GetGlobalSettings();
-            var umbracoContext = UmbracoContext.EnsureContext(
-                Current.UmbracoContextAccessor,
-                new Mock<HttpContextBase>().Object,
-                Mock.Of<IPublishedSnapshotService>(),
-                new Mock<WebSecurity>(null, null, globalSettings).Object,
-                TestObjects.GetUmbracoSettings(),
-                Enumerable.Empty<IUrlProvider>(),
-                globalSettings,
-                new TestVariationContextAccessor(),
-                true);
-
-            var controller = new TestSurfaceController(umbracoContext);
-            Composition.Register(_ => umbracoContext);
-
-            Assert.IsNotNull(controller.Umbraco);
-        }
-
+        
         [Test]
         public void Can_Lookup_Content()
         {
             var publishedSnapshot = new Mock<IPublishedSnapshot>();
             publishedSnapshot.Setup(x => x.Members).Returns(Mock.Of<IPublishedMemberCache>());
-            var contentCache = new Mock<IPublishedContentCache>();
             var content = new Mock<IPublishedContent>();
             content.Setup(x => x.Id).Returns(2);
-            contentCache.Setup(x => x.GetById(It.IsAny<int>())).Returns(content.Object);
-            var mediaCache = new Mock<IPublishedMediaCache>();
-            publishedSnapshot.Setup(x => x.Content).Returns(contentCache.Object);
-            publishedSnapshot.Setup(x => x.Media).Returns(mediaCache.Object);
             var publishedSnapshotService = new Mock<IPublishedSnapshotService>();
-            publishedSnapshotService.Setup(x => x.CreatePublishedSnapshot(It.IsAny<string>())).Returns(publishedSnapshot.Object);
             var globalSettings = TestObjects.GetGlobalSettings();
 
             var umbracoContext = UmbracoContext.EnsureContext(
@@ -131,13 +104,14 @@ public void Can_Lookup_Content()
                 Mock.Of<ITagQuery>(),
                 Mock.Of<ICultureDictionaryFactory>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                Mock.Of<IPublishedContentQuery>(),
+                Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object),
                 new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), Mock.Of<AppCaches>(), Mock.Of<ILogger>()));
 
             var ctrl = new TestSurfaceController(umbracoContext, helper);
             var result = ctrl.GetContent(2) as PublishedContentResult;
 
             Assert.IsNotNull(result);
+            Assert.IsNotNull(result.Content);
             Assert.AreEqual(2, result.Content.Id);
         }
 

From ad5b166f3f48d085e774ac57f8d10b96bc8d5981 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 15:44:32 +1100
Subject: [PATCH 240/421] Fixes tests, simplifies constructors

---
 .../Routing/RenderRouteHandlerTests.cs         | 18 ++++++++++++++++--
 .../TestHelpers/Stubs/TestControllerFactory.cs | 10 ++++++++++
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs   | 14 --------------
 .../Editors/BackOfficeController.cs            |  4 ++--
 src/Umbraco.Web/Mvc/RenderMvcController.cs     |  4 ++--
 .../Mvc/UmbracoAuthorizedController.cs         |  3 ++-
 src/Umbraco.Web/Mvc/UmbracoController.cs       |  5 ++---
 7 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 3f44c6764eeb..c7282ee9c890 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Web.Mvc;
 using System.Web.Routing;
+using System.Web.Security;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -17,12 +18,15 @@
 using Umbraco.Core.Strings;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Dictionary;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web.Runtime;
+using Umbraco.Web.Security;
 using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Tests.Routing
@@ -136,7 +140,16 @@ public void Umbraco_Route_User_Defined_Controller_Action(string templateName)
             var type = new AutoPublishedContentType(22, "CustomDocument", new PublishedPropertyType[] { });
             ContentTypesCache.GetPublishedContentTypeByAlias = alias => type;
 
-            var handler = new RenderRouteHandler(umbracoContext, new TestControllerFactory(umbracoContext, Mock.Of<ILogger>()));
+            var handler = new RenderRouteHandler(umbracoContext, new TestControllerFactory(umbracoContext, Mock.Of<ILogger>(), context =>
+            {
+                var membershipHelper = new MembershipHelper(new TestUmbracoContextAccessor(umbracoContext), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), Mock.Of<AppCaches>(), Mock.Of<ILogger>());
+                return new CustomDocumentController(Factory.GetInstance<IGlobalSettings>(),
+                    umbracoContext,
+                    Factory.GetInstance<ServiceContext>(),
+                    Factory.GetInstance<AppCaches>(),
+                    Factory.GetInstance<IProfilingLogger>(),
+                    new UmbracoHelper(umbracoContext, Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(), Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>(), membershipHelper));
+            }));
 
             handler.GetHandlerForRoute(umbracoContext.HttpContext.Request.RequestContext, frequest);
             Assert.AreEqual("CustomDocument", routeData.Values["controller"].ToString());
@@ -172,7 +185,8 @@ public void Umbraco_Route_User_Defined_Controller_Action(string templateName)
         /// </summary>
         public class CustomDocumentController : RenderMvcController
         {
-            public CustomDocumentController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger, umbracoHelper)
+            public CustomDocumentController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+                : base(globalSettings, umbracoContext, services, appCaches, profilingLogger, umbracoHelper)
             {
             }
 
diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
index 36c5961b9f6f..9889b8d0c234 100644
--- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
+++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
@@ -19,6 +19,7 @@ internal class TestControllerFactory : IControllerFactory
     {
         private readonly UmbracoContext _umbracoContext;
         private readonly ILogger _logger;
+        private readonly Func<RequestContext, IController> _factory;
 
         public TestControllerFactory(UmbracoContext umbracoContext, ILogger logger)
         {
@@ -26,8 +27,17 @@ public TestControllerFactory(UmbracoContext umbracoContext, ILogger logger)
             _logger = logger;
         }
 
+        public TestControllerFactory(UmbracoContext umbracoContext, ILogger logger, Func<RequestContext, IController> factory)
+        {
+            _umbracoContext = umbracoContext;
+            _logger = logger;
+            _factory = factory;
+        }
+
         public IController CreateController(RequestContext requestContext, string controllerName)
         {
+            if (_factory != null) return _factory(requestContext);
+
             var types = TypeFinder.FindClassesOfType<ControllerBase>(new[] { Assembly.GetExecutingAssembly() });
 
             var controllerTypes = types.Where(x => x.Name.Equals(controllerName + "Controller", StringComparison.InvariantCultureIgnoreCase));
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 4294faf4f825..702a99b5100c 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -231,20 +231,6 @@ protected virtual void ComposeWeb()
                 .Append<TranslationBackOfficeSection>();
             Composition.RegisterUnique<ISectionService, SectionService>();
 
-            //TODO: A lot of this is just copied from the WebRuntimeComposer, maybe we should just compose it all?
-            Composition.Register<IPublishedContentQuery>(factory =>
-            {
-                var umbCtx = factory.GetInstance<IUmbracoContextAccessor>();
-                return new PublishedContentQuery(umbCtx.UmbracoContext.ContentCache, umbCtx.UmbracoContext.MediaCache, factory.GetInstance<IVariationContextAccessor>());
-            }, Lifetime.Request);
-            Composition.Register<ITagQuery, TagQuery>(Lifetime.Request);
-
-            Composition.RegisterUnique<ITemplateRenderer, TemplateRenderer>();
-            Composition.RegisterUnique<IMacroRenderer, MacroRenderer>();
-            Composition.RegisterUnique<IUmbracoComponentRenderer, UmbracoComponentRenderer>();
-
-            // register the umbraco helper - this is Transient! very important!
-            Composition.Register<UmbracoHelper>();
         }
 
         protected virtual void ComposeWtf()
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index abe793069314..91a3f6778b0f 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -49,8 +49,8 @@ public class BackOfficeController : UmbracoController
         private const string TokenPasswordResetCode = "PasswordResetCode";
         private static readonly string[] TempDataTokenNames = { TokenExternalSignInError, TokenPasswordResetCode };
 
-        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
-            : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger, umbracoHelper)
+        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, services, appCaches, profilingLogger, umbracoHelper)
         {
             _manifestParser = manifestParser;
             _features = features;
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index da7e3b08fcd5..e67aa3948e65 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -23,8 +23,8 @@ public RenderMvcController()
             ActionInvoker = new RenderActionInvoker();
         }
 
-        public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
-            : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger, umbracoHelper)
+        public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, services, appCaches, profilingLogger, umbracoHelper)
         {
             ActionInvoker = new RenderActionInvoker();
         }
diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
index a54958c4f745..ae97f22dbec2 100644
--- a/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
@@ -21,7 +21,8 @@ protected UmbracoAuthorizedController()
         {
         }
 
-        protected UmbracoAuthorizedController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContext, services, appCaches, logger, profilingLogger, umbracoHelper)
+        protected UmbracoAuthorizedController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+            : base(globalSettings, umbracoContext, services, appCaches, profilingLogger, umbracoHelper)
         {
         }
     }
diff --git a/src/Umbraco.Web/Mvc/UmbracoController.cs b/src/Umbraco.Web/Mvc/UmbracoController.cs
index 61198bd2633e..79987ab6b418 100644
--- a/src/Umbraco.Web/Mvc/UmbracoController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoController.cs
@@ -73,20 +73,19 @@ protected UmbracoController()
                   Current.Factory.GetInstance<UmbracoContext>(),
                   Current.Factory.GetInstance<ServiceContext>(),
                   Current.Factory.GetInstance<AppCaches>(),
-                  Current.Factory.GetInstance<ILogger>(),
                   Current.Factory.GetInstance<IProfilingLogger>(),
                   Current.Factory.GetInstance<UmbracoHelper>()
             )
         {
         }
 
-        protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+        protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
         {
             GlobalSettings = globalSettings;
             UmbracoContext = umbracoContext;
             Services = services;
             AppCaches = appCaches;
-            Logger = logger;
+            Logger = profilingLogger;
             ProfilingLogger = profilingLogger;
             Umbraco = umbracoHelper;
         }

From bb64141207356f9082c621d93fb5d16bca34e2bb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 1 Feb 2019 16:35:10 +1100
Subject: [PATCH 241/421] removes obsolete method

---
 .../Mvc/MemberAuthorizeAttribute.cs           | 46 ++++---------------
 src/Umbraco.Web/Security/MembershipHelper.cs  |  5 --
 src/Umbraco.Web/Security/WebSecurity.cs       | 25 +---------
 .../WebApi/MemberAuthorizeAttribute.cs        | 46 +++----------------
 4 files changed, 16 insertions(+), 106 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
index 287edd3bceed..5f81ced3f0fc 100644
--- a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
@@ -1,10 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Web;
 using System.Web.Mvc;
 using AuthorizeAttribute = System.Web.Mvc.AuthorizeAttribute;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
+using Umbraco.Web.Security;
+using Umbraco.Core.Composing;
+using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.Mvc
 {
@@ -14,35 +15,6 @@ namespace Umbraco.Web.Mvc
     /// </summary>
     public sealed class MemberAuthorizeAttribute : AuthorizeAttribute
     {
-        // see note in HttpInstallAuthorizeAttribute
-        private readonly UmbracoContext _umbracoContext;
-
-        private UmbracoContext UmbracoContext => _umbracoContext ?? Current.UmbracoContext;
-
-        /// <summary>
-        /// THIS SHOULD BE ONLY USED FOR UNIT TESTS
-        /// </summary>
-        /// <param name="umbracoContext"></param>
-        public MemberAuthorizeAttribute(UmbracoContext umbracoContext)
-        {
-            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
-            _umbracoContext = umbracoContext;
-        }
-
-        public MemberAuthorizeAttribute()
-        {
-
-        }
-
-        /// <summary>
-        /// Flag for whether to allow all site visitors or just authenticated members
-        /// </summary>
-        /// <remarks>
-        /// This is the same as applying the [AllowAnonymous] attribute
-        /// </remarks>
-        [Obsolete("Use [AllowAnonymous] instead")]
-        public bool AllowAll { get; set; }
-
         /// <summary>
         /// Comma delimited list of allowed member types
         /// </summary>
@@ -70,17 +42,15 @@ protected override bool AuthorizeCore(HttpContextBase httpContext)
             var members = new List<int>();
             foreach (var s in AllowMembers.Split(','))
             {
-                int id;
-                if (int.TryParse(s, out id))
+                if (int.TryParse(s, out var id))
                 {
                     members.Add(id);
                 }
             }
 
-            return UmbracoContext.Security.IsMemberAuthorized(AllowAll,
-                                                  AllowType.Split(','),
-                                                  AllowGroup.Split(','),
-                                                  members);
+            var helper = Current.Factory.GetInstance<MembershipHelper>();
+            return helper.IsMemberAuthorized(AllowType.Split(','), AllowGroup.Split(','), members);
+            
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index daec4bb1f7f8..8de42fc12b68 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -599,20 +599,15 @@ public bool IsLoggedIn()
         /// <summary>
         /// Returns true or false if the currently logged in member is authorized based on the parameters provided
         /// </summary>
-        /// <param name="allowAll"></param>
         /// <param name="allowTypes"></param>
         /// <param name="allowGroups"></param>
         /// <param name="allowMembers"></param>
         /// <returns></returns>
         public virtual bool IsMemberAuthorized(
-            bool allowAll = false,
             IEnumerable<string> allowTypes = null,
             IEnumerable<string> allowGroups = null,
             IEnumerable<int> allowMembers = null)
         {
-            if (allowAll)
-                return true;
-
             if (allowTypes == null)
                 allowTypes = Enumerable.Empty<string>();
             if (allowGroups == null)
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index 54ff1bba3f95..ef6193694c6e 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -33,30 +33,7 @@ public WebSecurity(HttpContextBase httpContext, IUserService userService, IGloba
             _userService = userService;
             _globalSettings = globalSettings;
         }
-
-        /// <summary>
-        /// Returns true or false if the currently logged in member is authorized based on the parameters provided
-        /// </summary>
-        /// <param name="allowAll"></param>
-        /// <param name="allowTypes"></param>
-        /// <param name="allowGroups"></param>
-        /// <param name="allowMembers"></param>
-        /// <returns></returns>
-        [Obsolete("Use MembershipHelper.IsMemberAuthorized instead")]
-        public bool IsMemberAuthorized(
-            bool allowAll = false,
-            IEnumerable<string> allowTypes = null,
-            IEnumerable<string> allowGroups = null,
-            IEnumerable<int> allowMembers = null)
-        {
-            if (Current.UmbracoContext == null)
-            {
-                return false;
-            }
-            var helper = Current.Factory.GetInstance<MembershipHelper>();
-            return helper.IsMemberAuthorized(allowAll, allowTypes, allowGroups, allowMembers);
-        }
-
+        
         private IUser _currentUser;
 
         /// <summary>
diff --git a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
index 12caa29703ff..bc1e9a43180d 100644
--- a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
@@ -1,7 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Web.Http;
 using Umbraco.Core;
+using Umbraco.Web.Security;
+using Umbraco.Core.Composing;
+using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.WebApi
 {
@@ -11,37 +13,6 @@ namespace Umbraco.Web.WebApi
     /// </summary>
     public sealed class MemberAuthorizeAttribute : AuthorizeAttribute
     {
-        private readonly UmbracoContext _umbracoContext;
-
-        private UmbracoContext GetUmbracoContext()
-        {
-            return _umbracoContext ?? UmbracoContext.Current;
-        }
-
-        /// <summary>
-        /// THIS SHOULD BE ONLY USED FOR UNIT TESTS
-        /// </summary>
-        /// <param name="umbracoContext"></param>
-        public MemberAuthorizeAttribute(UmbracoContext umbracoContext)
-        {
-            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
-            _umbracoContext = umbracoContext;
-        }
-
-        public MemberAuthorizeAttribute()
-        {
-
-        }
-
-        /// <summary>
-        /// Flag for whether to allow all site visitors or just authenticated members
-        /// </summary>
-        /// <remarks>
-        /// This is the same as applying the [AllowAnonymous] attribute
-        /// </remarks>
-        [Obsolete("Use [AllowAnonymous] instead")]
-        public bool AllowAll { get; set; }
-
         /// <summary>
         /// Comma delimited list of allowed member types
         /// </summary>
@@ -69,17 +40,14 @@ protected override bool IsAuthorized(System.Web.Http.Controllers.HttpActionConte
             var members = new List<int>();
             foreach (var s in AllowMembers.Split(','))
             {
-                int id;
-                if (int.TryParse(s, out id))
+                if (int.TryParse(s, out var id))
                 {
                     members.Add(id);
                 }
             }
 
-            return GetUmbracoContext().Security.IsMemberAuthorized(AllowAll,
-                                                  AllowType.Split(','),
-                                                  AllowGroup.Split(','),
-                                                  members);
+            var helper = Current.Factory.GetInstance<MembershipHelper>();
+            return helper.IsMemberAuthorized(AllowType.Split(','), AllowGroup.Split(','), members);
         }
 
     }

From 045020e739f277d016516e34e200018bfcd495b0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 1 Feb 2019 08:37:06 +0100
Subject: [PATCH 242/421] #4068 - Changed `save` event triggered when save
 dialog is opened. `save` is still broadcasted on the actual save. Changed the
 grid event listener to only execute on `save` events

---
 .../common/directives/components/content/edit.controller.js | 2 +-
 .../donotpostdollarvariablesrequest.interceptor.js          | 2 +-
 .../src/views/propertyeditors/grid/grid.controller.js       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 5c5b1f933e6f..4f71fb068614 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -617,7 +617,7 @@
             // TODO: Add "..." to save button label if there are more than one variant to publish - currently it just adds the elipses if there's more than 1 variant
             if (isContentCultureVariant()) {
                 //before we launch the dialog we want to execute all client side validations first
-                if (formHelper.submitForm({ scope: $scope, action: "save" })) {
+                if (formHelper.submitForm({ scope: $scope, action: "openSaveDialog" })) {
 
                     var dialog = {
                         parentScope: $scope,
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
index 0a5f6d837da5..1bae002df9b9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
@@ -26,7 +26,7 @@
             //dealing with requests:
             'request': function(config) {
                 if(config.method === "POST"){
-                    config.transformRequest.push(transform);
+                    transform(config.data);
                 }
                 
                 return config;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index f7e69a268366..b40305f5f5f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -909,9 +909,9 @@ angular.module("umbraco")
         // needs to be merged in at runtime to ensure that the real config values are used
         // if they are ever updated.
 
-        var unsubscribe = $scope.$on("formSubmitting", function () {
-
-            if ($scope.model.value && $scope.model.value.sections) {
+        var unsubscribe = $scope.$on("formSubmitting", function (e, args) {
+            
+            if (args.action === "save" && $scope.model.value && $scope.model.value.sections) {
                 _.each($scope.model.value.sections, function(section) {
                     if (section.rows) {
                         _.each(section.rows, function (row) {

From fc6e17f3f9032b0fc9b9dbf3a2cb82421c048fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 1 Feb 2019 10:49:09 +0100
Subject: [PATCH 243/421] =?UTF-8?q?V8:=20UI=20=E2=80=94=20umb-content-grid?=
 =?UTF-8?q?=20color=20change?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/less/components/umb-content-grid.less          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 5a2821eb9ecf..ccf86e7ea6aa 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -15,10 +15,6 @@
    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
    border-radius: 3px;
    
-   color: @ui-option-type;
-   &:hover {
-       color:@ui-option-type-hover;
-   }
 }
 
 .umb-content-grid__item.-selected {
@@ -70,9 +66,13 @@
 .umb-content-grid__item-name {
    font-weight: bold;
    margin-bottom: 15px;
-   //color: @black;
    line-height: 1.4em;
    display: inline-flex;
+   
+   color: @ui-option-type;
+   &:hover {
+       color:@ui-option-type-hover;
+   }
 }
 
 .umb-content-grid__item-name:hover span {

From 979f7b404cc32639392fcf1aa0dbc90584d2a8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 1 Feb 2019 10:51:14 +0100
Subject: [PATCH 244/421] V8: refactoring of layers add and removal methods

---
 .../components/editor/umbeditors.directive.js | 234 +++++++++---------
 .../less/components/editor/umb-editor.less    |  16 +-
 2 files changed, 130 insertions(+), 120 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index 0db239c56a2a..c25dd0a76feb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -13,145 +13,145 @@
 
             function addEditor(editor) {
                 
+                
+                if (!editor.style)
+                    editor.style = {};
+                
                 editor.animating = true;
-
+                
                 showOverlayOnPrevEditor();
                 
-                // start collapsing editors to make room for new ones
-                $timeout(function() {
-                   
-                    var editorsElement = el[0];
-                    // only select the editors which are allowed to be 
-                    // shown so we don't animate a lot of editors which aren't necessary
-                    var moveEditors = editorsElement.querySelectorAll('.umb-editor:nth-last-child(-n+'+ allowedNumberOfVisibleEditors +')');
-
-                    // collapse open editors before opening the new one
-                    var collapseEditorAnimation = anime({
-                        targets: moveEditors,
-                        width: function(el, index, length) {
-                            // we have to resize all small editors when they move to the 
-                            // left side so they don't leave a gap
-                            if(el.classList.contains("umb-editor--small")) {
-                                return "100%";
-                            }
-                        },
-                        left: function(el, index, length){
-                            if(length >= allowedNumberOfVisibleEditors) {
-                                return index * editorIndent;
-                            }
-                            return (index + 1) * editorIndent;
-                        },
+                var i = allowedNumberOfVisibleEditors;
+                var len = scope.editors.length;
+                while(i<len) {
+                    
+                    var animeConfig = {
+                        target: scope.editors[i].style,
                         easing: 'easeInOutQuint',
                         duration: 300
-                    });
-
-                    // push the new editor to the dom
-                    scope.editors.push(editor);
-
-                });
-
-                // slide the new editor in
-                $timeout(function() {
-
-                    var editorsElement = el[0];
-                    // select the last editor we just pushed
-                    var lastEditor = editorsElement.querySelector('.umb-editor:last-of-type');
-                    var indentValue = scope.editors.length * editorIndent;
-
-                    /* don't allow indent larger than what 
-                    fits the max number of visible editors */
-                    if(scope.editors.length >= allowedNumberOfVisibleEditors) {
-                        indentValue = allowedNumberOfVisibleEditors * editorIndent;
                     }
-
-                    // indent all large editors
-                    if(editor.size !== "small") {
-                        lastEditor.style.left = indentValue + "px";
+                    
+                    if(scope.editors[i].size !== "small") {
+                        animeConfig.width = "100%";
+                    }
+                    
+                    if(len >= allowedNumberOfVisibleEditors) {
+                        animeConfig.left = i * editorIndent;
+                    } else {
+                        animeConfig.left = (i + 1) * editorIndent;
                     }
+                    
+                    anime(animeConfig);
+                    
+                    i++;
+                }
+                
+                
+                // push the new editor to the dom
+                scope.editors.push(editor);
+                
+                
+                
+                var indentValue = scope.editors.length * editorIndent;
 
-                    // animation config
-                    var addEditorAnimation = anime({
-                        targets: lastEditor,
-                        translateX: [100 + '%', 0],
-                        opacity: [0, 1],
-                        easing: 'easeInOutQuint',
-                        duration: 300,
-                        complete: function() {
-                            $timeout(function(){
-                                editor.animating = false;
-                            });
-                        }
-                    });
+                // don't allow indent larger than what 
+                // fits the max number of visible editors
+                if(scope.editors.length >= allowedNumberOfVisibleEditors) {
+                    indentValue = allowedNumberOfVisibleEditors * editorIndent;
+                }
 
+                // indent all large editors
+                if(editor.size !== "small") {
+                    editor.style.left = indentValue + "px";
+                }
+                
+                editor.style._tx = 100;
+                //editor.style.opacity = 0;
+                editor.style.transform = "translateX("+editor.style._tx+"%)";
+                
+                // animation config
+                anime({
+                    targets: editor.style,
+                    _tx: [100, 0],
+                    //opacity: [0, 1],
+                    easing: 'easeOutExpo',
+                    duration: 480,
+                    update: () => {
+                        editor.style.transform = "translateX("+editor.style._tx+"%)";
+                        scope.$digest();
+                    },
+                    complete: function() {
+                        //$timeout(function(){
+                            editor.animating = false;
+                            scope.$digest();
+                        //});
+                    }
                 });
+                
 
             }
 
             function removeEditor(editor) {
                 
                 editor.animating = true;
-
-                $timeout(function(){
-
-                    var editorsElement = el[0];
-                    var lastEditor = editorsElement.querySelector('.umb-editor:last-of-type');
-
-                    var removeEditorAnimation = anime({
-                        targets: lastEditor,
-                        translateX: [0, 100 + '%'],
-                        opacity: [1, 0],
-                        easing: 'easeInOutQuint',
-                        duration: 300,
-                        complete: function(a) {
-                            $timeout(function(){
-                                scope.editors.splice(-1,1);
-                                removeOverlayFromPrevEditor();
-                            });
-                        }
-                    });
-
-                    expandEditors();
-
+                
+                editor.style._tx = 0;
+                editor.style.transform = "translateX("+editor.style._tx+"%)";
+                
+                // animation config
+                anime({
+                    targets: editor.style,
+                    _tx: [0, 100],
+                    //opacity: [1, 0],
+                    easing: 'easeInExpo',
+                    duration: 360,
+                    update: () => {
+                        editor.style.transform = "translateX("+editor.style._tx+"%)";
+                        scope.$digest();
+                    },
+                    complete: function() {
+                        //$timeout(function(){
+                        scope.editors.splice(-1,1);
+                        removeOverlayFromPrevEditor();
+                        scope.$digest();
+                        //})
+                    }
                 });
-
+                
+                
+                expandEditors();
+                
+                
             }
 
             function expandEditors() {
-                // expand hidden editors
-                $timeout(function() {
- 
-                    var editorsElement = el[0];
-                    // only select the editors which are allowed to be 
-                    // shown so we don't animate a lot of editors which aren't necessary
-                    // as the last element hasn't been removed from the dom yet we have to select the last four and then skip the last child (as it is the one closing).
-                    var moveEditors = editorsElement.querySelectorAll('.umb-editor:nth-last-child(-n+'+ allowedNumberOfVisibleEditors + 1 +'):not(:last-child)');
-                    var editorWidth = editorsElement.offsetWidth;
-
-                    var expandEditorAnimation = anime({
-                        targets: moveEditors,
-                        left: function(el, index, length){
-                            // move the editor all the way to the right if the top one is a small
-                            if(el.classList.contains("umb-editor--small")) {
-                                // only change the size if it is the editor on top
-                                if(index + 1 === length) {
-                                    return editorWidth - 500;
-                                }
-                            } else {
-                                return (index + 1) * editorIndent;
-                            }
-                        },
-                        width: function(el, index, length) {
-                            // set the correct size if the top editor is of type "small"
-                            if(el.classList.contains("umb-editor--small") && index + 1 === length) {
-                                return "500px";
-                            }
-                        },
+                
+                var i = allowedNumberOfVisibleEditors + 1;
+                var len = scope.editors.length-1;
+                while(i<len) {
+                    
+                    var animeConfig = {
+                        target: scope.editors[i].style,
                         easing: 'easeInOutQuint',
                         duration: 300
-                    });
-    
-                });
-
+                    }
+                    
+                    if(scope.editors[i].size !== "small" && i === len) {
+                        animeConfig.width = "500px";
+                    }
+                    
+                    if(scope.editors[i].size !== "small" && i === len) {
+                        animeConfig.left = editorWidth - 500;
+                    } else {
+                        animeConfig.left = (index + 1) * editorIndent;
+                    }
+                    
+                    anime(animeConfig);
+                    
+                    i++;
+                }
+                
+                
             }
 
             // show backdrop on previous editor
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index 764094a9b8ba..3e94e01b3a60 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -17,13 +17,14 @@
 }
 
 .umb-editor--animating {
-    will-change: transform, opacity, width, left;
+    //will-change: transform, opacity, width, left;
+    will-change: transform, width, left;
 }
 
 // hide all infinite editors by default
 // will be shown through animation
 .umb-editors .umb-editor {
-    opacity: 0;
+    //opacity: 0;
     box-shadow: 0px 0 30px 0 rgba(0,0,0,.3);
 }
 
@@ -35,7 +36,14 @@
         max-width: 500px;
     }
 }
-
+@keyframes umb-editor__overlay_fade_opacity {
+    from {
+        opacity:0;
+    }
+    to {
+        opacity:1;
+    }
+}
 .umb-editor__overlay {
     position: absolute;
     top: 0;
@@ -44,4 +52,6 @@
     left: 0;
     background: rgba(0,0,0,0.4);
     z-index: @zIndexEditor;
+    
+    animation:umb-editor__overlay_fade_opacity 600ms;
 }

From 3fac16eda8b44d7ab2755bcc658e70289acefdb2 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 1 Feb 2019 09:58:10 +0000
Subject: [PATCH 245/421] Fix count bug - so it works with two languages

---
 src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index b6569420206b..17a2f3c66aad 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -47,7 +47,7 @@
                     <a href="" ng-click="updatePreviewDevice(device)"><i class="icon {{device.icon}}" title="{{device.title}}"></i><span></span></a>
                 </li>
 
-                @if (Model.Languages != null && Model.Languages.Count() > 2)
+                @if (Model.Languages != null && Model.Languages.Count() > 1)
                 {
                     foreach (var previewLink in Model.Languages)
                      {

From 0bb69aeeeeac4c7d27463a3318202beadf52909c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 1 Feb 2019 11:10:20 +0100
Subject: [PATCH 246/421] V8: preview colors changed for brandcolors 2019

---
 .../src/less/canvas-designer.less                | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index 146f9b8a67de..7f67d5c3b201 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -275,7 +275,7 @@ a, a:hover{
     font-family: "Lato", Helvetica, Arial, sans-serif;
     font-size: 13px;
     line-height: 16px;
-    background: #413659;
+    background: #1b264f;
     -webkit-transition: all 0.2s ease-in-out;
     -moz-transition: all 0.2s ease-in-out;
     transition: all 0.2s ease-in-out;
@@ -306,7 +306,7 @@ a, a:hover{
 
 ul.sections {
     display: block;
-    background: #413659;
+    background: #1b264f;
     height: 100%;
     position:absolute;
     top: 90px;
@@ -322,7 +322,7 @@ ul.sections {
 
 ul.sections li {
     display: block;
-    border-left: 4px #413659 solid;
+    border-left: 4px #1b264f solid;
     -webkit-transition: all .3s linear;
     -moz-transition: all .3s linear;
     transition: all .3s linear;
@@ -330,7 +330,8 @@ ul.sections li {
 
 .fix-left-menu ul.sections li a span,
 .fix-left-menu ul.sections li a i {
-    color: #8d869b;
+    color: #fff;
+    opacity: .7;
     -webkit-transition: all .3s linear;
     -moz-transition: all .3s linear;
     transition: all .3s linear;
@@ -345,6 +346,11 @@ ul.sections li a {
     text-align: center;
     text-decoration: none;
     border-bottom: 1px solid #2E2246;
+    &:hover {
+        span, i {
+            opacity: 1;
+        }
+    }
 }
 
 ul.sections li a i {
@@ -367,7 +373,7 @@ ul.sections li.current a i {
 }
 
 ul.sections li.current, ul.sections li:hover {
-    border-left: 4px #00AEA2 solid;
+    border-left: 4px #f5c1bc solid;
 }
 
 .fix-left-menu:hover ul.sections li a span,

From d38dba16600fcc45e05b8a6aa5b4a8821342470e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 1 Feb 2019 10:14:29 +0000
Subject: [PATCH 247/421] Update nuspec to include new hosted image/icon for
 Nuget packages from .com site

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 2 +-
 build/NuSpecs/UmbracoCms.Web.nuspec  | 4 ++--
 build/NuSpecs/UmbracoCms.nuspec      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index dc1224842e34..9758c05dd6d0 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -8,7 +8,7 @@
         <owners>Umbraco HQ</owners>
         <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
         <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 30fa303b30b8..fabd1e25a8d9 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -8,13 +8,13 @@
         <owners>Umbraco HQ</owners>
         <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
         <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
-        <dependencies> 
+        <dependencies>
             <!--
               note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
               the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 6681c97b4909..15040022452b 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -8,7 +8,7 @@
         <owners>Umbraco HQ</owners>
         <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
         <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
         <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>

From ab5c33e340a6c060d9beac5766e9db6e64e55fa1 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 1 Feb 2019 12:34:56 +0100
Subject: [PATCH 248/421] #4354 - Fix for stupid javascript's strict equality

---
 .../src/views/content/overlays/publish.html                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 364ed47361e6..8912f7606d04 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -18,7 +18,7 @@
                            type="checkbox"
                            ng-model="variant.publish"
                            ng-change="vm.changeSelection(variant)"
-                           ng-disabled="(vm.isNew && variant.language.isMandatory) || !variant.canSave"
+                           ng-disabled="(vm.isNew && variant.language.isMandatory) || (variant.canSave === false)"
                            style="margin-right: 8px;"
                            val-server-field="{{variant.htmlId}}" />
                     <div>

From f5d904c88c7d77e08c8cff7bcfc0f2f38db30151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 1 Feb 2019 12:38:12 +0100
Subject: [PATCH 249/421] V8: add spacing around tabs

---
 .../src/less/components/application/umb-dashboard.less          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
index 3257d7b93f5b..17fdcc905e3f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
@@ -27,6 +27,8 @@
 // we need to do some special styling for tabs inside the dashboard header
 .umb-dashboard__header .umb-tabs-nav {
     margin-bottom: 0;
+    margin-left: 10px;
+    margin-right: 10px;
     border: none;
 }
 

From 712a26015925cad8adf5154e1190f099bac52d93 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 1 Feb 2019 13:01:42 +0100
Subject: [PATCH 250/421] Fix wrong class name in media picker element selector

---
 .../infiniteeditors/mediapicker/mediapicker.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 7b3d13937f6a..2d6a2be471d4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -104,7 +104,7 @@ angular.module("umbraco")
             }
 
             $scope.upload = function(v) {
-                angular.element(".umb-file-dropzone-directive .file-select").trigger("click");
+                angular.element(".umb-file-dropzone .file-select").trigger("click");
             };
 
             $scope.dragLeave = function(el, event) {

From 726143246129c46e6a3efdb028416e377a795f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 1 Feb 2019 13:23:09 +0100
Subject: [PATCH 251/421] =?UTF-8?q?V8:=20UI=20=E2=80=94=20changed=20look?=
 =?UTF-8?q?=20of=20media-picker=20upload=20button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mediapicker/mediapicker.html              | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index b5dd23b1fd37..44b70ea6134f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.Editors.MediaPickerController as vm">
 <umb-editor-view >
-    
+
     <umb-editor-header
         name="model.title"
         name-locked="true"
@@ -10,17 +10,17 @@
     </umb-editor-header>
 
     <umb-editor-container>
-    
+
         <form id="fileupload" method="POST" enctype="multipart/form-data" umb-image-upload="options">
-    
+
             <div on-drag-leave="dragLeave()" on-drag-end="dragLeave()" on-drag-enter="dragEnter()">
-    
+
                 <div class="umb-control-group umb-mediapicker-upload">
-    
+
                     <umb-load-indicator
                         ng-if="loading">
                     </umb-load-indicator>
-    
+
                     <div class="form-search">
                         <i class="icon-search"></i>
                         <input class="umb-search-field search-query -full-width-input"
@@ -38,111 +38,111 @@
                             </label>
                         </div>
                     </div>
-    
+
                     <div class="upload-button">
-                        <umb-button 
-                            type="button" 
-                            label-key="general_upload" 
-                            action="upload()" 
+                        <umb-button
+                            type="button"
+                            label-key="general_upload"
+                            action="upload()"
                             disabled="lockedFolder"
-                            button-style="info">
+                            button-style="action">
                         </umb-button>
                     </div>
-    
+
                 </div>
-    
+
                 <div class="row umb-control-group" ng-show="!searchOptions.filter">
                     <ul class="umb-breadcrumbs">
                         <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
                             <a href ng-click="gotoFolder()" prevent-default>Media</a>
                             <span class="umb-breadcrumbs__separator">&#47;</span>
                         </li>
-    
+
                         <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
                             <a href ng-click="gotoFolder(item)" prevent-default>{{item.name}}</a>
                             <span class="umb-breadcrumbs__separator">&#47;</span>
                         </li>
-    
+
                         <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
                             <a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
                                 <i class="icon icon-add small"></i>
                             </a>
-    
+
                             <input type="text" class="umb-breadcrumbs__add-ancestor" ng-show="showFolderInput" ng-model="model.newFolderName" ng-keydown="enterSubmitFolder($event)"
                                 ng-blur="submitFolder()" focus-when="{{showFolderInput}}" />
                         </li>
                     </ul>
                     <div class="umb-loader" ng-if="creatingFolder"></div>
                 </div>
-    
-                <umb-file-dropzone 
-                    ng-if="acceptedMediatypes.length > 0 && !loading && !lockedFolder" 
+
+                <umb-file-dropzone
+                    ng-if="acceptedMediatypes.length > 0 && !loading && !lockedFolder"
                     accepted-mediatypes="acceptedMediatypes"
-                    parent-id="{{currentFolder.id}}" 
-                    files-uploaded="onUploadComplete" 
-                    files-queued="onFilesQueue" 
+                    parent-id="{{currentFolder.id}}"
+                    files-uploaded="onUploadComplete"
+                    files-queued="onFilesQueue"
                     accept="{{acceptedFileTypes}}"
-                    max-file-size="{{maxFileSize}}" 
+                    max-file-size="{{maxFileSize}}"
                     hide-dropzone="{{!activeDrag && images.length > 0 || searchOptions.filter }}"
                     compact="{{ images.length > 0 }}">
                 </umb-file-dropzone>
-                
-                <umb-media-grid 
-                        ng-if="!loading" 
-                        items="images" 
+
+                <umb-media-grid
+                        ng-if="!loading"
+                        items="images"
                         on-click="clickHandler"
                         on-click-name="clickItemName"
                         on-click-edit="editMediaItem(item)"
                         allow-on-click-edit="{{allowMediaEdit}}"
                         item-max-width="150"
-                        item-max-height="150" 
-                        item-min-width="100" 
-                        item-min-height="100" 
+                        item-max-height="150"
+                        item-min-width="100"
+                        item-min-height="100"
                         only-images={{onlyImages}}
                         include-sub-folders={{showChilds}}
                         current-Folder-id="{{currentFolder.id}}">
                 </umb-media-grid>
-    
+
                 <div class="flex justify-center">
-                    <umb-pagination 
-                        ng-if="searchOptions.totalPages > 0 && !loading" 
-                        page-number="searchOptions.pageNumber" 
+                    <umb-pagination
+                        ng-if="searchOptions.totalPages > 0 && !loading"
+                        page-number="searchOptions.pageNumber"
                         total-pages="searchOptions.totalPages"
                         on-change="changePagination(pageNumber)">
                     </umb-pagination>
                 </div>
-    
+
                 <umb-empty-state ng-if="searchOptions.filter && images.length === 0 && !loading" position="center">
                     <localize key="general_searchNoResult"></localize>
                 </umb-empty-state>
-    
+
             </div>
-    
+
             <umb-overlay ng-if="mediaPickerDetailsOverlay.show" model="mediaPickerDetailsOverlay" position="right">
-    
+
                 <div class="umb-control-group">
-    
+
                     <div ng-if="target.url">
-                        <umb-image-gravity 
-                            src="target.url" 
+                        <umb-image-gravity
+                            src="target.url"
                             center="target.focalPoint">
                         </umb-image-gravity>
                     </div>
-    
+
                     <div ng-if="cropSize">
-    
+
                         <h5>
                             <localize key="general_preview">Preview</localize>
                         </h5>
-    
+
                         <umb-image-thumbnail center="target.focalPoint" src="target.url" height="{{cropSize.height}}" width="{{cropSize.width}}"
                             max-size="400">
                         </umb-image-thumbnail>
-    
+
                     </div>
-    
+
                 </div>
-    
+
                 <div class="umb-control-group">
                     <label>
                         <localize key="@general_url"></localize>
@@ -150,17 +150,17 @@ <h5>
                     <input type="text" localize="placeholder" placeholder="@general_url" class="umb-property-editor umb-textstring" ng-model="target.url"
                         ng-disabled="target.id" />
                 </div>
-    
+
                 <div class="umb-control-group">
                     <label>
                         <localize key="@content_altTextOptional"></localize>
                     </label>
                     <input type="text" class="umb-property-editor umb-textstring" ng-model="target.altText" />
                 </div>
-    
-    
+
+
             </umb-overlay>
-    
+
         </form>
 
     </umb-editor-container>

From 9acf913872f012e4790315a3dcf1a32c4cc47661 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 1 Feb 2019 14:07:31 +0100
Subject: [PATCH 252/421] #3545 - Added IContentTypeServiceBaseFactory to
 create a IContentTypeServiceBase (E.g. IContentTypeService or
 IMediaTypeService) based on the type of the IContentBase

---
 .../Composing/Composers/ServicesComposer.cs   |  1 +
 src/Umbraco.Core/ContentExtensions.cs         | 16 +++++----
 .../Services/IContentTypeServiceBase.cs       |  7 +++-
 .../IContentTypeServiceBaseFactory.cs         | 10 ++++++
 .../ContentTypeServiceBaseFactory.cs          | 35 +++++++++++++++++++
 ...peServiceBaseOfTRepositoryTItemTService.cs |  7 ++++
 src/Umbraco.Core/Services/ServiceContext.cs   | 17 +++++++--
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 ++
 .../PublishedContent/NuCacheTests.cs          |  5 ++-
 .../Scoping/ScopedNuCacheTests.cs             |  4 +--
 .../ContentTypeServiceVariantsTests.cs        |  4 +--
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |  8 +++--
 src/Umbraco.Web/Editors/ContentController.cs  |  3 +-
 .../Editors/ContentTypeController.cs          |  9 ++---
 src/Umbraco.Web/Editors/MediaController.cs    |  8 ++---
 .../PublishedContentHashtableConverter.cs     |  5 +--
 .../Models/Mapping/ContentMapperProfile.cs    |  3 +-
 .../Mapping/ContentTypeBasicResolver.cs       | 11 +++---
 .../Mapping/ContentTypeMapperProfile.cs       |  4 +++
 .../Models/Mapping/MediaMapperProfile.cs      |  4 +--
 .../NuCache/PublishedSnapshotService.cs       |  9 ++---
 21 files changed, 130 insertions(+), 42 deletions(-)
 create mode 100644 src/Umbraco.Core/Services/IContentTypeServiceBaseFactory.cs
 create mode 100644 src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseFactory.cs

diff --git a/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs b/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs
index 0410e72148e3..1fe5dd756173 100644
--- a/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs
+++ b/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs
@@ -37,6 +37,7 @@ public static Composition ComposeServices(this Composition composition)
             composition.RegisterUnique<IMemberService, MemberService>();
             composition.RegisterUnique<IMediaService, MediaService>();
             composition.RegisterUnique<IContentTypeService, ContentTypeService>();
+            composition.RegisterUnique<IContentTypeServiceBaseFactory, ContentTypeServiceBaseFactory>();
             composition.RegisterUnique<IMediaTypeService, MediaTypeService>();
             composition.RegisterUnique<IDataTypeService, DataTypeService>();
             composition.RegisterUnique<IFileService, FileService>();
diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 63f9f176ea27..d4ec876565ba 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -166,7 +166,7 @@ public static IEnumerable<Property> GetPropertiesForGroup(this IContentBase cont
         /// <remarks>This really is for FileUpload fields only, and should be obsoleted. For anything else,
         /// you need to store the file by yourself using Store and then figure out
         /// how to deal with auto-fill properties (if any) and thumbnails (if any) by yourself.</remarks>
-        public static void SetValue(this IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
+        public static void SetValue(this IContentBase content, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
         {
             if (filename == null || filestream == null) return;
 
@@ -175,12 +175,12 @@ public static void SetValue(this IContentBase content, IContentTypeService conte
             if (string.IsNullOrWhiteSpace(filename)) return;
             filename = filename.ToLower();
 
-            SetUploadFile(content,contentTypeService, propertyTypeAlias, filename, filestream, culture, segment);
+            SetUploadFile(content,contentTypeServiceBaseFactory, propertyTypeAlias, filename, filestream, culture, segment);
         }
 
-        private static void SetUploadFile(this IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
+        private static void SetUploadFile(this IContentBase content, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
         {
-            var property = GetProperty(content, contentTypeService, propertyTypeAlias);
+            var property = GetProperty(content, contentTypeServiceBaseFactory, propertyTypeAlias);
 
             // Fixes https://github.com/umbraco/Umbraco-CMS/issues/3937 - Assigning a new file to an
             // existing IMedia with extension SetValue causes exception 'Illegal characters in path'
@@ -201,11 +201,12 @@ private static void SetUploadFile(this IContentBase content, IContentTypeService
         }
 
         // gets or creates a property for a content item.
-        private static Property GetProperty(IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias)
+        private static Property GetProperty(IContentBase content, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory, string propertyTypeAlias)
         {
             var property = content.Properties.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (property != null) return property;
 
+            var contentTypeService = contentTypeServiceBaseFactory.Create(content);
             var contentType = contentTypeService.Get(content.ContentTypeId);
             var propertyType = contentType.CompositionPropertyTypes
                 .FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
@@ -233,8 +234,9 @@ private static Property GetProperty(IContentBase content, IContentTypeService co
         /// the "folder number" that was assigned to the previous file referenced by the property,
         /// if any.</para>
         /// </remarks>
-        public static string StoreFile(this IContentBase content, IContentTypeService contentTypeService, string propertyTypeAlias, string filename, Stream filestream, string filepath)
+        public static string StoreFile(this IContentBase content, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory, string propertyTypeAlias, string filename, Stream filestream, string filepath)
         {
+            var contentTypeService = contentTypeServiceBaseFactory.Create(content);
             var contentType = contentTypeService.Get(content.ContentTypeId);
             var propertyType = contentType
                 .CompositionPropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
@@ -317,7 +319,7 @@ public static XElement ToXml(this IContent content, IEntityXmlSerializer seriali
         {
             return serializer.Serialize(content, false, false);
         }
-        
+
 
         /// <summary>
         /// Creates the xml representation for the <see cref="IMedia"/> object
diff --git a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
index bc091535d3d5..cd6f2f4911d9 100644
--- a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
+++ b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
@@ -4,11 +4,16 @@
 
 namespace Umbraco.Core.Services
 {
+    public interface IContentTypeServiceBase
+    {
+        IContentTypeComposition Get(int id);
+    }
+
     /// <summary>
     /// Provides a common base interface for <see cref="IContentTypeService"/>, <see cref="IMediaTypeService"/> and <see cref="IMemberTypeService"/>.
     /// </summary>
     /// <typeparam name="TItem">The type of the item.</typeparam>
-    public interface IContentTypeServiceBase<TItem> : IService
+    public interface IContentTypeServiceBase<TItem> : IContentTypeServiceBase, IService
         where TItem : IContentTypeComposition
     {
         TItem Get(int id);
diff --git a/src/Umbraco.Core/Services/IContentTypeServiceBaseFactory.cs b/src/Umbraco.Core/Services/IContentTypeServiceBaseFactory.cs
new file mode 100644
index 000000000000..c81686312830
--- /dev/null
+++ b/src/Umbraco.Core/Services/IContentTypeServiceBaseFactory.cs
@@ -0,0 +1,10 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Services
+{
+    public interface IContentTypeServiceBaseFactory
+    {
+        IContentTypeServiceBase Create(IContentBase contentBase);
+
+    }
+}
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseFactory.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseFactory.cs
new file mode 100644
index 000000000000..64395d4e2d6c
--- /dev/null
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseFactory.cs
@@ -0,0 +1,35 @@
+using System;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Services.Implement
+{
+    public class ContentTypeServiceBaseFactory : IContentTypeServiceBaseFactory
+    {
+        private readonly IContentTypeService _contentTypeService;
+        private readonly IMediaTypeService _mediaTypeService;
+        private readonly IMemberTypeService _memberTypeService;
+
+        public ContentTypeServiceBaseFactory(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService)
+        {
+            _contentTypeService = contentTypeService;
+            _mediaTypeService = mediaTypeService;
+            _memberTypeService = memberTypeService;
+        }
+
+        public IContentTypeServiceBase Create(IContentBase contentBase)
+        {
+            switch (contentBase)
+            {
+                case IContent _:
+                    return  _contentTypeService;
+                case IMedia _:
+                    return   _mediaTypeService;
+                case IMember _:
+                    return  _memberTypeService;
+                default:
+                    throw new ArgumentException($"Invalid contentBase type: {contentBase.GetType().FullName}" , nameof(contentBase));
+            }
+        }
+
+    }
+}
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index 78bb9821e4d4..943d4be536f8 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -211,6 +211,11 @@ private static void AddChange(ICollection<ContentTypeChange<TItem>> changes, TIt
 
         #region Get, Has, Is, Count
 
+        IContentTypeComposition IContentTypeServiceBase.Get(int id)
+        {
+            return Get(id);
+        }
+
         public TItem Get(int id)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -951,5 +956,7 @@ private void Audit(AuditType type, int userId, int objectId)
         }
 
         #endregion
+
+
     }
 }
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index 6d7ac8a5e7e6..efb4787e65af 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Core.Services.Implement;
 
 namespace Umbraco.Core.Services
 {
@@ -32,11 +33,12 @@ public class ServiceContext
         private readonly Lazy<IExternalLoginService> _externalLoginService;
         private readonly Lazy<IRedirectUrlService> _redirectUrlService;
         private readonly Lazy<IConsentService> _consentService;
+        private readonly Lazy<IContentTypeServiceBaseFactory> _contentTypeServiceBaseFactory;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServiceContext"/> class with lazy services.
         /// </summary>
-        public ServiceContext(Lazy<IPublicAccessService> publicAccessService, Lazy<IDomainService> domainService, Lazy<IAuditService> auditService, Lazy<ILocalizedTextService> localizedTextService, Lazy<ITagService> tagService, Lazy<IContentService> contentService, Lazy<IUserService> userService, Lazy<IMemberService> memberService, Lazy<IMediaService> mediaService, Lazy<IContentTypeService> contentTypeService, Lazy<IMediaTypeService> mediaTypeService, Lazy<IDataTypeService> dataTypeService, Lazy<IFileService> fileService, Lazy<ILocalizationService> localizationService, Lazy<IPackagingService> packagingService, Lazy<IServerRegistrationService> serverRegistrationService, Lazy<IEntityService> entityService, Lazy<IRelationService> relationService, Lazy<IMacroService> macroService, Lazy<IMemberTypeService> memberTypeService, Lazy<IMemberGroupService> memberGroupService, Lazy<INotificationService> notificationService, Lazy<IExternalLoginService> externalLoginService, Lazy<IRedirectUrlService> redirectUrlService, Lazy<IConsentService> consentService)
+        public ServiceContext(Lazy<IPublicAccessService> publicAccessService, Lazy<IDomainService> domainService, Lazy<IAuditService> auditService, Lazy<ILocalizedTextService> localizedTextService, Lazy<ITagService> tagService, Lazy<IContentService> contentService, Lazy<IUserService> userService, Lazy<IMemberService> memberService, Lazy<IMediaService> mediaService, Lazy<IContentTypeService> contentTypeService, Lazy<IMediaTypeService> mediaTypeService, Lazy<IDataTypeService> dataTypeService, Lazy<IFileService> fileService, Lazy<ILocalizationService> localizationService, Lazy<IPackagingService> packagingService, Lazy<IServerRegistrationService> serverRegistrationService, Lazy<IEntityService> entityService, Lazy<IRelationService> relationService, Lazy<IMacroService> macroService, Lazy<IMemberTypeService> memberTypeService, Lazy<IMemberGroupService> memberGroupService, Lazy<INotificationService> notificationService, Lazy<IExternalLoginService> externalLoginService, Lazy<IRedirectUrlService> redirectUrlService, Lazy<IConsentService> consentService, Lazy<IContentTypeServiceBaseFactory> contentTypeServiceBaseFactory)
         {
             _publicAccessService = publicAccessService;
             _domainService = domainService;
@@ -63,6 +65,7 @@ public ServiceContext(Lazy<IPublicAccessService> publicAccessService, Lazy<IDoma
             _externalLoginService = externalLoginService;
             _redirectUrlService = redirectUrlService;
             _consentService = consentService;
+            _contentTypeServiceBaseFactory = contentTypeServiceBaseFactory;
         }
 
         /// <summary>
@@ -96,7 +99,8 @@ public static ServiceContext CreatePartial(
             IExternalLoginService externalLoginService = null,
             IServerRegistrationService serverRegistrationService = null,
             IRedirectUrlService redirectUrlService = null,
-            IConsentService consentService = null)
+            IConsentService consentService = null,
+            IContentTypeServiceBaseFactory contentTypeServiceBaseFactory = null)
         {
             Lazy<T> Lazy<T>(T service) => service == null ? null : new Lazy<T>(() => service);
 
@@ -125,7 +129,9 @@ public static ServiceContext CreatePartial(
                 Lazy(notificationService),
                 Lazy(externalLoginService),
                 Lazy(redirectUrlService),
-                Lazy(consentService));
+                Lazy(consentService),
+                Lazy(contentTypeServiceBaseFactory)
+                );
         }
 
         /// <summary>
@@ -252,5 +258,10 @@ public static ServiceContext CreatePartial(
         /// Gets the ConsentService.
         /// </summary>
         public IConsentService ConsentService => _consentService.Value;
+
+        /// <summary>
+        /// Gets the ContentTypeServiceBaseFactory.
+        /// </summary>
+        public IContentTypeServiceBaseFactory ContentTypeServiceBaseFactory => _contentTypeServiceBaseFactory.Value;
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index d39247ad9ee0..ddfa4f9df8f1 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -1346,6 +1346,7 @@
     <Compile Include="Serialization\UdiRangeJsonConverter.cs" />
     <Compile Include="ServiceContextExtensions.cs" />
     <Compile Include="Services\IConsentService.cs" />
+    <Compile Include="Services\IContentTypeServiceBaseFactory.cs" />
     <Compile Include="Services\IEntityXmlSerializer.cs" />
     <Compile Include="Services\Implement\AuditService.cs" />
     <Compile Include="Services\Changes\ContentTypeChange.cs" />
@@ -1363,6 +1364,7 @@
     <Compile Include="Services\Implement\ContentTypeServiceBaseOfTItemTService.cs" />
     <Compile Include="Services\Implement\ContentTypeServiceBaseOfTRepositoryTItemTService.cs" />
     <Compile Include="Services\ContentTypeServiceExtensions.cs" />
+    <Compile Include="Services\Implement\ContentTypeServiceBaseFactory.cs" />
     <Compile Include="Services\Implement\DataTypeService.cs" />
     <Compile Include="Services\Implement\DomainService.cs" />
     <Compile Include="Services\Implement\EntityService.cs" />
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 8c1caae1e021..73554aec67a1 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -124,6 +124,9 @@ private void Init()
             Mock.Get(contentTypeService).Setup(x => x.GetAll()).Returns(contentTypes);
             Mock.Get(contentTypeService).Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(contentTypes);
 
+            var contentTypeServiceBaseFactory = Mock.Of<IContentTypeServiceBaseFactory>();
+            Mock.Get(contentTypeServiceBaseFactory).Setup(x => x.Create(It.IsAny<IContentBase>())).Returns(contentTypeService);
+
             var dataTypeService = Mock.Of<IDataTypeService>();
             Mock.Get(dataTypeService).Setup(x => x.GetAll()).Returns(dataTypes);
 
@@ -177,7 +180,7 @@ private void Init()
                 dataSource,
                 globalSettings,
                 new SiteDomainHelper(),
-                contentTypeService,
+                contentTypeServiceBaseFactory,
                 Mock.Of<IEntityXmlSerializer>());
 
             // invariant is the current default
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 9333d3be1880..d2fd3f90f9af 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -80,7 +80,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
             var documentRepository = Mock.Of<IDocumentRepository>();
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
-            var contentTypeService = Current.Services.ContentTypeService;
+            var contentTypeServiceBaseFactory = Current.Services.ContentTypeServiceBaseFactory;
 
             return new PublishedSnapshotService(
                 options,
@@ -97,7 +97,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
                 new DatabaseDataSource(),
-                Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(), contentTypeService,
+                Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(), contentTypeServiceBaseFactory,
                 Factory.GetInstance<IEntityXmlSerializer>());
         }
 
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 0d0bdcf62404..8f567afd65bd 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -53,7 +53,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
             var documentRepository = Factory.GetInstance<IDocumentRepository>();
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
-            var contentTypeService = Current.Services.ContentTypeService;
+            var contentTypeServiceBaseFactory = Current.Services.ContentTypeServiceBaseFactory;
 
             return new PublishedSnapshotService(
                 options,
@@ -70,7 +70,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
                 new DatabaseDataSource(),
-                Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(), contentTypeService,
+                Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(), contentTypeServiceBaseFactory,
                 Factory.GetInstance<IEntityXmlSerializer>());
         }
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 7a9702031b86..6ab714a68a53 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -176,7 +176,7 @@ public ServiceContext GetServiceContext(
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var compiledPackageXmlParser = new CompiledPackageXmlParser(new ConflictingPackageData(macroService.Value, fileService.Value));
                 return new PackagingService(
-                    auditService.Value, 
+                    auditService.Value,
                     new PackagesRepository(contentService.Value, contentTypeService.Value, dataTypeService.Value, fileService.Value, macroService.Value, localizationService.Value,
                         new EntityXmlSerializer(contentService.Value, mediaService.Value, dataTypeService.Value, userService.Value, localizationService.Value, contentTypeService.Value, urlSegmentProviders), logger, "createdPackages.config"),
                     new PackagesRepository(contentService.Value, contentTypeService.Value, dataTypeService.Value, fileService.Value, macroService.Value, localizationService.Value,
@@ -188,9 +188,10 @@ public ServiceContext GetServiceContext(
                         new DirectoryInfo(IOHelper.GetRootDirectorySafe())));
             });
             var relationService = GetLazyService<IRelationService>(factory, c => new RelationService(scopeProvider, logger, eventMessagesFactory, entityService.Value, GetRepo<IRelationRepository>(c), GetRepo<IRelationTypeRepository>(c)));
-            var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));            
+            var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));
             var redirectUrlService = GetLazyService<IRedirectUrlService>(factory, c => new RedirectUrlService(scopeProvider, logger, eventMessagesFactory, GetRepo<IRedirectUrlRepository>(c)));
             var consentService = GetLazyService<IConsentService>(factory, c => new ConsentService(scopeProvider, logger, eventMessagesFactory, GetRepo<IConsentRepository>(c)));
+            var contentTypeServiceBaseFactory = GetLazyService<IContentTypeServiceBaseFactory>(factory, c => new ContentTypeServiceBaseFactory(factory.GetInstance<IContentTypeService>(),factory.GetInstance<IMediaTypeService>(),factory.GetInstance<IMemberTypeService>()));
 
             return new ServiceContext(
                 publicAccessService,
@@ -217,7 +218,8 @@ public ServiceContext GetServiceContext(
                 notificationService,
                 externalLoginService,
                 redirectUrlService,
-                consentService);
+                consentService,
+                contentTypeServiceBaseFactory);
         }
 
         private Lazy<T> GetLazyService<T>(IFactory container, Func<IFactory, T> ctor)
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index b81f68f14e33..0dff862d0852 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1838,7 +1838,8 @@ private IContent ValidateMoveOrCopy(MoveOrCopy model)
                     throw new HttpResponseException(HttpStatusCode.NotFound);
                 }
 
-                var parentContentType = Services.ContentTypeService.Get(parent.ContentTypeId);
+                var contentTypeService = Services.ContentTypeServiceBaseFactory.Create(parent);
+                var parentContentType = contentTypeService.Get(parent.ContentTypeId);
                 //check if the item is allowed under this one
                 if (parentContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
                         .Any(x => x.Value == toMove.ContentType.Id) == false)
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index a559dbe32f56..8fc60261a194 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -403,7 +403,8 @@ public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
                     return Enumerable.Empty<ContentTypeBasic>();
                 }
 
-                var contentType = Services.ContentTypeService.Get(contentItem.ContentTypeId);
+                var contentTypeService = Services.ContentTypeServiceBaseFactory.Create(contentItem);
+                var contentType = contentTypeService.Get(contentItem.ContentTypeId);
                 var ids = contentType.AllowedContentTypes.Select(x => x.Id.Value).ToArray();
 
                 if (ids.Any() == false) return Enumerable.Empty<ContentTypeBasic>();
@@ -498,7 +499,7 @@ public HttpResponseMessage Import(string file)
             {
                 return Request.CreateResponse(HttpStatusCode.NotFound);
             }
-            
+
             var dataInstaller = new PackageDataInstallation(Logger, Services.FileService, Services.MacroService, Services.LocalizationService,
                 Services.DataTypeService, Services.EntityService, Services.ContentTypeService, Services.ContentService, _propertyEditors);
 
@@ -544,7 +545,7 @@ public async Task<ContentTypeImportModel> Upload()
             }
 
             var model = new ContentTypeImportModel();
-            
+
             var file = result.FileData[0];
             var fileName = file.Headers.ContentDisposition.FileName.Trim('\"');
             var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
@@ -578,6 +579,6 @@ public async Task<ContentTypeImportModel> Upload()
 
         }
 
-        
+
     }
 }
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index cdef11b6d8e3..9699bf8a7145 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -47,10 +47,10 @@ namespace Umbraco.Web.Editors
     [MediaControllerControllerConfiguration]
     public class MediaController : ContentControllerBase
     {
-        public MediaController(PropertyEditorCollection propertyEditors, IContentTypeService contentTypeService)
+        public MediaController(PropertyEditorCollection propertyEditors, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
-            _contentTypeService = contentTypeService;
+            _contentTypeServiceBaseFactory = contentTypeServiceBaseFactory;
         }
 
         /// <summary>
@@ -234,7 +234,7 @@ public IEnumerable<ContentItemBasic<ContentPropertyBasic>> GetRootMedia()
 
         private int[] _userStartNodes;
         private readonly PropertyEditorCollection _propertyEditors;
-        private readonly IContentTypeService _contentTypeService;
+        private readonly IContentTypeServiceBaseFactory _contentTypeServiceBaseFactory;
 
         protected int[] UserStartNodes
         {
@@ -726,7 +726,7 @@ public async Task<HttpResponseMessage> PostAddFile()
                     if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
                     using (fs)
                     {
-                        f.SetValue(_contentTypeService, Constants.Conventions.Media.File,fileName, fs);
+                        f.SetValue(_contentTypeServiceBaseFactory, Constants.Conventions.Media.File,fileName, fs);
                     }
 
                     var saveResult = mediaService.Save(f, Security.CurrentUser.Id);
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index ece76090d853..1ff38f3d1b9b 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -102,7 +102,7 @@ private void PopulatePageData(int pageId,
             Elements.Add("path", path);
             Elements.Add("splitpath", path.Split(','));
         }
-        
+
         /// <summary>
         /// Puts the properties of the node into the elements table
         /// </summary>
@@ -202,7 +202,8 @@ public PagePublishedContent(IContent inner, IVariationContextAccessor variationC
                 CreatorName = _inner.GetCreatorProfile().Name;
                 WriterName = _inner.GetWriterProfile().Name;
 
-                ContentType = Current.PublishedContentTypeFactory.CreateContentType(_inner.ContentType);
+                var contentTypeService = Current.Services.ContentTypeServiceBaseFactory.Create(_inner);
+                ContentType = Current.PublishedContentTypeFactory.CreateContentType(contentTypeService.Get(_inner.ContentTypeId));
 
                 _properties = ContentType.PropertyTypes
                     .Select(x =>
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
index f6b774dae0e6..2c13a2ecadd1 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
@@ -23,6 +23,7 @@ public ContentMapperProfile(
             IUserService userService,
             IContentService contentService,
             IContentTypeService contentTypeService,
+            IContentTypeServiceBaseFactory contentTypeServiceBaseFactory,
             ILocalizationService localizationService)
         {
             // create, capture, cache
@@ -30,7 +31,7 @@ public ContentMapperProfile(
             var creatorResolver = new CreatorResolver(userService);
             var actionButtonsResolver = new ActionButtonsResolver(userService, contentService);
             var childOfListViewResolver = new ContentChildOfListViewResolver(contentService, contentTypeService);
-            var contentTypeBasicResolver = new ContentTypeBasicResolver<IContent, ContentItemDisplay>(contentTypeService);
+            var contentTypeBasicResolver = new ContentTypeBasicResolver<IContent, ContentItemDisplay>(contentTypeServiceBaseFactory);
             var allowedTemplatesResolver = new AllowedTemplatesResolver(contentTypeService);
             var defaultTemplateResolver = new DefaultTemplateResolver();
             var variantResolver = new ContentVariantResolver(localizationService);
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
index 7b4a936676ac..0655f4d8cf1a 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
@@ -16,11 +16,11 @@ namespace Umbraco.Web.Models.Mapping
     internal class ContentTypeBasicResolver<TSource, TDestination> : IValueResolver<TSource, TDestination, ContentTypeBasic>
         where TSource : IContentBase
     {
-        private readonly IContentTypeService _contentTypeService;
+        private readonly IContentTypeServiceBaseFactory _contentTypeServiceBaseFactory;
 
-        public ContentTypeBasicResolver(IContentTypeService contentTypeService)
+        public ContentTypeBasicResolver(IContentTypeServiceBaseFactory contentTypeServiceBaseFactory)
         {
-            _contentTypeService = contentTypeService;
+            _contentTypeServiceBaseFactory = contentTypeServiceBaseFactory;
         }
 
         public ContentTypeBasic Resolve(TSource source, TDestination destination, ContentTypeBasic destMember, ResolutionContext context)
@@ -30,8 +30,9 @@ public ContentTypeBasic Resolve(TSource source, TDestination destination, Conten
             if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
                 && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
             {
-                var contentType = _contentTypeService.Get(source.ContentTypeId);
-                var contentTypeBasic =  Mapper.Map<IContentType, ContentTypeBasic>(contentType);
+                var contentTypeService = _contentTypeServiceBaseFactory.Create(source);
+                var contentType = contentTypeService.Get(source.ContentTypeId);
+                var contentTypeBasic =  Mapper.Map<IContentTypeComposition, ContentTypeBasic>(contentType);
 
                 return contentTypeBasic;
             }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs
index f70b01a42299..88bf409737f6 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs
@@ -134,6 +134,10 @@ public ContentTypeMapperProfile(PropertyEditorCollection propertyEditors, IDataT
 
                 });
 
+            CreateMap<IContentTypeComposition, ContentTypeBasic>()
+                .ForMember(dest => dest.Udi, opt => opt.MapFrom(source => Udi.Create(Constants.UdiEntityType.MemberType, source.Key)))
+                .ForMember(dest => dest.Blueprints, opt => opt.Ignore())
+                .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
             CreateMap<IMemberType, ContentTypeBasic>()
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(source => Udi.Create(Constants.UdiEntityType.MemberType, source.Key)))
                 .ForMember(dest => dest.Blueprints, opt => opt.Ignore())
diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
index 4dcaaa2a0f4f..2b575c87daf4 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
@@ -25,12 +25,12 @@ public MediaMapperProfile(TabsAndPropertiesResolver<IMedia, MediaItemDisplay> ta
             IMediaService mediaService,
             IMediaTypeService mediaTypeService,
             ILogger logger,
-            IContentTypeService contentTypeService)
+            IContentTypeServiceBaseFactory contentTypeServiceBaseFactory)
         {
             // create, capture, cache
             var mediaOwnerResolver = new OwnerResolver<IMedia>(userService);
             var childOfListViewResolver = new MediaChildOfListViewResolver(mediaService, mediaTypeService);
-            var mediaTypeBasicResolver = new ContentTypeBasicResolver<IMedia, MediaItemDisplay>(contentTypeService);
+            var mediaTypeBasicResolver = new ContentTypeBasicResolver<IMedia, MediaItemDisplay>(contentTypeServiceBaseFactory);
 
             //FROM IMedia TO MediaItemDisplay
             CreateMap<IMedia, MediaItemDisplay>()
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 752cfdb5dedf..e6a7c24f5964 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -41,7 +41,7 @@ class PublishedSnapshotService : PublishedSnapshotServiceBase
         private readonly IMemberRepository _memberRepository;
         private readonly IGlobalSettings _globalSettings;
         private readonly ISiteDomainHelper _siteDomainHelper;
-        private readonly IContentTypeService _contentTypeService;
+        private readonly IContentTypeServiceBaseFactory _contentTypeServiceBaseFactory;
         private readonly IEntityXmlSerializer _entitySerializer;
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
 
@@ -85,7 +85,7 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
             IUmbracoContextAccessor umbracoContextAccessor, ILogger logger, IScopeProvider scopeProvider,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
-            IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, IContentTypeService contentTypeService,
+            IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory,
             IEntityXmlSerializer entitySerializer)
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
@@ -104,7 +104,7 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
             _defaultCultureAccessor = defaultCultureAccessor;
             _globalSettings = globalSettings;
             _siteDomainHelper = siteDomainHelper;
-            _contentTypeService = contentTypeService;
+            _contentTypeServiceBaseFactory = contentTypeServiceBaseFactory;
 
             // we need an Xml serializer here so that the member cache can support XPath,
             // for members this is done by navigating the serialized-to-xml member
@@ -1204,7 +1204,8 @@ private ContentNuDto GetDto(IContentBase content, bool published)
             var cultureData = new Dictionary<string, CultureVariation>();
 
             // sanitize - names should be ok but ... never knows
-            var contentType = _contentTypeService.Get(content.ContentTypeId);
+            var contentTypeService = _contentTypeServiceBaseFactory.Create(content);
+            var contentType = contentTypeService.Get(content.ContentTypeId);
             if (contentType.VariesByCulture())
             {
                 var infos = content is IContent document

From bf87ecb81823dfd4eb0dc15b142c4bda4b17c815 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 1 Feb 2019 14:32:17 +0100
Subject: [PATCH 253/421] Add descriptions to properties on default media items

---
 .../Migrations/Install/DatabaseDataCreator.cs             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 7e9df321c391..1a4fdd44004f 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -211,13 +211,13 @@ private void CreatePropertyTypeGroupData()
         private void CreatePropertyTypeData()
         {
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 6, UniqueId = 6.ToGuid(), DataTypeId = 1043, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.File, Name = "Upload image", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 7, UniqueId = 7.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Width, Name = "Width", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 8, UniqueId = 8.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Height, Name = "Height", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 9, UniqueId = 9.ToGuid(), DataTypeId = Constants.DataTypes.LabelBigint, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 7, UniqueId = 7.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Width, Name = "Width", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in pixels", Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 8, UniqueId = 8.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Height, Name = "Height", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in pixels", Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 9, UniqueId = 9.ToGuid(), DataTypeId = Constants.DataTypes.LabelBigint, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in bytes", Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 10, UniqueId = 10.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 24, UniqueId = 24.ToGuid(), DataTypeId = -90, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.File, Name = "Upload file", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 25, UniqueId = 25.ToGuid(), DataTypeId = -92, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 26, UniqueId = 26.ToGuid(), DataTypeId = Constants.DataTypes.LabelBigint, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 26, UniqueId = 26.ToGuid(), DataTypeId = Constants.DataTypes.LabelBigint, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in bytes", Variations = (byte) ContentVariation.Nothing });
             //membership property types
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 28, UniqueId = 28.ToGuid(), DataTypeId = -89, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.Comments, Name = Constants.Conventions.Member.CommentsLabel, SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 29, UniqueId = 29.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.FailedPasswordAttempts, Name = Constants.Conventions.Member.FailedPasswordAttemptsLabel, SortOrder = 1, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });

From d4b2ac3f1e02b9ece7bf392b67fa221ed6e448b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 1 Feb 2019 14:54:49 +0100
Subject: [PATCH 254/421] =?UTF-8?q?V8:=20UI=20=E2=80=94=20changed=20color?=
 =?UTF-8?q?=20for=20focus=20point=20on=20medias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Web.UI.Client/src/less/property-editors.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 8d1b70c35d4d..09cdaf493977 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -547,7 +547,7 @@
     height: 14px;
     text-align: center;
     border-radius: 20px;
-    background: @turquoise;
+    background: @pinkLight;
     border: 3px solid @white;
     opacity: 0.8;
 }

From e17d6df02385563b9153ada29c19cc8e003f5505 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 1 Feb 2019 15:13:41 +0000
Subject: [PATCH 255/421] It helps if you put in a valid value - it expects
 Information and not Info as the loglevel

---
 src/Umbraco.Web.UI/config/serilog.config      | 3 ++-
 src/Umbraco.Web.UI/config/serilog.user.config | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/serilog.config b/src/Umbraco.Web.UI/config/serilog.config
index 9638d285ce02..1b76cba302c6 100644
--- a/src/Umbraco.Web.UI/config/serilog.config
+++ b/src/Umbraco.Web.UI/config/serilog.config
@@ -5,7 +5,8 @@
         <!-- Used to toggle the loge levels for the main Umbraco log files -->
         <!-- Found at /app_data/logs/ -->
         <!-- NOTE: Changing this will also flow down into serilog.user.config -->
-        <add key="serilog:minimum-level" value="Info" />
+        <!-- VALID Values: Verbose, Debug, Information, Warning, Error, Fatal -->
+        <add key="serilog:minimum-level" value="Information" />
 
         <!-- To write to new log locations (aka Sinks) such as your own .txt files, ELMAH.io, Elastic, SEQ -->
         <!-- Please use the serilog.user.config file to configure your own logging needs -->
diff --git a/src/Umbraco.Web.UI/config/serilog.user.config b/src/Umbraco.Web.UI/config/serilog.user.config
index 374657795ee7..24e5e4e4be72 100644
--- a/src/Umbraco.Web.UI/config/serilog.user.config
+++ b/src/Umbraco.Web.UI/config/serilog.user.config
@@ -3,7 +3,8 @@
     <appSettings>
         
         <!-- Controls log levels for all user-defined child sub-logger sinks configured here (Set this higher than child sinks defined here) -->
-        <add key="serilog:minimum-level" value="Info" />
+        <!-- VALID Values: Verbose, Debug, Information, Warning, Error, Fatal -->
+        <add key="serilog:minimum-level" value="Information" />
 
         <!-- For Different Namespaces - Set different logging levels -->
         <!--

From 132c3c0c8e420414a07178a893fba9a55d80247f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 1 Feb 2019 17:16:50 +0100
Subject: [PATCH 256/421] Cleanup PR, document and rename things

---
 .../Composing/Composers/ServicesComposer.cs   |   2 +-
 src/Umbraco.Core/ContentExtensions.cs         |  16 +--
 src/Umbraco.Core/Models/Content.cs            |  15 +--
 src/Umbraco.Core/Models/ISimpleContentType.cs | 112 ++++++++----------
 src/Umbraco.Core/Models/SimpleContentType.cs  |  84 +++++++++++++
 src/Umbraco.Core/ServiceContextExtensions.cs  |   8 +-
 .../IContentTypeBaseServiceProvider.cs        |  22 ++++
 .../Services/IContentTypeService.cs           |   2 +-
 .../Services/IContentTypeServiceBase.cs       |  21 +++-
 .../IContentTypeServiceBaseFactory.cs         |  10 --
 .../Services/IMediaTypeService.cs             |   2 +-
 .../Services/IMemberTypeService.cs            |   2 +-
 ...y.cs => ContentTypeBaseServiceProvider.cs} |   7 +-
 .../ContentTypeServiceBaseOfTItemTService.cs  |   2 +-
 ...peServiceBaseOfTRepositoryTItemTService.cs |   6 +-
 src/Umbraco.Core/Services/ServiceContext.cs   |  13 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   5 +-
 .../PublishedContent/NuCacheTests.cs          |   4 +-
 .../Scoping/ScopedNuCacheTests.cs             |   2 +-
 .../ContentTypeServiceVariantsTests.cs        |   2 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   2 +-
 src/Umbraco.Web/Editors/ContentController.cs  |   2 +-
 .../Editors/ContentTypeController.cs          |   2 +-
 src/Umbraco.Web/Editors/MediaController.cs    |   8 +-
 .../PublishedContentHashtableConverter.cs     |   2 +-
 .../Models/Mapping/ContentMapperProfile.cs    |   4 +-
 .../Mapping/ContentTypeBasicResolver.cs       |   8 +-
 .../Models/Mapping/MediaMapperProfile.cs      |   4 +-
 .../NuCache/PublishedSnapshotService.cs       |   8 +-
 29 files changed, 237 insertions(+), 140 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/SimpleContentType.cs
 create mode 100644 src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs
 delete mode 100644 src/Umbraco.Core/Services/IContentTypeServiceBaseFactory.cs
 rename src/Umbraco.Core/Services/Implement/{ContentTypeServiceBaseFactory.cs => ContentTypeBaseServiceProvider.cs} (75%)

diff --git a/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs b/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs
index 1fe5dd756173..1e10585b8ef4 100644
--- a/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs
+++ b/src/Umbraco.Core/Composing/Composers/ServicesComposer.cs
@@ -37,7 +37,7 @@ public static Composition ComposeServices(this Composition composition)
             composition.RegisterUnique<IMemberService, MemberService>();
             composition.RegisterUnique<IMediaService, MediaService>();
             composition.RegisterUnique<IContentTypeService, ContentTypeService>();
-            composition.RegisterUnique<IContentTypeServiceBaseFactory, ContentTypeServiceBaseFactory>();
+            composition.RegisterUnique<IContentTypeBaseServiceProvider, ContentTypeBaseServiceProvider>();
             composition.RegisterUnique<IMediaTypeService, MediaTypeService>();
             composition.RegisterUnique<IDataTypeService, DataTypeService>();
             composition.RegisterUnique<IFileService, FileService>();
diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index d4ec876565ba..5db080f3f314 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -166,7 +166,7 @@ public static IEnumerable<Property> GetPropertiesForGroup(this IContentBase cont
         /// <remarks>This really is for FileUpload fields only, and should be obsoleted. For anything else,
         /// you need to store the file by yourself using Store and then figure out
         /// how to deal with auto-fill properties (if any) and thumbnails (if any) by yourself.</remarks>
-        public static void SetValue(this IContentBase content, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
+        public static void SetValue(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
         {
             if (filename == null || filestream == null) return;
 
@@ -175,12 +175,12 @@ public static void SetValue(this IContentBase content, IContentTypeServiceBaseFa
             if (string.IsNullOrWhiteSpace(filename)) return;
             filename = filename.ToLower();
 
-            SetUploadFile(content,contentTypeServiceBaseFactory, propertyTypeAlias, filename, filestream, culture, segment);
+            SetUploadFile(content,contentTypeBaseServiceProvider, propertyTypeAlias, filename, filestream, culture, segment);
         }
 
-        private static void SetUploadFile(this IContentBase content, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
+        private static void SetUploadFile(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
         {
-            var property = GetProperty(content, contentTypeServiceBaseFactory, propertyTypeAlias);
+            var property = GetProperty(content, contentTypeBaseServiceProvider, propertyTypeAlias);
 
             // Fixes https://github.com/umbraco/Umbraco-CMS/issues/3937 - Assigning a new file to an
             // existing IMedia with extension SetValue causes exception 'Illegal characters in path'
@@ -201,12 +201,12 @@ private static void SetUploadFile(this IContentBase content, IContentTypeService
         }
 
         // gets or creates a property for a content item.
-        private static Property GetProperty(IContentBase content, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory, string propertyTypeAlias)
+        private static Property GetProperty(IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias)
         {
             var property = content.Properties.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (property != null) return property;
 
-            var contentTypeService = contentTypeServiceBaseFactory.Create(content);
+            var contentTypeService = contentTypeBaseServiceProvider.For(content);
             var contentType = contentTypeService.Get(content.ContentTypeId);
             var propertyType = contentType.CompositionPropertyTypes
                 .FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
@@ -234,9 +234,9 @@ private static Property GetProperty(IContentBase content, IContentTypeServiceBas
         /// the "folder number" that was assigned to the previous file referenced by the property,
         /// if any.</para>
         /// </remarks>
-        public static string StoreFile(this IContentBase content, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory, string propertyTypeAlias, string filename, Stream filestream, string filepath)
+        public static string StoreFile(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias, string filename, Stream filestream, string filepath)
         {
-            var contentTypeService = contentTypeServiceBaseFactory.Create(content);
+            var contentTypeService = contentTypeBaseServiceProvider.For(content);
             var contentType = contentTypeService.Get(content.ContentTypeId);
             var propertyType = contentType
                 .CompositionPropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index d2f5e3d30868..16b28e088a7f 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -15,8 +15,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Content : ContentBase, IContent
     {
-        private ISimpleContentType _contentType;
-        private ITemplate _template;
         private int? _templateId;
         private ContentScheduleCollection _schedule;
         private bool _published;
@@ -50,7 +48,7 @@ public Content(string name, IContent parent, IContentType contentType, PropertyC
             : base(name, parent, contentType, properties, culture)
         {
             if (contentType == null) throw new ArgumentNullException(nameof(contentType));
-            _contentType = new SimpleContentType(contentType);
+            ContentType = new SimpleContentType(contentType);
             _publishedState = PublishedState.Unpublished;
             PublishedVersionId = 0;
         }
@@ -78,7 +76,7 @@ public Content(string name, int parentId, IContentType contentType, PropertyColl
             : base(name, parentId, contentType, properties, culture)
         {
             if (contentType == null) throw new ArgumentNullException(nameof(contentType));
-            _contentType = new SimpleContentType(contentType);
+            ContentType = new SimpleContentType(contentType);
             _publishedState = PublishedState.Unpublished;
             PublishedVersionId = 0;
         }
@@ -140,7 +138,6 @@ public int? TemplateId
             set => SetPropertyValueAndDetectChanges(value, ref _templateId, Ps.Value.TemplateSelector);
         }
 
-
         /// <summary>
         /// Gets or sets a value indicating whether this content item is published or not.
         /// </summary>
@@ -184,7 +181,7 @@ public PublishedState PublishedState
         /// Gets the ContentType used by this content object
         /// </summary>
         [IgnoreDataMember]
-        public ISimpleContentType ContentType => _contentType;
+        public ISimpleContentType ContentType { get; private set; }
 
         /// <inheritdoc />
         [IgnoreDataMember]
@@ -426,7 +423,7 @@ public void UnpublishCulture(string culture = "*")
         public void ChangeContentType(IContentType contentType)
         {
             ContentTypeId = contentType.Id;
-            _contentType = new SimpleContentType(contentType);
+            ContentType = new SimpleContentType(contentType);
             ContentTypeBase = contentType;
             Properties.EnsurePropertyTypes(PropertyTypes);
 
@@ -445,7 +442,7 @@ public void ChangeContentType(IContentType contentType, bool clearProperties)
             if(clearProperties)
             {
                 ContentTypeId = contentType.Id;
-                _contentType = new SimpleContentType(contentType);
+                ContentType = new SimpleContentType(contentType);
                 ContentTypeBase = contentType;
                 Properties.EnsureCleanPropertyTypes(PropertyTypes);
 
@@ -500,7 +497,7 @@ protected override void PerformDeepClone(object clone)
             var clonedContent = (Content)clone;
 
             //need to manually clone this since it's not settable
-            clonedContent._contentType = ContentType;
+            clonedContent.ContentType = ContentType;
 
             //if culture infos exist then deal with event bindings
             if (clonedContent._publishInfos != null)
diff --git a/src/Umbraco.Core/Models/ISimpleContentType.cs b/src/Umbraco.Core/Models/ISimpleContentType.cs
index 679a69520c65..8c9413f934cf 100644
--- a/src/Umbraco.Core/Models/ISimpleContentType.cs
+++ b/src/Umbraco.Core/Models/ISimpleContentType.cs
@@ -1,79 +1,67 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Models
+namespace Umbraco.Core.Models
 {
     /// <summary>
-    /// Defines a ContentType, which Content is based on
+    /// Represents a simplified view of a content type.
     /// </summary>
     public interface ISimpleContentType
     {
+        /// <summary>
+        /// Gets the alias of the content type.
+        /// </summary>
         string Alias { get; }
+
+        /// <summary>
+        /// Gets the identifier of the content type.
+        /// </summary>
         int Id { get; }
+
+        /// <summary>
+        /// Gets the default template of the content type.
+        /// </summary>
         ITemplate DefaultTemplate { get; }
-        ContentVariation Variations { get; }
-        string Icon { get; }
-        bool IsContainer { get; }
-        string Name { get; }
-        bool AllowedAsRoot { get; }
-        bool IsElement { get; }
-        bool SupportsPropertyVariation(string culture, string s, bool b);
-    }
 
-    public class SimpleContentType : ISimpleContentType
-    {
-        public SimpleContentType(IContentType contentType)
-        {
-            Id = contentType.Id;
-            Alias = contentType.Alias;
-            DefaultTemplate = contentType.DefaultTemplate;
-            Variations = contentType.Variations;
-            Icon = contentType.Icon;
-            IsContainer = contentType.IsContainer;
-            Icon = contentType.Icon;
-            Name = contentType.Name;
-            AllowedAsRoot = contentType.AllowedAsRoot;
-            IsElement = contentType.IsElement;
-        }
+        /// <summary>
+        /// Gets the content variation of the content type.
+        /// </summary>
+        ContentVariation Variations { get; }
 
-        public string Alias { get; }
-        public int Id { get;  }
-        public ITemplate DefaultTemplate { get;  }
-        public ContentVariation Variations { get; }
-        public string Icon { get; }
-        public bool IsContainer { get; }
-        public string Name { get; }
-        public bool AllowedAsRoot { get; }
-        public bool IsElement { get; }
+        /// <summary>
+        /// Gets the icon of the content type.
+        /// </summary>
+        string Icon { get; }
 
-        /// <inheritdoc />
-        public bool SupportsPropertyVariation(string culture, string segment, bool wildcards = false)
-        {
-            // non-exact validation: can accept a 'null' culture if the property type varies
-            //  by culture, and likewise for segment
-            // wildcard validation: can accept a '*' culture or segment
-            return Variations.ValidateVariation(culture, segment, false, wildcards, false);
-        }
+        /// <summary>
+        /// Gets a value indicating whether the content type is a container.
+        /// </summary>
+        bool IsContainer { get; }
 
+        /// <summary>
+        /// Gets the name of the content type.
+        /// </summary>
+        string Name { get; }
 
-        protected bool Equals(SimpleContentType other)
-        {
-            return string.Equals(Alias, other.Alias) && Id == other.Id;
-        }
+        /// <summary>
+        /// Gets a value indicating whether content of that type can be created at the root of the tree.
+        /// </summary>
+        bool AllowedAsRoot { get; }
 
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != this.GetType()) return false;
-            return Equals((SimpleContentType) obj);
-        }
+        /// <summary>
+        /// Gets a value indicating whether the content type is an element content type.
+        /// </summary>
+        bool IsElement { get; }
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return ((Alias != null ? Alias.GetHashCode() : 0) * 397) ^ Id;
-            }
-        }
+        /// <summary>
+        /// Validates that a combination of culture and segment is valid for the content type properties.
+        /// </summary>
+        /// <param name="culture">The culture.</param>
+        /// <param name="segment">The segment.</param>
+        /// <param name="wildcards">A value indicating whether wildcard are supported.</param>
+        /// <returns>True if the combination is valid; otherwise false.</returns>
+        /// <remarks>
+        /// <para>The combination must be valid for properties of the content type. For instance, if the content type varies by culture,
+        /// then an invariant culture is valid, because some properties may be invariant. On the other hand, if the content type is invariant,
+        /// then a variant culture is invalid, because no property could possibly vary by culture.</para>
+        /// </remarks>
+        bool SupportsPropertyVariation(string culture, string segment, bool wildcards = false);
     }
 }
diff --git a/src/Umbraco.Core/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs
new file mode 100644
index 000000000000..be1f87fcda99
--- /dev/null
+++ b/src/Umbraco.Core/Models/SimpleContentType.cs
@@ -0,0 +1,84 @@
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Implements <see cref="ISimpleContentType"/>.
+    /// </summary>
+    public class SimpleContentType : ISimpleContentType
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleContentType"/> class.
+        /// </summary>
+        public SimpleContentType(IContentType contentType)
+        {
+            Id = contentType.Id;
+            Alias = contentType.Alias;
+            DefaultTemplate = contentType.DefaultTemplate;
+            Variations = contentType.Variations;
+            Icon = contentType.Icon;
+            IsContainer = contentType.IsContainer;
+            Icon = contentType.Icon;
+            Name = contentType.Name;
+            AllowedAsRoot = contentType.AllowedAsRoot;
+            IsElement = contentType.IsElement;
+        }
+
+        /// <inheritdoc />
+        public string Alias { get; }
+
+        /// <inheritdoc />
+        public int Id { get;  }
+
+        /// <inheritdoc />
+        public ITemplate DefaultTemplate { get;  }
+
+        /// <inheritdoc />
+        public ContentVariation Variations { get; }
+
+        /// <inheritdoc />
+        public string Icon { get; }
+
+        /// <inheritdoc />
+        public bool IsContainer { get; }
+
+        /// <inheritdoc />
+        public string Name { get; }
+
+        /// <inheritdoc />
+        public bool AllowedAsRoot { get; }
+
+        /// <inheritdoc />
+        public bool IsElement { get; }
+
+        /// <inheritdoc />
+        public bool SupportsPropertyVariation(string culture, string segment, bool wildcards = false)
+        {
+            // non-exact validation: can accept a 'null' culture if the property type varies
+            //  by culture, and likewise for segment
+            // wildcard validation: can accept a '*' culture or segment
+            return Variations.ValidateVariation(culture, segment, false, wildcards, false);
+        }
+
+        protected bool Equals(SimpleContentType other)
+        {
+            return string.Equals(Alias, other.Alias) && Id == other.Id;
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((SimpleContentType) obj);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return ((Alias != null ? Alias.GetHashCode() : 0) * 397) ^ Id;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/ServiceContextExtensions.cs b/src/Umbraco.Core/ServiceContextExtensions.cs
index b1ca02117340..3af918815fee 100644
--- a/src/Umbraco.Core/ServiceContextExtensions.cs
+++ b/src/Umbraco.Core/ServiceContextExtensions.cs
@@ -6,15 +6,15 @@ namespace Umbraco.Core
 {
     public static class ServiceContextExtensions
     {
-        public static IContentTypeServiceBase<T> GetContentTypeService<T>(this ServiceContext services)
+        public static IContentTypeBaseService<T> GetContentTypeService<T>(this ServiceContext services)
             where T : IContentTypeComposition
         {
             if (typeof(T).Implements<IContentType>())
-                return services.ContentTypeService as IContentTypeServiceBase<T>;
+                return services.ContentTypeService as IContentTypeBaseService<T>;
             if (typeof(T).Implements<IMediaType>())
-                return services.MediaTypeService as IContentTypeServiceBase<T>;
+                return services.MediaTypeService as IContentTypeBaseService<T>;
             if (typeof(T).Implements<IMemberType>())
-                return services.MemberTypeService as IContentTypeServiceBase<T>;
+                return services.MemberTypeService as IContentTypeBaseService<T>;
             throw new ArgumentException("Type " + typeof(T).FullName + " does not have a service.");
         }
     }
diff --git a/src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs b/src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs
new file mode 100644
index 000000000000..70327e7baf7d
--- /dev/null
+++ b/src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs
@@ -0,0 +1,22 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Services
+{
+    /// <summary>
+    /// Provides the <see cref="IContentTypeBaseService"/> corresponding to an <see cref="IContentBase"/> object.
+    /// </summary>
+    public interface IContentTypeBaseServiceProvider
+    {
+        /// <summary>
+        /// Gets the content type service base managing types for the specified content base.
+        /// </summary>
+        /// <remarks>
+        /// <para>If <paramref name="contentBase"/> is an <see cref="IContent"/>, this returns the
+        /// <see cref="IContentTypeService"/>, and if it's an <see cref="IMedia"/>, this returns
+        /// the <see cref="IMediaTypeService"/>, etc.</para>
+        /// <para>Services are returned as <see cref="IContentTypeBaseService"/> and can be used
+        /// to retrieve the content / media / whatever type as <see cref="IContentTypeComposition"/>.</para>
+        /// </remarks>
+        IContentTypeBaseService For(IContentBase contentBase);
+    }
+}
diff --git a/src/Umbraco.Core/Services/IContentTypeService.cs b/src/Umbraco.Core/Services/IContentTypeService.cs
index bddd276e58cd..02e4bc6b18f5 100644
--- a/src/Umbraco.Core/Services/IContentTypeService.cs
+++ b/src/Umbraco.Core/Services/IContentTypeService.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Core.Services
     /// <summary>
     /// Manages <see cref="IContentType"/> objects.
     /// </summary>
-    public interface IContentTypeService : IContentTypeServiceBase<IContentType>
+    public interface IContentTypeService : IContentTypeBaseService<IContentType>
     {
         /// <summary>
         /// Gets all property type aliases.
diff --git a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
index cd6f2f4911d9..8fa77e4836a3 100644
--- a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
+++ b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
@@ -4,8 +4,14 @@
 
 namespace Umbraco.Core.Services
 {
-    public interface IContentTypeServiceBase
+    /// <summary>
+    /// Provides a common base interface for <see cref="IContentTypeBase"/>.
+    /// </summary>
+    public interface IContentTypeBaseService
     {
+        /// <summary>
+        /// Gets a content type.
+        /// </summary>
         IContentTypeComposition Get(int id);
     }
 
@@ -13,11 +19,22 @@ public interface IContentTypeServiceBase
     /// Provides a common base interface for <see cref="IContentTypeService"/>, <see cref="IMediaTypeService"/> and <see cref="IMemberTypeService"/>.
     /// </summary>
     /// <typeparam name="TItem">The type of the item.</typeparam>
-    public interface IContentTypeServiceBase<TItem> : IContentTypeServiceBase, IService
+    public interface IContentTypeBaseService<TItem> : IContentTypeBaseService, IService
         where TItem : IContentTypeComposition
     {
+        /// <summary>
+        /// Gets a content type.
+        /// </summary>
         TItem Get(int id);
+
+        /// <summary>
+        /// Gets a content type.
+        /// </summary>
         TItem Get(Guid key);
+
+        /// <summary>
+        /// Gets a content type.
+        /// </summary>
         TItem Get(string alias);
 
         int Count();
diff --git a/src/Umbraco.Core/Services/IContentTypeServiceBaseFactory.cs b/src/Umbraco.Core/Services/IContentTypeServiceBaseFactory.cs
deleted file mode 100644
index c81686312830..000000000000
--- a/src/Umbraco.Core/Services/IContentTypeServiceBaseFactory.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Services
-{
-    public interface IContentTypeServiceBaseFactory
-    {
-        IContentTypeServiceBase Create(IContentBase contentBase);
-
-    }
-}
diff --git a/src/Umbraco.Core/Services/IMediaTypeService.cs b/src/Umbraco.Core/Services/IMediaTypeService.cs
index b125f4ca137d..992937675f30 100644
--- a/src/Umbraco.Core/Services/IMediaTypeService.cs
+++ b/src/Umbraco.Core/Services/IMediaTypeService.cs
@@ -5,6 +5,6 @@ namespace Umbraco.Core.Services
     /// <summary>
     /// Manages <see cref="IMediaType"/> objects.
     /// </summary>
-    public interface IMediaTypeService : IContentTypeServiceBase<IMediaType>
+    public interface IMediaTypeService : IContentTypeBaseService<IMediaType>
     { }
 }
diff --git a/src/Umbraco.Core/Services/IMemberTypeService.cs b/src/Umbraco.Core/Services/IMemberTypeService.cs
index e6dfef699870..41004d267db5 100644
--- a/src/Umbraco.Core/Services/IMemberTypeService.cs
+++ b/src/Umbraco.Core/Services/IMemberTypeService.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Services
     /// <summary>
     /// Manages <see cref="IMemberType"/> objects.
     /// </summary>
-    public interface IMemberTypeService : IContentTypeServiceBase<IMemberType>
+    public interface IMemberTypeService : IContentTypeBaseService<IMemberType>
     {
         string GetDefault();
     }
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseFactory.cs b/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
similarity index 75%
rename from src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseFactory.cs
rename to src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
index 64395d4e2d6c..d867224b9024 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseFactory.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
@@ -3,20 +3,20 @@
 
 namespace Umbraco.Core.Services.Implement
 {
-    public class ContentTypeServiceBaseFactory : IContentTypeServiceBaseFactory
+    public class ContentTypeBaseServiceProvider : IContentTypeBaseServiceProvider
     {
         private readonly IContentTypeService _contentTypeService;
         private readonly IMediaTypeService _mediaTypeService;
         private readonly IMemberTypeService _memberTypeService;
 
-        public ContentTypeServiceBaseFactory(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService)
+        public ContentTypeBaseServiceProvider(IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService)
         {
             _contentTypeService = contentTypeService;
             _mediaTypeService = mediaTypeService;
             _memberTypeService = memberTypeService;
         }
 
-        public IContentTypeServiceBase Create(IContentBase contentBase)
+        public IContentTypeBaseService For(IContentBase contentBase)
         {
             switch (contentBase)
             {
@@ -30,6 +30,5 @@ public IContentTypeServiceBase Create(IContentBase contentBase)
                     throw new ArgumentException($"Invalid contentBase type: {contentBase.GetType().FullName}" , nameof(contentBase));
             }
         }
-
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
index f4457e0991e9..3a1ad64483a1 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTItemTService.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Services.Implement
 {
     public abstract class ContentTypeServiceBase<TItem, TService> : ContentTypeServiceBase
         where TItem : class, IContentTypeComposition
-        where TService : class, IContentTypeServiceBase<TItem>
+        where TService : class, IContentTypeBaseService<TItem>
     {
         protected ContentTypeServiceBase(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory)
             : base(provider, logger, eventMessagesFactory)
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index 943d4be536f8..d4cb89095399 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -13,10 +13,10 @@
 
 namespace Umbraco.Core.Services.Implement
 {
-    public abstract class ContentTypeServiceBase<TRepository, TItem, TService> : ContentTypeServiceBase<TItem, TService>, IContentTypeServiceBase<TItem>
+    public abstract class ContentTypeServiceBase<TRepository, TItem, TService> : ContentTypeServiceBase<TItem, TService>, IContentTypeBaseService<TItem>
         where TRepository : IContentTypeRepositoryBase<TItem>
         where TItem : class, IContentTypeComposition
-        where TService : class, IContentTypeServiceBase<TItem>
+        where TService : class, IContentTypeBaseService<TItem>
     {
         private readonly IAuditRepository _auditRepository;
         private readonly IEntityContainerRepository _containerRepository;
@@ -211,7 +211,7 @@ private static void AddChange(ICollection<ContentTypeChange<TItem>> changes, TIt
 
         #region Get, Has, Is, Count
 
-        IContentTypeComposition IContentTypeServiceBase.Get(int id)
+        IContentTypeComposition IContentTypeBaseService.Get(int id)
         {
             return Get(id);
         }
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index efb4787e65af..f3c95b07f9fa 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -1,5 +1,4 @@
 using System;
-using Umbraco.Core.Services.Implement;
 
 namespace Umbraco.Core.Services
 {
@@ -33,12 +32,12 @@ public class ServiceContext
         private readonly Lazy<IExternalLoginService> _externalLoginService;
         private readonly Lazy<IRedirectUrlService> _redirectUrlService;
         private readonly Lazy<IConsentService> _consentService;
-        private readonly Lazy<IContentTypeServiceBaseFactory> _contentTypeServiceBaseFactory;
+        private readonly Lazy<IContentTypeBaseServiceProvider> _contentTypeBaseServiceProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServiceContext"/> class with lazy services.
         /// </summary>
-        public ServiceContext(Lazy<IPublicAccessService> publicAccessService, Lazy<IDomainService> domainService, Lazy<IAuditService> auditService, Lazy<ILocalizedTextService> localizedTextService, Lazy<ITagService> tagService, Lazy<IContentService> contentService, Lazy<IUserService> userService, Lazy<IMemberService> memberService, Lazy<IMediaService> mediaService, Lazy<IContentTypeService> contentTypeService, Lazy<IMediaTypeService> mediaTypeService, Lazy<IDataTypeService> dataTypeService, Lazy<IFileService> fileService, Lazy<ILocalizationService> localizationService, Lazy<IPackagingService> packagingService, Lazy<IServerRegistrationService> serverRegistrationService, Lazy<IEntityService> entityService, Lazy<IRelationService> relationService, Lazy<IMacroService> macroService, Lazy<IMemberTypeService> memberTypeService, Lazy<IMemberGroupService> memberGroupService, Lazy<INotificationService> notificationService, Lazy<IExternalLoginService> externalLoginService, Lazy<IRedirectUrlService> redirectUrlService, Lazy<IConsentService> consentService, Lazy<IContentTypeServiceBaseFactory> contentTypeServiceBaseFactory)
+        public ServiceContext(Lazy<IPublicAccessService> publicAccessService, Lazy<IDomainService> domainService, Lazy<IAuditService> auditService, Lazy<ILocalizedTextService> localizedTextService, Lazy<ITagService> tagService, Lazy<IContentService> contentService, Lazy<IUserService> userService, Lazy<IMemberService> memberService, Lazy<IMediaService> mediaService, Lazy<IContentTypeService> contentTypeService, Lazy<IMediaTypeService> mediaTypeService, Lazy<IDataTypeService> dataTypeService, Lazy<IFileService> fileService, Lazy<ILocalizationService> localizationService, Lazy<IPackagingService> packagingService, Lazy<IServerRegistrationService> serverRegistrationService, Lazy<IEntityService> entityService, Lazy<IRelationService> relationService, Lazy<IMacroService> macroService, Lazy<IMemberTypeService> memberTypeService, Lazy<IMemberGroupService> memberGroupService, Lazy<INotificationService> notificationService, Lazy<IExternalLoginService> externalLoginService, Lazy<IRedirectUrlService> redirectUrlService, Lazy<IConsentService> consentService, Lazy<IContentTypeBaseServiceProvider> contentTypeBaseServiceProvider)
         {
             _publicAccessService = publicAccessService;
             _domainService = domainService;
@@ -65,7 +64,7 @@ public ServiceContext(Lazy<IPublicAccessService> publicAccessService, Lazy<IDoma
             _externalLoginService = externalLoginService;
             _redirectUrlService = redirectUrlService;
             _consentService = consentService;
-            _contentTypeServiceBaseFactory = contentTypeServiceBaseFactory;
+            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
         }
 
         /// <summary>
@@ -100,7 +99,7 @@ public static ServiceContext CreatePartial(
             IServerRegistrationService serverRegistrationService = null,
             IRedirectUrlService redirectUrlService = null,
             IConsentService consentService = null,
-            IContentTypeServiceBaseFactory contentTypeServiceBaseFactory = null)
+            IContentTypeBaseServiceProvider contentTypeBaseServiceProvider = null)
         {
             Lazy<T> Lazy<T>(T service) => service == null ? null : new Lazy<T>(() => service);
 
@@ -130,7 +129,7 @@ public static ServiceContext CreatePartial(
                 Lazy(externalLoginService),
                 Lazy(redirectUrlService),
                 Lazy(consentService),
-                Lazy(contentTypeServiceBaseFactory)
+                Lazy(contentTypeBaseServiceProvider)
                 );
         }
 
@@ -262,6 +261,6 @@ public static ServiceContext CreatePartial(
         /// <summary>
         /// Gets the ContentTypeServiceBaseFactory.
         /// </summary>
-        public IContentTypeServiceBaseFactory ContentTypeServiceBaseFactory => _contentTypeServiceBaseFactory.Value;
+        public IContentTypeBaseServiceProvider ContentTypeBaseServices => _contentTypeBaseServiceProvider.Value;
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index c0edc517c301..242b4f67bc63 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -434,6 +434,7 @@
     <Compile Include="Models\PublishedContent\VariationContext.cs" />
     <Compile Include="Models\PublishedContent\ThreadCultureVariationContextAccessor.cs" />
     <Compile Include="Models\PublishedContent\VariationContextAccessorExtensions.cs" />
+    <Compile Include="Models\SimpleContentType.cs" />
     <Compile Include="Models\Trees\IBackOfficeSection.cs" />
     <Compile Include="PackageActions\AllowDoctype.cs" />
     <Compile Include="PackageActions\PublishRootDocument.cs" />
@@ -1347,7 +1348,7 @@
     <Compile Include="Serialization\UdiRangeJsonConverter.cs" />
     <Compile Include="ServiceContextExtensions.cs" />
     <Compile Include="Services\IConsentService.cs" />
-    <Compile Include="Services\IContentTypeServiceBaseFactory.cs" />
+    <Compile Include="Services\IContentTypeBaseServiceProvider.cs" />
     <Compile Include="Services\IEntityXmlSerializer.cs" />
     <Compile Include="Services\Implement\AuditService.cs" />
     <Compile Include="Services\Changes\ContentTypeChange.cs" />
@@ -1365,7 +1366,7 @@
     <Compile Include="Services\Implement\ContentTypeServiceBaseOfTItemTService.cs" />
     <Compile Include="Services\Implement\ContentTypeServiceBaseOfTRepositoryTItemTService.cs" />
     <Compile Include="Services\ContentTypeServiceExtensions.cs" />
-    <Compile Include="Services\Implement\ContentTypeServiceBaseFactory.cs" />
+    <Compile Include="Services\Implement\ContentTypeBaseServiceProvider.cs" />
     <Compile Include="Services\Implement\DataTypeService.cs" />
     <Compile Include="Services\Implement\DomainService.cs" />
     <Compile Include="Services\Implement\EntityService.cs" />
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 73554aec67a1..703ae3f0e711 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -124,8 +124,8 @@ private void Init()
             Mock.Get(contentTypeService).Setup(x => x.GetAll()).Returns(contentTypes);
             Mock.Get(contentTypeService).Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(contentTypes);
 
-            var contentTypeServiceBaseFactory = Mock.Of<IContentTypeServiceBaseFactory>();
-            Mock.Get(contentTypeServiceBaseFactory).Setup(x => x.Create(It.IsAny<IContentBase>())).Returns(contentTypeService);
+            var contentTypeServiceBaseFactory = Mock.Of<IContentTypeBaseServiceProvider>();
+            Mock.Get(contentTypeServiceBaseFactory).Setup(x => x.For(It.IsAny<IContentBase>())).Returns(contentTypeService);
 
             var dataTypeService = Mock.Of<IDataTypeService>();
             Mock.Get(dataTypeService).Setup(x => x.GetAll()).Returns(dataTypes);
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index d2fd3f90f9af..2f0876b9baa6 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -80,7 +80,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
             var documentRepository = Mock.Of<IDocumentRepository>();
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
-            var contentTypeServiceBaseFactory = Current.Services.ContentTypeServiceBaseFactory;
+            var contentTypeServiceBaseFactory = Current.Services.ContentTypeBaseServices;
 
             return new PublishedSnapshotService(
                 options,
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 8f567afd65bd..94518b8dfd6f 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -53,7 +53,7 @@ protected override IPublishedSnapshotService CreatePublishedSnapshotService()
             var documentRepository = Factory.GetInstance<IDocumentRepository>();
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
-            var contentTypeServiceBaseFactory = Current.Services.ContentTypeServiceBaseFactory;
+            var contentTypeServiceBaseFactory = Current.Services.ContentTypeBaseServices;
 
             return new PublishedSnapshotService(
                 options,
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 6ab714a68a53..db3aa10d44e1 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -191,7 +191,7 @@ public ServiceContext GetServiceContext(
             var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));
             var redirectUrlService = GetLazyService<IRedirectUrlService>(factory, c => new RedirectUrlService(scopeProvider, logger, eventMessagesFactory, GetRepo<IRedirectUrlRepository>(c)));
             var consentService = GetLazyService<IConsentService>(factory, c => new ConsentService(scopeProvider, logger, eventMessagesFactory, GetRepo<IConsentRepository>(c)));
-            var contentTypeServiceBaseFactory = GetLazyService<IContentTypeServiceBaseFactory>(factory, c => new ContentTypeServiceBaseFactory(factory.GetInstance<IContentTypeService>(),factory.GetInstance<IMediaTypeService>(),factory.GetInstance<IMemberTypeService>()));
+            var contentTypeServiceBaseFactory = GetLazyService<IContentTypeBaseServiceProvider>(factory, c => new ContentTypeBaseServiceProvider(factory.GetInstance<IContentTypeService>(),factory.GetInstance<IMediaTypeService>(),factory.GetInstance<IMemberTypeService>()));
 
             return new ServiceContext(
                 publicAccessService,
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 0dff862d0852..ee056e38f058 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1838,7 +1838,7 @@ private IContent ValidateMoveOrCopy(MoveOrCopy model)
                     throw new HttpResponseException(HttpStatusCode.NotFound);
                 }
 
-                var contentTypeService = Services.ContentTypeServiceBaseFactory.Create(parent);
+                var contentTypeService = Services.ContentTypeBaseServices.For(parent);
                 var parentContentType = contentTypeService.Get(parent.ContentTypeId);
                 //check if the item is allowed under this one
                 if (parentContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 8fc60261a194..0aa7b75143c9 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -403,7 +403,7 @@ public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
                     return Enumerable.Empty<ContentTypeBasic>();
                 }
 
-                var contentTypeService = Services.ContentTypeServiceBaseFactory.Create(contentItem);
+                var contentTypeService = Services.ContentTypeBaseServices.For(contentItem);
                 var contentType = contentTypeService.Get(contentItem.ContentTypeId);
                 var ids = contentType.AllowedContentTypes.Select(x => x.Id.Value).ToArray();
 
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 9699bf8a7145..5662680a8a95 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -47,10 +47,10 @@ namespace Umbraco.Web.Editors
     [MediaControllerControllerConfiguration]
     public class MediaController : ContentControllerBase
     {
-        public MediaController(PropertyEditorCollection propertyEditors, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory)
+        public MediaController(PropertyEditorCollection propertyEditors, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
-            _contentTypeServiceBaseFactory = contentTypeServiceBaseFactory;
+            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
         }
 
         /// <summary>
@@ -234,7 +234,7 @@ public IEnumerable<ContentItemBasic<ContentPropertyBasic>> GetRootMedia()
 
         private int[] _userStartNodes;
         private readonly PropertyEditorCollection _propertyEditors;
-        private readonly IContentTypeServiceBaseFactory _contentTypeServiceBaseFactory;
+        private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
 
         protected int[] UserStartNodes
         {
@@ -726,7 +726,7 @@ public async Task<HttpResponseMessage> PostAddFile()
                     if (fs == null) throw new InvalidOperationException("Could not acquire file stream");
                     using (fs)
                     {
-                        f.SetValue(_contentTypeServiceBaseFactory, Constants.Conventions.Media.File,fileName, fs);
+                        f.SetValue(_contentTypeBaseServiceProvider, Constants.Conventions.Media.File,fileName, fs);
                     }
 
                     var saveResult = mediaService.Save(f, Security.CurrentUser.Id);
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index 1ff38f3d1b9b..a871fef1b07b 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -202,7 +202,7 @@ public PagePublishedContent(IContent inner, IVariationContextAccessor variationC
                 CreatorName = _inner.GetCreatorProfile().Name;
                 WriterName = _inner.GetWriterProfile().Name;
 
-                var contentTypeService = Current.Services.ContentTypeServiceBaseFactory.Create(_inner);
+                var contentTypeService = Current.Services.ContentTypeBaseServices.For(_inner);
                 ContentType = Current.PublishedContentTypeFactory.CreateContentType(contentTypeService.Get(_inner.ContentTypeId));
 
                 _properties = ContentType.PropertyTypes
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
index 2c13a2ecadd1..55b1672b2be5 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
@@ -23,7 +23,7 @@ public ContentMapperProfile(
             IUserService userService,
             IContentService contentService,
             IContentTypeService contentTypeService,
-            IContentTypeServiceBaseFactory contentTypeServiceBaseFactory,
+            IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
             ILocalizationService localizationService)
         {
             // create, capture, cache
@@ -31,7 +31,7 @@ public ContentMapperProfile(
             var creatorResolver = new CreatorResolver(userService);
             var actionButtonsResolver = new ActionButtonsResolver(userService, contentService);
             var childOfListViewResolver = new ContentChildOfListViewResolver(contentService, contentTypeService);
-            var contentTypeBasicResolver = new ContentTypeBasicResolver<IContent, ContentItemDisplay>(contentTypeServiceBaseFactory);
+            var contentTypeBasicResolver = new ContentTypeBasicResolver<IContent, ContentItemDisplay>(contentTypeBaseServiceProvider);
             var allowedTemplatesResolver = new AllowedTemplatesResolver(contentTypeService);
             var defaultTemplateResolver = new DefaultTemplateResolver();
             var variantResolver = new ContentVariantResolver(localizationService);
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
index 0655f4d8cf1a..19c150e072a3 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
@@ -16,11 +16,11 @@ namespace Umbraco.Web.Models.Mapping
     internal class ContentTypeBasicResolver<TSource, TDestination> : IValueResolver<TSource, TDestination, ContentTypeBasic>
         where TSource : IContentBase
     {
-        private readonly IContentTypeServiceBaseFactory _contentTypeServiceBaseFactory;
+        private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
 
-        public ContentTypeBasicResolver(IContentTypeServiceBaseFactory contentTypeServiceBaseFactory)
+        public ContentTypeBasicResolver(IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
         {
-            _contentTypeServiceBaseFactory = contentTypeServiceBaseFactory;
+            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
         }
 
         public ContentTypeBasic Resolve(TSource source, TDestination destination, ContentTypeBasic destMember, ResolutionContext context)
@@ -30,7 +30,7 @@ public ContentTypeBasic Resolve(TSource source, TDestination destination, Conten
             if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
                 && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
             {
-                var contentTypeService = _contentTypeServiceBaseFactory.Create(source);
+                var contentTypeService = _contentTypeBaseServiceProvider.For(source);
                 var contentType = contentTypeService.Get(source.ContentTypeId);
                 var contentTypeBasic =  Mapper.Map<IContentTypeComposition, ContentTypeBasic>(contentType);
 
diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
index 2b575c87daf4..7a8706edf20a 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
@@ -25,12 +25,12 @@ public MediaMapperProfile(TabsAndPropertiesResolver<IMedia, MediaItemDisplay> ta
             IMediaService mediaService,
             IMediaTypeService mediaTypeService,
             ILogger logger,
-            IContentTypeServiceBaseFactory contentTypeServiceBaseFactory)
+            IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
         {
             // create, capture, cache
             var mediaOwnerResolver = new OwnerResolver<IMedia>(userService);
             var childOfListViewResolver = new MediaChildOfListViewResolver(mediaService, mediaTypeService);
-            var mediaTypeBasicResolver = new ContentTypeBasicResolver<IMedia, MediaItemDisplay>(contentTypeServiceBaseFactory);
+            var mediaTypeBasicResolver = new ContentTypeBasicResolver<IMedia, MediaItemDisplay>(contentTypeBaseServiceProvider);
 
             //FROM IMedia TO MediaItemDisplay
             CreateMap<IMedia, MediaItemDisplay>()
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index e6a7c24f5964..f470e5a65a97 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -41,7 +41,7 @@ class PublishedSnapshotService : PublishedSnapshotServiceBase
         private readonly IMemberRepository _memberRepository;
         private readonly IGlobalSettings _globalSettings;
         private readonly ISiteDomainHelper _siteDomainHelper;
-        private readonly IContentTypeServiceBaseFactory _contentTypeServiceBaseFactory;
+        private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
         private readonly IEntityXmlSerializer _entitySerializer;
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
 
@@ -85,7 +85,7 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
             IUmbracoContextAccessor umbracoContextAccessor, ILogger logger, IScopeProvider scopeProvider,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
-            IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, IContentTypeServiceBaseFactory contentTypeServiceBaseFactory,
+            IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
             IEntityXmlSerializer entitySerializer)
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
@@ -104,7 +104,7 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
             _defaultCultureAccessor = defaultCultureAccessor;
             _globalSettings = globalSettings;
             _siteDomainHelper = siteDomainHelper;
-            _contentTypeServiceBaseFactory = contentTypeServiceBaseFactory;
+            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
 
             // we need an Xml serializer here so that the member cache can support XPath,
             // for members this is done by navigating the serialized-to-xml member
@@ -1204,7 +1204,7 @@ private ContentNuDto GetDto(IContentBase content, bool published)
             var cultureData = new Dictionary<string, CultureVariation>();
 
             // sanitize - names should be ok but ... never knows
-            var contentTypeService = _contentTypeServiceBaseFactory.Create(content);
+            var contentTypeService = _contentTypeBaseServiceProvider.For(content);
             var contentType = contentTypeService.Get(content.ContentTypeId);
             if (contentType.VariesByCulture())
             {

From df61a768681184054415253758be7504020972af Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 1 Feb 2019 17:52:29 +0100
Subject: [PATCH 257/421] Cleanup PR

---
 .../EmbedProviders/EmbedProvidersCollectionBuilder.cs      | 7 -------
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs              | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs b/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs
index d11cf5f56ffb..0c6ea7a3e35c 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/EmbedProvidersCollectionBuilder.cs
@@ -6,12 +6,5 @@ namespace Umbraco.Web.Media.EmbedProviders
     public class EmbedProvidersCollectionBuilder : OrderedCollectionBuilderBase<EmbedProvidersCollectionBuilder, EmbedProvidersCollection, IEmbedProvider>
     {
         protected override EmbedProvidersCollectionBuilder This => this;
-
-        public override EmbedProvidersCollection CreateCollection(IFactory factory)
-        {
-            // No fancy magic here of reading package.manifest or using typeloader
-            // Have to explicitly add a OEmbedProvider to this collection
-            return base.CreateCollection(factory);
-        }        
     }
 }
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index a6755370a72f..b81f2db48694 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -214,8 +214,8 @@ public override void Compose(Composition composition)
             composition.WithCollectionBuilder<TreeCollectionBuilder>()
                 .AddTreeControllers(umbracoApiControllerTypes.Where(x => typeof(TreeControllerBase).IsAssignableFrom(x)));
 
-            // register OEmbed providers
-            // no type scanning - all explicit opt-in of adding types
+            // register OEmbed providers - no type scanning - all explicit opt-in of adding types
+            // note: IEmbedProvider is not IDiscoverable - think about it if going for type scanning
             composition.WithCollectionBuilder<EmbedProvidersCollectionBuilder>()
                 .Append<YouTube>()
                 .Append<Instagram>()

From 90a282c083e8a465db65476e926086c6159c6e62 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 1 Feb 2019 20:09:54 +0100
Subject: [PATCH 258/421] Fix the icon color picker

---
 .../directives/components/umbcolorswatches.directive.js       | 4 ++--
 .../infiniteeditors/iconpicker/iconpicker.controller.js       | 3 ++-
 .../views/common/infiniteeditors/iconpicker/iconpicker.html   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
index aac11bfd2203..9401cacab10f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
@@ -36,7 +36,7 @@ Use this directive to generate color swatches to pick from.
             scope.setColor = function (color, $index, $event) {
                 scope.selectedColor = color;
                 if (scope.onSelect) {
-                    scope.onSelect(color.color, $index, $event);
+                    scope.onSelect({color: color, $index: $index, $event: $event});
                     $event.stopPropagation();
                 }
             };
@@ -55,7 +55,7 @@ Use this directive to generate color swatches to pick from.
                 colors: '=?',
                 size: '@',
                 selectedColor: '=',
-                onSelect: '=',
+                onSelect: '&',
                 useLabel: '=',
                 useColorClass: '=?'
             },
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
index 16d6cf23fc7b..9c7e6de83bfd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
@@ -71,7 +71,8 @@ function IconPickerController($scope, iconHelper, localizationService) {
     }
 
     function selectColor(color, $index, $event) {
-        $scope.model.color = color;
+        $scope.model.color = color.value;
+        vm.color = color.value;
     }
 
     function close() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
index 55c4317279cf..b29d9af2faa0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
@@ -37,7 +37,7 @@
                         colors="vm.colors"
                         selected-color="vm.color"
                         size="s"
-                        on-select="vm.selectColor">
+                        on-select="vm.selectColor(color)">
                     </umb-color-swatches>
                 </div>
 

From 6874a5486b328ceb8d747f4fa10cdd33c849a455 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 1 Feb 2019 20:28:27 +0100
Subject: [PATCH 259/421] Fix selected color

---
 .../infiniteeditors/iconpicker/iconpicker.controller.js   | 8 ++++++--
 .../common/infiniteeditors/iconpicker/iconpicker.html     | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
index 9c7e6de83bfd..471d23ae842c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
@@ -49,7 +49,7 @@ function IconPickerController($scope, iconHelper, localizationService) {
         });
 
         // set a default color if nothing is passed in
-        vm.color = $scope.model.color ? $scope.model.color : vm.colors[0].value;
+        vm.color = $scope.model.color ? findColor($scope.model.color) : vm.colors[0];
 
         // if an icon is passed in - preselect it
         vm.icon = $scope.model.icon ? $scope.model.icon : undefined;
@@ -70,9 +70,13 @@ function IconPickerController($scope, iconHelper, localizationService) {
         submit();
     }
 
+    function findColor(value) {
+        return _.findWhere(vm.colors, {value: value});
+    }
+
     function selectColor(color, $index, $event) {
         $scope.model.color = color.value;
-        vm.color = color.value;
+        vm.color = color;
     }
 
     function close() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
index b29d9af2faa0..3caa6ae03d87 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
@@ -44,9 +44,9 @@
                 <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
                 <div class="umb-control-group" ng-show="!vm.loading && filtered.length > 0 ">
-                    <ul class="umb-iconpicker" ng-class="vm.color" ng-show="vm.icons">
+                    <ul class="umb-iconpicker" ng-class="vm.color.value" ng-show="vm.icons">
                         <li class="umb-iconpicker-item" ng-class="{'-selected': icon == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm) track by $id(icon)">
-                            <a href="#" title="{{icon}}" ng-click="vm.selectIcon(icon, vm.color)" prevent-default>
+                            <a href="#" title="{{icon}}" ng-click="vm.selectIcon(icon, vm.color.value)" prevent-default>
                                 <i class="{{icon}} large"></i>
                             </a>
                         </li>

From 5d15db8468e865d0e02741e3296a7157249f6b49 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 2 Feb 2019 13:42:24 +0100
Subject: [PATCH 260/421] Make sure the default dropdowns are created correctly

---
 src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 7e9df321c391..653da8b98c8d 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -114,10 +114,10 @@ void InsertDataTypeNodeDto(int id, int sortOrder, string uniqueId, string text)
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = new Guid("2e6d3631-066e-44b8-aec4-96f09099b2b5"), Text = "Numeric", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "True/false", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = new Guid("fbaf13a8-4036-41f2-93a3-974f678c312a"), Text = "Checkbox list", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownMultiple, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownMultiple}", SortOrder = 2, UniqueId = new Guid("0b6a45e7-44ba-430d-9da5-4e46060b9e03"), Text = "Dropdown", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownSingle, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownSingle}", SortOrder = 2, UniqueId = new Guid("0b6a45e7-44ba-430d-9da5-4e46060b9e03"), Text = "Dropdown", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = new Guid("5046194e-4237-453c-a547-15db3a07c4e1"), Text = "Date Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -40, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-40", SortOrder = 2, UniqueId = new Guid("bb5f57c9-ce2b-4bb9-b697-4caca783a805"), Text = "Radiobox", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
-            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownSingle, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownSingle}", SortOrder = 2, UniqueId = new Guid("f38f0ac7-1d27-439c-9f3f-089cd8825a53"), Text = "Dropdown multiple", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DropDownMultiple, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DropDownMultiple}", SortOrder = 2, UniqueId = new Guid("f38f0ac7-1d27-439c-9f3f-089cd8825a53"), Text = "Dropdown multiple", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = new Guid("0225af17-b302-49cb-9176-b9f35cab9c17"), Text = "Approved Color", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = new Guid("e4d66c0f-b935-4200-81f0-025f7256b89a"), Text = "Date Picker with time", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
             _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultContentListView, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = $"-1,{Constants.DataTypes.DefaultContentListView}", SortOrder = 2, UniqueId = new Guid("C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });

From 4b69a7859d426583c9d6e50a2695061ee0178709 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 3 Feb 2019 13:56:00 +0100
Subject: [PATCH 261/421] Make sure the app menu state is set

---
 .../directives/components/editor/umbeditormenu.directive.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
index 9dff712ef669..03587186cbce 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
@@ -30,8 +30,8 @@
                 }
 
                 //when the options item is selected, we need to set the current menu item in appState (since this is synonymous with a menu)
-                // Niels: No i think we are wrong, we should not set the currentNode, cause it represents the currentNode of interaction.
-                //appState.setMenuState("currentNode", scope.currentNode);
+                //- otherwise we break any tree dialog that works with the current node (and that's pretty much all of them)
+                appState.setMenuState("currentNode", scope.currentNode);
                 
                 if (!scope.actions) {
                     treeService.getMenu({ treeNode: scope.currentNode })

From 6141d8840777190f6a06798145b563b04b103dbc Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 3 Feb 2019 17:05:27 +0100
Subject: [PATCH 262/421] Don't set the menu state until the action is about to
 be carried out.

---
 .../components/editor/umbeditormenu.directive.js          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
index 03587186cbce..665f315bee04 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
@@ -18,6 +18,10 @@
             //adds a handler to the context menu item click, we need to handle this differently
             //depending on what the menu item is supposed to do.
             scope.executeMenuItem = function (action) {
+                //the action is called as it would be by the tree. to ensure that the action targets the correct node, 
+                //we need to set the current node in appState before calling the action. otherwise we break all actions
+                //that use the current node (and that's pretty much all of them)
+                appState.setMenuState("currentNode", scope.currentNode);                
                 navigationService.executeMenuAction(action, scope.currentNode, scope.currentSection);
                 scope.dropdown.isOpen = false;
             };
@@ -29,10 +33,6 @@
                     return;
                 }
 
-                //when the options item is selected, we need to set the current menu item in appState (since this is synonymous with a menu)
-                //- otherwise we break any tree dialog that works with the current node (and that's pretty much all of them)
-                appState.setMenuState("currentNode", scope.currentNode);
-                
                 if (!scope.actions) {
                     treeService.getMenu({ treeNode: scope.currentNode })
                         .then(function (data) {

From 9be6acf4491dd8c3c5b1294c604042f9f8ecfb95 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Feb 2019 12:09:04 +1100
Subject: [PATCH 263/421] Oops forgot to remove the IconClosed and IconOpen
 TreeAttribute props

---
 src/Umbraco.Web.UI.Client/package-lock.json   | 471 +++++++++++++-----
 src/Umbraco.Web/Trees/FilesTreeController.cs  |   2 +-
 .../Trees/ScriptsTreeController.cs            |   2 +-
 .../Trees/StylesheetsTreeController.cs        |   2 +-
 src/Umbraco.Web/Trees/TreeAttribute.cs        |  12 +-
 5 files changed, 345 insertions(+), 144 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index ed28a93caf03..390e23f1e924 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -937,7 +937,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -955,7 +955,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1104,6 +1104,7 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1112,7 +1113,8 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1170,7 +1172,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
       "dev": true
     },
     "array-sort": {
@@ -1216,7 +1218,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
       "dev": true
     },
     "asap": {
@@ -1269,7 +1271,7 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
       "dev": true
     },
     "asynckit": {
@@ -1523,6 +1525,7 @@
       "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1532,13 +1535,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1554,6 +1559,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1742,7 +1748,8 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1761,6 +1768,7 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1772,19 +1780,22 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1800,6 +1811,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1808,13 +1820,15 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1935,7 +1949,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1948,6 +1963,7 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1959,7 +1975,8 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -2220,7 +2237,8 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2316,6 +2334,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2379,7 +2398,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2459,7 +2478,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
     "continuable-cache": {
@@ -2502,7 +2521,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
       "dev": true
     },
     "core-util-is": {
@@ -2528,6 +2547,7 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2782,6 +2802,7 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2799,6 +2820,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2807,13 +2829,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2825,6 +2849,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2834,6 +2859,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2843,6 +2869,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2856,6 +2883,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2871,13 +2899,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2889,13 +2919,15 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2907,19 +2939,22 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2928,13 +2963,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2944,6 +2981,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -2964,13 +3002,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -2981,6 +3021,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -2996,6 +3037,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3005,6 +3047,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3014,6 +3057,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3024,6 +3068,7 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3034,6 +3079,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3046,6 +3092,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3057,6 +3104,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3084,6 +3132,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3097,19 +3146,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3122,6 +3174,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3132,6 +3185,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3144,6 +3198,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3158,19 +3213,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3183,6 +3241,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3193,6 +3252,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3205,6 +3265,7 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3218,19 +3279,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3243,6 +3307,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3253,6 +3318,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3265,6 +3331,7 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3280,6 +3347,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3292,7 +3360,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3425,7 +3494,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3491,6 +3560,7 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3514,6 +3584,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3522,13 +3593,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3540,6 +3613,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3549,6 +3623,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3558,6 +3633,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3571,6 +3647,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3586,13 +3663,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3604,13 +3683,15 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3622,19 +3703,22 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3643,13 +3727,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3659,6 +3745,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3679,13 +3766,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3696,6 +3785,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3711,6 +3801,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3720,6 +3811,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3729,6 +3821,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3739,6 +3832,7 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3749,6 +3843,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3761,6 +3856,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3772,6 +3868,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3814,6 +3911,7 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -3826,6 +3924,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -3834,13 +3933,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3850,6 +3951,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3865,6 +3967,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3876,6 +3979,7 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -3885,7 +3989,8 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3953,7 +4058,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -3989,7 +4094,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4153,7 +4258,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
           "optional": true
         }
@@ -4248,7 +4353,7 @@
     "eslint-scope": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4258,13 +4363,13 @@
     "eslint-utils": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
       "dev": true
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
       "dev": true
     },
     "espree": {
@@ -4287,7 +4392,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4296,7 +4401,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4356,7 +4461,7 @@
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
       "dev": true
     },
     "exec-buffer": {
@@ -4571,7 +4676,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -4825,6 +4930,7 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4872,13 +4978,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5125,7 +5233,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5189,7 +5298,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5210,12 +5320,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5230,17 +5342,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5357,7 +5472,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5369,6 +5485,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5383,6 +5500,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5390,12 +5508,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5414,6 +5534,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5494,7 +5615,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5506,6 +5628,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5591,7 +5714,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5627,6 +5751,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5646,6 +5771,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5689,12 +5815,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5730,6 +5858,7 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -5891,7 +6020,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6036,6 +6165,7 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6059,6 +6189,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6067,19 +6198,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
+          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6089,6 +6223,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6104,6 +6239,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6123,7 +6259,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6419,6 +6556,7 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6430,13 +6568,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6452,6 +6592,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6461,7 +6602,7 @@
     "gulp-eslint": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
+      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
       "dev": true,
       "requires": {
         "eslint": "^5.0.1",
@@ -7069,6 +7210,7 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7081,13 +7223,15 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7097,6 +7241,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -7415,7 +7560,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7566,7 +7711,7 @@
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
         "eventemitter3": "^3.0.0",
@@ -7860,7 +8005,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -7927,7 +8072,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8062,7 +8208,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8075,7 +8222,8 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8141,7 +8289,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8155,7 +8304,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -8164,14 +8313,15 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
     "is-retry-allowed": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8201,7 +8351,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8212,7 +8363,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8222,7 +8373,8 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8234,7 +8386,8 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8252,7 +8405,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8369,7 +8523,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -8496,7 +8650,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -8573,6 +8727,7 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8581,13 +8736,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8603,6 +8760,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -8908,7 +9066,8 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lodash.isobject": {
       "version": "2.4.1",
@@ -9105,7 +9264,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9146,7 +9306,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -9327,7 +9487,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
     "minimatch": {
@@ -9501,7 +9661,8 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12551,7 +12712,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -12855,7 +13017,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
       "dev": true
     },
     "posix-character-classes": {
@@ -13262,7 +13424,8 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13345,7 +13508,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
       "dev": true
     },
     "qs": {
@@ -13394,6 +13557,7 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13406,6 +13570,7 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13415,13 +13580,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13437,6 +13604,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -13541,7 +13709,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14039,7 +14207,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
     "sax": {
@@ -14053,6 +14221,7 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
+      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14198,7 +14367,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -14226,7 +14396,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true
     },
     "shebang-command": {
@@ -14516,7 +14686,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14703,7 +14873,8 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -14747,6 +14918,7 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -14757,6 +14929,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -14765,13 +14938,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14787,6 +14962,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14796,19 +14972,20 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
+      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
       "dev": true
     },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -14835,7 +15012,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -14850,7 +15027,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -14867,7 +15044,7 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
@@ -14981,6 +15158,7 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -14994,13 +15172,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15014,6 +15194,7 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15022,13 +15203,15 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -15059,6 +15242,7 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15092,6 +15276,7 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15100,13 +15285,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15119,7 +15306,8 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -15181,6 +15369,7 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15196,6 +15385,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15204,13 +15394,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15220,6 +15412,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15235,6 +15428,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15333,6 +15527,7 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15357,7 +15552,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "timsort": {
       "version": "0.3.0",
@@ -15409,7 +15605,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15420,6 +15616,7 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15429,6 +15626,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15445,7 +15643,8 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15524,6 +15723,7 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15573,7 +15773,7 @@
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -15615,7 +15815,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
       "dev": true
     },
     "unc-path-regex": {
@@ -15772,18 +15972,19 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -15800,6 +16001,7 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -15885,7 +16087,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -15930,6 +16133,7 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -15939,19 +16143,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15967,6 +16174,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16106,6 +16314,7 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
+      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16196,6 +16405,7 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16218,7 +16428,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",
@@ -16293,6 +16503,7 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web/Trees/FilesTreeController.cs b/src/Umbraco.Web/Trees/FilesTreeController.cs
index 878bde1ca059..60adb5048e36 100644
--- a/src/Umbraco.Web/Trees/FilesTreeController.cs
+++ b/src/Umbraco.Web/Trees/FilesTreeController.cs
@@ -4,7 +4,7 @@
 
 namespace Umbraco.Web.Trees
 {
-    [Tree(Constants.Applications.Settings, "files", TreeTitle = "Files", IconOpen = "icon-folder", IconClosed = "icon-folder", TreeUse = TreeUse.Dialog)]
+    [Tree(Constants.Applications.Settings, "files", TreeTitle = "Files", TreeUse = TreeUse.Dialog)]
     [CoreTree]
     public class FilesTreeController : FileSystemTreeController
     {
diff --git a/src/Umbraco.Web/Trees/ScriptsTreeController.cs b/src/Umbraco.Web/Trees/ScriptsTreeController.cs
index 1587e447ecb5..7c00d085b78b 100644
--- a/src/Umbraco.Web/Trees/ScriptsTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptsTreeController.cs
@@ -6,7 +6,7 @@
 namespace Umbraco.Web.Trees
 {
     [CoreTree]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Scripts, TreeTitle = "Scripts", IconOpen = "icon-folder", IconClosed = "icon-folder", SortOrder = 10, TreeGroup = Constants.Trees.Groups.Templating)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Scripts, TreeTitle = "Scripts", SortOrder = 10, TreeGroup = Constants.Trees.Groups.Templating)]
     public class ScriptsTreeController : FileSystemTreeController
     {
         protected override IFileSystem FileSystem => Current.FileSystems.ScriptsFileSystem; // TODO: inject
diff --git a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
index 87795fe8ded4..f96a83018db8 100644
--- a/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
+++ b/src/Umbraco.Web/Trees/StylesheetsTreeController.cs
@@ -5,7 +5,7 @@
 namespace Umbraco.Web.Trees
 {
     [CoreTree]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Stylesheets, TreeTitle = "Stylesheets", IconOpen = "icon-folder", IconClosed = "icon-folder", SortOrder = 9, TreeGroup = Constants.Trees.Groups.Templating)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Stylesheets, TreeTitle = "Stylesheets", SortOrder = 9, TreeGroup = Constants.Trees.Groups.Templating)]
     public class StylesheetsTreeController : FileSystemTreeController
     {
         protected override IFileSystem FileSystem => Current.FileSystems.StylesheetsFileSystem; // TODO: inject
diff --git a/src/Umbraco.Web/Trees/TreeAttribute.cs b/src/Umbraco.Web/Trees/TreeAttribute.cs
index 56de7023f8a4..25921b06f828 100644
--- a/src/Umbraco.Web/Trees/TreeAttribute.cs
+++ b/src/Umbraco.Web/Trees/TreeAttribute.cs
@@ -41,17 +41,7 @@ public TreeAttribute(string sectionAlias, string treeAlias)
         /// Gets the usage of the tree.
         /// </summary>
         public TreeUse TreeUse { get; set; } = TreeUse.Main | TreeUse.Dialog;
-
-        /// <summary>
-        /// Gets or sets the tree icon when closed.
-        /// </summary>
-        public string IconClosed { get; set; } = "icon-folder";
-
-        /// <summary>
-        /// Gets or sets the tree icon when open.
-        /// </summary>
-        public string IconOpen { get; set; } = "icon-folder-open";
-
+        
         /// <summary>
         /// Gets or sets the tree sort order.
         /// </summary>

From a0cda4075de6e9a023ea0c9cebd84bd25fc24947 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Feb 2019 13:42:07 +1100
Subject: [PATCH 264/421] Fixes issue with rendering macro content when the
 page doesn't exist

---
 src/Umbraco.Web/Editors/EntityController.cs         |  5 +++++
 src/Umbraco.Web/Editors/MacroRenderingController.cs | 13 ++++---------
 src/Umbraco.Web/Models/PartialViewMacroModel.cs     | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 5dc13e77cf7c..55604e0eb922 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -108,6 +108,8 @@ public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, st
             if (string.IsNullOrEmpty(query))
                 return Enumerable.Empty<EntityBasic>();
 
+            //TODO: This uses the internal UmbracoTreeSearcher, this instead should delgate to the ISearchableTree implementation for the type
+
             return ExamineSearch(query, type, searchFrom);
         }
 
@@ -451,6 +453,9 @@ public PagedResult<EntityBasic> GetPagedChildren(
             //the EntityService cannot search members of a certain type, this is currently not supported and would require
             //quite a bit of plumbing to do in the Services/Repository, we'll revert to a paged search
 
+            //TODO: We should really fix this in the EntityService but if we don't we should allow the ISearchableTree for the members controller
+            // to be used for this search instead of the built in/internal searcher
+
             var searchResult = _treeSearcher.ExamineSearch(filter ?? "", type, pageSize, pageNumber - 1, out long total, id);
 
             return new PagedResult<EntityBasic>(total, pageNumber, pageSize)
diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index 0fd88e2b1e13..87887f0cd7f9 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -102,18 +102,13 @@ public class MacroParameterModel
 
         private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId, IDictionary<string, object> macroParams)
         {
-            // note - here we should be using the cache, provided that the preview content is in the cache...
-
-            var doc = _contentService.GetById(pageId);
-            if (doc == null)
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-
             var m = _macroService.GetByAlias(macroAlias);
             if (m == null)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
 
             //if it isn't supposed to be rendered in the editor then return an empty string
-            if (!m.UseInEditor)
+            //currently we cannot render a macro if the page doesn't yet exist
+            if (pageId == -1 || !m.UseInEditor)
             {
                 var response = Request.CreateResponse();
                 //need to create a specific content result formatted as HTML since this controller has been configured
@@ -130,7 +125,7 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
             // When rendering the macro in the backoffice the default setting would be to use the Culture of the logged in user.
             // Since a Macro might contain thing thats related to the culture of the "IPublishedContent" (ie Dictionary keys) we want
             // to set the current culture to the culture related to the content item. This is hacky but it works.
-            var publishedContent = UmbracoContext.ContentCache.GetById(doc.Id);
+            var publishedContent = UmbracoContext.ContentCache.GetById(pageId);
             var culture = publishedContent?.GetCulture();
             _variationContextAccessor.VariationContext = new VariationContext(); //must have an active variation context!
             if (culture != null)
@@ -143,7 +138,7 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
             //need to create a specific content result formatted as HTML since this controller has been configured
             //with only json formatters.
             result.Content = new StringContent(
-                _componentRenderer.RenderMacro(doc.Id, m.Alias, macroParams).ToString(),
+                _componentRenderer.RenderMacro(pageId, m.Alias, macroParams).ToString(),
                 Encoding.UTF8,
                 "text/html");
             return result;
diff --git a/src/Umbraco.Web/Models/PartialViewMacroModel.cs b/src/Umbraco.Web/Models/PartialViewMacroModel.cs
index ae4becc7cfab..9964877cba29 100644
--- a/src/Umbraco.Web/Models/PartialViewMacroModel.cs
+++ b/src/Umbraco.Web/Models/PartialViewMacroModel.cs
@@ -22,10 +22,10 @@ public PartialViewMacroModel(IPublishedContent page,
             MacroId = macroId;
         }
        
-        public IPublishedContent Content { get; private set; }
-        public string MacroName { get; private set; }
-        public string MacroAlias { get; private set; }
-        public int MacroId { get; private set; }
-        public IDictionary<string, object> MacroParameters { get; private set; }
+        public IPublishedContent Content { get; }
+        public string MacroName { get; }
+        public string MacroAlias { get; }
+        public int MacroId { get; }
+        public IDictionary<string, object> MacroParameters { get; }
     }
 }

From 9fba7345aa2d5c731e0d6ab615336031fcb5ef31 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Feb 2019 13:48:53 +1100
Subject: [PATCH 265/421] When rendering macro contents, be sure to use the
 preview published content since the item

---
 src/Umbraco.Web/Editors/MacroRenderingController.cs | 11 +++++------
 src/Umbraco.Web/UmbracoComponentRenderer.cs         |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index 87887f0cd7f9..3cd2e86dd815 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -106,9 +106,11 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
             if (m == null)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
 
+            var publishedContent = UmbracoContext.ContentCache.GetById(true, pageId);
+
             //if it isn't supposed to be rendered in the editor then return an empty string
             //currently we cannot render a macro if the page doesn't yet exist
-            if (pageId == -1 || !m.UseInEditor)
+            if (pageId == -1 || publishedContent == null || !m.UseInEditor)
             {
                 var response = Request.CreateResponse();
                 //need to create a specific content result formatted as HTML since this controller has been configured
@@ -118,15 +120,12 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
                 return response;
             }
 
-            //because macro's are filled with insane legacy bits and pieces we need all sorts of weirdness to make them render.
-            //the 'easiest' way might be to create an IPublishedContent manually and populate the legacy 'page' object with that
-            //and then set the legacy parameters.
 
             // When rendering the macro in the backoffice the default setting would be to use the Culture of the logged in user.
             // Since a Macro might contain thing thats related to the culture of the "IPublishedContent" (ie Dictionary keys) we want
             // to set the current culture to the culture related to the content item. This is hacky but it works.
-            var publishedContent = UmbracoContext.ContentCache.GetById(pageId);
-            var culture = publishedContent?.GetCulture();
+            
+            var culture = publishedContent.GetCulture();
             _variationContextAccessor.VariationContext = new VariationContext(); //must have an active variation context!
             if (culture != null)
             {
diff --git a/src/Umbraco.Web/UmbracoComponentRenderer.cs b/src/Umbraco.Web/UmbracoComponentRenderer.cs
index 4ce25acb29d7..25c2d78731ed 100644
--- a/src/Umbraco.Web/UmbracoComponentRenderer.cs
+++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs
@@ -92,7 +92,7 @@ public IHtmlString RenderMacro(int contentId, string alias, IDictionary<string,
             if (contentId == default)
                 throw new ArgumentException("Invalid content id " + contentId);
 
-            var content = _umbracoContextAccessor.UmbracoContext.ContentCache?.GetById(contentId);
+            var content = _umbracoContextAccessor.UmbracoContext.ContentCache?.GetById(true, contentId);
 
             if (content == null)
                 throw new InvalidOperationException("Cannot render a macro, no content found by id " + contentId);

From 30452f0b17f3c6210497fe9de9a7c588d64620e6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Feb 2019 14:00:01 +1100
Subject: [PATCH 266/421] Fixes rte toolbar pinning in the grid

---
 .../src/common/services/tinymce.service.js                 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index a0fbbc19d64a..6b4554624fcb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1015,10 +1015,15 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
         pinToolbar : function (editor) {
 
+            //we can't pin the toolbar if this doesn't exist (i.e. when in distraction free mode)
+            if (!editor.editorContainer) {
+                return;
+            }
+
             var tinyMce = $(editor.editorContainer);
             var toolbar = tinyMce.find(".mce-toolbar");
             var toolbarHeight = toolbar.height();
-            var tinyMceRect = tinyMce[0].getBoundingClientRect();
+            var tinyMceRect = editor.editorContainer.getBoundingClientRect();
             var tinyMceTop = tinyMceRect.top;
             var tinyMceBottom = tinyMceRect.bottom;
             var tinyMceWidth = tinyMceRect.width;

From b51d3036e3d76dd7d0d892d73fe7ebc4daa67660 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Feb 2019 16:55:35 +1100
Subject: [PATCH 267/421] Adds overload of SaveAndPublish to accept multiple
 cultures, renames SavePublishing to CommitDocumentChanges, removes
 IContent.ChangeContentType

---
 src/Umbraco.Core/ContentExtensions.cs         | 16 +---
 src/Umbraco.Core/Models/Content.cs            |  4 +-
 src/Umbraco.Core/Models/ContentBase.cs        |  2 +-
 src/Umbraco.Core/Models/IContent.cs           | 19 +----
 src/Umbraco.Core/Services/IContentService.cs  | 38 ++++++---
 .../Services/Implement/ContentService.cs      | 46 ++++++++---
 src/Umbraco.Tests/Models/ContentTests.cs      | 23 +++---
 .../ContentServicePublishBranchTests.cs       |  8 +-
 .../Services/ContentServiceTests.cs           | 78 +++++++------------
 src/Umbraco.Web/Editors/ContentController.cs  | 17 ++--
 10 files changed, 120 insertions(+), 131 deletions(-)

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 5db080f3f314..9fcc12bc1083 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -67,21 +67,7 @@ internal static IReadOnlyList<string> GetCulturesUnpublishing(this IContent cont
                             content.WasCulturePublished(x))   // but was published before
                 .ToList();
         }
-
-        /// <summary>
-        /// Returns true if this entity was just published as part of a recent save operation (i.e. it wasn't previously published)
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// This is helpful for determining if the published event will execute during the saved event for a content item.
-        /// </remarks>
-        internal static bool JustPublished(this IContent entity)
-        {
-            var dirty = (IRememberBeingDirty)entity;
-            return dirty.WasPropertyDirty("Published") && entity.Published;
-        }
-
+        
         #endregion
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 16b28e088a7f..93f2b08482dd 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -420,7 +420,7 @@ public void UnpublishCulture(string culture = "*")
         /// </summary>
         /// <param name="contentType">New ContentType for this content</param>
         /// <remarks>Leaves PropertyTypes intact after change</remarks>
-        public void ChangeContentType(IContentType contentType)
+        internal void ChangeContentType(IContentType contentType)
         {
             ContentTypeId = contentType.Id;
             ContentType = new SimpleContentType(contentType);
@@ -437,7 +437,7 @@ public void ChangeContentType(IContentType contentType)
         /// </summary>
         /// <param name="contentType">New ContentType for this content</param>
         /// <param name="clearProperties">Boolean indicating whether to clear PropertyTypes upon change</param>
-        public void ChangeContentType(IContentType contentType, bool clearProperties)
+        internal void ChangeContentType(IContentType contentType, bool clearProperties)
         {
             if(clearProperties)
             {
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index ca1152a9a42b..89749da7e2b9 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -376,7 +376,7 @@ public virtual void CopyFrom(IContent other, string culture = "*")
         #region Validation
 
         /// <inheritdoc />
-        public virtual Property[] ValidateProperties(string culture = "*")
+        public Property[] ValidateProperties(string culture = "*")
         {
             var alsoInvariant = culture != null && culture != "*";
 
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index ee38f613a373..1d85a735b5be 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -79,7 +79,7 @@ public interface IContent : IContentBase
         /// and the content published name for this culture is non-null. It becomes non-published
         /// whenever values for this culture are unpublished.</para>
         /// <para>A culture becomes published as soon as PublishCulture has been invoked,
-        /// even though the document might now have been saved yet (and can have no identity).</para>
+        /// even though the document might not have been saved yet (and can have no identity).</para>
         /// <para>Does not support the '*' wildcard (returns false).</para>
         /// </remarks>
         bool IsCulturePublished(string culture);
@@ -137,23 +137,6 @@ public interface IContent : IContentBase
         /// </summary>
         IEnumerable<string> EditedCultures { get; }
 
-        // TODO: these two should move to some kind of service
-
-        /// <summary>
-        /// Changes the <see cref="IContentType"/> for the current content object
-        /// </summary>
-        /// <param name="contentType">New ContentType for this content</param>
-        /// <remarks>Leaves PropertyTypes intact after change</remarks>
-        void ChangeContentType(IContentType contentType);
-
-        /// <summary>
-        /// Changes the <see cref="IContentType"/> for the current content object and removes PropertyTypes,
-        /// which are not part of the new ContentType.
-        /// </summary>
-        /// <param name="contentType">New ContentType for this content</param>
-        /// <param name="clearProperties">Boolean indicating whether to clear PropertyTypes upon change</param>
-        void ChangeContentType(IContentType contentType, bool clearProperties);
-
         /// <summary>
         /// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
         /// </summary>
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 7fb7450b46f1..ad97ba2ddc27 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -336,29 +336,47 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// </summary>
         /// <remarks>
         /// <para>By default, publishes all variations of the document, but it is possible to specify a culture to be published.</para>
-        /// <para>When a culture is being published, it includes all varying values along with all invariant values. For
-        /// anything more complicated, see <see cref="SavePublishing"/>.</para>
+        /// <para>When a culture is being published, it includes all varying values along with all invariant values.</para>
         /// <para>The document is *always* saved, even when publishing fails.</para>
         /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither 'null' nor
         /// 'empty'. If the content type is invariant, then culture can be either '*' or null or empty.</para>
         /// </remarks>
+        /// <param name="content"></param>
+        /// <param name="culture"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns></returns>
         PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = 0, bool raiseEvents = true);
 
         /// <summary>
-        /// Saves and publishes a publishing document.
+        /// Saves and publishes a document.
+        /// </summary>
+        /// <remarks>
+        /// <para>By default, publishes all variations of the document, but it is possible to specify a culture to be published.</para>
+        /// <para>When a culture is being published, it includes all varying values along with all invariant values.</para>
+        /// <para>The document is *always* saved, even when publishing fails.</para>
+        /// </remarks>
+        /// <param name="content"></param>
+        /// <param name="cultures">The cultures to publish.</param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns></returns>
+        PublishResult SaveAndPublish(IContent content, string[] cultures, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Expert: Saves a document and publishes/unpublishes any pending publishing changes made to the document.
         /// </summary>
         /// <remarks>
-        /// <para>A publishing document is a document with values that are being published, i.e.
-        /// that have been published or cleared via <see cref="IContent.PublishCulture"/> and
+        /// <para>Pending publishing/unpublishing changes on a document are made with calls to <see cref="IContent.PublishCulture"/> and
         /// <see cref="IContent.UnpublishCulture"/>.</para>
-        /// <para>When one needs to publish or unpublish a single culture, or all cultures, using <see cref="SaveAndPublish"/>
-        /// and <see cref="Unpublish"/> is the way to go. But if one needs to, say, publish two cultures and unpublish a third
-        /// one, in one go, then one needs to invoke <see cref="IContent.PublishCulture"/> and <see cref="IContent.UnpublishCulture"/>
+        /// <para>When publishing or unpublishing a single culture, or all cultures, use <see cref="SaveAndPublish"/>
+        /// and <see cref="Unpublish"/>. But if the flexibility to both publish and unpublish in a single operation is required
+        /// then this method needs to be used in combination with <see cref="IContent.PublishCulture"/> and <see cref="IContent.UnpublishCulture"/>
         /// on the content itself - this prepares the content, but does not commit anything - and then, invoke
-        /// <see cref="SavePublishing"/> to actually commit the changes to the database.</para>
+        /// <see cref="CommitDocumentChanges"/> to actually commit the changes to the database.</para>
         /// <para>The document is *always* saved, even when publishing fails.</para>
         /// </remarks>
-        PublishResult SavePublishing(IContent content, int userId = 0, bool raiseEvents = true);
+        PublishResult CommitDocumentChanges(IContent content, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
         /// Saves and publishes a document branch.
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index c5745090f943..404adeea7235 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -857,7 +857,7 @@ public PublishResult SaveAndPublish(IContent content, string culture = "*", int
 
             var publishedState = content.PublishedState;
             if (publishedState != PublishedState.Published && publishedState != PublishedState.Unpublished)
-                throw new InvalidOperationException($"Cannot save-and-publish (un)publishing content, use the dedicated {nameof(SavePublishing)} method.");
+                throw new InvalidOperationException($"Cannot save-and-publish (un)publishing content, use the dedicated {nameof(CommitDocumentChanges)} method.");
 
             // cannot accept invariant (null or empty) culture for variant content type
             // cannot accept a specific culture for invariant content type (but '*' is ok)
@@ -891,7 +891,31 @@ public PublishResult SaveAndPublish(IContent content, string culture = "*", int
 
             // finally, "save publishing"
             // what happens next depends on whether the content can be published or not
-            return SavePublishing(content, userId, raiseEvents);
+            return CommitDocumentChanges(content, userId, raiseEvents);
+        }
+
+        /// <inheritdoc />
+        public PublishResult SaveAndPublish(IContent content, string[] cultures, int userId = 0, bool raiseEvents = true)
+        {
+            if (content == null) throw new ArgumentNullException(nameof(content));
+            if (cultures == null) throw new ArgumentNullException(nameof(cultures));
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            var varies = content.ContentType.VariesByCulture();
+            
+            if (cultures.Length == 0)
+            {
+                //no cultures specified and doesn't vary, so publish it, else nothing to publish
+                return !varies
+                    ? SaveAndPublish(content, userId: userId, raiseEvents: raiseEvents)
+                    : new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
+            }
+
+            if (cultures.Select(content.PublishCulture).Any(isValid => !isValid))
+                return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, content); //fixme: no way to know which one failed?
+
+            return CommitDocumentChanges(content, userId, raiseEvents);
         }
 
         /// <inheritdoc />
@@ -903,7 +927,7 @@ public PublishResult Unpublish(IContent content, string culture = "*", int userI
 
             var publishedState = content.PublishedState;
             if (publishedState != PublishedState.Published && publishedState != PublishedState.Unpublished)
-                throw new InvalidOperationException($"Cannot save-and-publish (un)publishing content, use the dedicated {nameof(SavePublishing)} method.");
+                throw new InvalidOperationException($"Cannot save-and-publish (un)publishing content, use the dedicated {nameof(CommitDocumentChanges)} method.");
 
             // cannot accept invariant (null or empty) culture for variant content type
             // cannot accept a specific culture for invariant content type (but '*' is ok)
@@ -938,22 +962,22 @@ public PublishResult Unpublish(IContent content, string culture = "*", int userI
             }
 
             // finally, "save publishing"
-            return SavePublishing(content, userId);
+            return CommitDocumentChanges(content, userId);
         }
 
         /// <inheritdoc />
-        public PublishResult SavePublishing(IContent content, int userId = 0, bool raiseEvents = true)
+        public PublishResult CommitDocumentChanges(IContent content, int userId = 0, bool raiseEvents = true)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
                 scope.WriteLock(Constants.Locks.ContentTree);
-                var result = SavePublishingInternal(scope, content, userId, raiseEvents);
+                var result = CommitDocumentChangesInternal(scope, content, userId, raiseEvents);
                 scope.Complete();
                 return result;
             }
         }
 
-        private PublishResult SavePublishingInternal(IScope scope, IContent content, int userId = 0, bool raiseEvents = true, bool branchOne = false, bool branchRoot = false)
+        private PublishResult CommitDocumentChangesInternal(IScope scope, IContent content, int userId = 0, bool raiseEvents = true, bool branchOne = false, bool branchRoot = false)
         {
             var evtMsgs = EventMessagesFactory.Get();
             PublishResult publishResult = null;
@@ -961,7 +985,7 @@ private PublishResult SavePublishingInternal(IScope scope, IContent content, int
 
             // nothing set = republish it all
             if (content.PublishedState != PublishedState.Publishing && content.PublishedState != PublishedState.Unpublishing)
-                ((Content)content).PublishedState = PublishedState.Publishing;
+                ((Content)content).PublishedState = PublishedState.Publishing; //TODO: fix this https://github.com/umbraco/Umbraco-CMS/issues/4234
 
             // state here is either Publishing or Unpublishing
             // (even though, Publishing to unpublish a culture may end up unpublishing everything)
@@ -1217,7 +1241,7 @@ private IEnumerable<PublishResult> PerformScheduledPublishInternal(DateTime date
                         else if (!publishing)
                             result = new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, d);
                         else
-                            result = SavePublishing(d, d.WriterId);
+                            result = CommitDocumentChanges(d, d.WriterId);
 
                         if (result.Success == false)
                             Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
@@ -1261,7 +1285,7 @@ private IEnumerable<PublishResult> PerformScheduledPublishInternal(DateTime date
 
                         if (pendingCultures.Count > 0)
                         {
-                            result = SavePublishing(d, d.WriterId);
+                            result = CommitDocumentChanges(d, d.WriterId);
                             if (result.Success == false)
                                 Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
                             yield return result;
@@ -1495,7 +1519,7 @@ private PublishResult SaveAndPublishBranchOne(IScope scope, IContent document,
             if (!publishCultures(document, culturesToPublish))
                 return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, document);
 
-            var result = SavePublishingInternal(scope, document, userId, branchOne: true, branchRoot: isRoot);
+            var result = CommitDocumentChangesInternal(scope, document, userId, branchOne: true, branchRoot: isRoot);
             if (result.Success)
                 publishedDocuments.Add(document);
             return result;
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 862925db2c34..805c957a2e15 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -704,20 +704,23 @@ public void Can_Change_ContentType_On_Content_And_Still_Get_Old_Properties()
         }
 
         [Test]
+        [Ignore("Need to reimplement this logic for v8")]
         public void Can_Change_ContentType_On_Content_And_Clear_Old_PropertyTypes()
         {
-            // Arrange
-            var contentType = MockedContentTypes.CreateTextPageContentType();
-            var simpleContentType = MockedContentTypes.CreateSimpleContentType();
-            var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
+            throw new NotImplementedException();
 
-            // Act
-            content.ChangeContentType(simpleContentType, true);
+            //// Arrange
+            //var contentType = MockedContentTypes.CreateTextPageContentType();
+            //var simpleContentType = MockedContentTypes.CreateSimpleContentType();
+            //var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
-            // Assert
-            Assert.That(content.Properties.Contains("author"), Is.True);
-            Assert.That(content.Properties.Contains("keywords"), Is.False);
-            Assert.That(content.Properties.Contains("description"), Is.False);
+            //// Act
+            //content.ChangeContentType(simpleContentType, true);
+
+            //// Assert
+            //Assert.That(content.Properties.Contains("author"), Is.True);
+            //Assert.That(content.Properties.Contains("keywords"), Is.False);
+            //Assert.That(content.Properties.Contains("description"), Is.False);
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Services/ContentServicePublishBranchTests.cs b/src/Umbraco.Tests/Services/ContentServicePublishBranchTests.cs
index 4afd5e33eb1e..d2343d3dea22 100644
--- a/src/Umbraco.Tests/Services/ContentServicePublishBranchTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServicePublishBranchTests.cs
@@ -264,9 +264,7 @@ public void Can_Publish_Variant_Branch()
             vRoot.SetValue("vp", "changed.es", "es");
             ServiceContext.ContentService.Save(vRoot); // now root has drafts in all cultures
 
-            iv1.PublishCulture("de");
-            iv1.PublishCulture("ru");
-            ServiceContext.ContentService.SavePublishing(iv1); // now iv1 de and ru are published
+            ServiceContext.ContentService.SaveAndPublish(iv1, new []{"de", "ru"}); // now iv1 de and ru are published
 
             iv1.SetValue("ip", "changed");
             iv1.SetValue("vp", "changed.de", "de");
@@ -345,10 +343,8 @@ private void Can_Publish_Mixed_Branch(out IContent iRoot, out IContent ii1, out
             iv11.SetValue("vp", "iv11.es", "es");
             ServiceContext.ContentService.Save(iv11);
 
-            iv11.PublishCulture("de");
             iv11.SetCultureName("iv11.ru", "ru");
-            iv11.PublishCulture("ru");
-            ServiceContext.ContentService.SavePublishing(iv11);
+            ServiceContext.ContentService.SaveAndPublish(iv11, new []{"de", "ru"});
 
             Assert.AreEqual("iv11.de", iv11.GetValue("vp", "de", published: true));
             Assert.AreEqual("iv11.ru", iv11.GetValue("vp", "ru", published: true));
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 017f1f50ecea..3e21768f97f1 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -767,7 +767,7 @@ public void Can_Unpublish_Content_Variation()
             Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
             Assert.IsFalse(content.WasCulturePublished(langUk.IsoCode));    //not persisted yet, will be false
 
-            var published = ServiceContext.ContentService.SavePublishing(content);
+            var published = ServiceContext.ContentService.SaveAndPublish(content, new[]{ langFr.IsoCode , langUk.IsoCode });
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.IsTrue(published.Success);
@@ -819,9 +819,8 @@ public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_St
             IContent content = new Content("content", -1, contentType);
             content.SetCultureName("content-en", langGB.IsoCode);
             content.SetCultureName("content-fr", langFr.IsoCode);
-            content.PublishCulture(langGB.IsoCode);
-            content.PublishCulture(langFr.IsoCode);
-            Assert.IsTrue(ServiceContext.ContentService.SavePublishing(content).Success);
+            
+            Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content, new []{ langGB.IsoCode , langFr.IsoCode }).Success);
            
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
@@ -861,8 +860,7 @@ public void Can_Publish_Content_Variation_And_Detect_Changed_Cultures()
 
             IContent content = new Content("content", -1, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
-            content.PublishCulture(langFr.IsoCode);
-            var published = ServiceContext.ContentService.SavePublishing(content);
+            var published = ServiceContext.ContentService.SaveAndPublish(content, langFr.IsoCode);
             //audit log will only show that french was published
             var lastLog = ServiceContext.AuditService.GetLogs(content.Id).Last();
             Assert.AreEqual($"Published languages: French (France)", lastLog.Comment);
@@ -870,8 +868,7 @@ public void Can_Publish_Content_Variation_And_Detect_Changed_Cultures()
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
             content.SetCultureName("content-en", langGB.IsoCode);
-            content.PublishCulture(langGB.IsoCode);
-            published = ServiceContext.ContentService.SavePublishing(content);
+            published = ServiceContext.ContentService.SaveAndPublish(content, langGB.IsoCode);
             //audit log will only show that english was published
             lastLog = ServiceContext.AuditService.GetLogs(content.Id).Last();
             Assert.AreEqual($"Published languages: English (United Kingdom)", lastLog.Comment);
@@ -895,15 +892,12 @@ public void Can_Unpublish_Content_Variation_And_Detect_Changed_Cultures()
             IContent content = new Content("content", -1, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
             content.SetCultureName("content-gb", langGB.IsoCode);
-            content.PublishCulture(langGB.IsoCode);
-            content.PublishCulture(langFr.IsoCode);
-            var published = ServiceContext.ContentService.SavePublishing(content);
+            var published = ServiceContext.ContentService.SaveAndPublish(content, new[] {langGB.IsoCode, langFr.IsoCode});
             Assert.IsTrue(published.Success);
 
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
-            content.UnpublishCulture(langFr.IsoCode); //unpublish non-mandatory lang
-            var unpublished = ServiceContext.ContentService.SavePublishing(content);
+            var unpublished = ServiceContext.ContentService.Unpublish(content, langFr.IsoCode);
             //audit log will only show that french was unpublished
             var lastLog = ServiceContext.AuditService.GetLogs(content.Id).Last();
             Assert.AreEqual($"Unpublished languages: French (France)", lastLog.Comment);
@@ -911,8 +905,7 @@ public void Can_Unpublish_Content_Variation_And_Detect_Changed_Cultures()
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
             content.SetCultureName("content-en", langGB.IsoCode);
-            content.UnpublishCulture(langGB.IsoCode); //unpublish mandatory lang
-            unpublished = ServiceContext.ContentService.SavePublishing(content);
+            unpublished = ServiceContext.ContentService.Unpublish(content, langGB.IsoCode);
             //audit log will only show that english was published
             var logs = ServiceContext.AuditService.GetLogs(content.Id).ToList();
             Assert.AreEqual($"Unpublished languages: English (United Kingdom)", logs[logs.Count - 2].Comment);
@@ -927,8 +920,7 @@ public void Can_Publish_Content_1()
             var content = contentService.GetById(NodeDto.NodeIdSeed + 2);
 
             // Act
-            content.PublishCulture();
-            var published = contentService.SavePublishing(content, Constants.Security.SuperUserId);
+            var published = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(published.Success, Is.True);
@@ -982,8 +974,7 @@ public void Can_Publish_Content_WithEvents()
                 Assert.AreEqual("Home", content.Name);
 
                 content.Name = "foo";
-                content.PublishCulture();
-                var published = contentService.SavePublishing(content, Constants.Security.SuperUserId);
+                var published = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
 
                 Assert.That(published.Success, Is.True);
                 Assert.That(content.Published, Is.True);
@@ -1030,10 +1021,7 @@ public void Can_Publish_Only_Valid_Content()
             Assert.IsTrue(parentPublished.Success);
             Assert.IsTrue(parent.Published);
 
-            var contentCanPublishValues = content.PublishCulture();
-
             // content cannot publish values because they are invalid
-            Assert.IsFalse(contentCanPublishValues);
             Assert.IsNotEmpty(content.ValidateProperties());
 
             // and therefore cannot be published,
@@ -1061,7 +1049,7 @@ public void Can_Publish_And_Unpublish_Cultures_In_Single_Operation()
             content.SetCultureName("name-da", langDa.IsoCode);
 
             content.PublishCulture(langFr.IsoCode);
-            var result = ServiceContext.ContentService.SavePublishing(content);
+            var result = ServiceContext.ContentService.CommitDocumentChanges(content);
             Assert.IsTrue(result.Success);
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
@@ -1070,7 +1058,7 @@ public void Can_Publish_And_Unpublish_Cultures_In_Single_Operation()
             content.UnpublishCulture(langFr.IsoCode);
             content.PublishCulture(langDa.IsoCode);
 
-            result = ServiceContext.ContentService.SavePublishing(content);
+            result = ServiceContext.ContentService.CommitDocumentChanges(content);
             Assert.IsTrue(result.Success);
             Assert.AreEqual(PublishResultType.SuccessMixedCulture, result.Result);
 
@@ -1149,12 +1137,10 @@ public void Cannot_Publish_Expired_Content()
             contentService.Save(content);
 
             var parent = contentService.GetById(NodeDto.NodeIdSeed + 2);
-            parent.PublishCulture();
-            var parentPublished = contentService.SavePublishing(parent, Constants.Security.SuperUserId);//Publish root Home node to enable publishing of 'NodeDto.NodeIdSeed + 3'
+            var parentPublished = contentService.SaveAndPublish(parent, userId: Constants.Security.SuperUserId);//Publish root Home node to enable publishing of 'NodeDto.NodeIdSeed + 3'
 
             // Act
-            content.PublishCulture();
-            var published = contentService.SavePublishing(content, Constants.Security.SuperUserId);
+            var published = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(parentPublished.Success, Is.True);
@@ -1192,12 +1178,10 @@ public void Cannot_Publish_Content_Awaiting_Release()
             contentService.Save(content, Constants.Security.SuperUserId);
 
             var parent = contentService.GetById(NodeDto.NodeIdSeed + 2);
-            parent.PublishCulture();
-            var parentPublished = contentService.SavePublishing(parent, Constants.Security.SuperUserId);//Publish root Home node to enable publishing of 'NodeDto.NodeIdSeed + 3'
+            var parentPublished = contentService.SaveAndPublish(parent, userId: Constants.Security.SuperUserId);//Publish root Home node to enable publishing of 'NodeDto.NodeIdSeed + 3'
 
             // Act
-            content.PublishCulture();
-            var published = contentService.SavePublishing(content, Constants.Security.SuperUserId);
+            var published = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(parentPublished.Success, Is.True);
@@ -1249,8 +1233,7 @@ public void Cannot_Publish_Trashed_Content()
             var content = contentService.GetById(NodeDto.NodeIdSeed + 5);
 
             // Act
-            content.PublishCulture();
-            var published = contentService.SavePublishing(content, Constants.Security.SuperUserId);
+            var published = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(published.Success, Is.False);
@@ -1267,8 +1250,7 @@ public void Can_Save_And_Publish_Content()
             content.SetValue("author", "Barack Obama");
 
             // Act
-            content.PublishCulture();
-            var published = contentService.SavePublishing(content, Constants.Security.SuperUserId);
+            var published = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(content.HasIdentity, Is.True);
@@ -1292,15 +1274,13 @@ public void Can_Save_And_Publish_Content_And_Child_Without_Identity()
             content.SetValue("author", "Barack Obama");
 
             // Act
-            content.PublishCulture();
-            var published = contentService.SavePublishing(content, Constants.Security.SuperUserId);
+            var published = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
             var childContent = contentService.Create("Child", content.Id, "umbTextpage", Constants.Security.SuperUserId);
             // Reset all identity properties
             childContent.Id = 0;
             childContent.Path = null;
             ((Content)childContent).ResetIdentity();
-            childContent.PublishCulture();
-            var childPublished = contentService.SavePublishing(childContent, Constants.Security.SuperUserId);
+            var childPublished = contentService.SaveAndPublish(childContent, userId: Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(content.HasIdentity, Is.True);
@@ -1639,14 +1619,12 @@ public void Can_Empty_RecycleBin_With_Content_That_Has_All_Related_Data()
             content1.PropertyValues(obj);
             content1.ResetDirtyProperties(false);
             ServiceContext.ContentService.Save(content1, Constants.Security.SuperUserId);
-            content1.PublishCulture();
-            Assert.IsTrue(ServiceContext.ContentService.SavePublishing(content1, 0).Success);
+            Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content1, userId: 0).Success);
             var content2 = MockedContent.CreateBasicContent(contentType);
             content2.PropertyValues(obj);
             content2.ResetDirtyProperties(false);
             ServiceContext.ContentService.Save(content2, Constants.Security.SuperUserId);
-            content2.PublishCulture();
-            Assert.IsTrue(ServiceContext.ContentService.SavePublishing(content2, 0).Success);
+            Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content2, userId: 0).Success);
 
             var editorGroup = ServiceContext.UserService.GetUserGroupByAlias("editor");
             editorGroup.StartContentId = content1.Id;
@@ -2721,9 +2699,7 @@ public void Can_SaveRead_Variations()
 
             // act
 
-            content.PublishCulture(langFr.IsoCode);
-            content.PublishCulture(langUk.IsoCode);
-            contentService.SavePublishing(content);
+            contentService.SaveAndPublish(content, new[]{ langFr.IsoCode, langUk.IsoCode });
 
             // both FR and UK have been published,
             // and content has been published,
@@ -2827,8 +2803,7 @@ public void Can_SaveRead_Variations()
             // act
             // cannot just 'save' since we are changing what's published!
 
-            content.UnpublishCulture(langFr.IsoCode);
-            contentService.SavePublishing(content);
+            contentService.Unpublish(content, langFr.IsoCode);
 
             // content has been published,
             // the french culture is gone
@@ -2919,7 +2894,7 @@ public void Can_SaveRead_Variations()
 
             // that HAS to be SavePublishing, because SaveAndPublish would just republish everything!
 
-            contentService.SavePublishing(content);
+            contentService.CommitDocumentChanges(content);
 
             // content has been re-published,
             // everything is back to what it was before being unpublished
@@ -2959,8 +2934,7 @@ public void Can_SaveRead_Variations()
 
             // act
 
-            content.PublishCulture(langUk.IsoCode);
-            contentService.SavePublishing(content);
+            contentService.SaveAndPublish(content, langUk.IsoCode);
 
             content2 = contentService.GetById(content.Id);
 
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index ee056e38f058..5cbd83d236da 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1148,7 +1148,6 @@ private IEnumerable<PublishResult> PublishBranchInternal(ContentItemSave content
         /// Performs the publishing operation for a content item
         /// </summary>
         /// <param name="contentItem"></param>
-        /// <param name="publishStatus"></param>
         /// <param name="wasCancelled"></param>
         /// <param name="successfulCultures">
         /// if the content is variant this will return an array of cultures that will be published (passed validation rules)
@@ -1197,10 +1196,12 @@ private PublishResult PublishInternal(ContentItemSave contentItem, out bool wasC
 
             if (canPublish)
             {
+                var culturesToPublish = cultureVariants.Where(x => x.Publish).Select(x => x.Culture).ToArray();
+                
                 //proceed to publish if all validation still succeeds
-                var publishStatus = Services.ContentService.SavePublishing(contentItem.PersistedContent, Security.CurrentUser.Id);
+                var publishStatus = Services.ContentService.SaveAndPublish(contentItem.PersistedContent, culturesToPublish, Security.CurrentUser.Id);
                 wasCancelled = publishStatus.Result == PublishResultType.FailedPublishCancelledByEvent;
-                successfulCultures = contentItem.Variants.Where(x => x.Publish).Select(x => x.Culture).ToArray();
+                successfulCultures = culturesToPublish;
                 return publishStatus;
             }
             else
@@ -1219,6 +1220,10 @@ private PublishResult PublishInternal(ContentItemSave contentItem, out bool wasC
         /// </summary>
         /// <param name="contentItem"></param>
         /// <param name="cultureVariants"></param>
+        /// <param name="mandatoryCultures"></param>
+        /// <param name="localizationKey"></param>
+        /// <param name="publishingCheck"></param>
+        /// <param name="mandatoryVariants"></param>
         /// <returns></returns>
         private bool ValidatePublishingMandatoryLanguages(
             ContentItemSave contentItem,
@@ -1240,7 +1245,7 @@ private bool ValidatePublishingMandatoryLanguages(
                 var isPublished = contentItem.PersistedContent.Published && contentItem.PersistedContent.IsCulturePublished(culture);
                 result.Add((mandatoryVariant, isPublished));
 
-                var isPublishing = isPublished ? true : publishingCheck(mandatoryVariant);
+                var isPublishing = isPublished || publishingCheck(mandatoryVariant);
 
                 if (isPublished || isPublishing) continue;
 
@@ -1254,7 +1259,7 @@ private bool ValidatePublishingMandatoryLanguages(
         }
 
         /// <summary>
-        /// This will call PublishCulture on the content item for each culture that needs to be published including the invariant culture
+        /// Call PublishCulture on the content item for each culture to get a validation result for each culture
         /// </summary>
         /// <param name="persistentContent"></param>
         /// <param name="cultureVariants"></param>
@@ -1311,7 +1316,7 @@ public HttpResponseMessage PostPublishById(int id)
                 return HandleContentNotFound(id, false);
             }
 
-            var publishResult = Services.ContentService.SavePublishing(foundContent, Security.GetUserId().ResultOr(0));
+            var publishResult = Services.ContentService.SaveAndPublish(foundContent, userId: Security.GetUserId().ResultOr(0));
             if (publishResult.Success == false)
             {
                 var notificationModel = new SimpleNotificationModel();

From 72f6b2fd1111446e6a32d17143d4ce332358fc17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 4 Feb 2019 08:12:27 +0100
Subject: [PATCH 268/421] removing comments from
 temp8-4257-refactoring-of-infinite-editor-layers

---
 .../components/editor/umbeditors.directive.js         | 11 ++---------
 .../src/less/components/editor/umb-editor.less        |  2 --
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index c25dd0a76feb..235918735fdd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -66,14 +66,12 @@
                 }
                 
                 editor.style._tx = 100;
-                //editor.style.opacity = 0;
                 editor.style.transform = "translateX("+editor.style._tx+"%)";
                 
                 // animation config
                 anime({
                     targets: editor.style,
                     _tx: [100, 0],
-                    //opacity: [0, 1],
                     easing: 'easeOutExpo',
                     duration: 480,
                     update: () => {
@@ -81,10 +79,8 @@
                         scope.$digest();
                     },
                     complete: function() {
-                        //$timeout(function(){
-                            editor.animating = false;
-                            scope.$digest();
-                        //});
+                        editor.animating = false;
+                        scope.$digest();
                     }
                 });
                 
@@ -102,7 +98,6 @@
                 anime({
                     targets: editor.style,
                     _tx: [0, 100],
-                    //opacity: [1, 0],
                     easing: 'easeInExpo',
                     duration: 360,
                     update: () => {
@@ -110,11 +105,9 @@
                         scope.$digest();
                     },
                     complete: function() {
-                        //$timeout(function(){
                         scope.editors.splice(-1,1);
                         removeOverlayFromPrevEditor();
                         scope.$digest();
-                        //})
                     }
                 });
                 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index 3e94e01b3a60..6dd77c56b1fb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -17,14 +17,12 @@
 }
 
 .umb-editor--animating {
-    //will-change: transform, opacity, width, left;
     will-change: transform, width, left;
 }
 
 // hide all infinite editors by default
 // will be shown through animation
 .umb-editors .umb-editor {
-    //opacity: 0;
     box-shadow: 0px 0 30px 0 rgba(0,0,0,.3);
 }
 

From 7fd51a298dcc951d66ef42a493e52bd74a325049 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Feb 2019 09:47:37 +0100
Subject: [PATCH 269/421] Upgrade ModelsBuilder, following changes in Umbraco

---
 build/NuSpecs/UmbracoCms.nuspec          | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 15040022452b..05a6f4ca0eb1 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,7 +22,7 @@
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
             <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
-            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.34]" />
+            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.35]" />
             <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
             <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
             <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e0660f8f1261..02e24ddbb658 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -105,7 +105,7 @@
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
-      <Version>8.0.0-alpha.34</Version>
+      <Version>8.0.0-alpha.35</Version>
     </PackageReference>
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>

From 80165c3c0f816a5c38ba2110621f28e7db7e92c7 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Feb 2019 19:52:04 +1100
Subject: [PATCH 270/421] Fixes allocations of property selectors, with nameof
 we save a bunch of both memory and initial reflection lookups

---
 src/Umbraco.Core/Models/AuditEntry.cs         |  31 +---
 src/Umbraco.Core/Models/Consent.cs            |  29 +---
 src/Umbraco.Core/Models/Content.cs            |  21 +--
 src/Umbraco.Core/Models/ContentBase.cs        |  18 +-
 .../Models/ContentCultureInfos.cs             |  15 +-
 src/Umbraco.Core/Models/ContentType.cs        |  20 +--
 src/Umbraco.Core/Models/ContentTypeBase.cs    |  60 +++----
 .../Models/ContentTypeCompositionBase.cs      |  15 +-
 src/Umbraco.Core/Models/DataType.cs           |  17 +-
 src/Umbraco.Core/Models/DictionaryItem.cs     |  27 +--
 .../Models/DictionaryTranslation.cs           |  11 +-
 .../Models/Entities/BeingDirty.cs             |  10 +-
 .../Models/Entities/BeingDirtyBase.cs         |  18 +-
 .../Models/Entities/EntityBase.cs             |  19 +--
 .../Models/Entities/TreeEntityBase.cs         |  30 +---
 src/Umbraco.Core/Models/File.cs               |  12 +-
 .../Models/Identity/BackOfficeIdentityUser.cs |  63 +++----
 src/Umbraco.Core/Models/Language.cs           |  23 +--
 src/Umbraco.Core/Models/Macro.cs              |  55 +++---
 src/Umbraco.Core/Models/MacroProperty.cs      |  41 ++---
 src/Umbraco.Core/Models/Member.cs             |  41 ++---
 src/Umbraco.Core/Models/MemberGroup.cs        |  12 +-
 src/Umbraco.Core/Models/MemberType.cs         |   9 +-
 src/Umbraco.Core/Models/Membership/User.cs    | 159 ++++++------------
 .../Models/Membership/UserGroup.cs            |  35 ++--
 src/Umbraco.Core/Models/MigrationEntry.cs     |  16 +-
 src/Umbraco.Core/Models/Property.cs           |   9 +-
 src/Umbraco.Core/Models/PropertyGroup.cs      |  17 +-
 src/Umbraco.Core/Models/PropertyType.cs       |  43 ++---
 src/Umbraco.Core/Models/PublicAccessEntry.cs  |  36 ++--
 src/Umbraco.Core/Models/PublicAccessRule.cs   |  17 +-
 src/Umbraco.Core/Models/RedirectUrl.cs        |  32 ++--
 src/Umbraco.Core/Models/Relation.cs           |  33 ++--
 src/Umbraco.Core/Models/RelationType.cs       |  31 ++--
 src/Umbraco.Core/Models/ServerRegistration.cs |  40 +++--
 src/Umbraco.Core/Models/StylesheetProperty.cs |  16 +-
 src/Umbraco.Core/Models/Tag.cs                |   6 +-
 src/Umbraco.Core/Models/Template.cs           |  26 +--
 src/Umbraco.Core/Models/UmbracoDomain.cs      |  28 +--
 .../Cache/DeepCloneAppCacheTests.cs           |  26 +--
 40 files changed, 358 insertions(+), 809 deletions(-)

diff --git a/src/Umbraco.Core/Models/AuditEntry.cs b/src/Umbraco.Core/Models/AuditEntry.cs
index 2076e5328c2e..da56c6c31875 100644
--- a/src/Umbraco.Core/Models/AuditEntry.cs
+++ b/src/Umbraco.Core/Models/AuditEntry.cs
@@ -12,8 +12,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     internal class AuditEntry : EntityBase, IAuditEntry
     {
-        private static PropertySelectors _selectors;
-
         private int _performingUserId;
         private string _performingDetails;
         private string _performingIp;
@@ -21,39 +19,26 @@ internal class AuditEntry : EntityBase, IAuditEntry
         private string _affectedDetails;
         private string _eventType;
         private string _eventDetails;
-
-        private static PropertySelectors Selectors => _selectors ?? (_selectors = new PropertySelectors());
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo PerformingUserId = ExpressionHelper.GetPropertyInfo<AuditEntry, int>(x => x.PerformingUserId);
-            public readonly PropertyInfo PerformingDetails = ExpressionHelper.GetPropertyInfo<AuditEntry, string>(x => x.PerformingDetails);
-            public readonly PropertyInfo PerformingIp = ExpressionHelper.GetPropertyInfo<AuditEntry, string>(x => x.PerformingIp);
-            public readonly PropertyInfo AffectedUserId = ExpressionHelper.GetPropertyInfo<AuditEntry, int>(x => x.AffectedUserId);
-            public readonly PropertyInfo AffectedDetails = ExpressionHelper.GetPropertyInfo<AuditEntry, string>(x => x.AffectedDetails);
-            public readonly PropertyInfo EventType = ExpressionHelper.GetPropertyInfo<AuditEntry, string>(x => x.EventType);
-            public readonly PropertyInfo EventDetails = ExpressionHelper.GetPropertyInfo<AuditEntry, string>(x => x.EventDetails);
-        }
-
+        
         /// <inheritdoc />
         public int PerformingUserId
         {
             get => _performingUserId;
-            set => SetPropertyValueAndDetectChanges(value, ref _performingUserId, Selectors.PerformingUserId);
+            set => SetPropertyValueAndDetectChanges(value, ref _performingUserId, nameof(PerformingUserId));
         }
 
         /// <inheritdoc />
         public string PerformingDetails
         {
             get => _performingDetails;
-            set => SetPropertyValueAndDetectChanges(value, ref _performingDetails, Selectors.PerformingDetails);
+            set => SetPropertyValueAndDetectChanges(value, ref _performingDetails, nameof(PerformingDetails));
         }
 
         /// <inheritdoc />
         public string PerformingIp
         {
             get => _performingIp;
-            set => SetPropertyValueAndDetectChanges(value, ref _performingIp, Selectors.PerformingIp);
+            set => SetPropertyValueAndDetectChanges(value, ref _performingIp, nameof(PerformingIp));
         }
 
         /// <inheritdoc />
@@ -67,28 +52,28 @@ public DateTime EventDateUtc
         public int AffectedUserId 
         {
             get => _affectedUserId;
-            set => SetPropertyValueAndDetectChanges(value, ref _affectedUserId, Selectors.AffectedUserId);
+            set => SetPropertyValueAndDetectChanges(value, ref _affectedUserId, nameof(AffectedUserId));
         }
 
         /// <inheritdoc />
         public string AffectedDetails 
         {
             get => _affectedDetails;
-            set => SetPropertyValueAndDetectChanges(value, ref _affectedDetails, Selectors.AffectedDetails);
+            set => SetPropertyValueAndDetectChanges(value, ref _affectedDetails, nameof(AffectedDetails));
         }
 
         /// <inheritdoc />
         public string EventType 
         {
             get => _eventType;
-            set => SetPropertyValueAndDetectChanges(value, ref _eventType, Selectors.EventType);
+            set => SetPropertyValueAndDetectChanges(value, ref _eventType, nameof(EventType));
         }
 
         /// <inheritdoc />
         public string EventDetails 
         {
             get => _eventDetails;
-            set => SetPropertyValueAndDetectChanges(value, ref _eventDetails, Selectors.EventDetails);
+            set => SetPropertyValueAndDetectChanges(value, ref _eventDetails, nameof(EventDetails));
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/Consent.cs b/src/Umbraco.Core/Models/Consent.cs
index 87dd9767a070..cca1db41f176 100644
--- a/src/Umbraco.Core/Models/Consent.cs
+++ b/src/Umbraco.Core/Models/Consent.cs
@@ -13,33 +13,18 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     internal class Consent : EntityBase, IConsent
     {
-        private static PropertySelectors _selector;
-
         private bool _current;
         private string _source;
         private string _context;
         private string _action;
         private ConsentState _state;
         private string _comment;
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo Current = ExpressionHelper.GetPropertyInfo<Consent, bool>(x => x.Current);
-            public readonly PropertyInfo Source = ExpressionHelper.GetPropertyInfo<Consent, string>(x => x.Source);
-            public readonly PropertyInfo Context = ExpressionHelper.GetPropertyInfo<Consent, string>(x => x.Context);
-            public readonly PropertyInfo Action = ExpressionHelper.GetPropertyInfo<Consent, string>(x => x.Action);
-            public readonly PropertyInfo State = ExpressionHelper.GetPropertyInfo<Consent, ConsentState>(x => x.State);
-            public readonly PropertyInfo Comment = ExpressionHelper.GetPropertyInfo<Consent, string>(x => x.Comment);
-        }
-
-        private static PropertySelectors Selectors => _selector ?? (_selector = new PropertySelectors());
-
+        
         /// <inheritdoc />
         public bool Current
         {
             get => _current;
-            set => SetPropertyValueAndDetectChanges(value, ref _current, Selectors.Current);
+            set => SetPropertyValueAndDetectChanges(value, ref _current, nameof(Current));
         }
 
         /// <inheritdoc />
@@ -49,7 +34,7 @@ public string Source
             set
             {
                 if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException(nameof(value));
-                SetPropertyValueAndDetectChanges(value, ref _source, Selectors.Source);
+                SetPropertyValueAndDetectChanges(value, ref _source, nameof(Source));
             }
         }
 
@@ -60,7 +45,7 @@ public string Context
             set
             {
                 if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException(nameof(value));
-                SetPropertyValueAndDetectChanges(value, ref _context, Selectors.Context);
+                SetPropertyValueAndDetectChanges(value, ref _context, nameof(Context));
             }
         }
 
@@ -71,7 +56,7 @@ public string Action
             set
             {
                 if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException(nameof(value));
-                SetPropertyValueAndDetectChanges(value, ref _action, Selectors.Action);
+                SetPropertyValueAndDetectChanges(value, ref _action, nameof(Action));
             }
         }
 
@@ -81,14 +66,14 @@ public ConsentState State
             get => _state;
             // note: we probably should validate the state here, but since the
             //  enum is [Flags] with many combinations, this could be expensive
-            set => SetPropertyValueAndDetectChanges(value, ref _state, Selectors.State);
+            set => SetPropertyValueAndDetectChanges(value, ref _state, nameof(State));
         }
 
         /// <inheritdoc />
         public string Comment
         {
             get => _comment;
-            set => SetPropertyValueAndDetectChanges(value, ref _comment, Selectors.Comment);
+            set => SetPropertyValueAndDetectChanges(value, ref _comment, nameof(Comment));
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 16b28e088a7f..4fda1ff23dd0 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -23,8 +23,6 @@ public class Content : ContentBase, IContent
         private ContentCultureInfosCollection _publishInfosOrig;
         private HashSet<string> _editedCultures;
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
         /// <summary>
         /// Constructor for creating a Content object
         /// </summary>
@@ -81,15 +79,6 @@ public Content(string name, int parentId, IContentType contentType, PropertyColl
             PublishedVersionId = 0;
         }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo TemplateSelector = ExpressionHelper.GetPropertyInfo<Content, int?>(x => x.TemplateId);
-            public readonly PropertyInfo PublishedSelector = ExpressionHelper.GetPropertyInfo<Content, bool>(x => x.Published);
-            public readonly PropertyInfo ContentScheduleSelector = ExpressionHelper.GetPropertyInfo<Content, ContentScheduleCollection>(x => x.ContentSchedule);
-            public readonly PropertyInfo PublishCultureInfosSelector = ExpressionHelper.GetPropertyInfo<Content, IReadOnlyDictionary<string, ContentCultureInfos>>(x => x.PublishCultureInfos);
-        }
-
         /// <inheritdoc />
         [DoNotClone]
         public ContentScheduleCollection ContentSchedule
@@ -107,7 +96,7 @@ public ContentScheduleCollection ContentSchedule
             {
                 if(_schedule != null)
                     _schedule.CollectionChanged -= ScheduleCollectionChanged;
-                SetPropertyValueAndDetectChanges(value, ref _schedule, Ps.Value.ContentScheduleSelector);
+                SetPropertyValueAndDetectChanges(value, ref _schedule, nameof(ContentSchedule));
                 if (_schedule != null)
                     _schedule.CollectionChanged += ScheduleCollectionChanged;
             }
@@ -120,7 +109,7 @@ public ContentScheduleCollection ContentSchedule
         /// <param name="e"></param>
         private void ScheduleCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.ContentScheduleSelector);
+            OnPropertyChanged(nameof(ContentSchedule));
         }
 
         /// <summary>
@@ -135,7 +124,7 @@ private void ScheduleCollectionChanged(object sender, NotifyCollectionChangedEve
         public int? TemplateId
         {
             get => _templateId;
-            set => SetPropertyValueAndDetectChanges(value, ref _templateId, Ps.Value.TemplateSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _templateId, nameof(TemplateId));
         }
 
         /// <summary>
@@ -151,7 +140,7 @@ public bool Published
             // - the ContentRepository when updating a content entity
             internal set
             {
-                SetPropertyValueAndDetectChanges(value, ref _published, Ps.Value.PublishedSelector);
+                SetPropertyValueAndDetectChanges(value, ref _published, nameof(Published));
                 _publishedState = _published ? PublishedState.Published : PublishedState.Unpublished;
             }
         }
@@ -332,7 +321,7 @@ internal void SetCultureEdited(IEnumerable<string> cultures)
         /// </summary>
         private void PublishNamesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.PublishCultureInfosSelector);
+            OnPropertyChanged(nameof(PublishCultureInfos));
         }
 
         [IgnoreDataMember]
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index ca1152a9a42b..705fa2cfb0d6 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -19,7 +19,6 @@ namespace Umbraco.Core.Models
     public abstract class ContentBase : TreeEntityBase, IContentBase
     {
         protected static readonly ContentCultureInfosCollection NoInfos = new ContentCultureInfosCollection();
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
 
         private int _contentTypeId;
         protected IContentTypeComposition ContentTypeBase;
@@ -62,18 +61,9 @@ private ContentBase(string name, IContentTypeComposition contentType, PropertyCo
             _properties.EnsurePropertyTypes(PropertyTypes);
         }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo DefaultContentTypeIdSelector = ExpressionHelper.GetPropertyInfo<ContentBase, int>(x => x.ContentTypeId);
-            public readonly PropertyInfo PropertyCollectionSelector = ExpressionHelper.GetPropertyInfo<ContentBase, PropertyCollection>(x => x.Properties);
-            public readonly PropertyInfo WriterSelector = ExpressionHelper.GetPropertyInfo<ContentBase, int>(x => x.WriterId);
-            public readonly PropertyInfo CultureInfosSelector = ExpressionHelper.GetPropertyInfo<ContentBase, IReadOnlyDictionary<string, ContentCultureInfos>>(x => x.CultureInfos);
-        }
-
         protected void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.PropertyCollectionSelector);
+            OnPropertyChanged(nameof(Properties));
         }
 
         /// <summary>
@@ -83,7 +73,7 @@ protected void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs
         public virtual int WriterId
         {
             get => _writerId;
-            set => SetPropertyValueAndDetectChanges(value, ref _writerId, Ps.Value.WriterSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _writerId, nameof(WriterId));
         }
 
         [IgnoreDataMember]
@@ -105,7 +95,7 @@ public virtual int ContentTypeId
                 }
                 return _contentTypeId;
             }
-            protected set => SetPropertyValueAndDetectChanges(value, ref _contentTypeId, Ps.Value.DefaultContentTypeIdSelector);
+            protected set => SetPropertyValueAndDetectChanges(value, ref _contentTypeId, nameof(ContentTypeId));
         }
 
         /// <summary>
@@ -251,7 +241,7 @@ internal void SetCultureInfo(string culture, string name, DateTime date)
         /// </summary>
         private void CultureInfosCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.CultureInfosSelector);
+            OnPropertyChanged(nameof(CultureInfos));
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Models/ContentCultureInfos.cs b/src/Umbraco.Core/Models/ContentCultureInfos.cs
index f51e3a275a9e..a0a4a7c472dd 100644
--- a/src/Umbraco.Core/Models/ContentCultureInfos.cs
+++ b/src/Umbraco.Core/Models/ContentCultureInfos.cs
@@ -13,8 +13,7 @@ public class ContentCultureInfos : BeingDirtyBase, IDeepCloneable, IEquatable<Co
     {
         private DateTime _date;
         private string _name;
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ContentCultureInfos"/> class.
         /// </summary>
@@ -46,7 +45,7 @@ internal ContentCultureInfos(ContentCultureInfos other)
         public string Name
         {
             get => _name;
-            set => SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <summary>
@@ -55,7 +54,7 @@ public string Name
         public DateTime Date
         {
             get => _date;
-            set => SetPropertyValueAndDetectChanges(value, ref _date, Ps.Value.DateSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _date, nameof(Date));
         }
 
         /// <inheritdoc />
@@ -102,12 +101,6 @@ public void Deconstruct(out string culture, out string name, out DateTime date)
             Deconstruct(out culture, out name);
             date = Date;
         }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<ContentCultureInfos, string>(x => x.Name);
-            public readonly PropertyInfo DateSelector = ExpressionHelper.GetPropertyInfo<ContentCultureInfos, DateTime>(x => x.Date);
-        }
+        
     }
 }
diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs
index 4b9831682ca4..97534835d156 100644
--- a/src/Umbraco.Core/Models/ContentType.cs
+++ b/src/Umbraco.Core/Models/ContentType.cs
@@ -13,7 +13,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class ContentType : ContentTypeCompositionBase, IContentType
     {
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
         public const bool IsPublishingConst = true;
 
         private int _defaultTemplate;
@@ -45,17 +44,10 @@ public ContentType(IContentType parent, string alias)
         /// <inheritdoc />
         public override bool IsPublishing => IsPublishingConst;
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo DefaultTemplateSelector = ExpressionHelper.GetPropertyInfo<ContentType, int>(x => x.DefaultTemplateId);
-            public readonly PropertyInfo AllowedTemplatesSelector = ExpressionHelper.GetPropertyInfo<ContentType, IEnumerable<ITemplate>>(x => x.AllowedTemplates);
-
-            //Custom comparer for enumerable
-            public readonly DelegateEqualityComparer<IEnumerable<ITemplate>> TemplateComparer = new DelegateEqualityComparer<IEnumerable<ITemplate>>(
-                (templates, enumerable) => templates.UnsortedSequenceEqual(enumerable),
-                templates => templates.GetHashCode());
-        }
+        //Custom comparer for enumerable
+        private static readonly DelegateEqualityComparer<IEnumerable<ITemplate>> TemplateComparer = new DelegateEqualityComparer<IEnumerable<ITemplate>>(
+            (templates, enumerable) => templates.UnsortedSequenceEqual(enumerable),
+            templates => templates.GetHashCode());
 
         /// <summary>
         /// Gets or sets the alias of the default Template.
@@ -76,7 +68,7 @@ public ITemplate DefaultTemplate
         internal int DefaultTemplateId
         {
             get { return _defaultTemplate; }
-            set { SetPropertyValueAndDetectChanges(value, ref _defaultTemplate, Ps.Value.DefaultTemplateSelector); }
+            set { SetPropertyValueAndDetectChanges(value, ref _defaultTemplate, nameof(DefaultTemplateId)); }
         }
 
         /// <summary>
@@ -91,7 +83,7 @@ public IEnumerable<ITemplate> AllowedTemplates
             get => _allowedTemplates;
             set
             {
-                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector, Ps.Value.TemplateComparer);
+                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, nameof(AllowedTemplates), TemplateComparer);
 
                 if (_allowedTemplates.Any(x => x.Id == _defaultTemplate) == false)
                     DefaultTemplateId = 0;
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 3da2838d0e4e..3f45f424daea 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -18,7 +18,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}, Alias: {Alias}")]
     public abstract class ContentTypeBase : TreeEntityBase, IContentTypeBase
     {
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
 
         private string _alias;
         private string _description;
@@ -83,37 +82,20 @@ protected ContentTypeBase(IContentTypeBase parent, string alias)
         /// </remarks>
         public abstract bool IsPublishing { get; }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Alias);
-            public readonly PropertyInfo DescriptionSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Description);
-            public readonly PropertyInfo IconSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Icon);
-            public readonly PropertyInfo ThumbnailSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Thumbnail);
-            public readonly PropertyInfo AllowedAsRootSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.AllowedAsRoot);
-            public readonly PropertyInfo IsElementSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.IsElement);
-            public readonly PropertyInfo IsContainerSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.IsContainer);
-            public readonly PropertyInfo AllowedContentTypesSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, IEnumerable<ContentTypeSort>>(x => x.AllowedContentTypes);
-            public readonly PropertyInfo PropertyGroupsSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, PropertyGroupCollection>(x => x.PropertyGroups);
-            public readonly PropertyInfo PropertyTypesSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, IEnumerable<PropertyType>>(x => x.PropertyTypes);
-            public readonly PropertyInfo HasPropertyTypeBeenRemovedSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.HasPropertyTypeBeenRemoved);
-            public readonly PropertyInfo VaryBy = ExpressionHelper.GetPropertyInfo<ContentTypeBase, ContentVariation>(x => x.Variations);
-
-            //Custom comparer for enumerable
-            public readonly DelegateEqualityComparer<IEnumerable<ContentTypeSort>> ContentTypeSortComparer =
-                new DelegateEqualityComparer<IEnumerable<ContentTypeSort>>(
-                    (sorts, enumerable) => sorts.UnsortedSequenceEqual(enumerable),
-                    sorts => sorts.GetHashCode());
-        }
+        //Custom comparer for enumerable
+        private static readonly DelegateEqualityComparer<IEnumerable<ContentTypeSort>> ContentTypeSortComparer =
+            new DelegateEqualityComparer<IEnumerable<ContentTypeSort>>(
+                (sorts, enumerable) => sorts.UnsortedSequenceEqual(enumerable),
+                sorts => sorts.GetHashCode());
 
         protected void PropertyGroupsChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.PropertyGroupsSelector);
+            OnPropertyChanged(nameof(PropertyGroups));
         }
 
         protected void PropertyTypesChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.PropertyTypesSelector);
+            OnPropertyChanged(nameof(PropertyTypes));
         }
 
         /// <summary>
@@ -126,7 +108,7 @@ public virtual string Alias
             set => SetPropertyValueAndDetectChanges(
                 value.ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase),
                 ref _alias,
-                Ps.Value.AliasSelector);
+                nameof(Alias));
         }
 
         /// <summary>
@@ -136,7 +118,7 @@ public virtual string Alias
         public string Description
         {
             get => _description;
-            set => SetPropertyValueAndDetectChanges(value, ref _description, Ps.Value.DescriptionSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _description, nameof(Description));
         }
 
         /// <summary>
@@ -146,7 +128,7 @@ public string Description
         public string Icon
         {
             get => _icon;
-            set => SetPropertyValueAndDetectChanges(value, ref _icon, Ps.Value.IconSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _icon, nameof(Icon));
         }
 
         /// <summary>
@@ -156,7 +138,7 @@ public string Icon
         public string Thumbnail
         {
             get => _thumbnail;
-            set => SetPropertyValueAndDetectChanges(value, ref _thumbnail, Ps.Value.ThumbnailSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _thumbnail, nameof(Thumbnail));
         }
 
         /// <summary>
@@ -166,7 +148,7 @@ public string Thumbnail
         public bool AllowedAsRoot
         {
             get => _allowedAsRoot;
-            set => SetPropertyValueAndDetectChanges(value, ref _allowedAsRoot, Ps.Value.AllowedAsRootSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _allowedAsRoot, nameof(AllowedAsRoot));
         }
 
         /// <summary>
@@ -179,7 +161,7 @@ public bool AllowedAsRoot
         public bool IsContainer
         {
             get => _isContainer;
-            set => SetPropertyValueAndDetectChanges(value, ref _isContainer, Ps.Value.IsContainerSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _isContainer, nameof(IsContainer));
         }
 
         /// <inheritdoc />
@@ -187,7 +169,7 @@ public bool IsContainer
         public bool IsElement
         {
             get => _isElement;
-            set => SetPropertyValueAndDetectChanges(value, ref _isElement, Ps.Value.IsElementSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _isElement, nameof(IsElement));
         }
 
         /// <summary>
@@ -197,8 +179,8 @@ public bool IsElement
         public IEnumerable<ContentTypeSort> AllowedContentTypes
         {
             get => _allowedContentTypes;
-            set => SetPropertyValueAndDetectChanges(value, ref _allowedContentTypes, Ps.Value.AllowedContentTypesSelector,
-                Ps.Value.ContentTypeSortComparer);
+            set => SetPropertyValueAndDetectChanges(value, ref _allowedContentTypes, nameof(AllowedContentTypes),
+                ContentTypeSortComparer);
         }
 
         /// <summary>
@@ -207,7 +189,7 @@ public IEnumerable<ContentTypeSort> AllowedContentTypes
         public virtual ContentVariation Variations
         {
             get => _variations;
-            set => SetPropertyValueAndDetectChanges(value, ref _variations, Ps.Value.VaryBy);
+            set => SetPropertyValueAndDetectChanges(value, ref _variations, nameof(Variations));
         }
 
         /// <inheritdoc />
@@ -295,7 +277,7 @@ internal bool HasPropertyTypeBeenRemoved
             private set
             {
                 _hasPropertyTypeBeenRemoved = value;
-                OnPropertyChanged(Ps.Value.HasPropertyTypeBeenRemovedSelector);
+                OnPropertyChanged(nameof(HasPropertyTypeBeenRemoved));
             }
         }
 
@@ -388,7 +370,7 @@ public void RemovePropertyType(string propertyTypeAlias)
                     if (!HasPropertyTypeBeenRemoved)
                     {
                         HasPropertyTypeBeenRemoved = true;
-                        OnPropertyChanged(Ps.Value.PropertyTypesSelector);
+                        OnPropertyChanged(nameof(PropertyTypes));
                     }
                     break;
                 }
@@ -400,7 +382,7 @@ public void RemovePropertyType(string propertyTypeAlias)
                 if (!HasPropertyTypeBeenRemoved)
                 {
                     HasPropertyTypeBeenRemoved = true;
-                    OnPropertyChanged(Ps.Value.PropertyTypesSelector);
+                    OnPropertyChanged(nameof(PropertyTypes));
                 }
             }
         }
@@ -424,7 +406,7 @@ public void RemovePropertyGroup(string propertyGroupName)
 
             // actually remove the group
             PropertyGroups.RemoveItem(propertyGroupName);
-            OnPropertyChanged(Ps.Value.PropertyGroupsSelector);
+            OnPropertyChanged(nameof(PropertyGroups));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
index 08b9f7480205..7a8e91845af3 100644
--- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
@@ -14,8 +14,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public abstract class ContentTypeCompositionBase : ContentTypeBase, IContentTypeComposition
     {
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
         private List<IContentTypeComposition> _contentTypeComposition = new List<IContentTypeComposition>();
         internal List<int> RemovedContentTypeKeyTracker = new List<int>();
 
@@ -32,13 +30,6 @@ protected ContentTypeCompositionBase(IContentTypeComposition parent, string alia
             AddContentType(parent);
         }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo ContentTypeCompositionSelector =
-                ExpressionHelper.GetPropertyInfo<ContentTypeCompositionBase, IEnumerable<IContentTypeComposition>>(x => x.ContentTypeComposition);
-        }
-
         /// <summary>
         /// Gets or sets the content types that compose this content type.
         /// </summary>
@@ -49,7 +40,7 @@ public IEnumerable<IContentTypeComposition> ContentTypeComposition
             set
             {
                 _contentTypeComposition = value.ToList();
-                OnPropertyChanged(Ps.Value.ContentTypeCompositionSelector);
+                OnPropertyChanged(nameof(ContentTypeComposition));
             }
         }
 
@@ -161,7 +152,7 @@ public bool AddContentType(IContentTypeComposition contentType)
                     throw new InvalidCompositionException(Alias, contentType.Alias, conflictingPropertyTypeAliases.ToArray());
 
                 _contentTypeComposition.Add(contentType);
-                OnPropertyChanged(Ps.Value.ContentTypeCompositionSelector);
+                OnPropertyChanged(nameof(ContentTypeComposition));
                 return true;
             }
             return false;
@@ -187,7 +178,7 @@ public bool RemoveContentType(string alias)
                 if (compositionIdsToRemove.Any())
                     RemovedContentTypeKeyTracker.AddRange(compositionIdsToRemove);
 
-                OnPropertyChanged(Ps.Value.ContentTypeCompositionSelector);
+                OnPropertyChanged(nameof(ContentTypeComposition));
                 return _contentTypeComposition.Remove(contentTypeComposition);
             }
             return false;
diff --git a/src/Umbraco.Core/Models/DataType.cs b/src/Umbraco.Core/Models/DataType.cs
index 4f0d0d6c31be..423895b47540 100644
--- a/src/Umbraco.Core/Models/DataType.cs
+++ b/src/Umbraco.Core/Models/DataType.cs
@@ -15,8 +15,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class DataType : TreeEntityBase, IDataType
     {
-        private static PropertySelectors _selectors;
-
         private IDataEditor _editor;
         private ValueStorageType _databaseType;
         private object _configuration;
@@ -35,15 +33,6 @@ public DataType(IDataEditor editor, int parentId = -1)
             Configuration = _editor.GetConfigurationEditor().DefaultConfigurationObject;
         }
 
-        private static PropertySelectors Selectors => _selectors ?? (_selectors = new PropertySelectors());
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo Editor = ExpressionHelper.GetPropertyInfo<DataType, IDataEditor>(x => x.Editor);
-            public readonly PropertyInfo DatabaseType = ExpressionHelper.GetPropertyInfo<DataType, ValueStorageType>(x => x.DatabaseType);
-            public readonly PropertyInfo Configuration = ExpressionHelper.GetPropertyInfo<DataType, object>(x => x.Configuration);
-        }
-
         /// <inheritdoc />
         [IgnoreDataMember]
         public IDataEditor Editor
@@ -53,7 +42,7 @@ public IDataEditor Editor
             {
                 // ignore if no change
                 if (_editor.Alias == value.Alias) return;
-                OnPropertyChanged(Selectors.Editor);
+                OnPropertyChanged(nameof(Editor));
 
                 // try to map the existing configuration to the new configuration
                 // simulate saving to db and reloading (ie go via json)
@@ -73,7 +62,7 @@ public IDataEditor Editor
         public ValueStorageType DatabaseType
         {
             get => _databaseType;
-            set => SetPropertyValueAndDetectChanges(value, ref _databaseType, Selectors.DatabaseType);
+            set => SetPropertyValueAndDetectChanges(value, ref _databaseType, nameof(DatabaseType));
         }
 
         /// <inheritdoc />
@@ -124,7 +113,7 @@ public object Configuration
                 _configurationJson = null;
 
                 // it's always a change
-                OnPropertyChanged(Selectors.Configuration);
+                OnPropertyChanged(nameof(Configuration));
             }
         }
 
diff --git a/src/Umbraco.Core/Models/DictionaryItem.cs b/src/Umbraco.Core/Models/DictionaryItem.cs
index 919f1b0a1f72..00c4e1a96cb5 100644
--- a/src/Umbraco.Core/Models/DictionaryItem.cs
+++ b/src/Umbraco.Core/Models/DictionaryItem.cs
@@ -30,20 +30,11 @@ public DictionaryItem(Guid? parentId, string itemKey)
             _translations = new List<IDictionaryTranslation>();
         }
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<DictionaryItem, Guid?>(x => x.ParentId);
-            public readonly PropertyInfo ItemKeySelector = ExpressionHelper.GetPropertyInfo<DictionaryItem, string>(x => x.ItemKey);
-            public readonly PropertyInfo TranslationsSelector = ExpressionHelper.GetPropertyInfo<DictionaryItem, IEnumerable<IDictionaryTranslation>>(x => x.Translations);
-
-            //Custom comparer for enumerable
-            public readonly DelegateEqualityComparer<IEnumerable<IDictionaryTranslation>> DictionaryTranslationComparer =
-                new DelegateEqualityComparer<IEnumerable<IDictionaryTranslation>>(
-                    (enumerable, translations) => enumerable.UnsortedSequenceEqual(translations),
-                    enumerable => enumerable.GetHashCode());
-        }
+        //Custom comparer for enumerable
+        private static readonly DelegateEqualityComparer<IEnumerable<IDictionaryTranslation>> DictionaryTranslationComparer =
+            new DelegateEqualityComparer<IEnumerable<IDictionaryTranslation>>(
+                (enumerable, translations) => enumerable.UnsortedSequenceEqual(translations),
+                enumerable => enumerable.GetHashCode());
 
         /// <summary>
         /// Gets or Sets the Parent Id of the Dictionary Item
@@ -52,7 +43,7 @@ private class PropertySelectors
         public Guid? ParentId
         {
             get { return _parentId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _parentId, Ps.Value.ParentIdSelector); }
+            set { SetPropertyValueAndDetectChanges(value, ref _parentId, nameof(ParentId)); }
         }
 
         /// <summary>
@@ -62,7 +53,7 @@ public Guid? ParentId
         public string ItemKey
         {
             get { return _itemKey; }
-            set { SetPropertyValueAndDetectChanges(value, ref _itemKey, Ps.Value.ItemKeySelector); }
+            set { SetPropertyValueAndDetectChanges(value, ref _itemKey, nameof(ItemKey)); }
         }
 
         /// <summary>
@@ -84,8 +75,8 @@ public IEnumerable<IDictionaryTranslation> Translations
                     }
                 }
 
-                SetPropertyValueAndDetectChanges(asArray, ref _translations, Ps.Value.TranslationsSelector,
-                    Ps.Value.DictionaryTranslationComparer);
+                SetPropertyValueAndDetectChanges(asArray, ref _translations, nameof(Translations),
+                    DictionaryTranslationComparer);
             }
         }
     }
diff --git a/src/Umbraco.Core/Models/DictionaryTranslation.cs b/src/Umbraco.Core/Models/DictionaryTranslation.cs
index c3b5a8a3b212..51c7ff2800ab 100644
--- a/src/Umbraco.Core/Models/DictionaryTranslation.cs
+++ b/src/Umbraco.Core/Models/DictionaryTranslation.cs
@@ -50,13 +50,6 @@ internal DictionaryTranslation(int languageId, string value, Guid uniqueId)
             Key = uniqueId;
         }
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo LanguageSelector = ExpressionHelper.GetPropertyInfo<DictionaryTranslation, ILanguage>(x => x.Language);
-            public readonly PropertyInfo ValueSelector = ExpressionHelper.GetPropertyInfo<DictionaryTranslation, string>(x => x.Value);
-        }
 
         /// <summary>
         /// Gets or sets the <see cref="Language"/> for the translation
@@ -84,7 +77,7 @@ public ILanguage Language
             }
             set
             {
-                SetPropertyValueAndDetectChanges(value, ref _language, Ps.Value.LanguageSelector);
+                SetPropertyValueAndDetectChanges(value, ref _language, nameof(Language));
                 _languageId = _language == null ? -1 : _language.Id;
             }
         }
@@ -101,7 +94,7 @@ public int LanguageId
         public string Value
         {
             get { return _value; }
-            set { SetPropertyValueAndDetectChanges(value, ref _value, Ps.Value.ValueSelector); }
+            set { SetPropertyValueAndDetectChanges(value, ref _value, nameof(Value)); }
         }
 
         protected override void PerformDeepClone(object clone)
diff --git a/src/Umbraco.Core/Models/Entities/BeingDirty.cs b/src/Umbraco.Core/Models/Entities/BeingDirty.cs
index ec447a62dc4e..4e6d0cf5e3ca 100644
--- a/src/Umbraco.Core/Models/Entities/BeingDirty.cs
+++ b/src/Umbraco.Core/Models/Entities/BeingDirty.cs
@@ -19,19 +19,19 @@ public sealed class BeingDirty : BeingDirtyBase
         /// <typeparam name="T">The type of the value.</typeparam>
         /// <param name="value">The new value.</param>
         /// <param name="valueRef">A reference to the value to set.</param>
-        /// <param name="propertySelector">The property selector.</param>
+        /// <param name="propertyName">The property selector.</param>
         /// <param name="comparer">A comparer to compare property values.</param>
-        public new void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, PropertyInfo propertySelector, IEqualityComparer<T> comparer = null)
+        public new void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, string propertyName, IEqualityComparer<T> comparer = null)
         {
-            base.SetPropertyValueAndDetectChanges(value, ref valueRef, propertySelector, comparer);
+            base.SetPropertyValueAndDetectChanges(value, ref valueRef, propertyName, comparer);
         }
 
         /// <summary>
         /// Registers that a property has changed.
         /// </summary>
-        public new void OnPropertyChanged(PropertyInfo propertySelector)
+        public new void OnPropertyChanged(string propertyName)
         {
-            base.OnPropertyChanged(propertySelector);
+            base.OnPropertyChanged(propertyName);
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
index 711b7c9b9fe8..d9db4332174c 100644
--- a/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
+++ b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
@@ -108,7 +108,7 @@ public virtual IEnumerable<string> GetWereDirtyProperties()
         /// <summary>
         /// Registers that a property has changed.
         /// </summary>
-        protected virtual void OnPropertyChanged(PropertyInfo propertyInfo)
+        protected virtual void OnPropertyChanged(string propertyName)
         {
             if (_withChanges == false)
                 return;
@@ -116,9 +116,9 @@ protected virtual void OnPropertyChanged(PropertyInfo propertyInfo)
             if (_currentChanges == null)
                 _currentChanges = new Dictionary<string, bool>();
 
-            _currentChanges[propertyInfo.Name] = true;
+            _currentChanges[propertyName] = true;
 
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyInfo.Name));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         /// <summary>
@@ -143,9 +143,9 @@ public void EnableChangeTracking()
         /// <typeparam name="T">The type of the value.</typeparam>
         /// <param name="value">The new value.</param>
         /// <param name="valueRef">A reference to the value to set.</param>
-        /// <param name="propertySelector">The property selector.</param>
+        /// <param name="propertyName">The property selector.</param>
         /// <param name="comparer">A comparer to compare property values.</param>
-        protected void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, PropertyInfo propertySelector, IEqualityComparer<T> comparer = null)
+        protected void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, string propertyName, IEqualityComparer<T> comparer = null)
         {
             if (comparer == null)
             {
@@ -165,7 +165,7 @@ protected void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, Prop
 
             // handle change
             if (changed)
-                OnPropertyChanged(propertySelector);
+                OnPropertyChanged(propertyName);
         }
 
         /// <summary>
@@ -174,17 +174,17 @@ protected void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, Prop
         /// <typeparam name="T">The type of the value.</typeparam>
         /// <param name="value">The new value.</param>
         /// <param name="orig">The original value.</param>
-        /// <param name="propertySelector">The property selector.</param>
+        /// <param name="propertyName">The property name.</param>
         /// <param name="comparer">A comparer to compare property values.</param>
         /// <param name="changed">A value indicating whether we know values have changed and no comparison is required.</param>
-        protected void DetectChanges<T>(T value, T orig, PropertyInfo propertySelector, IEqualityComparer<T> comparer, bool changed)
+        protected void DetectChanges<T>(T value, T orig, string propertyName, IEqualityComparer<T> comparer, bool changed)
         {
             // compare values
             changed = _withChanges && (changed || !comparer.Equals(orig, value));
 
             // handle change
             if (changed)
-                OnPropertyChanged(propertySelector);
+                OnPropertyChanged(propertyName);
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Models/Entities/EntityBase.cs b/src/Umbraco.Core/Models/Entities/EntityBase.cs
index 6c9bf3d7114b..ef90f5e28db7 100644
--- a/src/Umbraco.Core/Models/Entities/EntityBase.cs
+++ b/src/Umbraco.Core/Models/Entities/EntityBase.cs
@@ -17,23 +17,12 @@ public abstract class EntityBase : BeingDirtyBase, IEntity
         public Guid InstanceId = Guid.NewGuid();
 #endif
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
         private bool _hasIdentity;
         private int _id;
         private Guid _key;
         private DateTime _createDate;
         private DateTime _updateDate;
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo IdSelector = ExpressionHelper.GetPropertyInfo<EntityBase, int>(x => x.Id);
-            public readonly PropertyInfo KeySelector = ExpressionHelper.GetPropertyInfo<EntityBase, Guid>(x => x.Key);
-            public readonly PropertyInfo CreateDateSelector = ExpressionHelper.GetPropertyInfo<EntityBase, DateTime>(x => x.CreateDate);
-            public readonly PropertyInfo UpdateDateSelector = ExpressionHelper.GetPropertyInfo<EntityBase, DateTime>(x => x.UpdateDate);
-        }
-
         /// <inheritdoc />
         [DataMember]
         public int Id
@@ -41,7 +30,7 @@ public int Id
             get => _id;
             set
             {
-                SetPropertyValueAndDetectChanges(value, ref _id, Ps.Value.IdSelector);
+                SetPropertyValueAndDetectChanges(value, ref _id, nameof(Id));
                 _hasIdentity = value != 0;
             }
         }
@@ -57,7 +46,7 @@ public Guid Key
                     _key = Guid.NewGuid();
                 return _key;
             }
-            set => SetPropertyValueAndDetectChanges(value, ref _key, Ps.Value.KeySelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _key, nameof(Key));
         }
 
         /// <inheritdoc />
@@ -65,7 +54,7 @@ public Guid Key
         public DateTime CreateDate
         {
             get => _createDate;
-            set => SetPropertyValueAndDetectChanges(value, ref _createDate, Ps.Value.CreateDateSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _createDate, nameof(CreateDate));
         }
 
         /// <inheritdoc />
@@ -73,7 +62,7 @@ public DateTime CreateDate
         public DateTime UpdateDate
         {
             get => _updateDate;
-            set => SetPropertyValueAndDetectChanges(value, ref _updateDate, Ps.Value.UpdateDateSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _updateDate, nameof(UpdateDate));
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
index 60e06c497798..b8243ed0a95c 100644
--- a/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
+++ b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
@@ -9,9 +9,6 @@ namespace Umbraco.Core.Models.Entities
     /// </summary>
     public abstract class TreeEntityBase : EntityBase, ITreeEntity
     {
-        private static PropertySelectors _selectors;
-        private static PropertySelectors Selectors => _selectors ?? (_selectors = new PropertySelectors());
-
         private string _name;
         private int _creatorId;
         private int _parentId;
@@ -22,23 +19,12 @@ public abstract class TreeEntityBase : EntityBase, ITreeEntity
         private int _sortOrder;
         private bool _trashed;
 
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo Name = ExpressionHelper.GetPropertyInfo<ContentBase, string>(x => x.Name);
-            public readonly PropertyInfo CreatorId = ExpressionHelper.GetPropertyInfo<ContentBase, int>(x => x.CreatorId);
-            public readonly PropertyInfo ParentId = ExpressionHelper.GetPropertyInfo<ContentBase, int>(x => x.ParentId);
-            public readonly PropertyInfo Level = ExpressionHelper.GetPropertyInfo<ContentBase, int>(x => x.Level);
-            public readonly PropertyInfo Path = ExpressionHelper.GetPropertyInfo<ContentBase, string>(x => x.Path);
-            public readonly PropertyInfo SortOrder = ExpressionHelper.GetPropertyInfo<ContentBase, int>(x => x.SortOrder);
-            public readonly PropertyInfo Trashed = ExpressionHelper.GetPropertyInfo<ContentBase, bool>(x => x.Trashed);
-        }
-
         /// <inheritdoc />
         [DataMember]
         public string Name
         {
             get => _name;
-            set => SetPropertyValueAndDetectChanges(value, ref _name, Selectors.Name);
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <inheritdoc />
@@ -46,7 +32,7 @@ public string Name
         public int CreatorId
         {
             get => _creatorId;
-            set => SetPropertyValueAndDetectChanges(value, ref _creatorId, Selectors.CreatorId);
+            set => SetPropertyValueAndDetectChanges(value, ref _creatorId, nameof(CreatorId));
         }
 
         /// <inheritdoc />
@@ -72,7 +58,7 @@ public int ParentId
             {
                 if (value == 0)
                     throw new ArgumentException("Value cannot be zero.", nameof(value));
-                SetPropertyValueAndDetectChanges(value, ref _parentId, Selectors.ParentId);
+                SetPropertyValueAndDetectChanges(value, ref _parentId, nameof(ParentId));
                 _hasParentId = true;
                 _parent = null;
             }
@@ -83,7 +69,7 @@ public void SetParent(ITreeEntity parent)
         {
             _hasParentId = false;
             _parent = parent;
-            OnPropertyChanged(Selectors.ParentId);
+            OnPropertyChanged(nameof(ParentId));
         }
 
         /// <inheritdoc />
@@ -91,7 +77,7 @@ public void SetParent(ITreeEntity parent)
         public int Level
         {
             get => _level;
-            set => SetPropertyValueAndDetectChanges(value, ref _level, Selectors.Level);
+            set => SetPropertyValueAndDetectChanges(value, ref _level, nameof(Level));
         }
 
         /// <inheritdoc />
@@ -99,7 +85,7 @@ public int Level
         public string Path
         {
             get => _path;
-            set => SetPropertyValueAndDetectChanges(value, ref _path, Selectors.Path);
+            set => SetPropertyValueAndDetectChanges(value, ref _path, nameof(Path));
         }
 
         /// <inheritdoc />
@@ -107,7 +93,7 @@ public string Path
         public int SortOrder
         {
             get => _sortOrder;
-            set => SetPropertyValueAndDetectChanges(value, ref _sortOrder, Selectors.SortOrder);
+            set => SetPropertyValueAndDetectChanges(value, ref _sortOrder, nameof(SortOrder));
         }
 
         /// <inheritdoc />
@@ -115,7 +101,7 @@ public int SortOrder
         public bool Trashed
         {
             get => _trashed;
-            set => SetPropertyValueAndDetectChanges(value, ref _trashed, Selectors.Trashed);
+            set => SetPropertyValueAndDetectChanges(value, ref _trashed, nameof(Trashed));
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/File.cs b/src/Umbraco.Core/Models/File.cs
index 2f8e021f4c8b..494dcbe6fc54 100644
--- a/src/Umbraco.Core/Models/File.cs
+++ b/src/Umbraco.Core/Models/File.cs
@@ -33,14 +33,6 @@ protected File(string path, Func<File, string> getFileContent = null)
             _content = getFileContent != null ? null : string.Empty;
         }
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo ContentSelector = ExpressionHelper.GetPropertyInfo<File, string>(x => x.Content);
-            public readonly PropertyInfo PathSelector = ExpressionHelper.GetPropertyInfo<File, string>(x => x.Path);
-        }
-
         private string _alias;
         private string _name;
 
@@ -96,7 +88,7 @@ public virtual string Path
                 _alias = null;
                 _name = null;
 
-                SetPropertyValueAndDetectChanges(SanitizePath(value), ref _path, Ps.Value.PathSelector);
+                SetPropertyValueAndDetectChanges(SanitizePath(value), ref _path, nameof(Path));
             }
         }
 
@@ -138,7 +130,7 @@ public virtual string Content
             {
                 SetPropertyValueAndDetectChanges(
                     value ?? string.Empty, // cannot set to null
-                    ref _content, Ps.Value.ContentSelector);
+                    ref _content, nameof(Content));
             }
         }
 
diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
index f5c21a3a7464..084db81f11e9 100644
--- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
@@ -16,7 +16,6 @@ namespace Umbraco.Core.Models.Identity
 {
     public class BackOfficeIdentityUser : IdentityUser<int, IIdentityUserLogin, IdentityUserRole<string>, IdentityUserClaim<int>>, IRememberBeingDirty
     {
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
 
         private string _email;
         private string _userName;
@@ -118,7 +117,7 @@ public override int Id
         public override string Email
         {
             get => _email;
-            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _email, Ps.Value.EmailSelector);
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _email, nameof(Email));
         }
 
         /// <summary>
@@ -127,7 +126,7 @@ public override string Email
         public override string UserName
         {
             get => _userName;
-            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _userName, Ps.Value.UserNameSelector);
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _userName, nameof(UserName));
         }
 
         /// <summary>
@@ -136,7 +135,7 @@ public override string UserName
         public override DateTime? LastPasswordChangeDateUtc
         {
             get { return _lastPasswordChangeDateUtc; }
-            set { _beingDirty.SetPropertyValueAndDetectChanges(value, ref _lastPasswordChangeDateUtc, Ps.Value.LastPasswordChangeDateUtcSelector); }
+            set { _beingDirty.SetPropertyValueAndDetectChanges(value, ref _lastPasswordChangeDateUtc, nameof(LastPasswordChangeDateUtc)); }
         }
 
         /// <summary>
@@ -145,7 +144,7 @@ public override DateTime? LastPasswordChangeDateUtc
         public override DateTime? LastLoginDateUtc
         {
             get => _lastLoginDateUtc;
-            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _lastLoginDateUtc, Ps.Value.LastLoginDateUtcSelector);
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _lastLoginDateUtc, nameof(LastLoginDateUtc));
         }
 
         /// <summary>
@@ -154,7 +153,7 @@ public override DateTime? LastLoginDateUtc
         public override bool EmailConfirmed
         {
             get => _emailConfirmed;
-            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _emailConfirmed, Ps.Value.EmailConfirmedSelector);
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _emailConfirmed, nameof(EmailConfirmed));
         }
 
         /// <summary>
@@ -163,7 +162,7 @@ public override bool EmailConfirmed
         public string Name
         {
             get => _name;
-            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector);
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <summary>
@@ -172,7 +171,7 @@ public string Name
         public override int AccessFailedCount
         {
             get => _accessFailedCount;
-            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _accessFailedCount, Ps.Value.AccessFailedCountSelector);
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _accessFailedCount, nameof(AccessFailedCount));
         }
 
         /// <summary>
@@ -181,7 +180,7 @@ public override int AccessFailedCount
         public override string PasswordHash
         {
             get => _passwordHash;
-            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _passwordHash, Ps.Value.PasswordHashSelector);
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _passwordHash, nameof(PasswordHash));
         }
 
 
@@ -194,7 +193,7 @@ public int[] StartContentIds
             set
             {
                 if (value == null) value = new int[0];
-                _beingDirty.SetPropertyValueAndDetectChanges(value, ref _startContentIds, Ps.Value.StartContentIdsSelector, Ps.Value.StartIdsComparer);
+                _beingDirty.SetPropertyValueAndDetectChanges(value, ref _startContentIds, nameof(StartContentIds), StartIdsComparer);
             }
         }
 
@@ -207,7 +206,7 @@ public int[] StartMediaIds
             set
             {
                 if (value == null) value = new int[0];
-                _beingDirty.SetPropertyValueAndDetectChanges(value, ref _startMediaIds, Ps.Value.StartMediaIdsSelector, Ps.Value.StartIdsComparer);
+                _beingDirty.SetPropertyValueAndDetectChanges(value, ref _startMediaIds, nameof(StartMediaIds), StartIdsComparer);
             }
         }
 
@@ -222,7 +221,7 @@ public string[] AllowedSections
         public string Culture
         {
             get => _culture;
-            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _culture, Ps.Value.CultureSelector);
+            set => _beingDirty.SetPropertyValueAndDetectChanges(value, ref _culture, nameof(Culture));
         }
 
         public IReadOnlyUserGroup[] Groups
@@ -246,7 +245,7 @@ public IReadOnlyUserGroup[] Groups
                 }
                 _roles.CollectionChanged += _roles_CollectionChanged;
 
-                _beingDirty.SetPropertyValueAndDetectChanges(value, ref _groups, Ps.Value.GroupsSelector, Ps.Value.GroupsComparer);
+                _beingDirty.SetPropertyValueAndDetectChanges(value, ref _groups, nameof(Groups), GroupsComparer);
             }
         }
 
@@ -302,12 +301,12 @@ public override ICollection<IIdentityUserLogin> Logins
 
         void Logins_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            _beingDirty.OnPropertyChanged(Ps.Value.LoginsSelector);
+            _beingDirty.OnPropertyChanged(nameof(Logins));
         }
 
         private void _roles_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            _beingDirty.OnPropertyChanged(Ps.Value.RolesSelector);
+            _beingDirty.OnPropertyChanged(nameof(Roles));
         }
 
         private readonly ObservableCollection<IdentityUserRole<string>> _roles;
@@ -416,33 +415,13 @@ public void EnableChangeTracking()
 
         #endregion
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.Email);
-            public readonly PropertyInfo UserNameSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.UserName);
-            public readonly PropertyInfo LastLoginDateUtcSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, DateTime?>(x => x.LastLoginDateUtc);
-            public readonly PropertyInfo LastPasswordChangeDateUtcSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, DateTime?>(x => x.LastPasswordChangeDateUtc);
-            public readonly PropertyInfo EmailConfirmedSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, bool>(x => x.EmailConfirmed);
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.Name);
-            public readonly PropertyInfo AccessFailedCountSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, int>(x => x.AccessFailedCount);
-            public readonly PropertyInfo PasswordHashSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.PasswordHash);
-            public readonly PropertyInfo CultureSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.Culture);
-            public readonly PropertyInfo StartMediaIdsSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, int[]>(x => x.StartMediaIds);
-            public readonly PropertyInfo StartContentIdsSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, int[]>(x => x.StartContentIds);
-            public readonly PropertyInfo GroupsSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, IReadOnlyUserGroup[]>(x => x.Groups);
-            public readonly PropertyInfo LoginsSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, IEnumerable<IIdentityUserLogin>>(x => x.Logins);
-            public readonly PropertyInfo RolesSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, IEnumerable<IdentityUserRole<string>>>(x => x.Roles);
-
-            //Custom comparer for enumerables
-            public readonly DelegateEqualityComparer<IReadOnlyUserGroup[]> GroupsComparer = new DelegateEqualityComparer<IReadOnlyUserGroup[]>(
-                (groups, enumerable) => groups.Select(x => x.Alias).UnsortedSequenceEqual(enumerable.Select(x => x.Alias)),
-                groups => groups.GetHashCode());
-            public readonly DelegateEqualityComparer<int[]> StartIdsComparer = new DelegateEqualityComparer<int[]>(
-                (groups, enumerable) => groups.UnsortedSequenceEqual(enumerable),
-                groups => groups.GetHashCode());
-
-        }
+        //Custom comparer for enumerables
+        private static readonly DelegateEqualityComparer<IReadOnlyUserGroup[]> GroupsComparer = new DelegateEqualityComparer<IReadOnlyUserGroup[]>(
+            (groups, enumerable) => groups.Select(x => x.Alias).UnsortedSequenceEqual(enumerable.Select(x => x.Alias)),
+            groups => groups.GetHashCode());
+        private static readonly DelegateEqualityComparer<int[]> StartIdsComparer = new DelegateEqualityComparer<int[]>(
+            (groups, enumerable) => groups.UnsortedSequenceEqual(enumerable),
+            groups => groups.GetHashCode());
 
     }
 }
diff --git a/src/Umbraco.Core/Models/Language.cs b/src/Umbraco.Core/Models/Language.cs
index b02eb4805c1c..3e4d189abb9b 100644
--- a/src/Umbraco.Core/Models/Language.cs
+++ b/src/Umbraco.Core/Models/Language.cs
@@ -16,7 +16,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Language : EntityBase, ILanguage
     {
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
 
         private string _isoCode;
         private string _cultureName;
@@ -28,23 +27,13 @@ public Language(string isoCode)
         {
             IsoCode = isoCode;
         }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo IsoCodeSelector = ExpressionHelper.GetPropertyInfo<Language, string>(x => x.IsoCode);
-            public readonly PropertyInfo CultureNameSelector = ExpressionHelper.GetPropertyInfo<Language, string>(x => x.CultureName);
-            public readonly PropertyInfo IsDefaultVariantLanguageSelector = ExpressionHelper.GetPropertyInfo<Language, bool>(x => x.IsDefault);
-            public readonly PropertyInfo MandatorySelector = ExpressionHelper.GetPropertyInfo<Language, bool>(x => x.IsMandatory);
-            public readonly PropertyInfo FallbackLanguageSelector = ExpressionHelper.GetPropertyInfo<Language, int?>(x => x.FallbackLanguageId);
-        }
-
+        
         /// <inheritdoc />
         [DataMember]
         public string IsoCode
         {
             get => _isoCode;
-            set => SetPropertyValueAndDetectChanges(value, ref _isoCode, Ps.Value.IsoCodeSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _isoCode, nameof(IsoCode));
         }
 
         /// <inheritdoc />
@@ -102,7 +91,7 @@ public string CultureName
                 }
             }
 
-            set => SetPropertyValueAndDetectChanges(value, ref _cultureName, Ps.Value.CultureNameSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _cultureName, nameof(CultureName));
         }
 
         /// <inheritdoc />
@@ -113,21 +102,21 @@ public string CultureName
         public bool IsDefault
         {
             get => _isDefaultVariantLanguage;
-            set => SetPropertyValueAndDetectChanges(value, ref _isDefaultVariantLanguage, Ps.Value.IsDefaultVariantLanguageSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _isDefaultVariantLanguage, nameof(IsDefault));
         }
 
         /// <inheritdoc />
         public bool IsMandatory
         {
             get => _mandatory;
-            set => SetPropertyValueAndDetectChanges(value, ref _mandatory, Ps.Value.MandatorySelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _mandatory, nameof(IsMandatory));
         }
 
         /// <inheritdoc />
         public int? FallbackLanguageId
         {
             get => _fallbackLanguageId;
-            set => SetPropertyValueAndDetectChanges(value, ref _fallbackLanguageId, Ps.Value.FallbackLanguageSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _fallbackLanguageId, nameof(FallbackLanguageId));
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index 5ef49305acad..2f29ddecffb6 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -117,7 +117,7 @@ private class PropertySelectors
 
         void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.PropertiesSelector);
+            OnPropertyChanged(nameof(Properties));
 
             if (e.Action == NotifyCollectionChangedAction.Add)
             {
@@ -155,7 +155,7 @@ void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs e)
         /// <param name="e"></param>
         void PropertyDataChanged(object sender, PropertyChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.PropertiesSelector);
+            OnPropertyChanged(nameof(Properties));
         }
 
         public override void ResetDirtyProperties(bool rememberDirty)
@@ -172,18 +172,12 @@ public override void ResetDirtyProperties(bool rememberDirty)
         /// <summary>
         /// Used internally to check if we need to add a section in the repository to the db
         /// </summary>
-        internal IEnumerable<string> AddedProperties
-        {
-            get { return _addedProperties; }
-        }
+        internal IEnumerable<string> AddedProperties => _addedProperties;
 
         /// <summary>
         /// Used internally to check if we need to remove  a section in the repository to the db
         /// </summary>
-        internal IEnumerable<string> RemovedProperties
-        {
-            get { return _removedProperties; }
-        }
+        internal IEnumerable<string> RemovedProperties => _removedProperties;
 
         /// <summary>
         /// Gets or sets the alias of the Macro
@@ -191,8 +185,8 @@ internal IEnumerable<string> RemovedProperties
         [DataMember]
         public string Alias
         {
-            get { return _alias; }
-            set { SetPropertyValueAndDetectChanges(value.ToCleanString(CleanStringType.Alias), ref _alias, Ps.Value.AliasSelector); }
+            get => _alias;
+            set => SetPropertyValueAndDetectChanges(value.ToCleanString(CleanStringType.Alias), ref _alias, nameof(Alias));
         }
 
         /// <summary>
@@ -201,8 +195,8 @@ public string Alias
         [DataMember]
         public string Name
         {
-            get { return _name; }
-            set { SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector); }
+            get => _name;
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <summary>
@@ -211,8 +205,8 @@ public string Name
         [DataMember]
         public bool UseInEditor
         {
-            get { return _useInEditor; }
-            set { SetPropertyValueAndDetectChanges(value, ref _useInEditor, Ps.Value.UseInEditorSelector); }
+            get => _useInEditor;
+            set => SetPropertyValueAndDetectChanges(value, ref _useInEditor, nameof(UseInEditor));
         }
 
         /// <summary>
@@ -221,8 +215,8 @@ public bool UseInEditor
         [DataMember]
         public int CacheDuration
         {
-            get { return _cacheDuration; }
-            set { SetPropertyValueAndDetectChanges(value, ref _cacheDuration, Ps.Value.CacheDurationSelector); }
+            get => _cacheDuration;
+            set => SetPropertyValueAndDetectChanges(value, ref _cacheDuration, nameof(CacheDuration));
         }
 
         /// <summary>
@@ -231,8 +225,8 @@ public int CacheDuration
         [DataMember]
         public bool CacheByPage
         {
-            get { return _cacheByPage; }
-            set { SetPropertyValueAndDetectChanges(value, ref _cacheByPage, Ps.Value.CacheByPageSelector); }
+            get => _cacheByPage;
+            set => SetPropertyValueAndDetectChanges(value, ref _cacheByPage, nameof(CacheByPage));
         }
 
         /// <summary>
@@ -241,8 +235,8 @@ public bool CacheByPage
         [DataMember]
         public bool CacheByMember
         {
-            get { return _cacheByMember; }
-            set { SetPropertyValueAndDetectChanges(value, ref _cacheByMember, Ps.Value.CacheByMemberSelector); }
+            get => _cacheByMember;
+            set => SetPropertyValueAndDetectChanges(value, ref _cacheByMember, nameof(CacheByMember));
         }
 
         /// <summary>
@@ -251,8 +245,8 @@ public bool CacheByMember
         [DataMember]
         public bool DontRender
         {
-            get { return _dontRender; }
-            set { SetPropertyValueAndDetectChanges(value, ref _dontRender, Ps.Value.DontRenderSelector); }
+            get => _dontRender;
+            set => SetPropertyValueAndDetectChanges(value, ref _dontRender, nameof(DontRender));
         }
 
         /// <summary>
@@ -261,8 +255,8 @@ public bool DontRender
         [DataMember]
         public string MacroSource
         {
-            get { return _macroSource; }
-            set { SetPropertyValueAndDetectChanges(value, ref _macroSource, Ps.Value.ScriptPathSelector); }
+            get => _macroSource;
+            set => SetPropertyValueAndDetectChanges(value, ref _macroSource, nameof(MacroSource));
         }
 
         /// <summary>
@@ -271,18 +265,15 @@ public string MacroSource
         [DataMember]
         public MacroTypes MacroType
         {
-            get { return _macroType; }
-            set { SetPropertyValueAndDetectChanges(value, ref _macroType, Ps.Value.MacroTypeSelector); }
+            get => _macroType;
+            set => SetPropertyValueAndDetectChanges(value, ref _macroType, nameof(MacroType));
         }
 
         /// <summary>
         /// Gets or sets a list of Macro Properties
         /// </summary>
         [DataMember]
-        public MacroPropertyCollection Properties
-        {
-            get { return _properties; }
-        }
+        public MacroPropertyCollection Properties => _properties;
 
         protected override void PerformDeepClone(object clone)
         {
diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
index 380705b3d58f..7e269ba635ec 100644
--- a/src/Umbraco.Core/Models/MacroProperty.cs
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -59,27 +59,15 @@ internal MacroProperty(int id, Guid key, string @alias, string name, int sortOrd
         private int _sortOrder;
         private int _id;
         private string _editorAlias;
-
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo KeySelector = ExpressionHelper.GetPropertyInfo<MacroProperty, Guid>(x => x.Key);
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.Alias);
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.Name);
-            public readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, int>(x => x.SortOrder);
-            public readonly PropertyInfo IdSelector = ExpressionHelper.GetPropertyInfo<EntityBase, int>(x => x.Id);
-            public readonly PropertyInfo PropertyTypeSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.EditorAlias);
-        }
-
+        
         /// <summary>
         /// Gets or sets the Key of the Property
         /// </summary>
         [DataMember]
         public Guid Key
         {
-            get { return _key; }
-            set { SetPropertyValueAndDetectChanges(value, ref _key, Ps.Value.KeySelector); }
+            get => _key;
+            set => SetPropertyValueAndDetectChanges(value, ref _key, nameof(Key));
         }
 
         /// <summary>
@@ -88,8 +76,8 @@ public Guid Key
         [DataMember]
         public int Id
         {
-            get { return _id; }
-            set { SetPropertyValueAndDetectChanges(value, ref _id, Ps.Value.IdSelector); }
+            get => _id;
+            set => SetPropertyValueAndDetectChanges(value, ref _id, nameof(Id));
         }
 
         /// <summary>
@@ -98,8 +86,8 @@ public int Id
         [DataMember]
         public string Alias
         {
-            get { return _alias; }
-            set { SetPropertyValueAndDetectChanges(value, ref _alias, Ps.Value.AliasSelector); }
+            get => _alias;
+            set => SetPropertyValueAndDetectChanges(value, ref _alias, nameof(Alias));
         }
 
         /// <summary>
@@ -108,8 +96,8 @@ public string Alias
         [DataMember]
         public string Name
         {
-            get { return _name; }
-            set { SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector); }
+            get => _name;
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <summary>
@@ -118,8 +106,8 @@ public string Name
         [DataMember]
         public int SortOrder
         {
-            get { return _sortOrder; }
-            set { SetPropertyValueAndDetectChanges(value, ref _sortOrder, Ps.Value.SortOrderSelector); }
+            get => _sortOrder;
+            set => SetPropertyValueAndDetectChanges(value, ref _sortOrder, nameof(SortOrder));
         }
 
         /// <summary>
@@ -132,11 +120,8 @@ public int SortOrder
         [DataMember]
         public string EditorAlias
         {
-            get { return _editorAlias; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(value, ref _editorAlias, Ps.Value.PropertyTypeSelector);
-            }
+            get => _editorAlias;
+            set => SetPropertyValueAndDetectChanges(value, ref _editorAlias, nameof(EditorAlias));
         }
 
         public object DeepClone()
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index 0ef15ee4132d..06f94b85aa0d 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -130,25 +130,15 @@ public Member(string name, string email, string username, string rawPasswordValu
             _rawPasswordValue = rawPasswordValue;
             IsApproved = isApproved;
         }
-
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo UsernameSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Username);
-            public readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Email);
-            public readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.RawPasswordValue);
-            public readonly PropertyInfo ProviderUserKeySelector = ExpressionHelper.GetPropertyInfo<Member, object>(x => x.ProviderUserKey);
-        }
-
+        
         /// <summary>
         /// Gets or sets the Username
         /// </summary>
         [DataMember]
         public string Username
         {
-            get { return _username; }
-            set { SetPropertyValueAndDetectChanges(value, ref _username, Ps.Value.UsernameSelector); }
+            get => _username;
+            set => SetPropertyValueAndDetectChanges(value, ref _username, nameof(Username));
         }
 
         /// <summary>
@@ -157,8 +147,8 @@ public string Username
         [DataMember]
         public string Email
         {
-            get { return _email; }
-            set { SetPropertyValueAndDetectChanges(value, ref _email, Ps.Value.EmailSelector); }
+            get => _email;
+            set => SetPropertyValueAndDetectChanges(value, ref _email, nameof(Email));
         }
 
         /// <summary>
@@ -167,7 +157,7 @@ public string Email
         [IgnoreDataMember]
         public string RawPasswordValue
         {
-            get { return _rawPasswordValue; }
+            get => _rawPasswordValue;
             set
             {
                 if (value == null)
@@ -178,7 +168,7 @@ public string RawPasswordValue
                 }
                 else
                 {
-                    SetPropertyValueAndDetectChanges(value, ref _rawPasswordValue, Ps.Value.PasswordSelector);
+                    SetPropertyValueAndDetectChanges(value, ref _rawPasswordValue, nameof(RawPasswordValue));
                 }
             }
         }
@@ -487,10 +477,7 @@ public int FailedPasswordAttempts
         /// String alias of the default ContentType
         /// </summary>
         [DataMember]
-        public virtual string ContentTypeAlias
-        {
-            get { return _contentTypeAlias; }
-        }
+        public virtual string ContentTypeAlias => _contentTypeAlias;
 
         /// <summary>
         /// User key from the Provider.
@@ -504,11 +491,8 @@ public virtual string ContentTypeAlias
         [DataMember]
         public virtual object ProviderUserKey
         {
-            get
-            {
-                return _providerUserKey;
-            }
-            set { SetPropertyValueAndDetectChanges(value, ref _providerUserKey, Ps.Value.ProviderUserKeySelector); }
+            get => _providerUserKey;
+            set => SetPropertyValueAndDetectChanges(value, ref _providerUserKey, nameof(ProviderUserKey));
         }
 
 
@@ -528,10 +512,7 @@ internal override void AddingEntity()
         /// Gets the ContentType used by this content object
         /// </summary>
         [IgnoreDataMember]
-        public IMemberType ContentType
-        {
-            get { return _contentType; }
-        }
+        public IMemberType ContentType => _contentType;
 
         /* Internal experiment - only used for mapping queries.
          * Adding these to have first level properties instead of the Properties collection.
diff --git a/src/Umbraco.Core/Models/MemberGroup.cs b/src/Umbraco.Core/Models/MemberGroup.cs
index 0653f75ef7b3..69e26c103766 100644
--- a/src/Umbraco.Core/Models/MemberGroup.cs
+++ b/src/Umbraco.Core/Models/MemberGroup.cs
@@ -13,18 +13,10 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class MemberGroup : EntityBase, IMemberGroup
     {
-        private static PropertySelectors _selectors;
         private IDictionary<string, object> _additionalData;
         private string _name;
         private int _creatorId;
 
-        private static PropertySelectors Selectors => _selectors ?? (_selectors = new PropertySelectors());
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo Name = ExpressionHelper.GetPropertyInfo<MemberGroup, string>(x => x.Name);
-            public readonly PropertyInfo CreatorId = ExpressionHelper.GetPropertyInfo<MemberGroup, int>(x => x.CreatorId);
-        }
 
         /// <inheritdoc />
         [DataMember]
@@ -49,7 +41,7 @@ public string Name
                     AdditionalData["previousName"] = _name;
                 }
 
-                SetPropertyValueAndDetectChanges(value, ref _name, Selectors.Name);
+                SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
             }
         }
 
@@ -57,7 +49,7 @@ public string Name
         public int CreatorId
         {
             get => _creatorId;
-            set => SetPropertyValueAndDetectChanges(value, ref _creatorId, Selectors.CreatorId);
+            set => SetPropertyValueAndDetectChanges(value, ref _creatorId, nameof(CreatorId));
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index 1ce883d9a72f..141cb3b63ccb 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -12,7 +12,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class MemberType : ContentTypeCompositionBase, IMemberType
     {
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
         public const bool IsPublishingConst = false;
 
         //Dictionary is divided into string: PropertyTypeAlias, Tuple: MemberCanEdit, VisibleOnProfile, PropertyTypeId
@@ -46,12 +45,6 @@ public override ContentVariation Variations
             set => throw new NotSupportedException("Variations are not supported on members.");
         }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<MemberType, string>(x => x.Alias);
-        }
-
         /// <summary>
         /// The Alias of the ContentType
         /// </summary>
@@ -74,7 +67,7 @@ public override string Alias
                         ? value
                         : (value == null ? string.Empty : value.ToSafeAlias());
 
-                SetPropertyValueAndDetectChanges(newVal, ref _alias, Ps.Value.AliasSelector);
+                SetPropertyValueAndDetectChanges(newVal, ref _alias, nameof(Alias));
             }
         }
 
diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs
index 7832390b92b5..2fb293c349ed 100644
--- a/src/Umbraco.Core/Models/Membership/User.cs
+++ b/src/Umbraco.Core/Models/Membership/User.cs
@@ -1,14 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models.Membership
@@ -123,123 +117,92 @@ public User(int id, string name, string email, string username, string rawPasswo
         private IDictionary<string, object> _additionalData;
         private object _additionalDataLock = new object();
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo FailedPasswordAttemptsSelector = ExpressionHelper.GetPropertyInfo<User, int>(x => x.FailedPasswordAttempts);
-            public readonly PropertyInfo LastLockoutDateSelector = ExpressionHelper.GetPropertyInfo<User, DateTime>(x => x.LastLockoutDate);
-            public readonly PropertyInfo LastLoginDateSelector = ExpressionHelper.GetPropertyInfo<User, DateTime>(x => x.LastLoginDate);
-            public readonly PropertyInfo LastPasswordChangeDateSelector = ExpressionHelper.GetPropertyInfo<User, DateTime>(x => x.LastPasswordChangeDate);
-
-            public readonly PropertyInfo SecurityStampSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.SecurityStamp);
-            public readonly PropertyInfo AvatarSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Avatar);
-            public readonly PropertyInfo TourDataSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.TourData);
-            public readonly PropertyInfo SessionTimeoutSelector = ExpressionHelper.GetPropertyInfo<User, int>(x => x.SessionTimeout);
-            public readonly PropertyInfo StartContentIdSelector = ExpressionHelper.GetPropertyInfo<User, int[]>(x => x.StartContentIds);
-            public readonly PropertyInfo StartMediaIdSelector = ExpressionHelper.GetPropertyInfo<User, int[]>(x => x.StartMediaIds);
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Name);
-
-            public readonly PropertyInfo UsernameSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Username);
-            public readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Email);
-            public readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.RawPasswordValue);
-            public readonly PropertyInfo IsLockedOutSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.IsLockedOut);
-            public readonly PropertyInfo IsApprovedSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.IsApproved);
-            public readonly PropertyInfo LanguageSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Language);
-            public readonly PropertyInfo EmailConfirmedDateSelector = ExpressionHelper.GetPropertyInfo<User, DateTime?>(x => x.EmailConfirmedDate);
-            public readonly PropertyInfo InvitedDateSelector = ExpressionHelper.GetPropertyInfo<User, DateTime?>(x => x.InvitedDate);
-
-            public readonly PropertyInfo DefaultToLiveEditingSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.DefaultToLiveEditing);
-
-            public readonly PropertyInfo UserGroupsSelector = ExpressionHelper.GetPropertyInfo<User, IEnumerable<IReadOnlyUserGroup>>(x => x.Groups);
-
-            //Custom comparer for enumerable
-            public readonly DelegateEqualityComparer<IEnumerable<int>> IntegerEnumerableComparer =
-                new DelegateEqualityComparer<IEnumerable<int>>(
-                    (enum1, enum2) => enum1.UnsortedSequenceEqual(enum2),
-                    enum1 => enum1.GetHashCode());
-        }
+        //Custom comparer for enumerable
+        private static readonly DelegateEqualityComparer<IEnumerable<int>> IntegerEnumerableComparer =
+            new DelegateEqualityComparer<IEnumerable<int>>(
+                (enum1, enum2) => enum1.UnsortedSequenceEqual(enum2),
+                enum1 => enum1.GetHashCode());
 
         #region Implementation of IMembershipUser
 
         [IgnoreDataMember]
         public object ProviderUserKey
         {
-            get { return Id; }
-            set { throw new NotSupportedException("Cannot set the provider user key for a user"); }
+            get => Id;
+            set => throw new NotSupportedException("Cannot set the provider user key for a user");
         }
 
         [DataMember]
         public DateTime? EmailConfirmedDate
         {
-            get { return _emailConfirmedDate; }
-            set { SetPropertyValueAndDetectChanges(value, ref _emailConfirmedDate, Ps.Value.EmailConfirmedDateSelector); }
+            get => _emailConfirmedDate;
+            set => SetPropertyValueAndDetectChanges(value, ref _emailConfirmedDate, nameof(EmailConfirmedDate));
         }
         [DataMember]
         public DateTime? InvitedDate
         {
-            get { return _invitedDate; }
-            set { SetPropertyValueAndDetectChanges(value, ref _invitedDate, Ps.Value.InvitedDateSelector); }
+            get => _invitedDate;
+            set => SetPropertyValueAndDetectChanges(value, ref _invitedDate, nameof(InvitedDate));
         }
         [DataMember]
         public string Username
         {
-            get { return _username; }
-            set { SetPropertyValueAndDetectChanges(value, ref _username, Ps.Value.UsernameSelector); }
+            get => _username;
+            set => SetPropertyValueAndDetectChanges(value, ref _username, nameof(Username));
         }
         [DataMember]
         public string Email
         {
-            get { return _email; }
-            set { SetPropertyValueAndDetectChanges(value, ref _email, Ps.Value.EmailSelector); }
+            get => _email;
+            set => SetPropertyValueAndDetectChanges(value, ref _email, nameof(Email));
         }
         [DataMember]
         public string RawPasswordValue
         {
-            get { return _rawPasswordValue; }
-            set { SetPropertyValueAndDetectChanges(value, ref _rawPasswordValue, Ps.Value.PasswordSelector); }
+            get => _rawPasswordValue;
+            set => SetPropertyValueAndDetectChanges(value, ref _rawPasswordValue, nameof(RawPasswordValue));
         }
 
         [DataMember]
         public bool IsApproved
         {
-            get { return _isApproved; }
-            set { SetPropertyValueAndDetectChanges(value, ref _isApproved, Ps.Value.IsApprovedSelector); }
+            get => _isApproved;
+            set => SetPropertyValueAndDetectChanges(value, ref _isApproved, nameof(IsApproved));
         }
 
         [IgnoreDataMember]
         public bool IsLockedOut
         {
-            get { return _isLockedOut; }
-            set { SetPropertyValueAndDetectChanges(value, ref _isLockedOut, Ps.Value.IsLockedOutSelector); }
+            get => _isLockedOut;
+            set => SetPropertyValueAndDetectChanges(value, ref _isLockedOut, nameof(IsLockedOut));
         }
 
         [IgnoreDataMember]
         public DateTime LastLoginDate
         {
-            get { return _lastLoginDate; }
-            set { SetPropertyValueAndDetectChanges(value, ref _lastLoginDate, Ps.Value.LastLoginDateSelector); }
+            get => _lastLoginDate;
+            set => SetPropertyValueAndDetectChanges(value, ref _lastLoginDate, nameof(LastLoginDate));
         }
 
         [IgnoreDataMember]
         public DateTime LastPasswordChangeDate
         {
-            get { return _lastPasswordChangedDate; }
-            set { SetPropertyValueAndDetectChanges(value, ref _lastPasswordChangedDate, Ps.Value.LastPasswordChangeDateSelector); }
+            get => _lastPasswordChangedDate;
+            set => SetPropertyValueAndDetectChanges(value, ref _lastPasswordChangedDate, nameof(LastPasswordChangeDate));
         }
 
         [IgnoreDataMember]
         public DateTime LastLockoutDate
         {
-            get { return _lastLockoutDate; }
-            set { SetPropertyValueAndDetectChanges(value, ref _lastLockoutDate, Ps.Value.LastLockoutDateSelector); }
+            get => _lastLockoutDate;
+            set => SetPropertyValueAndDetectChanges(value, ref _lastLockoutDate, nameof(LastLockoutDate));
         }
 
         [IgnoreDataMember]
         public int FailedPasswordAttempts
         {
-            get { return _failedLoginAttempts; }
-            set { SetPropertyValueAndDetectChanges(value, ref _failedLoginAttempts, Ps.Value.FailedPasswordAttemptsSelector); }
+            get => _failedLoginAttempts;
+            set => SetPropertyValueAndDetectChanges(value, ref _failedLoginAttempts, nameof(FailedPasswordAttempts));
         }
 
         // TODO: Figure out how to support all of this! - we cannot have NotImplementedExceptions because these get used by the IMembershipMemberService<IUser> service so
@@ -279,8 +242,8 @@ public UserState UserState
         [DataMember]
         public string Name
         {
-            get { return _name; }
-            set { SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector); }
+            get => _name;
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         public IEnumerable<string> AllowedSections
@@ -295,10 +258,7 @@ public IEnumerable<string> AllowedSections
         [IgnoreDataMember]
         internal List<IUserGroup> GroupsToSave = new List<IUserGroup>();
 
-        public IProfile ProfileData
-        {
-            get { return new WrappedUserProfile(this); }
-        }
+        public IProfile ProfileData => new WrappedUserProfile(this);
 
         /// <summary>
         /// The security stamp used by ASP.Net identity
@@ -306,15 +266,15 @@ public IProfile ProfileData
         [IgnoreDataMember]
         public string SecurityStamp
         {
-            get { return _securityStamp; }
-            set { SetPropertyValueAndDetectChanges(value, ref _securityStamp, Ps.Value.SecurityStampSelector); }
+            get => _securityStamp;
+            set => SetPropertyValueAndDetectChanges(value, ref _securityStamp, nameof(SecurityStamp));
         }
 
         [DataMember]
         public string Avatar
         {
-            get { return _avatar; }
-            set { SetPropertyValueAndDetectChanges(value, ref _avatar, Ps.Value.AvatarSelector); }
+            get => _avatar;
+            set => SetPropertyValueAndDetectChanges(value, ref _avatar, nameof(Avatar));
         }
 
         /// <summary>
@@ -323,8 +283,8 @@ public string Avatar
         [DataMember]
         public string TourData
         {
-            get { return _tourData; }
-            set { SetPropertyValueAndDetectChanges(value, ref _tourData, Ps.Value.TourDataSelector); }
+            get => _tourData;
+            set => SetPropertyValueAndDetectChanges(value, ref _tourData, nameof(TourData));
         }
 
         /// <summary>
@@ -336,8 +296,8 @@ public string TourData
         [DataMember]
         public int SessionTimeout
         {
-            get { return _sessionTimeout; }
-            set { SetPropertyValueAndDetectChanges(value, ref _sessionTimeout, Ps.Value.SessionTimeoutSelector); }
+            get => _sessionTimeout;
+            set => SetPropertyValueAndDetectChanges(value, ref _sessionTimeout, nameof(SessionTimeout));
         }
 
         /// <summary>
@@ -350,8 +310,8 @@ public int SessionTimeout
         [DoNotClone]
         public int[] StartContentIds
         {
-            get { return _startContentIds; }
-            set { SetPropertyValueAndDetectChanges(value, ref _startContentIds, Ps.Value.StartContentIdSelector, Ps.Value.IntegerEnumerableComparer); }
+            get => _startContentIds;
+            set => SetPropertyValueAndDetectChanges(value, ref _startContentIds, nameof(StartContentIds), IntegerEnumerableComparer);
         }
 
         /// <summary>
@@ -364,32 +324,29 @@ public int[] StartContentIds
         [DoNotClone]
         public int[] StartMediaIds
         {
-            get { return _startMediaIds; }
-            set { SetPropertyValueAndDetectChanges(value, ref _startMediaIds, Ps.Value.StartMediaIdSelector, Ps.Value.IntegerEnumerableComparer); }
+            get => _startMediaIds;
+            set => SetPropertyValueAndDetectChanges(value, ref _startMediaIds, nameof(StartMediaIds), IntegerEnumerableComparer);
         }
 
         [DataMember]
         public string Language
         {
-            get { return _language; }
-            set { SetPropertyValueAndDetectChanges(value, ref _language, Ps.Value.LanguageSelector); }
+            get => _language;
+            set => SetPropertyValueAndDetectChanges(value, ref _language, nameof(Language));
         }
 
         [IgnoreDataMember]
         internal bool DefaultToLiveEditing
         {
-            get { return _defaultToLiveEditing; }
-            set { SetPropertyValueAndDetectChanges(value, ref _defaultToLiveEditing, Ps.Value.DefaultToLiveEditingSelector); }
+            get => _defaultToLiveEditing;
+            set => SetPropertyValueAndDetectChanges(value, ref _defaultToLiveEditing, nameof(DefaultToLiveEditing));
         }
 
         /// <summary>
         /// Gets the groups that user is part of
         /// </summary>
         [DataMember]
-        public IEnumerable<IReadOnlyUserGroup> Groups
-        {
-            get { return _userGroups; }
-        }
+        public IEnumerable<IReadOnlyUserGroup> Groups => _userGroups;
 
         public void RemoveGroup(string group)
         {
@@ -400,7 +357,7 @@ public void RemoveGroup(string group)
                     _userGroups.Remove(userGroup);
                     //reset this flag so it's rebuilt with the assigned groups
                     _allowedSections = null;
-                    OnPropertyChanged(Ps.Value.UserGroupsSelector);
+                    OnPropertyChanged(nameof(Groups));
                 }
             }
         }
@@ -412,7 +369,7 @@ public void ClearGroups()
                 _userGroups.Clear();
                 //reset this flag so it's rebuilt with the assigned groups
                 _allowedSections = null;
-                OnPropertyChanged(Ps.Value.UserGroupsSelector);
+                OnPropertyChanged(nameof(Groups));
             }
         }
 
@@ -422,7 +379,7 @@ public void AddGroup(IReadOnlyUserGroup group)
             {
                 //reset this flag so it's rebuilt with the assigned groups
                 _allowedSections = null;
-                OnPropertyChanged(Ps.Value.UserGroupsSelector);
+                OnPropertyChanged(nameof(Groups));
             }
         }
 
@@ -446,7 +403,7 @@ internal IDictionary<string, object> AdditionalData
 
         [IgnoreDataMember]
         [DoNotClone]
-        internal object AdditionalDataLock { get { return _additionalDataLock; } }
+        internal object AdditionalDataLock => _additionalDataLock;
 
         protected override void PerformDeepClone(object clone)
         {
@@ -498,15 +455,9 @@ public WrappedUserProfile(IUser user)
                 _user = user;
             }
 
-            public int Id
-            {
-                get { return _user.Id; }
-            }
+            public int Id => _user.Id;
 
-            public string Name
-            {
-                get { return _user.Name; }
-            }
+            public string Name => _user.Name;
 
             private bool Equals(WrappedUserProfile other)
             {
diff --git a/src/Umbraco.Core/Models/Membership/UserGroup.cs b/src/Umbraco.Core/Models/Membership/UserGroup.cs
index e3e812f4c156..0562586af405 100644
--- a/src/Umbraco.Core/Models/Membership/UserGroup.cs
+++ b/src/Umbraco.Core/Models/Membership/UserGroup.cs
@@ -22,24 +22,11 @@ public class UserGroup : EntityBase, IUserGroup, IReadOnlyUserGroup
         private IEnumerable<string> _permissions;
         private readonly List<string> _sectionCollection;
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        // ReSharper disable once ClassNeverInstantiated.Local // lazy-instantiated in Ps
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<UserGroup, string>(x => x.Name);
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<UserGroup, string>(x => x.Alias);
-            public readonly PropertyInfo PermissionsSelector = ExpressionHelper.GetPropertyInfo<UserGroup, IEnumerable<string>>(x => x.Permissions);
-            public readonly PropertyInfo IconSelector = ExpressionHelper.GetPropertyInfo<UserGroup, string>(x => x.Icon);
-            public readonly PropertyInfo StartContentIdSelector = ExpressionHelper.GetPropertyInfo<UserGroup, int?>(x => x.StartContentId);
-            public readonly PropertyInfo StartMediaIdSelector = ExpressionHelper.GetPropertyInfo<UserGroup, int?>(x => x.StartMediaId);
-
-            //Custom comparer for enumerable
-            public readonly DelegateEqualityComparer<IEnumerable<string>> StringEnumerableComparer =
-                new DelegateEqualityComparer<IEnumerable<string>>(
-                    (enum1, enum2) => enum1.UnsortedSequenceEqual(enum2),
-                    enum1 => enum1.GetHashCode());
-        }
+        //Custom comparer for enumerable
+        private static readonly DelegateEqualityComparer<IEnumerable<string>> StringEnumerableComparer =
+            new DelegateEqualityComparer<IEnumerable<string>>(
+                (enum1, enum2) => enum1.UnsortedSequenceEqual(enum2),
+                enum1 => enum1.GetHashCode());
 
         /// <summary>
         /// Constructor to create a new user group
@@ -71,35 +58,35 @@ public UserGroup(int userCount, string alias, string name, IEnumerable<string> p
         public int? StartMediaId
         {
             get => _startMediaId;
-            set => SetPropertyValueAndDetectChanges(value, ref _startMediaId, Ps.Value.StartMediaIdSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _startMediaId, nameof(StartMediaId));
         }
 
         [DataMember]
         public int? StartContentId
         {
             get => _startContentId;
-            set => SetPropertyValueAndDetectChanges(value, ref _startContentId, Ps.Value.StartContentIdSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _startContentId, nameof(StartContentId));
         }
 
         [DataMember]
         public string Icon
         {
             get => _icon;
-            set => SetPropertyValueAndDetectChanges(value, ref _icon, Ps.Value.IconSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _icon, nameof(Icon));
         }
 
         [DataMember]
         public string Alias
         {
             get => _alias;
-            set => SetPropertyValueAndDetectChanges(value.ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase), ref _alias, Ps.Value.AliasSelector);
+            set => SetPropertyValueAndDetectChanges(value.ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase), ref _alias, nameof(Alias));
         }
 
         [DataMember]
         public string Name
         {
             get => _name;
-            set => SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <summary>
@@ -112,7 +99,7 @@ public string Name
         public IEnumerable<string> Permissions
         {
             get => _permissions;
-            set => SetPropertyValueAndDetectChanges(value, ref _permissions, Ps.Value.PermissionsSelector, Ps.Value.StringEnumerableComparer);
+            set => SetPropertyValueAndDetectChanges(value, ref _permissions, nameof(Permissions), StringEnumerableComparer);
         }
 
         public IEnumerable<string> AllowedSections => _sectionCollection;
diff --git a/src/Umbraco.Core/Models/MigrationEntry.cs b/src/Umbraco.Core/Models/MigrationEntry.cs
index 9ac9ae58a41c..1149f6c773de 100644
--- a/src/Umbraco.Core/Models/MigrationEntry.cs
+++ b/src/Umbraco.Core/Models/MigrationEntry.cs
@@ -19,27 +19,19 @@ public MigrationEntry(int id, DateTime createDate, string migrationName, SemVers
             _version = version;
         }
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<MigrationEntry, string>(x => x.MigrationName);
-            public readonly PropertyInfo VersionSelector = ExpressionHelper.GetPropertyInfo<MigrationEntry, SemVersion>(x => x.Version);
-        }
-
         private string _migrationName;
         private SemVersion _version;
 
         public string MigrationName
         {
-            get { return _migrationName; }
-            set { SetPropertyValueAndDetectChanges(value, ref _migrationName, Ps.Value.NameSelector); }
+            get => _migrationName;
+            set => SetPropertyValueAndDetectChanges(value, ref _migrationName, nameof(MigrationName));
         }
 
         public SemVersion Version
         {
-            get { return _version; }
-            set { SetPropertyValueAndDetectChanges(value, ref _version, Ps.Value.VersionSelector); }
+            get => _version;
+            set => SetPropertyValueAndDetectChanges(value, ref _version, nameof(Version));
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index 11b5239a7069..f7f45d7f5cd2 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -103,9 +103,6 @@ public PropertyValue Clone()
         // ReSharper disable once ClassNeverInstantiated.Local
         private class PropertySelectors
         {
-            // TODO: This allows us to track changes for an entire Property, but doesn't allow us to track changes at the variant level
-            public readonly PropertyInfo ValuesSelector = ExpressionHelper.GetPropertyInfo<Property, object>(x => x.Values);
-
             public readonly DelegateEqualityComparer<object> PropertyValueComparer = new DelegateEqualityComparer<object>(
                 (o, o1) =>
                 {
@@ -258,7 +255,7 @@ private void PublishValue(PropertyValue pvalue)
                 throw new NotSupportedException("Property type does not support publishing.");
             var origValue = pvalue.PublishedValue;
             pvalue.PublishedValue = PropertyType.ConvertAssignedValue(pvalue.EditedValue);
-            DetectChanges(pvalue.EditedValue, origValue, Ps.Value.ValuesSelector, Ps.Value.PropertyValueComparer, false);
+            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, false);
         }
 
         private void UnpublishValue(PropertyValue pvalue)
@@ -269,7 +266,7 @@ private void UnpublishValue(PropertyValue pvalue)
                 throw new NotSupportedException("Property type does not support publishing.");
             var origValue = pvalue.PublishedValue;
             pvalue.PublishedValue = PropertyType.ConvertAssignedValue(null);
-            DetectChanges(pvalue.EditedValue, origValue, Ps.Value.ValuesSelector, Ps.Value.PropertyValueComparer, false);
+            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, false);
         }
 
         /// <summary>
@@ -290,7 +287,7 @@ public void SetValue(object value, string culture = null, string segment = null)
 
             pvalue.EditedValue = setValue;
 
-            DetectChanges(setValue, origValue, Ps.Value.ValuesSelector, Ps.Value.PropertyValueComparer, change);
+            DetectChanges(setValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, change);
         }
 
         // bypasses all changes detection and is the *only* way to set the published value
diff --git a/src/Umbraco.Core/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs
index 595e8d1d6a37..00bc12f5846d 100644
--- a/src/Umbraco.Core/Models/PropertyGroup.cs
+++ b/src/Umbraco.Core/Models/PropertyGroup.cs
@@ -15,7 +15,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}")]
     public class PropertyGroup : EntityBase, IEquatable<PropertyGroup>
     {
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
 
         private string _name;
         private int _sortOrder;
@@ -30,17 +29,9 @@ public PropertyGroup(PropertyTypeCollection propertyTypeCollection)
             PropertyTypes = propertyTypeCollection;
         }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<PropertyGroup, string>(x => x.Name);
-            public readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<PropertyGroup, int>(x => x.SortOrder);
-            public readonly PropertyInfo PropertyTypes = ExpressionHelper.GetPropertyInfo<PropertyGroup, PropertyTypeCollection>(x => x.PropertyTypes);
-        }
-
         private void PropertyTypesChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.PropertyTypes);
+            OnPropertyChanged(nameof(PropertyTypes));
         }
 
         /// <summary>
@@ -50,7 +41,7 @@ private void PropertyTypesChanged(object sender, NotifyCollectionChangedEventArg
         public string Name
         {
             get => _name;
-            set => SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <summary>
@@ -60,7 +51,7 @@ public string Name
         public int SortOrder
         {
             get => _sortOrder;
-            set => SetPropertyValueAndDetectChanges(value, ref _sortOrder, Ps.Value.SortOrderSelector);
+            set => SetPropertyValueAndDetectChanges(value, ref _sortOrder, nameof(SortOrder));
         }
 
         /// <summary>
@@ -85,7 +76,7 @@ public PropertyTypeCollection PropertyTypes
                 foreach (var propertyType in _propertyTypes)
                     propertyType.PropertyGroupId = new Lazy<int>(() => Id);
 
-                OnPropertyChanged(Ps.Value.PropertyTypes);
+                OnPropertyChanged(nameof(PropertyTypes));
                 _propertyTypes.CollectionChanged += PropertyTypesChanged;
             }
         }
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 107831ebddf3..486e22b278a5 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -20,8 +20,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}, Alias: {Alias}")]
     public class PropertyType : EntityBase, IEquatable<PropertyType>
     {
-        private static PropertySelectors _selectors;
-
         private readonly bool _forceValueStorageType;
         private string _name;
         private string _alias;
@@ -86,24 +84,7 @@ internal PropertyType(string propertyEditorAlias, ValueStorageType valueStorageT
             _alias = propertyTypeAlias == null ? null : SanitizeAlias(propertyTypeAlias);
             _variations = ContentVariation.Nothing;
         }
-
-        private static PropertySelectors Selectors => _selectors ?? (_selectors = new PropertySelectors());
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo Name = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.Name);
-            public readonly PropertyInfo Alias = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.Alias);
-            public readonly PropertyInfo Description = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.Description);
-            public readonly PropertyInfo DataTypeId = ExpressionHelper.GetPropertyInfo<PropertyType, int>(x => x.DataTypeId);
-            public readonly PropertyInfo PropertyEditorAlias = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.PropertyEditorAlias);
-            public readonly PropertyInfo ValueStorageType = ExpressionHelper.GetPropertyInfo<PropertyType, ValueStorageType>(x => x.ValueStorageType);
-            public readonly PropertyInfo Mandatory = ExpressionHelper.GetPropertyInfo<PropertyType, bool>(x => x.Mandatory);
-            public readonly PropertyInfo SortOrder = ExpressionHelper.GetPropertyInfo<PropertyType, int>(x => x.SortOrder);
-            public readonly PropertyInfo ValidationRegExp = ExpressionHelper.GetPropertyInfo<PropertyType, string>(x => x.ValidationRegExp);
-            public readonly PropertyInfo PropertyGroupId = ExpressionHelper.GetPropertyInfo<PropertyType, Lazy<int>>(x => x.PropertyGroupId);
-            public readonly PropertyInfo VaryBy = ExpressionHelper.GetPropertyInfo<PropertyType, ContentVariation>(x => x.Variations);
-        }
-
+        
         /// <summary>
         /// Gets a value indicating whether the content type, owning this property type, is publishing.
         /// </summary>
@@ -116,7 +97,7 @@ private class PropertySelectors
         public string Name
         {
             get => _name;
-            set => SetPropertyValueAndDetectChanges(value, ref _name, Selectors.Name);
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <summary>
@@ -126,7 +107,7 @@ public string Name
         public string Alias
         {
             get => _alias;
-            set => SetPropertyValueAndDetectChanges(SanitizeAlias(value), ref _alias, Selectors.Alias);
+            set => SetPropertyValueAndDetectChanges(SanitizeAlias(value), ref _alias, nameof(Alias));
         }
 
         /// <summary>
@@ -136,7 +117,7 @@ public string Alias
         public string Description
         {
             get => _description;
-            set => SetPropertyValueAndDetectChanges(value, ref _description, Selectors.Description);
+            set => SetPropertyValueAndDetectChanges(value, ref _description, nameof(Description));
         }
 
         /// <summary>
@@ -146,7 +127,7 @@ public string Description
         public int DataTypeId
         {
             get => _dataTypeId;
-            set => SetPropertyValueAndDetectChanges(value, ref _dataTypeId, Selectors.DataTypeId);
+            set => SetPropertyValueAndDetectChanges(value, ref _dataTypeId, nameof(DataTypeId));
         }
 
         /// <summary>
@@ -156,7 +137,7 @@ public int DataTypeId
         public string PropertyEditorAlias
         {
             get => _propertyEditorAlias;
-            set => SetPropertyValueAndDetectChanges(value, ref _propertyEditorAlias, Selectors.PropertyEditorAlias);
+            set => SetPropertyValueAndDetectChanges(value, ref _propertyEditorAlias, nameof(PropertyEditorAlias));
         }
 
         /// <summary>
@@ -169,7 +150,7 @@ internal ValueStorageType ValueStorageType
             set
             {
                 if (_forceValueStorageType) return; // ignore changes
-                SetPropertyValueAndDetectChanges(value, ref _valueStorageType, Selectors.ValueStorageType);
+                SetPropertyValueAndDetectChanges(value, ref _valueStorageType, nameof(ValueStorageType));
             }
         }
 
@@ -181,7 +162,7 @@ internal ValueStorageType ValueStorageType
         internal Lazy<int> PropertyGroupId
         {
             get => _propertyGroupId;
-            set => SetPropertyValueAndDetectChanges(value, ref _propertyGroupId, Selectors.PropertyGroupId);
+            set => SetPropertyValueAndDetectChanges(value, ref _propertyGroupId, nameof(PropertyGroupId));
         }
 
         /// <summary>
@@ -191,7 +172,7 @@ internal Lazy<int> PropertyGroupId
         public bool Mandatory
         {
             get => _mandatory;
-            set => SetPropertyValueAndDetectChanges(value, ref _mandatory, Selectors.Mandatory);
+            set => SetPropertyValueAndDetectChanges(value, ref _mandatory, nameof(Mandatory));
         }
 
         /// <summary>
@@ -201,7 +182,7 @@ public bool Mandatory
         public int SortOrder
         {
             get => _sortOrder;
-            set => SetPropertyValueAndDetectChanges(value, ref _sortOrder, Selectors.SortOrder);
+            set => SetPropertyValueAndDetectChanges(value, ref _sortOrder, nameof(SortOrder));
         }
 
         /// <summary>
@@ -211,7 +192,7 @@ public int SortOrder
         public string ValidationRegExp
         {
             get => _validationRegExp;
-            set => SetPropertyValueAndDetectChanges(value, ref _validationRegExp, Selectors.ValidationRegExp);
+            set => SetPropertyValueAndDetectChanges(value, ref _validationRegExp, nameof(ValidationRegExp));
         }
 
         /// <summary>
@@ -220,7 +201,7 @@ public string ValidationRegExp
         public ContentVariation Variations
         {
             get => _variations;
-            set => SetPropertyValueAndDetectChanges(value, ref _variations, Selectors.VaryBy);
+            set => SetPropertyValueAndDetectChanges(value, ref _variations, nameof(Variations));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/PublicAccessEntry.cs b/src/Umbraco.Core/Models/PublicAccessEntry.cs
index df2d9f9ddc07..58dd53a0c539 100644
--- a/src/Umbraco.Core/Models/PublicAccessEntry.cs
+++ b/src/Umbraco.Core/Models/PublicAccessEntry.cs
@@ -54,7 +54,7 @@ public PublicAccessEntry(Guid id, int protectedNodeId, int loginNodeId, int noAc
 
         void _ruleCollection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            OnPropertyChanged(Ps.Value.AllowedSectionsSelector);
+            OnPropertyChanged(nameof(Rules));
 
             //if (e.Action == NotifyCollectionChangedAction.Add)
             //{
@@ -77,26 +77,10 @@ void _ruleCollection_CollectionChanged(object sender, NotifyCollectionChangedEve
 
             }
         }
+        
+        internal IEnumerable<Guid> RemovedRules => _removedRules;
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo ProtectedNodeIdSelector = ExpressionHelper.GetPropertyInfo<PublicAccessEntry, int>(x => x.ProtectedNodeId);
-            public readonly PropertyInfo LoginNodeIdSelector = ExpressionHelper.GetPropertyInfo<PublicAccessEntry, int>(x => x.LoginNodeId);
-            public readonly PropertyInfo NoAccessNodeIdSelector = ExpressionHelper.GetPropertyInfo<PublicAccessEntry, int>(x => x.NoAccessNodeId);
-            public readonly PropertyInfo AllowedSectionsSelector = ExpressionHelper.GetPropertyInfo<PublicAccessEntry, IEnumerable<PublicAccessRule>>(x => x.Rules);
-        }
-
-        internal IEnumerable<Guid> RemovedRules
-        {
-            get { return _removedRules; }
-        }
-
-        public IEnumerable<PublicAccessRule> Rules
-        {
-            get { return _ruleCollection; }
-        }
+        public IEnumerable<PublicAccessRule> Rules => _ruleCollection;
 
         public PublicAccessRule AddRule(string ruleValue, string ruleType)
         {
@@ -129,22 +113,22 @@ internal void ClearRemovedRules()
         [DataMember]
         public int LoginNodeId
         {
-            get { return _loginNodeId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _loginNodeId, Ps.Value.LoginNodeIdSelector); }
+            get => _loginNodeId;
+            set => SetPropertyValueAndDetectChanges(value, ref _loginNodeId, nameof(LoginNodeId));
         }
 
         [DataMember]
         public int NoAccessNodeId
         {
-            get { return _noAccessNodeId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _noAccessNodeId, Ps.Value.NoAccessNodeIdSelector); }
+            get => _noAccessNodeId;
+            set => SetPropertyValueAndDetectChanges(value, ref _noAccessNodeId, nameof(NoAccessNodeId));
         }
 
         [DataMember]
         public int ProtectedNodeId
         {
-            get { return _protectedNodeId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _protectedNodeId, Ps.Value.ProtectedNodeIdSelector); }
+            get => _protectedNodeId;
+            set => SetPropertyValueAndDetectChanges(value, ref _protectedNodeId, nameof(ProtectedNodeId));
         }
 
         public override void ResetDirtyProperties(bool rememberDirty)
diff --git a/src/Umbraco.Core/Models/PublicAccessRule.cs b/src/Umbraco.Core/Models/PublicAccessRule.cs
index 67b9ece2f974..99d24221a27e 100644
--- a/src/Umbraco.Core/Models/PublicAccessRule.cs
+++ b/src/Umbraco.Core/Models/PublicAccessRule.cs
@@ -23,26 +23,19 @@ public PublicAccessRule()
         {
         }
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo RuleValueSelector = ExpressionHelper.GetPropertyInfo<PublicAccessRule, string>(x => x.RuleValue);
-            public readonly PropertyInfo RuleTypeSelector = ExpressionHelper.GetPropertyInfo<PublicAccessRule, string>(x => x.RuleType);
-        }
-
+        
         public Guid AccessEntryId { get; internal set; }
 
         public string RuleValue
         {
-            get { return _ruleValue; }
-            set { SetPropertyValueAndDetectChanges(value, ref _ruleValue, Ps.Value.RuleValueSelector); }
+            get => _ruleValue;
+            set => SetPropertyValueAndDetectChanges(value, ref _ruleValue, nameof(RuleValue));
         }
 
         public string RuleType
         {
-            get { return _ruleType; }
-            set { SetPropertyValueAndDetectChanges(value, ref _ruleType, Ps.Value.RuleTypeSelector); }
+            get => _ruleType;
+            set => SetPropertyValueAndDetectChanges(value, ref _ruleType, nameof(RuleType));
         }
 
 
diff --git a/src/Umbraco.Core/Models/RedirectUrl.cs b/src/Umbraco.Core/Models/RedirectUrl.cs
index 55b799244ecb..84fd631abbf0 100644
--- a/src/Umbraco.Core/Models/RedirectUrl.cs
+++ b/src/Umbraco.Core/Models/RedirectUrl.cs
@@ -20,18 +20,6 @@ public RedirectUrl()
             CreateDateUtc = DateTime.UtcNow;
         }
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo ContentIdSelector = ExpressionHelper.GetPropertyInfo<RedirectUrl, int>(x => x.ContentId);
-            public readonly PropertyInfo ContentKeySelector = ExpressionHelper.GetPropertyInfo<RedirectUrl, Guid>(x => x.ContentKey);
-            public readonly PropertyInfo CreateDateUtcSelector = ExpressionHelper.GetPropertyInfo<RedirectUrl, DateTime>(x => x.CreateDateUtc);
-            public readonly PropertyInfo CultureSelector = ExpressionHelper.GetPropertyInfo<RedirectUrl, string>(x => x.Culture);
-            public readonly PropertyInfo UrlSelector = ExpressionHelper.GetPropertyInfo<RedirectUrl, string>(x => x.Url);
-        }
-
         private int _contentId;
         private Guid _contentKey;
         private DateTime _createDateUtc;
@@ -41,36 +29,36 @@ private class PropertySelectors
         /// <inheritdoc />
         public int ContentId
         {
-            get { return _contentId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _contentId, Ps.Value.ContentIdSelector); }
+            get => _contentId;
+            set => SetPropertyValueAndDetectChanges(value, ref _contentId, nameof(ContentId));
         }
 
         /// <inheritdoc />
         public Guid ContentKey
         {
-            get { return _contentKey; }
-            set { SetPropertyValueAndDetectChanges(value, ref _contentKey, Ps.Value.ContentKeySelector); }
+            get => _contentKey;
+            set => SetPropertyValueAndDetectChanges(value, ref _contentKey, nameof(ContentKey));
         }
 
         /// <inheritdoc />
         public DateTime CreateDateUtc
         {
-            get {  return _createDateUtc; }
-            set { SetPropertyValueAndDetectChanges(value, ref _createDateUtc, Ps.Value.CreateDateUtcSelector); }
+            get => _createDateUtc;
+            set => SetPropertyValueAndDetectChanges(value, ref _createDateUtc, nameof(CreateDateUtc));
         }
 
         /// <inheritdoc />
         public string Culture
         {
-            get { return _culture; }
-            set { SetPropertyValueAndDetectChanges(value, ref _culture, Ps.Value.CultureSelector); }
+            get => _culture;
+            set => SetPropertyValueAndDetectChanges(value, ref _culture, nameof(Culture));
         }
 
         /// <inheritdoc />
         public string Url
         {
-            get { return _url; }
-            set { SetPropertyValueAndDetectChanges(value, ref _url, Ps.Value.UrlSelector); }
+            get => _url;
+            set => SetPropertyValueAndDetectChanges(value, ref _url, nameof(Url));
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/Relation.cs b/src/Umbraco.Core/Models/Relation.cs
index 2d2b05dbd60c..118456130911 100644
--- a/src/Umbraco.Core/Models/Relation.cs
+++ b/src/Umbraco.Core/Models/Relation.cs
@@ -25,16 +25,7 @@ public Relation(int parentId, int childId, IRelationType relationType)
             _childId = childId;
             _relationType = relationType;
         }
-
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<Relation, int>(x => x.ParentId);
-            public readonly PropertyInfo ChildIdSelector = ExpressionHelper.GetPropertyInfo<Relation, int>(x => x.ChildId);
-            public readonly PropertyInfo RelationTypeSelector = ExpressionHelper.GetPropertyInfo<Relation, IRelationType>(x => x.RelationType);
-            public readonly PropertyInfo CommentSelector = ExpressionHelper.GetPropertyInfo<Relation, string>(x => x.Comment);
-        }
+        
 
         /// <summary>
         /// Gets or sets the Parent Id of the Relation (Source)
@@ -42,8 +33,8 @@ private class PropertySelectors
         [DataMember]
         public int ParentId
         {
-            get { return _parentId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _parentId, Ps.Value.ParentIdSelector); }
+            get => _parentId;
+            set => SetPropertyValueAndDetectChanges(value, ref _parentId, nameof(ParentId));
         }
 
         /// <summary>
@@ -52,8 +43,8 @@ public int ParentId
         [DataMember]
         public int ChildId
         {
-            get { return _childId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _childId, Ps.Value.ChildIdSelector); }
+            get => _childId;
+            set => SetPropertyValueAndDetectChanges(value, ref _childId, nameof(ChildId));
         }
 
         /// <summary>
@@ -62,8 +53,8 @@ public int ChildId
         [DataMember]
         public IRelationType RelationType
         {
-            get { return _relationType; }
-            set { SetPropertyValueAndDetectChanges(value, ref _relationType, Ps.Value.RelationTypeSelector); }
+            get => _relationType;
+            set => SetPropertyValueAndDetectChanges(value, ref _relationType, nameof(RelationType));
         }
 
         /// <summary>
@@ -72,18 +63,14 @@ public IRelationType RelationType
         [DataMember]
         public string Comment
         {
-            get { return _comment; }
-            set { SetPropertyValueAndDetectChanges(value, ref _comment, Ps.Value.CommentSelector); }
+            get => _comment;
+            set => SetPropertyValueAndDetectChanges(value, ref _comment, nameof(Comment));
         }
 
         /// <summary>
         /// Gets the Id of the <see cref="RelationType"/> that this Relation is based on.
         /// </summary>
         [IgnoreDataMember]
-        public int RelationTypeId
-        {
-            get { return _relationType.Id; }
-        }
-
+        public int RelationTypeId => _relationType.Id;
     }
 }
diff --git a/src/Umbraco.Core/Models/RelationType.cs b/src/Umbraco.Core/Models/RelationType.cs
index 5aa2c19ce324..f2941a152d25 100644
--- a/src/Umbraco.Core/Models/RelationType.cs
+++ b/src/Umbraco.Core/Models/RelationType.cs
@@ -36,25 +36,14 @@ public RelationType(Guid childObjectType, Guid parentObjectType, string alias, s
             Name = name;
         }
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<RelationType, string>(x => x.Name);
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<RelationType, string>(x => x.Alias);
-            public readonly PropertyInfo IsBidirectionalSelector = ExpressionHelper.GetPropertyInfo<RelationType, bool>(x => x.IsBidirectional);
-            public readonly PropertyInfo ParentObjectTypeSelector = ExpressionHelper.GetPropertyInfo<RelationType, Guid>(x => x.ParentObjectType);
-            public readonly PropertyInfo ChildObjectTypeSelector = ExpressionHelper.GetPropertyInfo<RelationType, Guid>(x => x.ChildObjectType);
-        }
-
         /// <summary>
         /// Gets or sets the Name of the RelationType
         /// </summary>
         [DataMember]
         public string Name
         {
-            get { return _name; }
-            set { SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector); }
+            get => _name;
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         /// <summary>
@@ -63,8 +52,8 @@ public string Name
         [DataMember]
         public string Alias
         {
-            get { return _alias; }
-            set { SetPropertyValueAndDetectChanges(value, ref _alias, Ps.Value.AliasSelector); }
+            get => _alias;
+            set => SetPropertyValueAndDetectChanges(value, ref _alias, nameof(Alias));
         }
 
         /// <summary>
@@ -73,8 +62,8 @@ public string Alias
         [DataMember]
         public bool IsBidirectional
         {
-            get { return _isBidrectional; }
-            set { SetPropertyValueAndDetectChanges(value, ref _isBidrectional, Ps.Value.IsBidirectionalSelector); }
+            get => _isBidrectional;
+            set => SetPropertyValueAndDetectChanges(value, ref _isBidrectional, nameof(IsBidirectional));
         }
 
         /// <summary>
@@ -84,8 +73,8 @@ public bool IsBidirectional
         [DataMember]
         public Guid ParentObjectType
         {
-            get { return _parentObjectType; }
-            set { SetPropertyValueAndDetectChanges(value, ref _parentObjectType, Ps.Value.ParentObjectTypeSelector); }
+            get => _parentObjectType;
+            set => SetPropertyValueAndDetectChanges(value, ref _parentObjectType, nameof(ParentObjectType));
         }
 
         /// <summary>
@@ -95,8 +84,8 @@ public Guid ParentObjectType
         [DataMember]
         public Guid ChildObjectType
         {
-            get { return _childObjectType; }
-            set { SetPropertyValueAndDetectChanges(value, ref _childObjectType, Ps.Value.ChildObjectTypeSelector); }
+            get => _childObjectType;
+            set => SetPropertyValueAndDetectChanges(value, ref _childObjectType, nameof(ChildObjectType));
         }
 
     }
diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs
index db0e9b8c3b49..c85a750500ef 100644
--- a/src/Umbraco.Core/Models/ServerRegistration.cs
+++ b/src/Umbraco.Core/Models/ServerRegistration.cs
@@ -14,17 +14,7 @@ public class ServerRegistration : EntityBase, IServerRegistration
         private string _serverIdentity;
         private bool _isActive;
         private bool _isMaster;
-
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo ServerAddressSelector = ExpressionHelper.GetPropertyInfo<ServerRegistration, string>(x => x.ServerAddress);
-            public readonly PropertyInfo ServerIdentitySelector = ExpressionHelper.GetPropertyInfo<ServerRegistration, string>(x => x.ServerIdentity);
-            public readonly PropertyInfo IsActiveSelector = ExpressionHelper.GetPropertyInfo<ServerRegistration, bool>(x => x.IsActive);
-            public readonly PropertyInfo IsMasterSelector = ExpressionHelper.GetPropertyInfo<ServerRegistration, bool>(x => x.IsMaster);
-        }
-
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerRegistration"/> class.
         /// </summary>
@@ -73,8 +63,8 @@ public ServerRegistration(string serverAddress, string serverIdentity, DateTime
         /// </summary>
         public string ServerAddress
         {
-            get { return _serverAddress; }
-            set { SetPropertyValueAndDetectChanges(value, ref _serverAddress, Ps.Value.ServerAddressSelector); }
+            get => _serverAddress;
+            set => SetPropertyValueAndDetectChanges(value, ref _serverAddress, nameof(ServerAddress));
         }
 
         /// <summary>
@@ -82,8 +72,8 @@ public string ServerAddress
         /// </summary>
         public string ServerIdentity
         {
-            get { return _serverIdentity; }
-            set { SetPropertyValueAndDetectChanges(value, ref _serverIdentity, Ps.Value.ServerIdentitySelector); }
+            get => _serverIdentity;
+            set => SetPropertyValueAndDetectChanges(value, ref _serverIdentity, nameof(ServerIdentity));
         }
 
         /// <summary>
@@ -91,8 +81,8 @@ public string ServerIdentity
         /// </summary>
         public bool IsActive
         {
-            get { return _isActive; }
-            set { SetPropertyValueAndDetectChanges(value, ref _isActive, Ps.Value.IsActiveSelector); }
+            get => _isActive;
+            set => SetPropertyValueAndDetectChanges(value, ref _isActive, nameof(IsActive));
         }
 
         /// <summary>
@@ -100,19 +90,27 @@ public bool IsActive
         /// </summary>
         public bool IsMaster
         {
-            get { return _isMaster; }
-            set { SetPropertyValueAndDetectChanges(value, ref _isMaster, Ps.Value.IsMasterSelector); }
+            get => _isMaster;
+            set => SetPropertyValueAndDetectChanges(value, ref _isMaster, nameof(IsMaster));
         }
 
         /// <summary>
         /// Gets the date and time the registration was created.
         /// </summary>
-        public DateTime Registered { get { return CreateDate; } set { CreateDate = value; }}
+        public DateTime Registered
+        {
+            get => CreateDate;
+            set => CreateDate = value;
+        }
 
         /// <summary>
         /// Gets the date and time the registration was last accessed.
         /// </summary>
-        public DateTime Accessed { get { return UpdateDate; } set { UpdateDate = value; }}
+        public DateTime Accessed
+        {
+            get => UpdateDate;
+            set => UpdateDate = value;
+        }
 
         /// <summary>
         /// Converts the value of this instance to its equivalent string representation.
diff --git a/src/Umbraco.Core/Models/StylesheetProperty.cs b/src/Umbraco.Core/Models/StylesheetProperty.cs
index 1601ca3e76d8..27e9a2607417 100644
--- a/src/Umbraco.Core/Models/StylesheetProperty.cs
+++ b/src/Umbraco.Core/Models/StylesheetProperty.cs
@@ -25,14 +25,6 @@ public StylesheetProperty(string name, string @alias, string value)
             _value = value;
         }
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<StylesheetProperty, string>(x => x.Alias);
-            public readonly PropertyInfo ValueSelector = ExpressionHelper.GetPropertyInfo<StylesheetProperty, string>(x => x.Value);
-        }
-
         /// <summary>
         /// The CSS rule name that can be used by Umbraco in the back office
         /// </summary>
@@ -43,8 +35,8 @@ private class PropertySelectors
         /// </summary>
         public string Alias
         {
-            get { return _alias; }
-            set { SetPropertyValueAndDetectChanges(value, ref _alias, Ps.Value.AliasSelector); }
+            get => _alias;
+            set => SetPropertyValueAndDetectChanges(value, ref _alias, nameof(Alias));
         }
 
         /// <summary>
@@ -52,8 +44,8 @@ public string Alias
         /// </summary>
         public string Value
         {
-            get { return _value; }
-            set { SetPropertyValueAndDetectChanges(value, ref _value, Ps.Value.ValueSelector); }
+            get => _value;
+            set => SetPropertyValueAndDetectChanges(value, ref _value, nameof(Value));
         }
 
     }
diff --git a/src/Umbraco.Core/Models/Tag.cs b/src/Umbraco.Core/Models/Tag.cs
index e9707e587d9a..e44e26596b5e 100644
--- a/src/Umbraco.Core/Models/Tag.cs
+++ b/src/Umbraco.Core/Models/Tag.cs
@@ -48,21 +48,21 @@ private class PropertySelectors
         public string Group
         {
             get => _group;
-            set => SetPropertyValueAndDetectChanges(value, ref _group, Selectors.Group);
+            set => SetPropertyValueAndDetectChanges(value, ref _group, nameof(Group));
         }
 
         /// <inheritdoc />
         public string Text
         {
             get => _text;
-            set => SetPropertyValueAndDetectChanges(value, ref _text, Selectors.Text);
+            set => SetPropertyValueAndDetectChanges(value, ref _text, nameof(Text));
         }
 
         /// <inheritdoc />
         public int? LanguageId
         {
             get => _languageId;
-            set => SetPropertyValueAndDetectChanges(value, ref _languageId, Selectors.LanguageId);
+            set => SetPropertyValueAndDetectChanges(value, ref _languageId, nameof(LanguageId));
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs
index b7e67c45eadf..e8c983e224b0 100644
--- a/src/Umbraco.Core/Models/Template.cs
+++ b/src/Umbraco.Core/Models/Template.cs
@@ -17,16 +17,6 @@ public class Template : File, ITemplate
         private string _masterTemplateAlias;
         private Lazy<int> _masterTemplateId;
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo MasterTemplateAliasSelector = ExpressionHelper.GetPropertyInfo<Template, string>(x => x.MasterTemplateAlias);
-            public readonly PropertyInfo MasterTemplateIdSelector = ExpressionHelper.GetPropertyInfo<Template, Lazy<int>>(x => x.MasterTemplateId);
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<Template, string>(x => x.Alias);
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<Template, string>(x => x.Name);
-        }
-
         public Template(string name, string alias)
             : this(name, alias, (Func<File, string>) null)
         { }
@@ -42,28 +32,28 @@ internal Template(string name, string alias, Func<File, string> getFileContent)
         [DataMember]
         public Lazy<int> MasterTemplateId
         {
-            get { return _masterTemplateId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _masterTemplateId, Ps.Value.MasterTemplateIdSelector); }
+            get => _masterTemplateId;
+            set => SetPropertyValueAndDetectChanges(value, ref _masterTemplateId, nameof(MasterTemplateId));
         }
 
         public string MasterTemplateAlias
         {
-            get { return _masterTemplateAlias; }
-            set { SetPropertyValueAndDetectChanges(value, ref _masterTemplateAlias, Ps.Value.MasterTemplateAliasSelector); }
+            get => _masterTemplateAlias;
+            set => SetPropertyValueAndDetectChanges(value, ref _masterTemplateAlias, nameof(MasterTemplateAlias));
         }
 
         [DataMember]
         public new string Name
         {
-            get { return _name; }
-            set { SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector); }
+            get => _name;
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
         [DataMember]
         public new string Alias
         {
-            get { return _alias; }
-            set { SetPropertyValueAndDetectChanges(value.ToCleanString(CleanStringType.UnderscoreAlias), ref _alias, Ps.Value.AliasSelector); }
+            get => _alias;
+            set => SetPropertyValueAndDetectChanges(value.ToCleanString(CleanStringType.UnderscoreAlias), ref _alias, nameof(Alias));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/UmbracoDomain.cs b/src/Umbraco.Core/Models/UmbracoDomain.cs
index d7266f77fe46..9aa2aa3c54a5 100644
--- a/src/Umbraco.Core/Models/UmbracoDomain.cs
+++ b/src/Umbraco.Core/Models/UmbracoDomain.cs
@@ -23,41 +23,29 @@ public UmbracoDomain(string domainName, string languageIsoCode)
         private int? _contentId;
         private int? _languageId;
         private string _domainName;
-
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo ContentSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, int?>(x => x.RootContentId);
-            public readonly PropertyInfo DefaultLanguageSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, int?>(x => x.LanguageId);
-            public readonly PropertyInfo DomainNameSelector = ExpressionHelper.GetPropertyInfo<UmbracoDomain, string>(x => x.DomainName);
-        }
-
+        
         [DataMember]
         public int? LanguageId
         {
-            get { return _languageId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _languageId, Ps.Value.DefaultLanguageSelector); }
+            get => _languageId;
+            set => SetPropertyValueAndDetectChanges(value, ref _languageId, nameof(LanguageId));
         }
 
         [DataMember]
         public string DomainName
         {
-            get { return _domainName; }
-            set { SetPropertyValueAndDetectChanges(value, ref _domainName, Ps.Value.DomainNameSelector); }
+            get => _domainName;
+            set => SetPropertyValueAndDetectChanges(value, ref _domainName, nameof(DomainName));
         }
 
         [DataMember]
         public int? RootContentId
         {
-            get { return _contentId; }
-            set { SetPropertyValueAndDetectChanges(value, ref _contentId, Ps.Value.ContentSelector); }
+            get => _contentId;
+            set => SetPropertyValueAndDetectChanges(value, ref _contentId, nameof(RootContentId));
         }
 
-        public bool IsWildcard
-        {
-            get { return string.IsNullOrWhiteSpace(DomainName) || DomainName.StartsWith("*"); }
-        }
+        public bool IsWildcard => string.IsNullOrWhiteSpace(DomainName) || DomainName.StartsWith("*");
 
         /// <summary>
         /// Readonly value of the language ISO code for the domain
diff --git a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
index 11e2c5687316..13fabe5ca2ee 100644
--- a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
@@ -17,10 +17,7 @@ public class DeepCloneAppCacheTests : RuntimeAppCacheTests
     {
         private DeepCloneAppCache _provider;
 
-        protected override int GetTotalItemCount
-        {
-            get { return HttpRuntime.Cache.Count; }
-        }
+        protected override int GetTotalItemCount => HttpRuntime.Cache.Count;
 
         public override void Setup()
         {
@@ -28,15 +25,9 @@ public override void Setup()
             _provider = new DeepCloneAppCache(new WebCachingAppCache(HttpRuntime.Cache));
         }
 
-        internal override IAppCache AppCache
-        {
-            get { return _provider; }
-        }
+        internal override IAppCache AppCache => _provider;
 
-        internal override IAppPolicyCache AppPolicyCache
-        {
-            get { return _provider; }
-        }
+        internal override IAppPolicyCache AppPolicyCache => _provider;
 
         [Test]
         public void Clones_List()
@@ -101,18 +92,11 @@ public TestClass()
                 CloneId = Guid.NewGuid();
             }
 
-            private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-            private class PropertySelectors
-            {
-                public readonly PropertyInfo WriterSelector = ExpressionHelper.GetPropertyInfo<Content, string>(x => x.Name);
-            }
-
             private string _name;
             public string Name
             {
-                get { return _name; }
-                set { SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.WriterSelector); }
+                get => _name;
+                set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
             }
 
             public Guid CloneId { get; set; }

From bc987a825ad6110a996010085478b23d8d5d7d89 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Feb 2019 10:09:32 +0100
Subject: [PATCH 271/421] Cleanup

---
 src/Umbraco.Core/Models/AuditEntry.cs         | 11 +++--
 src/Umbraco.Core/Models/Consent.cs            |  3 +-
 src/Umbraco.Core/Models/Content.cs            |  1 -
 src/Umbraco.Core/Models/ContentBase.cs        |  1 -
 .../Models/ContentCultureInfos.cs             |  4 +-
 src/Umbraco.Core/Models/ContentType.cs        |  4 +-
 src/Umbraco.Core/Models/ContentTypeBase.cs    |  2 -
 .../Models/ContentTypeCompositionBase.cs      |  1 -
 src/Umbraco.Core/Models/DataType.cs           |  1 -
 src/Umbraco.Core/Models/DictionaryItem.cs     |  1 -
 .../Models/DictionaryTranslation.cs           |  3 --
 .../Models/Entities/BeingDirty.cs             |  3 +-
 .../Models/Entities/BeingDirtyBase.cs         |  3 +-
 .../Models/Entities/EntityBase.cs             |  1 -
 .../Models/Entities/TreeEntityBase.cs         |  1 -
 src/Umbraco.Core/Models/File.cs               |  4 --
 .../Models/Identity/BackOfficeIdentityUser.cs |  8 +---
 src/Umbraco.Core/Models/Language.cs           |  5 +--
 src/Umbraco.Core/Models/Macro.cs              | 17 --------
 src/Umbraco.Core/Models/MacroProperty.cs      |  2 -
 src/Umbraco.Core/Models/Member.cs             |  6 +--
 src/Umbraco.Core/Models/MemberGroup.cs        |  2 -
 src/Umbraco.Core/Models/MemberType.cs         |  1 -
 .../Models/Membership/UserGroup.cs            |  1 -
 src/Umbraco.Core/Models/MigrationEntry.cs     |  1 -
 src/Umbraco.Core/Models/Property.cs           | 43 ++++++++-----------
 src/Umbraco.Core/Models/PropertyGroup.cs      |  2 -
 src/Umbraco.Core/Models/PropertyType.cs       |  6 +--
 src/Umbraco.Core/Models/PublicAccessEntry.cs  |  1 -
 src/Umbraco.Core/Models/PublicAccessRule.cs   |  2 -
 src/Umbraco.Core/Models/RedirectUrl.cs        |  1 -
 src/Umbraco.Core/Models/Relation.cs           |  2 -
 src/Umbraco.Core/Models/RelationType.cs       |  2 -
 src/Umbraco.Core/Models/ServerRegistration.cs |  3 +-
 src/Umbraco.Core/Models/StylesheetProperty.cs |  1 -
 src/Umbraco.Core/Models/Tag.cs                | 12 ------
 src/Umbraco.Core/Models/Template.cs           |  1 -
 src/Umbraco.Core/Models/UmbracoDomain.cs      |  3 +-
 38 files changed, 35 insertions(+), 131 deletions(-)

diff --git a/src/Umbraco.Core/Models/AuditEntry.cs b/src/Umbraco.Core/Models/AuditEntry.cs
index da56c6c31875..d12163f39499 100644
--- a/src/Umbraco.Core/Models/AuditEntry.cs
+++ b/src/Umbraco.Core/Models/AuditEntry.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -19,7 +18,7 @@ internal class AuditEntry : EntityBase, IAuditEntry
         private string _affectedDetails;
         private string _eventType;
         private string _eventDetails;
-        
+
         /// <inheritdoc />
         public int PerformingUserId
         {
@@ -49,28 +48,28 @@ public DateTime EventDateUtc
         }
 
         /// <inheritdoc />
-        public int AffectedUserId 
+        public int AffectedUserId
         {
             get => _affectedUserId;
             set => SetPropertyValueAndDetectChanges(value, ref _affectedUserId, nameof(AffectedUserId));
         }
 
         /// <inheritdoc />
-        public string AffectedDetails 
+        public string AffectedDetails
         {
             get => _affectedDetails;
             set => SetPropertyValueAndDetectChanges(value, ref _affectedDetails, nameof(AffectedDetails));
         }
 
         /// <inheritdoc />
-        public string EventType 
+        public string EventType
         {
             get => _eventType;
             set => SetPropertyValueAndDetectChanges(value, ref _eventType, nameof(EventType));
         }
 
         /// <inheritdoc />
-        public string EventDetails 
+        public string EventDetails
         {
             get => _eventDetails;
             set => SetPropertyValueAndDetectChanges(value, ref _eventDetails, nameof(EventDetails));
diff --git a/src/Umbraco.Core/Models/Consent.cs b/src/Umbraco.Core/Models/Consent.cs
index cca1db41f176..4f7543fd5945 100644
--- a/src/Umbraco.Core/Models/Consent.cs
+++ b/src/Umbraco.Core/Models/Consent.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -19,7 +18,7 @@ internal class Consent : EntityBase, IConsent
         private string _action;
         private ConsentState _state;
         private string _comment;
-        
+
         /// <inheritdoc />
         public bool Current
         {
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 4fda1ff23dd0..dd4ba13c33a0 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Exceptions;
 
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 705fa2cfb0d6..a1fb5da30822 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -3,7 +3,6 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models.Entities;
diff --git a/src/Umbraco.Core/Models/ContentCultureInfos.cs b/src/Umbraco.Core/Models/ContentCultureInfos.cs
index a0a4a7c472dd..c8c4bea56a61 100644
--- a/src/Umbraco.Core/Models/ContentCultureInfos.cs
+++ b/src/Umbraco.Core/Models/ContentCultureInfos.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models.Entities;
 
@@ -13,7 +12,7 @@ public class ContentCultureInfos : BeingDirtyBase, IDeepCloneable, IEquatable<Co
     {
         private DateTime _date;
         private string _name;
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ContentCultureInfos"/> class.
         /// </summary>
@@ -101,6 +100,5 @@ public void Deconstruct(out string culture, out string name, out DateTime date)
             Deconstruct(out culture, out name);
             date = Date;
         }
-        
     }
 }
diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs
index 97534835d156..61fabe6fb06b 100644
--- a/src/Umbraco.Core/Models/ContentType.cs
+++ b/src/Umbraco.Core/Models/ContentType.cs
@@ -67,8 +67,8 @@ public ITemplate DefaultTemplate
         [DataMember]
         internal int DefaultTemplateId
         {
-            get { return _defaultTemplate; }
-            set { SetPropertyValueAndDetectChanges(value, ref _defaultTemplate, nameof(DefaultTemplateId)); }
+            get => _defaultTemplate;
+            set => SetPropertyValueAndDetectChanges(value, ref _defaultTemplate, nameof(DefaultTemplateId));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 3f45f424daea..2aa114a88f08 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -3,7 +3,6 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
@@ -18,7 +17,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}, Alias: {Alias}")]
     public abstract class ContentTypeBase : TreeEntityBase, IContentTypeBase
     {
-
         private string _alias;
         private string _description;
         private string _icon = "icon-folder";
diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
index 7a8e91845af3..ec6f80310779 100644
--- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Exceptions;
 
diff --git a/src/Umbraco.Core/Models/DataType.cs b/src/Umbraco.Core/Models/DataType.cs
index 423895b47540..8745e6dbec07 100644
--- a/src/Umbraco.Core/Models/DataType.cs
+++ b/src/Umbraco.Core/Models/DataType.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Umbraco.Core.Models.Entities;
diff --git a/src/Umbraco.Core/Models/DictionaryItem.cs b/src/Umbraco.Core/Models/DictionaryItem.cs
index 00c4e1a96cb5..c23e8f86a4cf 100644
--- a/src/Umbraco.Core/Models/DictionaryItem.cs
+++ b/src/Umbraco.Core/Models/DictionaryItem.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/DictionaryTranslation.cs b/src/Umbraco.Core/Models/DictionaryTranslation.cs
index 51c7ff2800ab..afb4063b9774 100644
--- a/src/Umbraco.Core/Models/DictionaryTranslation.cs
+++ b/src/Umbraco.Core/Models/DictionaryTranslation.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -50,7 +48,6 @@ internal DictionaryTranslation(int languageId, string value, Guid uniqueId)
             Key = uniqueId;
         }
 
-
         /// <summary>
         /// Gets or sets the <see cref="Language"/> for the translation
         /// </summary>
diff --git a/src/Umbraco.Core/Models/Entities/BeingDirty.cs b/src/Umbraco.Core/Models/Entities/BeingDirty.cs
index 4e6d0cf5e3ca..92b4ab5c4b74 100644
--- a/src/Umbraco.Core/Models/Entities/BeingDirty.cs
+++ b/src/Umbraco.Core/Models/Entities/BeingDirty.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Reflection;
 
 namespace Umbraco.Core.Models.Entities
 {
@@ -19,7 +18,7 @@ public sealed class BeingDirty : BeingDirtyBase
         /// <typeparam name="T">The type of the value.</typeparam>
         /// <param name="value">The new value.</param>
         /// <param name="valueRef">A reference to the value to set.</param>
-        /// <param name="propertyName">The property selector.</param>
+        /// <param name="propertyName">The property name.</param>
         /// <param name="comparer">A comparer to compare property values.</param>
         public new void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, string propertyName, IEqualityComparer<T> comparer = null)
         {
diff --git a/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
index d9db4332174c..a598ba1b3d2b 100644
--- a/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
+++ b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models.Entities
@@ -143,7 +142,7 @@ public void EnableChangeTracking()
         /// <typeparam name="T">The type of the value.</typeparam>
         /// <param name="value">The new value.</param>
         /// <param name="valueRef">A reference to the value to set.</param>
-        /// <param name="propertyName">The property selector.</param>
+        /// <param name="propertyName">The property name.</param>
         /// <param name="comparer">A comparer to compare property values.</param>
         protected void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, string propertyName, IEqualityComparer<T> comparer = null)
         {
diff --git a/src/Umbraco.Core/Models/Entities/EntityBase.cs b/src/Umbraco.Core/Models/Entities/EntityBase.cs
index ef90f5e28db7..43837fa776f5 100644
--- a/src/Umbraco.Core/Models/Entities/EntityBase.cs
+++ b/src/Umbraco.Core/Models/Entities/EntityBase.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models.Entities
diff --git a/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
index b8243ed0a95c..937d7ab0fce7 100644
--- a/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
+++ b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models.Entities
diff --git a/src/Umbraco.Core/Models/File.cs b/src/Umbraco.Core/Models/File.cs
index 494dcbe6fc54..845da4d0531f 100644
--- a/src/Umbraco.Core/Models/File.cs
+++ b/src/Umbraco.Core/Models/File.cs
@@ -1,9 +1,5 @@
 using System;
-using System.IO;
-using System.Reflection;
 using System.Runtime.Serialization;
-using System.Text;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
index 084db81f11e9..0eb53428d13f 100644
--- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
@@ -3,20 +3,14 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
-using System.Reflection;
-using System.Security.Claims;
-using System.Threading.Tasks;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Security;
 
 namespace Umbraco.Core.Models.Identity
 {
     public class BackOfficeIdentityUser : IdentityUser<int, IIdentityUserLogin, IdentityUserRole<string>, IdentityUserClaim<int>>, IRememberBeingDirty
     {
-
         private string _email;
         private string _userName;
         private int _id;
@@ -419,9 +413,9 @@ public void EnableChangeTracking()
         private static readonly DelegateEqualityComparer<IReadOnlyUserGroup[]> GroupsComparer = new DelegateEqualityComparer<IReadOnlyUserGroup[]>(
             (groups, enumerable) => groups.Select(x => x.Alias).UnsortedSequenceEqual(enumerable.Select(x => x.Alias)),
             groups => groups.GetHashCode());
+
         private static readonly DelegateEqualityComparer<int[]> StartIdsComparer = new DelegateEqualityComparer<int[]>(
             (groups, enumerable) => groups.UnsortedSequenceEqual(enumerable),
             groups => groups.GetHashCode());
-
     }
 }
diff --git a/src/Umbraco.Core/Models/Language.cs b/src/Umbraco.Core/Models/Language.cs
index 3e4d189abb9b..7d5fda3e06c4 100644
--- a/src/Umbraco.Core/Models/Language.cs
+++ b/src/Umbraco.Core/Models/Language.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Globalization;
-using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using System.Threading;
 using Umbraco.Core.Configuration;
@@ -16,7 +14,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Language : EntityBase, ILanguage
     {
-
         private string _isoCode;
         private string _cultureName;
         private bool _isDefaultVariantLanguage;
@@ -27,7 +24,7 @@ public Language(string isoCode)
         {
             IsoCode = isoCode;
         }
-        
+
         /// <inheritdoc />
         [DataMember]
         public string IsoCode
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index 2f29ddecffb6..bc71d3dc2bc9 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -3,7 +3,6 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
@@ -99,22 +98,6 @@ public Macro(string @alias, string name,
         private List<string> _addedProperties;
         private List<string> _removedProperties;
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.Alias);
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.Name);
-            public readonly PropertyInfo UseInEditorSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.UseInEditor);
-            public readonly PropertyInfo CacheDurationSelector = ExpressionHelper.GetPropertyInfo<Macro, int>(x => x.CacheDuration);
-            public readonly PropertyInfo CacheByPageSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.CacheByPage);
-            public readonly PropertyInfo CacheByMemberSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.CacheByMember);
-            public readonly PropertyInfo DontRenderSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.DontRender);
-            public readonly PropertyInfo ScriptPathSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.MacroSource);
-            public readonly PropertyInfo MacroTypeSelector = ExpressionHelper.GetPropertyInfo<Macro, MacroTypes>(x => x.MacroType);
-            public readonly PropertyInfo PropertiesSelector = ExpressionHelper.GetPropertyInfo<Macro, MacroPropertyCollection>(x => x.Properties);
-        }
-
         void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             OnPropertyChanged(nameof(Properties));
diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
index 7e269ba635ec..62ba6a7a7d1c 100644
--- a/src/Umbraco.Core/Models/MacroProperty.cs
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index 06f94b85aa0d..78d1cfafd5a7 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
 {
@@ -130,7 +126,7 @@ public Member(string name, string email, string username, string rawPasswordValu
             _rawPasswordValue = rawPasswordValue;
             IsApproved = isApproved;
         }
-        
+
         /// <summary>
         /// Gets or sets the Username
         /// </summary>
diff --git a/src/Umbraco.Core/Models/MemberGroup.cs b/src/Umbraco.Core/Models/MemberGroup.cs
index 69e26c103766..8c06da418d31 100644
--- a/src/Umbraco.Core/Models/MemberGroup.cs
+++ b/src/Umbraco.Core/Models/MemberGroup.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -17,7 +16,6 @@ public class MemberGroup : EntityBase, IMemberGroup
         private string _name;
         private int _creatorId;
 
-
         /// <inheritdoc />
         [DataMember]
         [DoNotClone]
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index 141cb3b63ccb..a6c151844656 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models
diff --git a/src/Umbraco.Core/Models/Membership/UserGroup.cs b/src/Umbraco.Core/Models/Membership/UserGroup.cs
index 0562586af405..31421f990d90 100644
--- a/src/Umbraco.Core/Models/Membership/UserGroup.cs
+++ b/src/Umbraco.Core/Models/Membership/UserGroup.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Core/Models/MigrationEntry.cs b/src/Umbraco.Core/Models/MigrationEntry.cs
index 1149f6c773de..1af66d2978bc 100644
--- a/src/Umbraco.Core/Models/MigrationEntry.cs
+++ b/src/Umbraco.Core/Models/MigrationEntry.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using Semver;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index f7f45d7f5cd2..726ddc1cf500 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Collections;
 using Umbraco.Core.Models.Entities;
@@ -25,8 +24,6 @@ public class Property : EntityBase
         // _vvalues contains the (indexed) variant property values
         private Dictionary<CompositeNStringNStringKey, PropertyValue> _vvalues;
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Property"/> class.
         /// </summary>
@@ -100,29 +97,25 @@ public PropertyValue Clone()
                 => new PropertyValue { _culture = _culture, _segment = _segment, PublishedValue = PublishedValue, EditedValue = EditedValue };
         }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly DelegateEqualityComparer<object> PropertyValueComparer = new DelegateEqualityComparer<object>(
-                (o, o1) =>
-                {
-                    if (o == null && o1 == null) return true;
+        private static readonly DelegateEqualityComparer<object> PropertyValueComparer = new DelegateEqualityComparer<object>(
+            (o, o1) =>
+            {
+                if (o == null && o1 == null) return true;
 
-                    // custom comparer for strings.
-                    // if one is null and another is empty then they are the same
-                    if (o is string || o1 is string)
-                        return ((o as string).IsNullOrWhiteSpace() && (o1 as string).IsNullOrWhiteSpace()) || (o != null && o1 != null && o.Equals(o1));
+                // custom comparer for strings.
+                // if one is null and another is empty then they are the same
+                if (o is string || o1 is string)
+                    return ((o as string).IsNullOrWhiteSpace() && (o1 as string).IsNullOrWhiteSpace()) || (o != null && o1 != null && o.Equals(o1));
 
-                    if (o == null || o1 == null) return false;
+                if (o == null || o1 == null) return false;
 
-                    // custom comparer for enumerable
-                    // ReSharper disable once MergeCastWithTypeCheck
-                    if (o is IEnumerable && o1 is IEnumerable enumerable)
-                        return ((IEnumerable) o).Cast<object>().UnsortedSequenceEqual(enumerable.Cast<object>());
+                // custom comparer for enumerable
+                // ReSharper disable once MergeCastWithTypeCheck
+                if (o is IEnumerable && o1 is IEnumerable enumerable)
+                    return ((IEnumerable)o).Cast<object>().UnsortedSequenceEqual(enumerable.Cast<object>());
 
-                    return o.Equals(o1);
-                }, o => o.GetHashCode());
-        }
+                return o.Equals(o1);
+            }, o => o.GetHashCode());
 
         /// <summary>
         /// Returns the PropertyType, which this Property is based on
@@ -255,7 +248,7 @@ private void PublishValue(PropertyValue pvalue)
                 throw new NotSupportedException("Property type does not support publishing.");
             var origValue = pvalue.PublishedValue;
             pvalue.PublishedValue = PropertyType.ConvertAssignedValue(pvalue.EditedValue);
-            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, false);
+            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), PropertyValueComparer, false);
         }
 
         private void UnpublishValue(PropertyValue pvalue)
@@ -266,7 +259,7 @@ private void UnpublishValue(PropertyValue pvalue)
                 throw new NotSupportedException("Property type does not support publishing.");
             var origValue = pvalue.PublishedValue;
             pvalue.PublishedValue = PropertyType.ConvertAssignedValue(null);
-            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, false);
+            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), PropertyValueComparer, false);
         }
 
         /// <summary>
@@ -287,7 +280,7 @@ public void SetValue(object value, string culture = null, string segment = null)
 
             pvalue.EditedValue = setValue;
 
-            DetectChanges(setValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, change);
+            DetectChanges(setValue, origValue, nameof(Values), PropertyValueComparer, change);
         }
 
         // bypasses all changes detection and is the *only* way to set the published value
diff --git a/src/Umbraco.Core/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs
index 00bc12f5846d..2e6da5d837a1 100644
--- a/src/Umbraco.Core/Models/PropertyGroup.cs
+++ b/src/Umbraco.Core/Models/PropertyGroup.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Specialized;
 using System.Diagnostics;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -15,7 +14,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}")]
     public class PropertyGroup : EntityBase, IEquatable<PropertyGroup>
     {
-
         private string _name;
         private int _sortOrder;
         private PropertyTypeCollection _propertyTypes;
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 486e22b278a5..1d6a3b4fe968 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
-using System.Text.RegularExpressions;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
@@ -84,7 +80,7 @@ internal PropertyType(string propertyEditorAlias, ValueStorageType valueStorageT
             _alias = propertyTypeAlias == null ? null : SanitizeAlias(propertyTypeAlias);
             _variations = ContentVariation.Nothing;
         }
-        
+
         /// <summary>
         /// Gets a value indicating whether the content type, owning this property type, is publishing.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PublicAccessEntry.cs b/src/Umbraco.Core/Models/PublicAccessEntry.cs
index 58dd53a0c539..cfb30de14751 100644
--- a/src/Umbraco.Core/Models/PublicAccessEntry.cs
+++ b/src/Umbraco.Core/Models/PublicAccessEntry.cs
@@ -3,7 +3,6 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/PublicAccessRule.cs b/src/Umbraco.Core/Models/PublicAccessRule.cs
index 99d24221a27e..bb6c1cdea2ff 100644
--- a/src/Umbraco.Core/Models/PublicAccessRule.cs
+++ b/src/Umbraco.Core/Models/PublicAccessRule.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -23,7 +22,6 @@ public PublicAccessRule()
         {
         }
 
-        
         public Guid AccessEntryId { get; internal set; }
 
         public string RuleValue
diff --git a/src/Umbraco.Core/Models/RedirectUrl.cs b/src/Umbraco.Core/Models/RedirectUrl.cs
index 84fd631abbf0..f4eb955c641e 100644
--- a/src/Umbraco.Core/Models/RedirectUrl.cs
+++ b/src/Umbraco.Core/Models/RedirectUrl.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/Relation.cs b/src/Umbraco.Core/Models/Relation.cs
index 118456130911..f5d13c70c4a3 100644
--- a/src/Umbraco.Core/Models/Relation.cs
+++ b/src/Umbraco.Core/Models/Relation.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Core/Models/RelationType.cs b/src/Umbraco.Core/Models/RelationType.cs
index f2941a152d25..259b7bc4ef5e 100644
--- a/src/Umbraco.Core/Models/RelationType.cs
+++ b/src/Umbraco.Core/Models/RelationType.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs
index c85a750500ef..7dae5d5393e6 100644
--- a/src/Umbraco.Core/Models/ServerRegistration.cs
+++ b/src/Umbraco.Core/Models/ServerRegistration.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.Reflection;
 using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
@@ -14,7 +13,7 @@ public class ServerRegistration : EntityBase, IServerRegistration
         private string _serverIdentity;
         private bool _isActive;
         private bool _isMaster;
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerRegistration"/> class.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/StylesheetProperty.cs b/src/Umbraco.Core/Models/StylesheetProperty.cs
index 27e9a2607417..089f89deb69d 100644
--- a/src/Umbraco.Core/Models/StylesheetProperty.cs
+++ b/src/Umbraco.Core/Models/StylesheetProperty.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/Tag.cs b/src/Umbraco.Core/Models/Tag.cs
index e44e26596b5e..315904493e3c 100644
--- a/src/Umbraco.Core/Models/Tag.cs
+++ b/src/Umbraco.Core/Models/Tag.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -12,8 +11,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Tag : EntityBase, ITag
     {
-        private static PropertySelectors _selectors;
-
         private string _group;
         private string _text;
         private int? _languageId;
@@ -35,15 +32,6 @@ public Tag(int id, string group, string text, int? languageId = null)
             LanguageId = languageId;
         }
 
-        private static PropertySelectors Selectors => _selectors ?? (_selectors = new PropertySelectors());
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo Group = ExpressionHelper.GetPropertyInfo<Tag, string>(x => x.Group);
-            public readonly PropertyInfo Text = ExpressionHelper.GetPropertyInfo<Tag, string>(x => x.Text);
-            public readonly PropertyInfo LanguageId = ExpressionHelper.GetPropertyInfo<Tag, int?>(x => x.LanguageId);
-        }
-
         /// <inheritdoc />
         public string Group
         {
diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs
index e8c983e224b0..db473972e3b0 100644
--- a/src/Umbraco.Core/Models/Template.cs
+++ b/src/Umbraco.Core/Models/Template.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Strings;
 
diff --git a/src/Umbraco.Core/Models/UmbracoDomain.cs b/src/Umbraco.Core/Models/UmbracoDomain.cs
index 9aa2aa3c54a5..093acef5b549 100644
--- a/src/Umbraco.Core/Models/UmbracoDomain.cs
+++ b/src/Umbraco.Core/Models/UmbracoDomain.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -23,7 +22,7 @@ public UmbracoDomain(string domainName, string languageIsoCode)
         private int? _contentId;
         private int? _languageId;
         private string _domainName;
-        
+
         [DataMember]
         public int? LanguageId
         {

From 3c3b9e39464bc0721f7661ad0b0d9d7f58e8aa34 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Feb 2019 12:55:04 +0100
Subject: [PATCH 272/421] Fixes

---
 src/Umbraco.Core/Models/ContentBase.cs     | 29 +++++++++++-----------
 src/Umbraco.Tests/Models/ContentTests.cs   | 15 +++++++++++
 src/Umbraco.Tests/Models/VariationTests.cs | 13 ++++------
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 1389f01fc87e..51730c3b4d13 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -367,25 +367,26 @@ public virtual void CopyFrom(IContent other, string culture = "*")
         /// <inheritdoc />
         public virtual Property[] ValidateProperties(string culture = "*")
         {
-            var alsoInvariant = culture != null && culture != "*";
-
+            // select invalid properties
             return Properties.Where(x =>
-                {
-                    var supportVariation = x.PropertyType.SupportsVariation(culture, "*", true);
+            {
+                // if culture is null, we validate invariant properties only
+                // if culture is '*' we validate both variant and invariant properties, automatically
+                // if culture is specific eg 'en-US' we both too, but explicitly
 
-                    if (supportVariation)
-                    {
-                        // If the property support variation then we report an error
-                        // when property is invalid for current culture OR property is invalid for invariant
-                        return !x.IsValid(culture) || (alsoInvariant && !x.IsValid(null));
-                    }
+                var varies = x.PropertyType.VariesByCulture();
 
-                    // Else we report error if the property is invalid for the default language
-                    return !x.IsValid();
+                if (culture == null)
+                    return !(varies || x.IsValid(null)); // validate invariant property, invariant culture
 
+                if (culture == "*")
+                    return !x.IsValid(culture); // validate property, all cultures
 
-                })
-                .ToArray();
+                return varies
+                    ? !x.IsValid(culture) // validate variant property, explicit culture
+                    : !x.IsValid(null); // validate invariant property, explicit culture
+            })
+            .ToArray();
         }
 
         #endregion
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 862925db2c34..160428b5e452 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -8,16 +8,19 @@
 using Umbraco.Core;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.Composers;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
+using Umbraco.Web.PropertyEditors;
 
 namespace Umbraco.Tests.Models
 {
@@ -34,6 +37,18 @@ protected override void Compose()
 
             Composition.Register(_ => Mock.Of<IDataTypeService>());
             Composition.Register(_ => Mock.Of<IContentSection>());
+
+            // all this is required so we can validate properties...
+            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>()) { Alias = "test" };
+            Composition.Register(_ => new DataEditorCollection(new [] { editor }));
+            Composition.Register<PropertyEditorCollection>();
+            var dataType = Mock.Of<IDataType>();
+            Mock.Get(dataType).Setup(x => x.Configuration).Returns(() => new object());
+            var dataTypeService = Mock.Of<IDataTypeService>();
+            Mock.Get(dataTypeService)
+                .Setup(x => x.GetDataType(It.IsAny<int>()))
+                .Returns(() => dataType);
+            Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService));
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Models/VariationTests.cs b/src/Umbraco.Tests/Models/VariationTests.cs
index 7c1ef3f58099..0ccdabe92822 100644
--- a/src/Umbraco.Tests/Models/VariationTests.cs
+++ b/src/Umbraco.Tests/Models/VariationTests.cs
@@ -382,15 +382,12 @@ public void ContentPublishValuesWithMixedPropertyTypeVariations()
 
             Assert.IsFalse(content.PublishCulture(langFr)); // fails because prop1 is mandatory
             content.SetValue("prop1", "a", langFr);
-            Assert.IsTrue(content.PublishCulture(langFr));
-            Assert.AreEqual("a", content.GetValue("prop1", langFr, published: true));
-            //this will be null because we tried to publish values for a specific culture but this property is invariant
-            Assert.IsNull(content.GetValue("prop2", published: true));
+            Assert.IsFalse(content.PublishCulture(langFr)); // fails because prop2 is mandatory and invariant
+            content.SetValue("prop2", "x");
+            Assert.IsTrue(content.PublishCulture(langFr)); // now it's ok
 
-            Assert.IsFalse(content.PublishCulture()); // fails because prop2 is mandatory
-            content.SetValue("prop2", "b");
-            Assert.IsTrue(content.PublishCulture());
-            Assert.AreEqual("b", content.GetValue("prop2", published: true));
+            Assert.AreEqual("a", content.GetValue("prop1", langFr, published: true));
+            Assert.AreEqual("x", content.GetValue("prop2", published: true));
         }
 
         [Test]

From 327b820a25684a08d0b6c14d8eade4a1a37a4176 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 4 Feb 2019 12:59:58 +0100
Subject: [PATCH 273/421] Fixed broken test

---
 .../Repositories/DataTypeDefinitionRepositoryTest.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
index b9724b0770b9..2d999f00cdc1 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
@@ -192,7 +192,7 @@ public void Can_Perform_Get_On_DataTypeDefinitionRepository()
             {
                 var repository = CreateRepository();
                 // Act
-                var dataTypeDefinition = repository.Get(-42);
+                var dataTypeDefinition = repository.Get(Constants.DataTypes.DropDownSingle);
 
                 // Assert
                 Assert.That(dataTypeDefinition, Is.Not.Null);

From d3eb48cef9997a838f4272c6d1420d070cae6730 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 4 Feb 2019 13:28:23 +0100
Subject: [PATCH 274/421] Fixes #4388 File uploads no longer has dragover
 styles

---
 .../src/views/components/upload/umb-file-dropzone.html          | 2 +-
 .../src/views/packages/views/install-local.html                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
index c99655b7fcb5..a379a0582900 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
@@ -8,7 +8,7 @@
         ng-model="filesHolder"
         ngf-change="handleFiles($files, $event)"
         class="dropzone"
-        ngf-drag-over-class="drag-over"
+        ngf-drag-over-class="'drag-over'"
         ngf-multiple="true"
         ngf-allow-dir="true"
         ngf-pattern="{{ accept }}"
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
index 6d95bcafa742..718992c25ad2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
@@ -12,7 +12,7 @@
                      ng-model="filesHolder"
                      ngf-change="handleFiles($files, $event)"
                      class="umb-upload-local__dropzone"
-                     ngf-drag-over-class="drag-over"
+                     ngf-drag-over-class="'drag-over'"
                      ngf-multiple="false"
                      ngf-allow-dir="false"
                      ngf-pattern="*.zip"

From bd4b4620d4d001ac5555f9c573d0bb38dc657236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 4 Feb 2019 13:34:26 +0100
Subject: [PATCH 275/421] First part of refactoring umb-editor-navigation

---
 .../editor/umbeditornavigation.directive.js   | 13 +++---
 .../umbeditornavigationitem.directive.js      | 40 +++++++++++++++++++
 .../src/less/canvas-designer.less             |  1 +
 .../components/umb-editor-navigation.less     | 22 +++++-----
 src/Umbraco.Web.UI.Client/src/less/navs.less  |  1 +
 .../editor/umb-editor-navigation-item.html    | 12 ++++++
 .../editor/umb-editor-navigation.html         | 36 ++++++-----------
 .../src/views/components/umb-dropdown.html    |  2 +-
 8 files changed, 88 insertions(+), 39 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
index 943d2232c257..6b269ad17efe 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
@@ -17,14 +17,17 @@
                 name: "More"
             };
 
-            scope.clickNavigationItem = function (selectedItem) {
+            scope.openNavigationItem = function (item) {
+                
+                console.log("openNavigationItem", item)
+                
                 scope.showDropdown = false;
-                runItemAction(selectedItem);
-                setItemToActive(selectedItem);
+                runItemAction(item);
+                setItemToActive(item);
                 if(scope.onSelect) {
-                    scope.onSelect({"item": selectedItem});
+                    scope.onSelect({"item": item});
                 }
-                eventsService.emit("app.tabChange", selectedItem);
+                eventsService.emit("app.tabChange", item);
             };
 
             scope.toggleDropdown = function () {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
new file mode 100644
index 000000000000..60a5a54d0fc6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
@@ -0,0 +1,40 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbTabContent
+@restrict E
+@scope
+
+@description
+Use this directive to render tab content. For an example see: {@link umbraco.directives.directive:umbTabContent umbTabContent}
+
+@param {string=} tab The tab.
+
+**/
+(function () {
+    'use strict';
+    
+    function UmbEditorNavigationItemController($scope, $element, $attrs) {
+        
+        console.log("LINKKK!")
+        var vm = this;
+        
+        this.callbackOpen = function(item) {
+            console.log("callbackOpen")
+            vm.open({item:vm.item});
+        };
+    }
+    
+    angular
+        .module('umbraco.directives.html')
+        .component('umbEditorNavigationItem', {
+            templateUrl: 'views/components/editor/umb-editor-navigation-item.html',
+            controller: UmbEditorNavigationItemController,
+            controllerAs: 'vm',
+            bindings: {
+                item: '=',
+                open: '&',
+                index: '@'
+            }
+        });
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index 7f67d5c3b201..d1492a33c6f3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -176,6 +176,7 @@ a, a:hover{
 
 .dropdown-menu {
     position: absolute;
+    display: block;
     top: auto;
     right: 0;
     z-index: 1000;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
index c1f099c2a5ee..f4bbeadc3f0e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
@@ -106,29 +106,25 @@
   line-height: 1em;
 }
 
-.umb-sub-views-nav-item__more {
+.umb-sub-views-nav-item-more__icon {
   margin-bottom: 10px;
 }
 
-.umb-sub-views-nav-item__more i {
+.umb-sub-views-nav-item-more__icon i {
 	height: 5px;
   width: 5px;
   border-radius: 50%;
-  background: @gray-3;
+  background: @ui-active-type;// fallback if browser doesnt support currentColor
+  background: currentColor;
   display: inline-block;
   margin: 0 5px 0 0;
 }
 
-.umb-sub-views-nav-item__more i:last-of-type {
+.umb-sub-views-nav-item-more__icon i:last-of-type {
   margin-right: 0;
 }
 
-// make dots green the an item is active
-.umb-sub-views-nav-item.is-active .umb-sub-views-nav-item__more i {
-  background-color: @ui-active;
-}
-
-.umb-sub-views-nav__dropdown.umb-sub-views-nav__dropdown {
+.umb-sub-views-nav-item-more__dropdown {
   left: auto;
   right: 0;
   display: grid;
@@ -136,3 +132,9 @@
   min-width: auto;
   margin-top: 10px;
 }
+.umb-sub-views-nav-item-more__dropdown > li {
+    display: flex;
+}
+.umb-sub-views-nav-item-more__dropdown .umb-sub-views-nav-item:first {
+    border-left: none;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less
index 0101113670d2..a2710fab6cdd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/navs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/navs.less
@@ -220,6 +220,7 @@
 // DROPDOWNS
 // ---------
 .dropdown-menu {
+    display: block;
   border-radius: @dropdownBorderRadius;
   box-shadow: 0 5px 20px rgba(0,0,0,.3);
   padding-top: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
new file mode 100644
index 000000000000..002e9adfc045
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
@@ -0,0 +1,12 @@
+<a data-element="sub-view-{{vm.item.alias}}"
+    tabindex="-1"
+    class="umb-sub-views-nav-item"
+    ng-href=""
+    ng-click="vm.callbackOpen(vm.item)"
+    hotkey="{{vm.index+1}}"
+    hotkey-when-hidden="true"
+    ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError}">
+    <i class="icon {{ vm.item.icon }}"></i>
+    <span class="umb-sub-views-nav-item-text">{{ vm.item.name }}</span>
+    <div ng-show="item.badge" class="badge -type-{{vm.item.badge.type}}">{{vm.item.badge.count}}</div>
+</a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
index e278a8c40155..1bc7c5ff4ada 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
@@ -3,42 +3,32 @@
     <li ng-repeat="item in navigation | limitTo: itemsLimit ">
         <div ng-show="item.alias !== 'more'"
             ng-class="item.errorClass">
-            <a data-element="sub-view-{{item.alias}}"
-               tabindex="-1"
-               class="umb-sub-views-nav-item js-umb-sub-views-nav-item"
-               href=""
-               ng-click="clickNavigationItem(item, $index)"
-               hotkey="{{$index+1}}"
-               ng-class="{'is-active': item.active, '-has-error': item.hasError}">
-                <i class="icon {{ item.icon }}"></i>
-                <span class="umb-sub-views-nav-item-text">{{ item.name }}</span>
-                <div ng-show="item.badge" class="badge -type-{{item.badge.type}}">{{item.badge.count}}</div>
-            </a>
+            <umb-editor-navigation-item
+                item="item"
+                open="openNavigationItem"
+                index="{{$index}}">
+            </umb-editor-navigation-item>
         </div>
     </li>
 
     <li ng-show="showMoreButton" style="position: relative;">
 
         <a data-element="sub-view-{{moreButton.alias}}"
-            class="umb-sub-views-nav-item"
+            class="umb-sub-views-nav-item umb-sub-views-nav-item-more"
             href=""
             ng-click="toggleDropdown()"
             ng-class="{'is-active': moreButton.active}">
-            <div class="umb-sub-views-nav-item__more"><i></i><i></i><i></i></div>
+            <div class="umb-sub-views-nav-item-more__icon"><i></i><i></i><i></i></div>
             <span class="umb-sub-views-nav-item-text">{{ moreButton.name }}</span>
         </a>
 
-        <umb-dropdown ng-show="showDropdown" on-close="hideDropdown()" class="umb-sub-views-nav__dropdown">
+        <umb-dropdown ng-show="showDropdown" on-close="hideDropdown()" class="umb-sub-views-nav-item-more__dropdown">
             <umb-dropdown-item ng-repeat="item in navigation | limitTo: overflowingItems">
-                <a data-element="sub-view-{{item.alias}}"
-                    style="display: flex; border: none;"
-                    class="umb-sub-views-nav-item"
-                    ng-href=""
-                    ng-click="clickNavigationItem(item, $index)"
-                    ng-class="{'is-active': item.active, '-has-error': item.hasError}">
-                    <i class="icon {{ item.icon }}"></i>
-                    <span class="umb-sub-views-nav-item-text">{{ item.name }}</span>
-                </a>
+                <umb-editor-navigation-item
+                    item="item"
+                    open="openNavigationItem"
+                    index="{{$index}}">
+                </umb-editor-navigation-item>
             </umb-dropdown-item>
         </umb-dropdown>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html
index 141793f6b1b8..2f241865971f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html
@@ -1 +1 @@
-<ul class="dropdown-menu db" on-outside-click="close()" ng-transclude></ul>
\ No newline at end of file
+<ul class="dropdown-menu" on-outside-click="close()" ng-transclude></ul>

From e636f12459ced0ca91285f45127a4167efb7380f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Feb 2019 09:03:54 +0100
Subject: [PATCH 276/421] Fix leak in BackgroundTaskRunner

---
 .../Scheduling/BackgroundTaskRunner.cs        | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
index d9e3c3c98045..47e97593f057 100644
--- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
+++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
@@ -355,6 +355,8 @@ public void Shutdown(bool force, bool wait)
                 // break latched tasks
                 // stop processing the queue
                 _shutdownTokenSource.Cancel(false); // false is the default
+                _shutdownTokenSource.Dispose();
+                _shutdownTokenSource = null;
             }
 
             // tasks in the queue will be executed...
@@ -379,28 +381,38 @@ private async Task Pump()
                     _cancelTokenSource = CancellationTokenSource.CreateLinkedTokenSource(_shutdownToken);
                 }
 
-                // wait for latch should return the task
-                // if it returns null it's either that the task has been cancelled
-                // or the whole runner is going down - in both cases, continue,
-                // and GetNextBackgroundTask will take care of shutdowns
-                bgTask = await WaitForLatch(bgTask, _cancelTokenSource.Token);
-                if (bgTask == null) continue;
-
-                // executes & be safe - RunAsync should NOT throw but only raise an event,
-                // but... just make sure we never ever take everything down
                 try
                 {
-                    await RunAsync(bgTask, _cancelTokenSource.Token).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<BackgroundTaskRunner>(ex, "{LogPrefix} Task runner exception", _logPrefix);
-                }
+                    // wait for latch should return the task
+                    // if it returns null it's either that the task has been cancelled
+                    // or the whole runner is going down - in both cases, continue,
+                    // and GetNextBackgroundTask will take care of shutdowns
+                    bgTask = await WaitForLatch(bgTask, _cancelTokenSource.Token);
 
-                // done
-                lock (_locker)
+                    if (bgTask != null)
+                    {
+                        // executes & be safe - RunAsync should NOT throw but only raise an event,
+                        // but... just make sure we never ever take everything down
+                        try
+                        {
+                            await RunAsync(bgTask, _cancelTokenSource.Token).ConfigureAwait(false);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Error<BackgroundTaskRunner>(ex, "{LogPrefix} Task runner exception", _logPrefix);
+                        }
+                    }
+                }
+                finally
                 {
-                    _cancelTokenSource = null;
+                    // done
+                    lock (_locker)
+                    {
+                        // always dispose CancellationTokenSource when you are done using them
+                        // https://lowleveldesign.org/2015/11/30/catch-in-cancellationtokensource/
+                        _cancelTokenSource.Dispose();
+                        _cancelTokenSource = null;
+                    }
                 }
             }
         }

From 3c65770008578894a00d60366ef1ddd0ff73559d Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Feb 2019 14:08:35 +0100
Subject: [PATCH 277/421] Upgrade ModelsBuilder, cleanup

---
 build/NuSpecs/UmbracoCms.nuspec                     |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj            |  2 +-
 src/Umbraco.Web/JavaScript/ServerVariablesParser.cs | 11 -----------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 05a6f4ca0eb1..b0f30b9779fd 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -22,7 +22,7 @@
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
             <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
-            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.35]" />
+            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.36]" />
             <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
             <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
             <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 02e24ddbb658..7c3293183ddb 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -105,7 +105,7 @@
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
-      <Version>8.0.0-alpha.35</Version>
+      <Version>8.0.0-alpha.36</Version>
     </PackageReference>
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>
diff --git a/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs b/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
index 6824d02d182e..8f27f5814399 100644
--- a/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
+++ b/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
@@ -2,19 +2,10 @@
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 
-namespace Umbraco.Web.UI.JavaScript
-{
-    //fixme delete this when Models Builder is updated
-    public sealed class ServerVariablesParser : global::Umbraco.Web.JavaScript.ServerVariablesParser
-    {
-    }
-}
-
 namespace Umbraco.Web.JavaScript
 {
     public class ServerVariablesParser
     {
-
         /// <summary>
         /// Allows developers to add custom variables on parsing
         /// </summary>
@@ -31,8 +22,6 @@ internal static string Parse(Dictionary<string, object> items)
 
             var json = JObject.FromObject(items);
             return vars.Replace(Token, json.ToString());
-
         }
-
     }
 }

From 09255019b22d4dc8d3c0ea3d29793db18b001b34 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 5 Feb 2019 01:22:52 +1100
Subject: [PATCH 278/421] removes CommitDocumentChanges from the public
 interface

---
 src/Umbraco.Core/Services/IContentService.cs    | 15 ---------------
 .../Services/Implement/ContentService.cs        | 17 +++++++++++++++--
 .../Services/ContentServiceTests.cs             | 12 ++++++++----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index ad97ba2ddc27..600921ee787d 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -363,21 +363,6 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <returns></returns>
         PublishResult SaveAndPublish(IContent content, string[] cultures, int userId = 0, bool raiseEvents = true);
 
-        /// <summary>
-        /// Expert: Saves a document and publishes/unpublishes any pending publishing changes made to the document.
-        /// </summary>
-        /// <remarks>
-        /// <para>Pending publishing/unpublishing changes on a document are made with calls to <see cref="IContent.PublishCulture"/> and
-        /// <see cref="IContent.UnpublishCulture"/>.</para>
-        /// <para>When publishing or unpublishing a single culture, or all cultures, use <see cref="SaveAndPublish"/>
-        /// and <see cref="Unpublish"/>. But if the flexibility to both publish and unpublish in a single operation is required
-        /// then this method needs to be used in combination with <see cref="IContent.PublishCulture"/> and <see cref="IContent.UnpublishCulture"/>
-        /// on the content itself - this prepares the content, but does not commit anything - and then, invoke
-        /// <see cref="CommitDocumentChanges"/> to actually commit the changes to the database.</para>
-        /// <para>The document is *always* saved, even when publishing fails.</para>
-        /// </remarks>
-        PublishResult CommitDocumentChanges(IContent content, int userId = 0, bool raiseEvents = true);
-
         /// <summary>
         /// Saves and publishes a document branch.
         /// </summary>
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 404adeea7235..adc6c919f1e7 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -965,8 +965,21 @@ public PublishResult Unpublish(IContent content, string culture = "*", int userI
             return CommitDocumentChanges(content, userId);
         }
 
-        /// <inheritdoc />
-        public PublishResult CommitDocumentChanges(IContent content, int userId = 0, bool raiseEvents = true)
+        /// <summary>
+        /// Saves a document and publishes/unpublishes any pending publishing changes made to the document.
+        /// </summary>
+        /// <remarks>
+        /// <para>This is the underlying logic for both publishing and unpublishing any document</para>
+        /// <para>Pending publishing/unpublishing changes on a document are made with calls to <see cref="IContent.PublishCulture"/> and
+        /// <see cref="IContent.UnpublishCulture"/>.</para>
+        /// <para>When publishing or unpublishing a single culture, or all cultures, use <see cref="SaveAndPublish"/>
+        /// and <see cref="Unpublish"/>. But if the flexibility to both publish and unpublish in a single operation is required
+        /// then this method needs to be used in combination with <see cref="IContent.PublishCulture"/> and <see cref="IContent.UnpublishCulture"/>
+        /// on the content itself - this prepares the content, but does not commit anything - and then, invoke
+        /// <see cref="CommitDocumentChanges"/> to actually commit the changes to the database.</para>
+        /// <para>The document is *always* saved, even when publishing fails.</para>
+        /// </remarks>
+        internal PublishResult CommitDocumentChanges(IContent content, int userId = 0, bool raiseEvents = true)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 3e21768f97f1..7dd6c7ba0390 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -1035,6 +1035,8 @@ public void Can_Publish_Only_Valid_Content()
         [Test]
         public void Can_Publish_And_Unpublish_Cultures_In_Single_Operation()
         {
+            //TODO: This is using an internal API - we aren't exposing this publicly (at least for now) but we'll keep the test around
+
             var langFr = new Language("fr");
             var langDa = new Language("da");
             ServiceContext.LocalizationService.Save(langFr);
@@ -1049,7 +1051,7 @@ public void Can_Publish_And_Unpublish_Cultures_In_Single_Operation()
             content.SetCultureName("name-da", langDa.IsoCode);
 
             content.PublishCulture(langFr.IsoCode);
-            var result = ServiceContext.ContentService.CommitDocumentChanges(content);
+            var result = ((ContentService)ServiceContext.ContentService).CommitDocumentChanges(content);
             Assert.IsTrue(result.Success);
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
@@ -1058,7 +1060,7 @@ public void Can_Publish_And_Unpublish_Cultures_In_Single_Operation()
             content.UnpublishCulture(langFr.IsoCode);
             content.PublishCulture(langDa.IsoCode);
 
-            result = ServiceContext.ContentService.CommitDocumentChanges(content);
+            result = ((ContentService)ServiceContext.ContentService).CommitDocumentChanges(content);
             Assert.IsTrue(result.Success);
             Assert.AreEqual(PublishResultType.SuccessMixedCulture, result.Result);
 
@@ -2893,8 +2895,10 @@ public void Can_SaveRead_Variations()
             // act
 
             // that HAS to be SavePublishing, because SaveAndPublish would just republish everything!
-
-            contentService.CommitDocumentChanges(content);
+            //TODO: This is using an internal API - the test can't pass without this but we want to keep the test here
+            // will need stephane to have a look at this test at some stage since there is a lot of logic here that we
+            // want to keep on testing but don't need the public API to do these more complicated things.
+            ((ContentService)contentService).CommitDocumentChanges(content);
 
             // content has been re-published,
             // everything is back to what it was before being unpublished

From a5947356e756bab88beccd2f13fb164146ad5578 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 5 Feb 2019 01:58:18 +1100
Subject: [PATCH 279/421] Removes WasCulturePublished from IContent

---
 src/Umbraco.Core/ContentExtensions.cs           | 10 ++++++++--
 src/Umbraco.Core/Models/Content.cs              | 17 ++---------------
 src/Umbraco.Core/Models/IContent.cs             |  8 --------
 .../Repositories/IDocumentRepository.cs         |  2 ++
 .../Implement/DocumentRepository.cs             |  3 ++-
 .../Services/Implement/ContentService.cs        | 15 ++++++++++++---
 .../Services/ContentServiceTests.cs             | 17 +++++------------
 7 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 9fcc12bc1083..44e990721017 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -56,15 +56,21 @@ public static ContentStatus GetStatus(this IContent content, string culture = nu
         /// Gets the cultures that have been flagged for unpublishing.
         /// </summary>
         /// <remarks>Gets cultures for which content.UnpublishCulture() has been invoked.</remarks>
-        internal static IReadOnlyList<string> GetCulturesUnpublishing(this IContent content)
+        internal static IReadOnlyList<string> GetCulturesUnpublishing(this IContent content, IContent persisted)
         {
+            //TODO: The reason we need a ref to the original persisted IContent is to check if it is published
+            // however, for performance reasons we could pass in a ContentCultureInfosCollection which could be
+            // resolved from the database much more quickly than resolving an entire IContent object.
+            // That said, the GetById on the IContentService will return from cache so might not be something to worry about.
+
+
             if (!content.Published || !content.ContentType.VariesByCulture() || !content.IsPropertyDirty("PublishCultureInfos"))
                 return Array.Empty<string>();
 
             var culturesChanging = content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key);
             return culturesChanging
                 .Where(x => !content.IsCulturePublished(x) && // is not published anymore
-                            content.WasCulturePublished(x))   // but was published before
+                            persisted != null && persisted.IsCulturePublished(x))   // but was published before
                 .ToList();
         }
         
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 84ccc42a77e0..63ab65b8fec4 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -19,7 +19,6 @@ public class Content : ContentBase, IContent
         private bool _published;
         private PublishedState _publishedState;
         private ContentCultureInfosCollection _publishInfos;
-        private ContentCultureInfosCollection _publishInfosOrig;
         private HashSet<string> _editedCultures;
 
         /// <summary>
@@ -201,11 +200,6 @@ public bool IsCulturePublished(string culture)
             // a non-available culture could not become published anyways
             => _publishInfos != null && _publishInfos.ContainsKey(culture);
 
-        /// <inheritdoc />
-        public bool WasCulturePublished(string culture)
-            // just check _publishInfosOrig - a copy of _publishInfos
-            // a non-available culture could not become published anyways
-            => _publishInfosOrig != null && _publishInfosOrig.ContainsKey(culture);
 
         // adjust dates to sync between version, cultures etc
         // used by the repo when persisting
@@ -216,9 +210,8 @@ internal void AdjustDates(DateTime date)
                 if (_publishInfos == null || !_publishInfos.TryGetValue(culture, out var publishInfos))
                     continue;
 
-                if (_publishInfosOrig != null && _publishInfosOrig.TryGetValue(culture, out var publishInfosOrig)
-                    && publishInfosOrig.Date == publishInfos.Date)
-                    continue;
+                //fixme: Removing the logic here for the old WasCulturePublished and the _publishInfosOrig has broken
+                // the test Can_Rollback_Version_On_Multilingual, but we need to understand what it's doing since I don't
 
                 _publishInfos.AddOrUpdate(culture, publishInfos.Name, date);
 
@@ -449,12 +442,6 @@ public override void ResetDirtyProperties(bool rememberDirty)
             // take care of the published state
             _publishedState = _published ? PublishedState.Published : PublishedState.Unpublished;
 
-            // Make a copy of the _publishInfos, this is purely so that we can detect
-            // if this entity's previous culture publish state (regardless of the rememberDirty flag)
-            _publishInfosOrig = _publishInfos == null
-                ? null
-                : new ContentCultureInfosCollection(_publishInfos);
-
             if (_publishInfos == null) return;
 
             foreach (var infos in _publishInfos)
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index 1d85a735b5be..f468df59aba8 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -84,14 +84,6 @@ public interface IContent : IContentBase
         /// </remarks>
         bool IsCulturePublished(string culture);
 
-        /// <summary>
-        /// Gets a value indicating whether a culture was published.
-        /// </summary>
-        /// <remarks>
-        /// <para>Mirrors <see cref="IsCulturePublished"/> whenever the content item is saved.</para>
-        /// </remarks>
-        bool WasCulturePublished(string culture);
-
         /// <summary>
         /// Gets the date a culture was published.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
index fc5382499f29..d49c92f1bf09 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
@@ -7,6 +7,8 @@ namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IDocumentRepository : IContentRepository<int, IContent>, IReadRepository<Guid, IContent>
     {
+
+
         /// <summary>
         /// Clears the publishing schedule for all entries having an a date before (lower than, or equal to) a specified date.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 6af7031883b8..9b4175b63f76 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -1127,7 +1127,7 @@ private IContent MapDtoToContent(DocumentDto dto)
 
                 // TODO: shall we get published properties or not?
                 //var publishedVersionId = dto.Published ? dto.PublishedVersionDto.Id : 0;
-                var publishedVersionId = dto.PublishedVersionDto != null ? dto.PublishedVersionDto.Id : 0;
+                var publishedVersionId = dto.PublishedVersionDto?.Id ?? 0;
 
                 var temp = new TempContent<Content>(dto.NodeId, versionId, publishedVersionId, contentType);
                 var ltemp = new List<TempContent<Content>> { temp };
@@ -1424,6 +1424,7 @@ private void EnsureVariantNamesAreUnique(Content content, bool publishing)
             }
         }
 
+        // ReSharper disable once ClassNeverInstantiated.Local
         private class CultureNodeName
         {
             public int Id { get; set; }
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index adc6c919f1e7..9c2721cbb434 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -921,6 +921,8 @@ public PublishResult SaveAndPublish(IContent content, string[] cultures, int use
         /// <inheritdoc />
         public PublishResult Unpublish(IContent content, string culture = "*", int userId = 0)
         {
+            if (content == null) throw new ArgumentNullException(nameof(content));
+
             var evtMsgs = EventMessagesFactory.Get();
 
             culture = culture.NullOrWhiteSpaceAsNull();
@@ -949,12 +951,16 @@ public PublishResult Unpublish(IContent content, string culture = "*", int userI
             // all cultures = unpublish whole
             if (culture == "*" || (!content.ContentType.VariesByCulture() && culture == null))
             {
+                //TODO: Stop casting https://github.com/umbraco/Umbraco-CMS/issues/4234
                 ((Content)content).PublishedState = PublishedState.Unpublishing;
             }
             else
             {
-                // if the culture we want to unpublish was already unpublished, nothing to do
-                if (!content.WasCulturePublished(culture))
+                // If the culture we want to unpublish was already unpublished, nothing to do.
+                // To check for that we need to lookup the persisted content item
+                var persisted = content.HasIdentity ? GetById(content.Id) : null;
+
+                if (persisted != null && !persisted.IsCulturePublished(culture))
                     return new PublishResult(PublishResultType.SuccessUnpublishAlready, evtMsgs, content);
 
                 // unpublish the culture
@@ -1025,7 +1031,10 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
 
             if (publishing)
             {
-                culturesUnpublishing = content.GetCulturesUnpublishing();
+                //to continue, we need to have a reference to the original IContent item that is currently persisted
+                var persisted = content.HasIdentity ? GetById(content.Id) : null;
+
+                culturesUnpublishing = content.GetCulturesUnpublishing(persisted);
                 culturesPublishing = variesByCulture
                         ? content.PublishCultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key).ToList()
                         : null;
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 7dd6c7ba0390..5bd37c03859c 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -763,36 +763,29 @@ public void Can_Unpublish_Content_Variation()
             content.PublishCulture(langFr.IsoCode);
             content.PublishCulture(langUk.IsoCode);
             Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsFalse(content.WasCulturePublished(langFr.IsoCode));    //not persisted yet, will be false
             Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsFalse(content.WasCulturePublished(langUk.IsoCode));    //not persisted yet, will be false
 
             var published = ServiceContext.ContentService.SaveAndPublish(content, new[]{ langFr.IsoCode , langUk.IsoCode });
+            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.IsTrue(published.Success);
             Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.WasCulturePublished(langFr.IsoCode));
             Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsTrue(content.WasCulturePublished(langUk.IsoCode));
 
             var unpublished = ServiceContext.ContentService.Unpublish(content, langFr.IsoCode);
             Assert.IsTrue(unpublished.Success);
             Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
-
             Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            //this is slightly confusing but this will be false because this method is used for checking the state of the current model,
-            //but the state on the model has changed with the above Unpublish call
-            Assert.IsFalse(content.WasCulturePublished(langFr.IsoCode));
+            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
 
             //re-get
             content = ServiceContext.ContentService.GetById(content.Id);
             Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            //this is slightly confusing but this will be false because this method is used for checking the state of a current model,
-            //but we've re-fetched from the database
-            Assert.IsFalse(content.WasCulturePublished(langFr.IsoCode));
             Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsTrue(content.WasCulturePublished(langUk.IsoCode));
+            
 
         }
 

From 2e5967ff9e56c259d2710d87a2bc98e309a9f311 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Feb 2019 17:58:36 +0100
Subject: [PATCH 280/421] Make TypeLoader less verbose

---
 src/Umbraco.Core/Composing/TypeLoader.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
index a2d6349ea0f1..08060ca65d14 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Core/Composing/TypeLoader.cs
@@ -211,7 +211,7 @@ private void WriteCacheTypesHash()
         /// file properties (false) or the file contents (true).</remarks>
         private static string GetFileHash(IEnumerable<Tuple<FileSystemInfo, bool>> filesAndFolders, IProfilingLogger logger)
         {
-            using (logger.TraceDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
+            using (logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
             {
                 // get the distinct file infos to hash
                 var uniqInfos = new HashSet<string>();
@@ -269,7 +269,7 @@ private static string RemoveCrLf(string s)
         // internal for tests
         internal static string GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, IProfilingLogger logger)
         {
-            using (logger.TraceDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
+            using (logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
             {
                 using (var generator = new HashGenerator())
                 {
@@ -666,7 +666,7 @@ private IEnumerable<Type> GetTypesInternal(
             var name = GetName(baseType, attributeType);
 
             lock (_locko)
-            using (_logger.TraceDuration<TypeLoader>(
+            using (_logger.DebugDuration<TypeLoader>(
                 "Getting " + name,
                 "Got " + name)) // cannot contain typesFound.Count as it's evaluated before the find
             {

From 1e8b8feee85eac0478470855148adc0d2849cb2b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Feb 2019 17:59:12 +0100
Subject: [PATCH 281/421] Make ContainerControllerFactory exceptions more
 explicit

---
 src/Umbraco.Web/Mvc/ContainerControllerFactory.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Mvc/ContainerControllerFactory.cs b/src/Umbraco.Web/Mvc/ContainerControllerFactory.cs
index 9262903355ef..cb732fdbb94b 100644
--- a/src/Umbraco.Web/Mvc/ContainerControllerFactory.cs
+++ b/src/Umbraco.Web/Mvc/ContainerControllerFactory.cs
@@ -16,7 +16,14 @@ public ContainerControllerFactory(IFactory container)
 
         protected override IController GetControllerInstance(RequestContext requestContext, Type controllerType)
         {
-            return (IController) _container.GetInstance(controllerType);
+            try
+            {
+                return (IController) _container.GetInstance(controllerType);
+            }
+            catch (Exception e)
+            {
+                throw new Exception($"Failed to create an instance of controller type {controllerType.FullName} (see inner exception).", e);
+            }
         }
 
         public override void ReleaseController(IController controller)

From 0061f997e98763ca0f9376cefda74063caa24416 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 4 Feb 2019 17:12:41 +0000
Subject: [PATCH 282/421] Fix up logviewer - search error/mesage drodpwon
 button to search on Goggle, GitHub, Our.Umb etc

---
 .../src/views/logviewer/search.html           | 50 +++++++++++++++----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
index dc61f987b22b..cccf620de3ec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
@@ -159,18 +159,48 @@ <h3>Properties</h3>
                                             </table>
 
                                             <div class="btn-group">
-                                                <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">
-                                                    <i class="icon-search"></i> Search
+                                                <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="log.searchDropdownOpen = !log.searchDropdownOpen">
+                                                    <i class="icon-search"></i> <localize key="general_search">Search</localize>
                                                     <span class="caret"></span>
                                                 </a>
-                                                <ul class="dropdown-menu">
-                                                    <li><a ng-href="https://www.google.com/search?q={{ log.RenderedMessage }}" target="_blank" title="Search this message with Google"><img src="https://www.google.com/favicon.ico" width="16" height="16" /> Search With Google</a></li>
-                                                    <li><a ng-href="https://www.bing.com/search?q={{ log.RenderedMessage }}" target="_blank" title="Search this message with Bing"><img src="https://www.bing.com/favicon.ico" width="16" height="16" /> Search With Bing</a></li>
-                                                    <li><a ng-href="https://our.umbraco.com/search?q={{ log.RenderedMessage }}&content=wiki,forum,documentation" target="_blank" title="Search this message on Our Umbraco forums and docs"><img src="https://our.umbraco.com/assets/images/app-icons/favicon.png" width="16" height="16" /> Search Our Umbraco</a></li>
-                                                    <li><a ng-href="https://www.google.co.uk/?q=site:our.umbraco.org {{ log.RenderedMessage }}&safe=off#q=site:our.umbraco.org {{ log.RenderedMessage }} {{ log.Properties['SourceContext'].Value }}&safe=off" target="_blank" title="Search Our Umbraco forums using Google"><img src="https://www.google.com/favicon.ico" width="16" height="16" /> Search Our with Google</a></li>
-                                                    <li><a ng-href="https://github.com/umbraco/Umbraco-CMS/search?q={{ log.Properties['SourceContext'].Value }}" target="_blank" title="Search within Umbraco source code on Github"><img src="https://www.github.com/favicon.ico" width="16" height="16" /> Search Umbraco Source</a></li>
-                                                    <li><a ng-href="https://github.com/umbraco/Umbraco-CMS/issues?q={{ log.Properties['SourceContext'].Value }}" target="_blank" title="Search Umbraco Issues on Github"><img src="https://www.github.com/favicon.ico" width="16" height="16" /> Search Umbraco Issues</a></li>
-                                                </ul>
+
+                                                <umb-dropdown ng-if="log.searchDropdownOpen" on-close="log.searchDropdownOpen = false">
+                                                    <umb-dropdown-item>
+                                                        <a ng-href="https://www.google.com/search?q={{ log.RenderedMessage }}" target="_blank" title="Search this message with Google">
+                                                            <img src="https://www.google.com/favicon.ico" width="16" height="16" /> Search With Google
+                                                        </a>
+                                                    </umb-dropdown-item>
+
+                                                    <umb-dropdown-item>
+                                                        <a ng-href="https://www.bing.com/search?q={{ log.RenderedMessage }}" target="_blank" title="Search this message with Bing">
+                                                            <img src="https://www.bing.com/favicon.ico" width="16" height="16" /> Search With Bing
+                                                        </a>
+                                                    </umb-dropdown-item>
+
+                                                    <umb-dropdown-item>
+                                                        <a ng-href="https://our.umbraco.com/search?q={{ log.RenderedMessage }}&content=wiki,forum,documentation" target="_blank" title="Search this message on Our Umbraco forums and docs">
+                                                            <img src="https://our.umbraco.com/assets/images/app-icons/favicon.png" width="16" height="16" /> Search Our Umbraco
+                                                        </a>
+                                                    </umb-dropdown-item>
+
+                                                    <umb-dropdown-item>
+                                                        <a ng-href="https://www.google.co.uk/?q=site:our.umbraco.org {{ log.RenderedMessage }}&safe=off#q=site:our.umbraco.org {{ log.RenderedMessage }} {{ log.Properties['SourceContext'].Value }}&safe=off" target="_blank" title="Search Our Umbraco forums using Google">
+                                                            <img src="https://www.google.com/favicon.ico" width="16" height="16" /> Search Our Umbraco with Google
+                                                        </a>
+                                                    </umb-dropdown-item>
+
+                                                    <umb-dropdown-item>
+                                                        <a ng-href="https://github.com/umbraco/Umbraco-CMS/search?q={{ log.Properties['SourceContext'].Value }}" target="_blank" title="Search within Umbraco source code on Github">
+                                                            <img src="https://www.github.com/favicon.ico" width="16" height="16" /> Search Umbraco Source
+                                                        </a>
+                                                    </umb-dropdown-item>
+
+                                                    <umb-dropdown-item>
+                                                        <a ng-href="https://github.com/umbraco/Umbraco-CMS/issues?q={{ log.Properties['SourceContext'].Value }}" target="_blank" title="Search Umbraco Issues on Github">
+                                                            <img src="https://www.github.com/favicon.ico" width="16" height="16" /> Search Umbraco Issues
+                                                        </a>
+                                                    </umb-dropdown-item>
+                                                </umb-dropdown>
                                             </div>
 
                                         </td>

From be881ba9ca7261d9a4a85a95338406025f5682e5 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 4 Feb 2019 20:09:17 +0100
Subject: [PATCH 283/421] Fix the redirect tracking composer

---
 src/Umbraco.Web/Routing/RedirectTrackingComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
index 1130f0880fe6..75ab4ad61319 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
@@ -12,6 +12,6 @@ namespace Umbraco.Web.Routing
     /// <para>recycle bin = moving to and from does nothing: to = the node is gone, where would we redirect? from = same</para>
     /// </remarks>
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
-    public class RedirectTrackingComposer : ComponentComposer<RelateOnCopyComponent>, ICoreComposer
+    public class RedirectTrackingComposer : ComponentComposer<RedirectTrackingComponent>, ICoreComposer
     { }
 }

From 9f612465cf954eb349acdad06519b1c203dab800 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 5 Feb 2019 14:13:03 +1100
Subject: [PATCH 284/421] Cleans up IContent/IContentBase, no more internal
 methods or setters, moves manipulation used by the DocumentRepository to ext
 methods

---
 src/Umbraco.Core/ContentExtensions.cs         |   2 +-
 src/Umbraco.Core/Models/Content.cs            | 207 ++++--------------
 src/Umbraco.Core/Models/ContentBase.cs        |  75 +++----
 .../Models/ContentRepositoryExtensions.cs     | 159 ++++++++++++++
 src/Umbraco.Core/Models/IContent.cs           |  41 +---
 src/Umbraco.Core/Models/IContentBase.cs       |   6 +-
 .../Implement/DocumentRepository.cs           |  62 +++---
 .../Services/Implement/ContentService.cs      |  10 +-
 .../Services/Implement/NotificationService.cs |   8 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 src/Umbraco.Tests/Models/ContentTests.cs      |  12 +-
 .../PublishedContentHashtableConverter.cs     |   4 +-
 .../NuCache/PublishedSnapshotService.cs       |   7 +-
 13 files changed, 302 insertions(+), 292 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/ContentRepositoryExtensions.cs

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 44e990721017..b2bf29cc5f0c 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -67,7 +67,7 @@ internal static IReadOnlyList<string> GetCulturesUnpublishing(this IContent cont
             if (!content.Published || !content.ContentType.VariesByCulture() || !content.IsPropertyDirty("PublishCultureInfos"))
                 return Array.Empty<string>();
 
-            var culturesChanging = content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key);
+            var culturesChanging = content.CultureInfos.Values.Where(x => x.IsDirty()).Select(x => x.Culture);
             return culturesChanging
                 .Where(x => !content.IsCulturePublished(x) && // is not published anymore
                             persisted != null && persisted.IsCulturePublished(x))   // but was published before
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 63ab65b8fec4..09b0b4183920 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -128,15 +128,16 @@ public int? TemplateId
         /// <summary>
         /// Gets or sets a value indicating whether this content item is published or not.
         /// </summary>
+        /// <remarks>
+        /// the setter is should only be invoked from
+        /// - the ContentFactory when creating a content entity from a dto
+        /// - the ContentRepository when updating a content entity
+        /// </remarks>
         [DataMember]
         public bool Published
         {
             get => _published;
-
-            // the setter is internal and should only be invoked from
-            // - the ContentFactory when creating a content entity from a dto
-            // - the ContentRepository when updating a content entity
-            internal set
+            set
             {
                 SetPropertyValueAndDetectChanges(value, ref _published, nameof(Published));
                 _publishedState = _published ? PublishedState.Published : PublishedState.Unpublished;
@@ -162,7 +163,7 @@ public PublishedState PublishedState
         }
 
         [IgnoreDataMember]
-        public bool Edited { get; internal set; }
+        public bool Edited { get; set; }
 
         /// <summary>
         /// Gets the ContentType used by this content object
@@ -172,23 +173,27 @@ public PublishedState PublishedState
 
         /// <inheritdoc />
         [IgnoreDataMember]
-        public DateTime? PublishDate { get; internal set; } // set by persistence
+        public DateTime? PublishDate { get; set; } // set by persistence
 
         /// <inheritdoc />
         [IgnoreDataMember]
-        public int? PublisherId { get; internal set; } // set by persistence
+        public int? PublisherId { get; set; } // set by persistence
 
         /// <inheritdoc />
         [IgnoreDataMember]
-        public int? PublishTemplateId { get; internal set; } // set by persistence
+        public int? PublishTemplateId { get; set; } // set by persistence
 
         /// <inheritdoc />
         [IgnoreDataMember]
-        public string PublishName { get; internal set; } // set by persistence
+        public string PublishName { get; set; } // set by persistence
 
         /// <inheritdoc />
         [IgnoreDataMember]
-        public IEnumerable<string> EditedCultures => CultureInfos.Keys.Where(IsCultureEdited);
+        public IEnumerable<string> EditedCultures
+        {
+            get => CultureInfos.Keys.Where(IsCultureEdited);
+            set => _editedCultures = value == null ? null : new HashSet<string>(value, StringComparer.OrdinalIgnoreCase);
+        }
 
         /// <inheritdoc />
         [IgnoreDataMember]
@@ -199,27 +204,7 @@ public bool IsCulturePublished(string culture)
             // just check _publishInfos
             // a non-available culture could not become published anyways
             => _publishInfos != null && _publishInfos.ContainsKey(culture);
-
-
-        // adjust dates to sync between version, cultures etc
-        // used by the repo when persisting
-        internal void AdjustDates(DateTime date)
-        {
-            foreach (var culture in PublishedCultures.ToList())
-            {
-                if (_publishInfos == null || !_publishInfos.TryGetValue(culture, out var publishInfos))
-                    continue;
-
-                //fixme: Removing the logic here for the old WasCulturePublished and the _publishInfosOrig has broken
-                // the test Can_Rollback_Version_On_Multilingual, but we need to understand what it's doing since I don't
-
-                _publishInfos.AddOrUpdate(culture, publishInfos.Name, date);
-
-                if (CultureInfos.TryGetValue(culture, out var infos))
-                    SetCultureInfo(culture, infos.Name, date);
-            }
-        }
-
+        
         /// <inheritdoc />
         public bool IsCultureEdited(string culture)
             => IsCultureAvailable(culture) && // is available, and
@@ -228,7 +213,23 @@ public bool IsCultureEdited(string culture)
 
         /// <inheritdoc/>
         [IgnoreDataMember]
-        public IReadOnlyDictionary<string, ContentCultureInfos> PublishCultureInfos => _publishInfos ?? NoInfos;
+        public ContentCultureInfosCollection PublishCultureInfos
+        {
+            get
+            {
+                if (_publishInfos != null) return _publishInfos;
+                _publishInfos = new ContentCultureInfosCollection();
+                _publishInfos.CollectionChanged += PublishNamesCollectionChanged;
+                return _publishInfos;
+            }
+            set
+            {
+                if (_publishInfos != null) _publishInfos.CollectionChanged -= PublishNamesCollectionChanged;
+                _publishInfos = value;
+                if (_publishInfos != null)
+                    _publishInfos.CollectionChanged += PublishNamesCollectionChanged;
+            }
+        }
 
         /// <inheritdoc/>
         public string GetPublishName(string culture)
@@ -247,67 +248,7 @@ public string GetPublishName(string culture)
             if (_publishInfos == null) return null;
             return _publishInfos.TryGetValue(culture, out var infos) ? infos.Date : (DateTime?) null;
         }
-
-        // internal for repository
-        internal void SetPublishInfo(string culture, string name, DateTime date)
-        {
-            if (string.IsNullOrWhiteSpace(name))
-                throw new ArgumentNullOrEmptyException(nameof(name));
-
-            if (culture.IsNullOrWhiteSpace())
-                throw new ArgumentNullOrEmptyException(nameof(culture));
-
-            if (_publishInfos == null)
-            {
-                _publishInfos = new ContentCultureInfosCollection();
-                _publishInfos.CollectionChanged += PublishNamesCollectionChanged;
-            }
-
-            _publishInfos.AddOrUpdate(culture, name, date);
-        }
-
-        private void ClearPublishInfos()
-        {
-            _publishInfos = null;
-        }
-
-        private void ClearPublishInfo(string culture)
-        {
-            if (culture.IsNullOrWhiteSpace())
-                throw new ArgumentNullOrEmptyException(nameof(culture));
-
-            if (_publishInfos == null) return;
-            _publishInfos.Remove(culture);
-            if (_publishInfos.Count == 0) _publishInfos = null;
-
-            // set the culture to be dirty - it's been modified
-            TouchCultureInfo(culture);
-        }
-
-        // sets a publish edited
-        internal void SetCultureEdited(string culture)
-        {
-            if (culture.IsNullOrWhiteSpace())
-                throw new ArgumentNullOrEmptyException(nameof(culture));
-            if (_editedCultures == null)
-                _editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            _editedCultures.Add(culture.ToLowerInvariant());
-        }
-
-        // sets all publish edited
-        internal void SetCultureEdited(IEnumerable<string> cultures)
-        {
-            if (cultures == null)
-            {
-                _editedCultures = null;
-            }
-            else
-            {
-                var editedCultures = new HashSet<string>(cultures.Where(x => !x.IsNullOrWhiteSpace()), StringComparer.OrdinalIgnoreCase);
-                _editedCultures = editedCultures.Count > 0 ? editedCultures : null;
-            }
-        }
-
+        
         /// <summary>
         /// Handles culture infos collection changes.
         /// </summary>
@@ -317,84 +258,10 @@ private void PublishNamesCollectionChanged(object sender, NotifyCollectionChange
         }
 
         [IgnoreDataMember]
-        public int PublishedVersionId { get; internal set; }
+        public int PublishedVersionId { get; set; }
 
         [DataMember]
-        public bool Blueprint { get; internal set; }
-
-        /// <inheritdoc />
-        public bool PublishCulture(string culture = "*")
-        {
-            culture = culture.NullOrWhiteSpaceAsNull();
-
-            // the variation should be supported by the content type properties
-            //  if the content type is invariant, only '*' and 'null' is ok
-            //  if the content type varies, everything is ok because some properties may be invariant
-            if (!ContentType.SupportsPropertyVariation(culture, "*", true))
-                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{ContentType.Alias}\" with variation \"{ContentType.Variations}\".");
-
-            // the values we want to publish should be valid
-            if (ValidateProperties(culture).Any())
-                return false;
-
-            var alsoInvariant = false;
-            if (culture == "*") // all cultures
-            {
-                foreach (var c in AvailableCultures)
-                {
-                    var name = GetCultureName(c);
-                    if (string.IsNullOrWhiteSpace(name))
-                        return false;
-                    SetPublishInfo(c, name, DateTime.Now);
-                }
-            }
-            else if (culture == null) // invariant culture
-            {
-                if (string.IsNullOrWhiteSpace(Name))
-                    return false;
-                // PublishName set by repository - nothing to do here
-            }
-            else // one single culture
-            {
-                var name = GetCultureName(culture);
-                if (string.IsNullOrWhiteSpace(name))
-                    return false;
-                SetPublishInfo(culture, name, DateTime.Now);
-                alsoInvariant = true; // we also want to publish invariant values
-            }
-
-            // property.PublishValues only publishes what is valid, variation-wise
-            foreach (var property in Properties)
-            {
-                property.PublishValues(culture);
-                if (alsoInvariant)
-                    property.PublishValues(null);
-            }
-
-            _publishedState = PublishedState.Publishing;
-            return true;
-        }
-
-        /// <inheritdoc />
-        public void UnpublishCulture(string culture = "*")
-        {
-            culture = culture.NullOrWhiteSpaceAsNull();
-
-            // the variation should be supported by the content type properties
-            if (!ContentType.SupportsPropertyVariation(culture, "*", true))
-                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{ContentType.Alias}\" with variation \"{ContentType.Variations}\".");
-
-            if (culture == "*") // all cultures
-                ClearPublishInfos();
-            else // one single culture
-                ClearPublishInfo(culture);
-
-            // property.PublishValues only publishes what is valid, variation-wise
-            foreach (var property in Properties)
-                property.UnpublishValues(culture);
-
-            _publishedState = PublishedState.Publishing;
-        }
+        public bool Blueprint { get; set; }
 
         /// <summary>
         /// Changes the <see cref="ContentType"/> for the current content object
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index ad8e179e7ae9..b9301504c478 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -17,7 +17,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}, ContentType: {ContentTypeBase.Alias}")]
     public abstract class ContentBase : TreeEntityBase, IContentBase
     {
-        protected static readonly ContentCultureInfosCollection NoInfos = new ContentCultureInfosCollection();
 
         private int _contentTypeId;
         protected IContentTypeComposition ContentTypeBase;
@@ -69,20 +68,20 @@ protected void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs
         /// Id of the user who wrote/updated this entity
         /// </summary>
         [DataMember]
-        public virtual int WriterId
+        public int WriterId
         {
             get => _writerId;
             set => SetPropertyValueAndDetectChanges(value, ref _writerId, nameof(WriterId));
         }
 
         [IgnoreDataMember]
-        public int VersionId { get; internal set; }
+        public int VersionId { get; set; }
 
         /// <summary>
         /// Integer Id of the default ContentType
         /// </summary>
         [DataMember]
-        public virtual int ContentTypeId
+        public int ContentTypeId
         {
             get
             {
@@ -105,11 +104,12 @@ public virtual int ContentTypeId
         /// </remarks>
         [DataMember]
         [DoNotClone]
-        public virtual PropertyCollection Properties
+        public PropertyCollection Properties
         {
             get => _properties;
             set
             {
+                if (_properties != null) _properties.CollectionChanged -= PropertiesChanged;
                 _properties = value;
                 _properties.CollectionChanged += PropertiesChanged;
             }
@@ -147,7 +147,23 @@ public bool IsCultureAvailable(string culture)
 
         /// <inheritdoc />
         [DataMember]
-        public virtual IReadOnlyDictionary<string, ContentCultureInfos> CultureInfos => _cultureInfos ?? NoInfos;
+        public ContentCultureInfosCollection CultureInfos
+        {
+            get
+            {
+                if (_cultureInfos != null) return _cultureInfos;
+                _cultureInfos = new ContentCultureInfosCollection();
+                _cultureInfos.CollectionChanged += CultureInfosCollectionChanged;
+                return _cultureInfos;
+            }
+            set
+            {
+                if (_cultureInfos != null) _cultureInfos.CollectionChanged -= CultureInfosCollectionChanged;
+                _cultureInfos = value;
+                if (_cultureInfos != null)
+                    _cultureInfos.CollectionChanged += CultureInfosCollectionChanged;
+            }
+        }
 
         /// <inheritdoc />
         public string GetCultureName(string culture)
@@ -182,7 +198,7 @@ public void SetCultureName(string name, string culture)
                 }
                 else // set
                 {
-                    SetCultureInfo(culture, name, DateTime.Now);
+                    this.SetCultureInfo(culture, name, DateTime.Now);
                 }
             }
             else // set on invariant content type
@@ -194,13 +210,13 @@ public void SetCultureName(string name, string culture)
             }
         }
 
-        protected void ClearCultureInfos()
+        private void ClearCultureInfos()
         {
             _cultureInfos?.Clear();
             _cultureInfos = null;
         }
 
-        protected void ClearCultureInfo(string culture)
+        private void ClearCultureInfo(string culture)
         {
             if (culture.IsNullOrWhiteSpace())
                 throw new ArgumentNullOrEmptyException(nameof(culture));
@@ -211,30 +227,6 @@ protected void ClearCultureInfo(string culture)
                 _cultureInfos = null;
         }
 
-        protected void TouchCultureInfo(string culture)
-        {
-            if (_cultureInfos == null || !_cultureInfos.TryGetValue(culture, out var infos)) return;
-            _cultureInfos.AddOrUpdate(culture, infos.Name, DateTime.Now);
-        }
-
-        // internal for repository
-        internal void SetCultureInfo(string culture, string name, DateTime date)
-        {
-            if (name.IsNullOrWhiteSpace())
-                throw new ArgumentNullOrEmptyException(nameof(name));
-
-            if (culture.IsNullOrWhiteSpace())
-                throw new ArgumentNullOrEmptyException(nameof(culture));
-
-            if (_cultureInfos == null)
-            {
-                _cultureInfos = new ContentCultureInfosCollection();
-                _cultureInfos.CollectionChanged += CultureInfosCollectionChanged;
-            }
-
-            _cultureInfos.AddOrUpdate(culture, name, date);
-        }
-
         /// <summary>
         /// Handles culture infos collection changes.
         /// </summary>
@@ -248,11 +240,11 @@ private void CultureInfosCollectionChanged(object sender, NotifyCollectionChange
         #region Has, Get, Set, Publish Property Value
 
         /// <inheritdoc />
-        public virtual bool HasProperty(string propertyTypeAlias)
+        public bool HasProperty(string propertyTypeAlias)
             => Properties.Contains(propertyTypeAlias);
 
         /// <inheritdoc />
-        public virtual object GetValue(string propertyTypeAlias, string culture = null, string segment = null, bool published = false)
+        public object GetValue(string propertyTypeAlias, string culture = null, string segment = null, bool published = false)
         {
             return Properties.TryGetValue(propertyTypeAlias, out var property)
                 ? property.GetValue(culture, segment, published)
@@ -260,7 +252,7 @@ public virtual object GetValue(string propertyTypeAlias, string culture = null,
         }
 
         /// <inheritdoc />
-        public virtual TValue GetValue<TValue>(string propertyTypeAlias, string culture = null, string segment = null, bool published = false)
+        public TValue GetValue<TValue>(string propertyTypeAlias, string culture = null, string segment = null, bool published = false)
         {
             if (!Properties.TryGetValue(propertyTypeAlias, out var property))
                 return default;
@@ -270,7 +262,7 @@ public virtual TValue GetValue<TValue>(string propertyTypeAlias, string culture
         }
 
         /// <inheritdoc />
-        public virtual void SetValue(string propertyTypeAlias, object value, string culture = null, string segment = null)
+        public void SetValue(string propertyTypeAlias, object value, string culture = null, string segment = null)
         {
             if (Properties.Contains(propertyTypeAlias))
             {
@@ -292,7 +284,7 @@ public virtual void SetValue(string propertyTypeAlias, object value, string cult
         #region Copy
 
         /// <inheritdoc />
-        public virtual void CopyFrom(IContent other, string culture = "*")
+        public void CopyFrom(IContent other, string culture = "*")
         {
             if (other.ContentTypeId != ContentTypeId)
                 throw new InvalidOperationException("Cannot copy values from a different content type.");
@@ -353,10 +345,11 @@ public virtual void CopyFrom(IContent other, string culture = "*")
             if (culture == null || culture == "*")
                 Name = other.Name;
 
-            foreach (var (otherCulture, otherInfos) in other.CultureInfos)
+            // ReSharper disable once UseDeconstruction
+            foreach (var cultureInfo in other.CultureInfos)
             {
-                if (culture == "*" || culture == otherCulture)
-                    SetCultureName(otherInfos.Name, otherCulture);
+                if (culture == "*" || culture == cultureInfo.Culture)
+                    SetCultureName(cultureInfo.Name, cultureInfo.Culture);
             }
         }
 
diff --git a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
new file mode 100644
index 000000000000..79c3dc3f636d
--- /dev/null
+++ b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
@@ -0,0 +1,159 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Exceptions;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Extension methods used to manipulate content variations by the document repository
+    /// </summary>
+    internal static class ContentRepositoryExtensions
+    {
+        public static void SetPublishInfo(this IContent content, string culture, string name, DateTime date)
+        {
+            if (string.IsNullOrWhiteSpace(name))
+                throw new ArgumentNullOrEmptyException(nameof(name));
+
+            if (culture.IsNullOrWhiteSpace())
+                throw new ArgumentNullOrEmptyException(nameof(culture));
+
+            content.PublishCultureInfos.AddOrUpdate(culture, name, date);
+        }
+
+        // adjust dates to sync between version, cultures etc used by the repo when persisting
+        public static void AdjustDates(this IContent content, DateTime date)
+        {
+            foreach (var culture in content.PublishedCultures.ToList())
+            {
+                if (!content.PublishCultureInfos.TryGetValue(culture, out var publishInfos))
+                    continue;
+
+                //fixme: Removing the logic here for the old WasCulturePublished and the _publishInfosOrig has broken
+                // the test Can_Rollback_Version_On_Multilingual, but we need to understand what it's doing since I don't
+
+                content.PublishCultureInfos.AddOrUpdate(culture, publishInfos.Name, date);
+
+                if (content.CultureInfos.TryGetValue(culture, out var infos))
+                    SetCultureInfo(content, culture, infos.Name, date);
+            }
+        }
+
+        // sets the edited cultures on the content
+        public static void SetCultureEdited(this IContent content, IEnumerable<string> cultures)
+        {
+            if (cultures == null)
+                content.EditedCultures = null;
+            else
+            {
+                var editedCultures = new HashSet<string>(cultures.Where(x => !x.IsNullOrWhiteSpace()), StringComparer.OrdinalIgnoreCase);
+                content.EditedCultures = editedCultures.Count > 0 ? editedCultures : null;
+            }
+        }
+
+        public static void SetCultureInfo(this IContentBase content, string culture, string name, DateTime date)
+        {
+            if (name.IsNullOrWhiteSpace())
+                throw new ArgumentNullOrEmptyException(nameof(name));
+
+            if (culture.IsNullOrWhiteSpace())
+                throw new ArgumentNullOrEmptyException(nameof(culture));
+
+            content.CultureInfos.AddOrUpdate(culture, name, date);
+        }
+
+        public static bool PublishCulture(this IContent content, string culture = "*")
+        {
+            culture = culture.NullOrWhiteSpaceAsNull();
+
+            // the variation should be supported by the content type properties
+            //  if the content type is invariant, only '*' and 'null' is ok
+            //  if the content type varies, everything is ok because some properties may be invariant
+            if (!content.ContentType.SupportsPropertyVariation(culture, "*", true))
+                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{content.ContentType.Alias}\" with variation \"{content.ContentType.Variations}\".");
+
+            // the values we want to publish should be valid
+            if (content.ValidateProperties(culture).Any())
+                return false;
+
+            var alsoInvariant = false;
+            if (culture == "*") // all cultures
+            {
+                foreach (var c in content.AvailableCultures)
+                {
+                    var name = content.GetCultureName(c);
+                    if (string.IsNullOrWhiteSpace(name))
+                        return false;
+                    content.SetPublishInfo(c, name, DateTime.Now);
+                }
+            }
+            else if (culture == null) // invariant culture
+            {
+                if (string.IsNullOrWhiteSpace(content.Name))
+                    return false;
+                // PublishName set by repository - nothing to do here
+            }
+            else // one single culture
+            {
+                var name = content.GetCultureName(culture);
+                if (string.IsNullOrWhiteSpace(name))
+                    return false;
+                content.SetPublishInfo(culture, name, DateTime.Now);
+                alsoInvariant = true; // we also want to publish invariant values
+            }
+
+            // property.PublishValues only publishes what is valid, variation-wise
+            foreach (var property in content.Properties)
+            {
+                property.PublishValues(culture);
+                if (alsoInvariant)
+                    property.PublishValues(null);
+            }
+
+            content.PublishedState = PublishedState.Publishing;
+            return true;
+        }
+
+        public static void UnpublishCulture(this IContent content, string culture = "*")
+        {
+            culture = culture.NullOrWhiteSpaceAsNull();
+
+            // the variation should be supported by the content type properties
+            if (!content.ContentType.SupportsPropertyVariation(culture, "*", true))
+                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{content.ContentType.Alias}\" with variation \"{content.ContentType.Variations}\".");
+
+            if (culture == "*") // all cultures
+                content.ClearPublishInfos();
+            else // one single culture
+                content.ClearPublishInfo(culture);
+
+            // property.PublishValues only publishes what is valid, variation-wise
+            foreach (var property in content.Properties)
+                property.UnpublishValues(culture);
+
+            content.PublishedState = PublishedState.Publishing;
+        }
+
+        public static void ClearPublishInfos(this IContent content)
+        {
+            content.PublishCultureInfos = null;
+        }
+
+        public static void ClearPublishInfo(this IContent content, string culture)
+        {
+            if (culture.IsNullOrWhiteSpace())
+                throw new ArgumentNullOrEmptyException(nameof(culture));
+
+            content.PublishCultureInfos.Remove(culture);
+
+            // set the culture to be dirty - it's been modified
+            content.TouchCultureInfo(culture);
+        }
+
+        public static void TouchCultureInfo(this IContent content, string culture)
+        {
+            if (!content.CultureInfos.TryGetValue(culture, out var infos)) return;
+            content.CultureInfos.AddOrUpdate(culture, infos.Name, DateTime.Now);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index f468df59aba8..e953bef1eba9 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -25,46 +25,46 @@ public interface IContent : IContentBase
         /// <summary>
         /// Gets a value indicating whether the content is published.
         /// </summary>
-        bool Published { get; }
+        bool Published { get; set; }
 
-        PublishedState PublishedState { get; }
+        PublishedState PublishedState { get; set; }
 
         /// <summary>
         /// Gets a value indicating whether the content has been edited.
         /// </summary>
-        bool Edited { get; }
+        bool Edited { get; set; }
 
         /// <summary>
         /// Gets the published version identifier.
         /// </summary>
-        int PublishedVersionId { get; }
+        int PublishedVersionId { get; set; }
 
         /// <summary>
         /// Gets a value indicating whether the content item is a blueprint.
         /// </summary>
-        bool Blueprint { get; }
+        bool Blueprint { get; set; }
 
         /// <summary>
         /// Gets the template id used to render the published version of the content.
         /// </summary>
         /// <remarks>When editing the content, the template can change, but this will not until the content is published.</remarks>
-        int? PublishTemplateId { get; }
+        int? PublishTemplateId { get; set; }
 
         /// <summary>
         /// Gets the name of the published version of the content.
         /// </summary>
         /// <remarks>When editing the content, the name can change, but this will not until the content is published.</remarks>
-        string PublishName { get; }
+        string PublishName { get; set; }
 
         /// <summary>
         /// Gets the identifier of the user who published the content.
         /// </summary>
-        int? PublisherId { get; }
+        int? PublisherId { get; set; }
 
         /// <summary>
         /// Gets the date and time the content was published.
         /// </summary>
-        DateTime? PublishDate { get; }
+        DateTime? PublishDate { get; set; }
 
         /// <summary>
         /// Gets the content type of this content.
@@ -117,7 +117,7 @@ public interface IContent : IContentBase
         /// <para>Because a dictionary key cannot be <c>null</c> this cannot get the invariant
         /// name, which must be get via the <see cref="PublishName"/> property.</para>
         /// </remarks>
-        IReadOnlyDictionary<string, ContentCultureInfos> PublishCultureInfos { get; }
+        ContentCultureInfosCollection PublishCultureInfos { get; set; }
 
         /// <summary>
         /// Gets the published cultures.
@@ -127,30 +127,13 @@ public interface IContent : IContentBase
         /// <summary>
         /// Gets the edited cultures.
         /// </summary>
-        IEnumerable<string> EditedCultures { get; }
+        IEnumerable<string> EditedCultures { get; set; }
 
         /// <summary>
         /// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
         /// </summary>
         /// <returns></returns>
         IContent DeepCloneWithResetIdentities();
-
-        /// <summary>
-        /// Registers a culture to be published.
-        /// </summary>
-        /// <returns>A value indicating whether the culture can be published.</returns>
-        /// <remarks>
-        /// <para>Fails if properties don't pass variant validation rules.</para>
-        /// <para>Publishing must be finalized via the content service SavePublishing method.</para>
-        /// </remarks>
-        bool PublishCulture(string culture = "*");
-
-        /// <summary>
-        /// Registers a culture to be unpublished.
-        /// </summary>
-        /// <remarks>
-        /// <para>Unpublishing must be finalized via the content service SavePublishing method.</para>
-        /// </remarks>
-        void UnpublishCulture(string culture = "*");
+        
     }
 }
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index 40a1c570977e..b3cc266f0a9c 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -26,7 +26,7 @@ public interface IContentBase : IUmbracoEntity
         /// <summary>
         /// Gets the version identifier.
         /// </summary>
-        int VersionId { get; }
+        int VersionId { get; set; }
 
         /// <summary>
         /// Sets the name of the content item for a specified culture.
@@ -57,8 +57,8 @@ public interface IContentBase : IUmbracoEntity
         /// <para>Because a dictionary key cannot be <c>null</c> this cannot contain the invariant
         /// culture name, which must be get or set via the <see cref="TreeEntityBase.Name"/> property.</para>
         /// </remarks>
-        IReadOnlyDictionary<string, ContentCultureInfos> CultureInfos { get; }
-
+        ContentCultureInfosCollection CultureInfos { get; set; }
+        
         /// <summary>
         /// Gets the available cultures.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 9b4175b63f76..3cf407d304e7 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -380,9 +380,10 @@ protected override void PersistNewItem(IContent entity)
                     content.AdjustDates(contentVersionDto.VersionDate);
 
                 // names also impact 'edited'
-                foreach (var (culture, infos) in content.CultureInfos)
-                    if (infos.Name != content.GetPublishName(culture))
-                        (editedCultures ?? (editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase))).Add(culture);
+                // ReSharper disable once UseDeconstruction
+                foreach (var cultureInfo in content.CultureInfos)
+                    if (cultureInfo.Name != content.GetPublishName(cultureInfo.Culture))
+                        (editedCultures ?? (editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase))).Add(cultureInfo.Culture);
 
                 // insert content variations
                 Database.BulkInsertRecords(GetContentVariationDtos(content, publishing));
@@ -541,11 +542,12 @@ protected override void PersistUpdatedItem(IContent entity)
                     content.AdjustDates(contentVersionDto.VersionDate);
 
                 // names also impact 'edited'
-                foreach (var (culture, infos) in content.CultureInfos)
-                    if (infos.Name != content.GetPublishName(culture))
+                // ReSharper disable once UseDeconstruction
+                foreach (var cultureInfo in content.CultureInfos)
+                    if (cultureInfo.Name != content.GetPublishName(cultureInfo.Culture))
                     {
                         edited = true;
-                        (editedCultures ?? (editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase))).Add(culture);
+                        (editedCultures ?? (editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase))).Add(cultureInfo.Culture);
 
                         // TODO: change tracking
                         // at the moment, we don't do any dirty tracking on property values, so we don't know whether the
@@ -951,6 +953,8 @@ public IEnumerable<IContent> GetContentForExpiration(DateTime date)
 
         #endregion
 
+        
+
         protected override string ApplySystemOrdering(ref Sql<ISqlContext> sql, Ordering ordering)
         {
             // note: 'updater' is the user who created the latest draft version,
@@ -1182,6 +1186,7 @@ private IDictionary<int, ContentScheduleCollection> GetContentSchedule(params in
             return result;
         }
 
+
         private void SetVariations(Content content, IDictionary<int, List<ContentVariation>> contentVariations, IDictionary<int, List<DocumentVariation>> documentVariations)
         {
             if (contentVariations.TryGetValue(content.VersionId, out var contentVariation))
@@ -1191,8 +1196,7 @@ private void SetVariations(Content content, IDictionary<int, List<ContentVariati
                 foreach (var v in contentVariation)
                     content.SetPublishInfo(v.Culture, v.Name, v.Date);
             if (documentVariations.TryGetValue(content.Id, out var documentVariation))
-                foreach (var v in documentVariation.Where(x => x.Edited))
-                    content.SetCultureEdited(v.Culture);
+                content.SetCultureEdited(documentVariation.Where(x => x.Edited).Select(x => x.Culture));
         }
 
         private IDictionary<int, List<ContentVariation>> GetContentVariations<T>(List<TempContent<T>> temps)
@@ -1262,14 +1266,15 @@ private IDictionary<int, List<DocumentVariation>> GetDocumentVariations<T>(List<
         private IEnumerable<ContentVersionCultureVariationDto> GetContentVariationDtos(IContent content, bool publishing)
         {
             // create dtos for the 'current' (non-published) version, all cultures
-            foreach (var (culture, name) in content.CultureInfos)
+            // ReSharper disable once UseDeconstruction
+            foreach (var cultureInfo in content.CultureInfos)
                 yield return new ContentVersionCultureVariationDto
                 {
                     VersionId = content.VersionId,
-                    LanguageId = LanguageRepository.GetIdByIsoCode(culture) ?? throw new InvalidOperationException("Not a valid culture."),
-                    Culture = culture,
-                    Name = name.Name,
-                    UpdateDate = content.GetUpdateDate(culture) ?? DateTime.MinValue // we *know* there is a value
+                    LanguageId = LanguageRepository.GetIdByIsoCode(cultureInfo.Culture) ?? throw new InvalidOperationException("Not a valid culture."),
+                    Culture = cultureInfo.Culture,
+                    Name = cultureInfo.Name,
+                    UpdateDate = content.GetUpdateDate(cultureInfo.Culture) ?? DateTime.MinValue // we *know* there is a value
                 };
 
             // if not publishing, we're just updating the 'current' (non-published) version,
@@ -1277,14 +1282,15 @@ private IEnumerable<ContentVersionCultureVariationDto> GetContentVariationDtos(I
             if (!publishing) yield break;
 
             // create dtos for the 'published' version, for published cultures (those having a name)
-            foreach (var (culture, name) in content.PublishCultureInfos)
+            // ReSharper disable once UseDeconstruction
+            foreach (var cultureInfo in content.PublishCultureInfos)
                 yield return new ContentVersionCultureVariationDto
                 {
                     VersionId = content.PublishedVersionId,
-                    LanguageId = LanguageRepository.GetIdByIsoCode(culture) ?? throw new InvalidOperationException("Not a valid culture."),
-                    Culture = culture,
-                    Name = name.Name,
-                    UpdateDate = content.GetPublishDate(culture) ?? DateTime.MinValue // we *know* there is a value
+                    LanguageId = LanguageRepository.GetIdByIsoCode(cultureInfo.Culture) ?? throw new InvalidOperationException("Not a valid culture."),
+                    Culture = cultureInfo.Culture,
+                    Name = cultureInfo.Name,
+                    UpdateDate = content.GetPublishDate(cultureInfo.Culture) ?? DateTime.MinValue // we *know* there is a value
                 };
         }
 
@@ -1344,7 +1350,7 @@ private void SanitizeNames(Content content, bool publishing)
             EnsureVariantNamesAreUnique(content, publishing);
         }
 
-        private void EnsureInvariantNameExists(Content content)
+        private void EnsureInvariantNameExists(IContent content)
         {
             if (content.ContentType.VariesByCulture())
             {
@@ -1358,7 +1364,7 @@ private void EnsureInvariantNameExists(Content content)
                 var defaultCulture = LanguageRepository.GetDefaultIsoCode();
                 content.Name = defaultCulture != null && content.CultureInfos.TryGetValue(defaultCulture, out var cultureName)
                     ? cultureName.Name
-                    : content.CultureInfos.First().Value.Name;
+                    : content.CultureInfos[0].Name;
             }
             else
             {
@@ -1368,7 +1374,7 @@ private void EnsureInvariantNameExists(Content content)
             }
         }
 
-        private void EnsureInvariantNameIsUnique(Content content)
+        private void EnsureInvariantNameIsUnique(IContent content)
         {
             content.Name = EnsureUniqueNodeName(content.ParentId, content.Name, content.Id);
         }
@@ -1405,22 +1411,22 @@ private void EnsureVariantNamesAreUnique(Content content, bool publishing)
             // of whether the name has changed (ie the culture has been updated) - some saving culture
             // fr-FR could cause culture en-UK name to change - not sure that is clean
 
-            foreach (var (culture, name) in content.CultureInfos)
+            foreach (var cultureInfo in content.CultureInfos)
             {
-                var langId = LanguageRepository.GetIdByIsoCode(culture);
+                var langId = LanguageRepository.GetIdByIsoCode(cultureInfo.Culture);
                 if (!langId.HasValue) continue;
                 if (!names.TryGetValue(langId.Value, out var cultureNames)) continue;
 
                 // get a unique name
                 var otherNames = cultureNames.Select(x => new SimilarNodeName { Id = x.Id, Name = x.Name });
-                var uniqueName = SimilarNodeName.GetUniqueName(otherNames, 0, name.Name);
+                var uniqueName = SimilarNodeName.GetUniqueName(otherNames, 0, cultureInfo.Name);
 
-                if (uniqueName == content.GetCultureName(culture)) continue;
+                if (uniqueName == content.GetCultureName(cultureInfo.Culture)) continue;
 
                 // update the name, and the publish name if published
-                content.SetCultureName(uniqueName, culture);
-                if (publishing && content.PublishCultureInfos.ContainsKey(culture))
-                    content.SetPublishInfo(culture, uniqueName, DateTime.Now);
+                content.SetCultureName(uniqueName, cultureInfo.Culture);
+                if (publishing && content.PublishCultureInfos.ContainsKey(cultureInfo.Culture))
+                    content.SetPublishInfo(cultureInfo.Culture, uniqueName, DateTime.Now); //TODO: This is weird, this call will have already been made in the SetCultureName
             }
         }
 
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 9c2721cbb434..a6ef1b9f36bc 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -776,7 +776,7 @@ public OperationResult Save(IContent content, int userId = 0, bool raiseEvents =
 
                 //track the cultures that have changed
                 var culturesChanging = content.ContentType.VariesByCulture()
-                    ? content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key).ToList()
+                    ? content.CultureInfos.Values.Where(x => x.IsDirty()).Select(x => x.Culture).ToList()
                     : null;
                 // TODO: Currently there's no way to change track which variant properties have changed, we only have change
                 // tracking enabled on all values on the Property which doesn't allow us to know which variants have changed.
@@ -1017,7 +1017,7 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
             IReadOnlyList<string> culturesPublishing = null;
             IReadOnlyList<string> culturesUnpublishing = null;
             IReadOnlyList<string> culturesChanging = variesByCulture
-                ? content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key).ToList()
+                ? content.CultureInfos.Values.Where(x => x.IsDirty()).Select(x => x.Culture).ToList()
                 : null;
 
             var isNew = !content.HasIdentity;
@@ -1036,7 +1036,7 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
 
                 culturesUnpublishing = content.GetCulturesUnpublishing(persisted);
                 culturesPublishing = variesByCulture
-                        ? content.PublishCultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key).ToList()
+                        ? content.PublishCultureInfos.Values.Where(x => x.IsDirty()).Select(x => x.Culture).ToList()
                         : null;
 
                 // ensure that the document can be published, and publish handling events, business rules, etc
@@ -2043,7 +2043,7 @@ public bool SendToPublication(IContent content, int userId = 0)
 
                 //track the cultures changing for auditing
                 var culturesChanging = content.ContentType.VariesByCulture()
-                    ? string.Join(",", content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key))
+                    ? string.Join(",", content.CultureInfos.Values.Where(x => x.IsDirty()).Select(x => x.Culture))
                     : null;
 
                 // TODO: Currently there's no way to change track which variant properties have changed, we only have change
@@ -2781,7 +2781,7 @@ public IContent CreateContentFromBlueprint(IContent blueprint, string name, int
             content.WriterId = userId;
 
             var now = DateTime.Now;
-            var cultures = blueprint.CultureInfos.Any() ? blueprint.CultureInfos.Select(x=>x.Key) : ArrayOfOneNullString;
+            var cultures = blueprint.CultureInfos.Count > 0 ? blueprint.CultureInfos.Values.Select(x => x.Culture) : ArrayOfOneNullString;
             foreach (var culture in cultures)
             {
                 foreach (var property in blueprint.Properties)
diff --git a/src/Umbraco.Core/Services/Implement/NotificationService.cs b/src/Umbraco.Core/Services/Implement/NotificationService.cs
index d981809364d3..2b21945ba855 100644
--- a/src/Umbraco.Core/Services/Implement/NotificationService.cs
+++ b/src/Umbraco.Core/Services/Implement/NotificationService.cs
@@ -345,8 +345,8 @@ private NotificationRequest CreateNotificationRequest(IUser performingUser, IUse
                 {
                     //Create the HTML based summary (ul of culture names)
 
-                    var culturesChanged = content.CultureInfos.Where(x => x.Value.WasDirty())
-                        .Select(x => x.Key)
+                    var culturesChanged = content.CultureInfos.Values.Where(x => x.WasDirty())
+                        .Select(x => x.Culture)
                         .Select(_localizationService.GetLanguageByIsoCode)
                         .WhereNotNull()
                         .Select(x => x.CultureName);
@@ -363,8 +363,8 @@ private NotificationRequest CreateNotificationRequest(IUser performingUser, IUse
                 {
                     //Create the text based summary (csv of culture names)
 
-                    var culturesChanged = string.Join(", ", content.CultureInfos.Where(x => x.Value.WasDirty())
-                        .Select(x => x.Key)
+                    var culturesChanged = string.Join(", ", content.CultureInfos.Values.Where(x => x.WasDirty())
+                        .Select(x => x.Culture)
                         .Select(_localizationService.GetLanguageByIsoCode)
                         .WhereNotNull()
                         .Select(x => x.CultureName));
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b327a9281da2..13db7e22597d 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -391,6 +391,7 @@
     <Compile Include="Models\ConsentState.cs" />
     <Compile Include="Models\ContentEditing\ContentApp.cs" />
     <Compile Include="Models\ContentEditing\IContentAppFactory.cs" />
+    <Compile Include="Models\ContentRepositoryExtensions.cs" />
     <Compile Include="Models\ContentSchedule.cs" />
     <Compile Include="Models\ContentScheduleAction.cs" />
     <Compile Include="Models\ContentScheduleCollection.cs" />
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 2e98b31cca68..c5dd8a6aea5f 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -437,16 +437,16 @@ public void Remember_Dirty_Properties()
             Assert.IsTrue(content.WasPropertyDirty("CultureInfos"));
             foreach(var culture in content.CultureInfos)
             {
-                Assert.IsTrue(culture.Value.WasDirty());
-                Assert.IsTrue(culture.Value.WasPropertyDirty("Name"));
-                Assert.IsTrue(culture.Value.WasPropertyDirty("Date"));
+                Assert.IsTrue(culture.WasDirty());
+                Assert.IsTrue(culture.WasPropertyDirty("Name"));
+                Assert.IsTrue(culture.WasPropertyDirty("Date"));
             }
             Assert.IsTrue(content.WasPropertyDirty("PublishCultureInfos"));
             foreach (var culture in content.PublishCultureInfos)
             {
-                Assert.IsTrue(culture.Value.WasDirty());
-                Assert.IsTrue(culture.Value.WasPropertyDirty("Name"));
-                Assert.IsTrue(culture.Value.WasPropertyDirty("Date"));
+                Assert.IsTrue(culture.WasDirty());
+                Assert.IsTrue(culture.WasPropertyDirty("Name"));
+                Assert.IsTrue(culture.WasPropertyDirty("Date"));
             }
         }
 
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index f40c8a7d9893..9c02fa040dc8 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -252,8 +252,8 @@ public IReadOnlyDictionary<string, PublishedCultureInfo> Cultures
                     if (_cultureInfos != null)
                         return _cultureInfos;
 
-                    return _cultureInfos = _inner.PublishCultureInfos
-                        .ToDictionary(x => x.Key, x => new PublishedCultureInfo(x.Key, x.Value.Name, x.Value.Date));
+                    return _cultureInfos = _inner.PublishCultureInfos.Values
+                        .ToDictionary(x => x.Culture, x => new PublishedCultureInfo(x.Culture, x.Name, x.Date));
                 }
             }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index f470e5a65a97..c503f382dcd5 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1214,10 +1214,11 @@ private ContentNuDto GetDto(IContentBase content, bool published)
                         : document.CultureInfos)
                     : content.CultureInfos;
 
-                foreach (var (culture, info) in infos)
+                // ReSharper disable once UseDeconstruction
+                foreach (var cultureInfo in infos)
                 {
-                    var cultureIsDraft = !published && content is IContent d && d.IsCultureEdited(culture);
-                    cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft };
+                    var cultureIsDraft = !published && content is IContent d && d.IsCultureEdited(cultureInfo.Culture);
+                    cultureData[cultureInfo.Culture] = new CultureVariation { Name = cultureInfo.Name, Date = content.GetUpdateDate(cultureInfo.Culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft };
                 }
             }
 

From 3dab68b70d92c71ee4703aa3e1d65c3f149fc026 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 5 Feb 2019 14:15:03 +1100
Subject: [PATCH 285/421] adds note

---
 .../Persistence/Repositories/Implement/DocumentRepository.cs     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 3cf407d304e7..5a3a42af2733 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -120,6 +120,7 @@ protected Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
                     break;
                 case QueryType.Single:
                 case QueryType.Many:
+                    //fixme: Apparently this is ambiguous?
                     sql = sql.Select<DocumentDto>(r =>
                        r.Select(documentDto => documentDto.ContentDto, r1 =>
                            r1.Select(contentDto => contentDto.NodeDto))

From c9936058b5112ec8913e7c8746ed87ec08f7ed3d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 5 Feb 2019 07:54:42 +0100
Subject: [PATCH 286/421] Allow creating any content type at root if none are
 marked as "AllowAsRoot"

---
 src/Umbraco.Web/Editors/ContentTypeController.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 0aa7b75143c9..8df753bfe7be 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -393,7 +393,11 @@ public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
             IEnumerable<IContentType> types;
             if (contentId == Constants.System.Root)
             {
-                types = Services.ContentTypeService.GetAll().Where(x => x.AllowedAsRoot).ToList();
+                var allContentTypes = Services.ContentTypeService.GetAll().ToList();
+                bool AllowedAsRoot(IContentType x) => x.AllowedAsRoot;
+                types = allContentTypes.Any(AllowedAsRoot)
+                    ? allContentTypes.Where(AllowedAsRoot).ToList()
+                    : allContentTypes;
             }
             else
             {

From 9579b42330199621c96c472a928ad033936e1d0e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 5 Feb 2019 07:54:59 +0100
Subject: [PATCH 287/421] Allow copying/moving any content type to root if none
 are marked as "AllowAsRoot"

---
 src/Umbraco.Web/Editors/ContentController.cs | 6 ++++--
 src/Umbraco.Web/Editors/MediaController.cs   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index ee056e38f058..4e8c26b8e1fd 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1822,8 +1822,10 @@ private IContent ValidateMoveOrCopy(MoveOrCopy model)
             }
             if (model.ParentId < 0)
             {
-                //cannot move if the content item is not allowed at the root
-                if (toMove.ContentType.AllowedAsRoot == false)
+                //cannot move if the content item is not allowed at the root unless there are
+                //none allowed at root (in which case all should be allowed at root)
+                var contentTypeService = Services.ContentTypeService;
+                if (toMove.ContentType.AllowedAsRoot == false && contentTypeService.GetAll().Any(ct => ct.AllowedAsRoot))
                 {
                     throw new HttpResponseException(
                             Request.CreateNotificationValidationErrorResponse(
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 5662680a8a95..5fab734f6cba 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -868,8 +868,10 @@ private IMedia ValidateMoveOrCopy(MoveOrCopy model)
             }
             if (model.ParentId < 0)
             {
-                //cannot move if the content item is not allowed at the root
-                if (toMove.ContentType.AllowedAsRoot == false)
+                //cannot move if the content item is not allowed at the root unless there are
+                //none allowed at root (in which case all should be allowed at root)
+                var mediaTypeService = Services.MediaTypeService;
+                if (toMove.ContentType.AllowedAsRoot == false && mediaTypeService.GetAll().Any(ct => ct.AllowedAsRoot))
                 {
                     var notificationModel = new SimpleNotificationModel();
                     notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedAtRoot"), "");

From f07a2715b42275ae5f68dab2075a4e62984421f8 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Feb 2019 18:49:56 +0100
Subject: [PATCH 288/421] Add assembly-level composer attributes

---
 src/Umbraco.Core/Components/Composers.cs      |  43 +-
 .../Components/DisableAttribute.cs            |   5 +-
 .../Components/DisableComposerAttribute.cs    |  28 ++
 .../Components/EnableAttribute.cs             |   5 +-
 .../Components/EnableComposerAttribute.cs     |  31 ++
 src/Umbraco.Core/Umbraco.Core.csproj          |   2 +
 .../Components/ComponentTests.cs              |  55 ++-
 src/Umbraco.Web.UI.Client/package-lock.json   | 466 +++++-------------
 8 files changed, 268 insertions(+), 367 deletions(-)
 create mode 100644 src/Umbraco.Core/Components/DisableComposerAttribute.cs
 create mode 100644 src/Umbraco.Core/Components/EnableComposerAttribute.cs

diff --git a/src/Umbraco.Core/Components/Composers.cs b/src/Umbraco.Core/Components/Composers.cs
index 89deed934ee1..4bbbdf26b072 100644
--- a/src/Umbraco.Core/Components/Composers.cs
+++ b/src/Umbraco.Core/Components/Composers.cs
@@ -173,27 +173,46 @@ private static void EnableDisableComposers(ICollection<Type> types)
             // what happens in case of conflicting remote declarations is unspecified. more
             // precisely, the last declaration to be processed wins, but the order of the
             // declarations depends on the type finder and is unspecified.
+
+            void UpdateEnableInfo(Type composerType, int weight2, Dictionary<Type, EnableInfo> enabled2, bool value)
+            {
+                if (enabled.TryGetValue(composerType, out var enableInfo) == false) enableInfo = enabled2[composerType] = new EnableInfo();
+                if (enableInfo.Weight > weight2) return;
+
+                enableInfo.Enabled = value;
+                enableInfo.Weight = weight2;
+            }
+
+            var assemblies = types.Select(x => x.Assembly).Distinct();
+            foreach (var assembly in assemblies)
+            {
+                foreach (var attr in assembly.GetCustomAttributes<EnableComposerAttribute>())
+                {
+                    var type = attr.EnabledType;
+                    UpdateEnableInfo(type, 2, enabled, true);
+                }
+
+                foreach (var attr in assembly.GetCustomAttributes<DisableComposerAttribute>())
+                {
+                    var type = attr.DisabledType;
+                    UpdateEnableInfo(type, 2, enabled, false);
+                }
+            }
+
             foreach (var composerType in types)
             {
                 foreach (var attr in composerType.GetCustomAttributes<EnableAttribute>())
                 {
                     var type = attr.EnabledType ?? composerType;
-                    if (enabled.TryGetValue(type, out var enableInfo) == false) enableInfo = enabled[type] = new EnableInfo();
-                    var weight = type == composerType ? 1 : 2;
-                    if (enableInfo.Weight > weight) continue;
-
-                    enableInfo.Enabled = true;
-                    enableInfo.Weight = weight;
+                    var weight = type == composerType ? 1 : 3;
+                    UpdateEnableInfo(type, weight, enabled, true);
                 }
+
                 foreach (var attr in composerType.GetCustomAttributes<DisableAttribute>())
                 {
                     var type = attr.DisabledType ?? composerType;
-                    if (enabled.TryGetValue(type, out var enableInfo) == false) enableInfo = enabled[type] = new EnableInfo();
-                    var weight = type == composerType ? 1 : 2;
-                    if (enableInfo.Weight > weight) continue;
-
-                    enableInfo.Enabled = false;
-                    enableInfo.Weight = weight;
+                    var weight = type == composerType ? 1 : 3;
+                    UpdateEnableInfo(type, weight, enabled, false);
                 }
             }
 
diff --git a/src/Umbraco.Core/Components/DisableAttribute.cs b/src/Umbraco.Core/Components/DisableAttribute.cs
index f9a7249b891d..608967d6ae86 100644
--- a/src/Umbraco.Core/Components/DisableAttribute.cs
+++ b/src/Umbraco.Core/Components/DisableAttribute.cs
@@ -9,9 +9,8 @@ namespace Umbraco.Core.Components
     /// <para>If a type is specified, disables the composer of that type, else disables the composer marked with the attribute.</para>
     /// <para>This attribute is *not* inherited.</para>
     /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>If a composer ends up being both enabled and disabled: attributes marking the composer itself have lower priority
-    /// than attributes on *other* composers, eg if a composer declares itself as disabled it is possible to enable it from
-    /// another composer. Anything else is unspecified.</para>
+    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
+    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
     /// </remarks>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
     public class DisableAttribute : Attribute
diff --git a/src/Umbraco.Core/Components/DisableComposerAttribute.cs b/src/Umbraco.Core/Components/DisableComposerAttribute.cs
new file mode 100644
index 000000000000..9d90a099df55
--- /dev/null
+++ b/src/Umbraco.Core/Components/DisableComposerAttribute.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Indicates that a composer should be disabled.
+    /// </summary>
+    /// <remarks>
+    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
+    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+    public class DisableComposerAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DisableComposerAttribute"/> class.
+        /// </summary>
+        public DisableComposerAttribute(Type disabledType)
+        {
+            DisabledType = disabledType;
+        }
+
+        /// <summary>
+        /// Gets the disabled type, or null if it is the composer marked with the attribute.
+        /// </summary>
+        public Type DisabledType { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Components/EnableAttribute.cs b/src/Umbraco.Core/Components/EnableAttribute.cs
index edf3cbdc2e63..2176a4ec230f 100644
--- a/src/Umbraco.Core/Components/EnableAttribute.cs
+++ b/src/Umbraco.Core/Components/EnableAttribute.cs
@@ -9,9 +9,8 @@ namespace Umbraco.Core.Components
     /// <para>If a type is specified, enables the composer of that type, else enables the composer marked with the attribute.</para>
     /// <para>This attribute is *not* inherited.</para>
     /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>If a composer ends up being both enabled and disabled: attributes marking the composer itself have lower priority
-    /// than attributes on *other* composers, eg if a composer declares itself as disabled it is possible to enable it from
-    /// another composer. Anything else is unspecified.</para>
+    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
+    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
     /// </remarks>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
     public class EnableAttribute : Attribute
diff --git a/src/Umbraco.Core/Components/EnableComposerAttribute.cs b/src/Umbraco.Core/Components/EnableComposerAttribute.cs
new file mode 100644
index 000000000000..fe5770014520
--- /dev/null
+++ b/src/Umbraco.Core/Components/EnableComposerAttribute.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Indicates that a composer should be enabled.
+    /// </summary>
+    /// <remarks>
+    /// <para>If a type is specified, enables the composer of that type, else enables the composer marked with the attribute.</para>
+    /// <para>This attribute is *not* inherited.</para>
+    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
+    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
+    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+    public class EnableComposerAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnableComposerAttribute"/> class.
+        /// </summary>
+        public EnableComposerAttribute(Type enabledType)
+        {
+            EnabledType = enabledType;
+        }
+
+        /// <summary>
+        /// Gets the enabled type, or null if it is the composer marked with the attribute.
+        /// </summary>
+        public Type EnabledType { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b327a9281da2..792f1d1223f4 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -163,7 +163,9 @@
     <Compile Include="Components\Composition.cs" />
     <Compile Include="Components\CompositionExtensions.cs" />
     <Compile Include="Components\DisableAttribute.cs" />
+    <Compile Include="Components\DisableComposerAttribute.cs" />
     <Compile Include="Components\EnableAttribute.cs" />
+    <Compile Include="Components\EnableComposerAttribute.cs" />
     <Compile Include="Components\IComposer.cs" />
     <Compile Include="Components\ICoreComposer.cs" />
     <Compile Include="Components\IRuntimeComposer.cs" />
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index 390bb018dab4..b35813ce99db 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -12,6 +12,8 @@
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Scoping;
 
+[assembly:DisableComposer(typeof(Umbraco.Tests.Components.ComponentTests.Composer26))]
+
 namespace Umbraco.Tests.Components
 {
     [TestFixture]
@@ -104,7 +106,7 @@ public void Boot1B()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Run));
 
             var types = TypeArray<Composer1, Composer2, Composer3, Composer4>();
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             // 2 is Core and requires 4
             // 3 is User - stays with RuntimeLevel.Run
@@ -120,7 +122,7 @@ public void Boot2()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
 
             var types = TypeArray<Composer20, Composer21>();
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             // 21 is required by 20
             // => reorder components accordingly
@@ -135,7 +137,7 @@ public void Boot3()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
 
             var types = TypeArray<Composer22, Composer24, Composer25>();
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             // i23 requires 22
             // 24, 25 implement i23
@@ -152,7 +154,7 @@ public void BrokenRequire()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
 
             var types = TypeArray<Composer1, Composer2, Composer3>();
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             try
             {
@@ -175,7 +177,7 @@ public void BrokenRequired()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
 
             var types = TypeArray<Composer2, Composer4, Composer13>();
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             // 2 is Core and requires 4
             // 13 is required by 1
@@ -234,7 +236,7 @@ public void Requires1()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
 
             var types = new[] { typeof(Composer6), typeof(Composer7), typeof(Composer8) };
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             components.Compose();
             Assert.AreEqual(2, Composed.Count);
@@ -249,7 +251,7 @@ public void Requires2A()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
 
             var types = new[] { typeof(Composer9), typeof(Composer2), typeof(Composer4) };
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             components.Compose();
             Assert.AreEqual(2, Composed.Count);
@@ -285,24 +287,24 @@ public void WeakDependencies()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
 
             var types = new[] { typeof(Composer10) };
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             components.Compose();
             Assert.AreEqual(1, Composed.Count);
             Assert.AreEqual(typeof(Composer10), Composed[0]);
 
             types = new[] { typeof(Composer11) };
-            components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             Assert.Throws<Exception>(() => components.Compose());
 
             types = new[] { typeof(Composer2) };
-            components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             Assert.Throws<Exception>(() => components.Compose());
 
             types = new[] { typeof(Composer12) };
-            components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             components.Compose();
             Assert.AreEqual(1, Composed.Count);
@@ -316,7 +318,7 @@ public void DisableMissing()
             var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
 
             var types = new[] { typeof(Composer6), typeof(Composer8) }; // 8 disables 7 which is not in the list
-            var components = new Core.Components.Composers(composition, types, Mock.Of<IProfilingLogger>());
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
             Composed.Clear();
             components.Compose();
             Assert.AreEqual(2, Composed.Count);
@@ -324,6 +326,27 @@ public void DisableMissing()
             Assert.AreEqual(typeof(Composer8), Composed[1]);
         }
 
+        [Test]
+        public void AttributesPriorities()
+        {
+            var register = MockRegister();
+            var composition = new Composition(register, MockTypeLoader(), Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Unknown));
+
+            var types = new[] { typeof(Composer26) }; // 26 disabled by assembly attribute
+            var components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
+            Composed.Clear();
+            components.Compose();
+            Assert.AreEqual(0, Composed.Count); // 26 gone
+
+            types = new[] { typeof(Composer26), typeof(Composer27) }; // 26 disabled by assembly attribute, enabled by 27
+            components = new Composers(composition, types, Mock.Of<IProfilingLogger>());
+            Composed.Clear();
+            components.Compose();
+            Assert.AreEqual(2, Composed.Count); // both
+            Assert.AreEqual(typeof(Composer26), Composed[0]);
+            Assert.AreEqual(typeof(Composer27), Composed[1]);
+        }
+
         #region Components
 
         public class TestComposerBase : IComposer
@@ -440,6 +463,14 @@ public class Composer24 : TestComposerBase, IComposer23
         public class Composer25 : TestComposerBase, IComposer23
         { }
 
+        // disabled by assembly attribute
+        public class Composer26 : TestComposerBase
+        { }
+
+        [Enable(typeof(Composer26))]
+        public class Composer27 : TestComposerBase
+        { }
+
         #endregion
 
         #region TypeArray
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 207eba38c528..4c796ab2a7ac 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -937,7 +937,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -955,7 +955,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1104,7 +1104,6 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1113,8 +1112,7 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -1172,7 +1170,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
       "dev": true
     },
     "array-sort": {
@@ -1218,7 +1216,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
       "dev": true
     },
     "asap": {
@@ -1271,7 +1269,7 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
       "dev": true
     },
     "asynckit": {
@@ -1525,7 +1523,6 @@
       "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1748,8 +1745,7 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1768,7 +1764,6 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1780,22 +1775,19 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1811,7 +1803,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1820,15 +1811,13 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1949,8 +1938,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1963,7 +1951,6 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1975,8 +1962,7 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -2237,8 +2223,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2334,7 +2319,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2398,7 +2382,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2478,7 +2462,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
       "dev": true
     },
     "continuable-cache": {
@@ -2521,7 +2505,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
       "dev": true
     },
     "core-util-is": {
@@ -2547,7 +2531,6 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2802,7 +2785,6 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2820,7 +2802,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2829,15 +2810,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2849,7 +2828,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2859,7 +2837,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2869,7 +2846,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2883,7 +2859,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2899,15 +2874,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2919,15 +2892,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2939,22 +2910,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2963,15 +2931,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2981,7 +2947,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3002,15 +2967,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3021,7 +2984,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3037,7 +2999,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3047,7 +3008,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3057,7 +3017,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3068,7 +3027,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3079,7 +3037,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3092,7 +3049,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3104,7 +3060,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3132,7 +3087,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3146,22 +3100,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3174,7 +3125,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3185,7 +3135,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3198,7 +3147,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3213,22 +3161,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3241,7 +3186,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3252,7 +3196,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3265,7 +3208,6 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3279,22 +3221,19 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3307,7 +3246,6 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3318,7 +3256,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3331,7 +3268,6 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3347,7 +3283,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3360,8 +3295,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3494,7 +3428,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3560,7 +3494,6 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3584,7 +3517,6 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3593,15 +3525,13 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
-          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3613,7 +3543,6 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3623,7 +3552,6 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3633,7 +3561,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3647,7 +3574,6 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
-          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3663,15 +3589,13 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3683,15 +3607,13 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3703,22 +3625,19 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3727,15 +3646,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3745,7 +3662,6 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
-          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3766,15 +3682,13 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3785,7 +3699,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3801,7 +3714,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3811,7 +3723,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3821,7 +3732,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3832,7 +3742,6 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
-          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3843,7 +3752,6 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
-              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3856,7 +3764,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3868,7 +3775,6 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3911,7 +3817,6 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -3924,7 +3829,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -3933,15 +3837,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3951,7 +3853,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3967,7 +3868,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3979,7 +3879,6 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -3989,8 +3888,7 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4058,7 +3956,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4094,7 +3992,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4258,7 +4156,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true,
           "optional": true
         }
@@ -4353,7 +4251,7 @@
     "eslint-scope": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4363,13 +4261,13 @@
     "eslint-utils": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
       "dev": true
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
       "dev": true
     },
     "espree": {
@@ -4392,7 +4290,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4401,7 +4299,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4461,7 +4359,7 @@
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
       "dev": true
     },
     "exec-buffer": {
@@ -4676,7 +4574,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -4930,7 +4828,6 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4978,15 +4875,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5233,8 +5128,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5298,8 +5192,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5320,14 +5213,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5342,20 +5233,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5472,8 +5360,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5485,7 +5372,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5500,7 +5386,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5508,14 +5393,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5534,7 +5417,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5615,8 +5497,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5628,7 +5509,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5714,8 +5594,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5751,7 +5630,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5771,7 +5649,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5815,14 +5692,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -5858,7 +5733,6 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
-      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -6020,7 +5894,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6165,7 +6039,6 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6189,7 +6062,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6198,22 +6070,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
-          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6223,7 +6092,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6239,7 +6107,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6259,8 +6126,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6556,7 +6422,6 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
-      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6568,15 +6433,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6592,7 +6455,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6602,7 +6464,7 @@
     "gulp-eslint": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
+      "integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
       "dev": true,
       "requires": {
         "eslint": "^5.0.1",
@@ -7210,7 +7072,6 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7223,15 +7084,13 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7241,7 +7100,6 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
-          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -7560,7 +7418,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7711,7 +7569,7 @@
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
       "dev": true,
       "requires": {
         "eventemitter3": "^3.0.0",
@@ -8005,7 +7863,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -8072,8 +7930,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8208,8 +8065,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8222,8 +8078,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8289,8 +8144,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8304,7 +8158,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -8313,15 +8167,14 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
       "dev": true
     },
     "is-retry-allowed": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8351,8 +8204,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8363,7 +8215,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8373,8 +8225,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8386,8 +8237,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8405,8 +8255,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8523,7 +8372,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -8650,7 +8499,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -8727,7 +8576,6 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8736,15 +8584,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8760,7 +8606,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -9066,8 +8911,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lodash.isobject": {
       "version": "2.4.1",
@@ -9264,8 +9108,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9306,7 +9149,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -9487,7 +9330,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
       "dev": true
     },
     "minimatch": {
@@ -9661,8 +9504,7 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12712,8 +12554,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -13017,7 +12858,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
       "dev": true
     },
     "posix-character-classes": {
@@ -13424,8 +13265,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13508,7 +13348,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
       "dev": true
     },
     "qs": {
@@ -13557,7 +13397,6 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13570,7 +13409,6 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13580,15 +13418,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13604,7 +13440,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -13709,7 +13544,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14207,7 +14042,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
       "dev": true
     },
     "sax": {
@@ -14221,7 +14056,6 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
-      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14367,8 +14201,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -14396,7 +14229,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
       "dev": true
     },
     "shebang-command": {
@@ -14686,7 +14519,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14873,8 +14706,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -14918,7 +14750,6 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -14929,7 +14760,6 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
-          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -14938,15 +14768,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14962,7 +14790,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14972,20 +14799,19 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
+      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
       "dev": true
     },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -15012,7 +14838,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -15027,7 +14853,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -15044,7 +14870,7 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
@@ -15158,7 +14984,6 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -15172,15 +14997,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15194,7 +15017,6 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15203,15 +15025,13 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15242,7 +15062,6 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15276,7 +15095,6 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15285,15 +15103,13 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15306,8 +15122,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15369,7 +15184,6 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15385,7 +15199,6 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15394,15 +15207,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15412,7 +15223,6 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15428,7 +15238,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15527,7 +15336,6 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15552,8 +15360,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "timsort": {
       "version": "0.3.0",
@@ -15605,7 +15412,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15616,7 +15423,6 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
-      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15626,7 +15432,6 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15643,8 +15448,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15723,7 +15527,6 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15773,7 +15576,7 @@
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -15815,7 +15618,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
       "dev": true
     },
     "unc-path-regex": {
@@ -15972,19 +15775,18 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -16001,7 +15803,6 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
-      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -16087,8 +15888,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -16133,7 +15933,6 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -16143,22 +15942,19 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -16174,7 +15970,6 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16314,7 +16109,6 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
-      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16405,7 +16199,6 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16428,7 +16221,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",
@@ -16503,7 +16296,6 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"

From ff497b413e24bb936bc9b4c1d98d993fa0a764b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 5 Feb 2019 11:54:23 +0100
Subject: [PATCH 289/421] V8: UI, refactoring of infinity editing to use CSS to
 fix issue regarding stacking of layers.

---
 .../components/editor/umbeditors.directive.js | 176 +++++-------------
 .../less/components/editor/umb-editor.less    |  69 +++++--
 .../application/umb-navigation.html           |   5 +-
 .../views/components/editor/umb-editors.html  |  20 +-
 4 files changed, 128 insertions(+), 142 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index 235918735fdd..4104a663d34d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -7,161 +7,85 @@
 
             var evts = [];
             var allowedNumberOfVisibleEditors = 3;
-            var editorIndent = 60;
-
+            
             scope.editors = [];
-
+            
             function addEditor(editor) {
                 
+                editor.inFront = true;
+                editor.moveRight = true;
+                editor.level = 0;
+                editor.styleIndex = 0;
                 
-                if (!editor.style)
-                    editor.style = {};
-                
-                editor.animating = true;
-                
-                showOverlayOnPrevEditor();
-                
-                var i = allowedNumberOfVisibleEditors;
-                var len = scope.editors.length;
-                while(i<len) {
-                    
-                    var animeConfig = {
-                        target: scope.editors[i].style,
-                        easing: 'easeInOutQuint',
-                        duration: 300
-                    }
-                    
-                    if(scope.editors[i].size !== "small") {
-                        animeConfig.width = "100%";
-                    }
-                    
-                    if(len >= allowedNumberOfVisibleEditors) {
-                        animeConfig.left = i * editorIndent;
-                    } else {
-                        animeConfig.left = (i + 1) * editorIndent;
-                    }
-                    
-                    anime(animeConfig);
-                    
-                    i++;
-                }
-                
+                editor.infinityMode = true;
                 
                 // push the new editor to the dom
                 scope.editors.push(editor);
                 
+                $timeout(() => {
+                    editor.moveRight = false;
+                })
                 
+                editor.animating = true;
+                setTimeout(revealEditorContent.bind(this, editor), 400);
                 
-                var indentValue = scope.editors.length * editorIndent;
-
-                // don't allow indent larger than what 
-                // fits the max number of visible editors
-                if(scope.editors.length >= allowedNumberOfVisibleEditors) {
-                    indentValue = allowedNumberOfVisibleEditors * editorIndent;
-                }
-
-                // indent all large editors
-                if(editor.size !== "small") {
-                    editor.style.left = indentValue + "px";
-                }
-                
-                editor.style._tx = 100;
-                editor.style.transform = "translateX("+editor.style._tx+"%)";
-                
-                // animation config
-                anime({
-                    targets: editor.style,
-                    _tx: [100, 0],
-                    easing: 'easeOutExpo',
-                    duration: 480,
-                    update: () => {
-                        editor.style.transform = "translateX("+editor.style._tx+"%)";
-                        scope.$digest();
-                    },
-                    complete: function() {
-                        editor.animating = false;
-                        scope.$digest();
-                    }
-                });
-                
+                updateEditors();
 
             }
-
+            
             function removeEditor(editor) {
                 
-                editor.animating = true;
+                editor.moveRight = true;
                 
-                editor.style._tx = 0;
-                editor.style.transform = "translateX("+editor.style._tx+"%)";
+                editor.animating = true;
+                setTimeout(removeEditorFromDOM.bind(this, editor), 400);
                 
-                // animation config
-                anime({
-                    targets: editor.style,
-                    _tx: [0, 100],
-                    easing: 'easeInExpo',
-                    duration: 360,
-                    update: () => {
-                        editor.style.transform = "translateX("+editor.style._tx+"%)";
-                        scope.$digest();
-                    },
-                    complete: function() {
-                        scope.editors.splice(-1,1);
-                        removeOverlayFromPrevEditor();
-                        scope.$digest();
-                    }
-                });
+                updateEditors(-1);
                 
+            }
+            
+            function revealEditorContent(editor) {
                 
-                expandEditors();
+                editor.animating = false;
                 
+                scope.$digest();
                 
             }
-
-            function expandEditors() {
+            
+            function removeEditorFromDOM(editor) {
                 
-                var i = allowedNumberOfVisibleEditors + 1;
-                var len = scope.editors.length-1;
-                while(i<len) {
-                    
-                    var animeConfig = {
-                        target: scope.editors[i].style,
-                        easing: 'easeInOutQuint',
-                        duration: 300
-                    }
-                    
-                    if(scope.editors[i].size !== "small" && i === len) {
-                        animeConfig.width = "500px";
-                    }
-                    
-                    if(scope.editors[i].size !== "small" && i === len) {
-                        animeConfig.left = editorWidth - 500;
-                    } else {
-                        animeConfig.left = (index + 1) * editorIndent;
-                    }
-                    
-                    anime(animeConfig);
-                    
-                    i++;
+                // push the new editor to the dom
+                var index = scope.editors.indexOf(editor);
+                if (index !== -1) {
+                    scope.editors.splice(index, 1);
                 }
                 
+                updateEditors();
+                
+                scope.$digest();
                 
             }
-
-            // show backdrop on previous editor
-            function showOverlayOnPrevEditor() {
-                var numberOfEditors = scope.editors.length;
-                if(numberOfEditors > 0) {
-                    scope.editors[numberOfEditors - 1].showOverlay = true;
+            
+            /** update layer positions. With ability to offset positions, needed for when an item is moving out, then we dont want it to influence positions */
+            function updateEditors(offset) {
+                
+                offset = offset || 0;// fallback value.
+                
+                var len = scope.editors.length;
+                var calcLen = len + offset;
+                var ceiling = Math.min(calcLen, allowedNumberOfVisibleEditors);
+                var origin = Math.max(calcLen-1, 0)-ceiling;
+                var i = 0;
+                while(i<len) {
+                    var iEditor = scope.editors[i];
+                    iEditor.styleIndex = Math.min(i+1, allowedNumberOfVisibleEditors);
+                    iEditor.level = Math.max(i-origin, -1);
+                    iEditor.inFront = iEditor.level >= ceiling;
+                    i++;
                 }
-            }
 
-            function removeOverlayFromPrevEditor() {
-                var numberOfEditors = scope.editors.length;
-                if(numberOfEditors > 0) {
-                    scope.editors[numberOfEditors - 1].showOverlay = false;
-                }
             }
-
+            
             evts.push(eventsService.on("appState.editors.open", function (name, args) {
                 addEditor(args.editor);
             }));
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index 6dd77c56b1fb..f1fa8245eaf6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -4,6 +4,7 @@
     right: 0;
     bottom: 0;
     left: 0;
+    overflow: hidden;
 }
 
 .umb-editor {
@@ -17,7 +18,49 @@
 }
 
 .umb-editor--animating {
-    will-change: transform, width, left;
+    //will-change: transform, width, left;
+}
+.umb-editor--infinityMode {
+    transform: none;
+    will-change: transform;
+    transition: transform 400ms ease-in-out;
+    &.moveRight {
+        transform: translateX(110%);
+    }
+}
+
+.umb-editor--outOfRange {
+    //left:0;
+    transform: none;
+    display: none;
+    will-change: auto;
+    transition: display 0s 320ms;
+}
+.umb-editor--level0 {
+    //left:0;
+    transform: none;
+}
+.umb-editor--level1 {
+    //left:60px;
+    transform: translateX(60px);
+}
+.umb-editor--level2 {
+    //left:120px;
+    transform: translateX(120px);
+}
+.umb-editor--level3 {
+    //left:180px;
+    transform: translateX(180px);
+}
+
+.umb-editor--n1 {
+    right:60px;
+}
+.umb-editor--n2 {
+    right:120px;
+}
+.umb-editor--n3 {
+    right:180px;
 }
 
 // hide all infinite editors by default
@@ -28,20 +71,14 @@
 
 .umb-editor--small {
     width: 500px;
+    will-change: transform;
     left: auto;
-
+    
     .umb-editor-container {
         max-width: 500px;
     }
 }
-@keyframes umb-editor__overlay_fade_opacity {
-    from {
-        opacity:0;
-    }
-    to {
-        opacity:1;
-    }
-}
+
 .umb-editor__overlay {
     position: absolute;
     top: 0;
@@ -50,6 +87,14 @@
     left: 0;
     background: rgba(0,0,0,0.4);
     z-index: @zIndexEditor;
-    
-    animation:umb-editor__overlay_fade_opacity 600ms;
+    visibility: hidden;
+    opacity: 0;
+    transition: opacity 320ms 20ms, visibility 0s 400ms;
+}
+
+#contentcolumn > .umb-editor__overlay,
+.--notInFront .umb-editor__overlay {
+    visibility: visible;
+    opacity: 1;
+    transition: opacity 320ms 20ms, visibility 0s;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
index 275c814761f7..829582329fd8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
@@ -1,7 +1,8 @@
 <div id="leftcolumn" ng-controller="Umbraco.NavigationController" ng-mouseleave="leaveTree($event)" ng-mouseenter="enterTree($event)">
 
     <!-- navigation container -->
-    <div id="navigation" ng-show="showNavigation" class="fill umb-modalcolumn" ng-animate="'slide'" nav-resize>
+    <div id="navigation" ng-show="showNavigation" class="fill umb-modalcolumn" ng-animate="'slide'" nav-resize
+    ng-class="{'--notInFront': infiniteMode}">
 
         <div class="navigation-inner-container">
 
@@ -45,7 +46,7 @@
 
         </div>
 
-        <div class="umb-editor__overlay" ng-show="infiniteMode"></div>
+        <div class="umb-editor__overlay"></div>
 
     </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
index 7b46e9e33d77..99f9e96765a7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
@@ -1,9 +1,25 @@
 <div class="umb-editors">
 
-    <div class="umb-editor" ng-repeat="model in editors" ng-style="model.style" ng-class="{'umb-editor--small': model.size === 'small', 'umb-editor--animating': model.animating}">
+    <div class="umb-editor"
+        ng-repeat="model in editors"
+        ng-class="{'umb-editor--small': model.size === 'small',
+        'umb-editor--animating': model.animating,
+        '--notInFront': model.inFront !== true,
+        'umb-editor--infinityMode': model.infinityMode,
+        'moveRight': model.moveRight,
+        'umb-editor--n0': model.styleIndex === 0,
+        'umb-editor--n1': model.styleIndex === 1,
+        'umb-editor--n2': model.styleIndex === 2,
+        'umb-editor--n3': model.styleIndex === 3,
+        'umb-editor--outOfRange': model.level === -1,
+        'umb-editor--level0': model.level === 0,
+        'umb-editor--level1': model.level === 1,
+        'umb-editor--level2': model.level === 2,
+        'umb-editor--level3': model.level === 3}"
+        >
         <div ng-if="!model.view && !model.animating" ng-transclude></div>
         <div ng-if="model.view && !model.animating" ng-include="model.view"></div>
-        <div ng-if="model.showOverlay" class="umb-editor__overlay"></div>
+        <div class="umb-editor__overlay"></div>
     </div>
 
 </div>

From 42902497194a258cde1444c43849410225b34f5d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 5 Feb 2019 11:55:10 +0100
Subject: [PATCH 290/421] #4405 - Load history on init if the active tab is
 info

---
 .../content/umbcontentnodeinfo.directive.js   | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index 06a147969a6d..a043b292ef1c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -3,7 +3,7 @@
 
     function ContentNodeInfoDirective($timeout, logResource, eventsService, userService, localizationService, dateHelper, editorService, redirectUrlsResource, overlayService) {
 
-        function link(scope, umbVariantContentCtrl) {
+        function link(scope) {
 
             var evts = [];
             var isInfoTab = false;
@@ -96,22 +96,17 @@
                     scope.previewOpenUrl = '#/settings/documenttypes/edit/' + scope.documentType.id;
                 }
 
-                //load in the audit trail if we are currently looking at the INFO tab
-                if (umbVariantContentCtrl && umbVariantContentCtrl.editor) {
-                    var activeApp = _.find(umbVariantContentCtrl.editor.content.apps, a => a.active);
-                    if (activeApp && activeApp.alias === "umbInfo") {
-                        isInfoTab = true;
-                        loadAuditTrail();
-                        loadRedirectUrls();
-                    }
+                var activeApp = _.find(scope.node.apps, (a) => a.active);
+                if (activeApp.alias === "umbInfo") {
+                    loadRedirectUrls();
+                    loadAuditTrail();
                 }
 
             }
 
             scope.auditTrailPageChange = function (pageNumber) {
                 scope.auditTrailOptions.pageNumber = pageNumber;
-                auditTrailLoaded = false;
-                loadAuditTrail();
+                loadAuditTrail(true);
             };
 
             scope.openDocumentType = function (documentType) {
@@ -192,10 +187,12 @@
                 editorService.rollback(rollback);
             };
 
-            function loadAuditTrail() {
+            function loadAuditTrail(forceReload) {
 
                 //don't load this if it's already done
-                if (auditTrailLoaded) { return; };
+                if (auditTrailLoaded && !forceReload) {
+                    return; 
+                }
 
                 scope.loadingAuditTrail = true;
 
@@ -334,8 +331,7 @@
                 if (newValue === oldValue) { return; }
 
                 if (isInfoTab) {
-                    auditTrailLoaded = false;
-                    loadAuditTrail();
+                    loadAuditTrail(true);
                     loadRedirectUrls();
                     setNodePublishStatus();
                     updateCurrentUrls();

From d3b091304701a5e3e19731d9e494b58706d8a4d3 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Feb 2019 12:19:57 +0100
Subject: [PATCH 291/421] Fix UmbracoHelper preventing upgrades

---
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  7 +++-
 src/Umbraco.Web/UmbracoHelper.cs              | 42 ++++++++++++-------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index e1a840c17b53..0f17c19bdbba 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -100,7 +100,12 @@ public override void Compose(Composition composition)
             composition.RegisterUnique<IUmbracoComponentRenderer, UmbracoComponentRenderer>();
 
             // register the umbraco helper - this is Transient! very important!
-            composition.Register<UmbracoHelper>();
+            // also, if not level.Run, we cannot really use the helper (during upgrade...)
+            // so inject a "void" helper (not exactly pretty but...)
+            if (composition.RuntimeState.Level == RuntimeLevel.Run)
+                composition.Register<UmbracoHelper>();
+            else
+                composition.Register(_ => new UmbracoHelper());
 
             // register distributed cache
             composition.RegisterUnique(f => new DistributedCache());
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 4b1b125a964c..962d181d7b5e 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -24,11 +24,14 @@ public class UmbracoHelper
     {
         private static readonly HtmlStringUtilities StringUtilities = new HtmlStringUtilities();
 
-        private readonly UmbracoContext _umbracoContext;
-        private IPublishedContent _currentPage;
-        
+        private readonly IPublishedContentQuery _publishedContentQuery;
+        private readonly ITagQuery _tagQuery;
+        private readonly MembershipHelper _membershipHelper;
         private readonly IUmbracoComponentRenderer _componentRenderer;
         private readonly ICultureDictionaryFactory _cultureDictionaryFactory;
+        private readonly UmbracoContext _umbracoContext;
+
+        private IPublishedContent _currentPage;
         private ICultureDictionary _cultureDictionary;
 
         #region Constructors
@@ -50,11 +53,11 @@ public UmbracoHelper(UmbracoContext umbracoContext, ITagQuery tagQuery,
             MembershipHelper membershipHelper)
         {
             _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
-            TagQuery = tagQuery ?? throw new ArgumentNullException(nameof(tagQuery));
+            _tagQuery = tagQuery ?? throw new ArgumentNullException(nameof(tagQuery));
             _cultureDictionaryFactory = cultureDictionary ?? throw new ArgumentNullException(nameof(cultureDictionary));
             _componentRenderer = componentRenderer ?? throw new ArgumentNullException(nameof(componentRenderer));
-            MembershipHelper = membershipHelper ?? throw new ArgumentNullException(nameof(membershipHelper));
-            ContentQuery = publishedContentQuery ?? throw new ArgumentNullException(nameof(publishedContentQuery));
+            _membershipHelper = membershipHelper ?? throw new ArgumentNullException(nameof(membershipHelper));
+            _publishedContentQuery = publishedContentQuery ?? throw new ArgumentNullException(nameof(publishedContentQuery));
 
             if (_umbracoContext.IsFrontEndUmbracoRequest)
                 _currentPage = _umbracoContext.PublishedRequest.PublishedContent;
@@ -69,25 +72,32 @@ internal UmbracoHelper()
 
         #endregion
 
+        // ensures that we can return the specified value
+        T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException(""); // fixme
+
+        private IUmbracoComponentRenderer ComponentRenderer => Ensure(_componentRenderer);
+        private ICultureDictionaryFactory CultureDictionaryFactory => Ensure(_cultureDictionaryFactory);
+        private UmbracoContext UmbracoContext => Ensure(_umbracoContext);
+
         /// <summary>
         /// Gets the tag context.
         /// </summary>
-        public ITagQuery TagQuery { get; }
+        public ITagQuery TagQuery => Ensure(_tagQuery);
 
         /// <summary>
         /// Gets the query context.
         /// </summary>
-        public IPublishedContentQuery ContentQuery { get; }
-        
+        public IPublishedContentQuery ContentQuery => Ensure(_publishedContentQuery);
+
         /// <summary>
         /// Gets the membership helper.
         /// </summary>
-        public MembershipHelper MembershipHelper { get; }
+        public MembershipHelper MembershipHelper => Ensure(_membershipHelper);
 
         /// <summary>
         /// Gets the url provider.
         /// </summary>
-        public UrlProvider UrlProvider => _umbracoContext.UrlProvider;
+        public UrlProvider UrlProvider => UmbracoContext.UrlProvider;
 
         /// <summary>
         /// Gets (or sets) the current <see cref="IPublishedContent"/> item assigned to the UmbracoHelper.
@@ -134,7 +144,7 @@ public IPublishedContent AssignedContentItem
         /// <returns></returns>
         public IHtmlString RenderTemplate(int contentId, int? altTemplateId = null)
         {
-            return _componentRenderer.RenderTemplate(contentId, altTemplateId);
+            return ComponentRenderer.RenderTemplate(contentId, altTemplateId);
         }
 
         #region RenderMacro
@@ -146,7 +156,7 @@ public IHtmlString RenderTemplate(int contentId, int? altTemplateId = null)
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias)
         {
-            return _componentRenderer.RenderMacro(_umbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, new { });
+            return ComponentRenderer.RenderMacro(UmbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, new { });
         }
 
         /// <summary>
@@ -157,7 +167,7 @@ public IHtmlString RenderMacro(string alias)
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias, object parameters)
         {
-            return _componentRenderer.RenderMacro(_umbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, parameters.ToDictionary<object>());
+            return ComponentRenderer.RenderMacro(UmbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, parameters.ToDictionary<object>());
         }
 
         /// <summary>
@@ -168,7 +178,7 @@ public IHtmlString RenderMacro(string alias, object parameters)
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters)
         {
-            return _componentRenderer.RenderMacro(_umbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, parameters);
+            return ComponentRenderer.RenderMacro(UmbracoContext.PublishedRequest?.PublishedContent?.Id ?? 0, alias, parameters);
         }
 
         #endregion
@@ -205,7 +215,7 @@ public string GetDictionaryValue(string key, string altText)
         /// Returns the ICultureDictionary for access to dictionary items
         /// </summary>
         public ICultureDictionary CultureDictionary => _cultureDictionary
-            ?? (_cultureDictionary = _cultureDictionaryFactory.CreateDictionary());
+            ?? (_cultureDictionary = CultureDictionaryFactory.CreateDictionary());
 
         #endregion
 

From d2692a2ff5566cf2427d034202935a047c9234b4 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Feb 2019 12:20:13 +0100
Subject: [PATCH 292/421] NuCache respects global local temp storage

---
 .../NuCache/PublishedSnapshotService.cs       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index f470e5a65a97..be506d99f8cc 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using System.Linq;
+using System.Web;
 using CSharpTest.Net.Collections;
 using Newtonsoft.Json;
 using Umbraco.Core;
@@ -140,8 +142,33 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
 
                 if (registered)
                 {
-                    var localContentDbPath = IOHelper.MapPath("~/App_Data/NuCache.Content.db");
-                    var localMediaDbPath = IOHelper.MapPath("~/App_Data/NuCache.Media.db");
+                    string path;
+                    var tempLocation = globalSettings.LocalTempStorageLocation;
+                    switch (tempLocation)
+                    {
+                        case LocalTempStorage.AspNetTemp:
+                            path = Path.Combine(HttpRuntime.CodegenDir, "UmbracoData", "NuCache");
+                            break;
+                        case LocalTempStorage.EnvironmentTemp:
+                            // TODO: why has this to be repeated everywhere?!
+                            // include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                            // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                            // utilizing an old path - assuming we cannot have SHA1 collisions on AppDomainAppId
+                            var appDomainHash = HttpRuntime.AppDomainAppId.GenerateHash();
+                            path = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", appDomainHash, "NuCache");
+                            break;
+                        //case LocalTempStorage.Default:
+                        //case LocalTempStorage.Unknown:
+                        default:
+                            path = IOHelper.MapPath("~/App_Data/TEMP/NuCache");
+                            break;
+                    }
+
+                    if (!Directory.Exists(path))
+                        Directory.CreateDirectory(path);
+
+                    var localContentDbPath = Path.Combine(path, "NuCache.Content.db");
+                    var localMediaDbPath = Path.Combine(path, "NuCache.Media.db");
                     _localDbExists = System.IO.File.Exists(localContentDbPath) && System.IO.File.Exists(localMediaDbPath);
 
                     // if both local databases exist then GetTree will open them, else new databases will be created

From 6125643c3f8086b0f44973b76556eef58bb0ae66 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Feb 2019 13:43:04 +0100
Subject: [PATCH 293/421] Bump copyright year

---
 src/SolutionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index ce40bd9baab5..5681a3194808 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -2,7 +2,7 @@
 using System.Resources;
 
 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2018")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

From 29f2f34f9b6343d772a352f9b9e3b0c56429d891 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Feb 2019 14:06:48 +0100
Subject: [PATCH 294/421] Refactor IContent vs IContentType

---
 src/Umbraco.Core/ContentExtensions.cs         |  9 ++--
 ...ontentTypeBaseServiceProviderExtensions.cs | 17 +++++++
 src/Umbraco.Core/Models/Content.cs            | 43 ++++------------
 src/Umbraco.Core/Models/ContentBase.cs        | 51 +++++++++----------
 src/Umbraco.Core/Models/ContentType.cs        |  7 ++-
 src/Umbraco.Core/Models/ContentTypeBase.cs    |  2 +
 src/Umbraco.Core/Models/IContent.cs           |  5 --
 src/Umbraco.Core/Models/IContentBase.cs       | 17 ++-----
 src/Umbraco.Core/Models/IContentTypeBase.cs   |  5 ++
 src/Umbraco.Core/Models/IMedia.cs             |  5 --
 src/Umbraco.Core/Models/IMember.cs            |  9 +---
 src/Umbraco.Core/Models/Media.cs              | 42 ++++-----------
 src/Umbraco.Core/Models/MediaExtensions.cs    |  4 +-
 src/Umbraco.Core/Models/MediaType.cs          |  3 ++
 src/Umbraco.Core/Models/Member.cs             | 32 +-----------
 src/Umbraco.Core/Models/MemberType.cs         |  3 ++
 src/Umbraco.Core/Models/SimpleContentType.cs  | 43 +++++++++++++++-
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 src/Umbraco.Tests/Models/ContentTests.cs      |  8 ---
 .../Editors/Binders/MemberBinder.cs           |  3 +-
 src/Umbraco.Web/Editors/ContentController.cs  |  3 +-
 .../Editors/ContentTypeController.cs          |  3 +-
 .../Editors/Filters/MemberValidationHelper.cs |  6 ++-
 src/Umbraco.Web/Editors/MediaController.cs    |  3 +-
 .../Editors/MediaTypeController.cs            |  3 +-
 src/Umbraco.Web/Editors/MemberController.cs   |  5 +-
 .../PublishedContentHashtableConverter.cs     |  4 +-
 .../Mapping/ContentTypeBasicResolver.cs       |  3 +-
 .../Mapping/MemberBasicPropertiesResolver.cs  |  9 ++--
 .../MemberTabsAndPropertiesResolver.cs        | 18 ++++---
 .../Mapping/TabsAndPropertiesResolver.cs      | 10 ++--
 .../NuCache/PublishedSnapshotService.cs       |  4 +-
 src/Umbraco.Web/Security/MembershipHelper.cs  |  8 +--
 33 files changed, 185 insertions(+), 203 deletions(-)
 create mode 100644 src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 5db080f3f314..bf2e7f6aa851 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -137,7 +137,8 @@ internal static bool HasChildren(IContentBase content, ServiceContext services)
         /// <returns></returns>
         public static IEnumerable<Property> GetNonGroupedProperties(this IContentBase content)
         {
-            var propertyIdsInTabs = content.PropertyGroups.SelectMany(pg => pg.PropertyTypes);
+            var contentType = Current.Services.ContentTypeBaseServices.GetContentTypeOf(content);
+            var propertyIdsInTabs = contentType.PropertyGroups.SelectMany(pg => pg.PropertyTypes);
             return content.Properties
                           .Where(property => propertyIdsInTabs.Contains(property.PropertyType) == false)
                           .OrderBy(x => x.PropertyType.SortOrder);
@@ -206,8 +207,7 @@ private static Property GetProperty(IContentBase content, IContentTypeBaseServic
             var property = content.Properties.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (property != null) return property;
 
-            var contentTypeService = contentTypeBaseServiceProvider.For(content);
-            var contentType = contentTypeService.Get(content.ContentTypeId);
+            var contentType = contentTypeBaseServiceProvider.GetContentTypeOf(content);
             var propertyType = contentType.CompositionPropertyTypes
                 .FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (propertyType == null)
@@ -236,8 +236,7 @@ private static Property GetProperty(IContentBase content, IContentTypeBaseServic
         /// </remarks>
         public static string StoreFile(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias, string filename, Stream filestream, string filepath)
         {
-            var contentTypeService = contentTypeBaseServiceProvider.For(content);
-            var contentType = contentTypeService.Get(content.ContentTypeId);
+            var contentType = contentTypeBaseServiceProvider.GetContentTypeOf(content);
             var propertyType = contentType
                 .CompositionPropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (propertyType == null) throw new ArgumentException("Invalid property type alias " + propertyTypeAlias + ".");
diff --git a/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs b/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs
new file mode 100644
index 000000000000..ad4d286139b9
--- /dev/null
+++ b/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core
+{
+    // fixme
+    public static class ContentTypeBaseServiceProviderExtensions
+    {
+        public static IContentTypeComposition GetContentTypeOf(this IContentTypeBaseServiceProvider serviceProvider, IContentBase contentBase)
+            => serviceProvider.For(contentBase).Get(contentBase.ContentTypeId);
+    }
+}
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index dd4ba13c33a0..d33e78d422f6 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -45,7 +45,6 @@ public Content(string name, IContent parent, IContentType contentType, PropertyC
             : base(name, parent, contentType, properties, culture)
         {
             if (contentType == null) throw new ArgumentNullException(nameof(contentType));
-            ContentType = new SimpleContentType(contentType);
             _publishedState = PublishedState.Unpublished;
             PublishedVersionId = 0;
         }
@@ -73,7 +72,6 @@ public Content(string name, int parentId, IContentType contentType, PropertyColl
             : base(name, parentId, contentType, properties, culture)
         {
             if (contentType == null) throw new ArgumentNullException(nameof(contentType));
-            ContentType = new SimpleContentType(contentType);
             _publishedState = PublishedState.Unpublished;
             PublishedVersionId = 0;
         }
@@ -165,12 +163,6 @@ public PublishedState PublishedState
         [IgnoreDataMember]
         public bool Edited { get; internal set; }
 
-        /// <summary>
-        /// Gets the ContentType used by this content object
-        /// </summary>
-        [IgnoreDataMember]
-        public ISimpleContentType ContentType { get; private set; }
-
         /// <inheritdoc />
         [IgnoreDataMember]
         public DateTime? PublishDate { get; internal set; } // set by persistence
@@ -241,7 +233,7 @@ public bool IsCultureEdited(string culture)
         public string GetPublishName(string culture)
         {
             if (culture.IsNullOrWhiteSpace()) return PublishName;
-            if (!ContentTypeBase.VariesByCulture()) return null;
+            if (!ContentType.VariesByCulture()) return null;
             if (_publishInfos == null) return null;
             return _publishInfos.TryGetValue(culture, out var infos) ? infos.Name : null;
         }
@@ -250,7 +242,7 @@ public string GetPublishName(string culture)
         public DateTime? GetPublishDate(string culture)
         {
             if (culture.IsNullOrWhiteSpace()) return PublishDate;
-            if (!ContentTypeBase.VariesByCulture()) return null;
+            if (!ContentType.VariesByCulture()) return null;
             if (_publishInfos == null) return null;
             return _publishInfos.TryGetValue(culture, out var infos) ? infos.Date : (DateTime?) null;
         }
@@ -410,13 +402,7 @@ public void UnpublishCulture(string culture = "*")
         /// <remarks>Leaves PropertyTypes intact after change</remarks>
         public void ChangeContentType(IContentType contentType)
         {
-            ContentTypeId = contentType.Id;
-            ContentType = new SimpleContentType(contentType);
-            ContentTypeBase = contentType;
-            Properties.EnsurePropertyTypes(PropertyTypes);
-
-            Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
-            Properties.CollectionChanged += PropertiesChanged;
+            ChangeContentType(contentType, false);
         }
 
         /// <summary>
@@ -427,19 +413,15 @@ public void ChangeContentType(IContentType contentType)
         /// <param name="clearProperties">Boolean indicating whether to clear PropertyTypes upon change</param>
         public void ChangeContentType(IContentType contentType, bool clearProperties)
         {
-            if(clearProperties)
-            {
-                ContentTypeId = contentType.Id;
-                ContentType = new SimpleContentType(contentType);
-                ContentTypeBase = contentType;
-                Properties.EnsureCleanPropertyTypes(PropertyTypes);
-
-                Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
-                Properties.CollectionChanged += PropertiesChanged;
-                return;
-            }
+            ChangeContentType(new SimpleContentType(contentType));
+
+            if (clearProperties)
+                Properties.EnsureCleanPropertyTypes(contentType.CompositionPropertyTypes);
+            else
+                Properties.EnsurePropertyTypes(contentType.CompositionPropertyTypes);
 
-            ChangeContentType(contentType);
+            Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
+            Properties.CollectionChanged += PropertiesChanged;
         }
 
         public override void ResetDirtyProperties(bool rememberDirty)
@@ -484,9 +466,6 @@ protected override void PerformDeepClone(object clone)
 
             var clonedContent = (Content)clone;
 
-            //need to manually clone this since it's not settable
-            clonedContent.ContentType = ContentType;
-
             //if culture infos exist then deal with event bindings
             if (clonedContent._publishInfos != null)
             {
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 51730c3b4d13..908f620b11a0 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.Serialization;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models.Entities;
 
@@ -20,7 +21,6 @@ public abstract class ContentBase : TreeEntityBase, IContentBase
         protected static readonly ContentCultureInfosCollection NoInfos = new ContentCultureInfosCollection();
 
         private int _contentTypeId;
-        protected IContentTypeComposition ContentTypeBase;
         private int _writerId;
         private PropertyCollection _properties;
         private ContentCultureInfosCollection _cultureInfos;
@@ -47,7 +47,7 @@ protected ContentBase(string name, IContentBase parent, IContentTypeComposition
 
         private ContentBase(string name, IContentTypeComposition contentType, PropertyCollection properties, string culture = null)
         {
-            ContentTypeBase = contentType ?? throw new ArgumentNullException(nameof(contentType));
+            ContentType = contentType?.ToSimple() ?? throw new ArgumentNullException(nameof(contentType));
 
             // initially, all new instances have
             Id = 0; // no identity
@@ -57,7 +57,16 @@ private ContentBase(string name, IContentTypeComposition contentType, PropertyCo
 
             _contentTypeId = contentType.Id;
             _properties = properties ?? throw new ArgumentNullException(nameof(properties));
-            _properties.EnsurePropertyTypes(PropertyTypes);
+            _properties.EnsurePropertyTypes(contentType.CompositionPropertyTypes);
+        }
+
+        [IgnoreDataMember]
+        public ISimpleContentType ContentType { get; private set; }
+
+        protected void ChangeContentType(ISimpleContentType contentType)
+        {
+            ContentType = contentType;
+            ContentTypeId = contentType.Id;
         }
 
         protected void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -88,13 +97,13 @@ public virtual int ContentTypeId
             {
                 //There will be cases where this has not been updated to reflect the true content type ID.
                 //This will occur when inserting new content.
-                if (_contentTypeId == 0 && ContentTypeBase != null && ContentTypeBase.HasIdentity)
+                if (_contentTypeId == 0 && ContentType != null)
                 {
-                    _contentTypeId = ContentTypeBase.Id;
+                    _contentTypeId = ContentType.Id;
                 }
                 return _contentTypeId;
             }
-            protected set => SetPropertyValueAndDetectChanges(value, ref _contentTypeId, nameof(ContentTypeId));
+            private set => SetPropertyValueAndDetectChanges(value, ref _contentTypeId, nameof(ContentTypeId));
         }
 
         /// <summary>
@@ -115,20 +124,6 @@ public virtual PropertyCollection Properties
             }
         }
 
-        /// <summary>
-        /// Gets the enumeration of property groups for the entity.
-        /// TODO: remove this proxy method
-        /// </summary>
-        [IgnoreDataMember]
-        public IEnumerable<PropertyGroup> PropertyGroups => ContentTypeBase.CompositionPropertyGroups;
-
-        /// <summary>
-        /// Gets the numeration of property types for the entity.
-        /// TODO: remove this proxy method
-        /// </summary>
-        [IgnoreDataMember]
-        public IEnumerable<PropertyType> PropertyTypes => ContentTypeBase.CompositionPropertyTypes;
-
         #region Cultures
 
         // notes - common rules
@@ -153,7 +148,7 @@ public bool IsCultureAvailable(string culture)
         public string GetCultureName(string culture)
         {
             if (culture.IsNullOrWhiteSpace()) return Name;
-            if (!ContentTypeBase.VariesByCulture()) return null;
+            if (!ContentType.VariesByCulture()) return null;
             if (_cultureInfos == null) return null;
             return _cultureInfos.TryGetValue(culture, out var infos) ? infos.Name : null;
         }
@@ -162,7 +157,7 @@ public string GetCultureName(string culture)
         public DateTime? GetUpdateDate(string culture)
         {
             if (culture.IsNullOrWhiteSpace()) return null;
-            if (!ContentTypeBase.VariesByCulture()) return null;
+            if (!ContentType.VariesByCulture()) return null;
             if (_cultureInfos == null) return null;
             return _cultureInfos.TryGetValue(culture, out var infos) ? infos.Date : (DateTime?) null;
         }
@@ -170,7 +165,7 @@ public string GetCultureName(string culture)
         /// <inheritdoc />
         public void SetCultureName(string name, string culture)
         {
-            if (ContentTypeBase.VariesByCulture()) // set on variant content type
+            if (ContentType.VariesByCulture()) // set on variant content type
             {
                 if (culture.IsNullOrWhiteSpace()) // invariant is ok
                 {
@@ -278,7 +273,8 @@ public virtual void SetValue(string propertyTypeAlias, object value, string cult
                 return;
             }
 
-            var propertyType = PropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
+            var propertyTypes = Current.Services.ContentTypeBaseServices.GetContentTypeOf(this).CompositionPropertyTypes;
+            var propertyType = propertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (propertyType == null)
                 throw new InvalidOperationException($"No PropertyType exists with the supplied alias \"{propertyTypeAlias}\".");
 
@@ -302,8 +298,8 @@ public virtual void CopyFrom(IContent other, string culture = "*")
             // the variation should be supported by the content type properties
             //  if the content type is invariant, only '*' and 'null' is ok
             //  if the content type varies, everything is ok because some properties may be invariant
-            if (!ContentTypeBase.SupportsPropertyVariation(culture, "*", true))
-                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{ContentTypeBase.Alias}\" with variation \"{ContentTypeBase.Variations}\".");
+            if (!ContentType.SupportsPropertyVariation(culture, "*", true))
+                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{ContentType.Alias}\" with variation \"{ContentType.Variations}\".");
 
             // copying from the same Id and VersionPk
             var copyingFromSelf = Id == other.Id && VersionId == other.VersionId;
@@ -490,6 +486,9 @@ protected override void PerformDeepClone(object clone)
 
             var clonedContent = (ContentBase)clone;
 
+            //need to manually clone this since it's not settable
+            clonedContent.ContentType = ContentType;
+
             //if culture infos exist then deal with event bindings
             if (clonedContent._cultureInfos != null)
             {
diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs
index 61fabe6fb06b..63c758611ab9 100644
--- a/src/Umbraco.Core/Models/ContentType.cs
+++ b/src/Umbraco.Core/Models/ContentType.cs
@@ -41,6 +41,9 @@ public ContentType(IContentType parent, string alias)
             _allowedTemplates = new List<ITemplate>();
         }
 
+        /// <inheritdoc />
+        public override ISimpleContentType ToSimple() => new SimpleContentType(this);
+
         /// <inheritdoc />
         public override bool IsPublishing => IsPublishingConst;
 
@@ -97,8 +100,8 @@ public IEnumerable<ITemplate> AllowedTemplates
         /// <returns>True if AllowedTemplates contains the templateId else False</returns>
         public bool IsAllowedTemplate(int templateId)
         {
-            return AllowedTemplates == null 
-                ? false 
+            return AllowedTemplates == null
+                ? false
                 : AllowedTemplates.Any(t => t.Id == templateId);
         }
 
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 2aa114a88f08..320f667e07f9 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -67,6 +67,8 @@ protected ContentTypeBase(IContentTypeBase parent, string alias)
             _variations = ContentVariation.Nothing;
         }
 
+        public abstract ISimpleContentType ToSimple();
+
         /// <summary>
         /// Gets a value indicating whether the content type is publishing.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index ee38f613a373..1e1867ddc66d 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -66,11 +66,6 @@ public interface IContent : IContentBase
         /// </summary>
         DateTime? PublishDate { get; }
 
-        /// <summary>
-        /// Gets the content type of this content.
-        /// </summary>
-        ISimpleContentType ContentType { get; }
-
         /// <summary>
         /// Gets a value indicating whether a culture is published.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index 40a1c570977e..1ed042d5bdb7 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -18,6 +18,11 @@ public interface IContentBase : IUmbracoEntity
         /// </summary>
         int ContentTypeId { get; }
 
+        /// <summary>
+        /// Gets the content type of this content.
+        /// </summary>
+        ISimpleContentType ContentType { get; }
+
         /// <summary>
         /// Gets the identifier of the writer.
         /// </summary>
@@ -95,18 +100,6 @@ public interface IContentBase : IUmbracoEntity
         /// <remarks>Properties are loaded as part of the Content object graph</remarks>
         PropertyCollection Properties { get; set; }
 
-        /// <summary>
-        /// List of PropertyGroups available on this Content object
-        /// </summary>
-        /// <remarks>PropertyGroups are kind of lazy loaded as part of the object graph</remarks>
-        IEnumerable<PropertyGroup> PropertyGroups { get; }
-
-        /// <summary>
-        /// List of PropertyTypes available on this Content object
-        /// </summary>
-        /// <remarks>PropertyTypes are kind of lazy loaded as part of the object graph</remarks>
-        IEnumerable<PropertyType> PropertyTypes { get; }
-
         /// <summary>
         /// Gets a value indicating whether the content entity has a property with the supplied alias.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
index aea84d976728..215c8532c1a7 100644
--- a/src/Umbraco.Core/Models/IContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/IContentTypeBase.cs
@@ -159,5 +159,10 @@ public interface IContentTypeBase : IUmbracoEntity
         /// <param name="propertyGroupName">Name of the PropertyGroup to move the PropertyType to</param>
         /// <returns></returns>
         bool MovePropertyType(string propertyTypeAlias, string propertyGroupName);
+
+        /// <summary>
+        /// Gets an <see cref="ISimpleContentType"/> corresponding to this content type.
+        /// </summary>
+        ISimpleContentType ToSimple();
     }
 }
diff --git a/src/Umbraco.Core/Models/IMedia.cs b/src/Umbraco.Core/Models/IMedia.cs
index cfb79bbf2cc9..3e2d11fb7144 100644
--- a/src/Umbraco.Core/Models/IMedia.cs
+++ b/src/Umbraco.Core/Models/IMedia.cs
@@ -4,11 +4,6 @@ namespace Umbraco.Core.Models
 {
     public interface IMedia : IContentBase
     {
-        /// <summary>
-        /// Gets the ContentType used by this Media object
-        /// </summary>
-        IMediaType ContentType { get; }
-
         /// <summary>
         /// Changes the <see cref="IMediaType"/> for the current content object
         /// </summary>
diff --git a/src/Umbraco.Core/Models/IMember.cs b/src/Umbraco.Core/Models/IMember.cs
index 15826f03f3a8..199d53b174bb 100644
--- a/src/Umbraco.Core/Models/IMember.cs
+++ b/src/Umbraco.Core/Models/IMember.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
 
 namespace Umbraco.Core.Models
@@ -11,10 +9,5 @@ public interface IMember : IContentBase, IMembershipUser, IHaveAdditionalData
         /// String alias of the default ContentType
         /// </summary>
         string ContentTypeAlias { get; }
-
-        /// <summary>
-        /// Gets the ContentType used by this content object
-        /// </summary>
-        IMemberType ContentType { get; }
     }
 }
diff --git a/src/Umbraco.Core/Models/Media.cs b/src/Umbraco.Core/Models/Media.cs
index a0f3aa35de3b..bf5f5cf9484a 100644
--- a/src/Umbraco.Core/Models/Media.cs
+++ b/src/Umbraco.Core/Models/Media.cs
@@ -10,8 +10,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Media : ContentBase, IMedia
     {
-        private IMediaType _contentType;
-
         /// <summary>
         /// Constructor for creating a Media object
         /// </summary>
@@ -31,9 +29,7 @@ public Media(string name, IMedia parent, IMediaType contentType)
         /// <param name="properties">Collection of properties</param>
         public Media(string name, IMedia parent, IMediaType contentType, PropertyCollection properties)
             : base(name, parent, contentType, properties)
-        {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
-        }
+        { }
 
         /// <summary>
         /// Constructor for creating a Media object
@@ -54,15 +50,7 @@ public Media(string name, int parentId, IMediaType contentType)
         /// <param name="properties">Collection of properties</param>
         public Media(string name, int parentId, IMediaType contentType, PropertyCollection properties)
             : base(name, parentId, contentType, properties)
-        {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
-        }
-
-        /// <summary>
-        /// Gets the ContentType used by this Media object
-        /// </summary>
-        [IgnoreDataMember]
-        public IMediaType ContentType => _contentType;
+        { }
 
         /// <summary>
         /// Changes the <see cref="IMediaType"/> for the current Media object
@@ -71,13 +59,7 @@ public Media(string name, int parentId, IMediaType contentType, PropertyCollecti
         /// <remarks>Leaves PropertyTypes intact after change</remarks>
         public void ChangeContentType(IMediaType contentType)
         {
-            ContentTypeId = contentType.Id;
-            _contentType = contentType;
-            ContentTypeBase = contentType;
-            Properties.EnsurePropertyTypes(PropertyTypes);
-            
-            Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
-            Properties.CollectionChanged += PropertiesChanged;
+            ChangeContentType(contentType, false);
         }
 
         /// <summary>
@@ -88,19 +70,15 @@ public void ChangeContentType(IMediaType contentType)
         /// <param name="clearProperties">Boolean indicating whether to clear PropertyTypes upon change</param>
         public void ChangeContentType(IMediaType contentType, bool clearProperties)
         {
-            if (clearProperties)
-            {
-                ContentTypeId = contentType.Id;
-                _contentType = contentType;
-                ContentTypeBase = contentType;
-                Properties.EnsureCleanPropertyTypes(PropertyTypes);
+            ChangeContentType(new SimpleContentType(contentType));
 
-                Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
-                Properties.CollectionChanged += PropertiesChanged;
-                return;
-            }
+            if (clearProperties)
+                Properties.EnsureCleanPropertyTypes(contentType.CompositionPropertyTypes);
+            else
+                Properties.EnsurePropertyTypes(contentType.CompositionPropertyTypes);
 
-            ChangeContentType(contentType);
+            Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
+            Properties.CollectionChanged += PropertiesChanged;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs
index e281aaf5abf6..b7d72f6dd337 100644
--- a/src/Umbraco.Core/Models/MediaExtensions.cs
+++ b/src/Umbraco.Core/Models/MediaExtensions.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors.ValueConverters;
@@ -15,7 +16,8 @@ public static class MediaExtensions
         /// </summary>
         public static string GetUrl(this IMedia media, string propertyAlias, ILogger logger)
         {
-            var propertyType = media.PropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyAlias));
+            var contentType = Current.Services.MediaTypeService.Get(media.ContentTypeId);
+            var propertyType = contentType.PropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyAlias));
             if (propertyType == null) return string.Empty;
 
             var val = media.Properties[propertyType];
diff --git a/src/Umbraco.Core/Models/MediaType.cs b/src/Umbraco.Core/Models/MediaType.cs
index 83e1acfbc06a..f7598b49659b 100644
--- a/src/Umbraco.Core/Models/MediaType.cs
+++ b/src/Umbraco.Core/Models/MediaType.cs
@@ -41,6 +41,9 @@ public MediaType(IMediaType parent, string alias)
         {
         }
 
+        /// <inheritdoc />
+        public override ISimpleContentType ToSimple() => new SimpleContentType(this);
+
         /// <inheritdoc />
         public override bool IsPublishing => IsPublishingConst;
 
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index 78d1cfafd5a7..0e91065d5634 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -15,8 +15,6 @@ namespace Umbraco.Core.Models
     public class Member : ContentBase, IMember
     {
         private IDictionary<string, object> _additionalData;
-        private IMemberType _contentType;
-        private readonly string _contentTypeAlias;
         private string _username;
         private string _email;
         private string _rawPasswordValue;
@@ -29,8 +27,6 @@ public class Member : ContentBase, IMember
         public Member(IMemberType contentType)
             : base("", -1, contentType, new PropertyCollection())
         {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
-            _contentTypeAlias = contentType.Alias;
             IsApproved = true;
 
             //this cannot be null but can be empty
@@ -49,8 +45,6 @@ public Member(string name, IMemberType contentType)
         {
             if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
 
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
-            _contentTypeAlias = contentType.Alias;
             IsApproved = true;
 
             //this cannot be null but can be empty
@@ -73,8 +67,6 @@ public Member(string name, string email, string username, IMemberType contentTyp
             if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
             if (string.IsNullOrWhiteSpace(username)) throw new ArgumentNullOrEmptyException(nameof(username));
 
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
-            _contentTypeAlias = contentType.Alias;
             _email = email;
             _username = username;
             IsApproved = isApproved;
@@ -96,9 +88,6 @@ public Member(string name, string email, string username, IMemberType contentTyp
         public Member(string name, string email, string username, string rawPasswordValue, IMemberType contentType)
             : base(name, -1, contentType, new PropertyCollection())
         {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
-            _contentTypeAlias = contentType.Alias;
-
             _email = email;
             _username = username;
             _rawPasswordValue = rawPasswordValue;
@@ -119,8 +108,6 @@ public Member(string name, string email, string username, string rawPasswordValu
         public Member(string name, string email, string username, string rawPasswordValue, IMemberType contentType, bool isApproved)
             : base(name, -1, contentType, new PropertyCollection())
         {
-            _contentType = contentType ?? throw new ArgumentNullException(nameof(contentType));
-            _contentTypeAlias = contentType.Alias;
             _email = email;
             _username = username;
             _rawPasswordValue = rawPasswordValue;
@@ -473,7 +460,7 @@ public int FailedPasswordAttempts
         /// String alias of the default ContentType
         /// </summary>
         [DataMember]
-        public virtual string ContentTypeAlias => _contentTypeAlias;
+        public virtual string ContentTypeAlias => ContentType.Alias;
 
         /// <summary>
         /// User key from the Provider.
@@ -504,12 +491,6 @@ internal override void AddingEntity()
                 ProviderUserKey = Key;
         }
 
-        /// <summary>
-        /// Gets the ContentType used by this content object
-        /// </summary>
-        [IgnoreDataMember]
-        public IMemberType ContentType => _contentType;
-
         /* Internal experiment - only used for mapping queries.
          * Adding these to have first level properties instead of the Properties collection.
          */
@@ -575,17 +556,6 @@ void DoLog(string logPropertyAlias, string logPropertyName)
             return true;
         }
 
-        protected override void PerformDeepClone(object clone)
-        {
-            base.PerformDeepClone(clone);
-
-            var clonedEntity = (Member)clone;
-
-            //need to manually clone this since it's not settable
-            clonedEntity._contentType = (IMemberType)ContentType.DeepClone();
-            
-        }
-
         /// <inheritdoc />
         [DataMember]
         [DoNotClone]
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index a6c151844656..e85aa0e15e95 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -31,6 +31,9 @@ public MemberType(IContentTypeComposition parent, string alias)
             MemberTypePropertyTypes = new Dictionary<string, MemberTypePropertyProfileAccess>();
         }
 
+        /// <inheritdoc />
+        public override ISimpleContentType ToSimple() => new SimpleContentType(this);
+
         /// <inheritdoc />
         public override bool IsPublishing => IsPublishingConst;
 
diff --git a/src/Umbraco.Core/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs
index be1f87fcda99..db7e01fadeed 100644
--- a/src/Umbraco.Core/Models/SimpleContentType.cs
+++ b/src/Umbraco.Core/Models/SimpleContentType.cs
@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Models
+using System;
+
+namespace Umbraco.Core.Models
 {
     /// <summary>
     /// Implements <see cref="ISimpleContentType"/>.
@@ -10,6 +12,9 @@ public class SimpleContentType : ISimpleContentType
         /// </summary>
         public SimpleContentType(IContentType contentType)
         {
+            if (contentType == null) throw new ArgumentNullException(nameof(contentType));
+
+
             Id = contentType.Id;
             Alias = contentType.Alias;
             DefaultTemplate = contentType.DefaultTemplate;
@@ -22,6 +27,42 @@ public SimpleContentType(IContentType contentType)
             IsElement = contentType.IsElement;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleContentType"/> class.
+        /// </summary>
+        public SimpleContentType(IMediaType mediaType)
+        {
+            if (mediaType == null) throw new ArgumentNullException(nameof(mediaType));
+
+            Id = mediaType.Id;
+            Alias = mediaType.Alias;
+            Variations = mediaType.Variations;
+            Icon = mediaType.Icon;
+            IsContainer = mediaType.IsContainer;
+            Icon = mediaType.Icon;
+            Name = mediaType.Name;
+            AllowedAsRoot = mediaType.AllowedAsRoot;
+            IsElement = mediaType.IsElement;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleContentType"/> class.
+        /// </summary>
+        public SimpleContentType(IMemberType memberType)
+        {
+            if (memberType == null) throw new ArgumentNullException(nameof(memberType));
+
+            Id = memberType.Id;
+            Alias = memberType.Alias;
+            Variations = memberType.Variations;
+            Icon = memberType.Icon;
+            IsContainer = memberType.IsContainer;
+            Icon = memberType.Icon;
+            Name = memberType.Name;
+            AllowedAsRoot = memberType.AllowedAsRoot;
+            IsElement = memberType.IsElement;
+        }
+
         /// <inheritdoc />
         public string Alias { get; }
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 792f1d1223f4..d4b26cbbc0d3 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -291,6 +291,7 @@
     <Compile Include="Constants-Web.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Composing\RegisterExtensions.cs" />
+    <Compile Include="ContentTypeBaseServiceProviderExtensions.cs" />
     <Compile Include="ContentVariationExtensions.cs" />
     <Compile Include="Dashboards\AccessRule.cs" />
     <Compile Include="Dashboards\AccessRuleType.cs" />
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 160428b5e452..844a6098787a 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -543,14 +543,12 @@ public void Can_Add_PropertyGroup_On_ContentType()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
-            var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
             contentType.PropertyGroups.Add(new PropertyGroup(true) { Name = "Test Group", SortOrder = 3 });
 
             // Assert
             Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(3));
-            Assert.That(content.PropertyGroups.Count(), Is.EqualTo(3));
         }
 
         [Test]
@@ -573,7 +571,6 @@ public void Can_Add_PropertyType_To_Group_On_ContentType()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
-            var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
             contentType.PropertyGroups["Content"].PropertyTypes.Add(new PropertyType("test", ValueStorageType.Ntext, "subtitle")
@@ -587,7 +584,6 @@ public void Can_Add_PropertyType_To_Group_On_ContentType()
 
             // Assert
             Assert.That(contentType.PropertyGroups["Content"].PropertyTypes.Count, Is.EqualTo(3));
-            Assert.That(content.PropertyGroups.First(x => x.Name == "Content").PropertyTypes.Count, Is.EqualTo(3));
         }
 
         [Test]
@@ -637,8 +633,6 @@ public void Can_Add_New_Property_To_New_PropertyType_In_New_PropertyGroup()
 
             // Assert
             Assert.That(content.Properties.Count, Is.EqualTo(5));
-            Assert.That(content.PropertyTypes.Count(), Is.EqualTo(5));
-            Assert.That(content.PropertyGroups.Count(), Is.EqualTo(3));
             Assert.That(content.Properties["subtitle"].GetValue(), Is.EqualTo("Subtitle Test"));
             Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("Textpage textpage"));
         }
@@ -676,8 +670,6 @@ public void Can_Change_ContentType_On_Content()
 
             // Assert
             Assert.That(content.Properties.Contains("author"), Is.True);
-            Assert.That(content.PropertyGroups.Count(), Is.EqualTo(1));
-            Assert.That(content.PropertyTypes.Count(), Is.EqualTo(3));
             //Note: There was 4 properties, after changing ContentType 1 has been added (no properties are deleted)
             Assert.That(content.Properties.Count, Is.EqualTo(5));
         }
diff --git a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
index 393fab98a9b6..bceba2e04dbf 100644
--- a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
+++ b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
@@ -169,7 +169,8 @@ private IMember CreateNew(MemberSave model)
                 var member = MemberService.CreateGenericMembershipProviderMember(model.Name, model.Email, model.Username, Guid.NewGuid().ToString("N"));
                 //we'll just remove all properties here otherwise we'll end up with validation errors, we don't want to persist any property data anyways
                 // in this case.
-                FilterContentTypeProperties(member.ContentType, member.ContentType.PropertyTypes.Select(x => x.Alias).ToArray());
+                memberType = _services.MemberTypeService.Get(member.ContentTypeId);
+                FilterContentTypeProperties(memberType, memberType.PropertyTypes.Select(x => x.Alias).ToArray());
                 return member;
             }
         }
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index b429c7d9bdea..0c3d8dfa2080 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1841,8 +1841,7 @@ private IContent ValidateMoveOrCopy(MoveOrCopy model)
                     throw new HttpResponseException(HttpStatusCode.NotFound);
                 }
 
-                var contentTypeService = Services.ContentTypeBaseServices.For(parent);
-                var parentContentType = contentTypeService.Get(parent.ContentTypeId);
+                var parentContentType = Services.ContentTypeService.Get(parent.ContentTypeId);
                 //check if the item is allowed under this one
                 if (parentContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
                         .Any(x => x.Value == toMove.ContentType.Id) == false)
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 1f5feb8ad9af..756762a8537f 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -403,8 +403,7 @@ public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
                     return Enumerable.Empty<ContentTypeBasic>();
                 }
 
-                var contentTypeService = Services.ContentTypeBaseServices.For(contentItem);
-                var contentType = contentTypeService.Get(contentItem.ContentTypeId);
+                var contentType = Services.ContentTypeBaseServices.GetContentTypeOf(contentItem);
                 var ids = contentType.AllowedContentTypes.Select(x => x.Id.Value).ToArray();
 
                 if (ids.Any() == false) return Enumerable.Empty<ContentTypeBasic>();
diff --git a/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs b/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
index 74fcac60ea77..c97e35eb0dfd 100644
--- a/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
+++ b/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
@@ -7,6 +7,7 @@
 using System.Web.Http.ModelBinding;
 using System.Web.Security;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.ContentEditing;
@@ -117,8 +118,9 @@ public override bool ValidateProperties(MemberSave model, IContentProperties<Con
             //if a sensitive value is being submitted.
             if (UmbracoContextAccessor.UmbracoContext.Security.CurrentUser.HasAccessToSensitiveData() == false)
             {
-                var sensitiveProperties = model.PersistedContent.ContentType
-                    .PropertyTypes.Where(x => model.PersistedContent.ContentType.IsSensitiveProperty(x.Alias))
+                var contentType = Current.Services.MemberTypeService.Get(model.PersistedContent.ContentTypeId);
+                var sensitiveProperties = contentType
+                    .PropertyTypes.Where(x => contentType.IsSensitiveProperty(x.Alias))
                     .ToList();
 
                 foreach (var sensitiveProperty in sensitiveProperties)
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index ee7f1cc9cd53..16816aa9fcbd 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -887,7 +887,8 @@ private IMedia ValidateMoveOrCopy(MoveOrCopy model)
                 }
 
                 //check if the item is allowed under this one
-                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
+                var parentContentType = Services.MediaTypeService.Get(parent.ContentTypeId);
+                if (parentContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
                     .Any(x => x.Value == toMove.ContentType.Id) == false)
                 {
                     var notificationModel = new SimpleNotificationModel();
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index d041db1862dc..c85ef439dd11 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -230,7 +230,8 @@ public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
                     return Enumerable.Empty<ContentTypeBasic>();
                 }
 
-                var ids = contentItem.ContentType.AllowedContentTypes.Select(x => x.Id.Value).ToArray();
+                var contentType = Services.MediaTypeService.Get(contentItem.ContentTypeId);
+                var ids = contentType.AllowedContentTypes.Select(x => x.Id.Value).ToArray();
 
                 if (ids.Any() == false) return Enumerable.Empty<ContentTypeBasic>();
 
diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs
index 5a11f6cda9df..cdc1fd3ce133 100644
--- a/src/Umbraco.Web/Editors/MemberController.cs
+++ b/src/Umbraco.Web/Editors/MemberController.cs
@@ -435,8 +435,9 @@ private string UpdateWithMembershipProvider(MemberSave contentItem)
             //There's only 3 special ones we need to deal with that are part of the MemberSave instance
             if (Security.CurrentUser.HasAccessToSensitiveData() == false)
             {
-                var sensitiveProperties = contentItem.PersistedContent.ContentType
-                    .PropertyTypes.Where(x => contentItem.PersistedContent.ContentType.IsSensitiveProperty(x.Alias))
+                var memberType = Services.MemberTypeService.Get(contentItem.PersistedContent.ContentTypeId);
+                var sensitiveProperties = memberType
+                    .PropertyTypes.Where(x => memberType.IsSensitiveProperty(x.Alias))
                     .ToList();
 
                 foreach (var sensitiveProperty in sensitiveProperties)
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index f40c8a7d9893..2a3bca9c1686 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -202,8 +202,8 @@ public PagePublishedContent(IContent inner, IVariationContextAccessor variationC
                 CreatorName = _inner.GetCreatorProfile().Name;
                 WriterName = _inner.GetWriterProfile().Name;
 
-                var contentTypeService = Current.Services.ContentTypeBaseServices.For(_inner);
-                ContentType = Current.PublishedContentTypeFactory.CreateContentType(contentTypeService.Get(_inner.ContentTypeId));
+                var contentType = Current.Services.ContentTypeBaseServices.GetContentTypeOf(_inner);
+                ContentType = Current.PublishedContentTypeFactory.CreateContentType(contentType);
 
                 _properties = ContentType.PropertyTypes
                     .Select(x =>
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
index 19c150e072a3..aa97b2526091 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeBasicResolver.cs
@@ -30,8 +30,7 @@ public ContentTypeBasic Resolve(TSource source, TDestination destination, Conten
             if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
                 && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
             {
-                var contentTypeService = _contentTypeBaseServiceProvider.For(source);
-                var contentType = contentTypeService.Get(source.ContentTypeId);
+                var contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(source);
                 var contentTypeBasic =  Mapper.Map<IContentTypeComposition, ContentTypeBasic>(contentType);
 
                 return contentTypeBasic;
diff --git a/src/Umbraco.Web/Models/Mapping/MemberBasicPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberBasicPropertiesResolver.cs
index fbd14876eae8..e1ee0631a9c4 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberBasicPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberBasicPropertiesResolver.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using AutoMapper;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping
@@ -13,10 +14,12 @@ namespace Umbraco.Web.Models.Mapping
     internal class MemberBasicPropertiesResolver : IValueResolver<IMember, MemberBasic, IEnumerable<ContentPropertyBasic>>
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly IMemberTypeService _memberTypeService;
 
-        public MemberBasicPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor)
+        public MemberBasicPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, IMemberTypeService memberTypeService)
         {
-            _umbracoContextAccessor = umbracoContextAccessor ?? throw new System.ArgumentNullException(nameof(umbracoContextAccessor));
+            _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
+            _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
         }
 
         public IEnumerable<ContentPropertyBasic> Resolve(IMember source, MemberBasic destination, IEnumerable<ContentPropertyBasic> destMember, ResolutionContext context)
@@ -29,7 +32,7 @@ public IEnumerable<ContentPropertyBasic> Resolve(IMember source, MemberBasic des
                     source.Properties.OrderBy(prop => prop.PropertyType.SortOrder))
                 .ToList();
 
-            var memberType = source.ContentType;
+            var memberType = _memberTypeService.Get(source.ContentTypeId);
 
             //now update the IsSensitive value
             foreach (var prop in result)
diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
index 6134275c7606..517889277c87 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
@@ -25,16 +25,18 @@ internal class MemberTabsAndPropertiesResolver : TabsAndPropertiesResolver<IMemb
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly ILocalizedTextService _localizedTextService;
+        private readonly IMemberTypeService _memberTypeService;
         private readonly IMemberService _memberService;
         private readonly IUserService _userService;
 
-        public MemberTabsAndPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService localizedTextService, IMemberService memberService, IUserService userService)
+        public MemberTabsAndPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService localizedTextService, IMemberService memberService, IUserService userService, IMemberTypeService memberTypeService)
             : base(localizedTextService)
         {
-            _umbracoContextAccessor = umbracoContextAccessor ?? throw new System.ArgumentNullException(nameof(umbracoContextAccessor));
-            _localizedTextService = localizedTextService ?? throw new System.ArgumentNullException(nameof(localizedTextService));
-            _memberService = memberService ?? throw new System.ArgumentNullException(nameof(memberService));
-            _userService = userService ?? throw new System.ArgumentNullException(nameof(userService));
+            _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
+            _localizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
+            _memberService = memberService ?? throw new ArgumentNullException(nameof(memberService));
+            _userService = userService ?? throw new ArgumentNullException(nameof(userService));
+            _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
         }
 
         /// <inheritdoc />
@@ -43,7 +45,9 @@ public override IEnumerable<Tab<ContentPropertyDisplay>> Resolve(IMember source,
         {
             var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
 
-            IgnoreProperties = source.PropertyTypes
+            var memberType = _memberTypeService.Get(source.ContentTypeId);
+
+            IgnoreProperties = memberType.CompositionPropertyTypes
                 .Where(x => x.HasIdentity == false)
                 .Select(x => x.Alias)
                 .ToArray();
@@ -176,7 +180,7 @@ protected override List<ContentPropertyDisplay> MapProperties(IContentBase conte
         {
             var result = base.MapProperties(content, properties, context);
             var member = (IMember)content;
-            var memberType = member.ContentType;
+            var memberType = _memberTypeService.Get(member.ContentTypeId);
 
             var umbracoContext = _umbracoContextAccessor.UmbracoContext;
 
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
index e8d7fb38b261..4e6ae99cf204 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -26,7 +26,7 @@ protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService,
         {
             IgnoreProperties = ignoreProperties ?? throw new ArgumentNullException(nameof(ignoreProperties));
         }
-        
+
         // TODO: This should deserialize to ListViewConfiguration
         private static int GetTabNumberFromConfig(IDictionary<string, object> listViewConfig)
         {
@@ -58,7 +58,7 @@ protected virtual IEnumerable<ContentPropertyDisplay> GetCustomGenericProperties
         /// <param name="tabs"></param>
         /// <param name="context"></param>
         /// <remarks>
-        /// The generic properties tab is responsible for 
+        /// The generic properties tab is responsible for
         /// setting up the properties such as Created date, updated date, template selected, etc...
         /// </remarks>
         protected virtual void MapGenericProperties(IContentBase content, List<Tab<ContentPropertyDisplay>> tabs, ResolutionContext context)
@@ -98,7 +98,7 @@ protected virtual void MapGenericProperties(IContentBase content, List<Tab<Conte
             //re-assign
             genericProps.Properties = contentProps;
 
-            //Show or hide properties tab based on whether it has or not any properties 
+            //Show or hide properties tab based on whether it has or not any properties
             if (genericProps.Properties.Any() == false)
             {
                 //loop through the tabs, remove the one with the id of zero and exit the loop
@@ -145,11 +145,13 @@ public virtual IEnumerable<Tab<ContentPropertyDisplay>> Resolve(TSource source,
         {
             var tabs = new List<Tab<ContentPropertyDisplay>>();
 
+            var contentType = Current.Services.ContentTypeBaseServices.GetContentTypeOf(source);
+
             // add the tabs, for properties that belong to a tab
             // need to aggregate the tabs, as content.PropertyGroups contains all the composition tabs,
             // and there might be duplicates (content does not work like contentType and there is no
             // content.CompositionPropertyGroups).
-            var groupsGroupsByName = source.PropertyGroups.OrderBy(x => x.SortOrder).GroupBy(x => x.Name);
+            var groupsGroupsByName = contentType.CompositionPropertyGroups.OrderBy(x => x.SortOrder).GroupBy(x => x.Name);
             foreach (var groupsByName in groupsGroupsByName)
             {
                 var properties = new List<Property>();
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index be506d99f8cc..18324a473d78 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1231,9 +1231,7 @@ private ContentNuDto GetDto(IContentBase content, bool published)
             var cultureData = new Dictionary<string, CultureVariation>();
 
             // sanitize - names should be ok but ... never knows
-            var contentTypeService = _contentTypeBaseServiceProvider.For(content);
-            var contentType = contentTypeService.Get(content.ContentTypeId);
-            if (contentType.VariesByCulture())
+            if (content.ContentType.VariesByCulture())
             {
                 var infos = content is IContent document
                     ? (published
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index 8de42fc12b68..83a0b15b8281 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -171,14 +171,16 @@ public virtual Attempt<MembershipUser> UpdateMemberProfile(ProfileModel model)
                 member.Name = model.Name;
             }
 
+            var memberType = _memberTypeService.Get(member.ContentTypeId);
+
             if (model.MemberProperties != null)
             {
                 foreach (var property in model.MemberProperties
                     //ensure the property they are posting exists
-                    .Where(p => member.ContentType.PropertyTypeExists(p.Alias))
+                    .Where(p => memberType.PropertyTypeExists(p.Alias))
                     .Where(property => member.Properties.Contains(property.Alias))
                     //needs to be editable
-                    .Where(p => member.ContentType.MemberCanEditProperty(p.Alias)))
+                    .Where(p => memberType.MemberCanEditProperty(p.Alias)))
                 {
                     member.Properties[property.Alias].SetValue(property.Value);
                 }
@@ -409,7 +411,7 @@ public virtual ProfileModel GetCurrentMemberProfileModel()
                 model.LastPasswordChangedDate = membershipUser.LastPasswordChangedDate;
 
 
-                var memberType = member.ContentType;
+                var memberType = _memberTypeService.Get(member.ContentTypeId);
 
                 var builtIns = Constants.Conventions.Member.GetStandardPropertyTypeStubs().Select(x => x.Key).ToArray();
 

From 6f9be482be217fb506800670f6aed168fb88186e Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 5 Feb 2019 14:52:02 +0100
Subject: [PATCH 295/421] #4398 - Added validation to the grid editor, such
 that columns must be at least as large as the layouts.

---
 .../datatypesettings.controller.js            | 19 +++++--
 .../grid/grid.prevalues.controller.js         |  6 +--
 .../GridConfigurationEditor.cs                | 49 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
index 9fbbad8f09d6..099439fa4b08 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
@@ -10,7 +10,7 @@
 (function () {
     "use strict";
 
-    function DataTypeSettingsController($scope, dataTypeResource, dataTypeHelper, localizationService) {
+    function DataTypeSettingsController($scope, dataTypeResource, dataTypeHelper, localizationService, notificationsService, overlayService, formHelper) {
 
         var vm = this;
 
@@ -102,7 +102,7 @@
             vm.saveButtonState = "busy";
 
             var preValues = dataTypeHelper.createPreValueProps(vm.dataType.preValues);
-
+            
             dataTypeResource.save(vm.dataType, preValues, $scope.model.create).then(function(newDataType) {
                 $scope.model.dataType = newDataType;
                 vm.saveButtonState = "success";
@@ -110,6 +110,19 @@
                 if ($scope.model && $scope.model.submit) {
                     $scope.model.submit($scope.model);
                 }
+            }, function(err) {
+                vm.saveButtonState = "error";
+     
+                 if(err.status === 400) {
+                    if (err.data && (err.data.ModelState)) {
+                        
+                        formHelper.handleServerValidation(err.data.ModelState);
+
+                        for (var e in err.data.ModelState) {
+                            notificationsService.error("Validation", err.data.ModelState[e][0]);
+                        }
+                    }
+                }
             });
             
         }
@@ -120,4 +133,4 @@
 
     angular.module("umbraco").controller("Umbraco.Editors.DataTypeSettingsController", DataTypeSettingsController);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
index 2a00df32dc02..19057fa842f4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
@@ -96,7 +96,7 @@ angular.module("umbraco")
            $scope.layoutConfigOverlay.rows = $scope.model.value.layouts;
            $scope.layoutConfigOverlay.columns = $scope.model.value.columns;
            $scope.layoutConfigOverlay.show = true;
-
+           
            $scope.layoutConfigOverlay.submit = function(model) {
               $scope.layoutConfigOverlay.show = false;
               $scope.layoutConfigOverlay = null;
@@ -218,8 +218,8 @@ angular.module("umbraco")
            $scope.editConfigCollectionOverlay.show = true;
 
            $scope.editConfigCollectionOverlay.submit = function(model) {
-
-              callback(model.config)
+               
+              callback(model.config);
 
               $scope.editConfigCollectionOverlay.show = false;
               $scope.editConfigCollectionOverlay = null;
diff --git a/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
index fe86bb9a6e19..902cd5b41bd3 100644
--- a/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs
@@ -1,4 +1,9 @@
-using Umbraco.Core.PropertyEditors;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Newtonsoft.Json;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors.Validators;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -6,5 +11,45 @@ namespace Umbraco.Web.PropertyEditors
     /// Represents the configuration for the grid value editor.
     /// </summary>
     public class GridConfigurationEditor : ConfigurationEditor<GridConfiguration>
-    { }
+    {
+        public GridConfigurationEditor()
+        {
+            var items = Fields.First(x => x.Key == "items");
+
+            items.Validators.Add(new GridValidator());
+        }
+    }
+
+    public class GridValidator : IValueValidator
+    {
+        public IEnumerable<ValidationResult> Validate(object rawValue, string valueType, object dataTypeConfiguration)
+        {
+            if (rawValue == null)
+                yield break;
+
+            var model = JsonConvert.DeserializeObject<GridEditorModel>(rawValue.ToString());
+
+            if (model.Templates.Any(t => t.Sections.Sum(s => s.Grid) > model.Columns))
+            {
+                yield return new ValidationResult("Columns must be at least the same size as the largest layout", new[] { nameof(model.Columns) });
+            }
+
+        }
+    }
+
+    public class GridEditorModel
+    {
+        public GridEditorTemplateModel[] Templates { get; set; }
+        public int Columns { get; set; }
+    }
+
+    public class GridEditorTemplateModel
+    {
+        public GridEditorSectionModel[] Sections { get; set; }
+    }
+
+    public class GridEditorSectionModel
+    {
+        public int Grid { get; set; }
+    }
 }

From 1e249815765b3ad3e3b15fea9418373a57ff284b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 5 Feb 2019 19:48:13 +0100
Subject: [PATCH 296/421] Rename umbracoDomains table to umbracoDomain
 (singular)

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs |  1 +
 .../Upgrade/V_8_0_0/RenameUmbracoDomainsTable.cs   | 12 ++++++++++++
 .../Persistence/Constants-DatabaseSchema.cs        |  2 +-
 .../Repositories/Implement/DomainRepository.cs     | 14 +++++++-------
 src/Umbraco.Core/Umbraco.Core.csproj               |  1 +
 5 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RenameUmbracoDomainsTable.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 0d0e7335911b..a9444a09180d 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -126,6 +126,7 @@ protected void DefinePlan()
             To<UpdateMemberGroupPickerData>("{8A027815-D5CD-4872-8B88-9A51AB5986A6}"); // from 7.14.0
             To<ConvertRelatedLinksToMultiUrlPicker>("{ED28B66A-E248-4D94-8CDB-9BDF574023F0}");
             To<UpdatePickerIntegerValuesToUdi>("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
+            To<RenameUmbracoDomainsTable>("{6017F044-8E70-4E10-B2A3-336949692ADD}");
 
 
             //FINAL
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RenameUmbracoDomainsTable.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RenameUmbracoDomainsTable.cs
new file mode 100644
index 000000000000..9bbccf368caa
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RenameUmbracoDomainsTable.cs
@@ -0,0 +1,12 @@
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class RenameUmbracoDomainsTable : MigrationBase
+    {
+        public RenameUmbracoDomainsTable(IMigrationContext context) : base(context) { }
+
+        public override void Migrate()
+        {
+            Rename.Table("umbracoDomains").To(Constants.DatabaseSchema.Tables.Domain).Do();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
index 7898a9997adb..b874c6e04a2f 100644
--- a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
+++ b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
@@ -40,7 +40,7 @@ public static class Tables
                 public const string RelationType = /*TableNamePrefix*/ "umbraco" + "RelationType";
                 public const string Relation = /*TableNamePrefix*/ "umbraco" + "Relation";
 
-                public const string Domain = /*TableNamePrefix*/ "umbraco" + "Domains";
+                public const string Domain = /*TableNamePrefix*/ "umbraco" + "Domain";
                 public const string Language = /*TableNamePrefix*/ "umbraco" + "Language";
                 public const string DictionaryEntry = /*TableNamePrefix*/ "cms" + "Dictionary";
                 public const string DictionaryValue = /*TableNamePrefix*/ "cms" + "LanguageText";
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
index 01b8bdd66c53..69523a860a94 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
@@ -33,10 +33,10 @@ protected override IDomain PerformGet(int id)
 
         protected override IEnumerable<IDomain> PerformGetAll(params int[] ids)
         {
-            var sql = GetBaseQuery(false).Where("umbracoDomains.id > 0");
+            var sql = GetBaseQuery(false).Where("umbracoDomain.id > 0");
             if (ids.Any())
             {
-                sql.Where("umbracoDomains.id in (@ids)", new { ids = ids });
+                sql.Where("umbracoDomain.id in (@ids)", new { ids = ids });
             }
 
             return Database.Fetch<DomainDto>(sql).Select(ConvertFromDto);
@@ -56,7 +56,7 @@ protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
             }
             else
             {
-                sql.Select("umbracoDomains.*, umbracoLanguage.languageISOCode")
+                sql.Select("umbracoDomain.*, umbracoLanguage.languageISOCode")
                     .From<DomainDto>()
                     .LeftJoin<LanguageDto>()
                     .On<DomainDto, LanguageDto>(dto => dto.DefaultLanguage, dto => dto.Id);
@@ -67,14 +67,14 @@ protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
 
         protected override string GetBaseWhereClause()
         {
-            return "umbracoDomains.id = @id";
+            return "umbracoDomain.id = @id";
         }
 
         protected override IEnumerable<string> GetDeleteClauses()
         {
             var list = new List<string>
                 {
-                    "DELETE FROM umbracoDomains WHERE id = @id"
+                    "DELETE FROM umbracoDomain WHERE id = @id"
                 };
             return list;
         }
@@ -86,7 +86,7 @@ protected override Guid NodeObjectTypeId
 
         protected override void PersistNewItem(IDomain entity)
         {
-            var exists = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoDomains WHERE domainName = @domainName", new { domainName = entity.DomainName });
+            var exists = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoDomain WHERE domainName = @domainName", new { domainName = entity.DomainName });
             if (exists > 0) throw new DuplicateNameException(string.Format("The domain name {0} is already assigned", entity.DomainName));
 
             if (entity.RootContentId.HasValue)
@@ -122,7 +122,7 @@ protected override void PersistUpdatedItem(IDomain entity)
         {
             ((UmbracoDomain)entity).UpdatingEntity();
 
-            var exists = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoDomains WHERE domainName = @domainName AND umbracoDomains.id <> @id",
+            var exists = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoDomain WHERE domainName = @domainName AND umbracoDomain.id <> @id",
                 new { domainName = entity.DomainName, id = entity.Id });
             //ensure there is no other domain with the same name on another entity
             if (exists > 0) throw new DuplicateNameException(string.Format("The domain name {0} is already assigned", entity.DomainName));
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 792f1d1223f4..46d88671f88b 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -379,6 +379,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorMacroColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorVariantsModel.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\RenameUmbracoDomainsTable.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\SuperZero.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TablesForScheduledPublishing.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TagsMigration.cs" />

From eafb9a46f7f47c0f4d36d14e009eb454bc4a901d Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 5 Feb 2019 19:59:13 +0100
Subject: [PATCH 297/421] Why so sad! :-)

---
 src/Umbraco.Core/Exceptions/BootFailedException.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Exceptions/BootFailedException.cs b/src/Umbraco.Core/Exceptions/BootFailedException.cs
index 10a648fd76c1..c3262d26c61f 100644
--- a/src/Umbraco.Core/Exceptions/BootFailedException.cs
+++ b/src/Umbraco.Core/Exceptions/BootFailedException.cs
@@ -11,7 +11,7 @@ public class BootFailedException : Exception
         /// <summary>
         /// Defines the default boot failed exception message.
         /// </summary>
-        public const string DefaultMessage = "Boot failed: Umbraco cannot run. Sad. See Umbraco's log file for more details.";
+        public const string DefaultMessage = "Boot failed: Umbraco cannot run. See Umbraco's log file for more details.";
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Exception"/> class with a specified error message.

From f752861e101740ec90dcc393d6563443078496ff Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Feb 2019 20:01:20 +0100
Subject: [PATCH 298/421] Bugfix null timer in CoreRuntime

---
 src/Umbraco.Core/Runtime/CoreRuntime.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Runtime/CoreRuntime.cs b/src/Umbraco.Core/Runtime/CoreRuntime.cs
index 9c18b3d8c383..da71cb10612f 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntime.cs
@@ -271,7 +271,7 @@ internal void DetermineRuntimeLevel(IUmbracoDatabaseFactory databaseFactory, IPr
                 {
                     _state.Level = RuntimeLevel.BootFailed;
                     _state.Reason = RuntimeLevelReason.BootFailedOnException;
-                    timer.Fail();
+                    timer?.Fail();
                     throw;
                 }
             }
@@ -287,7 +287,7 @@ private IEnumerable<Type> ResolveComposerTypes(TypeLoader typeLoader)
                 }
                 catch
                 {
-                    timer.Fail();
+                    timer?.Fail();
                     throw;
                 }
             }

From 92606e71224fef4fa163bb75cb90b718f7477bab Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 16:10:20 +1100
Subject: [PATCH 299/421] Fixes up dirty tracking of cultures and published
 cultures the same way we handle that with other entities which uses
 observable collection events. This simplifies the dirty tracking logic and
 means we dont require lookup the original object, but now we need to figure
 out the fixme stuff

---
 src/Umbraco.Core/ContentExtensions.cs         |  22 +-
 .../CancellableEnumerableObjectEventArgs.cs   |  52 +++++
 .../Events/CancellableEventArgs.cs            |   9 +-
 .../Events/CancellableObjectEventArgs.cs      |  46 ----
 .../Events/ContentPublishedEventArgs.cs       |  29 +++
 .../Events/ContentPublishingEventArgs.cs      |  33 +++
 .../Events/ContentSavedEventArgs.cs           |  30 +++
 .../Events/ContentSavingEventArgs.cs          |  66 ++++++
 src/Umbraco.Core/Events/PublishEventArgs.cs   |  21 +-
 src/Umbraco.Core/Events/SaveEventArgs.cs      |   6 +-
 src/Umbraco.Core/Models/Content.cs            | 146 +++++++++---
 src/Umbraco.Core/Models/ContentBase.cs        | 221 ++++++++----------
 ...ContentCultureInfosCollectionExtensions.cs |  12 -
 .../Models/ContentRepositoryExtensions.cs     | 130 ++++++++++-
 .../Models/Entities/BeingDirtyBase.cs         |   2 +-
 src/Umbraco.Core/Models/IContent.cs           |  24 --
 src/Umbraco.Core/Models/IContentBase.cs       |  28 ---
 src/Umbraco.Core/Models/Macro.cs              |   8 +-
 .../Implement/DocumentRepository.cs           |   1 -
 .../Services/Implement/ContentService.cs      | 118 +++++-----
 src/Umbraco.Core/Umbraco.Core.csproj          |   6 +-
 .../Services/ContentServiceEventTests.cs      |  81 +++----
 22 files changed, 680 insertions(+), 411 deletions(-)
 create mode 100644 src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
 create mode 100644 src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
 create mode 100644 src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
 create mode 100644 src/Umbraco.Core/Events/ContentSavedEventArgs.cs
 create mode 100644 src/Umbraco.Core/Events/ContentSavingEventArgs.cs
 delete mode 100644 src/Umbraco.Core/Models/ContentCultureInfosCollectionExtensions.cs

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index b2bf29cc5f0c..174b4233f447 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -52,27 +52,7 @@ public static ContentStatus GetStatus(this IContent content, string culture = nu
             return ContentStatus.Unpublished;
         }
 
-        /// <summary>
-        /// Gets the cultures that have been flagged for unpublishing.
-        /// </summary>
-        /// <remarks>Gets cultures for which content.UnpublishCulture() has been invoked.</remarks>
-        internal static IReadOnlyList<string> GetCulturesUnpublishing(this IContent content, IContent persisted)
-        {
-            //TODO: The reason we need a ref to the original persisted IContent is to check if it is published
-            // however, for performance reasons we could pass in a ContentCultureInfosCollection which could be
-            // resolved from the database much more quickly than resolving an entire IContent object.
-            // That said, the GetById on the IContentService will return from cache so might not be something to worry about.
-
-
-            if (!content.Published || !content.ContentType.VariesByCulture() || !content.IsPropertyDirty("PublishCultureInfos"))
-                return Array.Empty<string>();
-
-            var culturesChanging = content.CultureInfos.Values.Where(x => x.IsDirty()).Select(x => x.Culture);
-            return culturesChanging
-                .Where(x => !content.IsCulturePublished(x) && // is not published anymore
-                            persisted != null && persisted.IsCulturePublished(x))   // but was published before
-                .ToList();
-        }
+        
         
         #endregion
 
diff --git a/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
new file mode 100644
index 000000000000..1a651ef3489f
--- /dev/null
+++ b/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Permissions;
+
+namespace Umbraco.Core.Events
+{
+    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
+    public class CancellableEnumerableObjectEventArgs<T> : CancellableObjectEventArgs<IEnumerable<T>>, IEquatable<CancellableEnumerableObjectEventArgs<T>>
+    {
+        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
+            : base(eventObject, canCancel, messages, additionalData)
+        { }
+
+        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        { }
+
+        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        { }
+
+        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel)
+            : base(eventObject, canCancel)
+        { }
+
+        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject)
+            : base(eventObject)
+        { }
+
+        public bool Equals(CancellableEnumerableObjectEventArgs<T> other)
+        {
+            if (other is null) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return EventObject.SequenceEqual(other.EventObject);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is null) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((CancellableEnumerableObjectEventArgs<T>)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCodeHelper.GetHashCode(EventObject);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/CancellableEventArgs.cs b/src/Umbraco.Core/Events/CancellableEventArgs.cs
index 0f3091c46a2c..19f576478f64 100644
--- a/src/Umbraco.Core/Events/CancellableEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEventArgs.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Events
     public class CancellableEventArgs : EventArgs, IEquatable<CancellableEventArgs>
     {
         private bool _cancel;
-        private Dictionary<string, object> _eventState;
+        private IDictionary<string, object> _eventState;
 
         private static readonly ReadOnlyDictionary<string, object> EmptyAdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
 
@@ -89,7 +89,7 @@ public void CancelOperation(EventMessage cancelationMessage)
         /// <summary>
         /// Returns the EventMessages object which is used to add messages to the message collection for this event
         /// </summary>
-        public EventMessages Messages { get; private set; }
+        public EventMessages Messages { get; }
 
         /// <summary>
         /// In some cases raised evens might need to contain additional arbitrary readonly data which can be read by event subscribers
@@ -98,7 +98,7 @@ public void CancelOperation(EventMessage cancelationMessage)
         /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility
         /// so we cannot change the strongly typed nature for some events.
         /// </remarks>
-        public ReadOnlyDictionary<string, object> AdditionalData { get; private set; }
+        public ReadOnlyDictionary<string, object> AdditionalData { get; internal set; }
 
         /// <summary>
         /// This can be used by event subscribers to store state in the event args so they easily deal with custom state data between a starting ("ing")
@@ -106,7 +106,8 @@ public void CancelOperation(EventMessage cancelationMessage)
         /// </summary>
         public IDictionary<string, object> EventState
         {
-            get { return _eventState ?? (_eventState = new Dictionary<string, object>()); }
+            get => _eventState ?? (_eventState = new Dictionary<string, object>());
+            internal set => _eventState = value;
         }
 
         public bool Equals(CancellableEventArgs other)
diff --git a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
index a64a39924920..27ffb1b75df0 100644
--- a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Security.Permissions;
 using Umbraco.Core.Models;
 
@@ -128,49 +127,4 @@ public override int GetHashCode()
             return !Equals(left, right);
         }
     }
-
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-    public class CancellableEnumerableObjectEventArgs<T> : CancellableObjectEventArgs<IEnumerable<T>>, IEquatable<CancellableEnumerableObjectEventArgs<T>>
-    {
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
-            : base(eventObject, canCancel, messages, additionalData)
-        { }
-
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel, EventMessages eventMessages)
-            : base(eventObject, canCancel, eventMessages)
-        { }
-
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, EventMessages eventMessages)
-            : base(eventObject, eventMessages)
-        { }
-
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel)
-            : base(eventObject, canCancel)
-        { }
-
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject)
-            : base(eventObject)
-        { }
-
-        public bool Equals(CancellableEnumerableObjectEventArgs<T> other)
-        {
-            if (other is null) return false;
-            if (ReferenceEquals(this, other)) return true;
-
-            return EventObject.SequenceEqual(other.EventObject);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj is null) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != this.GetType()) return false;
-            return Equals((CancellableEnumerableObjectEventArgs<T>)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return HashCodeHelper.GetHashCode(EventObject);
-        }
-    }
 }
diff --git a/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs b/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
new file mode 100644
index 000000000000..589e447ba7c2
--- /dev/null
+++ b/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Events
+{
+    public class ContentPublishedEventArgs : PublishEventArgs<IContent>
+    {
+        public ContentPublishedEventArgs(IEnumerable<IContent> eventObject, bool canCancel, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+        }
+
+        /// <summary>
+        /// Determines whether a culture has been published, during a Published event.
+        /// </summary>
+        public bool HasPublishedCulture(IContent content, string culture)
+            => content.WasPropertyDirty("_changedCulture_" + culture);
+
+        /// <summary>
+        /// Determines whether a culture has been unpublished, during a Published event.
+        /// </summary>
+        public bool HasUnpublishedCulture(IContent content, string culture)
+            => content.WasPropertyDirty("_unpublishedCulture_" + culture); 
+
+
+
+    }
+}
diff --git a/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs b/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
new file mode 100644
index 000000000000..35cbf6344154
--- /dev/null
+++ b/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Events
+{
+    public class ContentPublishingEventArgs : PublishEventArgs<IContent>
+    {
+        /// <summary>
+        /// Creates a new <see cref="ContentPublishingEventArgs"/>
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="eventMessages"></param>
+        public ContentPublishingEventArgs(IEnumerable<IContent> eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+        }
+
+        /// <summary>
+        /// Determines whether a culture is being published, during a Publishing event.
+        /// </summary>
+        public bool IsPublishingCulture(IContent content, string culture)
+            => content.PublishCultureInfos.TryGetValue(culture, out var cultureInfo) && cultureInfo.IsDirty();
+
+        /// <summary>
+        /// Determines whether a culture is being unpublished, during a Publishing event.
+        /// </summary>
+        public bool IsUnpublishingCulture(IContent content, string culture)
+            => content.IsPropertyDirty("_unpublishedCulture_" + culture); //bit of a hack since we know that the content implementation tracks changes this way
+
+    }
+}
diff --git a/src/Umbraco.Core/Events/ContentSavedEventArgs.cs b/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
new file mode 100644
index 000000000000..4d4085b0649a
--- /dev/null
+++ b/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Events
+{
+    public class ContentSavedEventArgs : SaveEventArgs<IContent>
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new <see cref="ContentSavedEventArgs"/>
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="messages"></param>
+        /// <param name="additionalData"></param>
+        public ContentSavedEventArgs(IEnumerable<IContent> eventObject, EventMessages messages, IDictionary<string, object> additionalData)
+            : base(eventObject, false, messages, additionalData)
+        {
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Determines whether a culture has been saved, during a Saved event.
+        /// </summary>
+        public bool HasSavedCulture(IContent content, string culture)
+            => content.WasPropertyDirty("_updatedCulture_" + culture);
+    }
+}
diff --git a/src/Umbraco.Core/Events/ContentSavingEventArgs.cs b/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
new file mode 100644
index 000000000000..aa62f643497f
--- /dev/null
+++ b/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
@@ -0,0 +1,66 @@
+using System.Linq;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Events
+{
+    public class ContentSavingEventArgs : SaveEventArgs<IContent>
+    {
+        #region Factory Methods
+        /// <summary>
+        /// Converts <see cref="ContentSavingEventArgs"/> to <see cref="ContentSavedEventArgs"/> while preserving all args state
+        /// </summary>
+        /// <returns></returns>
+        public ContentSavedEventArgs ToContentSavedEventArgs()
+        {
+            return new ContentSavedEventArgs(EventObject, Messages, AdditionalData)
+            {
+                EventState = EventState
+            };
+        }
+
+        /// <summary>
+        /// Converts <see cref="ContentSavingEventArgs"/> to <see cref="ContentPublishedEventArgs"/> while preserving all args state
+        /// </summary>
+        /// <returns></returns>
+        public ContentPublishedEventArgs ToContentPublishedEventArgs()
+        {
+            return new ContentPublishedEventArgs(EventObject, false, Messages)
+            {
+                EventState = EventState,
+                AdditionalData = AdditionalData
+            };
+        }
+
+        /// <summary>
+        /// Converts <see cref="ContentSavingEventArgs"/> to <see cref="ContentPublishingEventArgs"/> while preserving all args state
+        /// </summary>
+        /// <returns></returns>
+        public ContentPublishingEventArgs ToContentPublishingEventArgs()
+        {
+            return new ContentPublishingEventArgs(EventObject, Messages)
+            {
+                EventState = EventState,
+                AdditionalData = AdditionalData
+            };
+        } 
+        #endregion
+
+        #region Constructors
+
+        public ContentSavingEventArgs(IEnumerable<IContent> eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
+        {
+        }
+
+        public ContentSavingEventArgs(IContent eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
+        {
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Determines whether a culture is being saved, during a Saving event.
+        /// </summary>
+        public bool IsSavingCulture(IContent content, string culture) => content.CultureInfos.TryGetValue(culture, out var cultureInfo) && cultureInfo.IsDirty();
+    }
+}
diff --git a/src/Umbraco.Core/Events/PublishEventArgs.cs b/src/Umbraco.Core/Events/PublishEventArgs.cs
index 599bae163905..4be655873ec3 100644
--- a/src/Umbraco.Core/Events/PublishEventArgs.cs
+++ b/src/Umbraco.Core/Events/PublishEventArgs.cs
@@ -10,12 +10,10 @@ public class PublishEventArgs<TEntity> : CancellableEnumerableObjectEventArgs<TE
         /// </summary>
         /// <param name="eventObject"></param>
         /// <param name="canCancel"></param>
-        /// <param name="isAllPublished"></param>
         /// <param name="eventMessages"></param>
-        public PublishEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, bool isAllPublished, EventMessages eventMessages)
+        public PublishEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, EventMessages eventMessages)
             : base(eventObject, canCancel, eventMessages)
         {
-            IsAllRepublished = isAllPublished;
         }
 
         /// <summary>
@@ -43,12 +41,10 @@ public PublishEventArgs(TEntity eventObject, EventMessages eventMessages)
         /// </summary>
         /// <param name="eventObject"></param>
         /// <param name="canCancel"></param>
-        /// <param name="isAllPublished"></param>
         /// <param name="eventMessages"></param>
-        public PublishEventArgs(TEntity eventObject, bool canCancel, bool isAllPublished, EventMessages eventMessages)
+        public PublishEventArgs(TEntity eventObject, bool canCancel, EventMessages eventMessages)
             : base(new List<TEntity> { eventObject }, canCancel, eventMessages)
         {
-            IsAllRepublished = isAllPublished;
         }
 
         /// <summary>
@@ -60,7 +56,6 @@ public PublishEventArgs(TEntity eventObject, bool canCancel, bool isAllPublished
         public PublishEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, bool isAllPublished)
             : base(eventObject, canCancel)
         {
-            IsAllRepublished = isAllPublished;
         }
 
         /// <summary>
@@ -90,24 +85,18 @@ public PublishEventArgs(TEntity eventObject)
         public PublishEventArgs(TEntity eventObject, bool canCancel, bool isAllPublished)
             : base(new List<TEntity> { eventObject }, canCancel)
         {
-            IsAllRepublished = isAllPublished;
         }
 
         /// <summary>
         /// Returns all entities that were published during the operation
         /// </summary>
-        public IEnumerable<TEntity> PublishedEntities
-        {
-            get { return EventObject; }
-        }
-
-        public bool IsAllRepublished { get; private set; }
+        public IEnumerable<TEntity> PublishedEntities => EventObject;
 
         public bool Equals(PublishEventArgs<TEntity> other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
-            return base.Equals(other) && IsAllRepublished == other.IsAllRepublished;
+            return base.Equals(other);
         }
 
         public override bool Equals(object obj)
@@ -122,7 +111,7 @@ public override int GetHashCode()
         {
             unchecked
             {
-                return (base.GetHashCode() * 397) ^ IsAllRepublished.GetHashCode();
+                return (base.GetHashCode() * 397);
             }
         }
 
diff --git a/src/Umbraco.Core/Events/SaveEventArgs.cs b/src/Umbraco.Core/Events/SaveEventArgs.cs
index 8c3fe82e2f0a..0b061c222750 100644
--- a/src/Umbraco.Core/Events/SaveEventArgs.cs
+++ b/src/Umbraco.Core/Events/SaveEventArgs.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Umbraco.Core.Events
 {
@@ -113,9 +112,6 @@ public SaveEventArgs(TEntity eventObject, bool canCancel)
         /// <summary>
         /// Returns all entities that were saved during the operation
         /// </summary>
-        public IEnumerable<TEntity> SavedEntities
-        {
-            get { return EventObject; }
-        }
+        public IEnumerable<TEntity> SavedEntities => EventObject;
     }
 }
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 928a109b7a30..90c994c86695 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -19,7 +19,14 @@ public class Content : ContentBase, IContent
         private bool _published;
         private PublishedState _publishedState;
         private HashSet<string> _editedCultures;
-        private ContentCultureInfosCollection _publishInfos, _publishInfos1, _publishInfos2;
+        private ContentCultureInfosCollection _publishInfos;
+
+        #region Used for change tracking
+
+        private (HashSet<string> addedCultures, HashSet<string> removedCultures, HashSet<string> updatedCultures) _currentPublishCultureChanges;
+        private (HashSet<string> addedCultures, HashSet<string> removedCultures, HashSet<string> updatedCultures) _previousPublishCultureChanges;
+
+        #endregion
 
         /// <summary>
         /// Constructor for creating a Content object
@@ -92,7 +99,7 @@ public ContentScheduleCollection ContentSchedule
             }
             set
             {
-                if(_schedule != null)
+                if (_schedule != null)
                     _schedule.CollectionChanged -= ScheduleCollectionChanged;
                 SetPropertyValueAndDetectChanges(value, ref _schedule, nameof(ContentSchedule));
                 if (_schedule != null)
@@ -204,7 +211,7 @@ public bool IsCulturePublished(string culture)
             // just check _publishInfos
             // a non-available culture could not become published anyways
             => _publishInfos != null && _publishInfos.ContainsKey(culture);
-        
+
         /// <inheritdoc />
         public bool IsCultureEdited(string culture)
             => IsCultureAvailable(culture) && // is available, and
@@ -246,33 +253,49 @@ public string GetPublishName(string culture)
             if (culture.IsNullOrWhiteSpace()) return PublishDate;
             if (!ContentTypeBase.VariesByCulture()) return null;
             if (_publishInfos == null) return null;
-            return _publishInfos.TryGetValue(culture, out var infos) ? infos.Date : (DateTime?) null;
-        }
-        
-        // internal for repository
-        internal void AknPublishInfo()
-        {
-            _publishInfos1 = _publishInfos2 = new ContentCultureInfosCollection(_publishInfos);
+            return _publishInfos.TryGetValue(culture, out var infos) ? infos.Date : (DateTime?)null;
         }
 
-        /// <inheritdoc />
-        public bool IsPublishingCulture(string culture) => _publishInfos.IsCultureUpdated(_publishInfos1, culture);
-
-        /// <inheritdoc />
-        public bool IsUnpublishingCulture(string culture) => _publishInfos.IsCultureRemoved(_publishInfos1, culture);
-
-        /// <inheritdoc />
-        public bool HasPublishedCulture(string culture) => _publishInfos1.IsCultureUpdated(_publishInfos2, culture);
-
-        /// <inheritdoc />
-        public bool HasUnpublishedCulture(string culture) => _publishInfos1.IsCultureRemoved(_publishInfos2, culture);
-
         /// <summary>
         /// Handles culture infos collection changes.
         /// </summary>
         private void PublishNamesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             OnPropertyChanged(nameof(PublishCultureInfos));
+
+            //we don't need to handle other actions, only add/remove, however we could implement Replace and track updated cultures in _updatedCultures too
+            //which would allows us to continue doing WasCulturePublished, but don't think we need it anymore
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    {
+                        var cultureInfo = e.NewItems.Cast<ContentCultureInfos>().First();
+                        if (_currentPublishCultureChanges.addedCultures == null) _currentPublishCultureChanges.addedCultures = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                        if (_currentPublishCultureChanges.updatedCultures == null) _currentPublishCultureChanges.updatedCultures = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                        _currentPublishCultureChanges.addedCultures.Add(cultureInfo.Culture);
+                        _currentPublishCultureChanges.updatedCultures.Add(cultureInfo.Culture);
+                        _currentPublishCultureChanges.removedCultures?.Remove(cultureInfo.Culture);
+                        break;
+                    }
+                case NotifyCollectionChangedAction.Remove:
+                    {
+                        //remove listening for changes
+                        var cultureInfo = e.OldItems.Cast<ContentCultureInfos>().First();
+                        if (_currentPublishCultureChanges.removedCultures == null) _currentPublishCultureChanges.removedCultures = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                        _currentPublishCultureChanges.removedCultures.Add(cultureInfo.Culture);
+                        _currentPublishCultureChanges.updatedCultures?.Remove(cultureInfo.Culture);
+                        _currentPublishCultureChanges.addedCultures?.Remove(cultureInfo.Culture);
+                        break;
+                    }
+                case NotifyCollectionChangedAction.Replace:
+                    {
+                        //replace occurs when an Update occurs
+                        var cultureInfo = e.NewItems.Cast<ContentCultureInfos>().First();
+                        if (_currentPublishCultureChanges.updatedCultures == null) _currentPublishCultureChanges.updatedCultures = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                        _currentPublishCultureChanges.updatedCultures.Add(cultureInfo.Culture);
+                        break;
+                    }
+            }
         }
 
         [IgnoreDataMember]
@@ -305,7 +328,7 @@ internal void ChangeContentType(IContentType contentType)
         /// <param name="clearProperties">Boolean indicating whether to clear PropertyTypes upon change</param>
         internal void ChangeContentType(IContentType contentType, bool clearProperties)
         {
-            if(clearProperties)
+            if (clearProperties)
             {
                 ContentTypeId = contentType.Id;
                 ContentType = new SimpleContentType(contentType);
@@ -320,21 +343,92 @@ internal void ChangeContentType(IContentType contentType, bool clearProperties)
             ChangeContentType(contentType);
         }
 
+        public override void ResetWereDirtyProperties()
+        {
+            base.ResetWereDirtyProperties();
+            _previousPublishCultureChanges.updatedCultures = null;
+            _previousPublishCultureChanges.removedCultures = null;
+            _previousPublishCultureChanges.addedCultures = null;
+        }
+
         public override void ResetDirtyProperties(bool rememberDirty)
         {
             base.ResetDirtyProperties(rememberDirty);
 
+            if (rememberDirty)
+            {
+
+                _previousPublishCultureChanges.addedCultures = _currentPublishCultureChanges.addedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.addedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousPublishCultureChanges.removedCultures = _currentPublishCultureChanges.removedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.removedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousPublishCultureChanges.updatedCultures = _currentPublishCultureChanges.updatedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.updatedCultures, StringComparer.InvariantCultureIgnoreCase);
+            }
+            else
+            {
+                _previousPublishCultureChanges.addedCultures = null;
+                _previousPublishCultureChanges.removedCultures = null;
+                _previousPublishCultureChanges.updatedCultures = null;
+            }
+            _currentPublishCultureChanges.addedCultures?.Clear();
+            _currentPublishCultureChanges.removedCultures?.Clear();
+            _currentPublishCultureChanges.updatedCultures?.Clear();
+
             // take care of the published state
             _publishedState = _published ? PublishedState.Published : PublishedState.Unpublished;
 
-            _publishInfos2 = _publishInfos1;
-
             if (_publishInfos == null) return;
 
             foreach (var infos in _publishInfos)
                 infos.ResetDirtyProperties(rememberDirty);
         }
 
+        /// <inheritdoc />
+        /// <remarks>Overridden to check special keys.</remarks>
+        public override bool IsPropertyDirty(string propertyName)
+        {
+            //Special check here since we want to check if the request is for changed cultures
+            if (propertyName.StartsWith("_publishedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_publishedCulture_");
+                return _currentPublishCultureChanges.addedCultures?.Contains(culture) ?? false;
+            }
+            if (propertyName.StartsWith("_unpublishedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_unpublishedCulture_");
+                return _currentPublishCultureChanges.removedCultures?.Contains(culture) ?? false;
+            }
+            if (propertyName.StartsWith("_changedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_changedCulture_");
+                return _currentPublishCultureChanges.updatedCultures?.Contains(culture) ?? false;
+            }
+
+            return base.IsPropertyDirty(propertyName);
+        }
+
+        /// <inheritdoc />
+        /// <remarks>Overridden to check special keys.</remarks>
+        public override bool WasPropertyDirty(string propertyName)
+        {
+            //Special check here since we want to check if the request is for changed cultures
+            if (propertyName.StartsWith("_publishedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_publishedCulture_");
+                return _previousPublishCultureChanges.addedCultures?.Contains(culture) ?? false;
+            }
+            if (propertyName.StartsWith("_unpublishedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_unpublishedCulture_");
+                return _previousPublishCultureChanges.removedCultures?.Contains(culture) ?? false;
+            }
+            if (propertyName.StartsWith("_changedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_changedCulture_");
+                return _previousPublishCultureChanges.updatedCultures?.Contains(culture) ?? false;
+            }
+
+            return base.WasPropertyDirty(propertyName);
+        }
+
         /// <summary>
         /// Creates a deep clone of the current entity with its identity and it's property identities reset
         /// </summary>
@@ -365,7 +459,7 @@ protected override void PerformDeepClone(object clone)
             if (clonedContent._publishInfos != null)
             {
                 clonedContent._publishInfos.CollectionChanged -= PublishNamesCollectionChanged;          //clear this event handler if any
-                clonedContent._publishInfos = (ContentCultureInfosCollection) _publishInfos.DeepClone(); //manually deep clone
+                clonedContent._publishInfos = (ContentCultureInfosCollection)_publishInfos.DeepClone(); //manually deep clone
                 clonedContent._publishInfos.CollectionChanged += clonedContent.PublishNamesCollectionChanged;    //re-assign correct event handler
             }
 
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 620efbb4b82d..521e0ebff8b3 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -22,7 +22,14 @@ public abstract class ContentBase : TreeEntityBase, IContentBase
         protected IContentTypeComposition ContentTypeBase;
         private int _writerId;
         private PropertyCollection _properties;
-        private ContentCultureInfosCollection _cultureInfos, _cultureInfos1, _cultureInfos2;
+        private ContentCultureInfosCollection _cultureInfos;
+
+        #region Used for change tracking
+
+        private (HashSet<string> addedCultures, HashSet<string> removedCultures, HashSet<string> updatedCultures) _currentCultureChanges;
+        private (HashSet<string> addedCultures, HashSet<string> removedCultures, HashSet<string> updatedCultures) _previousCultureChanges;
+
+        #endregion
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ContentBase"/> class.
@@ -64,6 +71,8 @@ protected void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs
             OnPropertyChanged(nameof(Properties));
         }
 
+
+
         /// <summary>
         /// Id of the user who wrote/updated this entity
         /// </summary>
@@ -180,7 +189,7 @@ public string GetCultureName(string culture)
             if (culture.IsNullOrWhiteSpace()) return null;
             if (!ContentTypeBase.VariesByCulture()) return null;
             if (_cultureInfos == null) return null;
-            return _cultureInfos.TryGetValue(culture, out var infos) ? infos.Date : (DateTime?) null;
+            return _cultureInfos.TryGetValue(culture, out var infos) ? infos.Date : (DateTime?)null;
         }
 
         /// <inheritdoc />
@@ -210,12 +219,6 @@ public void SetCultureName(string name, string culture)
             }
         }
 
-        private void ClearCultureInfos()
-        {
-            _cultureInfos?.Clear();
-            _cultureInfos = null;
-        }
-
         private void ClearCultureInfo(string culture)
         {
             if (culture.IsNullOrWhiteSpace())
@@ -233,6 +236,38 @@ private void ClearCultureInfo(string culture)
         private void CultureInfosCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             OnPropertyChanged(nameof(CultureInfos));
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    {
+                        var cultureInfo = e.NewItems.Cast<ContentCultureInfos>().First();
+                        if (_currentCultureChanges.addedCultures == null) _currentCultureChanges.addedCultures = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                        if (_currentCultureChanges.updatedCultures == null) _currentCultureChanges.updatedCultures = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                        _currentCultureChanges.addedCultures.Add(cultureInfo.Culture);
+                        _currentCultureChanges.updatedCultures.Add(cultureInfo.Culture);
+                        _currentCultureChanges.removedCultures?.Remove(cultureInfo.Culture);
+                        break;
+                    }
+                case NotifyCollectionChangedAction.Remove:
+                    {
+                        //remove listening for changes
+                        var cultureInfo = e.OldItems.Cast<ContentCultureInfos>().First();
+                        if (_currentCultureChanges.removedCultures == null) _currentCultureChanges.removedCultures = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                        _currentCultureChanges.removedCultures.Add(cultureInfo.Culture);
+                        _currentCultureChanges.updatedCultures?.Remove(cultureInfo.Culture);
+                        _currentCultureChanges.addedCultures?.Remove(cultureInfo.Culture);
+                        break;
+                    }
+                case NotifyCollectionChangedAction.Replace:
+                    {
+                        //replace occurs when an Update occurs
+                        var cultureInfo = e.NewItems.Cast<ContentCultureInfos>().First();
+                        if (_currentCultureChanges.updatedCultures == null) _currentCultureChanges.updatedCultures = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                        _currentCultureChanges.updatedCultures.Add(cultureInfo.Culture);
+                        break;
+                    }
+            }
         }
 
         #endregion
@@ -281,124 +316,42 @@ public void SetValue(string propertyTypeAlias, object value, string culture = nu
 
         #endregion
 
-        #region Copy
-
-        /// <inheritdoc />
-        public void CopyFrom(IContent other, string culture = "*")
-        {
-            if (other.ContentTypeId != ContentTypeId)
-                throw new InvalidOperationException("Cannot copy values from a different content type.");
-
-            culture = culture?.ToLowerInvariant().NullOrWhiteSpaceAsNull();
-
-            // the variation should be supported by the content type properties
-            //  if the content type is invariant, only '*' and 'null' is ok
-            //  if the content type varies, everything is ok because some properties may be invariant
-            if (!ContentTypeBase.SupportsPropertyVariation(culture, "*", true))
-                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{ContentTypeBase.Alias}\" with variation \"{ContentTypeBase.Variations}\".");
-
-            // copying from the same Id and VersionPk
-            var copyingFromSelf = Id == other.Id && VersionId == other.VersionId;
-            var published = copyingFromSelf;
-
-            // note: use property.SetValue(), don't assign pvalue.EditValue, else change tracking fails
-
-            // clear all existing properties for the specified culture
-            foreach (var property in Properties)
-            {
-                // each property type may or may not support the variation
-                if (!property.PropertyType.SupportsVariation(culture, "*", wildcards: true))
-                    continue;
-
-                foreach (var pvalue in property.Values)
-                    if (property.PropertyType.SupportsVariation(pvalue.Culture, pvalue.Segment, wildcards: true) &&
-                        (culture == "*" || pvalue.Culture.InvariantEquals(culture)))
-                    {
-                        property.SetValue(null, pvalue.Culture, pvalue.Segment);
-                    }
-            }
-
-            // copy properties from 'other'
-            var otherProperties = other.Properties;
-            foreach (var otherProperty in otherProperties)
-            {
-                if (!otherProperty.PropertyType.SupportsVariation(culture, "*", wildcards: true))
-                    continue;
-
-                var alias = otherProperty.PropertyType.Alias;
-                foreach (var pvalue in otherProperty.Values)
-                {
-                    if (otherProperty.PropertyType.SupportsVariation(pvalue.Culture, pvalue.Segment, wildcards: true) &&
-                        (culture == "*" || pvalue.Culture.InvariantEquals(culture)))
-                    {
-                        var value = published ? pvalue.PublishedValue : pvalue.EditedValue;
-                        SetValue(alias, value, pvalue.Culture, pvalue.Segment);
-                    }
-                }
-            }
-
-            // copy names, too
-
-            if (culture == "*")
-                ClearCultureInfos();
-
-            if (culture == null || culture == "*")
-                Name = other.Name;
-
-            // ReSharper disable once UseDeconstruction
-            foreach (var cultureInfo in other.CultureInfos)
-            {
-                if (culture == "*" || culture == cultureInfo.Culture)
-                    SetCultureName(cultureInfo.Name, cultureInfo.Culture);
-            }
-        }
-
-        #endregion
-
-        #region Validation
+        #region Dirty
 
-        /// <inheritdoc />
-        public Property[] ValidateProperties(string culture = "*")
+        public override void ResetWereDirtyProperties()
         {
-            // select invalid properties
-            return Properties.Where(x =>
-            {
-                // if culture is null, we validate invariant properties only
-                // if culture is '*' we validate both variant and invariant properties, automatically
-                // if culture is specific eg 'en-US' we both too, but explicitly
-
-                var varies = x.PropertyType.VariesByCulture();
-
-                if (culture == null)
-                    return !(varies || x.IsValid(null)); // validate invariant property, invariant culture
-
-                if (culture == "*")
-                    return !x.IsValid(culture); // validate property, all cultures
-
-                return varies
-                    ? !x.IsValid(culture) // validate variant property, explicit culture
-                    : !x.IsValid(null); // validate invariant property, explicit culture
-            })
-            .ToArray();
+            base.ResetWereDirtyProperties();
+            _previousCultureChanges.addedCultures = null;
+            _previousCultureChanges.removedCultures = null;
+            _previousCultureChanges.updatedCultures = null;
         }
 
-        #endregion
-
-        #region Dirty
-
         /// <inheritdoc />
         /// <remarks>Overridden to include user properties.</remarks>
         public override void ResetDirtyProperties(bool rememberDirty)
         {
             base.ResetDirtyProperties(rememberDirty);
 
+            if (rememberDirty)
+            {
+                _previousCultureChanges.addedCultures = _currentCultureChanges.addedCultures == null ? null : new HashSet<string>(_currentCultureChanges.addedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousCultureChanges.removedCultures = _currentCultureChanges.removedCultures == null ? null : new HashSet<string>(_currentCultureChanges.removedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousCultureChanges.updatedCultures = _currentCultureChanges.updatedCultures == null ? null : new HashSet<string>(_currentCultureChanges.updatedCultures, StringComparer.InvariantCultureIgnoreCase);
+            }
+            else
+            {
+                _previousCultureChanges.addedCultures = null;
+                _previousCultureChanges.removedCultures = null;
+                _previousCultureChanges.updatedCultures = null;
+            }
+            _currentCultureChanges.addedCultures?.Clear();
+            _currentCultureChanges.removedCultures?.Clear();
+            _currentCultureChanges.updatedCultures?.Clear();
+
             // also reset dirty changes made to user's properties
             foreach (var prop in Properties)
                 prop.ResetDirtyProperties(rememberDirty);
 
-            _cultureInfos2 = _cultureInfos1;
-            _cultureInfos1 = _cultureInfos == null ? null : new ContentCultureInfosCollection(_cultureInfos);
-
             // take care of culture infos
             if (_cultureInfos == null) return;
 
@@ -443,6 +396,23 @@ public override bool IsPropertyDirty(string propertyName)
             if (base.IsPropertyDirty(propertyName))
                 return true;
 
+            //Special check here since we want to check if the request is for changed cultures
+            if (propertyName.StartsWith("_addedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_addedCulture_");
+                return _currentCultureChanges.addedCultures?.Contains(culture) ?? false;
+            }
+            if (propertyName.StartsWith("_removedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_removedCulture_");
+                return _currentCultureChanges.removedCultures?.Contains(culture) ?? false;
+            }
+            if (propertyName.StartsWith("_updatedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_updatedCulture_");
+                return _currentCultureChanges.updatedCultures?.Contains(culture) ?? false;
+            }
+
             return Properties.Contains(propertyName) && Properties[propertyName].IsDirty();
         }
 
@@ -453,6 +423,23 @@ public override bool WasPropertyDirty(string propertyName)
             if (base.WasPropertyDirty(propertyName))
                 return true;
 
+            //Special check here since we want to check if the request is for changed cultures
+            if (propertyName.StartsWith("_addedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_addedCulture_");
+                return _previousCultureChanges.addedCultures?.Contains(culture) ?? false;
+            }
+            if (propertyName.StartsWith("_removedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_removedCulture_");
+                return _previousCultureChanges.removedCultures?.Contains(culture) ?? false;
+            }
+            if (propertyName.StartsWith("_updatedCulture_"))
+            {
+                var culture = propertyName.TrimStart("_updatedCulture_");
+                return _previousCultureChanges.updatedCultures?.Contains(culture) ?? false;
+            }
+
             return Properties.Contains(propertyName) && Properties[propertyName].WasDirty();
         }
 
@@ -474,12 +461,6 @@ public override IEnumerable<string> GetWereDirtyProperties()
             return instanceProperties.Concat(propertyTypes);
         }
 
-        /// <inheritdoc />
-        public bool IsSavingCulture(string culture) => _cultureInfos.IsCultureUpdated(_cultureInfos1, culture);
-
-        /// <inheritdoc />
-        public bool HasSavedCulture(string culture) => _cultureInfos1.IsCultureUpdated(_cultureInfos2, culture);
-
         #endregion
 
         /// <inheritdoc />
@@ -496,7 +477,7 @@ protected override void PerformDeepClone(object clone)
             if (clonedContent._cultureInfos != null)
             {
                 clonedContent._cultureInfos.CollectionChanged -= CultureInfosCollectionChanged;          //clear this event handler if any
-                clonedContent._cultureInfos = (ContentCultureInfosCollection) _cultureInfos.DeepClone(); //manually deep clone
+                clonedContent._cultureInfos = (ContentCultureInfosCollection)_cultureInfos.DeepClone(); //manually deep clone
                 clonedContent._cultureInfos.CollectionChanged += clonedContent.CultureInfosCollectionChanged;    //re-assign correct event handler
             }
 
@@ -504,7 +485,7 @@ protected override void PerformDeepClone(object clone)
             if (clonedContent._properties != null)
             {
                 clonedContent._properties.CollectionChanged -= PropertiesChanged;         //clear this event handler if any
-                clonedContent._properties = (PropertyCollection) _properties.DeepClone(); //manually deep clone
+                clonedContent._properties = (PropertyCollection)_properties.DeepClone(); //manually deep clone
                 clonedContent._properties.CollectionChanged += clonedContent.PropertiesChanged;   //re-assign correct event handler
             }
         }
diff --git a/src/Umbraco.Core/Models/ContentCultureInfosCollectionExtensions.cs b/src/Umbraco.Core/Models/ContentCultureInfosCollectionExtensions.cs
deleted file mode 100644
index 98a0b48d07e1..000000000000
--- a/src/Umbraco.Core/Models/ContentCultureInfosCollectionExtensions.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Umbraco.Core.Models
-{
-    public static class ContentCultureInfosCollectionExtensions
-    {
-        public static bool IsCultureUpdated(this ContentCultureInfosCollection to, ContentCultureInfosCollection from, string culture)
-            => to != null && to.ContainsKey(culture) &&
-               (from == null || !from.ContainsKey(culture) || from[culture].Date != to[culture].Date);
-
-        public static bool IsCultureRemoved(this ContentCultureInfosCollection to, ContentCultureInfosCollection from, string culture)
-            => (to == null || !to.ContainsKey(culture)) && from != null && from.ContainsKey(culture);
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
index 79c3dc3f636d..31e040f2d4a8 100644
--- a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
@@ -10,6 +10,127 @@ namespace Umbraco.Core.Models
     /// </summary>
     internal static class ContentRepositoryExtensions
     {
+        /// <summary>
+        /// Gets the cultures that have been flagged for unpublishing.
+        /// </summary>
+        /// <remarks>Gets cultures for which content.UnpublishCulture() has been invoked.</remarks>
+        public static IReadOnlyList<string> GetCulturesUnpublishing(this IContent content)
+        {
+            if (!content.Published || !content.ContentType.VariesByCulture() || !content.IsPropertyDirty("PublishCultureInfos"))
+                return Array.Empty<string>();
+
+            var culturesUnpublishing = content.CultureInfos.Values
+                .Where(x => content.IsPropertyDirty("_unpublishedCulture_" + x.Culture))
+                .Select(x => x.Culture);
+
+            return culturesUnpublishing.ToList();
+        }
+
+        /// <summary>
+        /// Copies values from another document.
+        /// </summary>
+        public static void CopyFrom(this IContent content, IContent other, string culture = "*")
+        {
+            if (other.ContentTypeId != content.ContentTypeId)
+                throw new InvalidOperationException("Cannot copy values from a different content type.");
+
+            culture = culture?.ToLowerInvariant().NullOrWhiteSpaceAsNull();
+
+            // the variation should be supported by the content type properties
+            //  if the content type is invariant, only '*' and 'null' is ok
+            //  if the content type varies, everything is ok because some properties may be invariant
+            if (!content.ContentType.SupportsPropertyVariation(culture, "*", true))
+                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{content.ContentType.Alias}\" with variation \"{content.ContentType.Variations}\".");
+
+            // copying from the same Id and VersionPk
+            var copyingFromSelf = content.Id == other.Id && content.VersionId == other.VersionId;
+            var published = copyingFromSelf;
+
+            // note: use property.SetValue(), don't assign pvalue.EditValue, else change tracking fails
+
+            // clear all existing properties for the specified culture
+            foreach (var property in content.Properties)
+            {
+                // each property type may or may not support the variation
+                if (!property.PropertyType.SupportsVariation(culture, "*", wildcards: true))
+                    continue;
+
+                foreach (var pvalue in property.Values)
+                    if (property.PropertyType.SupportsVariation(pvalue.Culture, pvalue.Segment, wildcards: true) &&
+                        (culture == "*" || pvalue.Culture.InvariantEquals(culture)))
+                    {
+                        property.SetValue(null, pvalue.Culture, pvalue.Segment);
+                    }
+            }
+
+            // copy properties from 'other'
+            var otherProperties = other.Properties;
+            foreach (var otherProperty in otherProperties)
+            {
+                if (!otherProperty.PropertyType.SupportsVariation(culture, "*", wildcards: true))
+                    continue;
+
+                var alias = otherProperty.PropertyType.Alias;
+                foreach (var pvalue in otherProperty.Values)
+                {
+                    if (otherProperty.PropertyType.SupportsVariation(pvalue.Culture, pvalue.Segment, wildcards: true) &&
+                        (culture == "*" || pvalue.Culture.InvariantEquals(culture)))
+                    {
+                        var value = published ? pvalue.PublishedValue : pvalue.EditedValue;
+                        content.SetValue(alias, value, pvalue.Culture, pvalue.Segment);
+                    }
+                }
+            }
+
+            // copy names, too
+
+            if (culture == "*")
+            {
+                content.CultureInfos.Clear();
+                content.CultureInfos = null;
+            }
+                
+
+            if (culture == null || culture == "*")
+                content.Name = other.Name;
+
+            // ReSharper disable once UseDeconstruction
+            foreach (var cultureInfo in other.CultureInfos)
+            {
+                if (culture == "*" || culture == cultureInfo.Culture)
+                    content.SetCultureName(cultureInfo.Name, cultureInfo.Culture);
+            }
+        }
+
+        /// <summary>
+        /// Validates the content item's properties pass variant rules
+        /// </summary>
+        /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither 'null' nor
+        /// 'empty'. If the content type is invariant, then culture can be either '*' or null or empty.</para>
+        public static Property[] ValidateProperties(this IContentBase content, string culture = "*")
+        {
+            // select invalid properties
+            return content.Properties.Where(x =>
+                {
+                    // if culture is null, we validate invariant properties only
+                    // if culture is '*' we validate both variant and invariant properties, automatically
+                    // if culture is specific eg 'en-US' we both too, but explicitly
+
+                    var varies = x.PropertyType.VariesByCulture();
+
+                    if (culture == null)
+                        return !(varies || x.IsValid(null)); // validate invariant property, invariant culture
+
+                    if (culture == "*")
+                        return !x.IsValid(culture); // validate property, all cultures
+
+                    return varies
+                        ? !x.IsValid(culture) // validate variant property, explicit culture
+                        : !x.IsValid(null); // validate invariant property, explicit culture
+                })
+                .ToArray();
+        }
+
         public static void SetPublishInfo(this IContent content, string culture, string name, DateTime date)
         {
             if (string.IsNullOrWhiteSpace(name))
@@ -32,6 +153,8 @@ public static void AdjustDates(this IContent content, DateTime date)
                 //fixme: Removing the logic here for the old WasCulturePublished and the _publishInfosOrig has broken
                 // the test Can_Rollback_Version_On_Multilingual, but we need to understand what it's doing since I don't
 
+                //fixme: Because this is being called, we end up updating a culture which triggers the dirty change tracking
+                // which ends up in error because the culture is not actually being updated which causes the tests to fail
                 content.PublishCultureInfos.AddOrUpdate(culture, publishInfos.Name, date);
 
                 if (content.CultureInfos.TryGetValue(culture, out var infos))
@@ -147,10 +270,13 @@ public static void ClearPublishInfo(this IContent content, string culture)
             content.PublishCultureInfos.Remove(culture);
 
             // set the culture to be dirty - it's been modified
-            content.TouchCultureInfo(culture);
+            content.TouchCulture(culture);
         }
 
-        public static void TouchCultureInfo(this IContent content, string culture)
+        /// <summary>
+        /// Updates a culture date, if the culture exists.
+        /// </summary>
+        public static void TouchCulture(this IContent content, string culture)
         {
             if (!content.CultureInfos.TryGetValue(culture, out var infos)) return;
             content.CultureInfos.AddOrUpdate(culture, infos.Name, DateTime.Now);
diff --git a/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
index a598ba1b3d2b..a1f4bad9a1b1 100644
--- a/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
+++ b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
@@ -65,7 +65,7 @@ public virtual bool WasPropertyDirty(string propertyName)
         }
 
         /// <inheritdoc />
-        public void ResetWereDirtyProperties()
+        public virtual void ResetWereDirtyProperties()
         {
             // note: cannot .Clear() because when memberwise-cloning this will be the SAME
             // instance as the one on the clone, so we need to create a new instance.
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index bd72029c3f66..e953bef1eba9 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -135,29 +135,5 @@ public interface IContent : IContentBase
         /// <returns></returns>
         IContent DeepCloneWithResetIdentities();
         
-
-        /// <summary>
-        /// Determines whether a culture is being published, during a Publishing event.
-        /// </summary>
-        /// <remarks>Outside of a Publishing event handler, the returned value is unspecified.</remarks>
-        bool IsPublishingCulture(string culture);
-
-        /// <summary>
-        /// Determines whether a culture is being unpublished, during a Publishing event.
-        /// </summary>
-        /// <remarks>Outside of a Publishing event handler, the returned value is unspecified.</remarks>
-        bool IsUnpublishingCulture(string culture);
-
-        /// <summary>
-        /// Determines whether a culture has been published, during a Published event.
-        /// </summary>
-        /// <remarks>Outside of a Published event handler, the returned value is unspecified.</remarks>
-        bool HasPublishedCulture(string culture);
-
-        /// <summary>
-        /// Determines whether a culture has been unpublished, during a Published event.
-        /// </summary>
-        /// <remarks>Outside of a Published event handler, the returned value is unspecified.</remarks>
-        bool HasUnpublishedCulture(string culture);
     }
 }
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index e6cda5de7bfb..1ebbfa1d493a 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -132,33 +132,5 @@ public interface IContentBase : IUmbracoEntity
         /// <remarks>Values 'null' and 'empty' are equivalent for culture and segment.</remarks>
         void SetValue(string propertyTypeAlias, object value, string culture = null, string segment = null);
 
-        /// <summary>
-        /// Copies values from another document.
-        /// </summary>
-        void CopyFrom(IContent other, string culture = "*");
-
-        /// <summary>
-        /// Validates the content item's properties pass variant rules
-        /// </summary>
-        /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither 'null' nor
-        /// 'empty'. If the content type is invariant, then culture can be either '*' or null or empty.</para>
-        Property[] ValidateProperties(string culture = "*");
-
-        /// <summary>
-        /// Determines whether a culture is being saved, during a Saving event.
-        /// </summary>
-        /// <remarks>Outside of a Saving event handler, the returned value is unspecified.</remarks>
-        bool IsSavingCulture(string culture);
-
-        /// <summary>
-        /// Determines whether a culture has been saved, during a Saved event.
-        /// </summary>
-        /// <remarks>Outside of a Saved event handler, the returned value is unspecified.</remarks>
-        bool HasSavedCulture(string culture);
-
-        /// <summary>
-        /// Updates a culture date, if the culture exists.
-        /// </summary>
-        void TouchCulture(string culture);
     }
 }
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index bc71d3dc2bc9..4f9e79f4821c 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -142,13 +142,15 @@ void PropertyDataChanged(object sender, PropertyChangedEventArgs e)
         }
 
         public override void ResetDirtyProperties(bool rememberDirty)
-        {
+        {   
+            base.ResetDirtyProperties(rememberDirty);
+
             _addedProperties.Clear();
             _removedProperties.Clear();
-            base.ResetDirtyProperties(rememberDirty);
+
             foreach (var prop in Properties)
             {
-                ((BeingDirtyBase)prop).ResetDirtyProperties(rememberDirty);
+                prop.ResetDirtyProperties(rememberDirty);
             }
         }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index c02a26ef7b29..a4acb824b781 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -1197,7 +1197,6 @@ private void SetVariations(Content content, IDictionary<int, List<ContentVariati
             {
                 foreach (var v in contentVariation)
                     content.SetPublishInfo(v.Culture, v.Name, v.Date);
-                content.AknPublishInfo();
             }
             if (documentVariations.TryGetValue(content.Id, out var documentVariation))
                 content.SetCultureEdited(documentVariation.Where(x => x.Edited).Select(x => x.Culture));
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index cbeada6411ec..ce7417722d22 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -307,15 +307,16 @@ private void CreateContent(IScope scope, Content content, IContent parent, int u
 
             if (withIdentity)
             {
+                var evtMsgs = EventMessagesFactory.Get();
+
                 // if saving is cancelled, content remains without an identity
-                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                var saveEventArgs = new ContentSavingEventArgs(content, evtMsgs);
                 if (scope.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
                     return;
 
                 _documentRepository.Save(content);
 
-                saveEventArgs.CanCancel = false;
-                scope.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                scope.Events.Dispatch(Saved, this, saveEventArgs.ToContentSavedEventArgs(), "Saved");
                 scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(content, TreeChangeTypes.RefreshNode).ToEventArgs());
             }
 
@@ -758,7 +759,7 @@ public OperationResult Save(IContent content, int userId = 0, bool raiseEvents =
 
             using (var scope = ScopeProvider.CreateScope())
             {
-                var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                var saveEventArgs = new ContentSavingEventArgs(content, evtMsgs);
                 if (raiseEvents && scope.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
                 {
                     scope.Complete();
@@ -784,8 +785,7 @@ public OperationResult Save(IContent content, int userId = 0, bool raiseEvents =
 
                 if (raiseEvents)
                 {
-                    saveEventArgs.CanCancel = false;
-                    scope.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    scope.Events.Dispatch(Saved, this, saveEventArgs.ToContentSavedEventArgs(), "Saved");
                 }
                 var changeType = TreeChangeTypes.RefreshNode;
                 scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(content, changeType).ToEventArgs());
@@ -814,7 +814,7 @@ public OperationResult Save(IEnumerable<IContent> contents, int userId = 0, bool
 
             using (var scope = ScopeProvider.CreateScope())
             {
-                var saveEventArgs = new SaveEventArgs<IContent>(contentsA, evtMsgs);
+                var saveEventArgs = new ContentSavingEventArgs(contentsA, evtMsgs);
                 if (raiseEvents && scope.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
                 {
                     scope.Complete();
@@ -835,8 +835,7 @@ public OperationResult Save(IEnumerable<IContent> contents, int userId = 0, bool
 
                 if (raiseEvents)
                 {
-                    saveEventArgs.CanCancel = false;
-                    scope.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    scope.Events.Dispatch(Saved, this, saveEventArgs.ToContentSavedEventArgs(), "Saved");
                 }
                 scope.Events.Dispatch(TreeChanged, this, treeChanges.ToEventArgs());
                 Audit(AuditType.Save, userId == -1 ? 0 : userId, Constants.System.Root, "Saved multiple content");
@@ -948,8 +947,7 @@ public PublishResult Unpublish(IContent content, string culture = "*", int userI
             // all cultures = unpublish whole
             if (culture == "*" || (!content.ContentType.VariesByCulture() && culture == null))
             {
-                //TODO: Stop casting https://github.com/umbraco/Umbraco-CMS/issues/4234
-                ((Content)content).PublishedState = PublishedState.Unpublishing;
+                content.PublishedState = PublishedState.Unpublishing;
             }
             else
             {
@@ -1001,7 +999,7 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
 
             // nothing set = republish it all
             if (content.PublishedState != PublishedState.Publishing && content.PublishedState != PublishedState.Unpublishing)
-                ((Content)content).PublishedState = PublishedState.Publishing; //TODO: fix this https://github.com/umbraco/Umbraco-CMS/issues/4234
+                content.PublishedState = PublishedState.Publishing;
 
             // state here is either Publishing or Unpublishing
             // (even though, Publishing to unpublish a culture may end up unpublishing everything)
@@ -1022,26 +1020,23 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
             var previouslyPublished = content.HasIdentity && content.Published;
 
             // always save
-            var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+            var saveEventArgs = new ContentSavingEventArgs(content, evtMsgs);
             if (raiseEvents && scope.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
                 return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, content);
 
             if (publishing)
             {
-                //to continue, we need to have a reference to the original IContent item that is currently persisted
-                var persisted = content.HasIdentity ? GetById(content.Id) : null;
-
-                culturesUnpublishing = content.GetCulturesUnpublishing(persisted);
+                culturesUnpublishing = content.GetCulturesUnpublishing();
                 culturesPublishing = variesByCulture
                         ? content.PublishCultureInfos.Values.Where(x => x.IsDirty()).Select(x => x.Culture).ToList()
                         : null;
 
                 // ensure that the document can be published, and publish handling events, business rules, etc
-                publishResult = StrategyCanPublish(scope, content, userId, /*checkPath:*/ (!branchOne || branchRoot), culturesPublishing, culturesUnpublishing, evtMsgs);
+                publishResult = StrategyCanPublish(scope, content, /*checkPath:*/ (!branchOne || branchRoot), culturesPublishing, culturesUnpublishing, evtMsgs, saveEventArgs);
                 if (publishResult.Success)
                 {
                     // note: StrategyPublish flips the PublishedState to Publishing!
-                    publishResult = StrategyPublish(scope, content, userId, culturesPublishing, culturesUnpublishing, evtMsgs);
+                    publishResult = StrategyPublish(content, culturesPublishing, culturesUnpublishing, evtMsgs);
                 }
                 else
                 {
@@ -1061,7 +1056,9 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
 
                     // reset published state from temp values (publishing, unpublishing) to original value
                     // (published, unpublished) in order to save the document, unchanged
-                    ((Content)content).Published = content.Published;
+                    //TODO: why? this seems odd, were just setting the exact same value that it already has
+                    // instead do we want to just set the PublishState?
+                    content.Published = content.Published; 
                 }
             }
 
@@ -1077,14 +1074,16 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
                     // handling events, business rules, etc
                     // note: StrategyUnpublish flips the PublishedState to Unpublishing!
                     // note: This unpublishes the entire document (not different variants)
-                    unpublishResult = StrategyCanUnpublish(scope, content, userId, evtMsgs);
+                    unpublishResult = StrategyCanUnpublish(scope, content, evtMsgs);
                     if (unpublishResult.Success)
                         unpublishResult = StrategyUnpublish(scope, content, userId, evtMsgs);
                     else
                     {
                         // reset published state from temp values (publishing, unpublishing) to original value
                         // (published, unpublished) in order to save the document, unchanged
-                        ((Content)content).Published = content.Published;
+                        //TODO: why? this seems odd, were just setting the exact same value that it already has
+                        // instead do we want to just set the PublishState?
+                        content.Published = content.Published;
                     }
                 }
                 else
@@ -1107,8 +1106,7 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
             // raise the Saved event, always
             if (raiseEvents)
             {
-                saveEventArgs.CanCancel = false;
-                scope.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                scope.Events.Dispatch(Saved, this, saveEventArgs.ToContentSavedEventArgs(), "Saved");
             }
 
             if (unpublishing) // we have tried to unpublish - won't happen in a branch
@@ -1151,16 +1149,16 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
                     if (!branchOne) // for branches, handled by SaveAndPublishBranch
                     {
                         scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(content, changeType).ToEventArgs());
-                        scope.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(content, false, false), "Published");
+                        scope.Events.Dispatch(Published, this, saveEventArgs.ToContentPublishedEventArgs(), nameof(Published));
                     }
 
-                    // if was not published and now is... descendants that were 'published' (but
+                    // it was not published and now is... descendants that were 'published' (but
                     // had an unpublished ancestor) are 're-published' ie not explicitly published
                     // but back as 'published' nevertheless
                     if (!branchOne && isNew == false && previouslyPublished == false && HasChildren(content.Id))
                     {
                         var descendants = GetPublishedDescendantsLocked(content).ToArray();
-                        scope.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(descendants, false, false), "Published");
+                        scope.Events.Dispatch(Published, this, new ContentPublishedEventArgs(descendants, false, evtMsgs), "Published");
                     }
 
                     switch (publishResult.Result)
@@ -1456,7 +1454,7 @@ public IEnumerable<PublishResult> SaveAndPublishBranch(IContent document, bool f
                 if (!document.HasIdentity)
                     throw new InvalidOperationException("Cannot not branch-publish a new document.");
 
-                var publishedState = ((Content)document).PublishedState;
+                var publishedState = document.PublishedState;
                 if (publishedState == PublishedState.Publishing)
                     throw new InvalidOperationException("Cannot mix PublishCulture and SaveAndPublishBranch.");
 
@@ -1510,7 +1508,9 @@ public IEnumerable<PublishResult> SaveAndPublishBranch(IContent document, bool f
 
                 // trigger events for the entire branch
                 scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(document, TreeChangeTypes.RefreshBranch).ToEventArgs());
-                scope.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(publishedDocuments, false, false), "Published");
+
+                //fixme - in the SaveAndPublishBranchOne -> CommitDocumentChangesInternal publishing/published is going to be raised there, so are we raising it 2x for the same thing?
+                scope.Events.Dispatch(Published, this, new ContentPublishedEventArgs(publishedDocuments, false, evtMsgs), nameof(Published));
 
                 scope.Complete();
             }
@@ -1772,7 +1772,7 @@ public void Move(IContent content, int parentId, int userId = 0)
                 {
                     // however, it had been masked when being trashed, so there's no need for
                     // any special event here - just change its state
-                    ((Content)content).PublishedState = PublishedState.Unpublishing;
+                    content.PublishedState = PublishedState.Unpublishing;
                 }
 
                 PerformMoveLocked(content, parentId, parent, userId, moves, trashed);
@@ -1949,7 +1949,7 @@ public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool
                 // a copy is not published (but not really unpublishing either)
                 // update the create author and last edit author
                 if (copy.Published)
-                    ((Content)copy).Published = false;
+                    copy.Published = false;
                 copy.CreatorId = userId;
                 copy.WriterId = userId;
 
@@ -1993,7 +1993,7 @@ public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool
                             // a copy is not published (but not really unpublishing either)
                             // update the create author and last edit author
                             if (descendantCopy.Published)
-                                ((Content)descendantCopy).Published = false;
+                                descendantCopy.Published = false;
                             descendantCopy.CreatorId = userId;
                             descendantCopy.WriterId = userId;
 
@@ -2130,7 +2130,7 @@ public OperationResult Sort(IEnumerable<int> ids, int userId = 0, bool raiseEven
 
         private OperationResult Sort(IScope scope, IContent[] itemsA, int userId, EventMessages evtMsgs, bool raiseEvents)
         {
-            var saveEventArgs = new SaveEventArgs<IContent>(itemsA);
+            var saveEventArgs = new ContentSavingEventArgs(itemsA, evtMsgs);
             if (raiseEvents)
             {
                 //raise cancelable sorting event
@@ -2172,15 +2172,16 @@ private OperationResult Sort(IScope scope, IContent[] itemsA, int userId, EventM
 
             if (raiseEvents)
             {
+                var savedEventsArgs = saveEventArgs.ToContentSavedEventArgs();
                 //first saved, then sorted
-                scope.Events.Dispatch(Saved, this, saveEventArgs, nameof(Saved));
-                scope.Events.Dispatch(Sorted, this, saveEventArgs, nameof(Sorted));
+                scope.Events.Dispatch(Saved, this, savedEventsArgs, nameof(Saved));
+                scope.Events.Dispatch(Sorted, this, savedEventsArgs, nameof(Sorted));
             }
 
             scope.Events.Dispatch(TreeChanged, this, saved.Select(x => new TreeChange<IContent>(x, TreeChangeTypes.RefreshNode)).ToEventArgs());
 
             if (raiseEvents && published.Any())
-                scope.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(published, false, false), "Published");
+                scope.Events.Dispatch(Published, this, new ContentPublishedEventArgs(published, false, evtMsgs), "Published");
 
             Audit(AuditType.Sort, userId, 0, "Sorting content performed by user");
             return OperationResult.Succeed(evtMsgs);
@@ -2271,12 +2272,12 @@ private void Audit(AuditType type, int userId, int objectId, string message = nu
         /// <summary>
         /// Occurs before Save
         /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saving;
+        public static event TypedEventHandler<IContentService, ContentSavingEventArgs> Saving;
 
         /// <summary>
         /// Occurs after Save
         /// </summary>
-        public static event TypedEventHandler<IContentService, SaveEventArgs<IContent>> Saved;
+        public static event TypedEventHandler<IContentService, ContentSavedEventArgs> Saved;
 
         /// <summary>
         /// Occurs after Create
@@ -2350,12 +2351,12 @@ private void Audit(AuditType type, int userId, int objectId, string message = nu
         /// <summary>
         /// Occurs before publish
         /// </summary>
-        public static event TypedEventHandler<IContentService, PublishEventArgs<IContent>> Publishing;
+        public static event TypedEventHandler<IContentService, ContentPublishingEventArgs> Publishing;
 
         /// <summary>
         /// Occurs after publish
         /// </summary>
-        public static event TypedEventHandler<IContentService, PublishEventArgs<IContent>> Published;
+        public static event TypedEventHandler<IContentService, ContentPublishedEventArgs> Published;
 
         /// <summary>
         /// Occurs before unpublish
@@ -2391,14 +2392,16 @@ private void Audit(AuditType type, int userId, int objectId, string message = nu
         /// </summary>
         /// <param name="scope"></param>
         /// <param name="content"></param>
-        /// <param name="userId"></param>
         /// <param name="checkPath"></param>
+        /// <param name="culturesUnpublishing"></param>
         /// <param name="evtMsgs"></param>
+        /// <param name="culturesPublishing"></param>
+        /// <param name="savingEventArgs"></param>
         /// <returns></returns>
-        private PublishResult StrategyCanPublish(IScope scope, IContent content, int userId, bool checkPath, IReadOnlyList<string> culturesPublishing, IReadOnlyList<string> culturesUnpublishing, EventMessages evtMsgs)
+        private PublishResult StrategyCanPublish(IScope scope, IContent content, bool checkPath, IReadOnlyList<string> culturesPublishing, IReadOnlyCollection<string> culturesUnpublishing, EventMessages evtMsgs, ContentSavingEventArgs savingEventArgs)
         {
             // raise Publishing event
-            if (scope.Events.DispatchCancelable(Publishing, this, new PublishEventArgs<IContent>(content, evtMsgs)))
+            if (scope.Events.DispatchCancelable(Publishing, this, savingEventArgs.ToContentPublishingEventArgs()))
             {
                 Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "publishing was cancelled");
                 return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, content);
@@ -2425,7 +2428,7 @@ private PublishResult StrategyCanPublish(IScope scope, IContent content, int use
 
             // ensure that the document has published values
             // either because it is 'publishing' or because it already has a published version
-            if (((Content)content).PublishedState != PublishedState.Publishing && content.PublishedVersionId == 0)
+            if (content.PublishedState != PublishedState.Publishing && content.PublishedVersionId == 0)
             {
                 Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document does not have published values");
                 return new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
@@ -2481,20 +2484,20 @@ private PublishResult StrategyCanPublish(IScope scope, IContent content, int use
         /// <summary>
         /// Publishes a document
         /// </summary>
-        /// <param name="scope"></param>
         /// <param name="content"></param>
-        /// <param name="userId"></param>
+        /// <param name="culturesUnpublishing"></param>
         /// <param name="evtMsgs"></param>
+        /// <param name="culturesPublishing"></param>
         /// <returns></returns>
         /// <remarks>
         /// It is assumed that all publishing checks have passed before calling this method like <see cref="StrategyCanPublish"/>
         /// </remarks>
-        private PublishResult StrategyPublish(IScope scope, IContent content, int userId,
-            IReadOnlyList<string> culturesPublishing, IReadOnlyList<string> culturesUnpublishing,
+        private PublishResult StrategyPublish(IContent content,
+            IReadOnlyCollection<string> culturesPublishing, IReadOnlyCollection<string> culturesUnpublishing,
             EventMessages evtMsgs)
         {
             // change state to publishing
-            ((Content)content).PublishedState = PublishedState.Publishing;
+            content.PublishedState = PublishedState.Publishing;
 
             //if this is a variant then we need to log which cultures have been published/unpublished and return an appropriate result
             if (content.ContentType.VariesByCulture())
@@ -2529,10 +2532,9 @@ private PublishResult StrategyPublish(IScope scope, IContent content, int userId
         /// </summary>
         /// <param name="scope"></param>
         /// <param name="content"></param>
-        /// <param name="userId"></param>
         /// <param name="evtMsgs"></param>
         /// <returns></returns>
-        private PublishResult StrategyCanUnpublish(IScope scope, IContent content, int userId, EventMessages evtMsgs)
+        private PublishResult StrategyCanUnpublish(IScope scope, IContent content, EventMessages evtMsgs)
         {
             // raise Unpublishing event
             if (scope.Events.DispatchCancelable(Unpublishing, this, new PublishEventArgs<IContent>(content, evtMsgs)))
@@ -2573,7 +2575,7 @@ private PublishResult StrategyUnpublish(IScope scope, IContent content, int user
                 Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) had its release date removed, because it was unpublished.", content.Name, content.Id);
 
             // change state to unpublishing
-            ((Content)content).PublishedState = PublishedState.Unpublishing;
+            content.PublishedState = PublishedState.Unpublishing;
 
             Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) has been unpublished.", content.Name, content.Id);
             return attempt;
@@ -2591,7 +2593,7 @@ private PublishResult StrategyUnpublish(IScope scope, IContent content, int user
         /// <para>Deletes content items of the specified type, and only that type. Does *not* handle content types
         /// inheritance and compositions, which need to be managed outside of this method.</para>
         /// </remarks>
-        /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
+        /// <param name="contentTypeIds">Id of the <see cref="IContentType"/></param>
         /// <param name="userId">Optional Id of the user issuing the delete operation</param>
         public void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
         {
@@ -2710,7 +2712,7 @@ public IContent GetBlueprintById(int id)
                 scope.ReadLock(Constants.Locks.ContentTree);
                 var blueprint = _documentBlueprintRepository.Get(id);
                 if (blueprint != null)
-                    ((Content)blueprint).Blueprint = true;
+                    blueprint.Blueprint = true;
                 return blueprint;
             }
         }
@@ -2722,7 +2724,7 @@ public IContent GetBlueprintById(Guid id)
                 scope.ReadLock(Constants.Locks.ContentTree);
                 var blueprint = _documentBlueprintRepository.Get(id);
                 if (blueprint != null)
-                    ((Content)blueprint).Blueprint = true;
+                    blueprint.Blueprint = true;
                 return blueprint;
             }
         }
@@ -2733,7 +2735,7 @@ public void SaveBlueprint(IContent content, int userId = 0)
             if (content.ParentId != -1)
                 content.ParentId = -1;
 
-            ((Content)content).Blueprint = true;
+            content.Blueprint = true;
 
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -2809,7 +2811,7 @@ public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] contentTy
                 }
                 return _documentBlueprintRepository.Get(query).Select(x =>
                 {
-                    ((Content)x).Blueprint = true;
+                    x.Blueprint = true;
                     return x;
                 });
             }
@@ -2828,7 +2830,7 @@ public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId
 
                 var blueprints = _documentBlueprintRepository.Get(query).Select(x =>
                 {
-                    ((Content)x).Blueprint = true;
+                    x.Blueprint = true;
                     return x;
                 }).ToArray();
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 6ddfe1afd681..84103067e91b 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -299,6 +299,11 @@
     <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
     <Compile Include="DisposableObjectSlim.cs" />
     <Compile Include="EnumExtensions.cs" />
+    <Compile Include="Events\CancellableEnumerableObjectEventArgs.cs" />
+    <Compile Include="Events\ContentPublishedEventArgs.cs" />
+    <Compile Include="Events\ContentPublishingEventArgs.cs" />
+    <Compile Include="Events\ContentSavedEventArgs.cs" />
+    <Compile Include="Events\ContentSavingEventArgs.cs" />
     <Compile Include="Events\ExportedMemberEventArgs.cs" />
     <Compile Include="Events\RolesEventArgs.cs" />
     <Compile Include="Events\UserGroupWithUsers.cs" />
@@ -389,7 +394,6 @@
     <Compile Include="Models\Consent.cs" />
     <Compile Include="Models\ConsentExtensions.cs" />
     <Compile Include="Models\ConsentState.cs" />
-    <Compile Include="Models\ContentCultureInfosCollectionExtensions.cs" />
     <Compile Include="Models\ContentEditing\ContentApp.cs" />
     <Compile Include="Models\ContentEditing\IContentAppFactory.cs" />
     <Compile Include="Models\ContentRepositoryExtensions.cs" />
diff --git a/src/Umbraco.Tests/Services/ContentServiceEventTests.cs b/src/Umbraco.Tests/Services/ContentServiceEventTests.cs
index 3576425b9cf5..b4fde295a71f 100644
--- a/src/Umbraco.Tests/Services/ContentServiceEventTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceEventTests.cs
@@ -47,35 +47,35 @@ public void SavingTest()
 
             var contentService = ServiceContext.ContentService;
 
-            var document = new Content("content", -1, contentType);
+            IContent document = new Content("content", -1, contentType);
             document.SetCultureName("hello", "en-US");
             document.SetCultureName("bonjour", "fr-FR");
             contentService.Save(document);
 
+            //re-get - dirty properties need resetting
+            document = contentService.GetById(document.Id);
+
             // properties: title, bodyText, keywords, description
             document.SetValue("title", "title-en", "en-US");
 
-            // touch the culture - required for IsSaving/HasSaved to work
-            document.TouchCulture("fr-FR");
-
-            void OnSaving(IContentService sender, SaveEventArgs<IContent> e)
+            void OnSaving(IContentService sender, ContentSavingEventArgs e)
             {
                 var saved = e.SavedEntities.First();
 
                 Assert.AreSame(document, saved);
 
-                Assert.IsTrue(saved.IsSavingCulture("fr-FR"));
-                Assert.IsFalse(saved.IsSavingCulture("en-UK"));
+                Assert.IsTrue(e.IsSavingCulture(saved, "fr-FR"));
+                Assert.IsFalse(e.IsSavingCulture(saved, "en-UK"));
             }
 
-            void OnSaved(IContentService sender, SaveEventArgs<IContent> e)
+            void OnSaved(IContentService sender, ContentSavedEventArgs e)
             {
                 var saved = e.SavedEntities.First();
 
                 Assert.AreSame(document, saved);
 
-                Assert.IsTrue(saved.HasSavedCulture("fr-FR"));
-                Assert.IsFalse(saved.HasSavedCulture("en-UK"));
+                Assert.IsTrue(e.HasSavedCulture(saved, "fr-FR"));
+                Assert.IsFalse(e.HasSavedCulture(saved, "en-UK"));
             }
 
             ContentService.Saving += OnSaving;
@@ -103,35 +103,35 @@ public void PublishingTest()
 
             var contentService = ServiceContext.ContentService;
 
-            var document = new Content("content", -1, contentType);
+            IContent document = new Content("content", -1, contentType);
             document.SetCultureName("hello", "en-US");
             document.SetCultureName("bonjour", "fr-FR");
             contentService.Save(document);
 
-            // ensure it works and does not throw
-            Assert.IsFalse(document.WasCulturePublished("fr-FR"));
-            Assert.IsFalse(document.WasCulturePublished("en-US"));
             Assert.IsFalse(document.IsCulturePublished("fr-FR"));
             Assert.IsFalse(document.IsCulturePublished("en-US"));
 
-            void OnPublishing(IContentService sender, PublishEventArgs<IContent> e)
+            //re-get - dirty properties need resetting
+            document = contentService.GetById(document.Id);
+
+            void OnPublishing(IContentService sender, ContentPublishingEventArgs e)
             {
                 var publishing = e.PublishedEntities.First();
 
                 Assert.AreSame(document, publishing);
 
-                Assert.IsFalse(publishing.IsPublishingCulture("en-US"));
-                Assert.IsTrue(publishing.IsPublishingCulture("fr-FR"));
+                Assert.IsFalse(e.IsPublishingCulture(publishing, "en-US"));
+                Assert.IsTrue(e.IsPublishingCulture(publishing, "fr-FR"));
             }
 
-            void OnPublished(IContentService sender, PublishEventArgs<IContent> e)
+            void OnPublished(IContentService sender, ContentPublishedEventArgs e)
             {
                 var published = e.PublishedEntities.First();
 
                 Assert.AreSame(document, published);
 
-                Assert.IsFalse(published.HasPublishedCulture("en-US"));
-                Assert.IsTrue(published.HasPublishedCulture("fr-FR"));
+                Assert.IsFalse(e.HasPublishedCulture(published, "en-US"));
+                Assert.IsTrue(e.HasPublishedCulture(published, "fr-FR"));
             }
 
             ContentService.Publishing += OnPublishing;
@@ -140,11 +140,9 @@ void OnPublished(IContentService sender, PublishEventArgs<IContent> e)
             ContentService.Publishing -= OnPublishing;
             ContentService.Published -= OnPublished;
 
-            document = (Content) contentService.GetById(document.Id);
+            document = contentService.GetById(document.Id);
 
             // ensure it works and does not throw
-            Assert.IsTrue(document.WasCulturePublished("fr-FR"));
-            Assert.IsFalse(document.WasCulturePublished("en-US"));
             Assert.IsTrue(document.IsCulturePublished("fr-FR"));
             Assert.IsFalse(document.IsCulturePublished("en-US"));
         }
@@ -165,58 +163,55 @@ public void UnpublishingTest()
                 propertyType.Variations = ContentVariation.Culture;
             contentTypeService.Save(contentType);
 
-            var contentService = ServiceContext.ContentService;
+            var contentService = (ContentService)ServiceContext.ContentService;
 
-            var document = new Content("content", -1, contentType);
+            IContent document = new Content("content", -1, contentType);
             document.SetCultureName("hello", "en-US");
             document.SetCultureName("bonjour", "fr-FR");
             contentService.SaveAndPublish(document);
 
-            // ensure it works and does not throw
-            Assert.IsTrue(document.WasCulturePublished("fr-FR"));
-            Assert.IsTrue(document.WasCulturePublished("en-US"));
             Assert.IsTrue(document.IsCulturePublished("fr-FR"));
             Assert.IsTrue(document.IsCulturePublished("en-US"));
 
-            void OnPublishing(IContentService sender, PublishEventArgs<IContent> e)
+            //re-get - dirty properties need resetting
+            document = contentService.GetById(document.Id);
+
+            void OnPublishing(IContentService sender, ContentPublishingEventArgs e)
             {
                 var publishing = e.PublishedEntities.First();
 
                 Assert.AreSame(document, publishing);
 
-                Assert.IsFalse(publishing.IsPublishingCulture("en-US"));
-                Assert.IsFalse(publishing.IsPublishingCulture("fr-FR"));
+                Assert.IsFalse(e.IsPublishingCulture(publishing, "en-US"));
+                Assert.IsFalse(e.IsPublishingCulture(publishing, "fr-FR"));
 
-                Assert.IsFalse(publishing.IsUnpublishingCulture("en-US"));
-                Assert.IsTrue(publishing.IsUnpublishingCulture("fr-FR"));
+                Assert.IsFalse(e.IsUnpublishingCulture(publishing, "en-US"));
+                Assert.IsTrue(e.IsUnpublishingCulture(publishing, "fr-FR"));
             }
 
-            void OnPublished(IContentService sender, PublishEventArgs<IContent> e)
+            void OnPublished(IContentService sender, ContentPublishedEventArgs e)
             {
                 var published = e.PublishedEntities.First();
 
                 Assert.AreSame(document, published);
 
-                Assert.IsFalse(published.HasPublishedCulture("en-US"));
-                Assert.IsFalse(published.HasPublishedCulture("fr-FR"));
+                Assert.IsFalse(e.HasPublishedCulture(published, "en-US"));
+                Assert.IsFalse(e.HasPublishedCulture(published, "fr-FR"));
 
-                Assert.IsFalse(published.HasUnpublishedCulture("en-US"));
-                Assert.IsTrue(published.HasUnpublishedCulture("fr-FR"));
+                Assert.IsFalse(e.HasUnpublishedCulture(published, "en-US"));
+                Assert.IsTrue(e.HasUnpublishedCulture(published, "fr-FR"));
             }
 
             document.UnpublishCulture("fr-FR");
 
             ContentService.Publishing += OnPublishing;
             ContentService.Published += OnPublished;
-            contentService.SavePublishing(document);
+            contentService.CommitDocumentChanges(document);
             ContentService.Publishing -= OnPublishing;
             ContentService.Published -= OnPublished;
 
-            document = (Content) contentService.GetById(document.Id);
+            document = contentService.GetById(document.Id);
 
-            // ensure it works and does not throw
-            Assert.IsFalse(document.WasCulturePublished("fr-FR"));
-            Assert.IsTrue(document.WasCulturePublished("en-US"));
             Assert.IsFalse(document.IsCulturePublished("fr-FR"));
             Assert.IsTrue(document.IsCulturePublished("en-US"));
         }

From 3b60ffeb28aafcea53641776aaa2e6cdb2e9bb8f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 16:27:19 +1100
Subject: [PATCH 300/421] fixes test

---
 src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
index dbdac1f91f81..af894bee5e3c 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
@@ -56,6 +56,7 @@ public MemberMapperProfile(
                 .ForMember(dest => dest.FailedPasswordAttempts, opt => opt.Ignore())
                 .ForMember(dest => dest.DeleteDate, opt => opt.Ignore())
                 .ForMember(dest => dest.WriterId, opt => opt.Ignore())
+                .ForMember(dest => dest.VersionId, opt => opt.Ignore())
                 // TODO: Support these eventually
                 .ForMember(dest => dest.PasswordQuestion, opt => opt.Ignore())
                 .ForMember(dest => dest.RawPasswordAnswerValue, opt => opt.Ignore());

From 1bbb9c2b6e939e7ba93359f448b7a49e503b1ba5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 16:43:04 +1100
Subject: [PATCH 301/421] updates to latest newtonsoft

---
 build/NuSpecs/UmbracoCms.Core.nuspec         |  2 +-
 src/Umbraco.Core/Umbraco.Core.csproj         |  2 +-
 src/Umbraco.Examine/Umbraco.Examine.csproj   |  2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj       |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj     |  2 +-
 src/Umbraco.Web.UI/web.Template.Debug.config | 11 +++++++++++
 src/Umbraco.Web.UI/web.Template.config       |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj           |  2 +-
 8 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 9758c05dd6d0..8140e090c0ae 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -28,7 +28,7 @@
             <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.6,5.999999)" />
             <dependency id="Microsoft.Owin" version="[4.0.0,4.999999)" />
             <dependency id="MiniProfiler" version="[3.2.0.157,3.999999)" />
-            <dependency id="Newtonsoft.Json" version="[11.0.2,11.999999)" />
+            <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
             <dependency id="Semver" version="[2.0.4,2.999999)" />
             <dependency id="Serilog" version="[2.7.1,2.999999)" />
             <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 792f1d1223f4..274f71bc3872 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -69,7 +69,7 @@
       <Version>4.0.0</Version>
     </PackageReference>
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="Serilog">
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 1320f3b0d2a1..989afd8d1ced 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -49,7 +49,7 @@
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
     <PackageReference Include="Examine" Version="1.0.0-beta078" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 41c95811316b..b58f8805225d 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -105,7 +105,7 @@
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Owin" Version="1.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.11.0" />
     <PackageReference Include="Semver" Version="2.0.4" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7c3293183ddb..9eee662c8955 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -103,7 +103,7 @@
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.0" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
       <Version>8.0.0-alpha.36</Version>
     </PackageReference>
diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index 8c4b3bb299e0..ef9fda896494 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -25,4 +25,15 @@
         <compilation debug="true" xdt:Transform="SetAttributes(debug)" />
     </system.web>
 
+     <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
+                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+
 </configuration>
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index d93089fe21da..703a53186108 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -231,7 +231,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f9fa29f7db83..3e310c96b979 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.0" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />

From 50d1b9ddfdac5e7e49bb81b4c9c40e1d7c7bad5d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 16:53:15 +1100
Subject: [PATCH 302/421] Latest MVC, WebApi, Owin and Signalr

---
 src/Umbraco.Core/Umbraco.Core.csproj         |  4 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj       | 20 ++++----
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj     |  8 +--
 src/Umbraco.Web.UI/web.Template.Debug.config | 51 ++++++++++++++++++++
 src/Umbraco.Web.UI/web.Template.config       | 12 ++---
 src/Umbraco.Web/Umbraco.Web.csproj           | 12 ++---
 6 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 274f71bc3872..a235e503dd51 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -63,10 +63,10 @@
       <Version>2.2.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client">
-      <Version>5.2.6</Version>
+      <Version>5.2.7</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Owin">
-      <Version>4.0.0</Version>
+      <Version>4.0.1</Version>
     </PackageReference>
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index b58f8805225d..332e922703a1 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -89,16 +89,16 @@
     <PackageReference Include="Lucene.Net" Version="3.0.3" />
     <PackageReference Include="Lucene.Net.Contrib" Version="3.0.3" />
     <PackageReference Include="Microsoft.AspNet.Identity.Core" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.SelfHost" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.6" />
-    <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Security" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.0" />
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.SelfHost" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.7" />
+    <PackageReference Include="Microsoft.Owin" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Owin.Security" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Moq" Version="4.8.2" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 9eee662c8955..72fe0b7e1fd3 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -91,8 +91,8 @@
     <PackageReference Include="ImageProcessor.Web" Version="4.9.3.25" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.4.1.19" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.6" />
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.7" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
     <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="2.0.1" />
     <PackageReference Include="Microsoft.Net.Compilers" Version="2.10.0">
@@ -100,8 +100,8 @@
       <!-- development dependency -->
     </PackageReference>
     <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index ef9fda896494..cfc38814a6c5 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -27,12 +27,63 @@
 
      <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
             <dependentAssembly xdt:Transform="Remove"
                                xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/>
             <dependentAssembly xdt:Transform="Insert">
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
                 <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
             </dependentAssembly>
+
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+            </dependentAssembly>
+
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+            </dependentAssembly>
+
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security.Cookies']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+            </dependentAssembly>
+
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security.OAuth']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+            </dependentAssembly>
+
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Http']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+            </dependentAssembly>
+
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Mvc']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+            </dependentAssembly>
+
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Mvc']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+            </dependentAssembly>
+
         </assemblyBinding>
     </runtime>
 
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 703a53186108..b977dddc6cc5 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -215,19 +215,19 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -239,11 +239,11 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3e310c96b979..681713afa59c 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -74,13 +74,13 @@
     <PackageReference Include="LightInject.WebApi" Version="2.0.0" />
     <PackageReference Include="Markdown" Version="2.2.1" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.SignalR.Core" Version="2.2.3" />
-    <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.6" />
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNet.SignalR.Core" Version="2.4.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
     <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />

From 33bc979cfc57a4a63d5f46171ec57dd6aa691603 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 17:03:23 +1100
Subject: [PATCH 303/421] Fixes binding of FormDataCollection for GET requests
 which fixes the compatibility with the latest WebApi 5.2.7 version (cherry
 picked from https://github.com/umbraco/Umbraco-CMS/pull/3851), fixes a
 binding redirect

---
 src/Umbraco.Web.UI/web.Template.Debug.config  |  7 +++
 src/Umbraco.Web.UI/web.Template.config        |  4 ++
 src/Umbraco.Web/Editors/EntityController.cs   |  4 +-
 .../Trees/ApplicationTreeController.cs        |  4 +-
 .../Trees/ContentTreeControllerBase.cs        |  4 +-
 src/Umbraco.Web/Trees/MemberTreeController.cs |  4 +-
 src/Umbraco.Web/Trees/TreeControllerBase.cs   | 14 +++---
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 .../Filters/HttpQueryStringFilterAttribute.cs | 43 -------------------
 .../Filters/HttpQueryStringModelBinder.cs     | 32 ++++++++++++++
 10 files changed, 57 insertions(+), 61 deletions(-)
 delete mode 100644 src/Umbraco.Web/WebApi/Filters/HttpQueryStringFilterAttribute.cs
 create mode 100644 src/Umbraco.Web/WebApi/Filters/HttpQueryStringModelBinder.cs

diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index cfc38814a6c5..ff42f098f739 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -84,6 +84,13 @@
                 <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
             </dependentAssembly>
 
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Net.Http.Formatting']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+            </dependentAssembly>
+
         </assemblyBinding>
     </runtime>
 
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index b977dddc6cc5..f0abbfde5247 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -249,6 +249,10 @@
                 <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
             </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 55604e0eb922..d89909d793b6 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -14,6 +14,7 @@
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using System.Web.Http.Controllers;
+using System.Web.Http.ModelBinding;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
@@ -605,8 +606,7 @@ public PagedResult<EntityBasic> GetPagedDescendants(
             }
         }
 
-        [HttpQueryStringFilter("queryStrings")]
-        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, FormDataCollection queryStrings)
+        public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
         {
             return GetResultForAncestors(id, type, queryStrings);
         }
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 68d7fbb3fd5a..162d001e9626 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -50,8 +49,7 @@ public ApplicationTreeController(IGlobalSettings globalSettings, UmbracoContext
         /// <param name="queryStrings"></param>
         /// <param name="use">Tree use.</param>
         /// <returns></returns>
-        [HttpQueryStringFilter("queryStrings")]
-        public async Task<TreeRootNode> GetApplicationTrees(string application, string tree, FormDataCollection queryStrings, TreeUse use = TreeUse.Main)
+        public async Task<TreeRootNode> GetApplicationTrees(string application, string tree, [System.Web.Http.ModelBinding.ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings, TreeUse use = TreeUse.Main)
         {
             application = application.CleanForXss();
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index ca2f2031bb8f..e521deca405e 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -14,6 +14,7 @@
 using Umbraco.Web.WebApi.Filters;
 using System.Globalization;
 using Umbraco.Core.Models.Entities;
+using System.Web.Http.ModelBinding;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Composing;
 
@@ -30,8 +31,7 @@ public abstract class ContentTreeControllerBase : TreeController
         /// <param name="id"></param>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
-        [HttpQueryStringFilter("queryStrings")]
-        public TreeNode GetTreeNode(string id, FormDataCollection queryStrings)
+        public TreeNode GetTreeNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
         {
             int asInt;
             Guid asGuid = Guid.Empty;
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index 430c5d21114e..6107540c0c79 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -5,6 +5,7 @@
 using System.Net.Http;
 using System.Net.Http.Formatting;
 using System.Web.Http;
+using System.Web.Http.ModelBinding;
 using System.Web.Security;
 using Umbraco.Core;
 using Umbraco.Core.Models;
@@ -49,8 +50,7 @@ public MemberTreeController(UmbracoTreeSearcher treeSearcher)
         /// <param name="id"></param>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
-        [HttpQueryStringFilter("queryStrings")]
-        public TreeNode GetTreeNode(string id, FormDataCollection queryStrings)
+        public TreeNode GetTreeNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
         {
             var node = GetSingleTreeNode(id, queryStrings);
 
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index e3946ce532e2..f7c2b2460e88 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Net.Http.Formatting;
+using System.Web.Http.ModelBinding;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -45,7 +46,7 @@ protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbr
         /// We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom data from the front-end
         /// to the back end to be used in the query for model data.
         /// </remarks>
-        protected abstract TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings);
+        protected abstract TreeNodeCollection GetTreeNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings);
 
         /// <summary>
         /// Returns the menu structure for the node
@@ -53,7 +54,7 @@ protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbr
         /// <param name="id"></param>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
-        protected abstract MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings);
+        protected abstract MenuItemCollection GetMenuForNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings);
 
         /// <summary>
         /// The name to display on the root node
@@ -86,8 +87,7 @@ protected TreeControllerBase(IGlobalSettings globalSettings, UmbracoContext umbr
         /// </summary>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
-        [HttpQueryStringFilter("queryStrings")]
-        public TreeNode GetRootNode(FormDataCollection queryStrings)
+        public TreeNode GetRootNode([ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
         {
             if (queryStrings == null) queryStrings = new FormDataCollection("");
             var node = CreateRootNode(queryStrings);
@@ -126,8 +126,7 @@ public TreeNode GetRootNode(FormDataCollection queryStrings)
         /// We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom data from the front-end
         /// to the back end to be used in the query for model data.
         /// </remarks>
-        [HttpQueryStringFilter("queryStrings")]
-        public TreeNodeCollection GetNodes(string id, FormDataCollection queryStrings)
+        public TreeNodeCollection GetNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
         {
             if (queryStrings == null) queryStrings = new FormDataCollection("");
             var nodes = GetTreeNodes(id, queryStrings);
@@ -158,8 +157,7 @@ public TreeNodeCollection GetNodes(string id, FormDataCollection queryStrings)
         /// <param name="id"></param>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
-        [HttpQueryStringFilter("queryStrings")]
-        public MenuItemCollection GetMenu(string id, FormDataCollection queryStrings)
+        public MenuItemCollection GetMenu(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings)
         {
             if (queryStrings == null) queryStrings = new FormDataCollection("");
             var menu = GetMenuForNode(id, queryStrings);
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 681713afa59c..0dc0845ee5d9 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -284,6 +284,7 @@
     <Compile Include="JavaScript\ClientDependencyConfiguration.cs" />
     <Compile Include="Editors\Binders\BlueprintItemBinder.cs" />
     <Compile Include="UmbracoApplicationBase.cs" />
+    <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
     <Compile Include="WebApi\HttpActionContextExtensions.cs" />
     <Compile Include="Models\ContentEditing\IContentSave.cs" />
     <Compile Include="WebApi\SerializeVersionAttribute.cs" />
@@ -1058,7 +1059,6 @@
     <Compile Include="WebApi\Filters\FileUploadCleanupFilterAttribute.cs" />
     <Compile Include="WebApi\Filters\FilterAllowedOutgoingContentAttribute.cs" />
     <Compile Include="WebApi\Filters\FilterAllowedOutgoingMediaAttribute.cs" />
-    <Compile Include="WebApi\Filters\HttpQueryStringFilterAttribute.cs" />
     <Compile Include="WebApi\Filters\OutgoingDateTimeFormatAttribute.cs" />
     <Compile Include="WebApi\Filters\UmbracoApplicationAuthorizeAttribute.cs" />
     <Compile Include="WebApi\GuidNoHyphenConverter.cs" />
diff --git a/src/Umbraco.Web/WebApi/Filters/HttpQueryStringFilterAttribute.cs b/src/Umbraco.Web/WebApi/Filters/HttpQueryStringFilterAttribute.cs
deleted file mode 100644
index eea4ef7e678e..000000000000
--- a/src/Umbraco.Web/WebApi/Filters/HttpQueryStringFilterAttribute.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http.Formatting;
-using System.Web.Http.Controllers;
-using System.Web.Http.Filters;
-
-namespace Umbraco.Web.WebApi.Filters
-{
-    /// <summary>
-    /// Allows an Action to execute with an arbitrary number of QueryStrings
-    /// </summary>
-    /// <remarks>
-    /// Just like you can POST an arbitrary number of parameters to an Action, you can't GET an arbitrary number
-    /// but this will allow you to do it
-    /// </remarks>
-    public sealed class HttpQueryStringFilterAttribute : ActionFilterAttribute
-    {
-        public string ParameterName { get; private set; }
-
-        public HttpQueryStringFilterAttribute(string parameterName)
-        {
-            if (string.IsNullOrEmpty(parameterName))
-                throw new ArgumentException("ParameterName is required.");
-            ParameterName = parameterName;
-        }
-
-        public override void OnActionExecuting(HttpActionContext actionContext)
-        {
-            //get the query strings from the request properties
-            if (actionContext.Request.Properties.ContainsKey("MS_QueryNameValuePairs"))
-            {
-                var queryStrings = actionContext.Request.Properties["MS_QueryNameValuePairs"] as IEnumerable<KeyValuePair<string, string>>;
-                if (queryStrings == null) return;
-
-                var formData = new FormDataCollection(queryStrings);
-
-                actionContext.ActionArguments[ParameterName] = formData;
-            }
-
-            base.OnActionExecuting(actionContext);
-        }
-    }
-}
diff --git a/src/Umbraco.Web/WebApi/Filters/HttpQueryStringModelBinder.cs b/src/Umbraco.Web/WebApi/Filters/HttpQueryStringModelBinder.cs
new file mode 100644
index 000000000000..6ffbb239f892
--- /dev/null
+++ b/src/Umbraco.Web/WebApi/Filters/HttpQueryStringModelBinder.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Net.Http.Formatting;
+using System.Web.Http.Controllers;
+using System.Web.Http.ModelBinding;
+
+namespace Umbraco.Web.WebApi.Filters
+{
+    /// <summary>
+    /// Allows an Action to execute with an arbitrary number of QueryStrings
+    /// </summary>
+    /// <remarks>
+    /// Just like you can POST an arbitrary number of parameters to an Action, you can't GET an arbitrary number
+    /// but this will allow you to do it
+    /// </remarks>
+    public sealed class HttpQueryStringModelBinder : IModelBinder
+    {
+        public bool BindModel(HttpActionContext actionContext, ModelBindingContext bindingContext)
+        {
+            //get the query strings from the request properties
+            if (actionContext.Request.Properties.ContainsKey("MS_QueryNameValuePairs"))
+            {
+                if (actionContext.Request.Properties["MS_QueryNameValuePairs"] is IEnumerable<KeyValuePair<string, string>> queryStrings)
+                {
+                    var formData = new FormDataCollection(queryStrings);
+                    bindingContext.Model = formData;
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file

From 5bf0b143d9eaa1ff169ecdfa67565553c8970f5f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 17:08:47 +1100
Subject: [PATCH 304/421] another owin update and nuspec fix

---
 build/NuSpecs/UmbracoCms.Core.nuspec     |  4 ++--
 build/NuSpecs/UmbracoCms.Web.nuspec      | 12 ++++++------
 build/NuSpecs/UmbracoCms.nuspec          |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj       |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 8140e090c0ae..67d1eb86d7be 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -25,8 +25,8 @@
             <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
             <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
             <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
-            <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.6,5.999999)" />
-            <dependency id="Microsoft.Owin" version="[4.0.0,4.999999)" />
+            <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
+            <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
             <dependency id="MiniProfiler" version="[3.2.0.157,3.999999)" />
             <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
             <dependency id="Semver" version="[2.0.4,2.999999)" />
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index fabd1e25a8d9..140284e29cdb 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -32,12 +32,12 @@
             <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
             <dependency id="Markdown" version="[2.2.1,2.999999)" />
             <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
-            <dependency id="Microsoft.AspNet.Mvc" version="[5.2.6,5.999999)" />
-            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3,2.999999)" />
-            <dependency id="Microsoft.AspNet.WebApi" version="[5.2.6,5.999999)" />
-            <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0,4.999999)" />
-            <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0,4.999999)" />
-            <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0,4.999999)" />
+            <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7,5.999999)" />
+            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0,2.999999)" />
+            <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7,5.999999)" />
+            <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
+            <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
+            <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
             <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.999999)" />
         </dependencies>
     </metadata>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index b0f30b9779fd..238dfd3c31b8 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -21,7 +21,7 @@
               the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
-            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
+            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
             <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.36]" />
             <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
             <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 72fe0b7e1fd3..a72434db4261 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -99,7 +99,7 @@
       <PrivateAssets>all</PrivateAssets>
       <!-- development dependency -->
     </PackageReference>
-    <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0dc0845ee5d9..af6c012c6964 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -78,7 +78,7 @@
     <PackageReference Include="Microsoft.AspNet.SignalR.Core" Version="2.4.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.7" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
-    <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />

From b82dde240be8030eacefc95563185a9ab3777ea7 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 6 Feb 2019 08:07:04 +0100
Subject: [PATCH 305/421] #4302 - Bugfixes for media validation.

---
 .../src/views/media/media.edit.controller.js                    | 2 +-
 .../Editors/Filters/MediaItemSaveValidationAttribute.cs         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index 175007e9ad4c..1f898230ac6f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -194,7 +194,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
 
                     contentEditingHelper.handleSaveError({
                         err: err,
-                        redirectOnError: !infiniteMode,
+                        redirectOnFailure: !infiniteMode,
                         rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data)
                     });
                     
diff --git a/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
index 36bab16ed103..eda2bb8d53b5 100644
--- a/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
@@ -45,7 +45,7 @@ public override void OnActionExecuting(HttpActionContext actionContext)
             {
                 //now do each validation step
                 if (contentItemValidator.ValidateExistingContent(model, actionContext))
-                    if (!contentItemValidator.ValidateProperties(model, model, actionContext))
+                    if (contentItemValidator.ValidateProperties(model, model, actionContext))
                         contentItemValidator.ValidatePropertyData(model, model, model.PropertyCollectionDto, actionContext.ModelState);
             }
         }

From 48531c6193bec465033e045662c2d71dc42c094f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 6 Feb 2019 08:07:50 +0100
Subject: [PATCH 306/421] #4302 - Sets the default values for Media File and
 Image File as mandatory

---
 src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index ef550481220a..7f7229ccd6bd 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -69,7 +69,7 @@ public void InitializeBaseData(string tableName)
 
             if (tableName.Equals(Constants.DatabaseSchema.Tables.RelationType))
                 CreateRelationTypeData();
-            
+
             if (tableName.Equals(Constants.DatabaseSchema.Tables.KeyValue))
                 CreateKeyValueData();
 
@@ -210,12 +210,12 @@ private void CreatePropertyTypeGroupData()
 
         private void CreatePropertyTypeData()
         {
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 6, UniqueId = 6.ToGuid(), DataTypeId = 1043, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.File, Name = "Upload image", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 6, UniqueId = 6.ToGuid(), DataTypeId = 1043, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.File, Name = "Upload image", SortOrder = 0, Mandatory = true, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 7, UniqueId = 7.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Width, Name = "Width", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in pixels", Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 8, UniqueId = 8.ToGuid(), DataTypeId = Constants.DataTypes.LabelInt, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Height, Name = "Height", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in pixels", Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 9, UniqueId = 9.ToGuid(), DataTypeId = Constants.DataTypes.LabelBigint, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in bytes", Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 10, UniqueId = 10.ToGuid(), DataTypeId = -92, ContentTypeId = 1032, PropertyTypeGroupId = 3, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
-            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 24, UniqueId = 24.ToGuid(), DataTypeId = -90, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.File, Name = "Upload file", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 24, UniqueId = 24.ToGuid(), DataTypeId = -90, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.File, Name = "Upload file", SortOrder = 0, Mandatory = true, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 25, UniqueId = 25.ToGuid(), DataTypeId = -92, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Extension, Name = "Type", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
             _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 26, UniqueId = 26.ToGuid(), DataTypeId = Constants.DataTypes.LabelBigint, ContentTypeId = 1033, PropertyTypeGroupId = 4, Alias = Constants.Conventions.Media.Bytes, Name = "Size", SortOrder = 0, Mandatory = false, ValidationRegExp = null, Description = "in bytes", Variations = (byte) ContentVariation.Nothing });
             //membership property types

From 4b9a13c3a1a65f8e86f2994298e9902b067318d1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 19:04:52 +1100
Subject: [PATCH 307/421] Updates mini profiler

---
 build/NuSpecs/UmbracoCms.Core.nuspec          |  2 +-
 .../Configuration/GlobalSettings.cs           |  2 +-
 .../Persistence/DbConnectionExtensions.cs     |  2 +-
 .../Persistence/NPocoDatabaseExtensions.cs    |  2 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +-
 .../TestHelpers/Stubs/TestProfiler.cs         | 13 +++--
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  2 +-
 src/Umbraco.Web/Logging/WebProfiler.cs        | 25 +++++++---
 .../Logging/WebProfilerProvider.cs            | 50 +++++++++----------
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 11 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 67d1eb86d7be..c5e891bd01eb 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -27,7 +27,7 @@
             <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
             <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
             <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
-            <dependency id="MiniProfiler" version="[3.2.0.157,3.999999)" />
+            <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
             <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
             <dependency id="Semver" version="[2.0.4,2.999999)" />
             <dependency id="Serilog" version="[2.7.1,2.999999)" />
diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index e30bf85fd066..1c8188e99fa8 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -31,7 +31,7 @@ public class GlobalSettings : IGlobalSettings
         private static string _reservedPaths;
         private static string _reservedUrls;
         //ensure the built on (non-changeable) reserved paths are there at all times
-        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,"; //must end with a comma!
+        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/"; //must end with a comma!
         internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
         #endregion
 
diff --git a/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs b/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs
index 20586cb6f4a3..835f76f9f905 100644
--- a/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs
+++ b/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs
@@ -76,7 +76,7 @@ internal static IDbConnection UnwrapUmbraco(this IDbConnection connection)
             do
             {
                 c = unwrapped;
-                if (unwrapped is ProfiledDbConnection profiled) unwrapped = profiled.InnerConnection;
+                if (unwrapped is ProfiledDbConnection profiled) unwrapped = profiled.WrappedConnection;
                 if (unwrapped is RetryDbConnection retrying) unwrapped = retrying.Inner;
 
             } while (c != unwrapped);
diff --git a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
index 248f91284f49..bb4c60a0df1e 100644
--- a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
+++ b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
@@ -148,7 +148,7 @@ private static TConnection GetTypedConnection<TConnection>(IDbConnection connect
             where TConnection : class, IDbConnection
         {
             var profiled = connection as ProfiledDbConnection;
-            return profiled == null ? connection as TConnection : profiled.InnerConnection as TConnection;
+            return profiled == null ? connection as TConnection : profiled.WrappedConnection as TConnection;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index a235e503dd51..e77cacbba2dc 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -68,7 +68,7 @@
     <PackageReference Include="Microsoft.Owin">
       <Version>4.0.1</Version>
     </PackageReference>
-    <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
+    <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="Semver" Version="2.0.4" />
diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestProfiler.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestProfiler.cs
index 0ffcfb7a3ffb..39cac6e24fac 100644
--- a/src/Umbraco.Tests/TestHelpers/Stubs/TestProfiler.cs
+++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestProfiler.cs
@@ -33,15 +33,20 @@ public void Start()
         {
             if (_enabled == false) return;
 
-            MiniProfiler.Settings.SqlFormatter = new SqlServerFormatter();
-            MiniProfiler.Settings.StackMaxLength = 5000;
-            MiniProfiler.Start();
+            //see https://miniprofiler.com/dotnet/AspDotNet
+            MiniProfiler.Configure(new MiniProfilerOptions
+            {
+                SqlFormatter = new SqlServerFormatter(),
+                StackMaxLength = 5000,
+            });
+            
+            MiniProfiler.StartNew();
         }
 
         public void Stop(bool discardResults = false)
         {
             if (_enabled)
-                MiniProfiler.Stop(discardResults);
+                MiniProfiler.Current.Stop(discardResults);
         }
     }
 }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 332e922703a1..5d056ee0f8a3 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -100,7 +100,7 @@
     <PackageReference Include="Microsoft.Owin.Security" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
-    <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
+    <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="NUnit" Version="3.10.1" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index a72434db4261..0ce5e97c0aac 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -102,7 +102,7 @@
     <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
-    <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
+    <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
       <Version>8.0.0-alpha.36</Version>
diff --git a/src/Umbraco.Web/Logging/WebProfiler.cs b/src/Umbraco.Web/Logging/WebProfiler.cs
index e31ef75209cf..a98b71203806 100755
--- a/src/Umbraco.Web/Logging/WebProfiler.cs
+++ b/src/Umbraco.Web/Logging/WebProfiler.cs
@@ -11,6 +11,9 @@ namespace Umbraco.Web.Logging
     /// <summary>
     /// Implements <see cref="IProfiler"/> by using the MiniProfiler framework.
     /// </summary>
+    /// <remarks>
+    /// Profiling only runs when the app is in debug mode, see WebRuntime for how this gets created
+    /// </remarks>
     internal class WebProfiler : IProfiler
     {
         private const string BootRequestItemKey = "Umbraco.Core.Logging.WebProfiler__isBootRequest";
@@ -22,10 +25,13 @@ public WebProfiler()
             // create our own provider, which can provide a profiler even during boot
             _provider = new WebProfilerProvider();
 
-            // settings
-            MiniProfiler.Settings.SqlFormatter = new SqlServerFormatter();
-            MiniProfiler.Settings.StackMaxLength = 5000;
-            MiniProfiler.Settings.ProfilerProvider = _provider;
+            //see https://miniprofiler.com/dotnet/AspDotNet
+            MiniProfiler.Configure(new MiniProfilerOptions
+            {
+                SqlFormatter = new SqlServerFormatter(),
+                StackMaxLength = 5000, 
+                ProfilerProvider = _provider
+            });
         }
 
         public void UmbracoApplicationBeginRequest(object sender, EventArgs e)
@@ -68,29 +74,32 @@ private static bool ShouldProfile(object sender)
         /// <inheritdoc/>
         public string Render()
         {
-            return MiniProfiler.RenderIncludes(RenderPosition.Right).ToString();
+            return MiniProfiler.Current.RenderIncludes(RenderPosition.Left).ToString();
         }
 
         /// <inheritdoc/>
         public IDisposable Step(string name)
         {
-            return MiniProfiler.Current.Step(name);
+            return MiniProfiler.Current?.Step(name);
         }
 
         /// <inheritdoc/>
         public void Start()
         {
-            MiniProfiler.Start();
+            MiniProfiler.StartNew();
         }
 
         /// <inheritdoc/>
         public void Stop(bool discardResults = false)
         {
-            MiniProfiler.Stop(discardResults);
+            MiniProfiler.Current?.Stop(discardResults);
         }
 
         private static Attempt<HttpRequestBase> TryGetRequest(object sender)
         {
+            if (sender is HttpRequest httpRequest)
+                return Attempt<HttpRequestBase>.Succeed(new HttpRequestWrapper(httpRequest));
+
             var app = sender as HttpApplication;
             if (app == null) return Attempt<HttpRequestBase>.Fail();
 
diff --git a/src/Umbraco.Web/Logging/WebProfilerProvider.cs b/src/Umbraco.Web/Logging/WebProfilerProvider.cs
index 7b12c2f5bded..dbb81cf232ec 100755
--- a/src/Umbraco.Web/Logging/WebProfilerProvider.cs
+++ b/src/Umbraco.Web/Logging/WebProfilerProvider.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Web;
 using StackExchange.Profiling;
+using StackExchange.Profiling.Internal;
 
 namespace Umbraco.Web.Logging
 {
@@ -13,7 +14,7 @@ namespace Umbraco.Web.Logging
     /// Once the boot phase is changed to BootPhase.BootRequest then the base class (default) provider will handle all
     /// profiling data and this sub class no longer performs any logic.
     /// </remarks>
-    internal class WebProfilerProvider : WebRequestProfilerProvider
+    internal class WebProfilerProvider : AspNetRequestProvider
     {
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
         private MiniProfiler _startupProfiler;
@@ -81,23 +82,16 @@ public void EndBootRequest()
         /// - assuming profiling is enabled, on every BeginRequest that should be profiled,
         /// - except for the very first one which is the boot request.</para>
         /// </remarks>
-        public override MiniProfiler Start(string sessionName = null)
+        public override MiniProfiler Start(string profilerName, MiniProfilerBaseOptions options)
         {
             var first = Interlocked.Exchange(ref _first, 1) == 0;
-            if (first == false) return base.Start(sessionName);
+            if (first == false) return base.Start(profilerName, options);
 
-            _startupProfiler = new MiniProfiler("http://localhost/umbraco-startup") { Name = "StartupProfiler" };
-            SetProfilerActive(_startupProfiler);
+            _startupProfiler = new MiniProfiler("StartupProfiler", options);
+            CurrentProfiler = _startupProfiler;
             return _startupProfiler;
         }
 
-        // obsolete but that's the one that's called ;-(
-        [Obsolete]
-        public override MiniProfiler Start(ProfileLevel level, string sessionName = null)
-        {
-            return Start(sessionName);
-        }
-
         /// <summary>
         /// Gets the current profiler.
         /// </summary>
@@ -105,23 +99,27 @@ public override MiniProfiler Start(ProfileLevel level, string sessionName = null
         /// If the boot phase is not Booted, then this will return the startup profiler (this), otherwise
         /// returns the base class
         /// </remarks>
-        public override MiniProfiler GetCurrentProfiler()
+        public override MiniProfiler CurrentProfiler
         {
-            // if not booting then just use base (fast)
-            // no lock, _bootPhase is volatile
-            if (_bootPhase == BootPhase.Booted)
-                return base.GetCurrentProfiler();
-
-            // else
-            try
-            {
-                var current = base.GetCurrentProfiler();
-                return current ?? _startupProfiler;
-            }
-            catch
+            get
             {
-                return _startupProfiler;
+                // if not booting then just use base (fast)
+                // no lock, _bootPhase is volatile
+                if (_bootPhase == BootPhase.Booted)
+                    return base.CurrentProfiler;
+
+                // else
+                try
+                {
+                    var current = base.CurrentProfiler;
+                    return current ?? _startupProfiler;
+                }
+                catch
+                {
+                    return _startupProfiler;
+                }
             }
+            
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index af6c012c6964..8e13d3343322 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -81,7 +81,7 @@
     <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.1" />
-    <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
+    <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="Semver" Version="2.0.4" />

From b4bf1cb01ce1a93d23af831eee30c7993856a8d4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 19:58:56 +1100
Subject: [PATCH 308/421] puts the profiler back to the right

---
 src/Umbraco.Web/Logging/WebProfiler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Logging/WebProfiler.cs b/src/Umbraco.Web/Logging/WebProfiler.cs
index a98b71203806..14c1bb065ffc 100755
--- a/src/Umbraco.Web/Logging/WebProfiler.cs
+++ b/src/Umbraco.Web/Logging/WebProfiler.cs
@@ -74,7 +74,7 @@ private static bool ShouldProfile(object sender)
         /// <inheritdoc/>
         public string Render()
         {
-            return MiniProfiler.Current.RenderIncludes(RenderPosition.Left).ToString();
+            return MiniProfiler.Current.RenderIncludes(RenderPosition.Right).ToString();
         }
 
         /// <inheritdoc/>

From 0947a1a109aca25a624bf3ac5a07b0afa6eea351 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 21:14:50 +1100
Subject: [PATCH 309/421] Automapper upgraded

---
 build/NuSpecs/UmbracoCms.Core.nuspec          |  2 +-
 build/NuSpecs/UmbracoCms.Web.nuspec           |  1 -
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +-
 .../Models/Mapping/AutoMapper6Tests.cs        |  6 +--
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  2 +-
 .../Models/Mapping/CodeFileMapperProfile.cs   |  2 +-
 .../Models/Mapping/ContentMapperProfile.cs    | 40 +++++++++----------
 .../Mapping/ContentPropertyMapperProfile.cs   |  2 +-
 .../Mapping/ContentTypeMapperProfile.cs       |  4 +-
 .../Mapping/ContentTypeProfileExtensions.cs   | 10 ++---
 .../Models/Mapping/DataTypeMapperProfile.cs   | 12 +++---
 .../Models/Mapping/EntityMapperProfile.cs     | 26 ++++++------
 .../Models/Mapping/LanguageMapperProfile.cs   |  2 +-
 .../Models/Mapping/MacroMapperProfile.cs      |  6 +--
 .../Models/Mapping/MediaMapperProfile.cs      | 22 +++++-----
 .../Models/Mapping/MemberMapperProfile.cs     | 28 ++++++-------
 .../Models/Mapping/UserMapperProfile.cs       | 18 ++++-----
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 19 files changed, 94 insertions(+), 95 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index c5e891bd01eb..60b91af7e6e8 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -20,7 +20,7 @@
               the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
-            <dependency id="AutoMapper" version="[7.0.1,7.999999)" />
+            <dependency id="AutoMapper" version="[8.0.0,8.999999)" />
             <dependency id="LightInject" version="[5.1.2,5.999999)" />
             <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
             <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 140284e29cdb..4ea0b7b07d0b 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -21,7 +21,6 @@
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
             <dependency id="UmbracoCms.Core" version="[$version$]" />
-            <dependency id="AutoMapper" version="[7.0.1,7.999999)" />
             <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
             <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
             <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e77cacbba2dc..9135c6bf9808 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -55,7 +55,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="AutoMapper" Version="7.0.1" />
+    <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="LightInject" Version="5.1.2" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Web" Version="2.0.0" />
diff --git a/src/Umbraco.Tests/Models/Mapping/AutoMapper6Tests.cs b/src/Umbraco.Tests/Models/Mapping/AutoMapper6Tests.cs
index 59c514f6544a..18bceaae49e6 100644
--- a/src/Umbraco.Tests/Models/Mapping/AutoMapper6Tests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/AutoMapper6Tests.cs
@@ -121,16 +121,16 @@ public ThingProfile(int ver)
                         break;
                     case 1:
                         map
-                            .ForMember(dest => dest.ValueString, opt => opt.ResolveUsing<MemberValueResolver, string>(src => src.ValueString));
+                            .ForMember(dest => dest.ValueString, opt => opt.MapFrom<MemberValueResolver, string>(src => src.ValueString));
                         break;
                     case 2:
                         map
-                            .ForMember(dest => dest.ValueString, opt => opt.ResolveUsing<ValueResolver>());
+                            .ForMember(dest => dest.ValueString, opt => opt.MapFrom<ValueResolver>());
                         break;
                     case 3:
                         // in most cases that should be perfectly enough?
                         map
-                            .ForMember(dest => dest.ValueString, opt => opt.ResolveUsing(source => "!!" + source.ValueString + "!!"));
+                            .ForMember(dest => dest.ValueString, opt => opt.MapFrom(source => "!!" + source.ValueString + "!!"));
                         break;
                     default:
                         throw new ArgumentOutOfRangeException(nameof(ver));
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 5d056ee0f8a3..8dfad73b8aab 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -78,7 +78,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="7.0.1" />
+    <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="Castle.Core" Version="4.2.1" />
     <PackageReference Include="Examine" Version="1.0.0-beta078" />
     <PackageReference Include="HtmlAgilityPack">
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 0ce5e97c0aac..1a4eeb3bbdc1 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -83,7 +83,7 @@
     <Folder Include="Views\MacroPartials\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="7.0.1" />
+    <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
diff --git a/src/Umbraco.Web/Models/Mapping/CodeFileMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/CodeFileMapperProfile.cs
index b3f5f0374c6b..563935676f7c 100644
--- a/src/Umbraco.Web/Models/Mapping/CodeFileMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/CodeFileMapperProfile.cs
@@ -14,7 +14,7 @@ public CodeFileMapperProfile()
                 .ForMember(dest => dest.Alias, opt => opt.MapFrom(sheet => sheet.Alias))
                 .ForMember(dest => dest.Key, opt => opt.MapFrom(sheet => sheet.Key))
                 .ForMember(dest => dest.Name, opt => opt.MapFrom(sheet => sheet.Name))
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Path, opt => opt.MapFrom(sheet => sheet.Path))
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
index 55b1672b2be5..652ac120146c 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
@@ -41,53 +41,53 @@ public ContentMapperProfile(
             //FROM IContent TO ContentItemDisplay
             CreateMap<IContent, ContentItemDisplay>()
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(src.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, src.Key)))
-                .ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => contentOwnerResolver.Resolve(src)))
-                .ForMember(dest => dest.Updater, opt => opt.ResolveUsing(src => creatorResolver.Resolve(src)))
-                .ForMember(dest => dest.Variants, opt => opt.ResolveUsing(variantResolver))
-                .ForMember(dest => dest.ContentApps, opt => opt.ResolveUsing(contentAppResolver))
+                .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => contentOwnerResolver.Resolve(src)))
+                .ForMember(dest => dest.Updater, opt => opt.MapFrom(src => creatorResolver.Resolve(src)))
+                .ForMember(dest => dest.Variants, opt => opt.MapFrom(variantResolver))
+                .ForMember(dest => dest.ContentApps, opt => opt.MapFrom(contentAppResolver))
                 .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon))
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
                 .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(src => src.ContentType.Name))
                 .ForMember(dest => dest.IsContainer, opt => opt.MapFrom(src => src.ContentType.IsContainer))
                 .ForMember(dest => dest.IsElement, opt => opt.MapFrom(src => src.ContentType.IsElement))
                 .ForMember(dest => dest.IsBlueprint, opt => opt.MapFrom(src => src.Blueprint))
-                .ForMember(dest => dest.IsChildOfListView, opt => opt.ResolveUsing(childOfListViewResolver))
+                .ForMember(dest => dest.IsChildOfListView, opt => opt.MapFrom(childOfListViewResolver))
                 .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed))
-                .ForMember(dest => dest.TemplateAlias, opt => opt.ResolveUsing(defaultTemplateResolver))
-                .ForMember(dest => dest.Urls, opt => opt.ResolveUsing(contentUrlResolver))
+                .ForMember(dest => dest.TemplateAlias, opt => opt.MapFrom(defaultTemplateResolver))
+                .ForMember(dest => dest.Urls, opt => opt.MapFrom(contentUrlResolver))
                 .ForMember(dest => dest.AllowPreview, opt => opt.Ignore())
-                .ForMember(dest => dest.TreeNodeUrl, opt => opt.ResolveUsing(contentTreeNodeUrlResolver))
+                .ForMember(dest => dest.TreeNodeUrl, opt => opt.MapFrom(contentTreeNodeUrlResolver))
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Errors, opt => opt.Ignore())
-                .ForMember(dest => dest.DocumentType, opt => opt.ResolveUsing(contentTypeBasicResolver))
-                .ForMember(dest => dest.AllowedTemplates, opt => opt.ResolveUsing(allowedTemplatesResolver))
-                .ForMember(dest => dest.AllowedActions, opt => opt.ResolveUsing(src => actionButtonsResolver.Resolve(src)))
+                .ForMember(dest => dest.DocumentType, opt => opt.MapFrom(contentTypeBasicResolver))
+                .ForMember(dest => dest.AllowedTemplates, opt => opt.MapFrom(allowedTemplatesResolver))
+                .ForMember(dest => dest.AllowedActions, opt => opt.MapFrom(src => actionButtonsResolver.Resolve(src)))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
 
             CreateMap<IContent, ContentVariantDisplay>()
                 .ForMember(dest => dest.PublishDate, opt => opt.MapFrom(src => src.PublishDate))
-                .ForMember(dest => dest.ReleaseDate, opt => opt.ResolveUsing(schedPublishReleaseDateResolver))
-                .ForMember(dest => dest.ExpireDate, opt => opt.ResolveUsing(schedPublishExpireDateResolver))
+                .ForMember(dest => dest.ReleaseDate, opt => opt.MapFrom(schedPublishReleaseDateResolver))
+                .ForMember(dest => dest.ExpireDate, opt => opt.MapFrom(schedPublishExpireDateResolver))
                 .ForMember(dest => dest.Segment, opt => opt.Ignore())
                 .ForMember(dest => dest.Language, opt => opt.Ignore())
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
-                .ForMember(dest => dest.State, opt => opt.ResolveUsing<ContentSavedStateResolver<ContentPropertyDisplay>>())
-                .ForMember(dest => dest.Tabs, opt => opt.ResolveUsing(tabsAndPropertiesResolver));
+                .ForMember(dest => dest.State, opt => opt.MapFrom<ContentSavedStateResolver<ContentPropertyDisplay>>())
+                .ForMember(dest => dest.Tabs, opt => opt.MapFrom(tabsAndPropertiesResolver));
 
             //FROM IContent TO ContentItemBasic<ContentPropertyBasic, IContent>
             CreateMap<IContent, ContentItemBasic<ContentPropertyBasic>>()
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(src =>
                     Udi.Create(src.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, src.Key)))
-                .ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => contentOwnerResolver.Resolve(src)))
-                .ForMember(dest => dest.Updater, opt => opt.ResolveUsing(src => creatorResolver.Resolve(src)))
+                .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => contentOwnerResolver.Resolve(src)))
+                .ForMember(dest => dest.Updater, opt => opt.MapFrom(src => creatorResolver.Resolve(src)))
                 .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon))
                 .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed))
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
                 .ForMember(dest => dest.Alias, opt => opt.Ignore())
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
-                .ForMember(dest => dest.UpdateDate, opt => opt.ResolveUsing<UpdateDateResolver>())
-                .ForMember(dest => dest.Name, opt => opt.ResolveUsing<NameResolver>())
-                .ForMember(dest => dest.State, opt => opt.ResolveUsing<ContentBasicSavedStateResolver<ContentPropertyBasic>>())
+                .ForMember(dest => dest.UpdateDate, opt => opt.MapFrom<UpdateDateResolver>())
+                .ForMember(dest => dest.Name, opt => opt.MapFrom<NameResolver>())
+                .ForMember(dest => dest.State, opt => opt.MapFrom<ContentBasicSavedStateResolver<ContentPropertyBasic>>())
                 .ForMember(dest => dest.VariesByCulture, opt => opt.MapFrom(src => src.ContentType.VariesByCulture()));
 
             //FROM IContent TO ContentPropertyCollectionDto
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapperProfile.cs
index 0b086afb2d93..f9ed72fc116c 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapperProfile.cs
@@ -22,7 +22,7 @@ public ContentPropertyMapperProfile(IDataTypeService dataTypeService, ILocalized
             //FROM Property TO ContentPropertyBasic
             CreateMap<PropertyGroup, Tab<ContentPropertyDisplay>>()
                 .ForMember(tab => tab.Label, expression => expression.MapFrom(@group => @group.Name))
-                .ForMember(tab => tab.IsActive, expression => expression.UseValue(true))
+                .ForMember(tab => tab.IsActive, expression => expression.MapFrom(_ => true))
                 .ForMember(tab => tab.Properties, expression => expression.Ignore())
                 .ForMember(tab => tab.Alias, expression => expression.Ignore())
                 .ForMember(tab => tab.Expanded, expression => expression.Ignore());
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs
index 88bf409737f6..ee78c692ffc3 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs
@@ -153,7 +153,7 @@ public ContentTypeMapperProfile(PropertyEditorCollection propertyEditors, IDataT
 
             CreateMap<PropertyTypeBasic, PropertyType>()
 
-                .ConstructUsing(propertyTypeBasic =>
+                .ConstructUsing((propertyTypeBasic, context) =>
                 {
                     var dataType = dataTypeService.GetDataType(propertyTypeBasic.DataTypeId);
                     if (dataType == null) throw new NullReferenceException("No data type found with id " + propertyTypeBasic.DataTypeId);
@@ -168,7 +168,7 @@ public ContentTypeMapperProfile(PropertyEditorCollection propertyEditors, IDataT
                 .ForMember(dest => dest.PropertyEditorAlias, opt => opt.Ignore())
                 .ForMember(dest => dest.DeleteDate, opt => opt.Ignore())
 
-                .ForMember(dto => dto.Variations, opt => opt.ResolveUsing<PropertyTypeVariationsResolver>())
+                .ForMember(dto => dto.Variations, opt => opt.MapFrom<PropertyTypeVariationsResolver>())
 
                 //only map if it is actually set
                 .ForMember(dest => dest.Id, opt => opt.Condition(source => source.Id > 0))
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
index 0181fc25bef9..b44cafa28086 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
@@ -114,7 +114,7 @@ public static IMappingExpression<TSource, TDestination> MapBaseContentTypeSaveTo
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Errors, opt => opt.Ignore())
                 .ForMember(dest => dest.LockedCompositeContentTypes, opt => opt.Ignore())
-                .ForMember(dest => dest.Groups, opt => opt.ResolveUsing(src => propertyGroupDisplayResolver.Resolve(src)));
+                .ForMember(dest => dest.Groups, opt => opt.MapFrom(src => propertyGroupDisplayResolver.Resolve(src)));
         }
 
         public static IMappingExpression<TSource, TDestination> MapBaseContentTypeEntityToDisplay<TSource, TDestination, TPropertyTypeDisplay>(
@@ -129,7 +129,7 @@ public static IMappingExpression<TSource, TDestination> MapBaseContentTypeEntity
             var propertyTypeGroupResolver = new PropertyTypeGroupResolver<TPropertyTypeDisplay>(propertyEditors, dataTypeService);
 
             return mapping
-                .ForMember(dest => dest.Udi, opt => opt.ResolveUsing(src => contentTypeUdiResolver.Resolve(src)))
+                .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => contentTypeUdiResolver.Resolve(src)))
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Blueprints, opt => opt.Ignore())
                 .ForMember(dest => dest.Errors, opt => opt.Ignore())
@@ -140,8 +140,8 @@ public static IMappingExpression<TSource, TDestination> MapBaseContentTypeEntity
 
                 .ForMember(dest => dest.AllowedContentTypes, opt => opt.MapFrom(src => src.AllowedContentTypes.Select(x => x.Id.Value)))
                 .ForMember(dest => dest.CompositeContentTypes, opt => opt.MapFrom(src => src.ContentTypeComposition))
-                .ForMember(dest => dest.LockedCompositeContentTypes, opt => opt.ResolveUsing(src => lockedCompositionsResolver.Resolve(src)))
-                .ForMember(dest => dest.Groups, opt => opt.ResolveUsing(src => propertyTypeGroupResolver.Resolve(src)))
+                .ForMember(dest => dest.LockedCompositeContentTypes, opt => opt.MapFrom(src => lockedCompositionsResolver.Resolve(src)))
+                .ForMember(dest => dest.Groups, opt => opt.MapFrom(src => propertyTypeGroupResolver.Resolve(src)))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
         }
 
@@ -184,7 +184,7 @@ public static IMappingExpression<TSource, TDestination> MapBaseContentTypeSaveTo
             // ignore for members
             mapping = typeof(TDestination) == typeof(IMemberType)
                 ? mapping.ForMember(dto => dto.Variations, opt => opt.Ignore())
-                : mapping.ForMember(dto => dto.Variations, opt => opt.ResolveUsing<ContentTypeVariationsResolver<TSource, TSourcePropertyType, TDestination>>());
+                : mapping.ForMember(dto => dto.Variations, opt => opt.MapFrom<ContentTypeVariationsResolver<TSource, TSourcePropertyType, TDestination>>());
 
             mapping = mapping
                 .ForMember(
diff --git a/src/Umbraco.Web/Models/Mapping/DataTypeMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/DataTypeMapperProfile.cs
index 425e447c9cc3..f707003ffe26 100644
--- a/src/Umbraco.Web/Models/Mapping/DataTypeMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/DataTypeMapperProfile.cs
@@ -68,8 +68,8 @@ public DataTypeMapperProfile(PropertyEditorCollection propertyEditors, ILogger l
 
             CreateMap<IDataType, DataTypeDisplay>()
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.DataType, src.Key)))
-                .ForMember(dest => dest.AvailableEditors, opt => opt.ResolveUsing(src => availablePropertyEditorsResolver.Resolve(src)))
-                .ForMember(dest => dest.PreValues, opt => opt.ResolveUsing(src => configurationDisplayResolver.Resolve(src)))
+                .ForMember(dest => dest.AvailableEditors, opt => opt.MapFrom(src => availablePropertyEditorsResolver.Resolve(src)))
+                .ForMember(dest => dest.PreValues, opt => opt.MapFrom(src => configurationDisplayResolver.Resolve(src)))
                 .ForMember(dest => dest.SelectedEditor, opt => opt.MapFrom(src => src.EditorAlias.IsNullOrWhiteSpace() ? null : src.EditorAlias))
                 .ForMember(dest => dest.HasPrevalues, opt => opt.Ignore())
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
@@ -92,13 +92,13 @@ public DataTypeMapperProfile(PropertyEditorCollection propertyEditors, ILogger l
                   .ConvertUsing(src => configurationDisplayResolver.Resolve(src));
 
             CreateMap<DataTypeSave, IDataType>()
-                .ConstructUsing(src => new DataType(propertyEditors[src.EditorAlias]) {CreateDate = DateTime.Now})
+                .ConstructUsing(src => new DataType(propertyEditors[src.EditorAlias], -1) {CreateDate = DateTime.Now})
                 .IgnoreEntityCommonProperties()
                 .ForMember(dest => dest.Id, opt => opt.MapFrom(src => Convert.ToInt32(src.Id)))
                 .ForMember(dest => dest.Key, opt => opt.Ignore()) // ignore key, else resets UniqueId - U4-3911
                 .ForMember(dest => dest.Path, opt => opt.Ignore())
                 .ForMember(dest => dest.EditorAlias, opt => opt.MapFrom(src => src.EditorAlias))
-                .ForMember(dest => dest.DatabaseType, opt => opt.ResolveUsing(src => databaseTypeResolver.Resolve(src)))
+                .ForMember(dest => dest.DatabaseType, opt => opt.MapFrom(src => databaseTypeResolver.Resolve(src)))
                 .ForMember(dest => dest.CreatorId, opt => opt.Ignore())
                 .ForMember(dest => dest.Level, opt => opt.Ignore())
                 .ForMember(dest => dest.SortOrder, opt => opt.Ignore())
@@ -107,14 +107,14 @@ public DataTypeMapperProfile(PropertyEditorCollection propertyEditors, ILogger l
 
             //Converts a property editor to a new list of pre-value fields - used when creating a new data type or changing a data type with new pre-vals
             CreateMap<IDataEditor, IEnumerable<DataTypeConfigurationFieldDisplay>>()
-                .ConvertUsing(src =>
+                .ConvertUsing((dataEditor, configurationFieldDisplays) =>
                     {
                         // this is a new data type, initialize default configuration
                         // get the configuration editor,
                         // get the configuration fields and map to UI,
                         // get the configuration default values and map to UI
 
-                        var configurationEditor = src.GetConfigurationEditor();
+                        var configurationEditor = dataEditor.GetConfigurationEditor();
 
                         var fields = configurationEditor.Fields.Select(Mapper.Map<DataTypeConfigurationFieldDisplay>).ToArray();
 
diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
index 90e98822b156..ab3929166f31 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
@@ -25,7 +25,7 @@ public EntityMapperProfile()
             var contentTypeUdiResolver = new ContentTypeUdiResolver();
 
             CreateMap<IEntitySlim, EntityBasic>()
-                .ForMember(dest => dest.Name, opt => opt.ResolveUsing<NameResolver>())
+                .ForMember(dest => dest.Name, opt => opt.MapFrom<NameResolver>())
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(ObjectTypes.GetUdiType(src.NodeObjectType), src.Key)))
                 .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => GetContentTypeIcon(src)))
                 .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed))
@@ -42,17 +42,17 @@ public EntityMapperProfile()
 
             CreateMap<PropertyType, EntityBasic>()
                 .ForMember(dest => dest.Udi, opt => opt.Ignore())
-                .ForMember(dest => dest.Icon, opt => opt.UseValue("icon-box"))
-                .ForMember(dest => dest.Path, opt => opt.UseValue(""))
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-box"))
+                .ForMember(dest => dest.Path, opt => opt.MapFrom(_ => ""))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
 
             CreateMap<PropertyGroup, EntityBasic>()
                 .ForMember(dest => dest.Udi, opt => opt.Ignore())
-                .ForMember(dest => dest.Icon, opt => opt.UseValue("icon-tab"))
-                .ForMember(dest => dest.Path, opt => opt.UseValue(""))
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-tab"))
+                .ForMember(dest => dest.Path, opt => opt.MapFrom(_ => ""))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 //in v6 the 'alias' is it's lower cased name so we'll stick to that.
                 .ForMember(dest => dest.Alias, opt => opt.MapFrom(src => src.Name.ToLowerInvariant()))
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
@@ -60,18 +60,18 @@ public EntityMapperProfile()
 
             CreateMap<IUser, EntityBasic>()
                 .ForMember(dest => dest.Udi, opt => opt.Ignore())
-                .ForMember(dest => dest.Icon, opt => opt.UseValue("icon-user"))
-                .ForMember(dest => dest.Path, opt => opt.UseValue(""))
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-user"))
+                .ForMember(dest => dest.Path, opt => opt.MapFrom(_ => ""))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Alias, opt => opt.MapFrom(src => src.Username))
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
 
             CreateMap<ITemplate, EntityBasic>()
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.Template, src.Key)))
-               .ForMember(dest => dest.Icon, opt => opt.UseValue("icon-layout"))
+               .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-layout"))
                .ForMember(dest => dest.Path, opt => opt.MapFrom(src => src.Path))
-               .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+               .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                .ForMember(dest => dest.Trashed, opt => opt.Ignore())
                .ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
 
@@ -80,7 +80,7 @@ public EntityMapperProfile()
                 .ForMember(dest => dest.SortOrder, opt => opt.Ignore());
 
             CreateMap<IContentTypeComposition, EntityBasic>()
-                .ForMember(dest => dest.Udi, opt => opt.ResolveUsing(src => contentTypeUdiResolver.Resolve(src)))
+                .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => contentTypeUdiResolver.Resolve(src)))
                 .ForMember(dest => dest.Path, opt => opt.MapFrom(src => src.Path))
                 .ForMember(dest => dest.ParentId, opt => opt.MapFrom(src => src.ParentId))
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
diff --git a/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs
index 13c6af2fda4b..a838180622ee 100644
--- a/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs
@@ -17,7 +17,7 @@ public LanguageMapperProfile()
                 .ForMember(dest => dest.Name, opt => opt.MapFrom(x => x.CultureName))
                 .ForMember(dest => dest.Key, opt => opt.MapFrom(x => x.Key))
                 .ForMember(dest => dest.Alias, opt => opt.MapFrom(x => x.IsoCode))
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Path, opt => opt.Ignore())
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
index be1bcdefdc2c..3e0f6c733715 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
@@ -19,9 +19,9 @@ public MacroMapperProfile()
             //FROM IMacro TO EntityBasic
             CreateMap<IMacro, EntityBasic>()
                 .ForMember(x => x.Udi, expression => expression.MapFrom(content => Udi.Create(Constants.UdiEntityType.Macro, content.Key)))
-                  .ForMember(entityBasic => entityBasic.Icon, expression => expression.UseValue("icon-settings-alt"))
-                  .ForMember(dto => dto.ParentId, expression => expression.UseValue(-1))
-                  .ForMember(dto => dto.Path, expression => expression.ResolveUsing(macro => "-1," + macro.Id))
+                  .ForMember(entityBasic => entityBasic.Icon, expression => expression.MapFrom(_ => "icon-settings-alt"))
+                  .ForMember(dto => dto.ParentId, expression => expression.MapFrom(_ => -1))
+                  .ForMember(dto => dto.Path, expression => expression.MapFrom(macro => "-1," + macro.Id))
                   .ForMember(dto => dto.Trashed, expression => expression.Ignore())
                   .ForMember(dto => dto.AdditionalData, expression => expression.Ignore());
 
diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
index 7a8706edf20a..f5182f0b3b6e 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
@@ -35,37 +35,37 @@ public MediaMapperProfile(TabsAndPropertiesResolver<IMedia, MediaItemDisplay> ta
             //FROM IMedia TO MediaItemDisplay
             CreateMap<IMedia, MediaItemDisplay>()
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Media, content.Key)))
-                .ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => mediaOwnerResolver.Resolve(src)))
+                .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => mediaOwnerResolver.Resolve(src)))
                 .ForMember(dest => dest.Icon, opt => opt.MapFrom(content => content.ContentType.Icon))
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(content => content.ContentType.Alias))
-                .ForMember(dest => dest.IsChildOfListView, opt => opt.ResolveUsing(childOfListViewResolver))
+                .ForMember(dest => dest.IsChildOfListView, opt => opt.MapFrom(childOfListViewResolver))
                 .ForMember(dest => dest.Trashed, opt => opt.MapFrom(content => content.Trashed))
                 .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(content => content.ContentType.Name))
                 .ForMember(dest => dest.Properties, opt => opt.Ignore())
-                .ForMember(dest => dest.TreeNodeUrl, opt => opt.ResolveUsing(contentTreeNodeUrlResolver))
+                .ForMember(dest => dest.TreeNodeUrl, opt => opt.MapFrom(contentTreeNodeUrlResolver))
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Errors, opt => opt.Ignore())
-                .ForMember(dest => dest.State, opt => opt.UseValue<ContentSavedState?>(null))
+                .ForMember(dest => dest.State, opt => opt.MapFrom<ContentSavedState?>(_ => null))
                 .ForMember(dest => dest.Edited, opt => opt.Ignore())
                 .ForMember(dest => dest.Updater, opt => opt.Ignore())
                 .ForMember(dest => dest.Alias, opt => opt.Ignore())
                 .ForMember(dest => dest.IsContainer, opt => opt.Ignore())
-                .ForMember(dest => dest.Tabs, opt => opt.ResolveUsing(tabsAndPropertiesResolver))
+                .ForMember(dest => dest.Tabs, opt => opt.MapFrom(tabsAndPropertiesResolver))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
-                .ForMember(dest => dest.ContentType, opt => opt.ResolveUsing(mediaTypeBasicResolver))
-                .ForMember(dest => dest.MediaLink, opt => opt.ResolveUsing(content => string.Join(",", content.GetUrls(Current.Configs.Settings().Content, logger))))
-                .ForMember(dest => dest.ContentApps, opt => opt.ResolveUsing(mediaAppResolver))
+                .ForMember(dest => dest.ContentType, opt => opt.MapFrom(mediaTypeBasicResolver))
+                .ForMember(dest => dest.MediaLink, opt => opt.MapFrom(content => string.Join(",", content.GetUrls(Current.Configs.Settings().Content, logger))))
+                .ForMember(dest => dest.ContentApps, opt => opt.MapFrom(mediaAppResolver))
                 .ForMember(dest => dest.VariesByCulture, opt => opt.MapFrom(src => src.ContentType.VariesByCulture()));
 
 
             //FROM IMedia TO ContentItemBasic<ContentPropertyBasic, IMedia>
             CreateMap<IMedia, ContentItemBasic<ContentPropertyBasic>>()
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.Media, src.Key)))
-                .ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => mediaOwnerResolver.Resolve(src)))
+                .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => mediaOwnerResolver.Resolve(src)))
                 .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon))
                 .ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed))
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
-                .ForMember(dest => dest.State, opt => opt.UseValue<ContentSavedState?>(null))
+                .ForMember(dest => dest.State, opt => opt.MapFrom<ContentSavedState?>(_ => null))
                 .ForMember(dest => dest.Edited, opt => opt.Ignore())
                 .ForMember(dest => dest.Updater, opt => opt.Ignore())
                 .ForMember(dest => dest.Alias, opt => opt.Ignore())
@@ -76,7 +76,7 @@ public MediaMapperProfile(TabsAndPropertiesResolver<IMedia, MediaItemDisplay> ta
             //FROM IMedia TO ContentItemDto<IMedia>
             CreateMap<IMedia, ContentPropertyCollectionDto>();
             //.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(Constants.UdiEntityType.Media, src.Key)))
-            //.ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => mediaOwnerResolver.Resolve(src)))
+            //.ForMember(dest => dest.Owner, opt => opt.MapFrom(src => mediaOwnerResolver.Resolve(src)))
             //.ForMember(dest => dest.Published, opt => opt.Ignore())
             //.ForMember(dest => dest.Edited, opt => opt.Ignore())
             //.ForMember(dest => dest.Updater, opt => opt.Ignore())
diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
index dbdac1f91f81..a651ba33af75 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
@@ -63,24 +63,24 @@ public MemberMapperProfile(
             //FROM IMember TO MemberDisplay
             CreateMap<IMember, MemberDisplay>()
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Member, content.Key)))
-                .ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => memberOwnerResolver.Resolve(src)))
+                .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => memberOwnerResolver.Resolve(src)))
                 .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon))
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
                 .ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(src => src.ContentType.Name))
                 .ForMember(dest => dest.Properties, opt => opt.Ignore())
-                .ForMember(dest => dest.Tabs, opt => opt.ResolveUsing(tabsAndPropertiesResolver))
-                .ForMember(dest => dest.MemberProviderFieldMapping, opt => opt.ResolveUsing(src => memberProfiderFieldMappingResolver.Resolve(src)))
-                .ForMember(dest => dest.MembershipScenario, opt => opt.ResolveUsing(src => membershipScenarioMappingResolver.Resolve(src)))
+                .ForMember(dest => dest.Tabs, opt => opt.MapFrom(tabsAndPropertiesResolver))
+                .ForMember(dest => dest.MemberProviderFieldMapping, opt => opt.MapFrom(src => memberProfiderFieldMappingResolver.Resolve(src)))
+                .ForMember(dest => dest.MembershipScenario, opt => opt.MapFrom(src => membershipScenarioMappingResolver.Resolve(src)))
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Errors, opt => opt.Ignore())
-                .ForMember(dest => dest.State, opt => opt.UseValue<ContentSavedState?>(null))
+                .ForMember(dest => dest.State, opt => opt.MapFrom<ContentSavedState?>(_ => null))
                 .ForMember(dest => dest.Edited, opt => opt.Ignore())
                 .ForMember(dest => dest.Updater, opt => opt.Ignore())
                 .ForMember(dest => dest.Alias, opt => opt.Ignore())
                 .ForMember(dest => dest.IsChildOfListView, opt => opt.Ignore())
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
                 .ForMember(dest => dest.IsContainer, opt => opt.Ignore())
-                .ForMember(dest => dest.TreeNodeUrl, opt => opt.ResolveUsing(memberTreeNodeUrlResolver))
+                .ForMember(dest => dest.TreeNodeUrl, opt => opt.MapFrom(memberTreeNodeUrlResolver))
                 .ForMember(dest => dest.VariesByCulture, opt => opt.Ignore());
 
             //FROM IMember TO MemberBasic
@@ -88,17 +88,17 @@ public MemberMapperProfile(
                 //we're giving this entity an ID of int.MaxValue - this is kind of a hack to force angular to use the Key instead of the Id in list views
                 .ForMember(dest => dest.Id, opt => opt.MapFrom(src => int.MaxValue))
                 .ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Member, content.Key)))
-                .ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => memberOwnerResolver.Resolve(src)))
+                .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => memberOwnerResolver.Resolve(src)))
                 .ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon))
                 .ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
                 .ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.Email))
                 .ForMember(dest => dest.Username, opt => opt.MapFrom(src => src.Username))
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
-                .ForMember(dest => dest.State, opt => opt.UseValue<ContentSavedState?>(null))
+                .ForMember(dest => dest.State, opt => opt.MapFrom<ContentSavedState?>(_ => null))
                 .ForMember(dest => dest.Edited, opt => opt.Ignore())
                 .ForMember(dest => dest.Updater, opt => opt.Ignore())
                 .ForMember(dest => dest.Alias, opt => opt.Ignore())
-                .ForMember(dto => dto.Properties, expression => expression.ResolveUsing(memberBasicPropertiesResolver))
+                .ForMember(dto => dto.Properties, expression => expression.MapFrom(memberBasicPropertiesResolver))
                 .ForMember(dest => dest.VariesByCulture, opt => opt.Ignore());
 
             //FROM MembershipUser TO MemberBasic
@@ -109,8 +109,8 @@ public MemberMapperProfile(
                 .ForMember(dest => dest.CreateDate, opt => opt.MapFrom(src => src.CreationDate))
                 .ForMember(dest => dest.UpdateDate, opt => opt.MapFrom(src => src.LastActivityDate))
                 .ForMember(dest => dest.Key, opt => opt.MapFrom(src => src.ProviderUserKey.TryConvertTo<Guid>().Result.ToString("N")))
-                .ForMember(dest => dest.Owner, opt => opt.UseValue(new UserProfile {Name = "Admin", UserId = -1 }))
-                .ForMember(dest => dest.Icon, opt => opt.UseValue("icon-user"))
+                .ForMember(dest => dest.Owner, opt => opt.MapFrom(_ => new UserProfile {Name = "Admin", UserId = -1 }))
+                .ForMember(dest => dest.Icon, opt => opt.MapFrom(_ => "icon-user"))
                 .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.UserName))
                 .ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.Email))
                 .ForMember(dest => dest.Username, opt => opt.MapFrom(src => src.UserName))
@@ -119,7 +119,7 @@ public MemberMapperProfile(
                 .ForMember(dest => dest.Path, opt => opt.Ignore())
                 .ForMember(dest => dest.SortOrder, opt => opt.Ignore())
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
-                .ForMember(dest => dest.State, opt => opt.UseValue(ContentSavedState.Draft))
+                .ForMember(dest => dest.State, opt => opt.MapFrom(_ => ContentSavedState.Draft))
                 .ForMember(dest => dest.Edited, opt => opt.Ignore())
                 .ForMember(dest => dest.Updater, opt => opt.Ignore())
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
@@ -130,14 +130,14 @@ public MemberMapperProfile(
             //FROM IMember TO ContentItemDto<IMember>
             CreateMap<IMember, ContentPropertyCollectionDto>()
                 //.ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Member, content.Key)))
-                //.ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => memberOwnerResolver.Resolve(src)))
+                //.ForMember(dest => dest.Owner, opt => opt.MapFrom(src => memberOwnerResolver.Resolve(src)))
                 //.ForMember(dest => dest.Published, opt => opt.Ignore())
                 //.ForMember(dest => dest.Edited, opt => opt.Ignore())
                 //.ForMember(dest => dest.Updater, opt => opt.Ignore())
                 //.ForMember(dest => dest.Icon, opt => opt.Ignore())
                 //.ForMember(dest => dest.Alias, opt => opt.Ignore())
                 //do no map the custom member properties (currently anyways, they were never there in 6.x)
-                .ForMember(dest => dest.Properties, opt => opt.ResolveUsing(src => memberDtoPropertiesResolver.Resolve(src)));
+                .ForMember(dest => dest.Properties, opt => opt.MapFrom(src => memberDtoPropertiesResolver.Resolve(src)));
 
             //FROM IMemberGroup TO MemberGroupDisplay
             CreateMap<IMemberGroup, MemberGroupDisplay>()
diff --git a/src/Umbraco.Web/Models/Mapping/UserMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/UserMapperProfile.cs
index 6f3af3b81270..84660d2602d7 100644
--- a/src/Umbraco.Web/Models/Mapping/UserMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserMapperProfile.cs
@@ -99,7 +99,7 @@ public UserMapperProfile(ILocalizedTextService textService, IUserService userSer
                 .ForMember(dest => dest.LastLockoutDate, opt => opt.Ignore())
                 .ForMember(dest => dest.FailedPasswordAttempts, opt => opt.Ignore())
                 //all invited users will not be approved, completing the invite will approve the user
-                .ForMember(user => user.IsApproved, opt => opt.UseValue(false))
+                .ForMember(user => user.IsApproved, opt => opt.MapFrom(_ => false))
                 .AfterMap((invite, user) =>
                 {
                     user.ClearGroups();
@@ -119,7 +119,7 @@ public UserMapperProfile(ILocalizedTextService textService, IUserService userSer
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Udi, opt => opt.Ignore())
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Path, opt => opt.MapFrom(userGroup => "-1," + userGroup.Id))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
                 .AfterMap((group, display) =>
@@ -134,7 +134,7 @@ public UserMapperProfile(ILocalizedTextService textService, IUserService userSer
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Udi, opt => opt.Ignore())
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Path, opt => opt.MapFrom(userGroup => "-1," + userGroup.Id))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
                 .AfterMap((group, display) =>
@@ -148,9 +148,9 @@ public UserMapperProfile(ILocalizedTextService textService, IUserService userSer
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
                 .ForMember(dest => dest.Id, opt => opt.MapFrom(group => group.Id))
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Path, opt => opt.MapFrom(userGroup => "-1," + userGroup.Id))
-                .ForMember(dest => dest.DefaultPermissions, opt => opt.ResolveUsing(src => userGroupDefaultPermissionsResolver.Resolve(src)))
+                .ForMember(dest => dest.DefaultPermissions, opt => opt.MapFrom(src => userGroupDefaultPermissionsResolver.Resolve(src)))
                 //these will be manually mapped and by default they are null
                 .ForMember(dest => dest.AssignedPermissions, opt => opt.Ignore())
                 .AfterMap((group, display) =>
@@ -182,11 +182,11 @@ public UserMapperProfile(ILocalizedTextService textService, IUserService userSer
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Udi, opt => opt.Ignore())
                 .ForMember(dest => dest.Trashed, opt => opt.Ignore())
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Path, opt => opt.MapFrom(userGroup => "-1," + userGroup.Id))
                 .ForMember(dest => dest.AdditionalData, opt => opt.Ignore())
                 .ForMember(dest => dest.Users, opt => opt.Ignore())
-                .ForMember(dest => dest.DefaultPermissions, opt => opt.ResolveUsing(src => userGroupDefaultPermissionsResolver.Resolve(src)))
+                .ForMember(dest => dest.DefaultPermissions, opt => opt.MapFrom(src => userGroupDefaultPermissionsResolver.Resolve(src)))
                 .ForMember(dest => dest.AssignedPermissions, opt => opt.Ignore())
                 .AfterMap((group, display) =>
                 {
@@ -276,7 +276,7 @@ public UserMapperProfile(ILocalizedTextService textService, IUserService userSer
                 .ForMember(
                     dest => dest.EmailHash,
                     opt => opt.MapFrom(user => user.Email.ToLowerInvariant().Trim().GenerateHash()))
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Path, opt => opt.MapFrom(user => "-1," + user.Id))
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.Udi, opt => opt.Ignore())
@@ -302,7 +302,7 @@ public UserMapperProfile(ILocalizedTextService textService, IUserService userSer
                 .ForMember(
                     dest => dest.EmailHash,
                     opt => opt.MapFrom(user => user.Email.ToLowerInvariant().Trim().ToMd5()))
-                .ForMember(dest => dest.ParentId, opt => opt.UseValue(-1))
+                .ForMember(dest => dest.ParentId, opt => opt.MapFrom(_ => -1))
                 .ForMember(dest => dest.Path, opt => opt.MapFrom(user => "-1," + user.Id))
                 .ForMember(dest => dest.Notifications, opt => opt.Ignore())
                 .ForMember(dest => dest.IsCurrentUser, opt => opt.Ignore())
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8e13d3343322..a40f5d20f91c 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -60,7 +60,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="7.0.1" />
+    <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.0.0-beta078" />

From a4a437a74665a833a4aaad623201a5834004d978 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 6 Feb 2019 11:18:52 +0100
Subject: [PATCH 310/421] Fixed view after UmbracoHelper ctor changes

---
 .../Views/Partials/Grid/Editors/TextString.cshtml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
index e0db23208610..2a1d63ffda35 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
@@ -5,7 +5,7 @@
 @if (Model.editor.config.markup != null)
 {
     string markup = Model.editor.config.markup.ToString();
-    var umbracoHelper = new UmbracoHelper(UmbracoContext.Current, Current.Services);
+    var umbracoHelper = Current.UmbracoHelper;
     markup = markup.Replace("#value#", umbracoHelper.ReplaceLineBreaksForHtml(HttpUtility.HtmlEncode(Model.value.ToString())).ToString());
 
     if (Model.editor.config.style != null)

From 64d2940c3b510a3c218237f6d4d791f042f5cc64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 6 Feb 2019 11:26:39 +0100
Subject: [PATCH 311/421] refactoring of umb-editor-navigation

---
 .../umbeditorcontentheader.directive.js       |  23 ++-
 .../editor/umbeditornavigation.directive.js   |   4 +-
 .../umbeditornavigationitem.directive.js      |  10 +-
 src/Umbraco.Web.UI.Client/src/less/belle.less |   1 +
 .../umb-editor-navigation-item.less           | 132 +++++++++++++++++
 .../components/umb-editor-navigation.less     | 134 ------------------
 .../content/umb-variant-content.html          |   7 +-
 .../editor/umb-editor-content-header.html     |   8 +-
 .../editor/umb-editor-navigation-item.html    |   3 +-
 .../editor/umb-editor-navigation.html         |  49 ++++---
 10 files changed, 189 insertions(+), 182 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 0d78aab0ebfc..0f1aae940d9f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -11,17 +11,27 @@
             if (!scope.serverValidationAliasField) {
                 scope.serverValidationAliasField = "Alias";
             }
-
+            
             scope.vm = {};
             scope.vm.dropdownOpen = false;
             scope.vm.currentVariant = "";
 
             function onInit() {
+                
                 setCurrentVariant();
+                /*
+                angular.forEach(scope.content.apps, (app) => {
+                    if (app.alias === "umbContent") {
+                        console.log("content app", app)
+                        app.type = "dropdown";
+                        app.groups = scope.content.tabs;
+                    }
+                });
+                */
             }
 
             function setCurrentVariant() {
-                angular.forEach(scope.variants, function (variant) {
+                angular.forEach(scope.content.variants, function (variant) {
                     if (variant.active) {
                         scope.vm.currentVariant = variant;
                     }
@@ -72,10 +82,10 @@
             onInit();
 
             //watch for the active culture changing, if it changes, update the current variant
-            if (scope.variants) {
+            if (scope.content.variants) {
                 scope.$watch(function () {
-                    for (var i = 0; i < scope.variants.length; i++) {
-                        var v = scope.variants[i];
+                    for (var i = 0; i < scope.content.variants.length; i++) {
+                        var v = scope.content.variants[i];
                         if (v.active) {
                             return v.language.culture;
                         }
@@ -100,10 +110,9 @@
                 nameDisabled: "<?",
                 menu: "=",
                 hideMenu: "<?",
-                variants: "=",
+                content: "=",
                 openVariants: "<",
                 hideChangeVariant: "<?",
-                navigation: "=",
                 onSelectNavigationItem: "&?",
                 showBackButton: "<?",
                 splitViewOpen: "=?",
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
index 6b269ad17efe..43a17c0139ed 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
@@ -17,9 +17,7 @@
                 name: "More"
             };
 
-            scope.openNavigationItem = function (item) {
-                
-                console.log("openNavigationItem", item)
+            scope.openNavigationItem = function(item) {
                 
                 scope.showDropdown = false;
                 runItemAction(item);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
index 60a5a54d0fc6..cbbedf9de3df 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
@@ -15,12 +15,12 @@ Use this directive to render tab content. For an example see: {@link umbraco.dir
     
     function UmbEditorNavigationItemController($scope, $element, $attrs) {
         
-        console.log("LINKKK!")
+        $element[0].classList.add('umb-sub-views-nav-item')
+        
         var vm = this;
         
-        this.callbackOpen = function(item) {
-            console.log("callbackOpen")
-            vm.open({item:vm.item});
+        this.callOpen = function() {
+            vm.onOpen({item:vm.item});
         };
     }
     
@@ -32,7 +32,7 @@ Use this directive to render tab content. For an example see: {@link umbraco.dir
             controllerAs: 'vm',
             bindings: {
                 item: '=',
-                open: '&',
+                onOpen: '&',
                 index: '@'
             }
         });
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 78e9cabcfc3e..db45755e5c10 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -105,6 +105,7 @@
 @import "components/editor/umb-editor.less";
 @import "components/umb-sub-views.less";
 @import "components/umb-editor-navigation.less";
+@import "components/umb-editor-navigation-item.less";
 @import "components/umb-editor-sub-views.less";
 @import "components/editor/subheader/umb-editor-sub-header.less";
 @import "components/umb-flatpickr.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
new file mode 100644
index 000000000000..7e858102e059
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -0,0 +1,132 @@
+.umb-sub-views-nav-item {
+    
+}
+.umb-sub-views-nav-item a {
+  text-align: center;
+  cursor: pointer;
+  display: block;
+  padding: 4px 10px 0 10px;
+  min-width: 70px;
+  border-right: 1px solid @gray-9;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: @editorHeaderHeight;
+  position: relative;
+  
+  color: @ui-active-type;
+  
+  &:hover {
+      color: @ui-active-type-hover !important;
+  }
+  
+  &::after {
+      content: "";
+      height: 0px;
+      left: 8px;
+      right: 8px;
+      background-color: @ui-light-active-border;
+      position: absolute;
+      bottom: 0;
+      border-radius: 3px 3px 0 0;
+      opacity: 0;
+      transition: all .2s linear;
+  }
+}
+
+.umb-sub-views-nav-item a:focus {
+  outline: none;
+}
+
+.umb-sub-views-nav-item a:hover,
+.umb-sub-views-nav-item a:focus {
+  text-decoration: none;
+}
+
+.umb-sub-views-nav-item a.is-active {
+    
+    color: @ui-light-active-type;
+    
+    &::after {
+        opacity: 1;
+        height: 4px;
+    }
+}
+
+.show-validation .umb-sub-views-nav-item a.-has-error {
+  color: @red;
+}
+
+.umb-sub-views-nav-item .icon {
+  font-size: 24px;
+  display: block;
+  text-align: center;
+  margin-bottom: 7px;
+}
+
+.umb-sub-views-nav-item .badge {
+  position: absolute;
+  top: 6px;
+  right: 6px;
+  min-width: 16px;
+  color: @white;
+  background-color: @ui-active-type;
+  border: 2px solid @white;
+  border-radius: 50%;
+  font-size: 10px;
+  font-weight: bold;
+  padding: 2px;
+  line-height: 16px;
+  display: block;
+
+  &.-type-alert {
+    background-color: @red;
+  }
+  &.-type-warning {
+    background-color: @yellow-d2;
+  }
+  &:empty {
+    height: 12px;
+    min-width: 12px;
+  }
+}
+
+.umb-sub-views-nav-item-text {
+  font-size: 12px;
+  line-height: 1em;
+}
+
+.umb-sub-views-nav-item-more__icon {
+  margin-bottom: 10px;
+}
+
+.umb-sub-views-nav-item-more__icon i {
+	height: 5px;
+  width: 5px;
+  border-radius: 50%;
+  background: @ui-active-type;// fallback if browser doesnt support currentColor
+  background: currentColor;
+  display: inline-block;
+  margin: 0 5px 0 0;
+}
+
+.umb-sub-views-nav-item-more__icon i:last-of-type {
+  margin-right: 0;
+}
+
+.umb-sub-views-nav-item-more__dropdown {
+  left: auto;
+  right: 0;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  min-width: auto;
+  margin-top: 10px;
+}
+.umb-sub-views-nav-item-more__dropdown > li {
+    display: flex;
+}
+.umb-sub-views-nav-item-more__dropdown .umb-sub-views-nav-item:first {
+    border-left: none;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
index f4bbeadc3f0e..985765e53aca 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
@@ -4,137 +4,3 @@
   margin: 0;
   border-left: 1px solid @gray-9;
 }
-
-.umb-sub-views-nav-item {
-  text-align: center;
-  cursor: pointer;
-  display: block;
-  padding: 4px 10px 0 10px;
-  //border-bottom: 4px solid transparent;
-  min-width: 70px;
-  border-right: 1px solid @gray-9;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: @editorHeaderHeight;
-  position: relative;
-  
-  color: @ui-active-type;
-  
-  &:hover {
-      color: @ui-active-type-hover !important;
-  }
-  
-  &::after {
-      content: "";
-      height: 0px;
-      left: 8px;
-      right: 8px;
-      background-color: @ui-light-active-border;
-      position: absolute;
-      bottom: 0;
-      border-radius: 3px 3px 0 0;
-      opacity: 0;
-      transition: all .2s linear;
-  }
-}
-
-.umb-sub-views-nav-item:focus {
-  outline: none;
-}
-
-.umb-sub-views-nav-item:hover,
-.umb-sub-views-nav-item:focus {
-  text-decoration: none;
-}
-
-.umb-sub-views-nav-item.is-active {
-    //color: @ui-active;
-    //border-bottom-color: @ui-active;
-    
-    //background-color: rgba(@ui-active, 0.25);
-    color: @ui-light-active-type;
-    //border-bottom-color: @ui-active;
-    &::after {
-        opacity: 1;
-        height: 4px;
-    }
-}
-
-.show-validation .umb-sub-views-nav-item.-has-error {
-  color: @red;
-}
-
-.umb-sub-views-nav-item .icon {
-  font-size: 24px;
-  display: block;
-  text-align: center;
-  margin-bottom: 7px;
-}
-
-.umb-sub-views-nav-item .badge {
-  position: absolute;
-  top: 6px;
-  right: 6px;
-  min-width: 16px;
-  color: @white;
-  background-color: @ui-active-type;
-  border: 2px solid @white;
-  border-radius: 50%;
-  font-size: 10px;
-  font-weight: bold;
-  padding: 2px;
-  line-height: 16px;
-  display: block;
-
-  &.-type-alert {
-    background-color: @red;
-  }
-  &.-type-warning {
-    background-color: @yellow-d2;
-  }
-  &:empty {
-    height: 12px;
-    min-width: 12px;
-  }
-}
-
-.umb-sub-views-nav-item-text {
-  font-size: 12px;
-  line-height: 1em;
-}
-
-.umb-sub-views-nav-item-more__icon {
-  margin-bottom: 10px;
-}
-
-.umb-sub-views-nav-item-more__icon i {
-	height: 5px;
-  width: 5px;
-  border-radius: 50%;
-  background: @ui-active-type;// fallback if browser doesnt support currentColor
-  background: currentColor;
-  display: inline-block;
-  margin: 0 5px 0 0;
-}
-
-.umb-sub-views-nav-item-more__icon i:last-of-type {
-  margin-right: 0;
-}
-
-.umb-sub-views-nav-item-more__dropdown {
-  left: auto;
-  right: 0;
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
-  min-width: auto;
-  margin-top: 10px;
-}
-.umb-sub-views-nav-item-more__dropdown > li {
-    display: flex;
-}
-.umb-sub-views-nav-item-more__dropdown .umb-sub-views-nav-item:first {
-    border-left: none;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
index c03b017a826d..84928a00bbf1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
@@ -1,19 +1,18 @@
 <div>
-    <umb-load-indicator 
+    <umb-load-indicator
         ng-if="vm.editor.loading">
     </umb-load-indicator>
 
     <div class="umb-split-view__content" ng-show="!vm.editor.loading">
 
         <ng-form name="contentHeaderForm">
-            <umb-editor-content-header 
+            <umb-editor-content-header
                 menu="vm.page.menu"
                 hide-menu="vm.page.hideActionsMenu"
                 name="vm.editor.content.name"
                 name-disabled="vm.nameDisabled"
-                navigation="vm.editor.content.apps"
+                content="vm.editor.content"
                 on-select-navigation-item="vm.selectApp(item)"
-                variants="vm.editor.content.variants"
                 open-variants="vm.openVariants"
                 hide-change-variant="vm.page.hideChangeVariant"
                 show-back-button="vm.page.listViewPath !== null"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 4861aac8a456..8e308e89b26f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -29,7 +29,7 @@
                             autocomplete="off" />
                     </ng-form>
 
-                    <a ng-if="variants.length > 0 && hideChangeVariant !== true" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
+                    <a ng-if="content.variants.length > 0 && hideChangeVariant !== true" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
                         <span>{{vm.currentVariant.language.name}}</span>
                         <ins class="umb-variant-switcher__expand" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</ins>
                     </a>
@@ -39,7 +39,7 @@
                     </span>
 
                     <umb-dropdown ng-if="vm.dropdownOpen" style="width: 100%; max-height: 250px; overflow-y: scroll; margin-top: 5px;" on-close="vm.dropdownOpen = false" umb-keyboard-list>
-                        <umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.active, 'umb-variant-switcher_item--not-allowed': variantIsOpen(variant.language.culture)}" ng-repeat="variant in variants">
+                        <umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.active, 'umb-variant-switcher_item--not-allowed': variantIsOpen(variant.language.culture)}" ng-repeat="variant in content.variants">
                             <a href="" class="umb-variant-switcher__name-wrapper" ng-click="selectVariant($event, variant)" prevent-default>
                                 <span class="umb-variant-switcher__name" ng-class="{'bold': variant.language.isDefault}">{{variant.language.name}}</span>
                                 <umb-variant-state variant="variant" class="umb-variant-switcher__state"></umb-variant-state>
@@ -60,10 +60,10 @@
             </a>
         </div>
 
-        <div ng-if="navigation && splitViewOpen !== true" style="margin-left: 20px;">
+        <div ng-if="content.apps && splitViewOpen !== true" style="margin-left: 20px;">
             <umb-editor-navigation
                 data-element="editor-sub-views"
-                navigation="navigation"
+                navigation="content.apps"
                 on-select="selectNavigationItem(item)">
             </umb-editor-navigation>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
index 002e9adfc045..329e96242b87 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
@@ -1,8 +1,7 @@
 <a data-element="sub-view-{{vm.item.alias}}"
     tabindex="-1"
-    class="umb-sub-views-nav-item"
     ng-href=""
-    ng-click="vm.callbackOpen(vm.item)"
+    ng-click="vm.callOpen(vm.item)"
     hotkey="{{vm.index+1}}"
     hotkey-when-hidden="true"
     ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
index 1bc7c5ff4ada..31388a54f838 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
@@ -1,11 +1,11 @@
 <ul class="umb-sub-views-nav" ng-show="showNavigation">
 
-    <li ng-repeat="item in navigation | limitTo: itemsLimit ">
-        <div ng-show="item.alias !== 'more'"
-            ng-class="item.errorClass">
+    <li ng-repeat="navItem in navigation | limitTo: itemsLimit ">
+        <div ng-show="navItem.alias !== 'more'"
+            ng-class="navItem.errorClass">
             <umb-editor-navigation-item
-                item="item"
-                open="openNavigationItem"
+                item="navItem"
+                on-open="openNavigationItem(item)"
                 index="{{$index}}">
             </umb-editor-navigation-item>
         </div>
@@ -13,24 +13,27 @@
 
     <li ng-show="showMoreButton" style="position: relative;">
 
-        <a data-element="sub-view-{{moreButton.alias}}"
-            class="umb-sub-views-nav-item umb-sub-views-nav-item-more"
-            href=""
-            ng-click="toggleDropdown()"
-            ng-class="{'is-active': moreButton.active}">
-            <div class="umb-sub-views-nav-item-more__icon"><i></i><i></i><i></i></div>
-            <span class="umb-sub-views-nav-item-text">{{ moreButton.name }}</span>
-        </a>
-
-        <umb-dropdown ng-show="showDropdown" on-close="hideDropdown()" class="umb-sub-views-nav-item-more__dropdown">
-            <umb-dropdown-item ng-repeat="item in navigation | limitTo: overflowingItems">
-                <umb-editor-navigation-item
-                    item="item"
-                    open="openNavigationItem"
-                    index="{{$index}}">
-                </umb-editor-navigation-item>
-            </umb-dropdown-item>
-        </umb-dropdown>
+        <div class="umb-sub-views-nav-item umb-sub-views-nav-item-more">
+
+            <a data-element="sub-view-{{moreButton.alias}}"
+                href=""
+                ng-click="toggleDropdown()"
+                ng-class="{'is-active': moreButton.active}">
+                <div class="umb-sub-views-nav-item-more__icon"><i></i><i></i><i></i></div>
+                <span class="umb-sub-views-nav-item-text">{{ moreButton.name }}</span>
+            </a>
+
+            <umb-dropdown ng-show="showDropdown" on-close="hideDropdown()" class="umb-sub-views-nav-item-more__dropdown">
+                <umb-dropdown-item ng-repeat="navItem in navigation | limitTo: overflowingItems">
+                    <umb-editor-navigation-item
+                        item="navItem"
+                        on-open="openNavigationItem(item)"
+                        index="{{$index}}">
+                    </umb-editor-navigation-item>
+                </umb-dropdown-item>
+            </umb-dropdown>
+
+        </div>
 
     </li>
 

From e556e39cd1f716420d893f4b3fb86d542b48d2bd Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 21:31:50 +1100
Subject: [PATCH 312/421] latest HtmlAgility

---
 build/NuSpecs/UmbracoCms.Web.nuspec    | 2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 4ea0b7b07d0b..b79b909191ef 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -25,7 +25,7 @@
             <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
             <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
             <dependency id="Examine" version="[1.0.0-beta078,1.999999)" />
-            <dependency id="HtmlAgilityPack" version="[1.8.9,1.999999)" />
+            <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
             <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
             <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
             <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8dfad73b8aab..7116a95b3116 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -82,7 +82,7 @@
     <PackageReference Include="Castle.Core" Version="4.2.1" />
     <PackageReference Include="Examine" Version="1.0.0-beta078" />
     <PackageReference Include="HtmlAgilityPack">
-      <Version>1.8.9</Version>
+      <Version>1.8.14</Version>
     </PackageReference>
     <PackageReference Include="LightInject" Version="5.1.2" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index a40f5d20f91c..edbb5130b969 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -64,7 +64,7 @@
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.0.0-beta078" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.8.9" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
     <PackageReference Include="ImageProcessor">
       <Version>2.6.2.25</Version>
     </PackageReference>

From 7c21a42804fdb372df71e743589aab1e9730bf0e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 21:39:09 +1100
Subject: [PATCH 313/421] Update serilog

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 4 ++--
 src/Umbraco.Core/Umbraco.Core.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 60b91af7e6e8..e4fc5f301300 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -30,12 +30,12 @@
             <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
             <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
             <dependency id="Semver" version="[2.0.4,2.999999)" />
-            <dependency id="Serilog" version="[2.7.1,2.999999)" />
+            <dependency id="Serilog" version="[2.8.0,2.999999)" />
             <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
             <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
             <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
             <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
-            <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.2,1.999999)" />
+            <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
             <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
             <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
             <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 9135c6bf9808..f66b55eab266 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -73,7 +73,7 @@
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="Serilog">
-      <Version>2.7.1</Version>
+      <Version>2.8.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Enrichers.Process">
       <Version>2.0.1</Version>
@@ -88,7 +88,7 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Formatting.Compact.Reader">
-      <Version>1.0.2</Version>
+      <Version>1.0.3</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Settings.AppSettings">
       <Version>2.2.2</Version>

From 4c2ea81c535e2fd5d5ecfc6fbdea310820e358dc Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 21:41:46 +1100
Subject: [PATCH 314/421] updates Light Inject

---
 build/NuSpecs/UmbracoCms.Core.nuspec   | 2 +-
 src/Umbraco.Core/Umbraco.Core.csproj   | 2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index e4fc5f301300..6fdc11f2f1d3 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -21,7 +21,7 @@
               not want this to happen as the alpha of the next major is, really, the next major already.
             -->
             <dependency id="AutoMapper" version="[8.0.0,8.999999)" />
-            <dependency id="LightInject" version="[5.1.2,5.999999)" />
+            <dependency id="LightInject" version="[5.4.0,5.999999)" />
             <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
             <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
             <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index f66b55eab266..5a8fbe62958c 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -56,7 +56,7 @@
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
     <PackageReference Include="AutoMapper" Version="8.0.0" />
-    <PackageReference Include="LightInject" Version="5.1.2" />
+    <PackageReference Include="LightInject" Version="5.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Web" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNet.Identity.Core">
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 7116a95b3116..251718a3b7b5 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -84,7 +84,7 @@
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.1.2" />
+    <PackageReference Include="LightInject" Version="5.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="Lucene.Net" Version="3.0.3" />
     <PackageReference Include="Lucene.Net.Contrib" Version="3.0.3" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index edbb5130b969..89432d4d25ba 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -68,7 +68,7 @@
     <PackageReference Include="ImageProcessor">
       <Version>2.6.2.25</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.1.2" />
+    <PackageReference Include="LightInject" Version="5.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Mvc" Version="2.0.0" />
     <PackageReference Include="LightInject.WebApi" Version="2.0.0" />

From 817ce71e832c1e4fa9cf8c8187e0c78e2069c077 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 21:44:12 +1100
Subject: [PATCH 315/421] updates threading libs

---
 build/NuSpecs/UmbracoCms.Web.nuspec    | 2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index b79b909191ef..5a7a44e80fe6 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -37,7 +37,7 @@
             <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
             <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
             <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
-            <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.999999)" />
+            <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
         </dependencies>
     </metadata>
     <files>
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 251718a3b7b5..8c26e3d53252 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -111,7 +111,7 @@
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="SharpZipLib" Version="0.86.0" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.4.0" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Cache\DistributedCacheBinderTests.cs" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 89432d4d25ba..8a29df96ff70 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -85,7 +85,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="Semver" Version="2.0.4" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">

From 47d660041e08a25364accef777b9672371660ad7 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 21:47:21 +1100
Subject: [PATCH 316/421] updates test proj dependencies

---
 src/Umbraco.Tests/Umbraco.Tests.csproj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8c26e3d53252..5148ca150df5 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -79,7 +79,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="8.0.0" />
-    <PackageReference Include="Castle.Core" Version="4.2.1" />
+    <PackageReference Include="Castle.Core" Version="4.3.1" />
     <PackageReference Include="Examine" Version="1.0.0-beta078" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
@@ -101,13 +101,13 @@
     <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
-    <PackageReference Include="Moq" Version="4.8.2" />
+    <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Owin" Version="1.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="3.11.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="SharpZipLib" Version="0.86.0" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />

From 68cdbf50b234e87295128a164aed7232625ccfd5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 21:48:33 +1100
Subject: [PATCH 317/421] removes old unused dependency  from tests

---
 src/Umbraco.Tests/Umbraco.Tests.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 5148ca150df5..bff8d63a3f4d 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -109,7 +109,6 @@
     <PackageReference Include="Owin" Version="1.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
     <PackageReference Include="Semver" Version="2.0.4" />
-    <PackageReference Include="SharpZipLib" Version="0.86.0" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
   </ItemGroup>

From 3f8efed392fb4d6b4f88ebeb26ae852811097924 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 21:55:59 +1100
Subject: [PATCH 318/421] updates nuspecs to have the correct target framework

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 54 +++++++++++++++-------------
 build/NuSpecs/UmbracoCms.Web.nuspec  | 52 +++++++++++++++------------
 build/NuSpecs/UmbracoCms.nuspec      | 31 +++++++++-------
 3 files changed, 77 insertions(+), 60 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 6fdc11f2f1d3..88281cb84b66 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -15,31 +15,35 @@
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-            <!--
-              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-              the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-              not want this to happen as the alpha of the next major is, really, the next major already.
-            -->
-            <dependency id="AutoMapper" version="[8.0.0,8.999999)" />
-            <dependency id="LightInject" version="[5.4.0,5.999999)" />
-            <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
-            <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
-            <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
-            <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
-            <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
-            <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
-            <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
-            <dependency id="Semver" version="[2.0.4,2.999999)" />
-            <dependency id="Serilog" version="[2.8.0,2.999999)" />
-            <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
-            <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
-            <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
-            <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
-            <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
-            <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
-            <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
-            <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
-            <dependency id="NPoco" version="[3.9.4,3.999999)" />
+
+            <group targetFramework="net472">
+                <!--
+                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
+                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
+                  not want this to happen as the alpha of the next major is, really, the next major already.
+                -->
+                <dependency id="AutoMapper" version="[8.0.0,8.999999)" />
+                <dependency id="LightInject" version="[5.4.0,5.999999)" />
+                <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
+                <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
+                <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
+                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
+                <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
+                <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
+                <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
+                <dependency id="Semver" version="[2.0.4,2.999999)" />
+                <dependency id="Serilog" version="[2.8.0,2.999999)" />
+                <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
+                <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
+                <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
+                <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
+                <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
+                <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
+                <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
+                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
+                <dependency id="NPoco" version="[3.9.4,3.999999)" />
+            </group>
+            
         </dependencies>
     </metadata>
     <files>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 5a7a44e80fe6..c52c8831e08c 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -15,29 +15,35 @@
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-            <!--
-              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-              the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-              not want this to happen as the alpha of the next major is, really, the next major already.
-            -->
-            <dependency id="UmbracoCms.Core" version="[$version$]" />
-            <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
-            <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
-            <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-            <dependency id="Examine" version="[1.0.0-beta078,1.999999)" />
-            <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
-            <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
-            <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
-            <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
-            <dependency id="Markdown" version="[2.2.1,2.999999)" />
-            <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
-            <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7,5.999999)" />
-            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0,2.999999)" />
-            <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7,5.999999)" />
-            <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
-            <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
-            <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
-            <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
+
+            <group targetFramework="net472">
+
+                <!--
+                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
+                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
+                  not want this to happen as the alpha of the next major is, really, the next major already.
+                -->
+                <dependency id="UmbracoCms.Core" version="[$version$]" />
+                <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
+                <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
+                <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
+                <dependency id="Examine" version="[1.0.0-beta078,1.999999)" />
+                <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
+                <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
+                <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
+                <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
+                <dependency id="Markdown" version="[2.2.1,2.999999)" />
+                <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
+                <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7,5.999999)" />
+                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0,2.999999)" />
+                <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7,5.999999)" />
+                <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
+                <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
+                <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
+                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
+
+            </group>
+            
         </dependencies>
     </metadata>
     <files>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 238dfd3c31b8..5e6dccfcd86c 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -15,18 +15,25 @@
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-            <dependency id="UmbracoCms.Web" version="[$version$]" />
-            <!--
-              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-              the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-              not want this to happen as the alpha of the next major is, really, the next major already.
-            -->
-            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.36]" />
-            <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
-            <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
-            <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
-            <dependency id="Microsoft.Net.Compilers" version="[2.10.0,2.999999)" />
+
+            <group targetFramework="net472">
+
+                <dependency id="UmbracoCms.Web" version="[$version$]" />
+                <!--
+                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
+                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
+                  not want this to happen as the alpha of the next major is, really, the next major already.
+                -->
+                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
+                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.36]" />
+                <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
+                <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
+                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
+                <dependency id="Microsoft.Net.Compilers" version="[2.10.0,2.999999)" />
+
+            </group>
+
+            
         </dependencies>
     </metadata>
     <files>

From 5b3f21c541384f0fa43ecfcf057bc6c4af14a192 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 22:12:00 +1100
Subject: [PATCH 319/421] fixes tests

---
 src/Umbraco.Core/Configuration/GlobalSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 1c8188e99fa8..02b26aec86a0 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -31,7 +31,7 @@ public class GlobalSettings : IGlobalSettings
         private static string _reservedPaths;
         private static string _reservedUrls;
         //ensure the built on (non-changeable) reserved paths are there at all times
-        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/"; //must end with a comma!
+        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
         internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
         #endregion
 

From 5b33416b7b71258b31e32d43620d242fc99946b0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 23:02:28 +1100
Subject: [PATCH 320/421] adds fixme notes

---
 src/Umbraco.Core/Models/Content.cs     | 4 +++-
 src/Umbraco.Core/Models/ContentBase.cs | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 90c994c86695..9a1ae7eda527 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -357,7 +357,7 @@ public override void ResetDirtyProperties(bool rememberDirty)
 
             if (rememberDirty)
             {
-
+                //fixme if it's empty don't allocate
                 _previousPublishCultureChanges.addedCultures = _currentPublishCultureChanges.addedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.addedCultures, StringComparer.InvariantCultureIgnoreCase);
                 _previousPublishCultureChanges.removedCultures = _currentPublishCultureChanges.removedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.removedCultures, StringComparer.InvariantCultureIgnoreCase);
                 _previousPublishCultureChanges.updatedCultures = _currentPublishCultureChanges.updatedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.updatedCultures, StringComparer.InvariantCultureIgnoreCase);
@@ -452,6 +452,8 @@ protected override void PerformDeepClone(object clone)
 
             var clonedContent = (Content)clone;
 
+            //fixme - need to reset change tracking bits
+
             //need to manually clone this since it's not settable
             clonedContent.ContentType = ContentType;
 
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 521e0ebff8b3..6de1bc71c90c 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -473,6 +473,8 @@ protected override void PerformDeepClone(object clone)
 
             var clonedContent = (ContentBase)clone;
 
+            //fixme - need to reset change tracking bits
+
             //if culture infos exist then deal with event bindings
             if (clonedContent._cultureInfos != null)
             {

From b260c18056414fbc27ce3965a225b9ea8086b6dc Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Feb 2019 19:58:33 +0100
Subject: [PATCH 321/421] Refactor IContent vs IContentType

---
 src/Umbraco.Core/Models/ContentBase.cs        |   2 +-
 src/Umbraco.Core/Models/ISimpleContentType.cs |  16 +--
 src/Umbraco.Core/Models/SimpleContentType.cs  | 100 +++++++++++-------
 .../Mappers/MapperCollectionBuilder.cs        |   1 +
 .../Mappers/SimpleContentTypeMapper.cs        |  38 +++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 .../Composing/TypeLoaderTests.cs              |   2 +-
 .../Models/ContentExtensionsTests.cs          |  54 +++++++++-
 src/Umbraco.Tests/Models/ContentTests.cs      |  53 +++++++++-
 .../Mapping/ContentWebModelMappingTests.cs    |  61 ++++++++---
 src/Umbraco.Tests/Models/MemberTests.cs       |  16 +--
 src/Umbraco.Tests/Models/VariationTests.cs    |   3 +
 .../Repositories/DocumentRepositoryTest.cs    |   9 +-
 .../Repositories/MediaRepositoryTest.cs       |   7 +-
 .../Repositories/MemberRepositoryTest.cs      |  10 +-
 .../Repositories/UserRepositoryTest.cs        |  25 +++--
 .../Services/ContentTypeServiceTests.cs       |   2 -
 .../Services/MemberTypeServiceTests.cs        |   2 -
 .../Testing/ContentBaseExtensions.cs          |   8 +-
 .../UmbracoExamine/IndexInitializer.cs        |   2 +-
 .../Web/Controllers/ContentControllerTests.cs |  58 +++++-----
 21 files changed, 330 insertions(+), 140 deletions(-)
 create mode 100644 src/Umbraco.Core/Persistence/Mappers/SimpleContentTypeMapper.cs

diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 908f620b11a0..765275cf5167 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    [DebuggerDisplay("Id: {Id}, Name: {Name}, ContentType: {ContentTypeBase.Alias}")]
+    [DebuggerDisplay("Id: {Id}, Name: {Name}, ContentType: {ContentType.Alias}")]
     public abstract class ContentBase : TreeEntityBase, IContentBase
     {
         protected static readonly ContentCultureInfosCollection NoInfos = new ContentCultureInfosCollection();
diff --git a/src/Umbraco.Core/Models/ISimpleContentType.cs b/src/Umbraco.Core/Models/ISimpleContentType.cs
index 8c9413f934cf..40862afd9e4f 100644
--- a/src/Umbraco.Core/Models/ISimpleContentType.cs
+++ b/src/Umbraco.Core/Models/ISimpleContentType.cs
@@ -1,20 +1,17 @@
-namespace Umbraco.Core.Models
+using Umbraco.Core.Models.Entities;
+
+namespace Umbraco.Core.Models
 {
     /// <summary>
     /// Represents a simplified view of a content type.
     /// </summary>
-    public interface ISimpleContentType
+    public interface ISimpleContentType : IUmbracoEntity
     {
         /// <summary>
         /// Gets the alias of the content type.
         /// </summary>
         string Alias { get; }
 
-        /// <summary>
-        /// Gets the identifier of the content type.
-        /// </summary>
-        int Id { get; }
-
         /// <summary>
         /// Gets the default template of the content type.
         /// </summary>
@@ -35,11 +32,6 @@ public interface ISimpleContentType
         /// </summary>
         bool IsContainer { get; }
 
-        /// <summary>
-        /// Gets the name of the content type.
-        /// </summary>
-        string Name { get; }
-
         /// <summary>
         /// Gets a value indicating whether content of that type can be created at the root of the tree.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs
index db7e01fadeed..c0e235e92db9 100644
--- a/src/Umbraco.Core/Models/SimpleContentType.cs
+++ b/src/Umbraco.Core/Models/SimpleContentType.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
 {
@@ -7,67 +9,56 @@ namespace Umbraco.Core.Models
     /// </summary>
     public class SimpleContentType : ISimpleContentType
     {
+        private readonly int _id;
+        private readonly string _name;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SimpleContentType"/> class.
         /// </summary>
         public SimpleContentType(IContentType contentType)
+            : this((IContentTypeBase)contentType)
         {
-            if (contentType == null) throw new ArgumentNullException(nameof(contentType));
-
-
-            Id = contentType.Id;
-            Alias = contentType.Alias;
             DefaultTemplate = contentType.DefaultTemplate;
-            Variations = contentType.Variations;
-            Icon = contentType.Icon;
-            IsContainer = contentType.IsContainer;
-            Icon = contentType.Icon;
-            Name = contentType.Name;
-            AllowedAsRoot = contentType.AllowedAsRoot;
-            IsElement = contentType.IsElement;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SimpleContentType"/> class.
         /// </summary>
         public SimpleContentType(IMediaType mediaType)
-        {
-            if (mediaType == null) throw new ArgumentNullException(nameof(mediaType));
-
-            Id = mediaType.Id;
-            Alias = mediaType.Alias;
-            Variations = mediaType.Variations;
-            Icon = mediaType.Icon;
-            IsContainer = mediaType.IsContainer;
-            Icon = mediaType.Icon;
-            Name = mediaType.Name;
-            AllowedAsRoot = mediaType.AllowedAsRoot;
-            IsElement = mediaType.IsElement;
-        }
+            : this((IContentTypeBase)mediaType)
+        { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SimpleContentType"/> class.
         /// </summary>
         public SimpleContentType(IMemberType memberType)
+            : this((IContentTypeBase)memberType)
+        { }
+
+        private SimpleContentType(IContentTypeBase contentType)
         {
-            if (memberType == null) throw new ArgumentNullException(nameof(memberType));
-
-            Id = memberType.Id;
-            Alias = memberType.Alias;
-            Variations = memberType.Variations;
-            Icon = memberType.Icon;
-            IsContainer = memberType.IsContainer;
-            Icon = memberType.Icon;
-            Name = memberType.Name;
-            AllowedAsRoot = memberType.AllowedAsRoot;
-            IsElement = memberType.IsElement;
+            if (contentType == null) throw new ArgumentNullException(nameof(contentType));
+
+            _id = contentType.Id;
+            Alias = contentType.Alias;
+            Variations = contentType.Variations;
+            Icon = contentType.Icon;
+            IsContainer = contentType.IsContainer;
+            Icon = contentType.Icon;
+            _name = contentType.Name;
+            AllowedAsRoot = contentType.AllowedAsRoot;
+            IsElement = contentType.IsElement;
         }
 
         /// <inheritdoc />
         public string Alias { get; }
 
         /// <inheritdoc />
-        public int Id { get;  }
+        public int Id
+        {
+            get => _id;
+            set => throw new NotSupportedException();
+        }
 
         /// <inheritdoc />
         public ITemplate DefaultTemplate { get;  }
@@ -82,7 +73,11 @@ public SimpleContentType(IMemberType memberType)
         public bool IsContainer { get; }
 
         /// <inheritdoc />
-        public string Name { get; }
+        public string Name
+        {
+            get => _name;
+            set => throw new NotSupportedException();
+        }
 
         /// <inheritdoc />
         public bool AllowedAsRoot { get; }
@@ -121,5 +116,34 @@ public override int GetHashCode()
                 return ((Alias != null ? Alias.GetHashCode() : 0) * 397) ^ Id;
             }
         }
+
+        // we have to have all this, because we're an IUmbracoEntity, because that is
+        // required by the query expression visitor / SimpleContentTypeMapper
+
+        public object DeepClone() => throw new NotImplementedException();
+
+        public Guid Key { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public DateTime CreateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public DateTime UpdateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public DateTime? DeleteDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public bool HasIdentity => throw new NotImplementedException();
+
+        public int CreatorId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public int ParentId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public void SetParent(ITreeEntity parent) => throw new NotImplementedException();
+
+        public int Level { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public string Path { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public int SortOrder { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public bool Trashed => throw new NotImplementedException();
+        public bool IsDirty() => throw new NotImplementedException();
+        public bool IsPropertyDirty(string propName) => throw new NotImplementedException();
+        public IEnumerable<string> GetDirtyProperties() => throw new NotImplementedException();
+        public void ResetDirtyProperties() => throw new NotImplementedException();
+        public bool WasDirty() => throw new NotImplementedException();
+        public bool WasPropertyDirty(string propertyName) => throw new NotImplementedException();
+        public void ResetWereDirtyProperties() => throw new NotImplementedException();
+        public void ResetDirtyProperties(bool rememberDirty) => throw new NotImplementedException();
+        public IEnumerable<string> GetWereDirtyProperties() => throw new NotImplementedException();
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs b/src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs
index 80819933f5b9..e20f7c19118d 100644
--- a/src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/MapperCollectionBuilder.cs
@@ -25,6 +25,7 @@ public MapperCollectionBuilder AddCoreMappers()
             Add<AuditItemMapper>();
             Add<ContentMapper>();
             Add<ContentTypeMapper>();
+            Add<SimpleContentTypeMapper>();
             Add<DataTypeMapper>();
             Add<DictionaryMapper>();
             Add<DictionaryTranslationMapper>();
diff --git a/src/Umbraco.Core/Persistence/Mappers/SimpleContentTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/SimpleContentTypeMapper.cs
new file mode 100644
index 000000000000..3ad975defb10
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Mappers/SimpleContentTypeMapper.cs
@@ -0,0 +1,38 @@
+using System.Collections.Concurrent;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Persistence.Mappers
+{
+    [MapperFor(typeof(ISimpleContentType))]
+    [MapperFor(typeof(SimpleContentType))]
+    public sealed class SimpleContentTypeMapper : BaseMapper
+    {
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+
+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
+
+        protected override void BuildMap()
+        {
+            if (PropertyInfoCache.IsEmpty == false) return;
+
+            CacheMap<ContentType, NodeDto>(src => src.Id, dto => dto.NodeId);
+            CacheMap<ContentType, NodeDto>(src => src.CreateDate, dto => dto.CreateDate);
+            CacheMap<ContentType, NodeDto>(src => src.Level, dto => dto.Level);
+            CacheMap<ContentType, NodeDto>(src => src.ParentId, dto => dto.ParentId);
+            CacheMap<ContentType, NodeDto>(src => src.Path, dto => dto.Path);
+            CacheMap<ContentType, NodeDto>(src => src.SortOrder, dto => dto.SortOrder);
+            CacheMap<ContentType, NodeDto>(src => src.Name, dto => dto.Text);
+            CacheMap<ContentType, NodeDto>(src => src.Trashed, dto => dto.Trashed);
+            CacheMap<ContentType, NodeDto>(src => src.Key, dto => dto.UniqueId);
+            CacheMap<ContentType, NodeDto>(src => src.CreatorId, dto => dto.UserId);
+            CacheMap<ContentType, ContentTypeDto>(src => src.Alias, dto => dto.Alias);
+            CacheMap<ContentType, ContentTypeDto>(src => src.AllowedAsRoot, dto => dto.AllowAtRoot);
+            CacheMap<ContentType, ContentTypeDto>(src => src.Description, dto => dto.Description);
+            CacheMap<ContentType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
+            CacheMap<ContentType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
+            CacheMap<ContentType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
+            CacheMap<ContentType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index d4b26cbbc0d3..eda02148fe82 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -467,6 +467,7 @@
     <Compile Include="Persistence\Mappers\AuditEntryMapper.cs" />
     <Compile Include="Persistence\Mappers\AuditItemMapper.cs" />
     <Compile Include="Persistence\Mappers\ConsentMapper.cs" />
+    <Compile Include="Persistence\Mappers\SimpleContentTypeMapper.cs" />
     <Compile Include="Persistence\Repositories\IAuditEntryRepository.cs" />
     <Compile Include="Persistence\Repositories\IConsentRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\AuditEntryRepository.cs" />
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 2354dc81472e..2dbd3055cbe9 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -264,7 +264,7 @@ public void Ensure_Only_One_Type_List_Created()
         public void Resolves_Assigned_Mappers()
         {
             var foundTypes1 = _typeLoader.GetAssignedMapperTypes();
-            Assert.AreEqual(29, foundTypes1.Count());
+            Assert.AreEqual(30, foundTypes1.Count());
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
index 5c95f1ead5d7..efa464a46ca3 100644
--- a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
+++ b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
@@ -1,22 +1,60 @@
 using System;
 using System.Linq;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.Composers;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
+using Umbraco.Web.PropertyEditors;
 
 namespace Umbraco.Tests.Models
 {
     [TestFixture]
     public class ContentExtensionsTests : UmbracoTestBase
     {
-        #region Others
+        private IContentTypeService _contentTypeService;
+
+        protected override void Compose()
+        {
+            base.Compose();
+
+            Composition.Register(_ => Mock.Of<ILogger>());
+            Composition.ComposeFileSystems();
+
+            Composition.Register(_ => Mock.Of<IDataTypeService>());
+            Composition.Register(_ => Mock.Of<IContentSection>());
+
+            // all this is required so we can validate properties...
+            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>()) { Alias = "test" };
+            Composition.Register(_ => new DataEditorCollection(new[] { editor }));
+            Composition.Register<PropertyEditorCollection>();
+            var dataType = Mock.Of<IDataType>();
+            Mock.Get(dataType).Setup(x => x.Configuration).Returns(() => new object());
+            var dataTypeService = Mock.Of<IDataTypeService>();
+            Mock.Get(dataTypeService)
+                .Setup(x => x.GetDataType(It.IsAny<int>()))
+                .Returns(() => dataType);
+
+            _contentTypeService = Mock.Of<IContentTypeService>();
+            var mediaTypeService = Mock.Of<IMediaTypeService>();
+            var memberTypeService = Mock.Of<IMemberTypeService>();
+            Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService, contentTypeBaseServiceProvider: new ContentTypeBaseServiceProvider(_contentTypeService, mediaTypeService, memberTypeService)));
+        }
 
         [Test]
         public void DirtyProperty_Reset_Clears_SavedPublishedState()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             content.PublishedState = PublishedState.Publishing;
@@ -30,6 +68,8 @@ public void DirtyProperty_Reset_Clears_SavedPublishedState()
         public void DirtyProperty_OnlyIfActuallyChanged_Content()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // if you assign a content property with its value it is not dirty
@@ -52,6 +92,8 @@ public void DirtyProperty_OnlyIfActuallyChanged_Content()
         public void DirtyProperty_OnlyIfActuallyChanged_User()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
             var prop = content.Properties.First();
 
@@ -76,6 +118,8 @@ public void DirtyProperty_OnlyIfActuallyChanged_User()
         public void DirtyProperty_UpdateDate()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
             var prop = content.Properties.First();
 
@@ -99,6 +143,8 @@ public void DirtyProperty_UpdateDate()
         public void DirtyProperty_WasDirty_ContentProperty()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
             content.ResetDirtyProperties(false);
             Assert.IsFalse(content.IsDirty());
@@ -126,6 +172,8 @@ public void DirtyProperty_WasDirty_ContentProperty()
         public void DirtyProperty_WasDirty_ContentSortOrder()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
             content.ResetDirtyProperties(false);
             Assert.IsFalse(content.IsDirty());
@@ -153,6 +201,8 @@ public void DirtyProperty_WasDirty_ContentSortOrder()
         public void DirtyProperty_WasDirty_UserProperty()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
             var prop = content.Properties.First();
             content.ResetDirtyProperties(false);
@@ -178,7 +228,5 @@ public void DirtyProperty_WasDirty_UserProperty()
             //Assert.IsFalse(content.WasDirty()); // not impacted by user properties
             Assert.IsTrue(content.WasDirty()); // now it is!
         }
-
-        #endregion
     }
 }
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 844a6098787a..ad49fb226b1e 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -17,6 +17,7 @@
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
@@ -28,6 +29,8 @@ namespace Umbraco.Tests.Models
     [TestFixture]
     public class ContentTests : UmbracoTestBase
     {
+        private IContentTypeService _contentTypeService;
+
         protected override void Compose()
         {
             base.Compose();
@@ -48,19 +51,24 @@ protected override void Compose()
             Mock.Get(dataTypeService)
                 .Setup(x => x.GetDataType(It.IsAny<int>()))
                 .Returns(() => dataType);
-            Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService));
+
+            _contentTypeService = Mock.Of<IContentTypeService>();
+            var mediaTypeService = Mock.Of<IMediaTypeService>();
+            var memberTypeService = Mock.Of<IMemberTypeService>();
+            Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService, contentTypeBaseServiceProvider: new ContentTypeBaseServiceProvider(_contentTypeService, mediaTypeService, memberTypeService)));
         }
 
         [Test]
         public void Variant_Culture_Names_Track_Dirty_Changes()
         {
             var contentType = new ContentType(-1) { Alias = "contentType" };
+            contentType.Variations = ContentVariation.Culture;
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = new Content("content", -1, contentType) { Id = 1, VersionId = 1 };
 
             const string langFr = "fr-FR";
 
-            contentType.Variations = ContentVariation.Culture;
-
             Assert.IsFalse(content.IsPropertyDirty("CultureInfos"));    //hasn't been changed
 
             Thread.Sleep(500);                                          //The "Date" wont be dirty if the test runs too fast since it will be the same date
@@ -123,6 +131,7 @@ public void Get_Non_Grouped_Properties()
 
             //ensure that nothing is marked as dirty
             contentType.ResetDirtyProperties(false);
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
 
 
             var content = MockedContent.CreateSimpleContent(contentType);
@@ -138,6 +147,8 @@ public void Get_Non_Grouped_Properties()
         public void All_Dirty_Properties_Get_Reset()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             content.ResetDirtyProperties(false);
@@ -154,6 +165,8 @@ public void Can_Verify_Mocked_Content()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -167,6 +180,8 @@ public void Can_Change_Property_Value()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -183,6 +198,8 @@ public void Can_Set_Property_Value_As_String()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -199,6 +216,8 @@ public void Can_Clone_Content_With_Reset_Identity()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
             content.Id = 10;
             content.Key = new Guid("29181B97-CB8F-403F-86DE-5FEB497F4800");
@@ -278,6 +297,8 @@ public void Can_Deep_Clone()
             var contentType = MockedContentTypes.CreateTextPageContentType();
             contentType.Id = 99;
             contentType.Variations = ContentVariation.Culture;
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             content.SetCultureName("Hello", "en-US");
@@ -387,6 +408,8 @@ public void Remember_Dirty_Properties()
             var contentType = MockedContentTypes.CreateTextPageContentType();
             contentType.Id = 99;
             contentType.Variations = ContentVariation.Culture;
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             content.SetCultureName("Hello", "en-US");
@@ -458,6 +481,8 @@ public void Can_Serialize_Without_Error()
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
             contentType.Id = 99;
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
             var i = 200;
             foreach (var property in content.Properties)
@@ -509,6 +534,8 @@ public void Can_Change_Property_Value_Through_Anonymous_Object()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -527,6 +554,8 @@ public void Can_Verify_Dirty_Property_On_Content()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -591,6 +620,8 @@ public void Can_Add_New_Property_To_New_PropertyType()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -613,6 +644,8 @@ public void Can_Add_New_Property_To_New_PropertyType_In_New_PropertyGroup()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -642,6 +675,8 @@ public void Can_Update_PropertyType_Through_Content_Properties()
         {
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act - note that the PropertyType's properties like SortOrder is not updated through the Content object
@@ -663,6 +698,8 @@ public void Can_Change_ContentType_On_Content()
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
             var simpleContentType = MockedContentTypes.CreateSimpleContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -680,6 +717,8 @@ public void Can_Change_ContentType_On_Content_And_Set_Property_Value()
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
             var simpleContentType = MockedContentTypes.CreateSimpleContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -697,6 +736,8 @@ public void Can_Change_ContentType_On_Content_And_Still_Get_Old_Properties()
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
             var simpleContentType = MockedContentTypes.CreateSimpleContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -716,6 +757,8 @@ public void Can_Change_ContentType_On_Content_And_Clear_Old_PropertyTypes()
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
             var simpleContentType = MockedContentTypes.CreateSimpleContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
@@ -731,6 +774,8 @@ public void Can_Change_ContentType_On_Content_And_Clear_Old_PropertyTypes()
         public void Can_Verify_Content_Is_Published()
         {
             var contentType = MockedContentTypes.CreateTextPageContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             content.ResetDirtyProperties();
@@ -800,6 +845,8 @@ public void After_Committing_Changes_Was_Dirty_Is_True_On_Changed_Property()
             // Arrange
             var contentType = MockedContentTypes.CreateTextPageContentType();
             contentType.ResetDirtyProperties(); //reset
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateTextpageContent(contentType, "test", -1);
             content.ResetDirtyProperties();
 
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
index e3551921d815..1817414f69b8 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
@@ -4,15 +4,20 @@
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.Composers;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Services;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Tests.Testing;
+using Umbraco.Web.PropertyEditors;
 using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Tests.Models.Mapping
@@ -21,12 +26,37 @@ namespace Umbraco.Tests.Models.Mapping
     [UmbracoTest(AutoMapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
     public class ContentWebModelMappingTests : TestWithDatabaseBase
     {
+        private IContentTypeService _contentTypeService;
+
+
         protected override void Compose()
         {
             base.Compose();
 
             Composition.RegisterUnique(f => Mock.Of<ICultureDictionaryFactory>());
-            Composition.RegisterUnique(f => Mock.Of<IContentTypeService>());
+
+            Composition.Register(_ => Mock.Of<ILogger>());
+            Composition.ComposeFileSystems();
+
+            Composition.Register(_ => Mock.Of<IDataTypeService>());
+            Composition.Register(_ => Mock.Of<IContentSection>());
+
+            // all this is required so we can validate properties...
+            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>()) { Alias = "test" };
+            Composition.Register(_ => new DataEditorCollection(new[] { editor }));
+            Composition.Register<PropertyEditorCollection>();
+            var dataType = Mock.Of<IDataType>();
+            Mock.Get(dataType).Setup(x => x.Configuration).Returns(() => new object());
+            var dataTypeService = Mock.Of<IDataTypeService>();
+            Mock.Get(dataTypeService)
+                .Setup(x => x.GetDataType(It.IsAny<int>()))
+                .Returns(() => dataType);
+
+            _contentTypeService = Mock.Of<IContentTypeService>();
+            var mediaTypeService = Mock.Of<IMediaTypeService>();
+            var memberTypeService = Mock.Of<IMemberTypeService>();
+            Composition.RegisterUnique(_ => _contentTypeService);
+            Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService, contentTypeBaseServiceProvider: new ContentTypeBaseServiceProvider(_contentTypeService, mediaTypeService, memberTypeService)));
         }
 
         [DataEditor("Test.Test", "Test", "~/Test.html")]
@@ -53,6 +83,8 @@ private void FixUsers(IContentBase content)
         public void To_Media_Item_Simple()
         {
             var contentType = MockedContentTypes.CreateImageMediaType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedMedia.CreateMediaImage(contentType, -1);
             FixUsers(content);
 
@@ -70,6 +102,8 @@ public void To_Media_Item_Simple()
         public void To_Content_Item_Simple()
         {
             var contentType = MockedContentTypes.CreateSimpleContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateSimpleContent(contentType);
             FixUsers(content);
 
@@ -87,6 +121,8 @@ public void To_Content_Item_Simple()
         public void To_Content_Item_Dto()
         {
             var contentType = MockedContentTypes.CreateSimpleContentType();
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+
             var content = MockedContent.CreateSimpleContent(contentType);
             FixUsers(content);
 
@@ -117,8 +153,8 @@ public void To_Media_Item_Dto()
         public void To_Display_Model()
         {
             var contentType = MockedContentTypes.CreateSimpleContentType();
-            var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
-            contentTypeServiceMock.Setup(x => x.Get(contentType.Id)).Returns(() => contentType);
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+            Mock.Get(_contentTypeService).Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
 
             var content = MockedContent.CreateSimpleContent(contentType);
 
@@ -127,7 +163,7 @@ public void To_Display_Model()
 
             // need ids for tabs
             var id = 1;
-            foreach (var g in content.PropertyGroups)
+            foreach (var g in contentType.CompositionPropertyGroups)
                 g.Id = id++;
 
             var result = Mapper.Map<IContent, ContentItemDisplay>(content);
@@ -141,7 +177,7 @@ public void To_Display_Model()
                 AssertDisplayProperty(invariantContent, p);
             }
 
-            Assert.AreEqual(content.PropertyGroups.Count(), invariantContent.Tabs.Count());
+            Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count());
             Assert.IsTrue(invariantContent.Tabs.First().IsActive);
             Assert.IsTrue(invariantContent.Tabs.Except(new[] { invariantContent.Tabs.First() }).All(x => x.IsActive == false));
         }
@@ -151,9 +187,8 @@ public void To_Display_Model_No_Tabs()
         {
             var contentType = MockedContentTypes.CreateSimpleContentType();
             contentType.PropertyGroups.Clear();
-            var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
-            contentTypeServiceMock.Setup(x => x.Get(contentType.Id)).Returns(() => contentType);
-
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+            Mock.Get(_contentTypeService).Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
 
             var content = new Content("Home", -1, contentType) { Level = 1, SortOrder = 1, CreatorId = 0, WriterId = 0 };
 
@@ -168,7 +203,7 @@ public void To_Display_Model_No_Tabs()
                 AssertDisplayProperty(invariantContent, p);
             }
 
-            Assert.AreEqual(content.PropertyGroups.Count(), invariantContent.Tabs.Count());
+            Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count());
         }
 
         [Test]
@@ -186,8 +221,8 @@ public void To_Display_Model_With_Non_Grouped_Properties()
                 p.Id = idSeed;
                 idSeed++;
             }
-            var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
-            contentTypeServiceMock.Setup(x => x.Get(contentType.Id)).Returns(() => contentType);
+            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+            Mock.Get(_contentTypeService).Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
 
 
             var content = MockedContent.CreateSimpleContent(contentType);
@@ -200,7 +235,7 @@ public void To_Display_Model_With_Non_Grouped_Properties()
             }
             //need ids for tabs
             var id = 1;
-            foreach (var g in content.PropertyGroups)
+            foreach (var g in contentType.CompositionPropertyGroups)
             {
                 g.Id = id;
                 id++;
@@ -221,7 +256,7 @@ public void To_Display_Model_With_Non_Grouped_Properties()
                 AssertDisplayProperty(invariantContent, p);
             }
 
-            Assert.AreEqual(content.PropertyGroups.Count(), invariantContent.Tabs.Count() - 1);
+            Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count() - 1);
             Assert.IsTrue(invariantContent.Tabs.Any(x => x.Label == Current.Services.TextService.Localize("general/properties")));
             Assert.AreEqual(2, invariantContent.Tabs.Where(x => x.Label == Current.Services.TextService.Localize("general/properties")).SelectMany(x => x.Properties.Where(p => p.Alias.StartsWith("_umb_") == false)).Count());
         }
diff --git a/src/Umbraco.Tests/Models/MemberTests.cs b/src/Umbraco.Tests/Models/MemberTests.cs
index c09f2e94603f..5e92ad7ccf03 100644
--- a/src/Umbraco.Tests/Models/MemberTests.cs
+++ b/src/Umbraco.Tests/Models/MemberTests.cs
@@ -67,20 +67,7 @@ public void Can_Deep_Clone()
             Assert.AreEqual(clone.Id, member.Id);
             Assert.AreEqual(clone.VersionId, member.VersionId);
             Assert.AreEqual(clone.AdditionalData, member.AdditionalData);
-            Assert.AreNotSame(clone.ContentType, member.ContentType);
             Assert.AreEqual(clone.ContentType, member.ContentType);
-            Assert.AreEqual(clone.ContentType.PropertyGroups.Count, member.ContentType.PropertyGroups.Count);
-            for (var index = 0; index < member.ContentType.PropertyGroups.Count; index++)
-            {
-                Assert.AreNotSame(clone.ContentType.PropertyGroups[index], member.ContentType.PropertyGroups[index]);
-                Assert.AreEqual(clone.ContentType.PropertyGroups[index], member.ContentType.PropertyGroups[index]);
-            }
-            Assert.AreEqual(clone.ContentType.PropertyTypes.Count(), member.ContentType.PropertyTypes.Count());
-            for (var index = 0; index < member.ContentType.PropertyTypes.Count(); index++)
-            {
-                Assert.AreNotSame(clone.ContentType.PropertyTypes.ElementAt(index), member.ContentType.PropertyTypes.ElementAt(index));
-                Assert.AreEqual(clone.ContentType.PropertyTypes.ElementAt(index), member.ContentType.PropertyTypes.ElementAt(index));
-            }
             Assert.AreEqual(clone.ContentTypeId, member.ContentTypeId);
             Assert.AreEqual(clone.CreateDate, member.CreateDate);
             Assert.AreEqual(clone.CreatorId, member.CreatorId);
@@ -112,6 +99,9 @@ public void Can_Deep_Clone()
                 Assert.AreEqual(clone.Properties[index], member.Properties[index]);
             }
 
+            // this can be the same, it is immutable
+            Assert.AreSame(clone.ContentType, member.ContentType);
+
             //This double verifies by reflection
             var allProps = clone.GetType().GetProperties();
             foreach (var propertyInfo in allProps)
diff --git a/src/Umbraco.Tests/Models/VariationTests.cs b/src/Umbraco.Tests/Models/VariationTests.cs
index 0ccdabe92822..36fb399fa72b 100644
--- a/src/Umbraco.Tests/Models/VariationTests.cs
+++ b/src/Umbraco.Tests/Models/VariationTests.cs
@@ -227,6 +227,9 @@ public void ContentNames()
             // now it will work
             contentType.Variations = ContentVariation.Culture;
 
+            // recreate content to re-capture content type variations
+            content = new Content("content", -1, contentType) { Id = 1, VersionId = 1 };
+
             // invariant name works
             content.Name = "name";
             Assert.AreEqual("name", content.GetCultureName(null));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
index 459dbeb587a5..2c4f3f190800 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
@@ -130,10 +130,11 @@ public void CreateVersions()
                 var hasPropertiesContentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 ServiceContext.FileService.SaveTemplate(hasPropertiesContentType.DefaultTemplate); // else, FK violation on contentType!
 
+                contentTypeRepository.Save(hasPropertiesContentType);
+
                 IContent content1 = MockedContent.CreateSimpleContent(hasPropertiesContentType);
 
                 // save = create the initial version
-                contentTypeRepository.Save(hasPropertiesContentType);
                 repository.Save(content1);
 
                 versions.Add(content1.VersionId); // the first version
@@ -399,9 +400,10 @@ public void SaveContent()
                 var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository);
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
+                contentTypeRepository.Save(contentType);
+
                 IContent textpage = MockedContent.CreateSimpleContent(contentType);
 
-                contentTypeRepository.Save(contentType);
                 repository.Save(textpage);
                 scope.Complete();
 
@@ -487,9 +489,10 @@ public void SaveContentMultiple()
                 var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository);
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
+                contentTypeRepository.Save(contentType);
+
                 var textpage = MockedContent.CreateSimpleContent(contentType);
 
-                contentTypeRepository.Save(contentType);
                 repository.Save(textpage);
 
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index cbd591950a4e..1c1b5e60f46e 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -61,8 +61,9 @@ public void CacheActiveForIntsAndGuids()
                 udb.EnableSqlCount = false;
 
                 var mediaType = MockedContentTypes.CreateSimpleMediaType("umbTextpage1", "Textpage");
-                var media = MockedMedia.CreateSimpleMedia(mediaType, "hello", -1);
                 mediaTypeRepository.Save(mediaType);
+
+                var media = MockedMedia.CreateSimpleMedia(mediaType, "hello", -1);
                 repository.Save(media);
 
                 udb.EnableSqlCount = true;
@@ -271,7 +272,7 @@ public void QueryMedia_ContentTypeIdFilter()
                     var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
                     repository.Save(folder);
                 }
-                
+
 
                 var types = new[] { 1031 };
                 var query = scope.SqlContext.Query<IMedia>().Where(x => types.Contains(x.ContentTypeId));
@@ -302,7 +303,7 @@ public void QueryMedia_ContentTypeAliasFilter()
                     var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
                     repository.Save(folder);
                 }
-                
+
 
                 var types = new[] { "Folder" };
                 var query = scope.SqlContext.Query<IMedia>().Where(x => types.Contains(x.ContentType.Alias));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
index dea15cd4ad19..c46a09068570 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
@@ -164,21 +164,19 @@ public void MemberHasBuiltinProperties()
 
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
                 memberTypeRepository.Save(memberType);
-                
 
                 var member = MockedMember.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
                 repository.Save(member);
-                
 
                 var sut = repository.Get(member.Id);
 
-                Assert.That(sut.ContentType.PropertyGroups.Count(), Is.EqualTo(2));
-                Assert.That(sut.ContentType.PropertyTypes.Count(), Is.EqualTo(3 + Constants.Conventions.Member.GetStandardPropertyTypeStubs().Count));
+                Assert.That(memberType.CompositionPropertyGroups.Count(), Is.EqualTo(2));
+                Assert.That(memberType.CompositionPropertyTypes.Count(), Is.EqualTo(3 + Constants.Conventions.Member.GetStandardPropertyTypeStubs().Count));
                 Assert.That(sut.Properties.Count(), Is.EqualTo(3 + Constants.Conventions.Member.GetStandardPropertyTypeStubs().Count));
-                var grp = sut.PropertyGroups.FirstOrDefault(x => x.Name == Constants.Conventions.Member.StandardPropertiesGroupName);
+                var grp = memberType.CompositionPropertyGroups.FirstOrDefault(x => x.Name == Constants.Conventions.Member.StandardPropertiesGroupName);
                 Assert.IsNotNull(grp);
                 var aliases = Constants.Conventions.Member.GetStandardPropertyTypeStubs().Select(x => x.Key).ToArray();
-                foreach (var p in sut.PropertyTypes.Where(x => aliases.Contains(x.Alias)))
+                foreach (var p in memberType.CompositionPropertyTypes.Where(x => aliases.Contains(x.Alias)))
                 {
                     Assert.AreEqual(grp.Id, p.PropertyGroupId.Value);
                 }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index 8f750f9238e4..1d50fcac9e54 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -75,7 +75,7 @@ public void Can_Perform_Add_On_UserRepository()
 
                 // Act
                 repository.Save(user);
-                
+
 
                 // Assert
                 Assert.That(user.HasIdentity, Is.True);
@@ -96,9 +96,9 @@ public void Can_Perform_Multiple_Adds_On_UserRepository()
 
                 // Act
                 repository.Save(user1);
-                
+
                 repository.Save(use2);
-                
+
 
                 // Assert
                 Assert.That(user1.HasIdentity, Is.True);
@@ -117,7 +117,7 @@ public void Can_Verify_Fresh_Entity_Is_Not_Dirty()
 
                 var user = MockedUser.CreateUser();
                 repository.Save(user);
-                
+
 
                 // Act
                 var resolved = repository.Get((int)user.Id);
@@ -132,9 +132,7 @@ public void Can_Verify_Fresh_Entity_Is_Not_Dirty()
         public void Can_Perform_Update_On_UserRepository()
         {
             var ct = MockedContentTypes.CreateBasicContentType("test");
-            var content = MockedContent.CreateBasicContent(ct);
             var mt = MockedContentTypes.CreateSimpleMediaType("testmedia", "TestMedia");
-            var media = MockedMedia.CreateSimpleMedia(mt, "asdf", -1);
 
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
@@ -147,11 +145,12 @@ public void Can_Perform_Update_On_UserRepository()
 
                 contentTypeRepo.Save(ct);
                 mediaTypeRepo.Save(mt);
-                
+
+                var content = MockedContent.CreateBasicContent(ct);
+                var media = MockedMedia.CreateSimpleMedia(mt, "asdf", -1);
 
                 contentRepository.Save(content);
                 mediaRepository.Save(media);
-                
 
                 var user = CreateAndCommitUserWithGroup(userRepository, userGroupRepository);
 
@@ -171,7 +170,7 @@ public void Can_Perform_Update_On_UserRepository()
                 resolved.Username = "newName";
 
                 userRepository.Save(resolved);
-                
+
                 var updatedItem = (User) userRepository.Get(user.Id);
 
                 // Assert
@@ -204,13 +203,13 @@ public void Can_Perform_Delete_On_UserRepository()
 
                 // Act
                 repository.Save(user);
-                
+
                 var id = user.Id;
 
                 var repository2 = new UserRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, Mock.Of<IMapperCollection>(),TestObjects.GetGlobalSettings());
 
                 repository2.Delete(user);
-                
+
 
                 var resolved = repository2.Get((int) id);
 
@@ -373,7 +372,7 @@ public void Can_Get_Paged_Results_By_Query_And_Filter_And_Groups()
                     scope.Database.AsUmbracoDatabase().EnableSqlCount = false;
                 }
             }
-            
+
         }
 
         [Test]
@@ -429,7 +428,7 @@ private static User CreateAndCommitUserWithGroup(IUserRepository repository, IUs
         {
             var user = MockedUser.CreateUser();
             repository.Save(user);
-            
+
 
             var group = MockedUserGroup.CreateUserGroup();
             userGroupRepository.AddOrUpdateGroupWithUsers(@group, new[] { user.Id });
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index 1319d00c4897..7a7aad690531 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -554,7 +554,6 @@ public void Deleting_PropertyType_Removes_The_Property_From_Content()
             IContent contentItem = MockedContent.CreateTextpageContent(contentType1, "Testing", -1);
             ServiceContext.ContentService.SaveAndPublish(contentItem);
             var initProps = contentItem.Properties.Count;
-            var initPropTypes = contentItem.PropertyTypes.Count();
 
             //remove a property
             contentType1.RemovePropertyType(contentType1.PropertyTypes.First().Alias);
@@ -563,7 +562,6 @@ public void Deleting_PropertyType_Removes_The_Property_From_Content()
             //re-load it from the db
             contentItem = ServiceContext.ContentService.GetById(contentItem.Id);
 
-            Assert.AreEqual(initPropTypes - 1, contentItem.PropertyTypes.Count());
             Assert.AreEqual(initProps - 1, contentItem.Properties.Count);
         }
 
diff --git a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
index 459daa3da659..5f4a87c3eb8e 100644
--- a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
@@ -83,7 +83,6 @@ public void Deleting_PropertyType_Removes_The_Property_From_Member()
             IMember member = MockedMember.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
             ServiceContext.MemberService.Save(member);
             var initProps = member.Properties.Count;
-            var initPropTypes = member.PropertyTypes.Count();
 
             //remove a property (NOT ONE OF THE DEFAULTS)
             var standardProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
@@ -93,7 +92,6 @@ public void Deleting_PropertyType_Removes_The_Property_From_Member()
             //re-load it from the db
             member = ServiceContext.MemberService.GetById(member.Id);
 
-            Assert.AreEqual(initPropTypes - 1, member.PropertyTypes.Count());
             Assert.AreEqual(initProps - 1, member.Properties.Count);
         }
 
diff --git a/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs b/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
index 58d4dfbd7f61..85ecf03dee3c 100644
--- a/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
+++ b/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Tests.Testing
@@ -7,7 +9,7 @@ namespace Umbraco.Tests.Testing
     public static class ContentBaseExtensions
     {
         /// <summary>
-        /// Set property values by alias with an annonymous object.
+        /// Set property values by alias with an anonymous object.
         /// </summary>
         /// <remarks>Does not support variants.</remarks>
         public static void PropertyValues(this IContentBase content, object value, string culture = null, string segment = null)
@@ -15,11 +17,13 @@ public static void PropertyValues(this IContentBase content, object value, strin
             if (value == null)
                 throw new Exception("No properties has been passed in");
 
+            var contentType = Current.Services.ContentTypeBaseServices.GetContentTypeOf(content);
+
             var propertyInfos = value.GetType().GetProperties();
             foreach (var propertyInfo in propertyInfos)
             {
                 //Check if a PropertyType with alias exists thus being a valid property
-                var propertyType = content.PropertyTypes.FirstOrDefault(x => x.Alias == propertyInfo.Name);
+                var propertyType = contentType.CompositionPropertyTypes.FirstOrDefault(x => x.Alias == propertyInfo.Name);
                 if (propertyType == null)
                     throw new Exception($"The property alias {propertyInfo.Name} is not valid, because no PropertyType with this alias exists");
 
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index 6fe921e13fda..f7b1799d63d6 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -110,7 +110,7 @@ public static IMediaService GetMockMediaService()
                         m.GetCultureName(It.IsAny<string>()) == (string)x.Attribute("nodeName") &&
                         m.Path == (string)x.Attribute("path") &&
                         m.Properties == new PropertyCollection() &&
-                        m.ContentType == Mock.Of<IMediaType>(mt =>
+                        m.ContentType == Mock.Of<ISimpleContentType>(mt =>
                             mt.Alias == (string)x.Attribute("nodeTypeAlias") &&
                             mt.Id == (int)x.Attribute("nodeType"))))
                 .ToArray();
diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
index 37600e2f895b..d0c09d33402e 100644
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
@@ -43,6 +43,14 @@ namespace Umbraco.Tests.Web.Controllers
     [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
     public class ContentControllerTests : TestWithDatabaseBase
     {
+        private IContentType _contentTypeForMockedContent;
+
+        public override void SetUp()
+        {
+            base.SetUp();
+            _contentTypeForMockedContent = null;
+        }
+
         protected override void ComposeApplication(bool withApplication)
         {
             base.ComposeApplication(withApplication);
@@ -115,23 +123,42 @@ private MultipartFormDataContent GetMultiPartRequestContent(string json)
             };
         }
 
-        private IContent GetMockedContent()
+        private IContentType GetMockedContentType()
         {
-            var content = MockedContent.CreateSimpleContent(MockedContentTypes.CreateSimpleContentType());
-            content.Id = 123;
-            content.Path = "-1,123";
+            var contentType = MockedContentTypes.CreateSimpleContentType();
             //ensure things have ids
             var ids = 888;
-            foreach (var g in content.PropertyGroups)
+            foreach (var g in contentType.CompositionPropertyGroups)
             {
                 g.Id = ids;
                 ids++;
             }
-            foreach (var p in content.PropertyTypes)
+            foreach (var p in contentType.CompositionPropertyGroups)
             {
                 p.Id = ids;
                 ids++;
             }
+
+            return contentType;
+        }
+
+        private IContent GetMockedContent()
+        {
+            if (_contentTypeForMockedContent == null)
+            {
+                _contentTypeForMockedContent = GetMockedContentType();
+                Mock.Get(Current.Services.ContentTypeService)
+                    .Setup(x => x.Get(_contentTypeForMockedContent.Id))
+                    .Returns(_contentTypeForMockedContent);
+                Mock.Get(Current.Services.ContentTypeService)
+                    .As<IContentTypeBaseService>()
+                    .Setup(x => x.Get(_contentTypeForMockedContent.Id))
+                    .Returns(_contentTypeForMockedContent);
+            }
+
+            var content = MockedContent.CreateSimpleContent(_contentTypeForMockedContent);
+            content.Id = 123;
+            content.Path = "-1,123";
             return content;
         }
 
@@ -229,7 +256,7 @@ ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoCont
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
                     helper);
-                
+
                 return controller;
             }
 
@@ -251,9 +278,6 @@ public async Task PostSave_Validate_At_Least_One_Variant_Flagged_For_Saving()
         {
             ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
-                var contentServiceMock = Mock.Get(Current.Services.ContentService);
-                contentServiceMock.Setup(x => x.GetById(123)).Returns(() => GetMockedContent());
-
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var controller = new ContentController(
                     propertyEditorCollection,
@@ -336,15 +360,11 @@ public async Task PostSave_Simple_Invariant()
 
             ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
-
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
                 contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
-                var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
-                contentTypeServiceMock.Setup(x => x.Get(content.ContentTypeId)).Returns(() => MockedContentTypes.CreateSimpleContentType());
-
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var controller = new ContentController(
                     propertyEditorCollection,
@@ -369,8 +389,6 @@ ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoCont
             Assert.AreEqual(HttpStatusCode.OK, response.Item1.StatusCode);
             var display = JsonConvert.DeserializeObject<ContentItemDisplay>(response.Item2);
             Assert.AreEqual(1, display.Variants.Count());
-            Assert.AreEqual(content.PropertyGroups.Count(), display.Variants.ElementAt(0).Tabs.Count());
-            Assert.AreEqual(content.PropertyTypes.Count(), display.Variants.ElementAt(0).Tabs.ElementAt(0).Properties.Count());
         }
 
         [Test]
@@ -380,15 +398,11 @@ public async Task PostSave_Validate_Empty_Name()
 
             ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
-
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
                 contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
-                var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
-                contentTypeServiceMock.Setup(x => x.Get(content.ContentTypeId)).Returns(() => MockedContentTypes.CreateSimpleContentType());
-
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var controller = new ContentController(
                     propertyEditorCollection,
@@ -428,15 +442,11 @@ public async Task PostSave_Validate_Variants_Empty_Name()
 
             ApiController CtrlFactory(HttpRequestMessage message, UmbracoContext umbracoContext, UmbracoHelper helper)
             {
-
                 var contentServiceMock = Mock.Get(Current.Services.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
                 contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
                     .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
 
-                var contentTypeServiceMock = Mock.Get(Current.Services.ContentTypeService);
-                contentTypeServiceMock.Setup(x => x.Get(content.ContentTypeId)).Returns(() => MockedContentTypes.CreateSimpleContentType());
-
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var controller = new ContentController(
                     propertyEditorCollection,

From bcfbab2add6558331ba74aa3b751abe3e0a4bcc9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 23:12:01 +1100
Subject: [PATCH 322/421] fixing tests

---
 src/Umbraco.Tests/App.config | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 5e366eef33df..49de6254503c 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -64,23 +64,23 @@
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-              <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
+              <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
+              <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
@@ -88,7 +88,7 @@
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-              <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
+              <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
@@ -100,11 +100,11 @@
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-              <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0"/>
+              <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-              <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0"/>
+              <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
           </dependentAssembly>
           <dependentAssembly>
               <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>

From b95b02d0c03e561f91227e0cb666ba6fb3553c4d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Feb 2019 23:51:12 +1100
Subject: [PATCH 323/421] ensure the culture is bumped if a property of that
 culture is modified, fixes up the AdjustDates method and tests

---
 src/Umbraco.Core/Models/ContentBase.cs        |  5 +++++
 .../Models/ContentCultureInfosCollection.cs   | 16 +--------------
 .../Models/ContentRepositoryExtensions.cs     | 20 ++++++++++++-------
 .../Services/ContentServiceEventTests.cs      |  8 ++++----
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 6de1bc71c90c..75d5a5f11323 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -302,6 +302,8 @@ public void SetValue(string propertyTypeAlias, object value, string culture = nu
             if (Properties.Contains(propertyTypeAlias))
             {
                 Properties[propertyTypeAlias].SetValue(value, culture, segment);
+                //bump the culture to be flagged for updating
+                this.TouchCulture(culture);
                 return;
             }
 
@@ -312,6 +314,9 @@ public void SetValue(string propertyTypeAlias, object value, string culture = nu
             var property = propertyType.CreateProperty();
             property.SetValue(value, culture, segment);
             Properties.Add(property);
+
+            //bump the culture to be flagged for updating
+            this.TouchCulture(culture);
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs b/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
index 287182d20e31..52f6f9adb6c2 100644
--- a/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
+++ b/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
@@ -17,21 +17,7 @@ public class ContentCultureInfosCollection : ObservableDictionary<string, Conten
         public ContentCultureInfosCollection()
             : base(x => x.Culture, StringComparer.InvariantCultureIgnoreCase)
         { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContentCultureInfosCollection"/> class with items.
-        /// </summary>
-        public ContentCultureInfosCollection(IEnumerable<ContentCultureInfos> items)
-            : base(x => x.Culture, StringComparer.InvariantCultureIgnoreCase)
-        {
-            // make sure to add *copies* and not the original items,
-            // as items can be modified by AddOrUpdate, and therefore
-            // the new collection would be impacted by changes made
-            // to the old collection
-            foreach (var item in items)
-                Add(new ContentCultureInfos(item));
-        }
-
+        
         /// <summary>
         /// Adds or updates a <see cref="ContentCultureInfos"/> instance.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
index 31e040f2d4a8..8d4e962ae1f6 100644
--- a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
@@ -142,7 +142,15 @@ public static void SetPublishInfo(this IContent content, string culture, string
             content.PublishCultureInfos.AddOrUpdate(culture, name, date);
         }
 
-        // adjust dates to sync between version, cultures etc used by the repo when persisting
+        /// <summary>
+        /// Used to synchronize all culture dates to the same date if they've been modified
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="date"></param>
+        /// <remarks>
+        /// This is so that in an operation where (for example) 2 languages are updates like french and english, it is possible that
+        /// these dates assigned to them differ by a couple of Ticks, but we need to ensure they are persisted at the exact same time.
+        /// </remarks>
         public static void AdjustDates(this IContent content, DateTime date)
         {
             foreach (var culture in content.PublishedCultures.ToList())
@@ -150,11 +158,9 @@ public static void AdjustDates(this IContent content, DateTime date)
                 if (!content.PublishCultureInfos.TryGetValue(culture, out var publishInfos))
                     continue;
 
-                //fixme: Removing the logic here for the old WasCulturePublished and the _publishInfosOrig has broken
-                // the test Can_Rollback_Version_On_Multilingual, but we need to understand what it's doing since I don't
-
-                //fixme: Because this is being called, we end up updating a culture which triggers the dirty change tracking
-                // which ends up in error because the culture is not actually being updated which causes the tests to fail
+                if (!publishInfos.IsDirty())
+                    continue; //if it's not dirty, it means it hasn't changed so there's nothing to adjust
+                
                 content.PublishCultureInfos.AddOrUpdate(culture, publishInfos.Name, date);
 
                 if (content.CultureInfos.TryGetValue(culture, out var infos))
@@ -276,7 +282,7 @@ public static void ClearPublishInfo(this IContent content, string culture)
         /// <summary>
         /// Updates a culture date, if the culture exists.
         /// </summary>
-        public static void TouchCulture(this IContent content, string culture)
+        public static void TouchCulture(this IContentBase content, string culture)
         {
             if (!content.CultureInfos.TryGetValue(culture, out var infos)) return;
             content.CultureInfos.AddOrUpdate(culture, infos.Name, DateTime.Now);
diff --git a/src/Umbraco.Tests/Services/ContentServiceEventTests.cs b/src/Umbraco.Tests/Services/ContentServiceEventTests.cs
index b4fde295a71f..1547ec232abc 100644
--- a/src/Umbraco.Tests/Services/ContentServiceEventTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceEventTests.cs
@@ -64,8 +64,8 @@ void OnSaving(IContentService sender, ContentSavingEventArgs e)
 
                 Assert.AreSame(document, saved);
 
-                Assert.IsTrue(e.IsSavingCulture(saved, "fr-FR"));
-                Assert.IsFalse(e.IsSavingCulture(saved, "en-UK"));
+                Assert.IsTrue(e.IsSavingCulture(saved, "en-US"));
+                Assert.IsFalse(e.IsSavingCulture(saved, "fr-FR"));
             }
 
             void OnSaved(IContentService sender, ContentSavedEventArgs e)
@@ -74,8 +74,8 @@ void OnSaved(IContentService sender, ContentSavedEventArgs e)
 
                 Assert.AreSame(document, saved);
 
-                Assert.IsTrue(e.HasSavedCulture(saved, "fr-FR"));
-                Assert.IsFalse(e.HasSavedCulture(saved, "en-UK"));
+                Assert.IsTrue(e.HasSavedCulture(saved, "en-US"));
+                Assert.IsFalse(e.HasSavedCulture(saved, "fr-FR"));
             }
 
             ContentService.Saving += OnSaving;

From e2c86a96fe073ea1a2b715c249e5cc8558d4378c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 00:05:25 +1100
Subject: [PATCH 324/421] Ensures change collections are cleared on clone

---
 src/Umbraco.Core/Models/Content.cs     | 8 ++++++++
 src/Umbraco.Core/Models/ContentBase.cs | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 9a1ae7eda527..efc9e216b9ec 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -472,6 +472,14 @@ protected override void PerformDeepClone(object clone)
                 clonedContent._schedule = (ContentScheduleCollection)_schedule.DeepClone();     //manually deep clone
                 clonedContent._schedule.CollectionChanged += clonedContent.ScheduleCollectionChanged;   //re-assign correct event handler
             }
+
+            clonedContent._currentPublishCultureChanges.updatedCultures = null;
+            clonedContent._currentPublishCultureChanges.addedCultures = null;
+            clonedContent._currentPublishCultureChanges.removedCultures = null;
+
+            clonedContent._previousPublishCultureChanges.updatedCultures = null;
+            clonedContent._previousPublishCultureChanges.addedCultures = null;
+            clonedContent._previousPublishCultureChanges.removedCultures = null;
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 75d5a5f11323..db41c31d3233 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -495,6 +495,14 @@ protected override void PerformDeepClone(object clone)
                 clonedContent._properties = (PropertyCollection)_properties.DeepClone(); //manually deep clone
                 clonedContent._properties.CollectionChanged += clonedContent.PropertiesChanged;   //re-assign correct event handler
             }
+
+            clonedContent._currentCultureChanges.updatedCultures = null;
+            clonedContent._currentCultureChanges.addedCultures = null;
+            clonedContent._currentCultureChanges.removedCultures = null;
+
+            clonedContent._previousCultureChanges.updatedCultures = null;
+            clonedContent._previousCultureChanges.addedCultures = null;
+            clonedContent._previousCultureChanges.removedCultures = null;
         }
     }
 }

From 34c65a94bfac56cbfc94b8831742d27fa2b21e23 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 00:07:43 +1100
Subject: [PATCH 325/421] dont allocate an empty object if the collection is
 empty

---
 src/Umbraco.Core/Models/Content.cs     | 7 +++----
 src/Umbraco.Core/Models/ContentBase.cs | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index efc9e216b9ec..483ba8b0d24e 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -357,10 +357,9 @@ public override void ResetDirtyProperties(bool rememberDirty)
 
             if (rememberDirty)
             {
-                //fixme if it's empty don't allocate
-                _previousPublishCultureChanges.addedCultures = _currentPublishCultureChanges.addedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.addedCultures, StringComparer.InvariantCultureIgnoreCase);
-                _previousPublishCultureChanges.removedCultures = _currentPublishCultureChanges.removedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.removedCultures, StringComparer.InvariantCultureIgnoreCase);
-                _previousPublishCultureChanges.updatedCultures = _currentPublishCultureChanges.updatedCultures == null ? null : new HashSet<string>(_currentPublishCultureChanges.updatedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousPublishCultureChanges.addedCultures = _currentPublishCultureChanges.addedCultures == null || _currentPublishCultureChanges.addedCultures.Count == 0 ? null : new HashSet<string>(_currentPublishCultureChanges.addedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousPublishCultureChanges.removedCultures = _currentPublishCultureChanges.removedCultures == null || _currentPublishCultureChanges.removedCultures.Count == 0 ? null : new HashSet<string>(_currentPublishCultureChanges.removedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousPublishCultureChanges.updatedCultures = _currentPublishCultureChanges.updatedCultures == null || _currentPublishCultureChanges.updatedCultures.Count == 0 ? null : new HashSet<string>(_currentPublishCultureChanges.updatedCultures, StringComparer.InvariantCultureIgnoreCase);
             }
             else
             {
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index db41c31d3233..50de59931cdf 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -339,9 +339,9 @@ public override void ResetDirtyProperties(bool rememberDirty)
 
             if (rememberDirty)
             {
-                _previousCultureChanges.addedCultures = _currentCultureChanges.addedCultures == null ? null : new HashSet<string>(_currentCultureChanges.addedCultures, StringComparer.InvariantCultureIgnoreCase);
-                _previousCultureChanges.removedCultures = _currentCultureChanges.removedCultures == null ? null : new HashSet<string>(_currentCultureChanges.removedCultures, StringComparer.InvariantCultureIgnoreCase);
-                _previousCultureChanges.updatedCultures = _currentCultureChanges.updatedCultures == null ? null : new HashSet<string>(_currentCultureChanges.updatedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousCultureChanges.addedCultures = _currentCultureChanges.addedCultures == null || _currentCultureChanges.addedCultures.Count == 0 ? null : new HashSet<string>(_currentCultureChanges.addedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousCultureChanges.removedCultures = _currentCultureChanges.removedCultures == null || _currentCultureChanges.removedCultures.Count == 0 ? null : new HashSet<string>(_currentCultureChanges.removedCultures, StringComparer.InvariantCultureIgnoreCase);
+                _previousCultureChanges.updatedCultures = _currentCultureChanges.updatedCultures == null || _currentCultureChanges.updatedCultures.Count == 0 ? null : new HashSet<string>(_currentCultureChanges.updatedCultures, StringComparer.InvariantCultureIgnoreCase);
             }
             else
             {
@@ -478,8 +478,6 @@ protected override void PerformDeepClone(object clone)
 
             var clonedContent = (ContentBase)clone;
 
-            //fixme - need to reset change tracking bits
-
             //if culture infos exist then deal with event bindings
             if (clonedContent._cultureInfos != null)
             {

From 7863cd3ab79640e59422a128dec46fe8e57130fa Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 6 Feb 2019 14:11:33 +0100
Subject: [PATCH 326/421] Refactor OrderedCollectionBuilderBase AppendAfter to
 InsertAfter

---
 .../Composing/OrderedCollectionBuilderBase.cs | 90 +++++++++++++------
 .../Composing/CollectionBuildersTests.cs      | 36 +++++++-
 2 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs b/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs
index 241b84d8d28f..2bd4c0d434b2 100644
--- a/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs
+++ b/src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs
@@ -78,33 +78,6 @@ public TBuilder Append(IEnumerable<Type> types)
             return This;
         }
 
-        /// <summary>
-        /// Appends a type after another type.
-        /// </summary>
-        /// <typeparam name="TAfter">The other type.</typeparam>
-        /// <typeparam name="T">The type to append.</typeparam>
-        /// <returns>The builder.</returns>
-        /// <remarks>Throws if both types are identical, or if the other type does not already belong to the collection.</remarks>
-        public TBuilder AppendAfter<TAfter, T>()
-            where TAfter : TItem
-            where T : TItem
-        {
-            Configure(types =>
-            {
-                var typeAfter = typeof (TAfter);
-                var type = typeof(T);
-                if (typeAfter == type) throw new InvalidOperationException();
-
-                var index = types.IndexOf(typeAfter);
-                if (index < 0) throw new InvalidOperationException();
-
-                if (types.Contains(type)) types.Remove(type);
-                index = types.IndexOf(typeAfter); // in case removing type changed index
-                types.Insert(index + 1, type);
-            });
-            return This;
-        }
-
         /// <summary>
         /// Inserts a type into the collection.
         /// </summary>
@@ -206,6 +179,69 @@ public TBuilder InsertBefore(Type typeBefore, Type type)
             return This;
         }
 
+        /// <summary>
+        /// Inserts a type after another type.
+        /// </summary>
+        /// <typeparam name="TAfter">The other type.</typeparam>
+        /// <typeparam name="T">The type to append.</typeparam>
+        /// <returns>The builder.</returns>
+        /// <remarks>Throws if both types are identical, or if the other type does not already belong to the collection.</remarks>
+        public TBuilder InsertAfter<TAfter, T>()
+            where TAfter : TItem
+            where T : TItem
+        {
+            Configure(types =>
+            {
+                var typeAfter = typeof(TAfter);
+                var type = typeof(T);
+                if (typeAfter == type) throw new InvalidOperationException();
+
+                var index = types.IndexOf(typeAfter);
+                if (index < 0) throw new InvalidOperationException();
+
+                if (types.Contains(type)) types.Remove(type);
+                index = types.IndexOf(typeAfter); // in case removing type changed index
+                index += 1; // insert here
+
+                if (index == types.Count)
+                    types.Add(type);
+                else
+                    types.Insert(index, type);
+            });
+            return This;
+        }
+
+        /// <summary>
+        /// Inserts a type after another type.
+        /// </summary>
+        /// <param name="typeAfter">The other type.</param>
+        /// <param name="type">The type to insert.</param>
+        /// <returns>The builder.</returns>
+        /// <remarks>Throws if both types are identical, or if the other type does not already belong to the collection.</remarks>
+        public TBuilder InsertAfter(Type typeAfter, Type type)
+        {
+            Configure(types =>
+            {
+                EnsureType(typeAfter, "find");
+                EnsureType(type, "register");
+
+                if (typeAfter == type) throw new InvalidOperationException();
+
+                var index = types.IndexOf(typeAfter);
+                if (index < 0) throw new InvalidOperationException();
+
+                if (types.Contains(type)) types.Remove(type);
+                index = types.IndexOf(typeAfter); // in case removing type changed index
+                index += 1; // insert here
+
+                if (index == types.Count)
+                    types.Add(type);
+                else
+                    types.Insert(index, type);
+            });
+            return This;
+        }
+
         /// <summary>
         /// Removes a type from the collection.
         /// </summary>
diff --git a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
index 8ea13fc9204a..07699f77ed7f 100644
--- a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
+++ b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
@@ -262,6 +262,40 @@ public void CanInsertIntoBuilderBefore()
             AssertCollection(col, typeof(Resolved1), typeof(Resolved3), typeof(Resolved2));
         }
 
+        [Test]
+        public void CanInsertIntoBuilderAfter()
+        {
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+                .Append<Resolved1>()
+                .Append<Resolved2>()
+                .InsertAfter<Resolved1, Resolved3>();
+
+            Assert.IsTrue(builder.Has<Resolved1>());
+            Assert.IsTrue(builder.Has<Resolved2>());
+            Assert.IsTrue(builder.Has<Resolved3>());
+
+            var factory = _composition.CreateFactory();
+            var col = builder.CreateCollection(factory);
+            AssertCollection(col, typeof(Resolved1), typeof(Resolved3), typeof(Resolved2));
+        }
+
+        [Test]
+        public void CanInsertIntoBuilderAfterLast()
+        {
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+                .Append<Resolved1>()
+                .Append<Resolved2>()
+                .InsertAfter<Resolved2, Resolved3>();
+
+            Assert.IsTrue(builder.Has<Resolved1>());
+            Assert.IsTrue(builder.Has<Resolved2>());
+            Assert.IsTrue(builder.Has<Resolved3>());
+
+            var factory = _composition.CreateFactory();
+            var col = builder.CreateCollection(factory);
+            AssertCollection(col, typeof(Resolved1), typeof(Resolved2), typeof(Resolved3));
+        }
+
         [Test]
         public void CannotInsertIntoBuilderBeforeOnceCollectionIsCreated()
         {
@@ -314,7 +348,7 @@ public void ScopeBuilderCreatesScopedCollection()
             var factory = _composition.CreateFactory();
 
             using (factory.BeginScope())
-            { 
+            {
                 var col1 = factory.GetInstance<TestCollection>();
                 AssertCollection(col1, typeof(Resolved1), typeof(Resolved2));
 

From f98727e08dbe6afd0f48ef64edd65b99430458bc Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 00:15:47 +1100
Subject: [PATCH 327/421] fixing tests

---
 src/Umbraco.Core/Models/ContentRepositoryExtensions.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
index 8d4e962ae1f6..ca9bf579023c 100644
--- a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
@@ -284,6 +284,7 @@ public static void ClearPublishInfo(this IContent content, string culture)
         /// </summary>
         public static void TouchCulture(this IContentBase content, string culture)
         {
+            if (culture.IsNullOrWhiteSpace()) return;
             if (!content.CultureInfos.TryGetValue(culture, out var infos)) return;
             content.CultureInfos.AddOrUpdate(culture, infos.Name, DateTime.Now);
         }

From 48e11ab4392bb3233dcfce9ad7af326db1368c7d Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 6 Feb 2019 14:53:49 +0100
Subject: [PATCH 328/421] Fix 8.0 migration

---
 .../V_8_0_0/ContentVariationMigration.cs      | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ContentVariationMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ContentVariationMigration.cs
index 23c835a3278f..84dd393b0db8 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ContentVariationMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ContentVariationMigration.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using NPoco;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
@@ -59,5 +61,58 @@ byte GetNewValue(byte oldValue)
                 Database.Update(dto);
             }
         }
+
+        // we *need* to use this private DTO here, which does *not* have extra properties, which would kill the migration
+
+        [TableName(TableName)]
+        [PrimaryKey("pk")]
+        [ExplicitColumns]
+        private class ContentTypeDto
+        {
+            public const string TableName = Constants.DatabaseSchema.Tables.ContentType;
+
+            [Column("pk")]
+            [PrimaryKeyColumn(IdentitySeed = 535)]
+            public int PrimaryKey { get; set; }
+
+            [Column("nodeId")]
+            [ForeignKey(typeof(NodeDto))]
+            [Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsContentType")]
+            public int NodeId { get; set; }
+
+            [Column("alias")]
+            [NullSetting(NullSetting = NullSettings.Null)]
+            public string Alias { get; set; }
+
+            [Column("icon")]
+            [Index(IndexTypes.NonClustered)]
+            [NullSetting(NullSetting = NullSettings.Null)]
+            public string Icon { get; set; }
+
+            [Column("thumbnail")]
+            [Constraint(Default = "folder.png")]
+            public string Thumbnail { get; set; }
+
+            [Column("description")]
+            [NullSetting(NullSetting = NullSettings.Null)]
+            [Length(1500)]
+            public string Description { get; set; }
+
+            [Column("isContainer")]
+            [Constraint(Default = "0")]
+            public bool IsContainer { get; set; }
+
+            [Column("allowAtRoot")]
+            [Constraint(Default = "0")]
+            public bool AllowAtRoot { get; set; }
+
+            [Column("variations")]
+            [Constraint(Default = "1" /*ContentVariation.InvariantNeutral*/)]
+            public byte Variations { get; set; }
+
+            [ResultColumn]
+            public NodeDto NodeDto { get; set; }
+        }
+
     }
 }

From 8b4315cd46229531a8dfbe79023eda72b59d76c4 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 6 Feb 2019 14:01:14 +0000
Subject: [PATCH 329/421] =?UTF-8?q?=F0=9F=A6=B8=F0=9F=A6=B8=20Is=20it=20a?=
 =?UTF-8?q?=20bird,=20is=20it=20a=20plane,=20no=20it's=20SuperUser=20?=
 =?UTF-8?q?=F0=9F=A6=B8=F0=9F=A6=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/ContentServiceExtensions.cs      |  2 +-
 src/Umbraco.Core/Services/IContentService.cs  | 62 +++++++++----------
 .../Services/IContentTypeServiceBase.cs       | 16 ++---
 src/Umbraco.Core/Services/IDataTypeService.cs | 14 ++---
 src/Umbraco.Core/Services/IFileService.cs     | 30 ++++-----
 .../Services/ILocalizationService.cs          |  8 +--
 src/Umbraco.Core/Services/IMacroService.cs    |  4 +-
 src/Umbraco.Core/Services/IMediaService.cs    | 30 ++++-----
 .../Services/IPackagingService.cs             | 10 +--
 .../Services/Implement/ContentService.cs      | 60 +++++++++---------
 ...peServiceBaseOfTRepositoryTItemTService.cs | 16 ++---
 .../Services/Implement/DataTypeService.cs     | 14 ++---
 .../Services/Implement/FileService.cs         | 36 +++++------
 .../Services/Implement/LocalizationService.cs |  8 +--
 .../Services/Implement/MacroService.cs        |  4 +-
 .../Services/Implement/MediaService.cs        | 34 +++++-----
 .../Services/Implement/PackagingService.cs    | 10 +--
 17 files changed, 179 insertions(+), 179 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentServiceExtensions.cs b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
index 03a790d4b8bc..4d673fc902f4 100644
--- a/src/Umbraco.Core/Services/ContentServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
@@ -34,7 +34,7 @@ public static IEnumerable<IContent> GetByIds(this IContentService contentService
         /// <param name="mediaTypeAlias"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-        public static IContent CreateContent(this IContentService contentService, string name, Udi parentId, string mediaTypeAlias, int userId = 0)
+        public static IContent CreateContent(this IContentService contentService, string name, Udi parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             var guidUdi = parentId as GuidUdi;
             if (guidUdi == null)
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 7fb7450b46f1..24462cdbf46b 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -32,27 +32,27 @@ public interface IContentService : IContentServiceBase
         /// <summary>
         /// Saves a blueprint.
         /// </summary>
-        void SaveBlueprint(IContent content, int userId = 0);
+        void SaveBlueprint(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a blueprint.
         /// </summary>
-        void DeleteBlueprint(IContent content, int userId = 0);
+        void DeleteBlueprint(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates a new content item from a blueprint.
         /// </summary>
-        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0);
+        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes blueprints for a content type.
         /// </summary>
-        void DeleteBlueprintsOfType(int contentTypeId, int userId = 0);
+        void DeleteBlueprintsOfType(int contentTypeId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes blueprints for content types.
         /// </summary>
-        void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
+        void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = Constants.Security.SuperUserId);
 
         #endregion
 
@@ -237,13 +237,13 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <summary>
         /// Saves a document.
         /// </summary>
-        OperationResult Save(IContent content, int userId = 0, bool raiseEvents = true);
+        OperationResult Save(IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Saves documents.
         /// </summary>
         // TODO: why only 1 result not 1 per content?!
-        OperationResult Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);
+        OperationResult Save(IEnumerable<IContent> contents, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Deletes a document.
@@ -252,7 +252,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <para>This method will also delete associated media files, child content and possibly associated domains.</para>
         /// <para>This method entirely clears the content from the database.</para>
         /// </remarks>
-        OperationResult Delete(IContent content, int userId = 0);
+        OperationResult Delete(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes all documents of a given document type.
@@ -261,7 +261,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <para>All non-deleted descendants of the deleted documents are moved to the recycle bin.</para>
         /// <para>This operation is potentially dangerous and expensive.</para>
         /// </remarks>
-        void DeleteOfType(int documentTypeId, int userId = 0);
+        void DeleteOfType(int documentTypeId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes all documents of given document types.
@@ -270,17 +270,17 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <para>All non-deleted descendants of the deleted documents are moved to the recycle bin.</para>
         /// <para>This operation is potentially dangerous and expensive.</para>
         /// </remarks>
-        void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
+        void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes versions of a document prior to a given date.
         /// </summary>
-        void DeleteVersions(int id, DateTime date, int userId = 0);
+        void DeleteVersions(int id, DateTime date, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a version of a document.
         /// </summary>
-        void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = 0);
+        void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = Constants.Security.SuperUserId);
 
         #endregion
 
@@ -289,7 +289,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <summary>
         /// Moves a document under a new parent.
         /// </summary>
-        void Move(IContent content, int parentId, int userId = 0);
+        void Move(IContent content, int parentId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Copies a document.
@@ -297,7 +297,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <remarks>
         /// <para>Recursively copies all children.</para>
         /// </remarks>
-        IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0);
+        IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Copies a document.
@@ -305,12 +305,12 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <remarks>
         /// <para>Optionally recursively copies all children.</para>
         /// </remarks>
-        IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0);
+        IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Moves a document to the recycle bin.
         /// </summary>
-        OperationResult MoveToRecycleBin(IContent content, int userId = 0);
+        OperationResult MoveToRecycleBin(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Empties the recycle bin.
@@ -320,12 +320,12 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <summary>
         /// Sorts documents.
         /// </summary>
-        OperationResult Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+        OperationResult Sort(IEnumerable<IContent> items, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Sorts documents.
         /// </summary>
-        OperationResult Sort(IEnumerable<int> ids, int userId = 0, bool raiseEvents = true);
+        OperationResult Sort(IEnumerable<int> ids, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         #endregion
 
@@ -342,7 +342,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither 'null' nor
         /// 'empty'. If the content type is invariant, then culture can be either '*' or null or empty.</para>
         /// </remarks>
-        PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = 0, bool raiseEvents = true);
+        PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Saves and publishes a publishing document.
@@ -358,7 +358,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <see cref="SavePublishing"/> to actually commit the changes to the database.</para>
         /// <para>The document is *always* saved, even when publishing fails.</para>
         /// </remarks>
-        PublishResult SavePublishing(IContent content, int userId = 0, bool raiseEvents = true);
+        PublishResult SavePublishing(IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Saves and publishes a document branch.
@@ -374,7 +374,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// only those documents that are already published, are republished. When <c>true</c>, all documents are
         /// published. The root of the branch is always published, regardless of <paramref name="force"/>.</para>
         /// </remarks>
-        IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string culture = "*", int userId = 0);
+        IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string culture = "*", int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves and publishes a document branch.
@@ -388,7 +388,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// only those documents that are already published, are republished. When <c>true</c>, all documents are
         /// published. The root of the branch is always published, regardless of <paramref name="force"/>.</para>
         /// </remarks>
-        IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string[] cultures, int userId = 0);
+        IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string[] cultures, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves and publishes a document branch.
@@ -413,7 +413,7 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force,
             Func<IContent, HashSet<string>> shouldPublish,
             Func<IContent, HashSet<string>, bool> publishCultures,
-            int userId = 0);
+            int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Unpublishes a document.
@@ -425,7 +425,7 @@ IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force,
         /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither null nor
         /// empty. If the content type is invariant, then culture can be either '*' or null or empty.</para>
         /// </remarks>
-        PublishResult Unpublish(IContent content, string culture = "*", int userId = 0);
+        PublishResult Unpublish(IContent content, string culture = "*", int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets a value indicating whether a document is path-publishable.
@@ -442,7 +442,7 @@ IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force,
         /// <summary>
         /// Saves a document and raises the "sent to publication" events.
         /// </summary>
-        bool SendToPublication(IContent content, int userId = 0);
+        bool SendToPublication(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Publishes and unpublishes scheduled documents.
@@ -477,27 +477,27 @@ IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force,
         /// <summary>
         /// Creates a document.
         /// </summary>
-        IContent Create(string name, Guid parentId, string documentTypeAlias, int userId = 0);
+        IContent Create(string name, Guid parentId, string documentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates a document.
         /// </summary>
-        IContent Create(string name, int parentId, string documentTypeAlias, int userId = 0);
+        IContent Create(string name, int parentId, string documentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates a document.
         /// </summary>
-        IContent Create(string name, IContent parent, string documentTypeAlias, int userId = 0);
+        IContent Create(string name, IContent parent, string documentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates and saves a document.
         /// </summary>
-        IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = 0);
+        IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates and saves a document.
         /// </summary>
-        IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = 0);
+        IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         #endregion
 
@@ -513,7 +513,7 @@ IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force,
         /// <remarks>
         /// <para>When no culture is specified, all cultures are rolled back.</para>
         /// </remarks>
-        OperationResult Rollback(int id, int versionId, string culture = "*", int userId = 0);
+        OperationResult Rollback(int id, int versionId, string culture = "*", int userId = Constants.Security.SuperUserId);
 
         #endregion
     }
diff --git a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
index 8fa77e4836a3..b86494adb5fa 100644
--- a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
+++ b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
@@ -47,11 +47,11 @@ public interface IContentTypeBaseService<TItem> : IContentTypeBaseService, IServ
         IEnumerable<TItem> GetChildren(int id);
         bool HasChildren(int id);
 
-        void Save(TItem item, int userId = 0);
-        void Save(IEnumerable<TItem> items, int userId = 0);
+        void Save(TItem item, int userId = Constants.Security.SuperUserId);
+        void Save(IEnumerable<TItem> items, int userId = Constants.Security.SuperUserId);
 
-        void Delete(TItem item, int userId = 0);
-        void Delete(IEnumerable<TItem> item, int userId = 0);
+        void Delete(TItem item, int userId = Constants.Security.SuperUserId);
+        void Delete(IEnumerable<TItem> item, int userId = Constants.Security.SuperUserId);
 
 
         Attempt<string[]> ValidateComposition(TItem compo);
@@ -63,15 +63,15 @@ public interface IContentTypeBaseService<TItem> : IContentTypeBaseService, IServ
         /// <returns></returns>
         bool HasContainerInPath(string contentPath);
 
-        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentContainerId, string name, int userId = 0);
-        Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = 0);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentContainerId, string name, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId);
         EntityContainer GetContainer(int containerId);
         EntityContainer GetContainer(Guid containerId);
         IEnumerable<EntityContainer> GetContainers(int[] containerIds);
         IEnumerable<EntityContainer> GetContainers(TItem contentType);
         IEnumerable<EntityContainer> GetContainers(string folderName, int level);
-        Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0);
-        Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = 0);
+        Attempt<OperationResult> DeleteContainer(int containerId, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = Constants.Security.SuperUserId);
 
         Attempt<OperationResult<MoveOperationStatusType>> Move(TItem moving, int containerId);
         Attempt<OperationResult<MoveOperationStatusType, TItem>> Copy(TItem copying, int containerId);
diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs
index 537c0e629f97..3dc530e25067 100644
--- a/src/Umbraco.Core/Services/IDataTypeService.cs
+++ b/src/Umbraco.Core/Services/IDataTypeService.cs
@@ -9,15 +9,15 @@ namespace Umbraco.Core.Services
     /// </summary>
     public interface IDataTypeService : IService
     {
-        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = 0);
-        Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = 0);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId);
         EntityContainer GetContainer(int containerId);
         EntityContainer GetContainer(Guid containerId);
         IEnumerable<EntityContainer> GetContainers(string folderName, int level);
         IEnumerable<EntityContainer> GetContainers(IDataType dataType);
         IEnumerable<EntityContainer> GetContainers(int[] containerIds);
-        Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0);
-        Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = 0);
+        Attempt<OperationResult> DeleteContainer(int containerId, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets a <see cref="IDataType"/> by its Name
@@ -52,14 +52,14 @@ public interface IDataTypeService : IService
         /// </summary>
         /// <param name="dataType"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
-        void Save(IDataType dataType, int userId = 0);
+        void Save(IDataType dataType, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves a collection of <see cref="IDataType"/>
         /// </summary>
         /// <param name="dataTypeDefinitions"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
-        void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = 0);
+        void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves a collection of <see cref="IDataType"/>
@@ -78,7 +78,7 @@ public interface IDataTypeService : IService
         /// </remarks>
         /// <param name="dataType"><see cref="IDataType"/> to delete</param>
         /// <param name="userId">Id of the user issuing the deletion</param>
-        void Delete(IDataType dataType, int userId = 0);
+        void Delete(IDataType dataType, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets a <see cref="IDataType"/> by its control Id
diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index 8596424b03d8..5fe52559eeb8 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -18,12 +18,12 @@ public interface IFileService : IService
         IPartialView GetPartialView(string path);
         IPartialView GetPartialViewMacro(string path);
         IEnumerable<IPartialView> GetPartialViewMacros(params string[] names);
-        Attempt<IPartialView> CreatePartialView(IPartialView partialView, string snippetName = null, int userId = 0);
-        Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = 0);
-        bool DeletePartialView(string path, int userId = 0);
-        bool DeletePartialViewMacro(string path, int userId = 0);
-        Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = 0);
-        Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = 0);
+        Attempt<IPartialView> CreatePartialView(IPartialView partialView, string snippetName = null, int userId = Constants.Security.SuperUserId);
+        Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = Constants.Security.SuperUserId);
+        bool DeletePartialView(string path, int userId = Constants.Security.SuperUserId);
+        bool DeletePartialViewMacro(string path, int userId = Constants.Security.SuperUserId);
+        Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = Constants.Security.SuperUserId);
+        Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = Constants.Security.SuperUserId);
         bool ValidatePartialView(PartialView partialView);
         bool ValidatePartialViewMacro(PartialView partialView);
 
@@ -45,14 +45,14 @@ public interface IFileService : IService
         /// </summary>
         /// <param name="stylesheet"><see cref="Stylesheet"/> to save</param>
         /// <param name="userId">Optional id of the user saving the stylesheet</param>
-        void SaveStylesheet(Stylesheet stylesheet, int userId = 0);
+        void SaveStylesheet(Stylesheet stylesheet, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a stylesheet by its name
         /// </summary>
         /// <param name="path">Name incl. extension of the Stylesheet to delete</param>
         /// <param name="userId">Optional id of the user deleting the stylesheet</param>
-        void DeleteStylesheet(string path, int userId = 0);
+        void DeleteStylesheet(string path, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Validates a <see cref="Stylesheet"/>
@@ -79,14 +79,14 @@ public interface IFileService : IService
         /// </summary>
         /// <param name="script"><see cref="Script"/> to save</param>
         /// <param name="userId">Optional id of the user saving the script</param>
-        void SaveScript(Script script, int userId = 0);
+        void SaveScript(Script script, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a script by its name
         /// </summary>
         /// <param name="path">Name incl. extension of the Script to delete</param>
         /// <param name="userId">Optional id of the user deleting the script</param>
-        void DeleteScript(string path, int userId = 0);
+        void DeleteScript(string path, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Validates a <see cref="Script"/>
@@ -187,7 +187,7 @@ public interface IFileService : IService
         /// </summary>
         /// <param name="template"><see cref="ITemplate"/> to save</param>
         /// <param name="userId">Optional id of the user saving the template</param>
-        void SaveTemplate(ITemplate template, int userId = 0);
+        void SaveTemplate(ITemplate template, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates a template for a content type
@@ -198,16 +198,16 @@ public interface IFileService : IService
         /// <returns>
         /// The template created
         /// </returns>
-        Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = 0);
+        Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = Constants.Security.SuperUserId);
 
-        ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = 0);
+        ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a template by its alias
         /// </summary>
         /// <param name="alias">Alias of the <see cref="ITemplate"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the template</param>
-        void DeleteTemplate(string alias, int userId = 0);
+        void DeleteTemplate(string alias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Validates a <see cref="ITemplate"/>
@@ -221,7 +221,7 @@ public interface IFileService : IService
         /// </summary>
         /// <param name="templates">List of <see cref="Template"/> to save</param>
         /// <param name="userId">Optional id of the user</param>
-        void SaveTemplate(IEnumerable<ITemplate> templates, int userId = 0);
+        void SaveTemplate(IEnumerable<ITemplate> templates, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets the content of a template as a stream.
diff --git a/src/Umbraco.Core/Services/ILocalizationService.cs b/src/Umbraco.Core/Services/ILocalizationService.cs
index 4882c7e8295c..54022d37bb67 100644
--- a/src/Umbraco.Core/Services/ILocalizationService.cs
+++ b/src/Umbraco.Core/Services/ILocalizationService.cs
@@ -86,7 +86,7 @@ public interface ILocalizationService : IService
         /// </summary>
         /// <param name="dictionaryItem"><see cref="IDictionaryItem"/> to save</param>
         /// <param name="userId">Optional id of the user saving the dictionary item</param>
-        void Save(IDictionaryItem dictionaryItem, int userId = 0);
+        void Save(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a <see cref="IDictionaryItem"/> object and its related translations
@@ -94,7 +94,7 @@ public interface ILocalizationService : IService
         /// </summary>
         /// <param name="dictionaryItem"><see cref="IDictionaryItem"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the dictionary item</param>
-        void Delete(IDictionaryItem dictionaryItem, int userId = 0);
+        void Delete(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets a <see cref="ILanguage"/> by its id
@@ -153,14 +153,14 @@ public interface ILocalizationService : IService
         /// </summary>
         /// <param name="language"><see cref="ILanguage"/> to save</param>
         /// <param name="userId">Optional id of the user saving the language</param>
-        void Save(ILanguage language, int userId = 0);
+        void Save(ILanguage language, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a <see cref="ILanguage"/> by removing it and its usages from the db
         /// </summary>
         /// <param name="language"><see cref="ILanguage"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the language</param>
-        void Delete(ILanguage language, int userId = 0);
+        void Delete(ILanguage language, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets the full dictionary key map.
diff --git a/src/Umbraco.Core/Services/IMacroService.cs b/src/Umbraco.Core/Services/IMacroService.cs
index 8c3acfd61953..597c986f3769 100644
--- a/src/Umbraco.Core/Services/IMacroService.cs
+++ b/src/Umbraco.Core/Services/IMacroService.cs
@@ -39,14 +39,14 @@ public interface IMacroService : IService
         /// </summary>
         /// <param name="macro"><see cref="IMacro"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the macro</param>
-        void Delete(IMacro macro, int userId = 0);
+        void Delete(IMacro macro, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves an <see cref="IMacro"/>
         /// </summary>
         /// <param name="macro"><see cref="IMacro"/> to save</param>
         /// <param name="userId">Optional id of the user saving the macro</param>
-        void Save(IMacro macro, int userId = 0);
+        void Save(IMacro macro, int userId = Constants.Security.SuperUserId);
 
         ///// <summary>
         ///// Gets a list all available <see cref="IMacroPropertyType"/> plugins
diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs
index ce2062d08df3..02398c363478 100644
--- a/src/Umbraco.Core/Services/IMediaService.cs
+++ b/src/Umbraco.Core/Services/IMediaService.cs
@@ -37,7 +37,7 @@ public interface IMediaService : IContentServiceBase
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -53,7 +53,7 @@ public interface IMediaService : IContentServiceBase
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -69,7 +69,7 @@ public interface IMediaService : IContentServiceBase
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets an <see cref="IMedia"/> object by Id
@@ -152,14 +152,14 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <param name="parentId">Id of the Media's new Parent</param>
         /// <param name="userId">Id of the User moving the Media</param>
         /// <returns>True if moving succeeded, otherwise False</returns>
-        Attempt<OperationResult> Move(IMedia media, int parentId, int userId = 0);
+        Attempt<OperationResult> Move(IMedia media, int parentId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes an <see cref="IMedia"/> object by moving it to the Recycle Bin
         /// </summary>
         /// <param name="media">The <see cref="IMedia"/> to delete</param>
         /// <param name="userId">Id of the User deleting the Media</param>
-        Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = 0);
+        Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
@@ -172,7 +172,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
         /// <param name="mediaTypeId">Id of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional Id of the user deleting Media</param>
-        void DeleteMediaOfType(int mediaTypeId, int userId = 0);
+        void DeleteMediaOfType(int mediaTypeId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes all media of the specified types. All Descendants of deleted media that is not of these types is moved to Recycle Bin.
@@ -180,7 +180,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
         /// <param name="mediaTypeIds">Ids of the <see cref="IMediaType"/>s</param>
         /// <param name="userId">Optional Id of the user issuing the delete operation</param>
-        void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = 0);
+        void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = Constants.Security.SuperUserId);
         
         /// <summary>
         /// Permanently deletes an <see cref="IMedia"/> object
@@ -191,7 +191,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// </remarks>
         /// <param name="media">The <see cref="IMedia"/> to delete</param>
         /// <param name="userId">Id of the User deleting the Media</param>
-        Attempt<OperationResult> Delete(IMedia media, int userId = 0);
+        Attempt<OperationResult> Delete(IMedia media, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves a single <see cref="IMedia"/> object
@@ -199,7 +199,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <param name="media">The <see cref="IMedia"/> to save</param>
         /// <param name="userId">Id of the User saving the Media</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationResult> Save(IMedia media, int userId = 0, bool raiseEvents = true);
+        Attempt<OperationResult> Save(IMedia media, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Saves a collection of <see cref="IMedia"/> objects
@@ -207,7 +207,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <param name="medias">Collection of <see cref="IMedia"/> to save</param>
         /// <param name="userId">Id of the User saving the Media</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = 0, bool raiseEvents = true);
+        Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Gets an <see cref="IMedia"/> object by its 'UniqueId'
@@ -250,7 +250,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <param name="id">Id of the <see cref="IMedia"/> object to delete versions from</param>
         /// <param name="versionDate">Latest version date</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        void DeleteVersions(int id, DateTime versionDate, int userId = 0);
+        void DeleteVersions(int id, DateTime versionDate, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Permanently deletes specific version(s) from an <see cref="IMedia"/> object.
@@ -259,7 +259,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <param name="versionId">Id of the version to delete</param>
         /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = 0);
+        void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets an <see cref="IMedia"/> object from the path stored in the 'umbracoFile' property.
@@ -304,7 +304,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(IEnumerable<IMedia> items, int userId = 0, bool raiseEvents = true);
+        bool Sort(IEnumerable<IMedia> items, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -319,7 +319,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMediaWithIdentity(string name, IMedia parent, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMediaWithIdentity(string name, IMedia parent, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -334,7 +334,7 @@ IEnumerable<IMedia> GetPagedMediaInRecycleBin(long pageIndex, int pageSize, out
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets the content of a media as a stream.
diff --git a/src/Umbraco.Core/Services/IPackagingService.cs b/src/Umbraco.Core/Services/IPackagingService.cs
index c14882fe7ae7..b38b5a426b89 100644
--- a/src/Umbraco.Core/Services/IPackagingService.cs
+++ b/src/Umbraco.Core/Services/IPackagingService.cs
@@ -27,7 +27,7 @@ public interface IPackagingService : IService
         /// <param name="packageDefinition"></param>
         /// <param name="packageFile"></param>
         /// <param name="userId"></param>
-        IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition packageDefinition, FileInfo packageFile, int userId = 0);
+        IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition packageDefinition, FileInfo packageFile, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Installs the data, entities, objects contained in an umbraco package file (zip)
@@ -35,7 +35,7 @@ public interface IPackagingService : IService
         /// <param name="packageDefinition"></param>
         /// <param name="packageFile"></param>
         /// <param name="userId"></param>
-        InstallationSummary InstallCompiledPackageData(PackageDefinition packageDefinition, FileInfo packageFile, int userId = 0);
+        InstallationSummary InstallCompiledPackageData(PackageDefinition packageDefinition, FileInfo packageFile, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Uninstalls all versions of the package by name
@@ -43,7 +43,7 @@ public interface IPackagingService : IService
         /// <param name="packageName"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-        UninstallationSummary UninstallPackage(string packageName, int userId = 0);
+        UninstallationSummary UninstallPackage(string packageName, int userId = Constants.Security.SuperUserId);
 
         #endregion
 
@@ -75,7 +75,7 @@ public interface IPackagingService : IService
         /// <param name="alreadyInstalled">If the package is an upgrade, the original/current PackageDefinition is returned</param>
         /// <returns></returns>
         PackageInstallType GetPackageInstallType(string packageName, SemVersion packageVersion, out PackageDefinition alreadyInstalled);
-        void DeleteInstalledPackage(int packageId, int userId = 0);
+        void DeleteInstalledPackage(int packageId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Persists a package definition to storage
@@ -89,7 +89,7 @@ public interface IPackagingService : IService
 
         IEnumerable<PackageDefinition> GetAllCreatedPackages();
         PackageDefinition GetCreatedPackageById(int id);
-        void DeleteCreatedPackage(int id, int userId = 0);
+        void DeleteCreatedPackage(int id, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Persists a package definition to storage
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index c5745090f943..9e78f902e154 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -162,7 +162,7 @@ public EntityPermissionCollection GetPermissions(IContent content)
         /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
         /// <param name="userId">Optional id of the user creating the content</param>
         /// <returns><see cref="IContent"/></returns>
-        public IContent Create(string name, Guid parentId, string contentTypeAlias, int userId = 0)
+        public IContent Create(string name, Guid parentId, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -182,7 +182,7 @@ public IContent Create(string name, Guid parentId, string contentTypeAlias, int
         /// <param name="contentTypeAlias">The alias of the content type.</param>
         /// <param name="userId">The optional id of the user creating the content.</param>
         /// <returns>The content object.</returns>
-        public IContent Create(string name, int parentId, string contentTypeAlias, int userId = 0)
+        public IContent Create(string name, int parentId, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -215,7 +215,7 @@ public IContent Create(string name, int parentId, string contentTypeAlias, int u
         /// <param name="contentTypeAlias">The alias of the content type.</param>
         /// <param name="userId">The optional id of the user creating the content.</param>
         /// <returns>The content object.</returns>
-        public IContent Create(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        public IContent Create(string name, IContent parent, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -246,7 +246,7 @@ public IContent Create(string name, IContent parent, string contentTypeAlias, in
         /// <param name="contentTypeAlias">The alias of the content type.</param>
         /// <param name="userId">The optional id of the user creating the content.</param>
         /// <returns>The content object.</returns>
-        public IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = 0)
+        public IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -280,7 +280,7 @@ public IContent CreateAndSave(string name, int parentId, string contentTypeAlias
         /// <param name="contentTypeAlias">The alias of the content type.</param>
         /// <param name="userId">The optional id of the user creating the content.</param>
         /// <returns>The content object.</returns>
-        public IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        public IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -751,7 +751,7 @@ public bool IsPathPublished(IContent content)
         #region Save, Publish, Unpublish
 
         /// <inheritdoc />
-        public OperationResult Save(IContent content, int userId = 0, bool raiseEvents = true)
+        public OperationResult Save(IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var publishedState = content.PublishedState;
             if (publishedState != PublishedState.Published && publishedState != PublishedState.Unpublished)
@@ -810,7 +810,7 @@ public OperationResult Save(IContent content, int userId = 0, bool raiseEvents =
         }
 
         /// <inheritdoc />
-        public OperationResult Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true)
+        public OperationResult Save(IEnumerable<IContent> contents, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
             var contentsA = contents.ToArray();
@@ -851,7 +851,7 @@ public OperationResult Save(IEnumerable<IContent> contents, int userId = 0, bool
         }
 
         /// <inheritdoc />
-        public PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = 0, bool raiseEvents = true)
+        public PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -895,7 +895,7 @@ public PublishResult SaveAndPublish(IContent content, string culture = "*", int
         }
 
         /// <inheritdoc />
-        public PublishResult Unpublish(IContent content, string culture = "*", int userId = 0)
+        public PublishResult Unpublish(IContent content, string culture = "*", int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -942,7 +942,7 @@ public PublishResult Unpublish(IContent content, string culture = "*", int userI
         }
 
         /// <inheritdoc />
-        public PublishResult SavePublishing(IContent content, int userId = 0, bool raiseEvents = true)
+        public PublishResult SavePublishing(IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -953,7 +953,7 @@ public PublishResult SavePublishing(IContent content, int userId = 0, bool raise
             }
         }
 
-        private PublishResult SavePublishingInternal(IScope scope, IContent content, int userId = 0, bool raiseEvents = true, bool branchOne = false, bool branchRoot = false)
+        private PublishResult SavePublishingInternal(IScope scope, IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true, bool branchOne = false, bool branchRoot = false)
         {
             var evtMsgs = EventMessagesFactory.Get();
             PublishResult publishResult = null;
@@ -1315,7 +1315,7 @@ private HashSet<string> SaveAndPublishBranch_ShouldPublish3(ref HashSet<string>
 
 
         /// <inheritdoc />
-        public IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string culture = "*", int userId = 0)
+        public IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string culture = "*", int userId = Constants.Security.SuperUserId)
         {
             // note: EditedValue and PublishedValue are objects here, so it is important to .Equals()
             // and not to == them, else we would be comparing references, and that is a bad thing
@@ -1357,7 +1357,7 @@ HashSet<string> ShouldPublish(IContent c)
         }
 
         /// <inheritdoc />
-        public IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string[] cultures, int userId = 0)
+        public IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string[] cultures, int userId = Constants.Security.SuperUserId)
         {
             // note: EditedValue and PublishedValue are objects here, so it is important to .Equals()
             // and not to == them, else we would be comparing references, and that is a bad thing
@@ -1397,7 +1397,7 @@ HashSet<string> ShouldPublish(IContent c)
         public IEnumerable<PublishResult> SaveAndPublishBranch(IContent document, bool force,
             Func<IContent, HashSet<string>> shouldPublish,
             Func<IContent, HashSet<string>, bool> publishCultures,
-            int userId = 0)
+            int userId = Constants.Security.SuperUserId)
         {
             if (shouldPublish == null) throw new ArgumentNullException(nameof(shouldPublish));
             if (publishCultures == null) throw new ArgumentNullException(nameof(publishCultures));
@@ -1574,7 +1574,7 @@ void DoDelete(IContent c)
         /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
         /// <param name="versionDate">Latest version date</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
+        public void DeleteVersions(int id, DateTime versionDate, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -1604,7 +1604,7 @@ public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
         /// <param name="versionId">Id of the version to delete</param>
         /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = 0)
+        public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -1690,7 +1690,7 @@ public OperationResult MoveToRecycleBin(IContent content, int userId)
         /// <param name="content">The <see cref="IContent"/> to move</param>
         /// <param name="parentId">Id of the Content's new Parent</param>
         /// <param name="userId">Optional Id of the User moving the Content</param>
-        public void Move(IContent content, int parentId, int userId = 0)
+        public void Move(IContent content, int parentId, int userId = Constants.Security.SuperUserId)
         {
             // if moving to the recycle bin then use the proper method
             if (parentId == Constants.System.RecycleBinContent)
@@ -1866,7 +1866,7 @@ public OperationResult EmptyRecycleBin()
         /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
         /// <param name="userId">Optional Id of the User copying the Content</param>
         /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0)
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = Constants.Security.SuperUserId)
         {
             return Copy(content, parentId, relateToOriginal, true, userId);
         }
@@ -1881,7 +1881,7 @@ public IContent Copy(IContent content, int parentId, bool relateToOriginal, int
         /// <param name="recursive">A value indicating whether to recursively copy children.</param>
         /// <param name="userId">Optional Id of the User copying the Content</param>
         /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0)
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = Constants.Security.SuperUserId)
         {
             var copy = content.DeepCloneWithResetIdentities();
             copy.ParentId = parentId;
@@ -1984,7 +1984,7 @@ public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool
         /// <param name="content">The <see cref="IContent"/> to send to publication</param>
         /// <param name="userId">Optional Id of the User issuing the send to publication</param>
         /// <returns>True if sending publication was successful otherwise false</returns>
-        public bool SendToPublication(IContent content, int userId = 0)
+        public bool SendToPublication(IContent content, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -2038,7 +2038,7 @@ public bool SendToPublication(IContent content, int userId = 0)
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>Result indicating what action was taken when handling the command.</returns>
-        public OperationResult Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true)
+        public OperationResult Sort(IEnumerable<IContent> items, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -2067,7 +2067,7 @@ public OperationResult Sort(IEnumerable<IContent> items, int userId = 0, bool ra
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>Result indicating what action was taken when handling the command.</returns>
-        public OperationResult Sort(IEnumerable<int> ids, int userId = 0, bool raiseEvents = true)
+        public OperationResult Sort(IEnumerable<int> ids, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -2550,7 +2550,7 @@ private PublishResult StrategyUnpublish(IScope scope, IContent content, int user
         /// </remarks>
         /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
         /// <param name="userId">Optional Id of the user issuing the delete operation</param>
-        public void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        public void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = Constants.Security.SuperUserId)
         {
             // TODO: This currently this is called from the ContentTypeService but that needs to change,
             // if we are deleting a content type, we should just delete the data and do this operation slightly differently.
@@ -2626,7 +2626,7 @@ public void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
         /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
         /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
         /// <param name="userId">Optional id of the user deleting the media</param>
-        public void DeleteOfType(int contentTypeId, int userId = 0)
+        public void DeleteOfType(int contentTypeId, int userId = Constants.Security.SuperUserId)
         {
             DeleteOfTypes(new[] { contentTypeId }, userId);
         }
@@ -2684,7 +2684,7 @@ public IContent GetBlueprintById(Guid id)
             }
         }
 
-        public void SaveBlueprint(IContent content, int userId = 0)
+        public void SaveBlueprint(IContent content, int userId = Constants.Security.SuperUserId)
         {
             //always ensure the blueprint is at the root
             if (content.ParentId != -1)
@@ -2710,7 +2710,7 @@ public void SaveBlueprint(IContent content, int userId = 0)
             }
         }
 
-        public void DeleteBlueprint(IContent content, int userId = 0)
+        public void DeleteBlueprint(IContent content, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -2723,7 +2723,7 @@ public void DeleteBlueprint(IContent content, int userId = 0)
 
         private static readonly string[] ArrayOfOneNullString = { null };
 
-        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0)
+        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = Constants.Security.SuperUserId)
         {
             if (blueprint == null) throw new ArgumentNullException(nameof(blueprint));
 
@@ -2772,7 +2772,7 @@ public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] contentTy
             }
         }
 
-        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -2799,7 +2799,7 @@ public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId
             }
         }
 
-        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
+        public void DeleteBlueprintsOfType(int contentTypeId, int userId = Constants.Security.SuperUserId)
         {
             DeleteBlueprintsOfTypes(new[] { contentTypeId }, userId);
         }
@@ -2808,7 +2808,7 @@ public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
 
         #region Rollback
 
-        public OperationResult Rollback(int id, int versionId, string culture = "*", int userId = 0)
+        public OperationResult Rollback(int id, int versionId, string culture = "*", int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index d4cb89095399..1f1f0d9ac345 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -376,7 +376,7 @@ public int Count()
 
         #region Save
 
-        public void Save(TItem item, int userId = 0)
+        public void Save(TItem item, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -414,7 +414,7 @@ public void Save(TItem item, int userId = 0)
             }
         }
 
-        public void Save(IEnumerable<TItem> items, int userId = 0)
+        public void Save(IEnumerable<TItem> items, int userId = Constants.Security.SuperUserId)
         {
             var itemsA = items.ToArray();
 
@@ -460,7 +460,7 @@ public void Save(IEnumerable<TItem> items, int userId = 0)
 
         #region Delete
 
-        public void Delete(TItem item, int userId = 0)
+        public void Delete(TItem item, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -514,7 +514,7 @@ public void Delete(TItem item, int userId = 0)
             }
         }
 
-        public void Delete(IEnumerable<TItem> items, int userId = 0)
+        public void Delete(IEnumerable<TItem> items, int userId = Constants.Security.SuperUserId)
         {
             var itemsA = items.ToArray();
 
@@ -735,7 +735,7 @@ public Attempt<OperationResult<MoveOperationStatusType>> Move(TItem moving, int
 
         protected Guid ContainerObjectType => EntityContainer.GetContainerObjectType(ContainedObjectType);
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -775,7 +775,7 @@ public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateCont
             }
         }
 
-        public Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = 0)
+        public Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -869,7 +869,7 @@ public IEnumerable<EntityContainer> GetContainers(string name, int level)
             }
         }
 
-        public Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0)
+        public Attempt<OperationResult> DeleteContainer(int containerId, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -906,7 +906,7 @@ public Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0)
             }
         }
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 97368e9047c2..445daddff4fa 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -38,7 +38,7 @@ public DataTypeService(IScopeProvider provider, ILogger logger, IEventMessagesFa
 
         #region Containers
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -119,7 +119,7 @@ public IEnumerable<EntityContainer> GetContainers(int[] containerIds)
             }
         }
 
-        public Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = 0)
+        public Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -153,7 +153,7 @@ public Attempt<OperationResult> SaveContainer(EntityContainer container, int use
             return OperationResult.Attempt.Succeed(evtMsgs);
         }
 
-        public Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0)
+        public Attempt<OperationResult> DeleteContainer(int containerId, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -186,7 +186,7 @@ public Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0)
             return OperationResult.Attempt.Succeed(evtMsgs);
         }
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -331,7 +331,7 @@ public Attempt<OperationResult<MoveOperationStatusType>> Move(IDataType toMove,
         /// </summary>
         /// <param name="dataType"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
-        public void Save(IDataType dataType, int userId = 0)
+        public void Save(IDataType dataType, int userId = Constants.Security.SuperUserId)
         {
             dataType.CreatorId = userId;
 
@@ -363,7 +363,7 @@ public void Save(IDataType dataType, int userId = 0)
         /// </summary>
         /// <param name="dataTypeDefinitions"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
-        public void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = 0)
+        public void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = Constants.Security.SuperUserId)
         {
             Save(dataTypeDefinitions, userId, true);
         }
@@ -413,7 +413,7 @@ public void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId, bool ra
         /// </remarks>
         /// <param name="dataType"><see cref="IDataType"/> to delete</param>
         /// <param name="userId">Optional Id of the user issuing the deletion</param>
-        public void Delete(IDataType dataType, int userId = 0)
+        public void Delete(IDataType dataType, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index d85b0ca1ba54..596d033ae891 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -74,7 +74,7 @@ public Stylesheet GetStylesheetByName(string name)
         /// </summary>
         /// <param name="stylesheet"><see cref="Stylesheet"/> to save</param>
         /// <param name="userId"></param>
-        public void SaveStylesheet(Stylesheet stylesheet, int userId = 0)
+        public void SaveStylesheet(Stylesheet stylesheet, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -100,7 +100,7 @@ public void SaveStylesheet(Stylesheet stylesheet, int userId = 0)
         /// </summary>
         /// <param name="path">Name incl. extension of the Stylesheet to delete</param>
         /// <param name="userId"></param>
-        public void DeleteStylesheet(string path, int userId = 0)
+        public void DeleteStylesheet(string path, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -217,7 +217,7 @@ public Script GetScriptByName(string name)
         /// </summary>
         /// <param name="script"><see cref="Script"/> to save</param>
         /// <param name="userId"></param>
-        public void SaveScript(Script script, int userId = 0)
+        public void SaveScript(Script script, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -242,7 +242,7 @@ public void SaveScript(Script script, int userId = 0)
         /// </summary>
         /// <param name="path">Name incl. extension of the Script to delete</param>
         /// <param name="userId"></param>
-        public void DeleteScript(string path, int userId = 0)
+        public void DeleteScript(string path, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -338,7 +338,7 @@ public long GetScriptFileSize(string filepath)
         /// <returns>
         /// The template created
         /// </returns>
-        public Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = Constants.Security.SuperUserId)
         {
             var template = new Template(contentTypeName,
                 //NOTE: We are NOT passing in the content type alias here, we want to use it's name since we don't
@@ -395,7 +395,7 @@ public Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateFo
         /// <param name="masterTemplate"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-        public ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = 0)
+        public ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = Constants.Security.SuperUserId)
         {
             // file might already be on disk, if so grab the content to avoid overwriting
             var template = new Template(name, alias)
@@ -529,7 +529,7 @@ public IEnumerable<ITemplate> GetTemplateChildren(int masterTemplateId)
         /// </summary>
         /// <param name="template"><see cref="Template"/> to save</param>
         /// <param name="userId"></param>
-        public void SaveTemplate(ITemplate template, int userId = 0)
+        public void SaveTemplate(ITemplate template, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -553,7 +553,7 @@ public void SaveTemplate(ITemplate template, int userId = 0)
         /// </summary>
         /// <param name="templates">List of <see cref="Template"/> to save</param>
         /// <param name="userId">Optional id of the user</param>
-        public void SaveTemplate(IEnumerable<ITemplate> templates, int userId = 0)
+        public void SaveTemplate(IEnumerable<ITemplate> templates, int userId = Constants.Security.SuperUserId)
         {
             var templatesA = templates.ToArray();
             using (var scope = ScopeProvider.CreateScope())
@@ -579,7 +579,7 @@ public void SaveTemplate(IEnumerable<ITemplate> templates, int userId = 0)
         /// </summary>
         /// <param name="alias">Alias of the <see cref="ITemplate"/> to delete</param>
         /// <param name="userId"></param>
-        public void DeleteTemplate(string alias, int userId = 0)
+        public void DeleteTemplate(string alias, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -723,17 +723,17 @@ public IEnumerable<IPartialView> GetPartialViewMacros(params string[] names)
             }
         }
 
-        public Attempt<IPartialView> CreatePartialView(IPartialView partialView, string snippetName = null, int userId = 0)
+        public Attempt<IPartialView> CreatePartialView(IPartialView partialView, string snippetName = null, int userId = Constants.Security.SuperUserId)
         {
             return CreatePartialViewMacro(partialView, PartialViewType.PartialView, snippetName, userId);
         }
 
-        public Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = 0)
+        public Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = Constants.Security.SuperUserId)
         {
             return CreatePartialViewMacro(partialView, PartialViewType.PartialViewMacro, snippetName, userId);
         }
 
-        private Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, PartialViewType partialViewType, string snippetName = null, int userId = 0)
+        private Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, PartialViewType partialViewType, string snippetName = null, int userId = Constants.Security.SuperUserId)
         {
             string partialViewHeader;
             switch (partialViewType)
@@ -799,17 +799,17 @@ private Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, P
             return Attempt<IPartialView>.Succeed(partialView);
         }        
 
-        public bool DeletePartialView(string path, int userId = 0)
+        public bool DeletePartialView(string path, int userId = Constants.Security.SuperUserId)
         {
             return DeletePartialViewMacro(path, PartialViewType.PartialView, userId);
         }
 
-        public bool DeletePartialViewMacro(string path, int userId = 0)
+        public bool DeletePartialViewMacro(string path, int userId = Constants.Security.SuperUserId)
         {
             return DeletePartialViewMacro(path, PartialViewType.PartialViewMacro, userId);
         }
 
-        private bool DeletePartialViewMacro(string path, PartialViewType partialViewType, int userId = 0)
+        private bool DeletePartialViewMacro(string path, PartialViewType partialViewType, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -839,17 +839,17 @@ private bool DeletePartialViewMacro(string path, PartialViewType partialViewType
             return true;
         }
 
-        public Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = 0)
+        public Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = Constants.Security.SuperUserId)
         {
             return SavePartialView(partialView, PartialViewType.PartialView, userId);
         }
 
-        public Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = 0)
+        public Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = Constants.Security.SuperUserId)
         {
             return SavePartialView(partialView, PartialViewType.PartialViewMacro, userId);
         }
 
-        private Attempt<IPartialView> SavePartialView(IPartialView partialView, PartialViewType partialViewType, int userId = 0)
+        private Attempt<IPartialView> SavePartialView(IPartialView partialView, PartialViewType partialViewType, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/LocalizationService.cs b/src/Umbraco.Core/Services/Implement/LocalizationService.cs
index 678ea10da2f9..251261cfc84a 100644
--- a/src/Umbraco.Core/Services/Implement/LocalizationService.cs
+++ b/src/Umbraco.Core/Services/Implement/LocalizationService.cs
@@ -227,7 +227,7 @@ public bool DictionaryItemExists(string key)
         /// </summary>
         /// <param name="dictionaryItem"><see cref="IDictionaryItem"/> to save</param>
         /// <param name="userId">Optional id of the user saving the dictionary item</param>
-        public void Save(IDictionaryItem dictionaryItem, int userId = 0)
+        public void Save(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -256,7 +256,7 @@ public void Save(IDictionaryItem dictionaryItem, int userId = 0)
         /// </summary>
         /// <param name="dictionaryItem"><see cref="IDictionaryItem"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the dictionary item</param>
-        public void Delete(IDictionaryItem dictionaryItem, int userId = 0)
+        public void Delete(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -356,7 +356,7 @@ public IEnumerable<ILanguage> GetAllLanguages()
         /// </summary>
         /// <param name="language"><see cref="ILanguage"/> to save</param>
         /// <param name="userId">Optional id of the user saving the language</param>
-        public void Save(ILanguage language, int userId = 0)
+        public void Save(ILanguage language, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -409,7 +409,7 @@ private bool CreatesCycle(ILanguage language, IDictionary<int, ILanguage> langua
         /// </summary>
         /// <param name="language"><see cref="ILanguage"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the language</param>
-        public void Delete(ILanguage language, int userId = 0)
+        public void Delete(ILanguage language, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/MacroService.cs b/src/Umbraco.Core/Services/Implement/MacroService.cs
index d4f2d95bbbbe..a6631aae4c2e 100644
--- a/src/Umbraco.Core/Services/Implement/MacroService.cs
+++ b/src/Umbraco.Core/Services/Implement/MacroService.cs
@@ -81,7 +81,7 @@ public IMacro GetById(Guid id)
         /// </summary>
         /// <param name="macro"><see cref="IMacro"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the macro</param>
-        public void Delete(IMacro macro, int userId = 0)
+        public void Delete(IMacro macro, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -106,7 +106,7 @@ public void Delete(IMacro macro, int userId = 0)
         /// </summary>
         /// <param name="macro"><see cref="IMacro"/> to save</param>
         /// <param name="userId">Optional Id of the user deleting the macro</param>
-        public void Save(IMacro macro, int userId = 0)
+        public void Save(IMacro macro, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index e7a42e28e48b..1fa9b9fdb41b 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -112,7 +112,7 @@ public int CountDescendants(int parentId, string mediaTypeAlias = null)
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        public IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             var parent = GetById(parentId);
             return CreateMedia(name, parent, mediaTypeAlias, userId);
@@ -130,7 +130,7 @@ public IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             var mediaType = GetMediaType(mediaTypeAlias);
             if (mediaType == null)
@@ -160,7 +160,7 @@ public IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMedia(string name, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMedia(string name, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // not locking since not saving anything
 
@@ -190,7 +190,7 @@ public IMedia CreateMedia(string name, string mediaTypeAlias, int userId = 0)
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             if (parent == null) throw new ArgumentNullException(nameof(parent));
 
@@ -219,7 +219,7 @@ public IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -251,7 +251,7 @@ public IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTyp
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMediaWithIdentity(string name, IMedia parent, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMediaWithIdentity(string name, IMedia parent, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             if (parent == null) throw new ArgumentNullException(nameof(parent));
 
@@ -632,7 +632,7 @@ public IMedia GetMediaByPath(string mediaPath)
         /// <param name="media">The <see cref="IMedia"/> to save</param>
         /// <param name="userId">Id of the User saving the Media</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public Attempt<OperationResult> Save(IMedia media, int userId = 0, bool raiseEvents = true)
+        public Attempt<OperationResult> Save(IMedia media, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -677,7 +677,7 @@ public Attempt<OperationResult> Save(IMedia media, int userId = 0, bool raiseEve
         /// <param name="medias">Collection of <see cref="IMedia"/> to save</param>
         /// <param name="userId">Id of the User saving the Media</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = 0, bool raiseEvents = true)
+        public Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
             var mediasA = medias.ToArray();
@@ -724,7 +724,7 @@ public Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = 0,
         /// </summary>
         /// <param name="media">The <see cref="IMedia"/> to delete</param>
         /// <param name="userId">Id of the User deleting the Media</param>
-        public Attempt<OperationResult> Delete(IMedia media, int userId = 0)
+        public Attempt<OperationResult> Delete(IMedia media, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -785,7 +785,7 @@ void DoDelete(IMedia c)
         /// <param name="id">Id of the <see cref="IMedia"/> object to delete versions from</param>
         /// <param name="versionDate">Latest version date</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Media object</param>
-        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
+        public void DeleteVersions(int id, DateTime versionDate, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -809,7 +809,7 @@ public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
             }
         }
 
-        private void DeleteVersions(IScope scope, bool wlock, int id, DateTime versionDate, int userId = 0)
+        private void DeleteVersions(IScope scope, bool wlock, int id, DateTime versionDate, int userId = Constants.Security.SuperUserId)
         {
             var args = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
             if (scope.Events.DispatchCancelable(DeletingVersions, this, args))
@@ -832,7 +832,7 @@ private void DeleteVersions(IScope scope, bool wlock, int id, DateTime versionDa
         /// <param name="versionId">Id of the version to delete</param>
         /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Media object</param>
-        public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = 0)
+        public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -872,7 +872,7 @@ public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int u
         /// </summary>
         /// <param name="media">The <see cref="IMedia"/> to delete</param>
         /// <param name="userId">Id of the User deleting the Media</param>
-        public Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = 0)
+        public Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             var moves = new List<Tuple<IMedia, string>>();
@@ -916,7 +916,7 @@ public Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = 0)
         /// <param name="media">The <see cref="IMedia"/> to move</param>
         /// <param name="parentId">Id of the Media's new Parent</param>
         /// <param name="userId">Id of the User moving the Media</param>
-        public Attempt<OperationResult> Move(IMedia media, int parentId, int userId = 0)
+        public Attempt<OperationResult> Move(IMedia media, int parentId, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -1084,7 +1084,7 @@ public OperationResult EmptyRecycleBin()
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        public bool Sort(IEnumerable<IMedia> items, int userId = 0, bool raiseEvents = true)
+        public bool Sort(IEnumerable<IMedia> items, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var itemsA = items.ToArray();
             if (itemsA.Length == 0) return true;
@@ -1273,7 +1273,7 @@ public long GetMediaFileSize(string filepath)
         /// </remarks>
         /// <param name="mediaTypeIds">Id of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user deleting the media</param>
-        public void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = 0)
+        public void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = Constants.Security.SuperUserId)
         {
             // TODO: This currently this is called from the ContentTypeService but that needs to change,
             // if we are deleting a content type, we should just delete the data and do this operation slightly differently.
@@ -1338,7 +1338,7 @@ public void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = 0)
         /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
         /// <param name="mediaTypeId">Id of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user deleting the media</param>
-        public void DeleteMediaOfType(int mediaTypeId, int userId = 0)
+        public void DeleteMediaOfType(int mediaTypeId, int userId = Constants.Security.SuperUserId)
         {
             DeleteMediaOfTypes(new[] { mediaTypeId }, userId);
         }
diff --git a/src/Umbraco.Core/Services/Implement/PackagingService.cs b/src/Umbraco.Core/Services/Implement/PackagingService.cs
index 9c4c6290a909..5194a26eb5a3 100644
--- a/src/Umbraco.Core/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Core/Services/Implement/PackagingService.cs
@@ -100,7 +100,7 @@ public async Task<FileInfo> FetchPackageFileAsync(Guid packageId, Version umbrac
 
         public CompiledPackage GetCompiledPackageInfo(FileInfo packageFile) => _packageInstallation.ReadPackage(packageFile);
 
-        public IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition packageDefinition, FileInfo packageFile, int userId = 0)
+        public IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition packageDefinition, FileInfo packageFile, int userId = Constants.Security.SuperUserId)
         {
             if (packageDefinition == null) throw new ArgumentNullException(nameof(packageDefinition));
             if (packageDefinition.Id == default) throw new ArgumentException("The package definition has not been persisted");
@@ -118,7 +118,7 @@ public IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition package
             return files;
         }
 
-        public InstallationSummary InstallCompiledPackageData(PackageDefinition packageDefinition, FileInfo packageFile, int userId = 0)
+        public InstallationSummary InstallCompiledPackageData(PackageDefinition packageDefinition, FileInfo packageFile, int userId = Constants.Security.SuperUserId)
         {
             if (packageDefinition == null) throw new ArgumentNullException(nameof(packageDefinition));
             if (packageDefinition.Id == default) throw new ArgumentException("The package definition has not been persisted");
@@ -141,7 +141,7 @@ public InstallationSummary InstallCompiledPackageData(PackageDefinition packageD
             return summary;
         }
 
-        public UninstallationSummary UninstallPackage(string packageName, int userId = 0)
+        public UninstallationSummary UninstallPackage(string packageName, int userId = Constants.Security.SuperUserId)
         {
             //this is ordered by descending version
             var allPackageVersions = GetInstalledPackageByName(packageName)?.ToList();
@@ -187,7 +187,7 @@ public UninstallationSummary UninstallPackage(string packageName, int userId = 0
 
         #region Created/Installed Package Repositories
 
-        public void DeleteCreatedPackage(int id, int userId = 0)
+        public void DeleteCreatedPackage(int id, int userId = Constants.Security.SuperUserId)
         {
             var package = GetCreatedPackageById(id);
             if (package == null) return;
@@ -236,7 +236,7 @@ public PackageInstallType GetPackageInstallType(string packageName, SemVersion p
 
         public bool SaveInstalledPackage(PackageDefinition definition) => _installedPackages.SavePackage(definition);
 
-        public void DeleteInstalledPackage(int packageId, int userId = 0)
+        public void DeleteInstalledPackage(int packageId, int userId = Constants.Security.SuperUserId)
         {
             var package = GetInstalledPackageById(packageId);
             if (package == null) return;

From 0be5ff64bc626f3f852dc207d86f2ecdcb3e2d6b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 6 Feb 2019 15:05:56 +0100
Subject: [PATCH 330/421] Be friendly

---
 .../Repositories/Implement/ServerRegistrationRepository.cs    | 2 +-
 .../Services/Implement/LocalizedTextServiceFileSources.cs     | 2 +-
 .../LegacyXmlPublishedCache/PublishedMediaCache.cs            | 2 +-
 .../Persistence/Repositories/ContentTypeRepositoryTest.cs     | 2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs                  | 4 ++--
 .../Models/Mapping/ContentTypeProfileExtensions.cs            | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
index 2bad7229f28f..6b2dfddaebf1 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
@@ -20,7 +20,7 @@ public ServerRegistrationRepository(IScopeAccessor scopeAccessor, ILogger logger
 
         protected override IRepositoryCachePolicy<IServerRegistration, int> CreateCachePolicy()
         {
-            // TODO: wtf are we doing with cache here?
+            // TODO: what are we doing with cache here?
             // why are we using disabled cache helper up there?
             //
             // 7.6 says:
diff --git a/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs b/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
index a0b952a75aa1..f620d31fe9fb 100644
--- a/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
+++ b/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
@@ -61,7 +61,7 @@ public LocalizedTextServiceFileSources(
                     var filename = Path.GetFileNameWithoutExtension(localCopy.FullName).Replace("_", "-");
 
                     // TODO: Fix this nonsense... would have to wait until v8 to store the language files with their correct
-                    // names instead of storing them as 2 letters but actually having a 4 letter culture. wtf. So now, we
+                    // names instead of storing them as 2 letters but actually having a 4 letter culture. So now, we
                     // need to check if the file is 2 letters, then open it to try to find it's 4 letter culture, then use that
                     // if it's successful. We're going to assume (though it seems assuming in the legacy logic is never a great idea)
                     // that any 4 letter file is named with the actual culture that it is!
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
index c62614ef2290..17a18781b42b 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
@@ -587,7 +587,7 @@ internal IEnumerable<IPublishedContent> ToIPublishedContent(int parentId, XPathN
             {
                 int id;
                 if (int.TryParse(itemm.GetAttribute("id", ""), out id) == false)
-                    continue; // wtf?
+                    continue; // uh?
                 var captured = itemm;
                 var cacheValues = GetCacheValues(id, idd => ConvertFromXPathNavigator(captured));
                 mediaList.Add(CreateFromCacheValues(cacheValues));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index 2d45c24d0f0c..03aae74920a2 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -311,7 +311,7 @@ public void Can_Perform_Add_On_ContentTypeRepository_After_Model_Mapping()
 
                 Assert.AreEqual(4, contentType.PropertyTypes.Count());
 
-                // remove all templates - since they are not saved, they would break the (wtf) mapping code
+                // remove all templates - since they are not saved, they would break the (!) mapping code
                 contentType.AllowedTemplates = new ITemplate[0];
 
                 // there is NO mapping from display to contentType, but only from save
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 702a99b5100c..c404e0404d7f 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -157,7 +157,7 @@ protected virtual void Compose()
 
             // etc
             ComposeWeb();
-            ComposeWtf();
+            ComposeMisc();
 
             // not sure really
             Compose(Composition);
@@ -233,7 +233,7 @@ protected virtual void ComposeWeb()
 
         }
 
-        protected virtual void ComposeWtf()
+        protected virtual void ComposeMisc()
         {
             // what else?
             var runtimeStateMock = new Mock<IRuntimeState>();
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
index 0181fc25bef9..0e324c94b950 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
@@ -25,7 +25,7 @@ public static IMappingExpression<TSource, PropertyGroup> MapPropertyGroupBasicTo
             where TPropertyTypeBasic : PropertyTypeBasic
         {
             return mapping
-                .ConstructUsing(x => new PropertyGroup(false)) // TODO: we have NO idea of isPublishing here = wtf?
+                .ConstructUsing(x => new PropertyGroup(false)) // TODO: we have NO idea of isPublishing here = so what?
                 .IgnoreEntityCommonProperties()
                 .ForMember(dest => dest.Id, map => map.Condition(src => src.Id > 0))
                 .ForMember(dest => dest.Key, map => map.Ignore())

From 51ad0f75d1c95808f05096b1cc89557fe3cf2bdc Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 6 Feb 2019 15:16:11 +0000
Subject: [PATCH 331/421] Fix up unit test but also uses constant for -1 as the
 parent id aka System Root Node Id

---
 .../Services/ContentServiceTests.cs           | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 017f1f50ecea..e75ed3f52c97 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -96,7 +96,7 @@ public void Create_Blueprint()
             ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
             contentTypeService.Save(contentType);
 
-            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
+            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
             blueprint.SetValue("title", "blueprint 1");
             blueprint.SetValue("bodyText", "blueprint 2");
             blueprint.SetValue("keywords", "blueprint 3");
@@ -122,7 +122,7 @@ public void Delete_Blueprint()
             ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
             contentTypeService.Save(contentType);
 
-            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
+            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
             blueprint.SetValue("title", "blueprint 1");
             blueprint.SetValue("bodyText", "blueprint 2");
             blueprint.SetValue("keywords", "blueprint 3");
@@ -148,7 +148,7 @@ public void Create_Content_From_Blueprint()
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
                 contentTypeService.Save(contentType);
 
-                var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
+                var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
                 blueprint.SetValue("title", "blueprint 1");
                 blueprint.SetValue("bodyText", "blueprint 2");
                 blueprint.SetValue("keywords", "blueprint 3");
@@ -183,7 +183,7 @@ public void Get_All_Blueprints()
 
             for (int i = 0; i < 10; i++)
             {
-                var blueprint = MockedContent.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, -1);
+                var blueprint = MockedContent.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, Constants.System.Root);
                 contentService.SaveBlueprint(blueprint);
             }
 
@@ -294,7 +294,7 @@ public void Remove_Scheduled_Publishing_Date()
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
 
             content.ContentSchedule.Add(null, DateTime.Now.AddHours(2));
             contentService.Save(content, Constants.Security.SuperUserId);
@@ -322,7 +322,7 @@ public void Get_Top_Version_Ids()
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             for (var i = 0; i < 20; i++)
             {
                 content.SetValue("bodyText", "hello world " + Guid.NewGuid());
@@ -347,7 +347,7 @@ public void Get_By_Ids_Sorted()
             var results = new List<IContent>();
             for (var i = 0; i < 20; i++)
             {
-                results.Add(contentService.CreateAndSave("Test", -1, "umbTextpage", 0));
+                results.Add(contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", 0));
             }
 
             var sortedGet = contentService.GetByIds(new[] {results[10].Id, results[5].Id, results[12].Id}).ToArray();
@@ -367,7 +367,7 @@ public void Count_All()
             // Act
             for (int i = 0; i < 20; i++)
             {
-                contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+                contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             }
 
             // Assert
@@ -386,7 +386,7 @@ public void Count_By_Content_Type()
             // Act
             for (int i = 0; i < 20; i++)
             {
-                contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
+                contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
             }
 
             // Assert
@@ -401,7 +401,7 @@ public void Count_Children()
             var contentTypeService = ServiceContext.ContentTypeService;
             var contentType = MockedContentTypes.CreateSimpleContentType("umbBlah", "test Doc Type");
             contentTypeService.Save(contentType);
-            var parent = contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
+            var parent = contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
 
             // Act
             for (int i = 0; i < 20; i++)
@@ -421,7 +421,7 @@ public void Count_Descendants()
             var contentTypeService = ServiceContext.ContentTypeService;
             var contentType = MockedContentTypes.CreateSimpleContentType("umbBlah", "test Doc Type");
             contentTypeService.Save(contentType);
-            var parent = contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
+            var parent = contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
 
             // Act
             IContent current = parent;
@@ -455,7 +455,7 @@ public void Can_Remove_Property_Type()
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.Create("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(content, Is.Not.Null);
@@ -469,7 +469,7 @@ public void Can_Create_Content()
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.Create("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(content, Is.Not.Null);
@@ -483,12 +483,12 @@ public void Can_Create_Content_Without_Explicitly_Set_User()
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.Create("Test", -1, "umbTextpage");
+            var content = contentService.Create("Test", Constants.System.Root, "umbTextpage");
 
             // Assert
             Assert.That(content, Is.Not.Null);
             Assert.That(content.HasIdentity, Is.False);
-            Assert.That(content.CreatorId, Is.EqualTo(0)); //Default to 0 (unknown) since we didn't explicitly set this in the Create call
+            Assert.That(content.CreatorId, Is.EqualTo(Constants.Security.SuperUserId)); //Default to -1 aka SuperUser (unknown) since we didn't explicitly set this in the Create call
         }
 
         [Test]
@@ -502,7 +502,7 @@ public void Can_Save_New_Content_With_Explicit_User()
                 RawPasswordValue = "test"
                 };
             ServiceContext.UserService.Save(user);
-            var content = new Content("Test", -1, ServiceContext.ContentTypeService.Get("umbTextpage"));
+            var content = new Content("Test", Constants.System.Root, ServiceContext.ContentTypeService.Get("umbTextpage"));
 
             // Act
             ServiceContext.ContentService.Save(content, (int)user.Id);
@@ -519,7 +519,7 @@ public void Cannot_Create_Content_With_Non_Existing_ContentType_Alias()
             var contentService = ServiceContext.ContentService;
 
             // Act & Assert
-            Assert.Throws<Exception>(() => contentService.Create("Test", -1, "umbAliasDoesntExist"));
+            Assert.Throws<Exception>(() => contentService.Create("Test", Constants.System.Root, "umbAliasDoesntExist"));
         }
 
         [Test]
@@ -527,7 +527,7 @@ public void Cannot_Save_Content_With_Empty_Name()
         {
             // Arrange
             var contentService = ServiceContext.ContentService;
-            var content = new Content(string.Empty, -1, ServiceContext.ContentTypeService.Get("umbTextpage"));
+            var content = new Content(string.Empty, Constants.System.Root, ServiceContext.ContentTypeService.Get("umbTextpage"));
 
             // Act & Assert
             Assert.Throws<InvalidOperationException>(() => contentService.Save(content));
@@ -757,7 +757,7 @@ public void Can_Unpublish_Content_Variation()
             contentType.Variations = ContentVariation.Culture;
             ServiceContext.ContentTypeService.Save(contentType);
 
-            IContent content = new Content("content", -1, contentType);
+            IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
             content.SetCultureName("content-en", langUk.IsoCode);
             content.PublishCulture(langFr.IsoCode);
@@ -816,7 +816,7 @@ public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_St
 
             ServiceContext.ContentTypeService.Save(contentType);
 
-            IContent content = new Content("content", -1, contentType);
+            IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-en", langGB.IsoCode);
             content.SetCultureName("content-fr", langFr.IsoCode);
             content.PublishCulture(langGB.IsoCode);
@@ -859,7 +859,7 @@ public void Can_Publish_Content_Variation_And_Detect_Changed_Cultures()
             contentType.Variations = ContentVariation.Culture;
             ServiceContext.ContentTypeService.Save(contentType);
 
-            IContent content = new Content("content", -1, contentType);
+            IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
             content.PublishCulture(langFr.IsoCode);
             var published = ServiceContext.ContentService.SavePublishing(content);
@@ -892,7 +892,7 @@ public void Can_Unpublish_Content_Variation_And_Detect_Changed_Cultures()
             contentType.Variations = ContentVariation.Culture;
             ServiceContext.ContentTypeService.Save(contentType);
 
-            IContent content = new Content("content", -1, contentType);
+            IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
             content.SetCultureName("content-gb", langGB.IsoCode);
             content.PublishCulture(langGB.IsoCode);
@@ -955,7 +955,7 @@ public void IsPublishable()
         {
             // Arrange
             var contentService = ServiceContext.ContentService;
-            var parent = contentService.Create("parent", -1, "umbTextpage");
+            var parent = contentService.Create("parent", Constants.System.Root, "umbTextpage");
 
             contentService.SaveAndPublish(parent);
             var content = contentService.Create("child", parent, "umbTextpage");
@@ -1288,7 +1288,7 @@ public void Can_Save_And_Publish_Content_And_Child_Without_Identity()
         {
             // Arrange
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             content.SetValue("author", "Barack Obama");
 
             // Act
@@ -1787,7 +1787,7 @@ public void Can_Copy_Content_With_Tags()
             ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
             ServiceContext.ContentTypeService.Save(contentType);
 
-            var content = MockedContent.CreateSimpleContent(contentType, "Simple Tags Page", -1);
+            var content = MockedContent.CreateSimpleContent(contentType, "Simple Tags Page", Constants.System.Root);
             content.AssignTags(propAlias, new[] {"hello", "world"});
             contentService.Save(content);
 
@@ -1963,7 +1963,7 @@ public void Can_Rollback_Version_On_Multilingual()
             ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
             ServiceContext.ContentTypeService.Save(contentType);
 
-            var page = new Content("Page", -1, contentType)
+            var page = new Content("Page", Constants.System.Root, contentType)
             {
                 Level = 1,
                 SortOrder = 1,
@@ -2190,7 +2190,7 @@ public void Can_Verify_Property_Types_On_Content()
             var contentType = MockedContentTypes.CreateAllTypesContentType("allDataTypes", "All DataTypes");
             contentTypeService.Save(contentType);
             var contentService = ServiceContext.ContentService;
-            var content = MockedContent.CreateAllTypesContent(contentType, "Random Content", -1);
+            var content = MockedContent.CreateAllTypesContent(contentType, "Random Content", Constants.System.Root);
             contentService.Save(content);
             var id = content.Id;
 
@@ -2243,7 +2243,7 @@ public void Can_Delete_Previous_Versions_Not_Latest()
         public void Ensure_Content_Xml_Created()
         {
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             content.SetValue("author", "Barack Obama");
 
             contentService.Save(content);
@@ -2265,7 +2265,7 @@ public void Ensure_Content_Xml_Created()
         public void Ensure_Preview_Xml_Created()
         {
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             content.SetValue("author", "Barack Obama");
 
             contentService.Save(content);
@@ -2293,10 +2293,10 @@ public void Can_Get_Paged_Children()
             }
 
             long total;
-            var entities = service.GetPagedChildren(-1, 0, 6, out total).ToArray();
+            var entities = service.GetPagedChildren(Constants.System.Root, 0, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(6));
             Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
+            entities = service.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(4));
             Assert.That(total, Is.EqualTo(10));
         }
@@ -2328,10 +2328,10 @@ public void Can_Get_Paged_Children_Dont_Get_Descendants()
 
             long total;
             // children in root including the folder - not the descendants in the folder
-            var entities = service.GetPagedChildren(-1, 0, 6, out total).ToArray();
+            var entities = service.GetPagedChildren(Constants.System.Root, 0, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(6));
             Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
+            entities = service.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(4));
             Assert.That(total, Is.EqualTo(10));
 
@@ -2347,7 +2347,7 @@ public void Can_Get_Paged_Children_Dont_Get_Descendants()
         [Test]
         public void PublishingTest()
         {
-            var contentType = new ContentType(-1)
+            var contentType = new ContentType(Constants.System.Root)
             {
                 Alias = "foo",
                 Name = "Foo"
@@ -2365,7 +2365,7 @@ public void PublishingTest()
             ServiceContext.ContentTypeService.Save(contentType);
 
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("foo", -1, "foo");
+            var content = contentService.Create("foo", Constants.System.Root, "foo");
             contentService.Save(content);
 
             Assert.IsFalse(content.Published);
@@ -2493,7 +2493,7 @@ public void Ensure_Invariant_Name()
             contentTypeService.Save(contentType);
 
             var contentService = ServiceContext.ContentService;
-            var content = new Content(null, -1, contentType);
+            var content = new Content(null, Constants.System.Root, contentType);
 
             content.SetCultureName("name-us", langUk.IsoCode);
             content.SetCultureName("name-fr", langFr.IsoCode);
@@ -2528,7 +2528,7 @@ public void Ensure_Unique_Culture_Names()
 
             var contentService = ServiceContext.ContentService;
 
-            var content = new Content(null, -1, contentType);
+            var content = new Content(null, Constants.System.Root, contentType);
             content.SetCultureName("root", langUk.IsoCode);
             contentService.Save(content);
 
@@ -2570,13 +2570,13 @@ public void Can_Get_Paged_Children_WithFilterAndOrder()
             var o = new[] { 2, 1, 3, 0, 4 }; // randomly different
             for (var i = 0; i < 5; i++)
             {
-                var contentA = new Content(null, -1, contentType);
+                var contentA = new Content(null, Constants.System.Root, contentType);
                 contentA.SetCultureName("contentA" + i + "uk", langUk.IsoCode);
                 contentA.SetCultureName("contentA" + o[i] + "fr", langFr.IsoCode);
                 contentA.SetCultureName("contentX" + i + "da", langDa.IsoCode);
                 contentService.Save(contentA);
 
-                var contentB = new Content(null, -1, contentType);
+                var contentB = new Content(null, Constants.System.Root, contentType);
                 contentB.SetCultureName("contentB" + i + "uk", langUk.IsoCode);
                 contentB.SetCultureName("contentB" + o[i] + "fr", langFr.IsoCode);
                 contentB.SetCultureName("contentX" + i + "da", langDa.IsoCode);
@@ -2584,7 +2584,7 @@ public void Can_Get_Paged_Children_WithFilterAndOrder()
             }
 
             // get all
-            var list = contentService.GetPagedChildren(-1, 0, 100, out var total).ToList();
+            var list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out var total).ToList();
 
             Console.WriteLine("ALL");
             WriteList(list);
@@ -2594,7 +2594,7 @@ public void Can_Get_Paged_Children_WithFilterAndOrder()
             Assert.AreEqual(11, list.Count);
 
             // filter
-            list = contentService.GetPagedChildren(-1, 0, 100, out total,
+            list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
                 SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
                 Ordering.By("name", culture: langFr.IsoCode)).ToList();
 
@@ -2602,7 +2602,7 @@ public void Can_Get_Paged_Children_WithFilterAndOrder()
             Assert.AreEqual(0, list.Count);
 
             // filter
-            list = contentService.GetPagedChildren(-1, 0, 100, out total,
+            list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
                 SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
                 Ordering.By("name", culture: langDa.IsoCode)).ToList();
 
@@ -2613,7 +2613,7 @@ public void Can_Get_Paged_Children_WithFilterAndOrder()
             Assert.AreEqual(10, list.Count);
 
             // filter
-            list = contentService.GetPagedChildren(-1, 0, 100, out total,
+            list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
                 SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
                 Ordering.By("name", culture: langFr.IsoCode)).ToList();
 
@@ -2626,7 +2626,7 @@ public void Can_Get_Paged_Children_WithFilterAndOrder()
             for (var i = 0; i < 5; i++)
                 Assert.AreEqual("contentA" + i + "fr", list[i].GetCultureName(langFr.IsoCode));
 
-            list = contentService.GetPagedChildren(-1, 0, 100, out total,
+            list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
                 SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
                 Ordering.By("name", direction: Direction.Descending, culture: langFr.IsoCode)).ToList();
 
@@ -2671,7 +2671,7 @@ public void Can_SaveRead_Variations()
             contentTypeService.Save(contentType);
 
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("Home US", -1, "umbTextpage");
+            var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage");
 
             // creating content with a name but no culture - will set the invariant name
             // but, because that content is variant, as soon as we save, we'll need to

From 162e6918280dd49a6fa6854a159194344025a3fc Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 6 Feb 2019 16:26:32 +0100
Subject: [PATCH 332/421] Bugfix PublishedContentTypeFactory

---
 .../PublishedContent/PublishedContentTypeFactory.cs  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
index abf4156d7fd9..8a44a7a9b406 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
@@ -70,9 +70,7 @@ public PublishedDataType GetDataType(int id)
                 if (_publishedDataTypes == null)
                 {
                     var dataTypes = _dataTypeService.GetAll();
-                    _publishedDataTypes = dataTypes.ToDictionary(
-                        x => x.Id,
-                        x => new PublishedDataType(x.Id, x.EditorAlias, x is DataType d ? d.GetLazyConfiguration() : new Lazy<object>(() => x.Configuration)));
+                    _publishedDataTypes = dataTypes.ToDictionary(x => x.Id, CreatePublishedDataType);
                 }
 
                 publishedDataTypes = _publishedDataTypes;
@@ -89,12 +87,12 @@ public void NotifyDataTypeChanges(int[] ids)
         {
             lock (_publishedDataTypesLocker)
             {
-                foreach (var id in ids)
-                    _publishedDataTypes.Remove(id);
                 var dataTypes = _dataTypeService.GetAll(ids);
-                foreach (var dataType in dataTypes)
-                    _publishedDataTypes[dataType.Id] = new PublishedDataType(dataType.Id, dataType.EditorAlias, dataType is DataType d ? d.GetLazyConfiguration() : new Lazy<object>(() => dataType.Configuration));
+                _publishedDataTypes = dataTypes.ToDictionary(x => x.Id, CreatePublishedDataType);
             }
         }
+
+        private PublishedDataType CreatePublishedDataType(IDataType dataType)
+            => new PublishedDataType(dataType.Id, dataType.EditorAlias, dataType is DataType d ? d.GetLazyConfiguration() : new Lazy<object>(() => dataType.Configuration));
     }
 }

From 4655acfdebbb8e17a908b7ea2f236eaebf19a40b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 11:26:09 +1100
Subject: [PATCH 333/421] Fixes ambiguous call

---
 .../Repositories/Implement/DocumentRepository.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index a4acb824b781..04af52047c1a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -120,15 +120,15 @@ protected Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
                     break;
                 case QueryType.Single:
                 case QueryType.Many:
-                    //fixme: Apparently this is ambiguous?
-                    sql = sql.Select<DocumentDto>(r =>
-                       r.Select(documentDto => documentDto.ContentDto, r1 =>
-                           r1.Select(contentDto => contentDto.NodeDto))
-                        .Select(documentDto => documentDto.DocumentVersionDto, r1 =>
-                           r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto))
-                        .Select(documentDto => documentDto.PublishedVersionDto, "pdv", r1 =>
-                           r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto, "pcv")))
 
+                    //we've put this in a local function so that the below sql.Select statement doesn't have a problem
+                    //thinking that the call is ambiguous
+                    NPocoSqlExtensions.SqlRef<DocumentDto> SelectStatement(NPocoSqlExtensions.SqlRef<DocumentDto> r) =>
+                        r.Select(documentDto => documentDto.ContentDto, r1 => r1.Select(contentDto => contentDto.NodeDto))
+                            .Select(documentDto => documentDto.DocumentVersionDto, r1 => r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto))
+                            .Select(documentDto => documentDto.PublishedVersionDto, "pdv", r1 => r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto, "pcv"));
+
+                    sql = sql.Select<DocumentDto>(SelectStatement)
                        // select the variant name, coalesce to the invariant name, as "variantName"
                        .AndSelect(VariantNameSqlExpression + " AS variantName");
                     break;

From 78849bb7ff5e8c2c379d8310458db37341fc2985 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 11:42:16 +1100
Subject: [PATCH 334/421] removes unused methods and internalizes methods we
 can't expose yet

---
 src/Umbraco.Core/Models/ContentBase.cs |  2 +-
 src/Umbraco.Core/Models/IMedia.cs      | 15 +--------------
 src/Umbraco.Core/Models/Media.cs       | 15 ++-------------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 3a372296f07c..c6f5f39e2371 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -69,7 +69,7 @@ private ContentBase(string name, IContentTypeComposition contentType, PropertyCo
         [IgnoreDataMember]
         public ISimpleContentType ContentType { get; private set; }
 
-        protected void ChangeContentType(ISimpleContentType contentType)
+        internal void ChangeContentType(ISimpleContentType contentType)
         {
             ContentType = contentType;
             ContentTypeId = contentType.Id;
diff --git a/src/Umbraco.Core/Models/IMedia.cs b/src/Umbraco.Core/Models/IMedia.cs
index 3e2d11fb7144..3ad4f87aa855 100644
--- a/src/Umbraco.Core/Models/IMedia.cs
+++ b/src/Umbraco.Core/Models/IMedia.cs
@@ -4,19 +4,6 @@ namespace Umbraco.Core.Models
 {
     public interface IMedia : IContentBase
     {
-        /// <summary>
-        /// Changes the <see cref="IMediaType"/> for the current content object
-        /// </summary>
-        /// <param name="contentType">New ContentType for this content</param>
-        /// <remarks>Leaves PropertyTypes intact after change</remarks>
-        void ChangeContentType(IMediaType contentType);
-
-        /// <summary>
-        /// Changes the <see cref="IMediaType"/> for the current content object and removes PropertyTypes,
-        /// which are not part of the new ContentType.
-        /// </summary>
-        /// <param name="contentType">New ContentType for this content</param>
-        /// <param name="clearProperties">Boolean indicating whether to clear PropertyTypes upon change</param>
-        void ChangeContentType(IMediaType contentType, bool clearProperties);
+        
     }
 }
diff --git a/src/Umbraco.Core/Models/Media.cs b/src/Umbraco.Core/Models/Media.cs
index bf5f5cf9484a..d281f8f2671e 100644
--- a/src/Umbraco.Core/Models/Media.cs
+++ b/src/Umbraco.Core/Models/Media.cs
@@ -57,7 +57,7 @@ public Media(string name, int parentId, IMediaType contentType, PropertyCollecti
         /// </summary>
         /// <param name="contentType">New MediaType for this Media</param>
         /// <remarks>Leaves PropertyTypes intact after change</remarks>
-        public void ChangeContentType(IMediaType contentType)
+        internal void ChangeContentType(IMediaType contentType)
         {
             ChangeContentType(contentType, false);
         }
@@ -68,7 +68,7 @@ public void ChangeContentType(IMediaType contentType)
         /// </summary>
         /// <param name="contentType">New MediaType for this Media</param>
         /// <param name="clearProperties">Boolean indicating whether to clear PropertyTypes upon change</param>
-        public void ChangeContentType(IMediaType contentType, bool clearProperties)
+        internal void ChangeContentType(IMediaType contentType, bool clearProperties)
         {
             ChangeContentType(new SimpleContentType(contentType));
 
@@ -81,16 +81,5 @@ public void ChangeContentType(IMediaType contentType, bool clearProperties)
             Properties.CollectionChanged += PropertiesChanged;
         }
 
-        /// <summary>
-        /// Changes the Trashed state of the content object
-        /// </summary>
-        /// <param name="isTrashed">Boolean indicating whether content is trashed (true) or not trashed (false)</param>
-        /// <param name="parentId"> </param>
-        public void ChangeTrashedState(bool isTrashed, int parentId = -20)
-        {
-            Trashed = isTrashed;
-            //The Media Recycle Bin Id is -21 so we correct that here
-            ParentId = parentId == -20 ? -21 : parentId;
-        }
     }
 }

From 030b6263504387c57b84a6821e31621f2e5613b4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 11:49:30 +1100
Subject: [PATCH 335/421] Removes the need for a .Current, removes an unused
 method

---
 src/Umbraco.Core/ContentExtensions.cs         |  5 +--
 src/Umbraco.Tests/Models/ContentTests.cs      |  4 ++-
 .../MemberTabsAndPropertiesResolver.cs        |  4 +--
 .../Mapping/TabsAndPropertiesResolver.cs      | 31 ++++++-------------
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index d82f181e5d8c..d552b3f960ec 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -106,10 +106,11 @@ internal static bool HasChildren(IContentBase content, ServiceContext services)
         /// Returns properties that do not belong to a group
         /// </summary>
         /// <param name="content"></param>
+        /// <param name="contentTypeBaseService"></param>
         /// <returns></returns>
-        public static IEnumerable<Property> GetNonGroupedProperties(this IContentBase content)
+        public static IEnumerable<Property> GetNonGroupedProperties(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseService)
         {
-            var contentType = Current.Services.ContentTypeBaseServices.GetContentTypeOf(content);
+            var contentType = contentTypeBaseService.GetContentTypeOf(content);
             var propertyIdsInTabs = contentType.PropertyGroups.SelectMany(pg => pg.PropertyTypes);
             return content.Properties
                           .Where(property => propertyIdsInTabs.Contains(property.PropertyType) == false)
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 7fc1bd3ce474..a54b9c4e48e7 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -137,7 +137,9 @@ public void Get_Non_Grouped_Properties()
             var content = MockedContent.CreateSimpleContent(contentType);
             //need to id the p
 
-            var nonGrouped = content.GetNonGroupedProperties();
+            var serviceProvider = new ContentTypeBaseServiceProvider(_contentTypeService, Mock.Of<IMediaTypeService>(), Mock.Of<IMemberTypeService>());
+
+            var nonGrouped = content.GetNonGroupedProperties(serviceProvider);
 
             Assert.AreEqual(2, nonGrouped.Count());
             Assert.AreEqual(5, content.Properties.Count());
diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
index 517889277c87..288b8353181d 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
@@ -29,8 +29,8 @@ internal class MemberTabsAndPropertiesResolver : TabsAndPropertiesResolver<IMemb
         private readonly IMemberService _memberService;
         private readonly IUserService _userService;
 
-        public MemberTabsAndPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService localizedTextService, IMemberService memberService, IUserService userService, IMemberTypeService memberTypeService)
-            : base(localizedTextService)
+        public MemberTabsAndPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService localizedTextService, IMemberService memberService, IUserService userService, IMemberTypeService memberTypeService, IContentTypeBaseServiceProvider contentTypeServiceProvider)
+            : base(localizedTextService, contentTypeServiceProvider)
         {
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
             _localizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
index 4e6ae99cf204..6f3815f678b4 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -12,36 +12,23 @@ namespace Umbraco.Web.Models.Mapping
 {
     internal abstract class TabsAndPropertiesResolver
     {
+        private readonly IContentTypeBaseServiceProvider _contentTypeServiceProvider;
         protected ILocalizedTextService LocalizedTextService { get; }
         protected IEnumerable<string> IgnoreProperties { get; set; }
 
-        protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService)
+        protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IContentTypeBaseServiceProvider contentTypeServiceProvider)
         {
+            _contentTypeServiceProvider = contentTypeServiceProvider;
             LocalizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
             IgnoreProperties = new List<string>();
         }
 
-        protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IEnumerable<string> ignoreProperties)
-            : this(localizedTextService)
+        protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IContentTypeBaseServiceProvider contentTypeServiceProvider, IEnumerable<string> ignoreProperties)
+            : this(localizedTextService, contentTypeServiceProvider)
         {
             IgnoreProperties = ignoreProperties ?? throw new ArgumentNullException(nameof(ignoreProperties));
         }
-
-        // TODO: This should deserialize to ListViewConfiguration
-        private static int GetTabNumberFromConfig(IDictionary<string, object> listViewConfig)
-        {
-            if (!listViewConfig.TryGetValue("displayAtTabNumber", out var displayTabNum))
-                return -1;
-            switch (displayTabNum)
-            {
-                case int i:
-                    return i;
-                case string s when int.TryParse(s, out var parsed):
-                    return parsed;
-            }
-            return -1;
-        }
-
+        
         /// <summary>
         /// Returns a collection of custom generic properties that exist on the generic properties tab
         /// </summary>
@@ -65,7 +52,7 @@ protected virtual void MapGenericProperties(IContentBase content, List<Tab<Conte
         {
             // add the generic properties tab, for properties that don't belong to a tab
             // get the properties, map and translate them, then add the tab
-            var noGroupProperties = content.GetNonGroupedProperties()
+            var noGroupProperties = content.GetNonGroupedProperties(_contentTypeServiceProvider)
                 .Where(x => IgnoreProperties.Contains(x.Alias) == false) // skip ignored
                 .ToList();
             var genericproperties = MapProperties(content, noGroupProperties, context);
@@ -137,8 +124,8 @@ protected virtual List<ContentPropertyDisplay> MapProperties(IContentBase conten
     internal class TabsAndPropertiesResolver<TSource, TDestination> : TabsAndPropertiesResolver, IValueResolver<TSource, TDestination, IEnumerable<Tab<ContentPropertyDisplay>>>
         where TSource : IContentBase
     {
-        public TabsAndPropertiesResolver(ILocalizedTextService localizedTextService)
-            : base(localizedTextService)
+        public TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IContentTypeBaseServiceProvider contentTypeServiceProvider)
+            : base(localizedTextService, contentTypeServiceProvider)
         { }
 
         public virtual IEnumerable<Tab<ContentPropertyDisplay>> Resolve(TSource source, TDestination destination, IEnumerable<Tab<ContentPropertyDisplay>> destMember, ResolutionContext context)

From 562855a687cce19272a0ed8ea8aaab771c82afbd Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 11:53:43 +1100
Subject: [PATCH 336/421] removes fixme, adds comments and null checks

---
 .../ContentTypeBaseServiceProviderExtensions.cs     | 13 ++++++-------
 .../Implement/ContentTypeBaseServiceProvider.cs     |  1 +
 .../Macros/PublishedContentHashtableConverter.cs    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs b/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs
index ad4d286139b9..f962d9aefb5e 100644
--- a/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs
+++ b/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs
@@ -1,17 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 
 namespace Umbraco.Core
 {
-    // fixme
-    public static class ContentTypeBaseServiceProviderExtensions
+    internal static class ContentTypeBaseServiceProviderExtensions
     {
+        //TODO: Maybe this should just be on the IContentTypeBaseServiceProvider interface?
         public static IContentTypeComposition GetContentTypeOf(this IContentTypeBaseServiceProvider serviceProvider, IContentBase contentBase)
-            => serviceProvider.For(contentBase).Get(contentBase.ContentTypeId);
+        {
+            if (contentBase == null) throw new ArgumentNullException(nameof(contentBase));
+            return serviceProvider.For(contentBase)?.Get(contentBase.ContentTypeId);
+        }
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs b/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
index d867224b9024..e20ff28ab3d7 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
@@ -18,6 +18,7 @@ public ContentTypeBaseServiceProvider(IContentTypeService contentTypeService, IM
 
         public IContentTypeBaseService For(IContentBase contentBase)
         {
+            if (contentBase == null) throw new ArgumentNullException(nameof(contentBase));
             switch (contentBase)
             {
                 case IContent _:
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index 0ce317ac65c6..cc88d183b6dd 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -199,8 +199,8 @@ public PagePublishedContent(IContent inner, IVariationContextAccessor variationC
                 Key = _inner.Key;
 
                 // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
-                CreatorName = _inner.GetCreatorProfile().Name;
-                WriterName = _inner.GetWriterProfile().Name;
+                CreatorName = _inner.GetCreatorProfile()?.Name;
+                WriterName = _inner.GetWriterProfile()?.Name;
 
                 var contentType = Current.Services.ContentTypeBaseServices.GetContentTypeOf(_inner);
                 ContentType = Current.PublishedContentTypeFactory.CreateContentType(contentType);

From 9df0f384afe2f06978c181972b6e58a8ccd8362b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 12:02:47 +1100
Subject: [PATCH 337/421] Removes the need for another .Current and a lookup,
 simplifies the whole GetUrl for media

---
 src/Umbraco.Core/Models/MediaExtensions.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Core/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs
index b7d72f6dd337..ff5e47394f96 100644
--- a/src/Umbraco.Core/Models/MediaExtensions.cs
+++ b/src/Umbraco.Core/Models/MediaExtensions.cs
@@ -16,21 +16,17 @@ public static class MediaExtensions
         /// </summary>
         public static string GetUrl(this IMedia media, string propertyAlias, ILogger logger)
         {
-            var contentType = Current.Services.MediaTypeService.Get(media.ContentTypeId);
-            var propertyType = contentType.PropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyAlias));
-            if (propertyType == null) return string.Empty;
-
-            var val = media.Properties[propertyType];
-            if (val == null) return string.Empty;
+            if (!media.Properties.TryGetValue(propertyAlias, out var property))
+                return string.Empty;
 
             // TODO: would need to be adjusted to variations, when media become variants
-            var jsonString = val.GetValue() as string;
+            var jsonString = property?.GetValue() as string;
             if (jsonString == null) return string.Empty;
 
-            if (propertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.UploadField)
+            if (property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.UploadField)
                 return jsonString;
 
-            if (propertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.ImageCropper)
+            if (property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.ImageCropper)
             {
                 if (jsonString.DetectIsJson() == false)
                     return jsonString;

From 123daed990445885343eca8b017ae6d6358bb472 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 12:43:11 +1100
Subject: [PATCH 338/421] Removes the need for .Current in some places, adds
 TODO notes to test a theory, removes IUmbracoEntity from ISimpleContentType
 since all tests seem to pass without it and because the
 SimpleContentTypeMapper doesn't actually use ISimpleContentType i don't think
 it's needed, we'll see what the tests say.

---
 src/Umbraco.Core/Models/ISimpleContentType.cs |  5 +-
 src/Umbraco.Core/Models/PropertyCollection.cs |  2 +-
 src/Umbraco.Core/Models/SimpleContentType.cs  | 73 ++++++++-----------
 .../Querying/ModelToSqlExpressionVisitor.cs   |  2 +-
 src/Umbraco.Tests/Models/ContentTests.cs      |  5 +-
 .../Services/ContentServiceTests.cs           |  6 +-
 .../Testing/ContentBaseExtensions.cs          | 34 +++++----
 .../Filters/MemberSaveValidationAttribute.cs  |  9 ++-
 .../Editors/Filters/MemberValidationHelper.cs | 33 ++-------
 9 files changed, 74 insertions(+), 95 deletions(-)

diff --git a/src/Umbraco.Core/Models/ISimpleContentType.cs b/src/Umbraco.Core/Models/ISimpleContentType.cs
index 40862afd9e4f..7f6b2e68ea81 100644
--- a/src/Umbraco.Core/Models/ISimpleContentType.cs
+++ b/src/Umbraco.Core/Models/ISimpleContentType.cs
@@ -5,8 +5,11 @@ namespace Umbraco.Core.Models
     /// <summary>
     /// Represents a simplified view of a content type.
     /// </summary>
-    public interface ISimpleContentType : IUmbracoEntity
+    public interface ISimpleContentType
     {
+        int Id { get; }
+        string Name { get; }
+
         /// <summary>
         /// Gets the alias of the content type.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PropertyCollection.cs b/src/Umbraco.Core/Models/PropertyCollection.cs
index 5e71fe9f6592..ed641080ea1c 100644
--- a/src/Umbraco.Core/Models/PropertyCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyCollection.cs
@@ -93,7 +93,7 @@ protected override void ClearItems()
         }
 
         /// <summary>
-        /// Adds a property.
+        /// Adds or update a property.
         /// </summary>
         internal new void Add(Property property)
         {
diff --git a/src/Umbraco.Core/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs
index c0e235e92db9..86a1e56723b8 100644
--- a/src/Umbraco.Core/Models/SimpleContentType.cs
+++ b/src/Umbraco.Core/Models/SimpleContentType.cs
@@ -9,9 +9,6 @@ namespace Umbraco.Core.Models
     /// </summary>
     public class SimpleContentType : ISimpleContentType
     {
-        private readonly int _id;
-        private readonly string _name;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="SimpleContentType"/> class.
         /// </summary>
@@ -39,13 +36,12 @@ private SimpleContentType(IContentTypeBase contentType)
         {
             if (contentType == null) throw new ArgumentNullException(nameof(contentType));
 
-            _id = contentType.Id;
+            Id = contentType.Id;
             Alias = contentType.Alias;
             Variations = contentType.Variations;
             Icon = contentType.Icon;
             IsContainer = contentType.IsContainer;
-            Icon = contentType.Icon;
-            _name = contentType.Name;
+            Name = contentType.Name;
             AllowedAsRoot = contentType.AllowedAsRoot;
             IsElement = contentType.IsElement;
         }
@@ -53,12 +49,7 @@ private SimpleContentType(IContentTypeBase contentType)
         /// <inheritdoc />
         public string Alias { get; }
 
-        /// <inheritdoc />
-        public int Id
-        {
-            get => _id;
-            set => throw new NotSupportedException();
-        }
+        public int Id { get; }
 
         /// <inheritdoc />
         public ITemplate DefaultTemplate { get;  }
@@ -71,13 +62,8 @@ public int Id
 
         /// <inheritdoc />
         public bool IsContainer { get; }
-
-        /// <inheritdoc />
-        public string Name
-        {
-            get => _name;
-            set => throw new NotSupportedException();
-        }
+        
+        public string Name { get; }
 
         /// <inheritdoc />
         public bool AllowedAsRoot { get; }
@@ -120,30 +106,29 @@ public override int GetHashCode()
         // we have to have all this, because we're an IUmbracoEntity, because that is
         // required by the query expression visitor / SimpleContentTypeMapper
 
-        public object DeepClone() => throw new NotImplementedException();
-
-        public Guid Key { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public DateTime CreateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public DateTime UpdateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public DateTime? DeleteDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public bool HasIdentity => throw new NotImplementedException();
-
-        public int CreatorId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public int ParentId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public void SetParent(ITreeEntity parent) => throw new NotImplementedException();
-
-        public int Level { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public string Path { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public int SortOrder { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public bool Trashed => throw new NotImplementedException();
-        public bool IsDirty() => throw new NotImplementedException();
-        public bool IsPropertyDirty(string propName) => throw new NotImplementedException();
-        public IEnumerable<string> GetDirtyProperties() => throw new NotImplementedException();
-        public void ResetDirtyProperties() => throw new NotImplementedException();
-        public bool WasDirty() => throw new NotImplementedException();
-        public bool WasPropertyDirty(string propertyName) => throw new NotImplementedException();
-        public void ResetWereDirtyProperties() => throw new NotImplementedException();
-        public void ResetDirtyProperties(bool rememberDirty) => throw new NotImplementedException();
-        public IEnumerable<string> GetWereDirtyProperties() => throw new NotImplementedException();
+        //string ITreeEntity.Name { get => this.Name; set => throw new NotImplementedException(); }
+        //int IEntity.Id { get => this.Id; set => throw new NotImplementedException(); }
+        //bool IEntity.HasIdentity => this.Id != default;
+        //int ITreeEntity.CreatorId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //int ITreeEntity.ParentId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //int ITreeEntity.Level { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //string ITreeEntity.Path { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //int ITreeEntity.SortOrder { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //bool ITreeEntity.Trashed => throw new NotImplementedException();
+        //Guid IEntity.Key { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //DateTime IEntity.CreateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //DateTime IEntity.UpdateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //DateTime? IEntity.DeleteDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        //void ITreeEntity.SetParent(ITreeEntity parent) => throw new NotImplementedException();
+        //object IDeepCloneable.DeepClone() => throw new NotImplementedException();
+        //bool IRememberBeingDirty.WasDirty() => throw new NotImplementedException();
+        //bool IRememberBeingDirty.WasPropertyDirty(string propertyName) => throw new NotImplementedException();
+        //void IRememberBeingDirty.ResetWereDirtyProperties() => throw new NotImplementedException();
+        //void IRememberBeingDirty.ResetDirtyProperties(bool rememberDirty) => throw new NotImplementedException();
+        //IEnumerable<string> IRememberBeingDirty.GetWereDirtyProperties() => throw new NotImplementedException();
+        //bool ICanBeDirty.IsDirty() => throw new NotImplementedException();
+        //bool ICanBeDirty.IsPropertyDirty(string propName) => throw new NotImplementedException();
+        //IEnumerable<string> ICanBeDirty.GetDirtyProperties() => throw new NotImplementedException();
+        //void ICanBeDirty.ResetDirtyProperties() => throw new NotImplementedException();
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs b/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
index a353f01f5bed..bf26523d9e29 100644
--- a/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
+++ b/src/Umbraco.Core/Persistence/Querying/ModelToSqlExpressionVisitor.cs
@@ -60,7 +60,7 @@ protected override string VisitMemberAccess(MemberExpression m)
 
             if (m.Expression != null
                 && m.Expression.Type != typeof(T)
-                && TypeHelper.IsTypeAssignableFrom<IUmbracoEntity>(m.Expression.Type)
+                && TypeHelper.IsTypeAssignableFrom<IUmbracoEntity>(m.Expression.Type) //TODO: Could this just be `IEntity` ? why does it need to be IUmbracoEntity, we aren't even using the reference to that below
                 && EndsWithConstant(m) == false)
             {
                 //if this is the case, it means we have a sub expression / nested property access, such as: x.ContentType.Alias == "Test";
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index a54b9c4e48e7..7d19c341672f 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -30,6 +30,7 @@ namespace Umbraco.Tests.Models
     public class ContentTests : UmbracoTestBase
     {
         private IContentTypeService _contentTypeService;
+        private IContentTypeBaseServiceProvider _contentTypeServiceProvider;
 
         protected override void Compose()
         {
@@ -56,6 +57,8 @@ protected override void Compose()
             var mediaTypeService = Mock.Of<IMediaTypeService>();
             var memberTypeService = Mock.Of<IMemberTypeService>();
             Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService, contentTypeBaseServiceProvider: new ContentTypeBaseServiceProvider(_contentTypeService, mediaTypeService, memberTypeService)));
+
+            _contentTypeServiceProvider = new ContentTypeBaseServiceProvider(_contentTypeService, Mock.Of<IMediaTypeService>(), Mock.Of<IMemberTypeService>());
         }
 
         [Test]
@@ -541,7 +544,7 @@ public void Can_Change_Property_Value_Through_Anonymous_Object()
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
-            content.PropertyValues(new {title = "This is the new title"});
+            content.PropertyValues(_contentTypeServiceProvider, new { title = "This is the new title"});
 
             // Assert
             Assert.That(content.Properties.Any(), Is.True);
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 94cbf69b636c..b5069e040b64 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -1574,19 +1574,19 @@ public void Can_Empty_RecycleBin_With_Content_That_Has_All_Related_Data()
 
             var contentType = MockedContentTypes.CreateAllTypesContentType("test", "test");
             ServiceContext.ContentTypeService.Save(contentType, Constants.Security.SuperUserId);
-
+            
             object obj =
                 new
                 {
                     tags = "[\"Hello\",\"World\"]"
                 };
             var content1 = MockedContent.CreateBasicContent(contentType);
-            content1.PropertyValues(obj);
+            content1.PropertyValues(ServiceContext.ContentTypeBaseServices, obj);
             content1.ResetDirtyProperties(false);
             ServiceContext.ContentService.Save(content1, Constants.Security.SuperUserId);
             Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content1, userId: 0).Success);
             var content2 = MockedContent.CreateBasicContent(contentType);
-            content2.PropertyValues(obj);
+            content2.PropertyValues(ServiceContext.ContentTypeBaseServices, obj);
             content2.ResetDirtyProperties(false);
             ServiceContext.ContentService.Save(content2, Constants.Security.SuperUserId);
             Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content2, userId: 0).Success);
diff --git a/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs b/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
index 85ecf03dee3c..883c7682f42a 100644
--- a/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
+++ b/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
@@ -3,42 +3,48 @@
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Tests.Testing
 {
     public static class ContentBaseExtensions
     {
+        public static void PropertyValues(this IContentBase content, object value, string culture = null, string segment = null)
+        {
+            content.PropertyValues(Current.Services.ContentTypeBaseServices, value, culture, segment);
+        }
+
         /// <summary>
         /// Set property values by alias with an anonymous object.
         /// </summary>
         /// <remarks>Does not support variants.</remarks>
-        public static void PropertyValues(this IContentBase content, object value, string culture = null, string segment = null)
+        public static void PropertyValues(this IContentBase content, IContentTypeBaseServiceProvider contentTypeServiceProvider, object value, string culture = null, string segment = null)
         {
             if (value == null)
                 throw new Exception("No properties has been passed in");
 
-            var contentType = Current.Services.ContentTypeBaseServices.GetContentTypeOf(content);
-
             var propertyInfos = value.GetType().GetProperties();
             foreach (var propertyInfo in propertyInfos)
             {
-                //Check if a PropertyType with alias exists thus being a valid property
-                var propertyType = contentType.CompositionPropertyTypes.FirstOrDefault(x => x.Alias == propertyInfo.Name);
-                if (propertyType == null)
-                    throw new Exception($"The property alias {propertyInfo.Name} is not valid, because no PropertyType with this alias exists");
-
-                //Check if a Property with the alias already exists in the collection thus being updated or inserted
-                var item = content.Properties.FirstOrDefault(x => x.Alias == propertyInfo.Name);
-                if (item != null)
+                if (content.Properties.TryGetValue(propertyInfo.Name, out var property))
                 {
-                    item.SetValue(propertyInfo.GetValue(value, null), culture, segment);
+                    property.SetValue(propertyInfo.GetValue(value, null), culture, segment);
                     //Update item with newly added value
-                    content.Properties.Add(item);
+                    content.Properties.Add(property);
                 }
                 else
                 {
+
+                    //TODO: Will this ever happen?? In theory we don't need to lookup the content type here since we can just check if the content contains properties with the correct name,
+                    // however, i think this may be needed in the case where the content type contains property types that do not exist yet as properties on the
+                    // content item? But can that happen? AFAIK it can't/shouldn't because of how we create content items in ContentBase we do _properties.EnsurePropertyTypes!
+
+                    var contentType = contentTypeServiceProvider.GetContentTypeOf(content);
+                    var propertyType = contentType.CompositionPropertyTypes.FirstOrDefault(x => x.Alias == propertyInfo.Name);
+                    if (propertyType == null)
+                        throw new Exception($"The property alias {propertyInfo.Name} is not valid, because no PropertyType with this alias exists");
                     //Create new Property to add to collection
-                    var property = propertyType.CreateProperty();
+                    property = propertyType.CreateProperty();
                     property.SetValue(propertyInfo.GetValue(value, null), culture, segment);
                     content.Properties.Add(property);
                 }
diff --git a/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs
index 619bd763330e..80d5f684fe61 100644
--- a/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs
@@ -5,6 +5,7 @@
 using System.Web.Http.Filters;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
 
@@ -17,21 +18,23 @@ internal class MemberSaveValidationAttribute : ActionFilterAttribute
     {
         private readonly ILogger _logger;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly IMemberTypeService _memberTypeService;
 
-        public MemberSaveValidationAttribute() : this(Current.Logger, Current.UmbracoContextAccessor)
+        public MemberSaveValidationAttribute() : this(Current.Logger, Current.UmbracoContextAccessor, Current.Services.MemberTypeService)
         {
         }
 
-        public MemberSaveValidationAttribute(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor)
+        public MemberSaveValidationAttribute(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, IMemberTypeService memberTypeService)
         {
             _logger = logger;
             _umbracoContextAccessor = umbracoContextAccessor;
+            _memberTypeService = memberTypeService;
         }
 
         public override void OnActionExecuting(HttpActionContext actionContext)
         {
             var model = (MemberSave)actionContext.ActionArguments["contentItem"];
-            var contentItemValidator = new MemberValidationHelper(_logger, _umbracoContextAccessor);
+            var contentItemValidator = new MemberValidationHelper(_logger, _umbracoContextAccessor, _memberTypeService);
             //now do each validation step
             if (contentItemValidator.ValidateExistingContent(model, actionContext))
                 if (contentItemValidator.ValidateProperties(model, model, actionContext))
diff --git a/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs b/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
index c97e35eb0dfd..8f98765c3436 100644
--- a/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
+++ b/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
@@ -10,43 +10,22 @@
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Editors.Filters
 {
 
-    //internal class ContentValidationHelper : ContentItemValidationHelper<IContent, ContentItemSave>
-    //{
-    //    public ContentValidationHelper(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor) : base(logger, umbracoContextAccessor)
-    //    {
-    //    }
-
-    //    /// <summary>
-    //    /// Validates that the correct information is in the request for saving a culture variant
-    //    /// </summary>
-    //    /// <param name="postedItem"></param>
-    //    /// <param name="actionContext"></param>
-    //    /// <returns></returns>
-    //    protected override bool ValidateCultureVariant(ContentItemSave postedItem, HttpActionContext actionContext)
-    //    {
-    //        var contentType = postedItem.PersistedContent.GetContentType();
-    //        if (contentType.VariesByCulture() && postedItem.Culture.IsNullOrWhiteSpace())
-    //        {
-    //            //we cannot save a content item that is culture variant if no culture was specified in the request!
-    //            actionContext.Response = actionContext.Request.CreateValidationErrorResponse($"No culture found in request. Cannot save a content item that varies by culture, without a specified culture.");
-    //            return false;
-    //        }
-    //        return true;
-    //    }
-    //}
-
     /// <summary>
     /// Custom validation helper so that we can exclude the Member.StandardPropertyTypeStubs from being validating for existence
     /// </summary>
     internal class MemberValidationHelper : ContentItemValidationHelper<IMember, MemberSave>
     {
-        public MemberValidationHelper(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor) : base(logger, umbracoContextAccessor)
+        private readonly IMemberTypeService _memberTypeService;
+
+        public MemberValidationHelper(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, IMemberTypeService memberTypeService) : base(logger, umbracoContextAccessor)
         {
+            _memberTypeService = memberTypeService;
         }
 
         /// <summary>
@@ -118,7 +97,7 @@ public override bool ValidateProperties(MemberSave model, IContentProperties<Con
             //if a sensitive value is being submitted.
             if (UmbracoContextAccessor.UmbracoContext.Security.CurrentUser.HasAccessToSensitiveData() == false)
             {
-                var contentType = Current.Services.MemberTypeService.Get(model.PersistedContent.ContentTypeId);
+                var contentType = _memberTypeService.Get(model.PersistedContent.ContentTypeId);
                 var sensitiveProperties = contentType
                     .PropertyTypes.Where(x => contentType.IsSensitiveProperty(x.Alias))
                     .ToList();

From 3b12e0b72a040967d22a268478ca018d754b13ae Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 13:28:23 +1100
Subject: [PATCH 339/421] Updates ContentBase to track the original
 PropertyType's which means we don't ever need to look them up again, adds
 notes about this too since it seems it is probably unnecessary to begin with.

---
 src/Umbraco.Core/Models/ContentBase.cs        | 38 ++++++++++++-------
 src/Umbraco.Tests/Models/ContentTests.cs      |  6 +--
 .../Services/ContentServiceTests.cs           |  4 +-
 .../Testing/ContentBaseExtensions.cs          | 21 +++++-----
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index c6f5f39e2371..03eb5a4c9e75 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -23,6 +23,7 @@ public abstract class ContentBase : TreeEntityBase, IContentBase
         private int _writerId;
         private PropertyCollection _properties;
         private ContentCultureInfosCollection _cultureInfos;
+        internal IReadOnlyList<PropertyType> AllPropertyTypes { get; }
 
         #region Used for change tracking
 
@@ -64,6 +65,11 @@ private ContentBase(string name, IContentTypeComposition contentType, PropertyCo
             _contentTypeId = contentType.Id;
             _properties = properties ?? throw new ArgumentNullException(nameof(properties));
             _properties.EnsurePropertyTypes(contentType.CompositionPropertyTypes);
+
+            //track all property types on this content type, these can never change during the lifetime of this single instance
+            //there is no real extra memory overhead of doing this since these property types are already cached on this object via the
+            //properties already.
+            AllPropertyTypes = new List<PropertyType>(contentType.CompositionPropertyTypes);
         }
 
         [IgnoreDataMember]
@@ -294,22 +300,26 @@ public TValue GetValue<TValue>(string propertyTypeAlias, string culture = null,
         /// <inheritdoc />
         public void SetValue(string propertyTypeAlias, object value, string culture = null, string segment = null)
         {
-            if (Properties.Contains(propertyTypeAlias))
+            if (Properties.TryGetValue(propertyTypeAlias, out var property))
             {
-                Properties[propertyTypeAlias].SetValue(value, culture, segment);
-                //bump the culture to be flagged for updating
-                this.TouchCulture(culture);
-                return;
+                property.SetValue(value, culture, segment);
+            }
+            else
+            {
+                //fixme: Can this ever happen? According to the ctor in ContentBase (EnsurePropertyTypes), all properties will be created based on the content type's property types
+                // so how can a property not be resolved by the alias on the content.Properties but it can on the content type?
+                // This maybe can happen if a developer has removed a property with the api and is trying to then set the value of that property again...
+                // BUT, as it turns out the content.Properties.Remove(...) method is NEVER used, because why and how could it? you never remove a property from
+                // a content item directly.
+
+                var propertyType = AllPropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
+                if (propertyType == null)
+                    throw new InvalidOperationException($"No PropertyType exists with the supplied alias \"{propertyTypeAlias}\".");
+
+                property = propertyType.CreateProperty();
+                property.SetValue(value, culture, segment);
+                Properties.Add(property);
             }
-
-            var propertyTypes = Current.Services.ContentTypeBaseServices.GetContentTypeOf(this).CompositionPropertyTypes;
-            var propertyType = propertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
-            if (propertyType == null)
-                throw new InvalidOperationException($"No PropertyType exists with the supplied alias \"{propertyTypeAlias}\".");
-
-            var property = propertyType.CreateProperty();
-            property.SetValue(value, culture, segment);
-            Properties.Add(property);
 
             //bump the culture to be flagged for updating
             this.TouchCulture(culture);
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 7d19c341672f..f211e570e989 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -30,7 +30,6 @@ namespace Umbraco.Tests.Models
     public class ContentTests : UmbracoTestBase
     {
         private IContentTypeService _contentTypeService;
-        private IContentTypeBaseServiceProvider _contentTypeServiceProvider;
 
         protected override void Compose()
         {
@@ -57,8 +56,7 @@ protected override void Compose()
             var mediaTypeService = Mock.Of<IMediaTypeService>();
             var memberTypeService = Mock.Of<IMemberTypeService>();
             Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService, contentTypeBaseServiceProvider: new ContentTypeBaseServiceProvider(_contentTypeService, mediaTypeService, memberTypeService)));
-
-            _contentTypeServiceProvider = new ContentTypeBaseServiceProvider(_contentTypeService, Mock.Of<IMediaTypeService>(), Mock.Of<IMemberTypeService>());
+            
         }
 
         [Test]
@@ -544,7 +542,7 @@ public void Can_Change_Property_Value_Through_Anonymous_Object()
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
-            content.PropertyValues(_contentTypeServiceProvider, new { title = "This is the new title"});
+            content.PropertyValues(new { title = "This is the new title"});
 
             // Assert
             Assert.That(content.Properties.Any(), Is.True);
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index b5069e040b64..78f0d739fb6b 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -1581,12 +1581,12 @@ public void Can_Empty_RecycleBin_With_Content_That_Has_All_Related_Data()
                     tags = "[\"Hello\",\"World\"]"
                 };
             var content1 = MockedContent.CreateBasicContent(contentType);
-            content1.PropertyValues(ServiceContext.ContentTypeBaseServices, obj);
+            content1.PropertyValues(obj);
             content1.ResetDirtyProperties(false);
             ServiceContext.ContentService.Save(content1, Constants.Security.SuperUserId);
             Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content1, userId: 0).Success);
             var content2 = MockedContent.CreateBasicContent(contentType);
-            content2.PropertyValues(ServiceContext.ContentTypeBaseServices, obj);
+            content2.PropertyValues(obj);
             content2.ResetDirtyProperties(false);
             ServiceContext.ContentService.Save(content2, Constants.Security.SuperUserId);
             Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content2, userId: 0).Success);
diff --git a/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs b/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
index 883c7682f42a..6d3d2c76839f 100644
--- a/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
+++ b/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
@@ -9,16 +9,12 @@ namespace Umbraco.Tests.Testing
 {
     public static class ContentBaseExtensions
     {
-        public static void PropertyValues(this IContentBase content, object value, string culture = null, string segment = null)
-        {
-            content.PropertyValues(Current.Services.ContentTypeBaseServices, value, culture, segment);
-        }
-
+        
         /// <summary>
         /// Set property values by alias with an anonymous object.
         /// </summary>
         /// <remarks>Does not support variants.</remarks>
-        public static void PropertyValues(this IContentBase content, IContentTypeBaseServiceProvider contentTypeServiceProvider, object value, string culture = null, string segment = null)
+        public static void PropertyValues(this IContentBase content, object value, string culture = null, string segment = null)
         {
             if (value == null)
                 throw new Exception("No properties has been passed in");
@@ -35,12 +31,13 @@ public static void PropertyValues(this IContentBase content, IContentTypeBaseSer
                 else
                 {
 
-                    //TODO: Will this ever happen?? In theory we don't need to lookup the content type here since we can just check if the content contains properties with the correct name,
-                    // however, i think this may be needed in the case where the content type contains property types that do not exist yet as properties on the
-                    // content item? But can that happen? AFAIK it can't/shouldn't because of how we create content items in ContentBase we do _properties.EnsurePropertyTypes!
-
-                    var contentType = contentTypeServiceProvider.GetContentTypeOf(content);
-                    var propertyType = contentType.CompositionPropertyTypes.FirstOrDefault(x => x.Alias == propertyInfo.Name);
+                    //fixme: Can this ever happen? According to the ctor in ContentBase (EnsurePropertyTypes), all properties will be created based on the content type's property types
+                    // so how can a property not be resolved by the alias on the content.Properties but it can on the content type?
+                    // This maybe can happen if a developer has removed a property with the api and is trying to then set the value of that property again...
+                    // BUT, as it turns out the content.Properties.Remove(...) method is NEVER used, because why and how could it? you never remove a property from
+                    // a content item directly.
+                    
+                    var propertyType = ((ContentBase)content).AllPropertyTypes.FirstOrDefault(x => x.Alias == propertyInfo.Name);
                     if (propertyType == null)
                         throw new Exception($"The property alias {propertyInfo.Name} is not valid, because no PropertyType with this alias exists");
                     //Create new Property to add to collection

From 03eaf3aa3dc034930621545e5562c4fb287b09e0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 13:29:01 +1100
Subject: [PATCH 340/421] So yup ISimpleContentType needs the IUmbracoEntity,
 so we'll explicitly implement essentially hiding the implementation from the
 API unless it's explicitly cast

---
 src/Umbraco.Core/Models/ISimpleContentType.cs |  6 +--
 src/Umbraco.Core/Models/SimpleContentType.cs  | 48 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Core/Models/ISimpleContentType.cs b/src/Umbraco.Core/Models/ISimpleContentType.cs
index 7f6b2e68ea81..740db8e73fb3 100644
--- a/src/Umbraco.Core/Models/ISimpleContentType.cs
+++ b/src/Umbraco.Core/Models/ISimpleContentType.cs
@@ -5,10 +5,10 @@ namespace Umbraco.Core.Models
     /// <summary>
     /// Represents a simplified view of a content type.
     /// </summary>
-    public interface ISimpleContentType
+    public interface ISimpleContentType : IUmbracoEntity
     {
-        int Id { get; }
-        string Name { get; }
+        new int Id { get; }
+        new string Name { get; }
 
         /// <summary>
         /// Gets the alias of the content type.
diff --git a/src/Umbraco.Core/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs
index 86a1e56723b8..5c81017ec80e 100644
--- a/src/Umbraco.Core/Models/SimpleContentType.cs
+++ b/src/Umbraco.Core/Models/SimpleContentType.cs
@@ -106,29 +106,29 @@ public override int GetHashCode()
         // we have to have all this, because we're an IUmbracoEntity, because that is
         // required by the query expression visitor / SimpleContentTypeMapper
 
-        //string ITreeEntity.Name { get => this.Name; set => throw new NotImplementedException(); }
-        //int IEntity.Id { get => this.Id; set => throw new NotImplementedException(); }
-        //bool IEntity.HasIdentity => this.Id != default;
-        //int ITreeEntity.CreatorId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //int ITreeEntity.ParentId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //int ITreeEntity.Level { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //string ITreeEntity.Path { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //int ITreeEntity.SortOrder { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //bool ITreeEntity.Trashed => throw new NotImplementedException();
-        //Guid IEntity.Key { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //DateTime IEntity.CreateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //DateTime IEntity.UpdateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //DateTime? IEntity.DeleteDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        //void ITreeEntity.SetParent(ITreeEntity parent) => throw new NotImplementedException();
-        //object IDeepCloneable.DeepClone() => throw new NotImplementedException();
-        //bool IRememberBeingDirty.WasDirty() => throw new NotImplementedException();
-        //bool IRememberBeingDirty.WasPropertyDirty(string propertyName) => throw new NotImplementedException();
-        //void IRememberBeingDirty.ResetWereDirtyProperties() => throw new NotImplementedException();
-        //void IRememberBeingDirty.ResetDirtyProperties(bool rememberDirty) => throw new NotImplementedException();
-        //IEnumerable<string> IRememberBeingDirty.GetWereDirtyProperties() => throw new NotImplementedException();
-        //bool ICanBeDirty.IsDirty() => throw new NotImplementedException();
-        //bool ICanBeDirty.IsPropertyDirty(string propName) => throw new NotImplementedException();
-        //IEnumerable<string> ICanBeDirty.GetDirtyProperties() => throw new NotImplementedException();
-        //void ICanBeDirty.ResetDirtyProperties() => throw new NotImplementedException();
+        string ITreeEntity.Name { get => this.Name; set => throw new NotImplementedException(); }
+        int IEntity.Id { get => this.Id; set => throw new NotImplementedException(); }
+        bool IEntity.HasIdentity => this.Id != default;
+        int ITreeEntity.CreatorId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        int ITreeEntity.ParentId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        int ITreeEntity.Level { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        string ITreeEntity.Path { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        int ITreeEntity.SortOrder { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        bool ITreeEntity.Trashed => throw new NotImplementedException();
+        Guid IEntity.Key { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        DateTime IEntity.CreateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        DateTime IEntity.UpdateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        DateTime? IEntity.DeleteDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        void ITreeEntity.SetParent(ITreeEntity parent) => throw new NotImplementedException();
+        object IDeepCloneable.DeepClone() => throw new NotImplementedException();
+        bool IRememberBeingDirty.WasDirty() => throw new NotImplementedException();
+        bool IRememberBeingDirty.WasPropertyDirty(string propertyName) => throw new NotImplementedException();
+        void IRememberBeingDirty.ResetWereDirtyProperties() => throw new NotImplementedException();
+        void IRememberBeingDirty.ResetDirtyProperties(bool rememberDirty) => throw new NotImplementedException();
+        IEnumerable<string> IRememberBeingDirty.GetWereDirtyProperties() => throw new NotImplementedException();
+        bool ICanBeDirty.IsDirty() => throw new NotImplementedException();
+        bool ICanBeDirty.IsPropertyDirty(string propName) => throw new NotImplementedException();
+        IEnumerable<string> ICanBeDirty.GetDirtyProperties() => throw new NotImplementedException();
+        void ICanBeDirty.ResetDirtyProperties() => throw new NotImplementedException();
     }
 }

From a9045c254eda37a296f29e1c834cf1f703385b58 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 14:01:00 +1100
Subject: [PATCH 341/421] Removes the need to do any lookup for
 GetNonGroupedProperties, we already know if they belong to a non-group based
 on the ID

---
 src/Umbraco.Core/ContentExtensions.cs              |  9 +++------
 src/Umbraco.Tests/Models/ContentTests.cs           |  4 +---
 .../Mapping/MemberTabsAndPropertiesResolver.cs     |  4 ++--
 .../Models/Mapping/TabsAndPropertiesResolver.cs    | 14 ++++++--------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index d552b3f960ec..f802c2d0d991 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -106,15 +106,12 @@ internal static bool HasChildren(IContentBase content, ServiceContext services)
         /// Returns properties that do not belong to a group
         /// </summary>
         /// <param name="content"></param>
-        /// <param name="contentTypeBaseService"></param>
         /// <returns></returns>
-        public static IEnumerable<Property> GetNonGroupedProperties(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseService)
+        public static IEnumerable<Property> GetNonGroupedProperties(this IContentBase content)
         {
-            var contentType = contentTypeBaseService.GetContentTypeOf(content);
-            var propertyIdsInTabs = contentType.PropertyGroups.SelectMany(pg => pg.PropertyTypes);
             return content.Properties
-                          .Where(property => propertyIdsInTabs.Contains(property.PropertyType) == false)
-                          .OrderBy(x => x.PropertyType.SortOrder);
+                .Where(x => x.PropertyType.PropertyGroupId == null)
+                .OrderBy(x => x.PropertyType.SortOrder);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index f211e570e989..693f919b7a76 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -138,9 +138,7 @@ public void Get_Non_Grouped_Properties()
             var content = MockedContent.CreateSimpleContent(contentType);
             //need to id the p
 
-            var serviceProvider = new ContentTypeBaseServiceProvider(_contentTypeService, Mock.Of<IMediaTypeService>(), Mock.Of<IMemberTypeService>());
-
-            var nonGrouped = content.GetNonGroupedProperties(serviceProvider);
+            var nonGrouped = content.GetNonGroupedProperties();
 
             Assert.AreEqual(2, nonGrouped.Count());
             Assert.AreEqual(5, content.Properties.Count());
diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
index 288b8353181d..517889277c87 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs
@@ -29,8 +29,8 @@ internal class MemberTabsAndPropertiesResolver : TabsAndPropertiesResolver<IMemb
         private readonly IMemberService _memberService;
         private readonly IUserService _userService;
 
-        public MemberTabsAndPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService localizedTextService, IMemberService memberService, IUserService userService, IMemberTypeService memberTypeService, IContentTypeBaseServiceProvider contentTypeServiceProvider)
-            : base(localizedTextService, contentTypeServiceProvider)
+        public MemberTabsAndPropertiesResolver(IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService localizedTextService, IMemberService memberService, IUserService userService, IMemberTypeService memberTypeService)
+            : base(localizedTextService)
         {
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
             _localizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
index 6f3815f678b4..dc3cc9e74f54 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -12,19 +12,17 @@ namespace Umbraco.Web.Models.Mapping
 {
     internal abstract class TabsAndPropertiesResolver
     {
-        private readonly IContentTypeBaseServiceProvider _contentTypeServiceProvider;
         protected ILocalizedTextService LocalizedTextService { get; }
         protected IEnumerable<string> IgnoreProperties { get; set; }
 
-        protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IContentTypeBaseServiceProvider contentTypeServiceProvider)
+        protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService)
         {
-            _contentTypeServiceProvider = contentTypeServiceProvider;
             LocalizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
             IgnoreProperties = new List<string>();
         }
 
-        protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IContentTypeBaseServiceProvider contentTypeServiceProvider, IEnumerable<string> ignoreProperties)
-            : this(localizedTextService, contentTypeServiceProvider)
+        protected TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IEnumerable<string> ignoreProperties)
+            : this(localizedTextService)
         {
             IgnoreProperties = ignoreProperties ?? throw new ArgumentNullException(nameof(ignoreProperties));
         }
@@ -52,7 +50,7 @@ protected virtual void MapGenericProperties(IContentBase content, List<Tab<Conte
         {
             // add the generic properties tab, for properties that don't belong to a tab
             // get the properties, map and translate them, then add the tab
-            var noGroupProperties = content.GetNonGroupedProperties(_contentTypeServiceProvider)
+            var noGroupProperties = content.GetNonGroupedProperties()
                 .Where(x => IgnoreProperties.Contains(x.Alias) == false) // skip ignored
                 .ToList();
             var genericproperties = MapProperties(content, noGroupProperties, context);
@@ -124,8 +122,8 @@ protected virtual List<ContentPropertyDisplay> MapProperties(IContentBase conten
     internal class TabsAndPropertiesResolver<TSource, TDestination> : TabsAndPropertiesResolver, IValueResolver<TSource, TDestination, IEnumerable<Tab<ContentPropertyDisplay>>>
         where TSource : IContentBase
     {
-        public TabsAndPropertiesResolver(ILocalizedTextService localizedTextService, IContentTypeBaseServiceProvider contentTypeServiceProvider)
-            : base(localizedTextService, contentTypeServiceProvider)
+        public TabsAndPropertiesResolver(ILocalizedTextService localizedTextService)
+            : base(localizedTextService)
         { }
 
         public virtual IEnumerable<Tab<ContentPropertyDisplay>> Resolve(TSource source, TDestination destination, IEnumerable<Tab<ContentPropertyDisplay>> destMember, ResolutionContext context)

From fcec180dc48dc1603758fa75cf369b0c6471c9fa Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 14:54:22 +1100
Subject: [PATCH 342/421] Ship with correct skipIIsCustomeerrors setting

---
 src/Umbraco.Web.UI/config/umbracoSettings.Release.config | 2 +-
 src/Umbraco.Web.UI/config/umbracoSettings.config         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index eb63fdac7a08..1420063cd6d1 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -106,7 +106,7 @@
         path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
   -->
   <web.routing
-    trySkipIisCustomErrors="false"
+    trySkipIisCustomErrors="true"
     internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
     umbracoApplicationUrl="">
   </web.routing>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index eb63fdac7a08..1420063cd6d1 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -106,7 +106,7 @@
         path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
   -->
   <web.routing
-    trySkipIisCustomErrors="false"
+    trySkipIisCustomErrors="true"
     internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
     umbracoApplicationUrl="">
   </web.routing>

From ed5023e4319fd8b0119937bfd62e89562721d12d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 15:13:45 +1100
Subject: [PATCH 343/421] Adds some null checks to Examine's value set builders
 in case some of the data is strangely incorrect

---
 src/Umbraco.Examine/ContentValueSetBuilder.cs | 29 ++++++++++---------
 src/Umbraco.Examine/MediaValueSetBuilder.cs   | 13 +++++----
 src/Umbraco.Examine/MemberValueSetBuilder.cs  | 13 +++++----
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Examine/ContentValueSetBuilder.cs b/src/Umbraco.Examine/ContentValueSetBuilder.cs
index 5e0197765ddc..44cef0881382 100644
--- a/src/Umbraco.Examine/ContentValueSetBuilder.cs
+++ b/src/Umbraco.Examine/ContentValueSetBuilder.cs
@@ -1,5 +1,6 @@
 using Examine;
 using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
@@ -41,7 +42,7 @@ public override IEnumerable<ValueSet> GetValueSets(params IContent[] content)
                 var urlValue = c.GetUrlSegment(_urlSegmentProviders); //Always add invariant urlName
                 var values = new Dictionary<string, IEnumerable<object>>
                 {
-                    {"icon", c.ContentType.Icon.Yield()},
+                    {"icon", c.ContentType.Icon?.Yield() ?? Enumerable.Empty<string>()},
                     {UmbracoExamineIndex.PublishedFieldName, new object[] {c.Published ? "y" : "n"}},   //Always add invariant published value
                     {"id", new object[] {c.Id}},
                     {UmbracoExamineIndex.NodeKeyFieldName, new object[] {c.Key}},
@@ -51,12 +52,12 @@ public override IEnumerable<ValueSet> GetValueSets(params IContent[] content)
                     {"sortOrder", new object[] {c.SortOrder}},
                     {"createDate", new object[] {c.CreateDate}},    //Always add invariant createDate
                     {"updateDate", new object[] {c.UpdateDate}},    //Always add invariant updateDate
-                    {"nodeName", PublishedValuesOnly               //Always add invariant nodeName
-                        ? c.PublishName.Yield()
-                        : c.Name.Yield()},
-                    {"urlName", urlValue.Yield()},                  //Always add invariant urlName
-                    {"path", c.Path.Yield()},
-                    {"nodeType", new object[] {c.ContentType.Id}},
+                    {"nodeName", (PublishedValuesOnly               //Always add invariant nodeName
+                        ? c.PublishName?.Yield()
+                        : c?.Name.Yield()) ?? Enumerable.Empty<string>()},
+                    {"urlName", urlValue?.Yield() ?? Enumerable.Empty<string>()},                  //Always add invariant urlName
+                    {"path", c.Path?.Yield() ?? Enumerable.Empty<string>()},
+                    {"nodeType", c.ContentType.Id.ToString().Yield() ?? Enumerable.Empty<string>()},
                     {"creatorName", (c.GetCreatorProfile(_userService)?.Name ?? "??").Yield() },
                     {"writerName",(c.GetWriterProfile(_userService)?.Name ?? "??").Yield() },
                     {"writerID", new object[] {c.WriterId}},
@@ -72,14 +73,14 @@ public override IEnumerable<ValueSet> GetValueSets(params IContent[] content)
                     {
                         var variantUrl = c.GetUrlSegment(_urlSegmentProviders, culture);
                         var lowerCulture = culture.ToLowerInvariant();
-                        values[$"urlName_{lowerCulture}"] = variantUrl.Yield();
-                        values[$"nodeName_{lowerCulture}"] = PublishedValuesOnly
-                            ? c.GetPublishName(culture).Yield()
-                            : c.GetCultureName(culture).Yield();
+                        values[$"urlName_{lowerCulture}"] = variantUrl?.Yield() ?? Enumerable.Empty<string>();
+                        values[$"nodeName_{lowerCulture}"] = (PublishedValuesOnly
+                            ? c.GetPublishName(culture)?.Yield()
+                            : c.GetCultureName(culture)?.Yield()) ?? Enumerable.Empty<string>();
                         values[$"{UmbracoExamineIndex.PublishedFieldName}_{lowerCulture}"] = (c.IsCulturePublished(culture) ? "y" : "n").Yield<object>();
-                        values[$"updateDate_{lowerCulture}"] = PublishedValuesOnly
-                            ? c.GetPublishDate(culture).Yield<object>()
-                            : c.GetUpdateDate(culture).Yield<object>();
+                        values[$"updateDate_{lowerCulture}"] = (PublishedValuesOnly
+                            ? c.GetPublishDate(culture)
+                            : c.GetUpdateDate(culture))?.Yield<object>() ?? Enumerable.Empty<object>();
                     }
                 }
 
diff --git a/src/Umbraco.Examine/MediaValueSetBuilder.cs b/src/Umbraco.Examine/MediaValueSetBuilder.cs
index 23d0414d5d5f..3839d008b39e 100644
--- a/src/Umbraco.Examine/MediaValueSetBuilder.cs
+++ b/src/Umbraco.Examine/MediaValueSetBuilder.cs
@@ -1,5 +1,6 @@
 using Examine;
 using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
@@ -30,7 +31,7 @@ public override IEnumerable<ValueSet> GetValueSets(params IMedia[] media)
                 var urlValue = m.GetUrlSegment(_urlSegmentProviders);
                 var values = new Dictionary<string, IEnumerable<object>>
                 {
-                    {"icon", m.ContentType.Icon.Yield()},
+                    {"icon", m.ContentType.Icon?.Yield() ?? Enumerable.Empty<string>()},
                     {"id", new object[] {m.Id}},
                     {UmbracoExamineIndex.NodeKeyFieldName, new object[] {m.Key}},
                     {"parentID", new object[] {m.Level > 1 ? m.ParentId : -1}},
@@ -39,11 +40,11 @@ public override IEnumerable<ValueSet> GetValueSets(params IMedia[] media)
                     {"sortOrder", new object[] {m.SortOrder}},
                     {"createDate", new object[] {m.CreateDate}},
                     {"updateDate", new object[] {m.UpdateDate}},
-                    {"nodeName", m.Name.Yield()},
-                    {"urlName", urlValue.Yield()},
-                    {"path", m.Path.Yield()},
-                    {"nodeType", new object[] {m.ContentType.Id}},
-                    {"creatorName", m.GetCreatorProfile(_userService).Name.Yield()}
+                    {"nodeName", m.Name?.Yield() ?? Enumerable.Empty<string>()},
+                    {"urlName", urlValue?.Yield() ?? Enumerable.Empty<string>()},
+                    {"path", m.Path?.Yield() ?? Enumerable.Empty<string>()},
+                    {"nodeType", m.ContentType.Id.ToString().Yield() },
+                    {"creatorName", (m.GetCreatorProfile(_userService)?.Name ?? "??").Yield()}
                 };
 
                 foreach (var property in m.Properties)
diff --git a/src/Umbraco.Examine/MemberValueSetBuilder.cs b/src/Umbraco.Examine/MemberValueSetBuilder.cs
index d9f0b7806d0f..06fe78105d3b 100644
--- a/src/Umbraco.Examine/MemberValueSetBuilder.cs
+++ b/src/Umbraco.Examine/MemberValueSetBuilder.cs
@@ -1,5 +1,6 @@
 using Examine;
 using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
@@ -21,7 +22,7 @@ public override IEnumerable<ValueSet> GetValueSets(params IMember[] members)
             {
                 var values = new Dictionary<string, IEnumerable<object>>
                 {
-                    {"icon", m.ContentType.Icon.Yield()},
+                    {"icon", m.ContentType.Icon?.Yield() ?? Enumerable.Empty<string>()},
                     {"id", new object[] {m.Id}},
                     {UmbracoExamineIndex.NodeKeyFieldName, new object[] {m.Key}},
                     {"parentID", new object[] {m.Level > 1 ? m.ParentId : -1}},
@@ -30,11 +31,11 @@ public override IEnumerable<ValueSet> GetValueSets(params IMember[] members)
                     {"sortOrder", new object[] {m.SortOrder}},
                     {"createDate", new object[] {m.CreateDate}},
                     {"updateDate", new object[] {m.UpdateDate}},
-                    {"nodeName", m.Name.Yield()},
-                    {"path", m.Path.Yield()},
-                    {"nodeType", new object[] {m.ContentType.Id}},
-                    {"loginName", m.Username.Yield()},
-                    {"email", m.Email.Yield()},
+                    {"nodeName", m.Name?.Yield() ?? Enumerable.Empty<string>()},
+                    {"path", m.Path?.Yield() ?? Enumerable.Empty<string>()},
+                    {"nodeType", m.ContentType.Id.ToString().Yield() },
+                    {"loginName", m.Username?.Yield() ?? Enumerable.Empty<string>()},
+                    {"email", m.Email?.Yield() ?? Enumerable.Empty<string>()},
                 };
 
                 foreach (var property in m.Properties)

From 86b31c278231ad5463a051fd71137aa68687df33 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 15:41:20 +1100
Subject: [PATCH 344/421] fixes test.js to point to the correct karma config

---
 src/Umbraco.Web.UI.Client/gulp/tasks/test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
index e40d4c436a39..4c18bff97476 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
@@ -11,7 +11,7 @@ var karmaServer = require('karma').Server;
  // Karma test
 gulp.task('test:unit', function() {
     new karmaServer({
-        configFile: __dirname + "/test/config/karma.conf.js",
+        configFile: __dirname + "/../../test/config/karma.conf.js",
         keepalive: true
     })
     .start();
@@ -19,7 +19,7 @@ gulp.task('test:unit', function() {
 
 gulp.task('test:e2e', function() {
     new karmaServer({
-        configFile: __dirname + "/test/config/e2e.js",
+        configFile: __dirname + "/../../test/config/e2e.js",
         keepalive: true
     })
     .start();

From 261ddfbcd6cc31f291538ef193f064393f9750c3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 16:22:29 +1100
Subject: [PATCH 345/421] Gets unit tests running again and added a task
 `runTests`

---
 src/Umbraco.Web.UI.Client/gulp/tasks/test.js   |  5 ++++-
 .../test/config/app.unit.js                    | 18 +++++++++++++-----
 .../test/config/karma.conf.js                  | 14 ++++++++------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
index 4c18bff97476..a5a23eb41bab 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
@@ -9,7 +9,10 @@ var karmaServer = require('karma').Server;
  **************************/
 
  // Karma test
-gulp.task('test:unit', function() {
+gulp.task('runTests', ["js", "test:unit"]);
+
+gulp.task('test:unit', function () {
+
     new karmaServer({
         configFile: __dirname + "/../../test/config/karma.conf.js",
         keepalive: true
diff --git a/src/Umbraco.Web.UI.Client/test/config/app.unit.js b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
index 1369ad21454c..32b05ab0d48c 100644
--- a/src/Umbraco.Web.UI.Client/test/config/app.unit.js
+++ b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
@@ -1,12 +1,20 @@
 var app = angular.module('umbraco', [
-	'umbraco.filters',
-	'umbraco.directives',
-	'umbraco.resources',
-	'umbraco.services',
+    'umbraco.filters',
+    'umbraco.directives',
+    'umbraco.resources',
+    'umbraco.services',
+    
 	'umbraco.mocks',
 	'umbraco.interceptors',
 
     'ngRoute',
+    'ngAnimate',
     'ngCookies',
-    'LocalStorageModule'
+    'ngSanitize',
+    
+    //'ngMessages',
+    'tmh.dynamicLocale',
+    //'ngFileUpload',
+    //'LocalStorageModule',
+    //'chart.js'
 ]);
diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
index 07aa9935a82f..cfb4eddb40c6 100644
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -24,17 +24,19 @@ module.exports = function (config) {
             'node_modules/moment/min/moment-with-locales.js',
             'lib/umbraco/Extensions.js',
             'node_modules/lazyload-js/lazyload.min.js',
+            'node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.min.js',
 
             //app bootstrap and loader
             'test/config/app.unit.js',
 
             //application files
-            'src/common/directives/*.js',
-            'src/common/filters/*.js',
-            'src/common/services/*.js',
-            'src/common/interceptors/*.js',
-            'src/common/resources/*.js',
-            'src/views/**/*.controller.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.controllers.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.directives.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.filters.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.services.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.interceptors.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.security.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.resources.js',
 
             //mocked data and routing
             'src/common/mocks/umbraco.servervariables.js',

From d76f7db7005b1a23afe71584cb55d759884f49da Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 16:59:25 +1100
Subject: [PATCH 346/421] fixes the runTest build so that it properly builds
 the babel js and fixes one of the tests

---
 src/Umbraco.Web.UI.Client/gulp/tasks/test.js                 | 5 ++++-
 .../contentpicker/contentpicker.controller.js                | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
index a5a23eb41bab..76712f145457 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
@@ -3,13 +3,16 @@
 var config = require('../config');
 var gulp = require('gulp');
 var karmaServer = require('karma').Server;
+var runSequence = require('run-sequence');
 
 /**************************
  * Build tests
  **************************/
 
  // Karma test
-gulp.task('runTests', ["js", "test:unit"]);
+gulp.task('runTests', function(cb) {
+    runSequence(["js"], "test:unit", cb);
+});
 
 gulp.task('test:unit', function () {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 37a97e928c5e..8b5915026c1a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -310,12 +310,13 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
 
             //need to determine which items we already have loaded
             var renderModelIds = _.map($scope.renderModel, function (d) {
-                return $scope.model.config.idType === "udi" ? d.udi : d.id;
+                return ($scope.model.config.idType === "udi" ? d.udi : d.id).toString();
             });
 
             //get the ids that no longer exist
             var toRemove = _.difference(renderModelIds, valueIds);
 
+
             //remove the ones that no longer exist
             for (var j = 0; j < toRemove.length; j++) {
                 var index = renderModelIds.indexOf(toRemove[j]);

From 1703c918d97f4270ada1a1ed5947d51fc235e946 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 17:06:50 +1100
Subject: [PATCH 347/421] test pass now

---
 .../src/views/propertyeditors/rte/rte.controller.js    |  4 ++--
 .../app/propertyeditors/dropdown-controller.spec.js    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 960e66edfee3..6099c5dad4a4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -1,6 +1,6 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.RTEController",
-    function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, editorService, macroService, editorState) {
+        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper) {
 
             // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
@@ -13,7 +13,7 @@ angular.module("umbraco")
             var n = d.getTime();
             $scope.textAreaHtmlId = $scope.model.alias + "_" + n + "_rte";
 
-            var editorConfig = $scope.model.config.editor;
+            var editorConfig = $scope.model.config ? $scope.model.config.editor : null;
             if (!editorConfig || angular.isString(editorConfig)) {
                 editorConfig = tinyMceService.defaultPrevalues();
             }
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/dropdown-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/dropdown-controller.spec.js
index 3367db59cf5c..dba3373ec258 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/dropdown-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/dropdown-controller.spec.js
@@ -14,7 +14,7 @@ describe('Drop down controller tests', function () {
 
         it('should define the default properties on construction', function () {
              
-            controllerFactory('Umbraco.PropertyEditors.DropdownController', {
+            controllerFactory('Umbraco.PropertyEditors.DropdownFlexibleController', {
                 $scope: scope,
                 $routeParams: routeParams
             });
@@ -32,7 +32,7 @@ describe('Drop down controller tests', function () {
                 }
             };
 
-            controllerFactory('Umbraco.PropertyEditors.DropdownController', {
+            controllerFactory('Umbraco.PropertyEditors.DropdownFlexibleController', {
                 $scope: scope,
                 $routeParams: routeParams
             });
@@ -57,7 +57,7 @@ describe('Drop down controller tests', function () {
             };
 
             var test = function() {
-                controllerFactory('Umbraco.PropertyEditors.DropdownController', {
+                controllerFactory('Umbraco.PropertyEditors.DropdownFlexibleController', {
                     $scope: scope,
                     $routeParams: routeParams
                 });
@@ -76,7 +76,7 @@ describe('Drop down controller tests', function () {
             };
 
             var test = function () {
-                controllerFactory('Umbraco.PropertyEditors.DropdownController', {
+                controllerFactory('Umbraco.PropertyEditors.DropdownFlexibleController', {
                     $scope: scope,
                     $routeParams: routeParams
                 });
@@ -87,4 +87,4 @@ describe('Drop down controller tests', function () {
         });
 
     });
-});
\ No newline at end of file
+});

From 977250dcddfdc50564e8affb4beb69c6d047ee0c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Feb 2019 17:15:49 +1100
Subject: [PATCH 348/421] tests as part of build

---
 src/Umbraco.Web.UI.Client/gulp/tasks/build.js | 2 +-
 src/Umbraco.Web.UI.Client/gulp/tasks/test.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/build.js b/src/Umbraco.Web.UI.Client/gulp/tasks/build.js
index 4e519c58e98c..32bf71f5f71d 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/build.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/build.js
@@ -6,5 +6,5 @@ var runSequence = require('run-sequence');
 
 // Build - build the files ready for production
 gulp.task('build', function(cb) {
-   runSequence(["dependencies", "js", "less", "views"], cb);
+    runSequence(["js", "dependencies", "less", "views"], "test:unit", cb);
 });
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
index 76712f145457..eae65613c4c7 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
@@ -11,7 +11,7 @@ var runSequence = require('run-sequence');
 
  // Karma test
 gulp.task('runTests', function(cb) {
-    runSequence(["js"], "test:unit", cb);
+    runSequence("js", "test:unit", cb);
 });
 
 gulp.task('test:unit', function () {

From d11fd67a093827e577cab4c685528ea56d1316fb Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 6 Feb 2019 19:04:58 +0100
Subject: [PATCH 349/421] Bugfix PublishedContentTypeFactory

---
 .../PublishedContentTypeFactory.cs               | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
index 8a44a7a9b406..2ca3593b55a4 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
@@ -87,8 +87,20 @@ public void NotifyDataTypeChanges(int[] ids)
         {
             lock (_publishedDataTypesLocker)
             {
-                var dataTypes = _dataTypeService.GetAll(ids);
-                _publishedDataTypes = dataTypes.ToDictionary(x => x.Id, CreatePublishedDataType);
+                if (_publishedDataTypes == null)
+                {
+                    var dataTypes = _dataTypeService.GetAll();
+                    _publishedDataTypes = dataTypes.ToDictionary(x => x.Id, CreatePublishedDataType);
+                }
+                else
+                {
+                    foreach (var id in ids)
+                        _publishedDataTypes.Remove(id);
+
+                    var dataTypes = _dataTypeService.GetAll(ids);
+                    foreach (var dataType in dataTypes)
+                        _publishedDataTypes[dataType.Id] = CreatePublishedDataType(dataType);
+                }
             }
         }
 

From f6da7e4444d45f420c50e7a533b89eb66d067201 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 7 Feb 2019 08:19:44 +0100
Subject: [PATCH 350/421] JS error, handle user dialog in the same way as help
 dialog. Don't close on change of section. Before was a js error with missing
 method

---
 .../components/application/umbsections.directive.js          | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
index 5006087ca53b..14c987883947 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
@@ -105,11 +105,6 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
                     return;
                 }
 
-                if (scope.userDialog) {
-                    closeUserDialog();
-                }
-
-
                 navigationService.hideSearch();
                 navigationService.showTree(section.alias);
 

From 8329097974b56da85d16549e09b9b92ba85539db Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 6 Feb 2019 17:28:48 +0100
Subject: [PATCH 351/421] Review PR, adjustments

---
 .../CancellableEnumerableObjectEventArgs.cs   | 24 ++---
 .../Events/CancellableEventArgs.cs            |  4 +-
 .../Events/CancellableObjectEventArgs.cs      | 90 +------------------
 ...ancellableObjectEventArgsOfTEventObject.cs | 82 +++++++++++++++++
 .../Events/ContentPublishedEventArgs.cs       | 19 ++--
 .../Events/ContentPublishingEventArgs.cs      | 17 ++--
 .../Events/ContentSavedEventArgs.cs           | 20 ++---
 .../Events/ContentSavingEventArgs.cs          | 31 ++++---
 src/Umbraco.Core/Models/Content.cs            | 24 ++---
 src/Umbraco.Core/Models/ContentBase.cs        | 37 ++++----
 .../Models/ContentRepositoryExtensions.cs     |  8 +-
 src/Umbraco.Core/Models/IContentBase.cs       |  2 +-
 .../Repositories/IDocumentRepository.cs       |  2 -
 .../Implement/DocumentRepository.cs           | 22 +++--
 src/Umbraco.Core/Services/IContentService.cs  | 16 ++--
 .../Services/Implement/ContentService.cs      | 20 +++--
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 17 files changed, 212 insertions(+), 207 deletions(-)
 create mode 100644 src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs

diff --git a/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
index 1a651ef3489f..1d52d0d84783 100644
--- a/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
@@ -1,34 +1,36 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Permissions;
 
 namespace Umbraco.Core.Events
 {
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-    public class CancellableEnumerableObjectEventArgs<T> : CancellableObjectEventArgs<IEnumerable<T>>, IEquatable<CancellableEnumerableObjectEventArgs<T>>
+    /// <summary>
+    /// Represents event data, for events that support cancellation, and expose impacted objects.
+    /// </summary>
+    /// <typeparam name="TEventObject">The type of the exposed, impacted objects.</typeparam>
+    public class CancellableEnumerableObjectEventArgs<TEventObject> : CancellableObjectEventArgs<IEnumerable<TEventObject>>, IEquatable<CancellableEnumerableObjectEventArgs<TEventObject>>
     {
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
             : base(eventObject, canCancel, messages, additionalData)
         { }
 
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel, EventMessages eventMessages)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject, bool canCancel, EventMessages eventMessages)
             : base(eventObject, canCancel, eventMessages)
         { }
 
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, EventMessages eventMessages)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject, EventMessages eventMessages)
             : base(eventObject, eventMessages)
         { }
 
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject, bool canCancel)
             : base(eventObject, canCancel)
         { }
 
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject)
             : base(eventObject)
         { }
 
-        public bool Equals(CancellableEnumerableObjectEventArgs<T> other)
+        public bool Equals(CancellableEnumerableObjectEventArgs<TEventObject> other)
         {
             if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -41,7 +43,7 @@ public override bool Equals(object obj)
             if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != this.GetType()) return false;
-            return Equals((CancellableEnumerableObjectEventArgs<T>)obj);
+            return Equals((CancellableEnumerableObjectEventArgs<TEventObject>)obj);
         }
 
         public override int GetHashCode()
@@ -49,4 +51,4 @@ public override int GetHashCode()
             return HashCodeHelper.GetHashCode(EventObject);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Events/CancellableEventArgs.cs b/src/Umbraco.Core/Events/CancellableEventArgs.cs
index 19f576478f64..d9d670ea5943 100644
--- a/src/Umbraco.Core/Events/CancellableEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEventArgs.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Security.Permissions;
 
 namespace Umbraco.Core.Events
 {
     /// <summary>
-    /// Event args for that can support cancellation
+    /// Represents event data for events that support cancellation.
     /// </summary>
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
     public class CancellableEventArgs : EventArgs, IEquatable<CancellableEventArgs>
     {
         private bool _cancel;
diff --git a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
index 27ffb1b75df0..daf36fd6c875 100644
--- a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Security.Permissions;
-using Umbraco.Core.Models;
+using System.Collections.Generic;
 
 namespace Umbraco.Core.Events
 {
     /// <summary>
-    /// Used as a base class for the generic type CancellableObjectEventArgs{T} so that we can get direct 'object' access to the underlying EventObject
+    /// Provides a base class for classes representing event data, for events that support cancellation, and expose an impacted object.
     /// </summary>
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
     public abstract class CancellableObjectEventArgs : CancellableEventArgs
     {
         protected CancellableObjectEventArgs(object eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
@@ -41,90 +36,11 @@ protected CancellableObjectEventArgs(object eventObject)
         }
 
         /// <summary>
-        /// Returns the object relating to the event
+        /// Gets or sets the impacted object.
         /// </summary>
         /// <remarks>
         /// This is protected so that inheritors can expose it with their own name
         /// </remarks>
         internal object EventObject { get; set; }
-
-    }
-
-    /// <summary>
-    /// Event args for a strongly typed object that can support cancellation
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-    public class CancellableObjectEventArgs<T> : CancellableObjectEventArgs, IEquatable<CancellableObjectEventArgs<T>>
-    {
-        public CancellableObjectEventArgs(T eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
-            : base(eventObject, canCancel, messages, additionalData)
-        {
-        }
-
-        public CancellableObjectEventArgs(T eventObject, bool canCancel, EventMessages eventMessages)
-            : base(eventObject, canCancel, eventMessages)
-        {
-        }
-
-        public CancellableObjectEventArgs(T eventObject, EventMessages eventMessages)
-            : base(eventObject, eventMessages)
-        {
-        }
-
-        public CancellableObjectEventArgs(T eventObject, bool canCancel)
-            : base(eventObject, canCancel)
-        {
-        }
-
-        public CancellableObjectEventArgs(T eventObject)
-            : base(eventObject)
-        {
-        }
-
-        /// <summary>
-        /// Returns the object relating to the event
-        /// </summary>
-        /// <remarks>
-        /// This is protected so that inheritors can expose it with their own name
-        /// </remarks>
-        protected new T EventObject
-        {
-            get { return (T) base.EventObject; }
-            set { base.EventObject = value; }
-        }
-
-        public bool Equals(CancellableObjectEventArgs<T> other)
-        {
-            if (other is null) return false;
-            if (ReferenceEquals(this, other)) return true;
-            return base.Equals(other) && EqualityComparer<T>.Default.Equals(EventObject, other.EventObject);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj is null) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != this.GetType()) return false;
-            return Equals((CancellableObjectEventArgs<T>)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (base.GetHashCode() * 397) ^ EqualityComparer<T>.Default.GetHashCode(EventObject);
-            }
-        }
-
-        public static bool operator ==(CancellableObjectEventArgs<T> left, CancellableObjectEventArgs<T> right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(CancellableObjectEventArgs<T> left, CancellableObjectEventArgs<T> right)
-        {
-            return !Equals(left, right);
-        }
     }
 }
diff --git a/src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs b/src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs
new file mode 100644
index 000000000000..ace2ce0a4fbd
--- /dev/null
+++ b/src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Represent event data, for events that support cancellation, and expose an impacted object.
+    /// </summary>
+    /// <typeparam name="TEventObject">The type of the exposed, impacted object.</typeparam>
+    public class CancellableObjectEventArgs<TEventObject> : CancellableObjectEventArgs, IEquatable<CancellableObjectEventArgs<TEventObject>>
+    {
+        public CancellableObjectEventArgs(TEventObject eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
+            : base(eventObject, canCancel, messages, additionalData)
+        {
+        }
+
+        public CancellableObjectEventArgs(TEventObject eventObject, bool canCancel, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+        }
+
+        public CancellableObjectEventArgs(TEventObject eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+        }
+
+        public CancellableObjectEventArgs(TEventObject eventObject, bool canCancel)
+            : base(eventObject, canCancel)
+        {
+        }
+
+        public CancellableObjectEventArgs(TEventObject eventObject)
+            : base(eventObject)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the impacted object.
+        /// </summary>
+        /// <remarks>
+        /// This is protected so that inheritors can expose it with their own name
+        /// </remarks>
+        protected new TEventObject EventObject
+        {
+            get => (TEventObject) base.EventObject;
+            set => base.EventObject = value;
+        }
+
+        public bool Equals(CancellableObjectEventArgs<TEventObject> other)
+        {
+            if (other is null) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && EqualityComparer<TEventObject>.Default.Equals(EventObject, other.EventObject);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is null) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((CancellableObjectEventArgs<TEventObject>)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (base.GetHashCode() * 397) ^ EqualityComparer<TEventObject>.Default.GetHashCode(EventObject);
+            }
+        }
+
+        public static bool operator ==(CancellableObjectEventArgs<TEventObject> left, CancellableObjectEventArgs<TEventObject> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(CancellableObjectEventArgs<TEventObject> left, CancellableObjectEventArgs<TEventObject> right)
+        {
+            return !Equals(left, right);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs b/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
index 589e447ba7c2..8c0690d59113 100644
--- a/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
+++ b/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
@@ -1,29 +1,30 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
+    /// <summary>
+    /// Represents event data for the Published event.
+    /// </summary>
     public class ContentPublishedEventArgs : PublishEventArgs<IContent>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentPublishedEventArgs"/> class.
+        /// </summary>
         public ContentPublishedEventArgs(IEnumerable<IContent> eventObject, bool canCancel, EventMessages eventMessages)
             : base(eventObject, canCancel, eventMessages)
-        {
-        }
+        { }
 
         /// <summary>
         /// Determines whether a culture has been published, during a Published event.
         /// </summary>
         public bool HasPublishedCulture(IContent content, string culture)
-            => content.WasPropertyDirty("_changedCulture_" + culture);
+            => content.WasPropertyDirty(ContentBase.ChangeTrackingPrefix.ChangedCulture + culture);
 
         /// <summary>
         /// Determines whether a culture has been unpublished, during a Published event.
         /// </summary>
         public bool HasUnpublishedCulture(IContent content, string culture)
-            => content.WasPropertyDirty("_unpublishedCulture_" + culture); 
-
-
-
+            => content.WasPropertyDirty(ContentBase.ChangeTrackingPrefix.UnpublishedCulture + culture); 
     }
 }
diff --git a/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs b/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
index 35cbf6344154..b64bb19deff3 100644
--- a/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
+++ b/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
@@ -1,21 +1,19 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
+    /// <summary>
+    /// Represents event data for the Publishing event.
+    /// </summary>
     public class ContentPublishingEventArgs : PublishEventArgs<IContent>
     {
         /// <summary>
-        /// Creates a new <see cref="ContentPublishingEventArgs"/>
+        /// Initializes a new instance of the <see cref="ContentPublishingEventArgs"/> class.
         /// </summary>
-        /// <param name="eventObject"></param>
-        /// <param name="eventMessages"></param>
         public ContentPublishingEventArgs(IEnumerable<IContent> eventObject, EventMessages eventMessages)
             : base(eventObject, eventMessages)
-        {
-        }
+        { }
 
         /// <summary>
         /// Determines whether a culture is being published, during a Publishing event.
@@ -27,7 +25,6 @@ public bool IsPublishingCulture(IContent content, string culture)
         /// Determines whether a culture is being unpublished, during a Publishing event.
         /// </summary>
         public bool IsUnpublishingCulture(IContent content, string culture)
-            => content.IsPropertyDirty("_unpublishedCulture_" + culture); //bit of a hack since we know that the content implementation tracks changes this way
-
+            => content.IsPropertyDirty(ContentBase.ChangeTrackingPrefix.UnpublishedCulture + culture); //bit of a hack since we know that the content implementation tracks changes this way
     }
 }
diff --git a/src/Umbraco.Core/Events/ContentSavedEventArgs.cs b/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
index 4d4085b0649a..e2d8c25dd19f 100644
--- a/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
+++ b/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
@@ -1,30 +1,24 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
+    /// <summary>
+    /// Represents event data for the Saved event.
+    /// </summary>
     public class ContentSavedEventArgs : SaveEventArgs<IContent>
     {
-        #region Constructors
-
         /// <summary>
-        /// Creates a new <see cref="ContentSavedEventArgs"/>
+        /// Initializes a new instance of the <see cref="ContentSavedEventArgs"/> class.
         /// </summary>
-        /// <param name="eventObject"></param>
-        /// <param name="messages"></param>
-        /// <param name="additionalData"></param>
         public ContentSavedEventArgs(IEnumerable<IContent> eventObject, EventMessages messages, IDictionary<string, object> additionalData)
             : base(eventObject, false, messages, additionalData)
-        {
-        }
-
-        #endregion
+        { }
 
         /// <summary>
         /// Determines whether a culture has been saved, during a Saved event.
         /// </summary>
         public bool HasSavedCulture(IContent content, string culture)
-            => content.WasPropertyDirty("_updatedCulture_" + culture);
+            => content.WasPropertyDirty(ContentBase.ChangeTrackingPrefix.UpdatedCulture + culture);
     }
 }
diff --git a/src/Umbraco.Core/Events/ContentSavingEventArgs.cs b/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
index aa62f643497f..384353ee2e83 100644
--- a/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
+++ b/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
@@ -1,12 +1,15 @@
-using System.Linq;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
+    /// <summary>
+    /// Represent event data for the Saving event.
+    /// </summary>
     public class ContentSavingEventArgs : SaveEventArgs<IContent>
     {
         #region Factory Methods
+
         /// <summary>
         /// Converts <see cref="ContentSavingEventArgs"/> to <see cref="ContentSavedEventArgs"/> while preserving all args state
         /// </summary>
@@ -43,24 +46,32 @@ public ContentPublishingEventArgs ToContentPublishingEventArgs()
                 EventState = EventState,
                 AdditionalData = AdditionalData
             };
-        } 
+        }
+
         #endregion
 
         #region Constructors
 
-        public ContentSavingEventArgs(IEnumerable<IContent> eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
-        {
-        }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentSavingEventArgs"/> class.
+        /// </summary>
+        public ContentSavingEventArgs(IEnumerable<IContent> eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        { }
 
-        public ContentSavingEventArgs(IContent eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
-        {
-        }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentSavingEventArgs"/> class.
+        /// </summary>
+        public ContentSavingEventArgs(IContent eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        { }
 
         #endregion
 
         /// <summary>
         /// Determines whether a culture is being saved, during a Saving event.
         /// </summary>
-        public bool IsSavingCulture(IContent content, string culture) => content.CultureInfos.TryGetValue(culture, out var cultureInfo) && cultureInfo.IsDirty();
+        public bool IsSavingCulture(IContent content, string culture)
+            => content.CultureInfos.TryGetValue(culture, out var cultureInfo) && cultureInfo.IsDirty();
     }
 }
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 483ba8b0d24e..f0c1915f75f3 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -385,19 +385,19 @@ public override void ResetDirtyProperties(bool rememberDirty)
         public override bool IsPropertyDirty(string propertyName)
         {
             //Special check here since we want to check if the request is for changed cultures
-            if (propertyName.StartsWith("_publishedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.PublishedCulture))
             {
-                var culture = propertyName.TrimStart("_publishedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.PublishedCulture);
                 return _currentPublishCultureChanges.addedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_unpublishedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.UnpublishedCulture))
             {
-                var culture = propertyName.TrimStart("_unpublishedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.UnpublishedCulture);
                 return _currentPublishCultureChanges.removedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_changedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.ChangedCulture))
             {
-                var culture = propertyName.TrimStart("_changedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.ChangedCulture);
                 return _currentPublishCultureChanges.updatedCultures?.Contains(culture) ?? false;
             }
 
@@ -409,19 +409,19 @@ public override bool IsPropertyDirty(string propertyName)
         public override bool WasPropertyDirty(string propertyName)
         {
             //Special check here since we want to check if the request is for changed cultures
-            if (propertyName.StartsWith("_publishedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.PublishedCulture))
             {
-                var culture = propertyName.TrimStart("_publishedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.PublishedCulture);
                 return _previousPublishCultureChanges.addedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_unpublishedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.UnpublishedCulture))
             {
-                var culture = propertyName.TrimStart("_unpublishedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.UnpublishedCulture);
                 return _previousPublishCultureChanges.removedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_changedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.ChangedCulture))
             {
-                var culture = propertyName.TrimStart("_changedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.ChangedCulture);
                 return _previousPublishCultureChanges.updatedCultures?.Contains(culture) ?? false;
             }
 
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 50de59931cdf..55922b485ac9 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -17,7 +17,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}, ContentType: {ContentTypeBase.Alias}")]
     public abstract class ContentBase : TreeEntityBase, IContentBase
     {
-
         private int _contentTypeId;
         protected IContentTypeComposition ContentTypeBase;
         private int _writerId;
@@ -29,6 +28,16 @@ public abstract class ContentBase : TreeEntityBase, IContentBase
         private (HashSet<string> addedCultures, HashSet<string> removedCultures, HashSet<string> updatedCultures) _currentCultureChanges;
         private (HashSet<string> addedCultures, HashSet<string> removedCultures, HashSet<string> updatedCultures) _previousCultureChanges;
 
+        public static class ChangeTrackingPrefix
+        {
+            public const string UpdatedCulture = "_updatedCulture_";
+            public const string ChangedCulture = "_changedCulture_";
+            public const string PublishedCulture = "_publishedCulture_";
+            public const string UnpublishedCulture = "_unpublishedCulture_";
+            public const string AddedCulture = "_addedCulture_";
+            public const string RemovedCulture = "_removedCulture_";
+        }
+
         #endregion
 
         /// <summary>
@@ -71,8 +80,6 @@ protected void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs
             OnPropertyChanged(nameof(Properties));
         }
 
-
-
         /// <summary>
         /// Id of the user who wrote/updated this entity
         /// </summary>
@@ -402,19 +409,19 @@ public override bool IsPropertyDirty(string propertyName)
                 return true;
 
             //Special check here since we want to check if the request is for changed cultures
-            if (propertyName.StartsWith("_addedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.AddedCulture))
             {
-                var culture = propertyName.TrimStart("_addedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.AddedCulture);
                 return _currentCultureChanges.addedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_removedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.RemovedCulture))
             {
-                var culture = propertyName.TrimStart("_removedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.RemovedCulture);
                 return _currentCultureChanges.removedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_updatedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.UpdatedCulture))
             {
-                var culture = propertyName.TrimStart("_updatedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.UpdatedCulture);
                 return _currentCultureChanges.updatedCultures?.Contains(culture) ?? false;
             }
 
@@ -429,19 +436,19 @@ public override bool WasPropertyDirty(string propertyName)
                 return true;
 
             //Special check here since we want to check if the request is for changed cultures
-            if (propertyName.StartsWith("_addedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.AddedCulture))
             {
-                var culture = propertyName.TrimStart("_addedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.AddedCulture);
                 return _previousCultureChanges.addedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_removedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.RemovedCulture))
             {
-                var culture = propertyName.TrimStart("_removedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.RemovedCulture);
                 return _previousCultureChanges.removedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_updatedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.UpdatedCulture))
             {
-                var culture = propertyName.TrimStart("_updatedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.UpdatedCulture);
                 return _previousCultureChanges.updatedCultures?.Contains(culture) ?? false;
             }
 
diff --git a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
index ca9bf579023c..27678c047cf2 100644
--- a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
@@ -20,7 +20,7 @@ public static IReadOnlyList<string> GetCulturesUnpublishing(this IContent conten
                 return Array.Empty<string>();
 
             var culturesUnpublishing = content.CultureInfos.Values
-                .Where(x => content.IsPropertyDirty("_unpublishedCulture_" + x.Culture))
+                .Where(x => content.IsPropertyDirty(ContentBase.ChangeTrackingPrefix.UnpublishedCulture + x.Culture))
                 .Select(x => x.Culture);
 
             return culturesUnpublishing.ToList();
@@ -88,8 +88,7 @@ public static void CopyFrom(this IContent content, IContent other, string cultur
             {
                 content.CultureInfos.Clear();
                 content.CultureInfos = null;
-            }
-                
+            }                
 
             if (culture == null || culture == "*")
                 content.Name = other.Name;
@@ -158,8 +157,9 @@ public static void AdjustDates(this IContent content, DateTime date)
                 if (!content.PublishCultureInfos.TryGetValue(culture, out var publishInfos))
                     continue;
 
+                // if it's not dirty, it means it hasn't changed so there's nothing to adjust
                 if (!publishInfos.IsDirty())
-                    continue; //if it's not dirty, it means it hasn't changed so there's nothing to adjust
+                    continue; 
                 
                 content.PublishCultureInfos.AddOrUpdate(culture, publishInfos.Name, date);
 
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index 1ebbfa1d493a..1a6a6843f975 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -58,7 +58,7 @@ public interface IContentBase : IUmbracoEntity
         /// culture name, which must be get or set via the <see cref="TreeEntityBase.Name"/> property.</para>
         /// </remarks>
         ContentCultureInfosCollection CultureInfos { get; set; }
-        
+
         /// <summary>
         /// Gets the available cultures.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
index d49c92f1bf09..fc5382499f29 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IDocumentRepository : IContentRepository<int, IContent>, IReadRepository<Guid, IContent>
     {
-
-
         /// <summary>
         /// Clears the publishing schedule for all entries having an a date before (lower than, or equal to) a specified date.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 04af52047c1a..d8e6fd2c0e73 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -120,15 +119,15 @@ protected Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
                     break;
                 case QueryType.Single:
                 case QueryType.Many:
+                    // R# may flag this ambiguous and red-squiggle it, but it is not
+                    sql = sql.Select<DocumentDto>(r =>
+                       r.Select(documentDto => documentDto.ContentDto, r1 =>
+                           r1.Select(contentDto => contentDto.NodeDto))
+                        .Select(documentDto => documentDto.DocumentVersionDto, r1 =>
+                           r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto))
+                        .Select(documentDto => documentDto.PublishedVersionDto, "pdv", r1 =>
+                           r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto, "pcv")))
 
-                    //we've put this in a local function so that the below sql.Select statement doesn't have a problem
-                    //thinking that the call is ambiguous
-                    NPocoSqlExtensions.SqlRef<DocumentDto> SelectStatement(NPocoSqlExtensions.SqlRef<DocumentDto> r) =>
-                        r.Select(documentDto => documentDto.ContentDto, r1 => r1.Select(contentDto => contentDto.NodeDto))
-                            .Select(documentDto => documentDto.DocumentVersionDto, r1 => r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto))
-                            .Select(documentDto => documentDto.PublishedVersionDto, "pdv", r1 => r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto, "pcv"));
-
-                    sql = sql.Select<DocumentDto>(SelectStatement)
                        // select the variant name, coalesce to the invariant name, as "variantName"
                        .AndSelect(VariantNameSqlExpression + " AS variantName");
                     break;
@@ -954,8 +953,6 @@ public IEnumerable<IContent> GetContentForExpiration(DateTime date)
 
         #endregion
 
-        
-
         protected override string ApplySystemOrdering(ref Sql<ISqlContext> sql, Ordering ordering)
         {
             // note: 'updater' is the user who created the latest draft version,
@@ -1187,17 +1184,18 @@ private IDictionary<int, ContentScheduleCollection> GetContentSchedule(params in
             return result;
         }
 
-
         private void SetVariations(Content content, IDictionary<int, List<ContentVariation>> contentVariations, IDictionary<int, List<DocumentVariation>> documentVariations)
         {
             if (contentVariations.TryGetValue(content.VersionId, out var contentVariation))
                 foreach (var v in contentVariation)
                     content.SetCultureInfo(v.Culture, v.Name, v.Date);
+
             if (content.PublishedVersionId > 0 && contentVariations.TryGetValue(content.PublishedVersionId, out contentVariation))
             {
                 foreach (var v in contentVariation)
                     content.SetPublishInfo(v.Culture, v.Name, v.Date);
             }
+
             if (documentVariations.TryGetValue(content.Id, out var documentVariation))
                 content.SetCultureEdited(documentVariation.Where(x => x.Edited).Select(x => x.Culture));
         }
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 600921ee787d..942206ccc230 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -341,11 +341,10 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither 'null' nor
         /// 'empty'. If the content type is invariant, then culture can be either '*' or null or empty.</para>
         /// </remarks>
-        /// <param name="content"></param>
-        /// <param name="culture"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns></returns>
+        /// <param name="content">The document to publish.</param>
+        /// <param name="culture">The culture to publish.</param>
+        /// <param name="userId">The identifier of the user performing the action.</param>
+        /// <param name="raiseEvents">A value indicating whether to raise events.</param>
         PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = 0, bool raiseEvents = true);
 
         /// <summary>
@@ -356,11 +355,10 @@ IEnumerable<IContent> GetPagedOfTypes(int[] contentTypeIds, long pageIndex, int
         /// <para>When a culture is being published, it includes all varying values along with all invariant values.</para>
         /// <para>The document is *always* saved, even when publishing fails.</para>
         /// </remarks>
-        /// <param name="content"></param>
+        /// <param name="content">The document to publish.</param>
         /// <param name="cultures">The cultures to publish.</param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns></returns>
+        /// <param name="userId">The identifier of the user performing the action.</param>
+        /// <param name="raiseEvents">A value indicating whether to raise events.</param>
         PublishResult SaveAndPublish(IContent content, string[] cultures, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index ce7417722d22..d034dad22db5 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -908,8 +908,9 @@ public PublishResult SaveAndPublish(IContent content, string[] cultures, int use
                     : new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
             }
 
+            // TODO: currently, no way to know which one failed
             if (cultures.Select(content.PublishCulture).Any(isValid => !isValid))
-                return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, content); //fixme: no way to know which one failed?
+                return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, content);
 
             return CommitDocumentChanges(content, userId, raiseEvents);
         }
@@ -1055,9 +1056,10 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
                     }
 
                     // reset published state from temp values (publishing, unpublishing) to original value
-                    // (published, unpublished) in order to save the document, unchanged
-                    //TODO: why? this seems odd, were just setting the exact same value that it already has
-                    // instead do we want to just set the PublishState?
+                    // (published, unpublished) in order to save the document, unchanged - yes, this is odd,
+                    // but: (a) it means we don't reproduce the PublishState logic here and (b) setting the
+                    // PublishState to anything other than Publishing or Unpublishing - which is precisely
+                    // what we want to do here - throws
                     content.Published = content.Published; 
                 }
             }
@@ -1080,9 +1082,10 @@ private PublishResult CommitDocumentChangesInternal(IScope scope, IContent conte
                     else
                     {
                         // reset published state from temp values (publishing, unpublishing) to original value
-                        // (published, unpublished) in order to save the document, unchanged
-                        //TODO: why? this seems odd, were just setting the exact same value that it already has
-                        // instead do we want to just set the PublishState?
+                        // (published, unpublished) in order to save the document, unchanged - yes, this is odd,
+                        // but: (a) it means we don't reproduce the PublishState logic here and (b) setting the
+                        // PublishState to anything other than Publishing or Unpublishing - which is precisely
+                        // what we want to do here - throws
                         content.Published = content.Published;
                     }
                 }
@@ -1507,9 +1510,8 @@ public IEnumerable<PublishResult> SaveAndPublishBranch(IContent document, bool f
                 Audit(AuditType.Publish, userId, document.Id, "Branch published");
 
                 // trigger events for the entire branch
+                // (SaveAndPublishBranchOne does *not* do it)
                 scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(document, TreeChangeTypes.RefreshBranch).ToEventArgs());
-
-                //fixme - in the SaveAndPublishBranchOne -> CommitDocumentChangesInternal publishing/published is going to be raised there, so are we raising it 2x for the same thing?
                 scope.Events.Dispatch(Published, this, new ContentPublishedEventArgs(publishedDocuments, false, evtMsgs), nameof(Published));
 
                 scope.Complete();
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ab663b5a2459..f6705f6619ec 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -302,6 +302,7 @@
     <Compile Include="DisposableObjectSlim.cs" />
     <Compile Include="EnumExtensions.cs" />
     <Compile Include="Events\CancellableEnumerableObjectEventArgs.cs" />
+    <Compile Include="Events\CancellableObjectEventArgsOfTEventObject.cs" />
     <Compile Include="Events\ContentPublishedEventArgs.cs" />
     <Compile Include="Events\ContentPublishingEventArgs.cs" />
     <Compile Include="Events\ContentSavedEventArgs.cs" />

From fb070928f743301c01cf6ca7b744f725132c9c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 7 Feb 2019 08:57:20 +0100
Subject: [PATCH 352/421] V8: umb-editor-navigation-anchor-dropdown first
 version

---
 .../components/content/edit.controller.js     |  17 +++
 .../content/umbtabbedcontent.directive.js     | 109 +++++++++++++-----
 .../content/umbvariantcontent.directive.js    |  15 ++-
 .../umbvariantcontenteditors.directive.js     |  10 +-
 .../umbeditorcontentheader.directive.js       |  16 ++-
 .../editor/umbeditornavigation.directive.js   |   9 +-
 .../umbeditornavigationitem.directive.js      |  45 +++++++-
 .../util/getDomElement.directive.js           |  17 +++
 .../umb-editor-navigation-item.less           |  36 ++++--
 .../src/views/components/content/edit.html    |   3 +-
 .../content/umb-tabbed-content.html           |  13 +--
 .../content/umb-variant-content-editors.html  |   3 +-
 .../content/umb-variant-content.html          |   1 +
 .../editor/umb-editor-content-header.html     |   3 +-
 .../editor/umb-editor-navigation-item.html    |  10 +-
 .../editor/umb-editor-navigation.html         |   2 +
 16 files changed, 254 insertions(+), 55 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/util/getDomElement.directive.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 16db974df9f5..c91683be83a1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -878,6 +878,23 @@
             }
         };
 
+        /**
+         * Call back when a content app changes
+         * @param {any} app
+         */
+        $scope.appAnchorChanged = function (app, anchor) {
+            
+            if ($scope.app !== app) {
+                console.log("Change app")
+                // TODO: Not working..!!!!!!!!
+                $scope.appChanged(app);
+            }
+            
+            //send an event downwards
+            $scope.$broadcast("editors.apps.appAnchorChanged", { app: app, anchor: anchor });
+            
+        };
+
         // methods for infinite editing
         $scope.close = function () {
             if ($scope.infiniteModel.close) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index 5ebb40fac6e9..f288d8681d77 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -4,38 +4,95 @@
     /** This directive is used to render out the current variant tabs and properties and exposes an API for other directives to consume  */
     function tabbedContentDirective() {
 
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/content/umb-tabbed-content.html',
-            controller: function ($scope) {
+        function link($scope, $element, $attrs) {
+            
+            var appRootNode = $element[0];
+            
+            // Directive for cached property groups.
+            var propertyGroupNodesDictionary = {};
+            
+            var scrollableNode = appRootNode.closest(".umb-scrollable");
+            scrollableNode.addEventListener("scroll", onScroll);
+            
+            function onScroll(event) {
                 
-                //expose the property/methods for other directives to use
-                this.content = $scope.content;
-                this.activeVariant = _.find(this.content.variants, variant => {
-                    return variant.active;
-                });
+                var viewFocusY = scrollableNode.scrollTop + scrollableNode.clientHeight * .5;
+                
+                for(var i in $scope.content.tabs) {
+                    var group = $scope.content.tabs[i];
+                    var node = propertyGroupNodesDictionary[group.id];
+                    //console.log(node.offsetTop, node.offsetTop + node.clientHeight)
+                    if (viewFocusY >= node.offsetTop && viewFocusY <= node.offsetTop + node.clientHeight) {
+                        setActiveAnchor(group);
+                        return;
+                    }
+                }
+                
+            }
+            function setActiveAnchor(tab) {
+                var i = $scope.content.tabs.length;
+                while(i--) {
+                    $scope.content.tabs[i].active = false;
+                }
+                tab.active = true;
+            }
+            function scrollTo(id) {
+                console.log("scrollTo", id);
+                
+                if (propertyGroupNodesDictionary[id]) {
+                    let y = propertyGroupNodesDictionary[id].offsetTop - 20;// currently only relative to closest relatively positioned parent 
+                    
+                    scrollableNode.scrollTo(0, y);
+                }
+            }
+            
+            $scope.registerPropertyGroup = function(element, appAnchor) {
+                propertyGroupNodesDictionary[appAnchor] = element;
+            }
+            
+            $scope.$on("editors.apps.appAnchorChanged", function($event, $args) {
+                if($args.app.alias === "umbContent") {
+                    setActiveAnchor($args.anchor);
+                    scrollTo($args.anchor.id);
+                }
+            });
+            
+            
+        }
 
-                $scope.activeVariant = this.activeVariant;
+        function controller($scope, $element, $attrs) {
+            
+            
+            //expose the property/methods for other directives to use
+            this.content = $scope.content;
+            this.activeVariant = _.find(this.content.variants, variant => {
+                return variant.active;
+            });
 
-                $scope.defaultVariant = _.find(this.content.variants, variant => {
-                    return variant.language.isDefault;
-                });
+            $scope.activeVariant = this.activeVariant;
 
-                $scope.unlockInvariantValue = function(property) {
-                    property.unlockInvariantValue = !property.unlockInvariantValue;
-                };
+            $scope.defaultVariant = _.find(this.content.variants, variant => {
+                return variant.language.isDefault;
+            });
 
-                $scope.$watch("tabbedContentForm.$dirty",
-                    function (newValue, oldValue) {
-                        if (newValue === true) {
-                            $scope.content.isDirty = true;
-                        }
-                    });
-            },
-            link: function(scope) {
+            $scope.unlockInvariantValue = function(property) {
+                property.unlockInvariantValue = !property.unlockInvariantValue;
+            };
+
+            $scope.$watch("tabbedContentForm.$dirty",
+                function (newValue, oldValue) {
+                    if (newValue === true) {
+                        $scope.content.isDirty = true;
+                    }
+                });
+        }
 
-            },
+        var directive = {
+            restrict: 'E',
+            replace: true,
+            templateUrl: 'views/components/content/umb-tabbed-content.html',
+            controller: controller,
+            link: link,
             scope: {
                 content: "="
             }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
index 85458549924e..9eb4ddee1577 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
@@ -16,7 +16,8 @@
             onCloseSplitView: "&",
             onSelectVariant: "&",
             onOpenSplitView: "&",
-            onSelectApp: "&"
+            onSelectApp: "&",
+            onSelectAppAnchor: "&"
         },
         controllerAs: 'vm',
         controller: umbVariantContentController
@@ -35,6 +36,7 @@
         vm.selectVariant = selectVariant;
         vm.openSplitView = openSplitView;
         vm.selectApp = selectApp;
+        vm.selectAppAnchor = selectAppAnchor;
 
         function onInit() {
             // disable the name field if the active content app is not "Content"
@@ -89,6 +91,17 @@
             }
         }
 
+        /**
+         * Used to proxy a callback
+         * @param {any} item
+         */
+        function selectAppAnchor(item, anchor) {
+            // call the callback if any is registered
+            if(vm.onSelectAppAnchor) {
+                vm.onSelectAppAnchor({"app": item, "anchor": anchor});
+            }
+        }
+
         /**
          * Used to proxy a callback
          * @param {any} variant
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index addbb3b11b26..0995a137071f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -10,7 +10,8 @@
             page: "<",
             content: "<", // TODO: Not sure if this should be = since we are changing the 'active' property of a variant
             culture: "<",
-            onSelectApp: "&?"
+            onSelectApp: "&?",
+            onSelectAppAnchor: "&?"
         },
         controllerAs: 'vm',
         controller: umbVariantContentEditorsController
@@ -32,6 +33,7 @@
         vm.closeSplitView = closeSplitView;
         vm.selectVariant = selectVariant;
         vm.selectApp = selectApp;
+        vm.selectAppAnchor = selectAppAnchor;
 
         //Used to track how many content views there are (for split view there will be 2, it could support more in theory)
         vm.editors = [];
@@ -323,6 +325,12 @@
                 vm.onSelectApp({"app": app});
             }
         }
+        
+        function selectAppAnchor(app, anchor) {
+            if(vm.onSelectAppAnchor) {
+                vm.onSelectAppAnchor({"app": app, "anchor": anchor});
+            }
+        }
 
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 0f1aae940d9f..ad20c6bbae94 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -19,15 +19,14 @@
             function onInit() {
                 
                 setCurrentVariant();
-                /*
+                
                 angular.forEach(scope.content.apps, (app) => {
                     if (app.alias === "umbContent") {
-                        console.log("content app", app)
-                        app.type = "dropdown";
-                        app.groups = scope.content.tabs;
+                        console.log("app: ", app)
+                        app.anchors = scope.content.tabs;
                     }
                 });
-                */
+                
             }
 
             function setCurrentVariant() {
@@ -56,6 +55,12 @@
                 }
             }
 
+            scope.selectAnchorItem = function(item, anchor) {
+                if(scope.onSelectAnchorItem) {
+                    scope.onSelectAnchorItem({"item": item, "anchor": anchor});
+                }
+            }
+
             scope.closeSplitView = function () {
                 if (scope.onCloseSplitView) {
                     scope.onCloseSplitView();
@@ -114,6 +119,7 @@
                 openVariants: "<",
                 hideChangeVariant: "<?",
                 onSelectNavigationItem: "&?",
+                onSelectAnchorItem: "&?",
                 showBackButton: "<?",
                 splitViewOpen: "=?",
                 onOpenInSplitView: "&?",
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
index 43a17c0139ed..34810f17dd91 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
@@ -28,6 +28,12 @@
                 eventsService.emit("app.tabChange", item);
             };
 
+            scope.openAnchorItem = function(item, anchor) {
+                if(scope.onAnchorSelect) {
+                    scope.onAnchorSelect({"item": item, "anchor": anchor});
+                }
+            };
+
             scope.toggleDropdown = function () {
                 scope.showDropdown = !scope.showDropdown;
             };
@@ -129,7 +135,8 @@
             templateUrl: 'views/components/editor/umb-editor-navigation.html',
             scope: {
                 navigation: "=",
-                onSelect: "&"
+                onSelect: "&",
+                onAnchorSelect: "&"
             },
             link: link
         };
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
index cbbedf9de3df..abb685807b8d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
@@ -15,13 +15,51 @@ Use this directive to render tab content. For an example see: {@link umbraco.dir
     
     function UmbEditorNavigationItemController($scope, $element, $attrs) {
         
-        $element[0].classList.add('umb-sub-views-nav-item')
-        
         var vm = this;
         
-        this.callOpen = function() {
+        vm.showDropdown = false;
+        
+        vm.clicked = function() {
             vm.onOpen({item:vm.item});
+            
+            //vm.mouseOver();// help touch users get the dropdown.
+            clearTimeout(vm.mouseOutDelay);
+            vm.showDropdown = true;
+        };
+        
+        vm.anchorClicked = function(anchor, $event) {
+            
+            vm.onOpenAnchor({item:vm.item, anchor:anchor});
+            $event.stopPropagation();
+            $event.preventDefault();
         };
+        
+        vm.mouseOver = function() {
+            clearTimeout(vm.mouseOutDelay);
+            vm.showDropdown = true;
+            $scope.$digest();
+        }
+        
+        var hideDropdown = function() {
+            vm.showDropdown = false;
+            $scope.$digest();
+        }
+        var hideDropdownBind = hideDropdown.bind(vm);
+        
+        vm.mouseOut = function() {
+            clearTimeout(vm.mouseOutDelay);
+            vm.mouseOutDelay = setTimeout(hideDropdownBind, 1000);
+        }
+        
+        
+        
+        var componentNode = $element[0];
+        
+        componentNode.classList.add('umb-sub-views-nav-item');
+        
+        componentNode.addEventListener('mouseover', vm.mouseOver.bind(vm));
+        componentNode.addEventListener('mouseout', vm.mouseOut.bind(vm));
+        
     }
     
     angular
@@ -33,6 +71,7 @@ Use this directive to render tab content. For an example see: {@link umbraco.dir
             bindings: {
                 item: '=',
                 onOpen: '&',
+                onOpenAnchor: '&',
                 index: '@'
             }
         });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/getDomElement.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/getDomElement.directive.js
new file mode 100644
index 000000000000..2a0c9c3aece3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/getDomElement.directive.js
@@ -0,0 +1,17 @@
+angular.module("umbraco.directives").directive("retriveDomElement", function () {
+  var directiveDefinitionObject = {
+
+    restrict: "A",
+    selector: '[retriveDomElement]',
+    scope: {
+        "retriveDomElement": "&"
+    },
+    link: {
+        post: function(scope, iElement, iAttrs, controller) {
+            scope.retriveDomElement({element:iElement, attributes: iAttrs});
+        }
+    }
+  };
+
+  return directiveDefinitionObject;
+});
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
index 7e858102e059..faa4ff40b082 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -1,7 +1,7 @@
 .umb-sub-views-nav-item {
-    
+    position: relative;
 }
-.umb-sub-views-nav-item a {
+.umb-sub-views-nav-item > a {
   text-align: center;
   cursor: pointer;
   display: block;
@@ -36,16 +36,16 @@
   }
 }
 
-.umb-sub-views-nav-item a:focus {
+.umb-sub-views-nav-item > a:focus {
   outline: none;
 }
 
-.umb-sub-views-nav-item a:hover,
-.umb-sub-views-nav-item a:focus {
+.umb-sub-views-nav-item > a:hover,
+.umb-sub-views-nav-item > a:focus {
   text-decoration: none;
 }
 
-.umb-sub-views-nav-item a.is-active {
+.umb-sub-views-nav-item > a.is-active {
     
     color: @ui-light-active-type;
     
@@ -55,7 +55,7 @@
     }
 }
 
-.show-validation .umb-sub-views-nav-item a.-has-error {
+.show-validation .umb-sub-views-nav-item > a.-has-error {
   color: @red;
 }
 
@@ -98,6 +98,28 @@
   line-height: 1em;
 }
 
+
+.umb-sub-views-nav-item__anchor_dropdown {// inherits from .dropdown-menu
+    display: none;
+    &.show {
+        display: block;
+    }
+}
+.umb-sub-views-nav-item__anchor_dropdown li a {
+    border-left: 4px solid transparent;
+}
+.umb-sub-views-nav-item__anchor_dropdown li.is-active a {
+    border-left-color: @ui-selected-border;
+}
+.umb-sub-views-nav-item__anchor_dropdown li:hover.is-active a {
+    border-left-color: @ui-selected-border-hover;
+}
+
+
+// --------------------------------
+// item__more, appears when there is not enough room for the visible items.
+// --------------------------------
+
 .umb-sub-views-nav-item-more__icon {
   margin-bottom: 10px;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index e97eabf17f2b..dda9334e0571 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -10,7 +10,8 @@
                 page="page"
                 content="content"
                 culture="culture"
-                on-select-app="appChanged(app)">
+                on-select-app="appChanged(app)"
+                on-select-app-anchor="appAnchorChanged(app, anchor)">
             </umb-variant-content-editors>
 
             <umb-editor-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index cdacea7cf19a..be768db497ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -1,16 +1,15 @@
 <div>
     <ng-form name="tabbedContentForm">
-        <div class="umb-expansion-panel" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
+        <div class="umb-expansion-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
 
-            <div class="umb-expansion-panel__header" ng-click="group.open = !group.open">
+            <div class="umb-expansion-panel__header">
                 <div>{{ group.label }}</div>
-                <ins class="umb-expansion-panel__expand" ng-class="{'icon-navigation-down': !group.open, 'icon-navigation-up': group.open}">&nbsp;</ins>
             </div>
 
-            <div class="umb-expansion-panel__content" ng-show="group.open">
-                <umb-property 
-                    data-element="property-{{property.alias}}" 
-                    ng-repeat="property in group.properties track by property.alias" 
+            <div class="umb-expansion-panel__content">
+                <umb-property
+                    data-element="property-{{property.alias}}"
+                    ng-repeat="property in group.properties track by property.alias"
                     property="property"
                     show-inherit="content.variants.length > 1 && !property.culture && !activeVariant.language.isDefault"
                     inherits-from="defaultVariant.language.name">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content-editors.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content-editors.html
index 9d879fac22c8..76bca6fce209 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content-editors.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content-editors.html
@@ -13,7 +13,8 @@
             on-open-split-view="vm.openSplitView(variant)"
             on-close-split-view="vm.closeSplitView($index)"
             on-select-variant="vm.selectVariant(variant, $index)"
-            on-select-app="vm.selectApp(app)">
+            on-select-app="vm.selectApp(app)"
+            on-select-app-anchor="vm.selectAppAnchor(app, anchor)">
         </umb-variant-content>
 
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
index 84928a00bbf1..34c7792055e3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
@@ -13,6 +13,7 @@
                 name-disabled="vm.nameDisabled"
                 content="vm.editor.content"
                 on-select-navigation-item="vm.selectApp(item)"
+                on-select-anchor-item="vm.selectAppAnchor(item, anchor)"
                 open-variants="vm.openVariants"
                 hide-change-variant="vm.page.hideChangeVariant"
                 show-back-button="vm.page.listViewPath !== null"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 8e308e89b26f..98ecfd4d28a7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -64,7 +64,8 @@
             <umb-editor-navigation
                 data-element="editor-sub-views"
                 navigation="content.apps"
-                on-select="selectNavigationItem(item)">
+                on-select="selectNavigationItem(item)"
+                on-anchor-select="selectAnchorItem(item, anchor)">
             </umb-editor-navigation>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
index 329e96242b87..848985239c38 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
@@ -1,7 +1,7 @@
 <a data-element="sub-view-{{vm.item.alias}}"
     tabindex="-1"
     ng-href=""
-    ng-click="vm.callOpen(vm.item)"
+    ng-click="vm.clicked()"
     hotkey="{{vm.index+1}}"
     hotkey-when-hidden="true"
     ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError}">
@@ -9,3 +9,11 @@
     <span class="umb-sub-views-nav-item-text">{{ vm.item.name }}</span>
     <div ng-show="item.badge" class="badge -type-{{vm.item.badge.type}}">{{vm.item.badge.count}}</div>
 </a>
+
+<ul class="dropdown-menu umb-sub-views-nav-item__anchor_dropdown" ng-class="{'show': vm.showDropdown}">
+    <li ng-repeat="anchor in vm.item.anchors" ng-class="{'is-active': anchor.active}">
+        <a href="" ng-click="vm.anchorClicked(anchor, $event)">
+            {{anchor.label}}
+        </a>
+    </li>
+</ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
index 31388a54f838..0c8f0be7a254 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
@@ -6,6 +6,7 @@
             <umb-editor-navigation-item
                 item="navItem"
                 on-open="openNavigationItem(item)"
+                on-open-anchor="openAnchorItem(item, anchor)"
                 index="{{$index}}">
             </umb-editor-navigation-item>
         </div>
@@ -28,6 +29,7 @@
                     <umb-editor-navigation-item
                         item="navItem"
                         on-open="openNavigationItem(item)"
+                        on-open-anchor="openAnchorItem(item, anchor)"
                         index="{{$index}}">
                     </umb-editor-navigation-item>
                 </umb-dropdown-item>

From fc6548d87bb740c60dd2d3fe1b7dc7cba9ad3507 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 7 Feb 2019 09:56:14 +0100
Subject: [PATCH 353/421] Fix issue where Id was not set when loading all
 entity paths

---
 src/Umbraco.Core/Models/Entities/TreeEntityPath.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs b/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs
index 54142a75275c..adbb0d9a3931 100644
--- a/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs
+++ b/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs
@@ -14,5 +14,14 @@ public class TreeEntityPath
         /// Gets or sets the path of the entity.
         /// </summary>
         public string Path { get; set; }
+
+        /// <summary>
+        /// Proxy of the Id
+        /// </summary>
+        public int NodeId
+        {
+            get => Id;
+            set => Id = value;
+        }
     }
 }

From 8ed2dcb8bfaf5cffc515aaea174a8016b6a06e9b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 7 Feb 2019 09:59:16 +0100
Subject: [PATCH 354/421] Don't capture content caches!

---
 .../PublishedContentMoreTests.cs              |  2 +-
 src/Umbraco.Web/PublishedContentQuery.cs      | 52 ++++++++-----------
 .../Routing/ContentFinderByConfigured404.cs   |  3 +-
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  2 +-
 src/Umbraco.Web/UmbracoHelper.cs              |  2 +-
 5 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
index 5f3a51f4f67c..0dcc4bea99b4 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
@@ -195,7 +195,7 @@ public void Issue()
         [Test]
         public void PublishedContentQueryTypedContentList()
         {
-            var query = new PublishedContentQuery(UmbracoContext.Current.ContentCache, UmbracoContext.Current.MediaCache, UmbracoContext.Current.VariationContextAccessor);
+            var query = new PublishedContentQuery(UmbracoContext.Current.PublishedSnapshot, UmbracoContext.Current.VariationContextAccessor);
             var result = query.Content(new[] { 1, 2, 4 }).ToArray();
             Assert.AreEqual(2, result.Length);
             Assert.AreEqual(1, result[0].Id);
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 2c4d08502e8c..61180580cbf0 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -2,41 +2,31 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
 using System.Xml.XPath;
 using Examine;
 using Examine.Search;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
 using Umbraco.Examine;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web
 {
-    using Examine = global::Examine;
-
     /// <summary>
     /// A class used to query for published content, media items
     /// </summary>
     public class PublishedContentQuery : IPublishedContentQuery
     {
-        private readonly IPublishedContentCache _contentCache;
-        private readonly IPublishedMediaCache _mediaCache;
+        private readonly IPublishedSnapshot _publishedSnapshot;
         private readonly IVariationContextAccessor _variationContextAccessor;
 
         /// <summary>
-        /// Constructor used to return results from the caches
+        /// Initializes a new instance of the <see cref="PublishedContentQuery"/> class.
         /// </summary>
-        /// <param name="contentCache"></param>
-        /// <param name="mediaCache"></param>
-        /// <param name="variationContextAccessor"></param>
-        public PublishedContentQuery(IPublishedContentCache contentCache, IPublishedMediaCache mediaCache, IVariationContextAccessor variationContextAccessor)
+        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor)
         {
-            _contentCache = contentCache ?? throw new ArgumentNullException(nameof(contentCache));
-            _mediaCache = mediaCache ?? throw new ArgumentNullException(nameof(mediaCache));
+            _publishedSnapshot = publishedSnapshot ?? throw new ArgumentNullException(nameof(publishedSnapshot));
             _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
         }
 
@@ -44,48 +34,48 @@ public PublishedContentQuery(IPublishedContentCache contentCache, IPublishedMedi
 
         public IPublishedContent Content(int id)
         {
-            return ItemById(id, _contentCache);
+            return ItemById(id, _publishedSnapshot.Content);
         }
 
         public IPublishedContent Content(Guid id)
         {
-            return ItemById(id, _contentCache);
+            return ItemById(id, _publishedSnapshot.Content);
         }
 
         public IPublishedContent Content(Udi id)
         {
             if (!(id is GuidUdi udi)) return null;
-            return ItemById(udi.Guid, _contentCache);
+            return ItemById(udi.Guid, _publishedSnapshot.Content);
         }
 
         public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return ItemByXPath(xpath, vars, _contentCache);
+            return ItemByXPath(xpath, vars, _publishedSnapshot.Content);
         }
 
         public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids)
         {
-            return ItemsByIds(_contentCache, ids);
+            return ItemsByIds(_publishedSnapshot.Content, ids);
         }
 
         public IEnumerable<IPublishedContent> Content(IEnumerable<Guid> ids)
         {
-            return ItemsByIds(_contentCache, ids);
+            return ItemsByIds(_publishedSnapshot.Content, ids);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return ItemsByXPath(xpath, vars, _contentCache);
+            return ItemsByXPath(xpath, vars, _publishedSnapshot.Content);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars)
         {
-            return ItemsByXPath(xpath, vars, _contentCache);
+            return ItemsByXPath(xpath, vars, _publishedSnapshot.Content);
         }
 
         public IEnumerable<IPublishedContent> ContentAtRoot()
         {
-            return ItemsAtRoot(_contentCache);
+            return ItemsAtRoot(_publishedSnapshot.Content);
         }
 
         #endregion
@@ -94,33 +84,33 @@ public IEnumerable<IPublishedContent> ContentAtRoot()
 
         public IPublishedContent Media(int id)
         {
-            return ItemById(id, _mediaCache);
+            return ItemById(id, _publishedSnapshot.Media);
         }
 
         public IPublishedContent Media(Guid id)
         {
-            return ItemById(id, _mediaCache);
+            return ItemById(id, _publishedSnapshot.Media);
         }
 
         public IPublishedContent Media(Udi id)
         {
             if (!(id is GuidUdi udi)) return null;
-            return ItemById(udi.Guid, _mediaCache);
+            return ItemById(udi.Guid, _publishedSnapshot.Media);
         }
 
         public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
         {
-            return ItemsByIds(_mediaCache, ids);
+            return ItemsByIds(_publishedSnapshot.Media, ids);
         }
 
         public IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids)
         {
-            return ItemsByIds(_mediaCache, ids);
+            return ItemsByIds(_publishedSnapshot.Media, ids);
         }
 
         public IEnumerable<IPublishedContent> MediaAtRoot()
         {
-            return ItemsAtRoot(_mediaCache);
+            return ItemsAtRoot(_publishedSnapshot.Media);
         }
 
 
@@ -224,7 +214,7 @@ public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take
 
             totalRecords = results.TotalItemCount;
 
-            return new CultureContextualSearchResults(results.ToPublishedSearchResults(_contentCache), _variationContextAccessor, culture);
+            return new CultureContextualSearchResults(results.ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor, culture);
         }
 
         /// <inheritdoc />
@@ -241,7 +231,7 @@ public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query, int skip,
                 : query.Execute(maxResults: skip + take);
 
             totalRecords = results.TotalItemCount;
-            return results.ToPublishedSearchResults(_contentCache);
+            return results.ToPublishedSearchResults(_publishedSnapshot.Content);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
index 382ee6fe122c..e3cad25c6fd0 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
@@ -13,7 +13,6 @@ namespace Umbraco.Web.Routing
     /// </summary>
     public class ContentFinderByConfigured404 : IContentLastChanceFinder
     {
-
         private readonly ILogger _logger;
         private readonly IEntityService _entityService;
         private readonly IContentSection _contentConfigSection;
@@ -63,7 +62,7 @@ public bool TryFindContent(PublishedRequest frequest)
             var error404 = NotFoundHandlerHelper.GetCurrentNotFoundPageId(
                 _contentConfigSection.Error404Collection.ToArray(),
                 _entityService,
-                new PublishedContentQuery(frequest.UmbracoContext.ContentCache, frequest.UmbracoContext.MediaCache, frequest.UmbracoContext.VariationContextAccessor),
+                new PublishedContentQuery(frequest.UmbracoContext.PublishedSnapshot, frequest.UmbracoContext.VariationContextAccessor),
                 errorCulture);
 
             IPublishedContent content = null;
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 0f17c19bdbba..3afe6aa39708 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -91,7 +91,7 @@ public override void Compose(Composition composition)
             composition.Register<IPublishedContentQuery>(factory =>
             {
                 var umbCtx = factory.GetInstance<IUmbracoContextAccessor>();
-                return new PublishedContentQuery(umbCtx.UmbracoContext.ContentCache, umbCtx.UmbracoContext.MediaCache, factory.GetInstance<IVariationContextAccessor>());
+                return new PublishedContentQuery(umbCtx.UmbracoContext.PublishedSnapshot, factory.GetInstance<IVariationContextAccessor>());
             }, Lifetime.Request);
             composition.Register<ITagQuery, TagQuery>(Lifetime.Request);
 
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 962d181d7b5e..d2da4d16460a 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -73,7 +73,7 @@ internal UmbracoHelper()
         #endregion
 
         // ensures that we can return the specified value
-        T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException(""); // fixme
+        T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException("This UmbracoHelper instance has not been initialized.");
 
         private IUmbracoComponentRenderer ComponentRenderer => Ensure(_componentRenderer);
         private ICultureDictionaryFactory CultureDictionaryFactory => Ensure(_cultureDictionaryFactory);

From 2092156db34d3d6a8393934f2c1295502984bb6c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 7 Feb 2019 12:27:19 +0100
Subject: [PATCH 355/421] Cleanup

---
 ...ontentTypeBaseServiceProviderExtensions.cs | 16 ----------
 src/Umbraco.Core/Models/ContentBase.cs        | 24 +++------------
 src/Umbraco.Core/Models/IMedia.cs             |  8 ++---
 src/Umbraco.Core/Models/Media.cs              |  1 -
 src/Umbraco.Core/Models/MediaExtensions.cs    |  5 ++--
 src/Umbraco.Core/Models/PropertyCollection.cs |  2 +-
 .../IContentTypeBaseServiceProvider.cs        |  5 ++++
 .../ContentTypeBaseServiceProvider.cs         |  7 +++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 -
 .../Testing/ContentBaseExtensions.cs          | 29 ++++---------------
 .../Filters/MemberSaveValidationAttribute.cs  | 12 +++-----
 .../Editors/Filters/MemberValidationHelper.cs |  4 +--
 12 files changed, 33 insertions(+), 81 deletions(-)
 delete mode 100644 src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs

diff --git a/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs b/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs
deleted file mode 100644
index f962d9aefb5e..000000000000
--- a/src/Umbraco.Core/ContentTypeBaseServiceProviderExtensions.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-
-namespace Umbraco.Core
-{
-    internal static class ContentTypeBaseServiceProviderExtensions
-    {
-        //TODO: Maybe this should just be on the IContentTypeBaseServiceProvider interface?
-        public static IContentTypeComposition GetContentTypeOf(this IContentTypeBaseServiceProvider serviceProvider, IContentBase contentBase)
-        {
-            if (contentBase == null) throw new ArgumentNullException(nameof(contentBase));
-            return serviceProvider.For(contentBase)?.Get(contentBase.ContentTypeId);
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index e6e893d90553..fbb68194b72b 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -307,26 +307,10 @@ public TValue GetValue<TValue>(string propertyTypeAlias, string culture = null,
         /// <inheritdoc />
         public void SetValue(string propertyTypeAlias, object value, string culture = null, string segment = null)
         {
-            if (Properties.TryGetValue(propertyTypeAlias, out var property))
-            {
-                property.SetValue(value, culture, segment);
-            }
-            else
-            {
-                //fixme: Can this ever happen? According to the ctor in ContentBase (EnsurePropertyTypes), all properties will be created based on the content type's property types
-                // so how can a property not be resolved by the alias on the content.Properties but it can on the content type?
-                // This maybe can happen if a developer has removed a property with the api and is trying to then set the value of that property again...
-                // BUT, as it turns out the content.Properties.Remove(...) method is NEVER used, because why and how could it? you never remove a property from
-                // a content item directly.
-
-                var propertyType = AllPropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
-                if (propertyType == null)
-                    throw new InvalidOperationException($"No PropertyType exists with the supplied alias \"{propertyTypeAlias}\".");
-
-                property = propertyType.CreateProperty();
-                property.SetValue(value, culture, segment);
-                Properties.Add(property);
-            }
+            if (!Properties.TryGetValue(propertyTypeAlias, out var property))
+                throw new InvalidOperationException($"No PropertyType exists with the supplied alias \"{propertyTypeAlias}\".");
+
+            property.SetValue(value, culture, segment);
 
             //bump the culture to be flagged for updating
             this.TouchCulture(culture);
diff --git a/src/Umbraco.Core/Models/IMedia.cs b/src/Umbraco.Core/Models/IMedia.cs
index 3ad4f87aa855..75e94d66e77b 100644
--- a/src/Umbraco.Core/Models/IMedia.cs
+++ b/src/Umbraco.Core/Models/IMedia.cs
@@ -1,9 +1,5 @@
-using Umbraco.Core.Persistence.Mappers;
-
-namespace Umbraco.Core.Models
+namespace Umbraco.Core.Models
 {
     public interface IMedia : IContentBase
-    {
-        
-    }
+    { }
 }
diff --git a/src/Umbraco.Core/Models/Media.cs b/src/Umbraco.Core/Models/Media.cs
index d281f8f2671e..002611c09cc7 100644
--- a/src/Umbraco.Core/Models/Media.cs
+++ b/src/Umbraco.Core/Models/Media.cs
@@ -80,6 +80,5 @@ internal void ChangeContentType(IMediaType contentType, bool clearProperties)
             Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
             Properties.CollectionChanged += PropertiesChanged;
         }
-
     }
 }
diff --git a/src/Umbraco.Core/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs
index ff5e47394f96..1166698adb8d 100644
--- a/src/Umbraco.Core/Models/MediaExtensions.cs
+++ b/src/Umbraco.Core/Models/MediaExtensions.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors.ValueConverters;
@@ -20,8 +19,8 @@ public static string GetUrl(this IMedia media, string propertyAlias, ILogger log
                 return string.Empty;
 
             // TODO: would need to be adjusted to variations, when media become variants
-            var jsonString = property?.GetValue() as string;
-            if (jsonString == null) return string.Empty;
+            if (!(property.GetValue() is string jsonString))
+                return string.Empty;
 
             if (property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.UploadField)
                 return jsonString;
diff --git a/src/Umbraco.Core/Models/PropertyCollection.cs b/src/Umbraco.Core/Models/PropertyCollection.cs
index ed641080ea1c..977600a2f7a8 100644
--- a/src/Umbraco.Core/Models/PropertyCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyCollection.cs
@@ -93,7 +93,7 @@ protected override void ClearItems()
         }
 
         /// <summary>
-        /// Adds or update a property.
+        /// Adds or updates a property.
         /// </summary>
         internal new void Add(Property property)
         {
diff --git a/src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs b/src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs
index 70327e7baf7d..d0146ce043d1 100644
--- a/src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs
+++ b/src/Umbraco.Core/Services/IContentTypeBaseServiceProvider.cs
@@ -18,5 +18,10 @@ public interface IContentTypeBaseServiceProvider
         /// to retrieve the content / media / whatever type as <see cref="IContentTypeComposition"/>.</para>
         /// </remarks>
         IContentTypeBaseService For(IContentBase contentBase);
+
+        /// <summary>
+        /// Gets the content type of an <see cref="IContentBase"/> object.
+        /// </summary>
+        IContentTypeComposition GetContentTypeOf(IContentBase contentBase);
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs b/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
index e20ff28ab3d7..5a56dfe3bc61 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeBaseServiceProvider.cs
@@ -31,5 +31,12 @@ public IContentTypeBaseService For(IContentBase contentBase)
                     throw new ArgumentException($"Invalid contentBase type: {contentBase.GetType().FullName}" , nameof(contentBase));
             }
         }
+
+        // note: this should be a default interface method with C# 8
+        public IContentTypeComposition GetContentTypeOf(IContentBase contentBase)
+        {
+            if (contentBase == null) throw new ArgumentNullException(nameof(contentBase));
+            return For(contentBase)?.Get(contentBase.ContentTypeId);
+        }
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b29977697a09..f773d5d152b5 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -291,7 +291,6 @@
     <Compile Include="Constants-Web.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Composing\RegisterExtensions.cs" />
-    <Compile Include="ContentTypeBaseServiceProviderExtensions.cs" />
     <Compile Include="ContentVariationExtensions.cs" />
     <Compile Include="Dashboards\AccessRule.cs" />
     <Compile Include="Dashboards\AccessRuleType.cs" />
diff --git a/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs b/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
index 6d3d2c76839f..d33818a31bf7 100644
--- a/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
+++ b/src/Umbraco.Tests/Testing/ContentBaseExtensions.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Tests.Testing
 {
     public static class ContentBaseExtensions
     {
-        
+
         /// <summary>
         /// Set property values by alias with an anonymous object.
         /// </summary>
@@ -22,29 +22,12 @@ public static void PropertyValues(this IContentBase content, object value, strin
             var propertyInfos = value.GetType().GetProperties();
             foreach (var propertyInfo in propertyInfos)
             {
-                if (content.Properties.TryGetValue(propertyInfo.Name, out var property))
-                {
-                    property.SetValue(propertyInfo.GetValue(value, null), culture, segment);
-                    //Update item with newly added value
-                    content.Properties.Add(property);
-                }
-                else
-                {
+                if (!content.Properties.TryGetValue(propertyInfo.Name, out var property))
+                    throw new Exception($"The property alias {propertyInfo.Name} is not valid, because no PropertyType with this alias exists");
 
-                    //fixme: Can this ever happen? According to the ctor in ContentBase (EnsurePropertyTypes), all properties will be created based on the content type's property types
-                    // so how can a property not be resolved by the alias on the content.Properties but it can on the content type?
-                    // This maybe can happen if a developer has removed a property with the api and is trying to then set the value of that property again...
-                    // BUT, as it turns out the content.Properties.Remove(...) method is NEVER used, because why and how could it? you never remove a property from
-                    // a content item directly.
-                    
-                    var propertyType = ((ContentBase)content).AllPropertyTypes.FirstOrDefault(x => x.Alias == propertyInfo.Name);
-                    if (propertyType == null)
-                        throw new Exception($"The property alias {propertyInfo.Name} is not valid, because no PropertyType with this alias exists");
-                    //Create new Property to add to collection
-                    property = propertyType.CreateProperty();
-                    property.SetValue(propertyInfo.GetValue(value, null), culture, segment);
-                    content.Properties.Add(property);
-                }
+                property.SetValue(propertyInfo.GetValue(value, null), culture, segment);
+                //Update item with newly added value
+                content.Properties.Add(property);
             }
         }
     }
diff --git a/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs
index 80d5f684fe61..c99bc64e23b3 100644
--- a/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs
@@ -1,10 +1,6 @@
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http.Controllers;
+using System.Web.Http.Controllers;
 using System.Web.Http.Filters;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.ContentEditing;
@@ -20,9 +16,9 @@ internal class MemberSaveValidationAttribute : ActionFilterAttribute
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IMemberTypeService _memberTypeService;
 
-        public MemberSaveValidationAttribute() : this(Current.Logger, Current.UmbracoContextAccessor, Current.Services.MemberTypeService)
-        {
-        }
+        public MemberSaveValidationAttribute()
+            : this(Current.Logger, Current.UmbracoContextAccessor, Current.Services.MemberTypeService)
+        { }
 
         public MemberSaveValidationAttribute(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, IMemberTypeService memberTypeService)
         {
diff --git a/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs b/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
index 8f98765c3436..ac72019cdfa6 100644
--- a/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
+++ b/src/Umbraco.Web/Editors/Filters/MemberValidationHelper.cs
@@ -7,7 +7,6 @@
 using System.Web.Http.ModelBinding;
 using System.Web.Security;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
@@ -23,7 +22,8 @@ internal class MemberValidationHelper : ContentItemValidationHelper<IMember, Mem
     {
         private readonly IMemberTypeService _memberTypeService;
 
-        public MemberValidationHelper(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, IMemberTypeService memberTypeService) : base(logger, umbracoContextAccessor)
+        public MemberValidationHelper(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, IMemberTypeService memberTypeService)
+            : base(logger, umbracoContextAccessor)
         {
             _memberTypeService = memberTypeService;
         }

From 990e82d183897b6bc36735133305e58d0cd167d1 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 7 Feb 2019 12:36:53 +0100
Subject: [PATCH 356/421] Upgrade ModelsBuilder, cleanup dashboard

---
 .../ModelsBuilder/modelsbuilder.controller.js | 35 +++++++++------
 .../ModelsBuilder/modelsbuilder.htm           | 41 -----------------
 .../ModelsBuilder/modelsbuilder.html          | 44 +++++++++++++++++++
 .../ModelsBuilder/package.manifest            | 19 ++++++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  2 +-
 .../Dashboards/ModelsBuilderDashboard.cs      | 20 ---------
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 7 files changed, 81 insertions(+), 81 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.htm
 create mode 100644 src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.html
 delete mode 100644 src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs

diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js
index 942b79eabd8e..b0e0c303cf63 100644
--- a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js
+++ b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js
@@ -1,28 +1,35 @@
-function modelsBuilderController($scope, umbRequestHelper, $log, $http, modelsBuilderResource) {
+function modelsBuilderController($scope, $http, umbRequestHelper, modelsBuilderResource) {
 
-    $scope.generate = function() {
-        $scope.generating = true;
+    var vm = this;
+
+    vm.reload = reload;
+    vm.generate = generate;
+    vm.dashboard = null;
+
+    function generate() {
+        vm.generating = true;
         umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
                 'Failed to generate.')
             .then(function (result) {
-                $scope.generating = false;
-                $scope.dashboard = result;
+                vm.generating = false;
+                vm.dashboard = result;
             });
-    };
+    }
 
-    $scope.reload = function () {
-        $scope.ready = false;
+    function reload() {
+        vm.loading = true;
         modelsBuilderResource.getDashboard().then(function (result) {
-            $scope.dashboard = result;
-            $scope.ready = true;
+            vm.dashboard = result;
+            vm.loading = false;
         });
-    };
+    }
 
     function init() {
-        modelsBuilderResource.getDashboard().then(function(result) {
-            $scope.dashboard = result;
-            $scope.ready = true;
+        vm.loading = true;
+        modelsBuilderResource.getDashboard().then(function (result) {
+            vm.dashboard = result;
+            vm.loading = false;
         });
     }
 
diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.htm b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.htm
deleted file mode 100644
index eeca93bf3a99..000000000000
--- a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<div id="modelsBuilder" ng-controller="Umbraco.Dashboard.ModelsBuilderController">
-
-    <div ng-show="ready" style="float: right;">
-        <button type="button" class="btn" ng-click="reload()"><span>Reload</span></button>
-    </div>
-
-    <h3>Models Builder</h3>
-
-    <div ng-show="!ready">
-        Loading...
-    </div>
-
-    <div ng-show="ready">
-        <div ng-bind-html="dashboard.text"></div>
-
-        <div ng-if="dashboard.outOfDateModels">
-            <p>Models are <strong>out-of-date</strong>.
-            </p>
-        </div>
-
-        <div ng-if="dashboard.canGenerate">
-            <div ng-if="dashboard.generateCausesRestart">
-                <p style="color: red; font-weight: bold;">Generating models will restart the application.</p>
-            </div>
-            <div ng-show="!generating">
-                <button type="button" ng-click="generate()" class="btn btn-danger">
-                    <span>Generate models</span>
-                </button>
-            </div>
-            <div class="umb-loader-wrapper" ng-show="generating">
-                <div class="umb-loader"></div>
-            </div>
-        </div>
-
-        <div ng-if="dashboard.lastError" style="margin-top: 32px;" ng-show="!generating">
-            <span style="color: red; font-weight: bold;">Last generation failed with the following error:</span>
-            <pre style="width: 80%; white-space: pre-line; background: #f8f8f8; padding: 4px; font-size: small;">{{dashboard.lastError}}</pre>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.html b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.html
new file mode 100644
index 000000000000..0c10c33e3964
--- /dev/null
+++ b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.html
@@ -0,0 +1,44 @@
+<div id="modelsBuilder" ng-controller="Umbraco.Dashboard.ModelsBuilderController as vm">
+
+    <umb-box>
+        <umb-box-content>
+
+            <div ng-show="!vm.loading" class="pull-right">
+                <button type="button" class="btn" ng-click="vm.reload()"><span>Reload</span></button>
+            </div>
+
+            <h3 class="bold">Models Builder</h3>
+
+            <umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
+
+            <div ng-show="!vm.loading && vm.dashboard">
+                <div ng-bind-html="vm.dashboard.text"></div>
+
+                <div ng-if="vm.dashboard.outOfDateModels">
+                    <p>Models are <strong>out-of-date</strong>.</p>
+                </div>
+
+                <div ng-if="vm.dashboard.canGenerate">
+                    <div ng-if="vm.dashboard.generateCausesRestart">
+                        <p style="color: red; font-weight: bold;">Generating models will restart the application.</p>
+                    </div>
+                    <div ng-show="!vm.generating">
+                        <button type="button" ng-click="vm.generate()" class="btn btn-danger">
+                            <span>Generate models</span>
+                        </button>
+                    </div>
+                    <div class="umb-loader-wrapper" ng-show="vm.generating">
+                        <div class="umb-loader"></div>
+                    </div>
+                </div>
+
+                <div ng-if="vm.dashboard.lastError" style="margin-top: 32px;" ng-show="!vm.generating">
+                    <span style="color: red; font-weight: bold;">Last generation failed with the following error:</span>
+                    <pre style="width: 80%; white-space: pre-line; background: #f8f8f8; padding: 4px; font-size: small;">{{vm.dashboard.lastError}}</pre>
+                </div>
+            </div>
+
+        </umb-box-content>
+    </umb-box>
+
+</div>
diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/package.manifest b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/package.manifest
index d83523517a31..5e64177046f6 100644
--- a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/package.manifest
+++ b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/package.manifest
@@ -1,7 +1,18 @@
 {
-    //array of files we want to inject into the application on app_start
-    javascript: [
-        '~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js',
-		'~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js'
+    // array of files we want to inject into the application
+    "javascript": [
+        "~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js",
+		"~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js"
+    ],
+
+    // models builder dashboard
+    "dashboards":  [
+        {
+            "alias": "settingsModelsBuilder",
+            "name":  "Models Builder",
+            "view":  "/App_Plugins/ModelsBuilder/modelsbuilder.html",
+            "sections":  [ "settings" ],
+            "weight": 40
+        }
     ]
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7c3293183ddb..245ae7ca94c9 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -105,7 +105,7 @@
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Umbraco.ModelsBuilder.Ui">
-      <Version>8.0.0-alpha.36</Version>
+      <Version>8.0.0-alpha.37</Version>
     </PackageReference>
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>
diff --git a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs b/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
deleted file mode 100644
index 44bc00cb6ff3..000000000000
--- a/src/Umbraco.Web/Dashboards/ModelsBuilderDashboard.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Dashboards;
-
-namespace Umbraco.Web.Dashboards
-{
-    [Weight(40)]
-    public class ModelsBuilderDashboard : IDashboard
-    {
-        public string Alias => "settingsModelsBuilder";
-
-        public string[] Sections => new [] { "settings" };
-
-        public string View => "/App_Plugins/ModelsBuilder/modelsbuilder.htm";
-
-        public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
-    }
-
-
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f9fa29f7db83..1cb2e9a53eae 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -130,7 +130,6 @@
     <Compile Include="Dashboards\HealthCheckDashboard.cs" />
     <Compile Include="Dashboards\MediaDashboard.cs" />
     <Compile Include="Dashboards\MembersDashboard.cs" />
-    <Compile Include="Dashboards\ModelsBuilderDashboard.cs" />
     <Compile Include="Dashboards\PublishedStatusDashboard.cs" />
     <Compile Include="Dashboards\RedirectUrlDashboard.cs" />
     <Compile Include="Dashboards\SettingsDashboards.cs" />

From 29334ed2d56f6ad4099b3f103627f74d9c9536c3 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 7 Feb 2019 12:57:10 +0100
Subject: [PATCH 357/421] Fix ModelsBuilder changes

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

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 245ae7ca94c9..f12ccfcf9956 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -141,7 +141,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.htm" />
+    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.html" />
     <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
     <Content Include="Config\grid.editors.config.js" />
     <Content Include="Config\Lang\cs-CZ.user.xml" />

From 42803ff006d45167ac4e259d53691dd00f4958d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 7 Feb 2019 13:26:23 +0100
Subject: [PATCH 358/421] V8: umb-editor-navigation anchor-dropdown refined,
 remembers last active anchor,

---
 .../components/content/edit.controller.js     | 10 +++--
 .../content/umbtabbedcontent.directive.js     | 39 ++++++++++++++++---
 .../content/umbvariantcontent.directive.js    | 14 ++++---
 .../umbvariantcontenteditors.directive.js     | 11 ++++--
 .../editor/umbeditornavigation.directive.js   |  3 ++
 .../umbeditornavigationitem.directive.js      |  2 +-
 .../umb-editor-navigation-item.less           | 15 +++++--
 .../editor/umb-editor-navigation-item.html    |  2 +-
 8 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index c91683be83a1..6b7b12980900 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -871,6 +871,8 @@
             
             $scope.app = app;
             
+            $scope.$broadcast("editors.apps.appChanged", { app: app });
+            
             if (infiniteMode) {
                 createInfiniteModeButtons($scope.content);
             } else {
@@ -883,13 +885,15 @@
          * @param {any} app
          */
         $scope.appAnchorChanged = function (app, anchor) {
-            
+            /*
+            // This is how it should be done — but because of the current architecture, i had to give the responsibilty to 'activate' the content-app to the menu, cause thats the only place you currently can change the active content-app.
+            // proposal. Make sure that the content-app-menu dosnt do anything. Just make it callback when menu-item are clicked, then make the controller of the view handle what to be done. Then the controller should broadcast a local event, notifying that the current content-app has been changed.
+            // read more on this issue: https://github.com/umbraco/Umbraco-CMS/issues/4467
             if ($scope.app !== app) {
-                console.log("Change app")
                 // TODO: Not working..!!!!!!!!
                 $scope.appChanged(app);
             }
-            
+            */
             //send an event downwards
             $scope.$broadcast("editors.apps.appAnchorChanged", { app: app, anchor: anchor });
             
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index f288d8681d77..c2d2ce5fa9b5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -2,7 +2,7 @@
     'use strict';
 
     /** This directive is used to render out the current variant tabs and properties and exposes an API for other directives to consume  */
-    function tabbedContentDirective() {
+    function tabbedContentDirective($timeout) {
 
         function link($scope, $element, $attrs) {
             
@@ -36,12 +36,30 @@
                 }
                 tab.active = true;
             }
+            function getActiveAnchor() {
+                var i = $scope.content.tabs.length;
+                while(i--) {
+                    if ($scope.content.tabs[i].active === true)
+                        return $scope.content.tabs[i];
+                }
+                return false;
+            }
+            function getScrollPositionFor(id) {
+                if (propertyGroupNodesDictionary[id]) {
+                    return propertyGroupNodesDictionary[id].offsetTop - 20;// currently only relative to closest relatively positioned parent 
+                }
+                return null;
+            }
             function scrollTo(id) {
                 console.log("scrollTo", id);
-                
-                if (propertyGroupNodesDictionary[id]) {
-                    let y = propertyGroupNodesDictionary[id].offsetTop - 20;// currently only relative to closest relatively positioned parent 
-                    
+                var y = getScrollPositionFor(id);
+                if (getScrollPositionFor !== null) {
+                    scrollableNode.scrollTo(0, y);
+                }
+            }
+            function jumpTo(id) {
+                var y = getScrollPositionFor(id);
+                if (getScrollPositionFor !== null) {
                     scrollableNode.scrollTo(0, y);
                 }
             }
@@ -50,6 +68,14 @@
                 propertyGroupNodesDictionary[appAnchor] = element;
             }
             
+            $scope.$on("editors.apps.appChanged", function($event, $args) {
+                // if app changed to this app, then we want to scroll to the current anchor
+                if($args.app.alias === "umbContent") {
+                    var activeAnchor = getActiveAnchor();
+                    $timeout(jumpTo.bind(null, [activeAnchor.id]));
+                }
+            });
+            
             $scope.$on("editors.apps.appAnchorChanged", function($event, $args) {
                 if($args.app.alias === "umbContent") {
                     setActiveAnchor($args.anchor);
@@ -84,7 +110,8 @@
                     if (newValue === true) {
                         $scope.content.isDirty = true;
                     }
-                });
+                }
+            );
         }
 
         var directive = {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
index 9eb4ddee1577..5556308e0623 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
@@ -80,16 +80,20 @@
          * @param {any} item
          */
         function selectApp(item) {
-            // disable the name field if the active content app is not "Content" or "Info"
-            vm.nameDisabled = false;
-            if(item && item.alias !== "umbContent" && item.alias !== "umbInfo") {
-                vm.nameDisabled = true;
-            }
             // call the callback if any is registered
             if(vm.onSelectApp) {
                 vm.onSelectApp({"app": item});
             }
         }
+        
+        $scope.$on("editors.apps.appChanged", function($event, $args) {
+            var app = $args.app;
+            // disable the name field if the active content app is not "Content" or "Info"
+            vm.nameDisabled = false;
+            if(app && app.alias !== "umbContent" && app.alias !== "umbInfo") {
+                vm.nameDisabled = true;
+            }
+        });
 
         /**
          * Used to proxy a callback
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index 0995a137071f..bd21cca5411a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -318,9 +318,6 @@
          * @param {any} app This is the model of the selected app
          */
         function selectApp(app) {
-            if(app && app.alias) {
-                activeAppAlias = app.alias;
-            }
             if(vm.onSelectApp) {
                 vm.onSelectApp({"app": app});
             }
@@ -331,6 +328,14 @@
                 vm.onSelectAppAnchor({"app": app, "anchor": anchor});
             }
         }
+        
+        
+        $scope.$on("editors.apps.appChanged", function($event, $args) {
+            var app = $args.app;
+            if(app && app.alias) {
+                activeAppAlias = app.alias;
+            }
+        });
 
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
index 34810f17dd91..31976118fd61 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
@@ -32,6 +32,9 @@
                 if(scope.onAnchorSelect) {
                     scope.onAnchorSelect({"item": item, "anchor": anchor});
                 }
+                if (item.active !== true) {
+                    scope.openNavigationItem(item);
+                }
             };
 
             scope.toggleDropdown = function () {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
index abb685807b8d..8ebee7d15c9a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
@@ -48,7 +48,7 @@ Use this directive to render tab content. For an example see: {@link umbraco.dir
         
         vm.mouseOut = function() {
             clearTimeout(vm.mouseOutDelay);
-            vm.mouseOutDelay = setTimeout(hideDropdownBind, 1000);
+            vm.mouseOutDelay = setTimeout(hideDropdownBind, 500);
         }
         
         
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
index faa4ff40b082..673de62b3620 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -1,5 +1,6 @@
 .umb-sub-views-nav-item {
     position: relative;
+    display: block;
 }
 .umb-sub-views-nav-item > a {
   text-align: center;
@@ -36,6 +37,9 @@
   }
 }
 
+.umb-sub-views-nav-item > a:active {
+  .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+}
 .umb-sub-views-nav-item > a:focus {
   outline: none;
 }
@@ -101,6 +105,12 @@
 
 .umb-sub-views-nav-item__anchor_dropdown {// inherits from .dropdown-menu
     display: none;
+    margin: 0;
+    
+    // center align horizontal
+    left: 50%;
+    transform: translateX(-50%);
+    
     &.show {
         display: block;
     }
@@ -111,9 +121,8 @@
 .umb-sub-views-nav-item__anchor_dropdown li.is-active a {
     border-left-color: @ui-selected-border;
 }
-.umb-sub-views-nav-item__anchor_dropdown li:hover.is-active a {
-    border-left-color: @ui-selected-border-hover;
-}
+
+.umb-sub-views-nav-item 
 
 
 // --------------------------------
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
index 848985239c38..90408e00ccba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
@@ -11,7 +11,7 @@
 </a>
 
 <ul class="dropdown-menu umb-sub-views-nav-item__anchor_dropdown" ng-class="{'show': vm.showDropdown}">
-    <li ng-repeat="anchor in vm.item.anchors" ng-class="{'is-active': anchor.active}">
+    <li ng-repeat="anchor in vm.item.anchors" ng-class="{'is-active': vm.item.active && anchor.active}">
         <a href="" ng-click="vm.anchorClicked(anchor, $event)">
             {{anchor.label}}
         </a>

From 0b19eab5a95ff6782952595e522047aec1f5f9ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 7 Feb 2019 13:59:20 +0100
Subject: [PATCH 359/421] umb-group-panel for umbtabbedcontent

---
 .../content/umbtabbedcontent.directive.js     | 11 +++++-----
 src/Umbraco.Web.UI.Client/src/less/belle.less |  1 +
 .../less/components/html/umb-group-panel.less | 20 +++++++++++++++++++
 .../umb-editor-navigation-item.less           |  3 +--
 .../content/umb-tabbed-content.html           |  6 +++---
 5 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index c2d2ce5fa9b5..8a8e8d50dd42 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -30,11 +30,13 @@
                 
             }
             function setActiveAnchor(tab) {
-                var i = $scope.content.tabs.length;
-                while(i--) {
-                    $scope.content.tabs[i].active = false;
+                if (tab.active !== true) {
+                    var i = $scope.content.tabs.length;
+                    while(i--) {
+                        $scope.content.tabs[i].active = false;
+                    }
+                    tab.active = true;
                 }
-                tab.active = true;
             }
             function getActiveAnchor() {
                 var i = $scope.content.tabs.length;
@@ -51,7 +53,6 @@
                 return null;
             }
             function scrollTo(id) {
-                console.log("scrollTo", id);
                 var y = getScrollPositionFor(id);
                 if (getScrollPositionFor !== null) {
                     scrollableNode.scrollTo(0, y);
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index db45755e5c10..db0b64daa446 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -91,6 +91,7 @@
 @import "components/application/umb-dashboard.less";
 
 @import "components/html/umb-expansion-panel.less";
+@import "components/html/umb-group-panel.less";
 @import "components/html/umb-alert.less";
 
 @import "components/tree/umb-tree.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less
new file mode 100644
index 000000000000..0e03af213f91
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less
@@ -0,0 +1,20 @@
+.umb-group-panel {
+    background: @white;
+    border-radius: 3px;
+    margin-bottom: 16px;
+    box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.16);
+}
+
+.umb-group-panel__header {
+    padding: 10px 20px;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    color: @black;
+}
+
+.umb-group-panel__content {
+    padding: 20px;
+    border-top: 1px solid @gray-9;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
index 673de62b3620..517ccfd295f8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -106,6 +106,7 @@
 .umb-sub-views-nav-item__anchor_dropdown {// inherits from .dropdown-menu
     display: none;
     margin: 0;
+    overflow: hidden;
     
     // center align horizontal
     left: 50%;
@@ -122,8 +123,6 @@
     border-left-color: @ui-selected-border;
 }
 
-.umb-sub-views-nav-item 
-
 
 // --------------------------------
 // item__more, appears when there is not enough room for the visible items.
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index be768db497ed..b76c74149d1e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -1,12 +1,12 @@
 <div>
     <ng-form name="tabbedContentForm">
-        <div class="umb-expansion-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
+        <div class="umb-group-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
 
-            <div class="umb-expansion-panel__header">
+            <div class="umb-group-panel__header">
                 <div>{{ group.label }}</div>
             </div>
 
-            <div class="umb-expansion-panel__content">
+            <div class="umb-group-panel__content">
                 <umb-property
                     data-element="property-{{property.alias}}"
                     ng-repeat="property in group.properties track by property.alias"

From df53b93ae013a022d649d7c940deeca53de123f5 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 7 Feb 2019 13:59:43 +0100
Subject: [PATCH 360/421] Fix nuspec

---
 build/NuSpecs/UmbracoCms.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 5e6dccfcd86c..ee0764bdd3f5 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -25,7 +25,7 @@
                   not want this to happen as the alpha of the next major is, really, the next major already.
                 -->
                 <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.36]" />
+                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.37]" />
                 <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
                 <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
                 <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />

From 5c8fad330ea4608d938e7332029f7e130936687e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 7 Feb 2019 15:10:31 +0100
Subject: [PATCH 361/421] motion added for umb-editor-navigation-item
 anchor-dropdown

---
 .../content/umbtabbedcontent.directive.js     | 24 ++++++++++++++--
 .../umbeditornavigationitem.directive.js      | 28 -------------------
 .../umb-editor-navigation-item.less           | 15 +++++++---
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index 8a8e8d50dd42..deb799580fef 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -13,6 +13,7 @@
             
             var scrollableNode = appRootNode.closest(".umb-scrollable");
             scrollableNode.addEventListener("scroll", onScroll);
+            scrollableNode.addEventListener("mousehweel", cancelScrollTween);
             
             function onScroll(event) {
                 
@@ -21,7 +22,6 @@
                 for(var i in $scope.content.tabs) {
                     var group = $scope.content.tabs[i];
                     var node = propertyGroupNodesDictionary[group.id];
-                    //console.log(node.offsetTop, node.offsetTop + node.clientHeight)
                     if (viewFocusY >= node.offsetTop && viewFocusY <= node.offsetTop + node.clientHeight) {
                         setActiveAnchor(group);
                         return;
@@ -29,6 +29,7 @@
                 }
                 
             }
+            
             function setActiveAnchor(tab) {
                 if (tab.active !== true) {
                     var i = $scope.content.tabs.length;
@@ -55,15 +56,34 @@
             function scrollTo(id) {
                 var y = getScrollPositionFor(id);
                 if (getScrollPositionFor !== null) {
-                    scrollableNode.scrollTo(0, y);
+                    
+                    var viewportHeight = scrollableNode.clientHeight;
+                    var from = scrollableNode.scrollTop;
+                    var to = Math.min(y, scrollableNode.scrollHeight - viewportHeight);
+                    
+                    var animeObject = {_y: from};
+                    $scope.scrollTween = anime({
+                        targets: animeObject,
+                        _y: to,
+                        easing: 'easeOutExpo',
+                        duration: 200 + Math.min(Math.abs(to-from)/viewportHeight*100, 400),
+                        update: () => {
+                            scrollableNode.scrollTo(0, animeObject._y);
+                        }
+                    });
+
                 }
             }
             function jumpTo(id) {
                 var y = getScrollPositionFor(id);
                 if (getScrollPositionFor !== null) {
+                    cancelScrollTween();
                     scrollableNode.scrollTo(0, y);
                 }
             }
+            function cancelScrollTween() {
+                $scope.scrollTween.pause();
+            }
             
             $scope.registerPropertyGroup = function(element, appAnchor) {
                 propertyGroupNodesDictionary[appAnchor] = element;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
index 8ebee7d15c9a..9473d3c31ea8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
@@ -17,14 +17,8 @@ Use this directive to render tab content. For an example see: {@link umbraco.dir
         
         var vm = this;
         
-        vm.showDropdown = false;
-        
         vm.clicked = function() {
             vm.onOpen({item:vm.item});
-            
-            //vm.mouseOver();// help touch users get the dropdown.
-            clearTimeout(vm.mouseOutDelay);
-            vm.showDropdown = true;
         };
         
         vm.anchorClicked = function(anchor, $event) {
@@ -34,32 +28,10 @@ Use this directive to render tab content. For an example see: {@link umbraco.dir
             $event.preventDefault();
         };
         
-        vm.mouseOver = function() {
-            clearTimeout(vm.mouseOutDelay);
-            vm.showDropdown = true;
-            $scope.$digest();
-        }
-        
-        var hideDropdown = function() {
-            vm.showDropdown = false;
-            $scope.$digest();
-        }
-        var hideDropdownBind = hideDropdown.bind(vm);
-        
-        vm.mouseOut = function() {
-            clearTimeout(vm.mouseOutDelay);
-            vm.mouseOutDelay = setTimeout(hideDropdownBind, 500);
-        }
-        
-        
-        
         var componentNode = $element[0];
         
         componentNode.classList.add('umb-sub-views-nav-item');
         
-        componentNode.addEventListener('mouseover', vm.mouseOver.bind(vm));
-        componentNode.addEventListener('mouseout', vm.mouseOut.bind(vm));
-        
     }
     
     angular
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
index 517ccfd295f8..0372eeef4b27 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -104,7 +104,7 @@
 
 
 .umb-sub-views-nav-item__anchor_dropdown {// inherits from .dropdown-menu
-    display: none;
+    display: block;
     margin: 0;
     overflow: hidden;
     
@@ -112,9 +112,9 @@
     left: 50%;
     transform: translateX(-50%);
     
-    &.show {
-        display: block;
-    }
+    visibility:hidden;
+    opacity: 0;
+    transition: visibility 0s 500ms, opacity 250ms 250ms;
 }
 .umb-sub-views-nav-item__anchor_dropdown li a {
     border-left: 4px solid transparent;
@@ -123,6 +123,13 @@
     border-left-color: @ui-selected-border;
 }
 
+.umb-sub-views-nav-item:hover .umb-sub-views-nav-item__anchor_dropdown {
+    visibility:visible;
+    opacity: 1;
+    transition: visibility 0s 0s, opacity 20ms 0s;
+}
+
+
 
 // --------------------------------
 // item__more, appears when there is not enough room for the visible items.

From 1095948c270d0e652a53a76678b0cc0f5840bcc0 Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Thu, 7 Feb 2019 15:44:17 +0100
Subject: [PATCH 362/421] Sets prop's prefixed with "$" to undefined.

---
 .../donotpostdollarvariablesrequest.interceptor.js            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
index 1bae002df9b9..eabb61132042 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
@@ -5,11 +5,11 @@
         for (var property in obj) {
             if (obj.hasOwnProperty(property)) {
                 
-                if (property.startsWith(propertyPrefix) && obj[property]) {
+                if (property.startsWith(propertyPrefix) && obj[property] !== undefined) {
                     obj[property] = undefined;
                 }
                 
-                if (typeof obj[property] == "object") {
+                if (typeof obj[property] === "object") {
                     removeProperty(obj[property], propertyPrefix);
                 }
             }

From b08218240c187594eef131b0d8c878c89cc188cb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Feb 2019 10:26:21 +1100
Subject: [PATCH 363/421] updates package json ... lets see how the build
 server does with the new build

---
 src/Umbraco.Web.UI.Client/package-lock.json | 466 ++++++++++++++------
 1 file changed, 337 insertions(+), 129 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 4c796ab2a7ac..207eba38c528 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -937,7 +937,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -955,7 +955,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1104,6 +1104,7 @@
       "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0"
       },
@@ -1112,7 +1113,8 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -1170,7 +1172,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
       "dev": true
     },
     "array-sort": {
@@ -1216,7 +1218,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
       "dev": true
     },
     "asap": {
@@ -1269,7 +1271,7 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
       "dev": true
     },
     "asynckit": {
@@ -1523,6 +1525,7 @@
       "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -1745,7 +1748,8 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -1764,6 +1768,7 @@
       "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
       "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.1.0",
         "readable-stream": "^2.0.2",
@@ -1775,19 +1780,22 @@
           "version": "3.9.0",
           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -1803,6 +1811,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -1811,13 +1820,15 @@
           "version": "2.0.3",
           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "vinyl": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -1938,7 +1949,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "caseless": {
       "version": "0.12.0",
@@ -1951,6 +1963,7 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
       "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-proxy": "^1.0.1",
         "is-obj": "^1.0.0",
@@ -1962,7 +1975,8 @@
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -2223,7 +2237,8 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
       "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
       "version": "2.0.1",
@@ -2319,6 +2334,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2382,7 +2398,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2462,7 +2478,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
     "continuable-cache": {
@@ -2505,7 +2521,7 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
       "dev": true
     },
     "core-util-is": {
@@ -2531,6 +2547,7 @@
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "capture-stack-trace": "^1.0.0"
       }
@@ -2785,6 +2802,7 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
       "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-to-vinyl": "^1.0.0",
         "concat-stream": "^1.4.6",
@@ -2802,6 +2820,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -2810,13 +2829,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -2828,6 +2849,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -2837,6 +2859,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2846,6 +2869,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -2859,6 +2883,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -2874,13 +2899,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -2892,13 +2919,15 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -2910,19 +2939,22 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -2931,13 +2963,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2947,6 +2981,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -2967,13 +3002,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -2984,6 +3021,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -2999,6 +3037,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3008,6 +3047,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3017,6 +3057,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3027,6 +3068,7 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3037,6 +3079,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3049,6 +3092,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3060,6 +3104,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3087,6 +3132,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
       "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-tar": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3100,19 +3146,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3125,6 +3174,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3135,6 +3185,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3147,6 +3198,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
       "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-bzip2": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3161,19 +3213,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3186,6 +3241,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3196,6 +3252,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3208,6 +3265,7 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
       "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-gzip": "^1.0.0",
         "object-assign": "^2.0.0",
@@ -3221,19 +3279,22 @@
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
           "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3246,6 +3307,7 @@
           "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -3256,6 +3318,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^0.2.0",
             "clone-stats": "^0.0.1"
@@ -3268,6 +3331,7 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
       "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-zip": "^1.0.0",
         "read-all-stream": "^3.0.0",
@@ -3283,6 +3347,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3295,7 +3360,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3428,7 +3494,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3494,6 +3560,7 @@
       "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
       "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "caw": "^1.0.1",
         "concat-stream": "^1.4.7",
@@ -3517,6 +3584,7 @@
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-flatten": "^1.0.1"
           }
@@ -3525,13 +3593,15 @@
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -3543,6 +3613,7 @@
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-posix-bracket": "^0.1.0"
           }
@@ -3552,6 +3623,7 @@
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3561,6 +3633,7 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inflight": "^1.0.4",
             "inherits": "2",
@@ -3574,6 +3647,7 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
           "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
           "dev": true,
+          "optional": true,
           "requires": {
             "extend": "^3.0.0",
             "glob": "^5.0.3",
@@ -3589,13 +3663,15 @@
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "readable-stream": {
               "version": "1.0.34",
               "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.1",
@@ -3607,13 +3683,15 @@
               "version": "0.10.31",
               "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "through2": {
               "version": "0.6.5",
               "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "readable-stream": ">=1.0.33-1 <1.1.0-0",
                 "xtend": ">=4.0.0 <4.1.0-0"
@@ -3625,19 +3703,22 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
           "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -3646,13 +3727,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3662,6 +3745,7 @@
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -3682,13 +3766,15 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ordered-read-streams": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
           "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-stream": "^1.0.1",
             "readable-stream": "^2.0.1"
@@ -3699,6 +3785,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3714,6 +3801,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3723,6 +3811,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -3732,6 +3821,7 @@
           "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
           "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "first-chunk-stream": "^1.0.0",
             "strip-bom": "^2.0.0"
@@ -3742,6 +3832,7 @@
           "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
           "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
           "dev": true,
+          "optional": true,
           "requires": {
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "through2-filter": "^3.0.0"
@@ -3752,6 +3843,7 @@
               "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
               "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
               "dev": true,
+              "optional": true,
               "requires": {
                 "through2": "~2.0.0",
                 "xtend": "~4.0.0"
@@ -3764,6 +3856,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -3775,6 +3868,7 @@
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
           "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "duplexify": "^3.2.0",
             "glob-stream": "^5.3.2",
@@ -3817,6 +3911,7 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -3829,6 +3924,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -3837,13 +3933,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3853,6 +3951,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3868,6 +3967,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3879,6 +3979,7 @@
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
       "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
@@ -3888,7 +3989,8 @@
           "version": "1.1.0",
           "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
           "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3956,7 +4058,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -3992,7 +4094,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4156,7 +4258,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
           "optional": true
         }
@@ -4251,7 +4353,7 @@
     "eslint-scope": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4261,13 +4363,13 @@
     "eslint-utils": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
-      "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
       "dev": true
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
       "dev": true
     },
     "espree": {
@@ -4290,7 +4392,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4299,7 +4401,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4359,7 +4461,7 @@
     "eventemitter3": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
       "dev": true
     },
     "exec-buffer": {
@@ -4574,7 +4676,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -4828,6 +4930,7 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4875,13 +4978,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
       "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "filenamify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
       "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
@@ -5128,7 +5233,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5192,7 +5298,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5213,12 +5320,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5233,17 +5342,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5360,7 +5472,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5372,6 +5485,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5386,6 +5500,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5393,12 +5508,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5417,6 +5534,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5497,7 +5615,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5509,6 +5628,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5594,7 +5714,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5630,6 +5751,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5649,6 +5771,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5692,12 +5815,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5733,6 +5858,7 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
       "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
       "dev": true,
+      "optional": true,
       "requires": {
         "rc": "^1.1.2"
       }
@@ -5894,7 +6020,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6039,6 +6165,7 @@
       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "create-error-class": "^3.0.1",
         "duplexer2": "^0.1.4",
@@ -6062,6 +6189,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -6070,19 +6198,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
+          "optional": true,
           "requires": {
             "error-ex": "^1.2.0"
           }
@@ -6092,6 +6223,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6107,6 +6239,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6126,7 +6259,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6422,6 +6556,7 @@
       "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
       "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "archive-type": "^3.0.0",
         "decompress": "^3.0.0",
@@ -6433,13 +6568,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -6455,6 +6592,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -6464,7 +6602,7 @@
     "gulp-eslint": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
+      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
       "dev": true,
       "requires": {
         "eslint": "^5.0.1",
@@ -7072,6 +7210,7 @@
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
       "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "convert-source-map": "^1.1.1",
         "graceful-fs": "^4.1.2",
@@ -7084,13 +7223,15 @@
           "version": "4.1.15",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
           "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
           "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-utf8": "^0.2.0"
           }
@@ -7100,6 +7241,7 @@
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -7418,7 +7560,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7569,7 +7711,7 @@
     "http-proxy": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
         "eventemitter3": "^3.0.0",
@@ -7863,7 +8005,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -7930,7 +8072,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
       "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -8065,7 +8208,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-jpg": {
       "version": "1.0.1",
@@ -8078,7 +8222,8 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
       "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -8144,7 +8289,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -8158,7 +8304,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -8167,14 +8313,15 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
     "is-retry-allowed": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -8204,7 +8351,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
       "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -8215,7 +8363,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8225,7 +8373,8 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -8237,7 +8386,8 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
       "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -8255,7 +8405,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
       "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "isarray": {
       "version": "0.0.1",
@@ -8372,7 +8523,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -8499,7 +8650,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -8576,6 +8727,7 @@
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.0.5"
       },
@@ -8584,13 +8736,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -8606,6 +8760,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -8911,7 +9066,8 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lodash.isobject": {
       "version": "2.4.1",
@@ -9108,7 +9264,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -9149,7 +9306,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -9330,7 +9487,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
     "minimatch": {
@@ -9504,7 +9661,8 @@
       "version": "1.0.0",
       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node.extend": {
       "version": "1.1.8",
@@ -12554,7 +12712,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "p-pipe": {
       "version": "1.2.0",
@@ -12858,7 +13017,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
       "dev": true
     },
     "posix-character-classes": {
@@ -13265,7 +13424,8 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "preserve": {
       "version": "0.2.0",
@@ -13348,7 +13508,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
       "dev": true
     },
     "qs": {
@@ -13397,6 +13557,7 @@
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -13409,6 +13570,7 @@
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pinkie-promise": "^2.0.0",
         "readable-stream": "^2.0.0"
@@ -13418,13 +13580,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -13440,6 +13604,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -13544,7 +13709,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -14042,7 +14207,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
     "sax": {
@@ -14056,6 +14221,7 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
+      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14201,7 +14367,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "set-value": {
       "version": "2.0.0",
@@ -14229,7 +14396,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true
     },
     "shebang-command": {
@@ -14519,7 +14686,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14706,7 +14873,8 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
       "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "static-extend": {
       "version": "0.1.2",
@@ -14750,6 +14918,7 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -14760,6 +14929,7 @@
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
           "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
+          "optional": true,
           "requires": {
             "readable-stream": "^2.0.2"
           }
@@ -14768,13 +14938,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14790,6 +14962,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14799,19 +14972,20 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
+      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
       "dev": true
     },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
       "dev": true,
       "requires": {
         "date-format": "^1.2.0",
@@ -14838,7 +15012,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -14853,7 +15027,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -14870,7 +15044,7 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
@@ -14984,6 +15158,7 @@
       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0",
         "get-stdin": "^4.0.1",
@@ -14997,13 +15172,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15017,6 +15194,7 @@
           "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
           "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-relative": "^0.1.0"
           }
@@ -15025,13 +15203,15 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
           "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -15062,6 +15242,7 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15095,6 +15276,7 @@
       "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "chalk": "^1.0.0"
       },
@@ -15103,13 +15285,15 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -15122,7 +15306,8 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -15184,6 +15369,7 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15199,6 +15385,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "once": "^1.4.0"
           }
@@ -15207,13 +15394,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -15223,6 +15412,7 @@
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15238,6 +15428,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15336,6 +15527,7 @@
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -15360,7 +15552,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "timsort": {
       "version": "0.3.0",
@@ -15412,7 +15605,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15423,6 +15616,7 @@
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
       "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1"
       },
@@ -15432,6 +15626,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -15448,7 +15643,8 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15527,6 +15723,7 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15576,7 +15773,7 @@
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -15618,7 +15815,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
       "dev": true
     },
     "unc-path-regex": {
@@ -15775,18 +15972,19 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -15803,6 +16001,7 @@
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
+      "optional": true,
       "requires": {
         "prepend-http": "^1.0.1"
       }
@@ -15888,7 +16087,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
       "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -15933,6 +16133,7 @@
       "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
       "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.0"
@@ -15942,19 +16143,22 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15970,6 +16174,7 @@
           "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -16109,6 +16314,7 @@
       "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
       "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
       "dev": true,
+      "optional": true,
       "requires": {
         "wrap-fn": "^0.1.0"
       }
@@ -16199,6 +16405,7 @@
       "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "co": "3.1.0"
       }
@@ -16221,7 +16428,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",
@@ -16296,6 +16503,7 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"

From ccaaa9ab935d054a80d3753254ce73f25e0d75c3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Feb 2019 16:00:02 +1100
Subject: [PATCH 364/421] Ensures everything doesn't explode if a non-found
 property editor alias exists in the db

---
 .../Persistence/Factories/DataTypeFactory.cs             | 9 +++++++--
 .../Repositories/Implement/DataTypeRepository.cs         | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/DataTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/DataTypeFactory.cs
index 01b0e59a1de8..5a677d219c8e 100644
--- a/src/Umbraco.Core/Persistence/Factories/DataTypeFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/DataTypeFactory.cs
@@ -2,6 +2,7 @@
 using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.PropertyEditors;
@@ -10,10 +11,14 @@ namespace Umbraco.Core.Persistence.Factories
 {
     internal static class DataTypeFactory
     {
-        public static IDataType BuildEntity(DataTypeDto dto, PropertyEditorCollection editors)
+        public static IDataType BuildEntity(DataTypeDto dto, PropertyEditorCollection editors, ILogger logger)
         {
             if (!editors.TryGet(dto.EditorAlias, out var editor))
-                throw new InvalidOperationException($"Could not find an editor with alias \"{dto.EditorAlias}\".");
+            {
+                logger.Warn(typeof(DataTypeFactory), "Could not find an editor with alias {dto.EditorAlias}, converting to label", dto.EditorAlias);
+                //convert to label
+                editor = new LabelPropertyEditor(logger);
+            }
 
             var dataType = new DataType(editor);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
index 3de9e3c99ba2..02ba4d1c1356 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
@@ -54,7 +54,7 @@ protected override IEnumerable<IDataType> PerformGetAll(params int[] ids)
             }
 
             var dtos = Database.Fetch<DataTypeDto>(dataTypeSql);
-            return dtos.Select(x => DataTypeFactory.BuildEntity(x, _editors.Value)).ToArray();
+            return dtos.Select(x => DataTypeFactory.BuildEntity(x, _editors.Value, Logger)).ToArray();
         }
 
         protected override IEnumerable<IDataType> PerformGetByQuery(IQuery<IDataType> query)
@@ -65,7 +65,7 @@ protected override IEnumerable<IDataType> PerformGetByQuery(IQuery<IDataType> qu
 
             var dtos = Database.Fetch<DataTypeDto>(sql);
 
-            return dtos.Select(x => DataTypeFactory.BuildEntity(x, _editors.Value)).ToArray();
+            return dtos.Select(x => DataTypeFactory.BuildEntity(x, _editors.Value, Logger)).ToArray();
         }
 
         #endregion

From 63b3c06b3a3a80dbbd51f79611564b4cdd115df5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Feb 2019 16:00:59 +1100
Subject: [PATCH 365/421] Ensures the correct DefaultConfiguration values are
 specified for any editor that is actively overriding ToValueEditor and
 setting these values there

---
 .../PropertyEditors/ContentPickerConfigurationEditor.cs   | 7 +++++++
 .../PropertyEditors/DateConfigurationEditor.cs            | 5 +++++
 .../PropertyEditors/DateTimeConfigurationEditor.cs        | 5 +++++
 .../PropertyEditors/MediaPickerConfigurationEditor.cs     | 7 ++++++-
 .../PropertyEditors/MultiNodePickerConfigurationEditor.cs | 8 ++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
index 5be97e5f7639..00ad7e632757 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
@@ -12,6 +12,13 @@ public ContentPickerConfigurationEditor()
                 .Config = new Dictionary<string, object> { { "idType", "udi" } };
         }
 
+        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
+        {
+            ["idType"] = "udi",
+            ["showEditButton"] = false,
+            ["showPathOnHover"] = false,
+        };
+
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             // these are not configuration fields, but constants required by the value editor
diff --git a/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
index b0839c51574a..9e20a7a30597 100644
--- a/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
@@ -8,6 +8,11 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class DateConfigurationEditor : ConfigurationEditor<DateConfiguration>
     {
+        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
+        {
+            ["pickTime"] = false,
+        };
+
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
index 494d8814f48b..882400a25eca 100644
--- a/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
@@ -8,6 +8,11 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class DateTimeConfigurationEditor : ConfigurationEditor<DateTimeConfiguration>
     {
+        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
+        {
+            ["pickTime"] = true,
+        };
+
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
index e810a65fb6e0..c7c3b1087c66 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
@@ -20,6 +20,11 @@ public MediaPickerConfigurationEditor()
                 };
         }
 
+        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
+        {
+            ["idType"] = "udi"
+        };
+
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
@@ -27,4 +32,4 @@ public override IDictionary<string, object> ToValueEditor(object configuration)
             return d;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
index 75fe581d5b12..96cdbe5dc1e9 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
@@ -28,6 +28,14 @@ public override Dictionary<string, object> ToConfigurationEditor(MultiNodePicker
             return output;
         }
 
+        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
+        {
+            ["multiPicker"] = true,
+            ["showEditButton"] = false,
+            ["showPathOnHover"] = false,
+            ["idType"] = "udi"
+        };
+
         /// <inheritdoc />
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {

From 40097c441a200b9edadf42e2c87fca19af6189f1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Feb 2019 16:07:03 +1100
Subject: [PATCH 366/421] Ensure the same logic for property editors is
 executed for parameter editors to get the final configuration object

---
 src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
index 3e0f6c733715..de649a09d83f 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
@@ -45,8 +45,9 @@ public MacroMapperProfile()
                     }
 
                     parameter.View = paramEditor.GetValueEditor().View;
+                    var paramConfig = paramEditor.GetConfigurationEditor().ToValueEditor(paramEditor.DefaultConfiguration);
                     //set the config
-                    parameter.Configuration = paramEditor.DefaultConfiguration;
+                    parameter.Configuration = paramConfig;
                 });
         }
     }

From 964447d54673adced8c8447eac5e81263abe99a2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Feb 2019 16:08:29 +1100
Subject: [PATCH 367/421] fixes up the web.config view file with the right mvc
 version

---
 src/Umbraco.Web.UI/Views/Web.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/Views/Web.config b/src/Umbraco.Web.UI/Views/Web.config
index c137c3705e8b..efd80424e50e 100644
--- a/src/Umbraco.Web.UI/Views/Web.config
+++ b/src/Umbraco.Web.UI/Views/Web.config
@@ -9,7 +9,7 @@
     </configSections>
 
     <system.web.webPages.razor>
-        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
         <pages pageBaseType="System.Web.Mvc.WebViewPage">
             <namespaces>
                 <add namespace="System.Web.Mvc" />
@@ -41,7 +41,7 @@
     <system.web>
         <compilation targetFramework="4.7.2">
             <assemblies>
-                <add assembly="System.Web.Mvc, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
 
                 <!--
                     Views are compiled by the Microsoft.CodeDom.Providers.DotNetCompilerPlatform which uses the Roslyn compiler

From 73ce546f0c210cd411a5972ca6273e8b63589c28 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Feb 2019 16:12:30 +1100
Subject: [PATCH 368/421] ensures idType in JS is always udi by default instead
 of int

---
 .../src/views/prevalueeditors/mediapicker.controller.js       | 2 +-
 .../src/views/prevalueeditors/treepicker.controller.js        | 2 +-
 .../src/views/prevalueeditors/treesource.controller.js        | 4 ++--
 .../propertyeditors/contentpicker/contentpicker.controller.js | 2 +-
 .../propertyeditors/relatedlinks/relatedlinks.controller.js   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
index 89878e375020..42582290427b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
@@ -18,7 +18,7 @@ function mediaPickerController($scope, entityResource, iconHelper, editorService
         entityType: "Media",
         section: "media",
         treeAlias: "media",
-        idType: "int"
+        idType: "udi"
     };
 
     //combine the dialogOptions with any values returned from the server
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
index 3de4611ca265..951b76193fb7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
@@ -16,7 +16,7 @@ angular.module('umbraco')
             entityType: "Document",
             type: "content",
             treeAlias: "content",
-            idType: "int"
+            idType: "udi"
         };
 
         //combine the config with any values returned from the server
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index 166e86a5825c..ba8902a01742 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -15,7 +15,7 @@ angular.module('umbraco')
         }
         if (!$scope.model.config) {
             $scope.model.config = {
-                idType: "int"
+                idType: "udi"
             };
         }
 
@@ -76,4 +76,4 @@ angular.module('umbraco')
 				$scope.node = item;
                 $scope.model.value.id = $scope.model.config.idType === "udi" ? item.udi : item.id;
 		}
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 8b5915026c1a..15a1526b9fbb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -144,7 +144,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         },
         treeAlias: $scope.model.config.startNode.type,
         section: $scope.model.config.startNode.type,
-        idType: "int",
+        idType: "udi",
         //only show the lang selector for content
         showLanguageSelector: $scope.model.config.startNode.type === "content"
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
index 78da1f482d70..d54a17e15a2e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
@@ -47,7 +47,7 @@
                     section: "content",
                     treeAlias: "content",
                     multiPicker: false,
-                    idType: $scope.model.config.idType ? $scope.model.config.idType : "int",
+                    idType: $scope.model.config.idType ? $scope.model.config.idType : "udi",
                     submit: function (model) {
                         select(model.selection[0]);
                         editorService.close();

From 88b0dccfa100cf15b4d8b6f25c800f30ba993e45 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 8 Feb 2019 08:50:57 +0100
Subject: [PATCH 369/421] Fix TreeEntityPath

---
 src/Umbraco.Core/Models/Entities/TreeEntityPath.cs       | 9 ---------
 .../Repositories/Implement/EntityRepository.cs           | 7 ++++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs b/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs
index adbb0d9a3931..54142a75275c 100644
--- a/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs
+++ b/src/Umbraco.Core/Models/Entities/TreeEntityPath.cs
@@ -14,14 +14,5 @@ public class TreeEntityPath
         /// Gets or sets the path of the entity.
         /// </summary>
         public string Path { get; set; }
-
-        /// <summary>
-        /// Proxy of the Id
-        /// </summary>
-        public int NodeId
-        {
-            get => Id;
-            set => Id = value;
-        }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 85912694f029..5321e45f2418 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -69,7 +69,7 @@ public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> qu
             var page = Database.Page<BaseDto>(pageIndex + 1, pageSize, sql);
             var dtos = page.Items;
             var entities = dtos.Select(x => BuildEntity(isContent, isMedia, x)).ToArray();
-            
+
             if (isContent)
                 BuildVariants(entities.Cast<DocumentEntitySlim>());
 
@@ -198,7 +198,8 @@ public IEnumerable<TreeEntityPath> GetAllPaths(Guid objectType, params Guid[] ke
 
         private IEnumerable<TreeEntityPath> PerformGetAllPaths(Guid objectType, Action<Sql<ISqlContext>> filter = null)
         {
-            var sql = Sql().Select<NodeDto>(x => x.NodeId, x => x.Path).From<NodeDto>().Where<NodeDto>(x => x.NodeObjectType == objectType);
+            // NodeId is named Id on TreeEntityPath = use an alias
+            var sql = Sql().Select<NodeDto>(x => Alias(x.NodeId, "Id"), x => x.Path).From<NodeDto>().Where<NodeDto>(x => x.NodeObjectType == objectType);
             filter?.Invoke(sql);
             return Database.Fetch<TreeEntityPath>(sql);
         }
@@ -405,7 +406,7 @@ private Sql<ISqlContext> GetPropertyData(IEnumerable<int> versionIds)
                 .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((left, right) => left.DataTypeId == right.NodeId)
                 .WhereIn<PropertyDataDto>(x => x.VersionId, versionIds)
                 .OrderBy<PropertyDataDto>(x => x.VersionId);
-        }      
+        }
 
         // gets the base SELECT + FROM [+ filter] sql
         // always from the 'current' content version

From e5a27a21089dcca342ef9d5de445c06155bb8b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 8 Feb 2019 09:39:01 +0100
Subject: [PATCH 370/421] removed misleading documentation

---
 .../editor/umbeditornavigationitem.directive.js      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
index 9473d3c31ea8..1d5bfb552a06 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
@@ -1,15 +1,3 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTabContent
-@restrict E
-@scope
-
-@description
-Use this directive to render tab content. For an example see: {@link umbraco.directives.directive:umbTabContent umbTabContent}
-
-@param {string=} tab The tab.
-
-**/
 (function () {
     'use strict';
     

From 14db9da57c4bb92b66d3893889f4215ab3951a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 8 Feb 2019 09:45:33 +0100
Subject: [PATCH 371/421] removed proposal comment

---
 .../directives/components/content/edit.controller.js   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 6b7b12980900..b1ce4a266cfe 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -885,18 +885,8 @@
          * @param {any} app
          */
         $scope.appAnchorChanged = function (app, anchor) {
-            /*
-            // This is how it should be done — but because of the current architecture, i had to give the responsibilty to 'activate' the content-app to the menu, cause thats the only place you currently can change the active content-app.
-            // proposal. Make sure that the content-app-menu dosnt do anything. Just make it callback when menu-item are clicked, then make the controller of the view handle what to be done. Then the controller should broadcast a local event, notifying that the current content-app has been changed.
-            // read more on this issue: https://github.com/umbraco/Umbraco-CMS/issues/4467
-            if ($scope.app !== app) {
-                // TODO: Not working..!!!!!!!!
-                $scope.appChanged(app);
-            }
-            */
             //send an event downwards
             $scope.$broadcast("editors.apps.appAnchorChanged", { app: app, anchor: anchor });
-            
         };
 
         // methods for infinite editing

From 065cc69f51b3828dc8de1a1dbeb5d38def7eb85f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 8 Feb 2019 09:45:36 +0100
Subject: [PATCH 372/421] #4477 - Changed the saved value from the radio button
 list to the text value. + Migration of old values

---
 .../Migrations/Upgrade/UmbracoPlan.cs         |   1 +
 .../RadioButtonPropertyEditorsMigration.cs    | 105 ++++++++++++++++++
 .../RadioButtonListValueConverter.cs          |   4 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   4 +
 .../radiobuttons/radiobuttons.html            |   4 +-
 .../RadioButtonsPropertyEditor.cs             |   2 +-
 6 files changed, 115 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index a9444a09180d..c8247aa835cd 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -127,6 +127,7 @@ protected void DefinePlan()
             To<ConvertRelatedLinksToMultiUrlPicker>("{ED28B66A-E248-4D94-8CDB-9BDF574023F0}");
             To<UpdatePickerIntegerValuesToUdi>("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
             To<RenameUmbracoDomainsTable>("{6017F044-8E70-4E10-B2A3-336949692ADD}");
+            To<RadioButtonPropertyEditorsMigration>("{940FD19A-00A8-4D5C-B8FF-939143585726}");
 
 
             //FINAL
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
new file mode 100644
index 000000000000..bcea3ec3b684
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class RadioButtonPropertyEditorsMigration : MigrationBase
+    {
+        public RadioButtonPropertyEditorsMigration(IMigrationContext context)
+            : base(context)
+        {
+        }
+
+        public override void Migrate()
+        {
+            //need to convert the old drop down data types to use the new one
+            var dataTypes = Database.Fetch<DataTypeDto>(Sql()
+                .Select<DataTypeDto>()
+                .From<DataTypeDto>()
+                .Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.RadioButtonList"));
+
+            foreach (var dataType in dataTypes)
+            {
+                ValueListConfiguration config;
+
+                if (!dataType.Configuration.IsNullOrWhiteSpace())
+                {
+                    // parse configuration, and update everything accordingly
+                    try
+                    {
+                        config = (ValueListConfiguration) new ValueListConfigurationEditor().FromDatabase(
+                            dataType.Configuration);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Error<DropDownPropertyEditorsMigration>(
+                            ex,
+                            "Invalid drop down configuration detected: \"{Configuration}\", cannot convert editor, values will be cleared",
+                            dataType.Configuration);
+
+                        continue;
+                    }
+
+                    // get property data dtos
+                    var propertyDataDtos = Database.Fetch<PropertyDataDto>(Sql()
+                        .Select<PropertyDataDto>()
+                        .From<PropertyDataDto>()
+                        .InnerJoin<PropertyTypeDto>()
+                        .On<PropertyTypeDto, PropertyDataDto>((pt, pd) => pt.Id == pd.PropertyTypeId)
+                        .InnerJoin<DataTypeDto>()
+                        .On<DataTypeDto, PropertyTypeDto>((dt, pt) => dt.NodeId == pt.DataTypeId)
+                        .Where<PropertyTypeDto>(x => x.DataTypeId == dataType.NodeId));
+
+                    // update dtos
+                    var updatedDtos = propertyDataDtos.Where(x => UpdatePropertyDataDto(x, config));
+
+                    // persist changes
+                    foreach (var propertyDataDto in updatedDtos) Database.Update(propertyDataDto);
+                }
+            }
+        }
+
+        private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfiguration config)
+        {
+            //Get the INT ids stored for this property/drop down
+            int[] ids = null;
+            if (propData.IntegerValue.HasValue) ids = new[] {propData.IntegerValue.Value};
+
+            //if there are INT ids, convert them to values based on the configuration
+            if (ids == null || ids.Length <= 0) return false;
+
+            //map the ids to values
+            var values = new List<string>();
+            var canConvert = true;
+
+            foreach (var id in ids)
+            {
+                var val = config.Items.FirstOrDefault(x => x.Id == id);
+                if (val != null)
+                    values.Add(val.Value);
+                else
+                {
+                    Logger.Warn<DropDownPropertyEditorsMigration>(
+                        "Could not find associated data type configuration for stored Id {DataTypeId}", id);
+                    canConvert = false;
+                }
+            }
+
+            if (!canConvert) return false;
+
+            propData.VarcharValue = string.Join(",", values);
+            propData.TextValue = null;
+            propData.IntegerValue = null;
+            return true;
+        }
+
+        private class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfiguration>
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
index 362c88d08ca0..fc7d3d42de42 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
@@ -10,14 +10,14 @@ public override bool IsConverter(PublishedPropertyType propertyType)
             => propertyType.EditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.RadioButtonList);
 
         public override Type GetPropertyValueType(PublishedPropertyType propertyType)
-            => typeof (int);
+            => typeof (string);
 
         public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType)
             => PropertyCacheLevel.Element;
 
         public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
         {
-            var intAttempt = source.TryConvertTo<int>();
+            var intAttempt = source.TryConvertTo<string>();
 
             if (intAttempt.Success)
                 return intAttempt.Result;
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b80d607d4f58..72dbb03a9b87 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -52,6 +52,9 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\Umbraco.Tests\bin\Debug\Umbraco.Web.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
@@ -385,6 +388,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorMacroColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorVariantsModel.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\RadioButtonPropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameUmbracoDomainsTable.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\SuperZero.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TablesForScheduledPublishing.cs" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index 7b9805d6645e..96367b641a82 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -3,10 +3,10 @@
         <li ng-repeat="item in configItems track by item.id">
             <label class="radio">
                 <input type="radio" name="{{htmlId}}"
-                       value="{{item.id}}"
+                       value="{{item.value}}"
                        ng-model="model.value" />
                 {{item.value}}
             </label>
         </li>
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs
index 46069fec79f0..601728189cfd 100644
--- a/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// A property editor to allow the individual selection of pre-defined items.
     /// </summary>
-    [DataEditor(Constants.PropertyEditors.Aliases.RadioButtonList, "Radio button list", "radiobuttons", ValueType = ValueTypes.Integer, Group="lists", Icon="icon-target")]
+    [DataEditor(Constants.PropertyEditors.Aliases.RadioButtonList, "Radio button list", "radiobuttons", ValueType = ValueTypes.String, Group="lists", Icon="icon-target")]
     public class RadioButtonsPropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;

From 67e90ca21be67890f63bba0ddb34e806788140a1 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 8 Feb 2019 09:56:24 +0100
Subject: [PATCH 373/421] Cleanup configuration editors

---
 .../ContentPickerConfigurationEditor.cs        | 17 ++++++++---------
 .../PropertyEditors/DateConfigurationEditor.cs |  5 -----
 .../DateTimeConfigurationEditor.cs             |  5 -----
 .../MediaPickerConfigurationEditor.cs          | 18 +++++++++---------
 .../MultiNodePickerConfigurationEditor.cs      | 15 ++-------------
 5 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
index 00ad7e632757..1e7e2d79ce48 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
@@ -8,24 +8,23 @@ internal class ContentPickerConfigurationEditor : ConfigurationEditor<ContentPic
         public ContentPickerConfigurationEditor()
         {
             // configure fields
+            // this is not part of ContentPickerConfiguration,
+            // but is required to configure the UI editor (when editing the configuration)
             Field(nameof(ContentPickerConfiguration.StartNodeId))
                 .Config = new Dictionary<string, object> { { "idType", "udi" } };
         }
 
-        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
-        {
-            ["idType"] = "udi",
-            ["showEditButton"] = false,
-            ["showPathOnHover"] = false,
-        };
-
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {
-            // these are not configuration fields, but constants required by the value editor
+            // get the configuration fields
             var d = base.ToValueEditor(configuration);
+
+            // add extra fields
+            // not part of ContentPickerConfiguration but used to configure the UI editor
             d["showEditButton"] = false;
             d["showPathOnHover"] = false;
-            d["idType"] = "udi";
+            d["idType"] = "udi"; 
+
             return d;
         }
     }
diff --git a/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
index 9e20a7a30597..b0839c51574a 100644
--- a/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DateConfigurationEditor.cs
@@ -8,11 +8,6 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class DateConfigurationEditor : ConfigurationEditor<DateConfiguration>
     {
-        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
-        {
-            ["pickTime"] = false,
-        };
-
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
index 882400a25eca..494d8814f48b 100644
--- a/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
@@ -8,11 +8,6 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class DateTimeConfigurationEditor : ConfigurationEditor<DateTimeConfiguration>
     {
-        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
-        {
-            ["pickTime"] = true,
-        };
-
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {
             var d = base.ToValueEditor(configuration);
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
index c7c3b1087c66..70f38e654cbc 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
@@ -13,22 +13,22 @@ public class MediaPickerConfigurationEditor : ConfigurationEditor<MediaPickerCon
         /// </summary>
         public MediaPickerConfigurationEditor()
         {
+            // configure fields
+            // this is not part of ContentPickerConfiguration,
+            // but is required to configure the UI editor (when editing the configuration)
             Field(nameof(MediaPickerConfiguration.StartNodeId))
-                .Config = new Dictionary<string, object>
-                {
-                    { "idType", "udi" }
-                };
+                .Config = new Dictionary<string, object> { { "idType", "udi" } };
         }
 
-        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
-        {
-            ["idType"] = "udi"
-        };
-
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {
+            // get the configuration fields
             var d = base.ToValueEditor(configuration);
+
+            // add extra fields
+            // not part of ContentPickerConfiguration but used to configure the UI editor
             d["idType"] = "udi";
+
             return d;
         }
     }
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
index 96cdbe5dc1e9..c6e4cbfa98d5 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
@@ -11,10 +11,7 @@ public class MultiNodePickerConfigurationEditor : ConfigurationEditor<MultiNodeP
         public MultiNodePickerConfigurationEditor()
         {
             Field(nameof(MultiNodePickerConfiguration.TreeSource))
-                .Config = new Dictionary<string, object>
-                {
-                    { "idType", "udi" }
-                };
+                .Config = new Dictionary<string, object> { { "idType", "udi" } };
         }
 
         /// <inheritdoc />
@@ -23,19 +20,11 @@ public override Dictionary<string, object> ToConfigurationEditor(MultiNodePicker
             // sanitize configuration
             var output = base.ToConfigurationEditor(configuration);
 
-            output["multiPicker"] = configuration.MaxNumber > 1 ? true : false;
+            output["multiPicker"] = configuration.MaxNumber > 1;
 
             return output;
         }
 
-        public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
-        {
-            ["multiPicker"] = true,
-            ["showEditButton"] = false,
-            ["showPathOnHover"] = false,
-            ["idType"] = "udi"
-        };
-
         /// <inheritdoc />
         public override IDictionary<string, object> ToValueEditor(object configuration)
         {

From 354c45e0e2971a3352b328d83624744e09ac467f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 8 Feb 2019 10:32:21 +0100
Subject: [PATCH 374/421] #4477 - also refresh cache after migration

---
 .../RadioButtonPropertyEditorsMigration.cs    | 57 ++++++++++++++++++-
 .../RadioButtonListValueConverter.cs          |  6 +-
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
index bcea3ec3b684..4a5e2269b05b 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
@@ -1,18 +1,27 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Sync;
+using Umbraco.Web.Cache;
 
 namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
     public class RadioButtonPropertyEditorsMigration : MigrationBase
     {
-        public RadioButtonPropertyEditorsMigration(IMigrationContext context)
+        private readonly CacheRefresherCollection _cacheRefreshers;
+        private readonly IServerMessenger _serverMessenger;
+
+        public RadioButtonPropertyEditorsMigration(IMigrationContext context, CacheRefresherCollection cacheRefreshers, IServerMessenger serverMessenger)
             : base(context)
         {
+            _cacheRefreshers = cacheRefreshers;
+            _serverMessenger = serverMessenger;
         }
 
         public override void Migrate()
@@ -23,6 +32,7 @@ public override void Migrate()
                 .From<DataTypeDto>()
                 .Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.RadioButtonList"));
 
+            var refreshCache = false;
             foreach (var dataType in dataTypes)
             {
                 ValueListConfiguration config;
@@ -60,15 +70,42 @@ public override void Migrate()
 
                     // persist changes
                     foreach (var propertyDataDto in updatedDtos) Database.Update(propertyDataDto);
+
+                    UpdateDataType(dataType);
+                    refreshCache = true;
                 }
             }
+
+            if (refreshCache)
+            {
+                var dataTypeCacheRefresher = _cacheRefreshers[ContentCacheRefresher.UniqueId];
+                _serverMessenger.PerformRefreshAll(dataTypeCacheRefresher);
+            }
+
+        }
+
+        private void UpdateDataType(DataTypeDto dataType)
+        {
+            dataType.DbType = ValueStorageType.Nvarchar.ToString();
+            Database.Update(dataType);
         }
 
         private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfiguration config)
         {
             //Get the INT ids stored for this property/drop down
             int[] ids = null;
-            if (propData.IntegerValue.HasValue) ids = new[] {propData.IntegerValue.Value};
+            if (!propData.VarcharValue.IsNullOrWhiteSpace())
+            {
+                ids = ConvertStringValues(propData.VarcharValue);
+            }
+            else if (!propData.TextValue.IsNullOrWhiteSpace())
+            {
+                ids = ConvertStringValues(propData.TextValue);
+            }
+            else if (propData.IntegerValue.HasValue)
+            {
+                ids = new[] { propData.IntegerValue.Value };
+            }
 
             //if there are INT ids, convert them to values based on the configuration
             if (ids == null || ids.Length <= 0) return false;
@@ -101,5 +138,21 @@ private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfigurat
         private class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfiguration>
         {
         }
+
+        private int[] ConvertStringValues(string val)
+        {
+            var splitVals = val.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+            var intVals = splitVals
+                .Select(x => int.TryParse(x, out var i) ? i : int.MinValue)
+                .Where(x => x != int.MinValue)
+                .ToArray();
+
+            //only return if the number of values are the same (i.e. All INTs)
+            if (splitVals.Length == intVals.Length)
+                return intVals;
+
+            return null;
+        }
     }
 }
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
index fc7d3d42de42..b99cc7e0e31a 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs
@@ -17,10 +17,10 @@ public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType p
 
         public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
         {
-            var intAttempt = source.TryConvertTo<string>();
+            var attempt = source.TryConvertTo<string>();
 
-            if (intAttempt.Success)
-                return intAttempt.Result;
+            if (attempt.Success)
+                return attempt.Result;
 
             return null;
         }

From 8f39cd605aa35ec95a884675c92be59efe2b957b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 8 Feb 2019 11:47:42 +0100
Subject: [PATCH 375/421] Fix MacroMapperProfile

---
 src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
index de649a09d83f..a507cc4c03a9 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs
@@ -45,9 +45,15 @@ public MacroMapperProfile()
                     }
 
                     parameter.View = paramEditor.GetValueEditor().View;
-                    var paramConfig = paramEditor.GetConfigurationEditor().ToValueEditor(paramEditor.DefaultConfiguration);
-                    //set the config
-                    parameter.Configuration = paramConfig;
+
+                    // sets the parameter configuration to be the default configuration editor's configuration,
+                    // ie configurationEditor.DefaultConfigurationObject, prepared for the value editor, ie
+                    // after ToValueEditor - important to use DefaultConfigurationObject here, because depending
+                    // on editors, ToValueEditor expects the actual strongly typed configuration - not the
+                    // dictionary thing returned by DefaultConfiguration
+
+                    var configurationEditor = paramEditor.GetConfigurationEditor();
+                    parameter.Configuration = configurationEditor.ToValueEditor(configurationEditor.DefaultConfigurationObject);
                 });
         }
     }

From b5c803b5ed0fd75722af3d16e7f037ebc7f65839 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 8 Feb 2019 12:42:46 +0100
Subject: [PATCH 376/421] Cleanup TreeEntityPath

---
 .../Persistence/Repositories/Implement/EntityRepository.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 5321e45f2418..ae907051ca74 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -199,7 +199,7 @@ public IEnumerable<TreeEntityPath> GetAllPaths(Guid objectType, params Guid[] ke
         private IEnumerable<TreeEntityPath> PerformGetAllPaths(Guid objectType, Action<Sql<ISqlContext>> filter = null)
         {
             // NodeId is named Id on TreeEntityPath = use an alias
-            var sql = Sql().Select<NodeDto>(x => Alias(x.NodeId, "Id"), x => x.Path).From<NodeDto>().Where<NodeDto>(x => x.NodeObjectType == objectType);
+            var sql = Sql().Select<NodeDto>(x => Alias(x.NodeId, nameof(TreeEntityPath.Id)), x => x.Path).From<NodeDto>().Where<NodeDto>(x => x.NodeObjectType == objectType);
             filter?.Invoke(sql);
             return Database.Fetch<TreeEntityPath>(sql);
         }

From 1860a175d1e00bb39158eef1a1d465dc7d488042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 8 Feb 2019 13:06:56 +0100
Subject: [PATCH 377/421] remove eventlisteners on destroy

---
 .../components/content/umbtabbedcontent.directive.js | 10 ++++++++--
 .../editor/umbeditornavigationitem.directive.js      | 12 +++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index deb799580fef..6fe0881f7288 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -13,7 +13,7 @@
             
             var scrollableNode = appRootNode.closest(".umb-scrollable");
             scrollableNode.addEventListener("scroll", onScroll);
-            scrollableNode.addEventListener("mousehweel", cancelScrollTween);
+            scrollableNode.addEventListener("mousewheel", cancelScrollTween);
             
             function onScroll(event) {
                 
@@ -87,7 +87,7 @@
             
             $scope.registerPropertyGroup = function(element, appAnchor) {
                 propertyGroupNodesDictionary[appAnchor] = element;
-            }
+            };
             
             $scope.$on("editors.apps.appChanged", function($event, $args) {
                 // if app changed to this app, then we want to scroll to the current anchor
@@ -104,6 +104,12 @@
                 }
             });
             
+            //ensure to unregister from all dom-events
+            $scope.$on('$destroy', function () {
+                cancelScrollTween();
+                scrollableNode.removeEventListener("scroll", onScroll);
+                scrollableNode.removeEventListener("mousehweel", cancelScrollTween);
+            });
             
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
index 1d5bfb552a06..3a0dbb06d825 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
@@ -10,15 +10,25 @@
         };
         
         vm.anchorClicked = function(anchor, $event) {
-            
             vm.onOpenAnchor({item:vm.item, anchor:anchor});
             $event.stopPropagation();
             $event.preventDefault();
         };
         
+        // needed to make sure that we update what anchors are active.
+        vm.mouseOver = function() {
+            $scope.$digest();
+        }
+        
         var componentNode = $element[0];
         
         componentNode.classList.add('umb-sub-views-nav-item');
+        componentNode.addEventListener('mouseover', vm.mouseOver);
+
+        //ensure to unregister from all dom-events
+        $scope.$on('$destroy', function () {
+            componentNode.removeEventListener("mouseover", vm.mouseOver);
+        });
         
     }
     

From 612a63b6bb5edb7d8f77deae37914e7a01f5510b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 8 Feb 2019 13:30:20 +0100
Subject: [PATCH 378/421] fix if scrollTween not defined issue

---
 .../components/content/umbtabbedcontent.directive.js          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index 6fe0881f7288..ecc8872ba11f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -82,7 +82,9 @@
                 }
             }
             function cancelScrollTween() {
-                $scope.scrollTween.pause();
+                if($scope.scrollTween) {
+                    $scope.scrollTween.pause();
+                }
             }
             
             $scope.registerPropertyGroup = function(element, appAnchor) {

From 521fc227ba0f9a3de107219579b77ec80e61c333 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 8 Feb 2019 13:04:30 +0000
Subject: [PATCH 379/421] TYPO - Update
 src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js

---
 .../directives/components/content/umbtabbedcontent.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index ecc8872ba11f..06f426889f11 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -110,7 +110,7 @@
             $scope.$on('$destroy', function () {
                 cancelScrollTween();
                 scrollableNode.removeEventListener("scroll", onScroll);
-                scrollableNode.removeEventListener("mousehweel", cancelScrollTween);
+                scrollableNode.removeEventListener("mousewheel", cancelScrollTween);
             });
             
         }

From b177607d47d1b03e83f6cbe190522d48e3b4b56f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 8 Feb 2019 14:13:46 +0100
Subject: [PATCH 380/421] Suspend JS tests - can we build?

---
 src/Umbraco.Web.UI.Client/gulp/tasks/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/build.js b/src/Umbraco.Web.UI.Client/gulp/tasks/build.js
index 32bf71f5f71d..8fe582e406a7 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/build.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/build.js
@@ -6,5 +6,5 @@ var runSequence = require('run-sequence');
 
 // Build - build the files ready for production
 gulp.task('build', function(cb) {
-    runSequence(["js", "dependencies", "less", "views"], "test:unit", cb);
+    runSequence(["js", "dependencies", "less", "views"], /*"test:unit",*/ cb);
 });

From 4f53cfc85527ad8cdf02e25f7c66b4be5c64f8b0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 8 Feb 2019 14:18:24 +0100
Subject: [PATCH 381/421] #4477 - Added fixme for cache rebuild

---
 .../V_8_0_0/RadioButtonPropertyEditorsMigration.cs     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
index 4a5e2269b05b..2c4e601a9e83 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
@@ -14,14 +14,9 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
     public class RadioButtonPropertyEditorsMigration : MigrationBase
     {
-        private readonly CacheRefresherCollection _cacheRefreshers;
-        private readonly IServerMessenger _serverMessenger;
-
-        public RadioButtonPropertyEditorsMigration(IMigrationContext context, CacheRefresherCollection cacheRefreshers, IServerMessenger serverMessenger)
+        public RadioButtonPropertyEditorsMigration(IMigrationContext context)
             : base(context)
         {
-            _cacheRefreshers = cacheRefreshers;
-            _serverMessenger = serverMessenger;
         }
 
         public override void Migrate()
@@ -78,8 +73,7 @@ public override void Migrate()
 
             if (refreshCache)
             {
-                var dataTypeCacheRefresher = _cacheRefreshers[ContentCacheRefresher.UniqueId];
-                _serverMessenger.PerformRefreshAll(dataTypeCacheRefresher);
+                //FIXME: trigger cache rebuild. Currently the data in the database tables is wrong.
             }
 
         }

From 99887cb362d76ebbe5e22772b21d83514182fe7e Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Sun, 10 Feb 2019 11:25:46 +0100
Subject: [PATCH 382/421] Bugfix IdkMap

---
 src/Umbraco.Core/Services/IdkMap.cs                        | 2 +-
 .../PublishedCache/NuCache/PublishedSnapshotService.cs     | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Services/IdkMap.cs b/src/Umbraco.Core/Services/IdkMap.cs
index 9ec62fda0f2d..f352def49e70 100644
--- a/src/Umbraco.Core/Services/IdkMap.cs
+++ b/src/Umbraco.Core/Services/IdkMap.cs
@@ -158,7 +158,7 @@ public Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType)
             // multiple times, but we don't lock the cache while accessing the database = better
 
             int? val = null;
-             
+
             if (_dictionary.TryGetValue(umbracoObjectType, out var mappers))
                 if ((val = mappers.key2id(key)) == default(int)) val = null;
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 9845becb45db..cc1216eb6899 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -192,10 +192,13 @@ public PublishedSnapshotService(Options options, IMainDom mainDom, IRuntimeState
 
             LoadCaches();
 
+            Guid GetUid(ContentStore store, int id) => store.LiveSnapshot.Get(id)?.Uid ?? default;
+            int GetId(ContentStore store, Guid uid) => store.LiveSnapshot.Get(uid)?.Id ?? default;
+
             if (idkMap != null)
             {
-                idkMap.SetMapper(UmbracoObjectTypes.Document, id => _contentStore.LiveSnapshot.Get(id).Uid, uid => _contentStore.LiveSnapshot.Get(uid).Id);
-                idkMap.SetMapper(UmbracoObjectTypes.Media, id => _mediaStore.LiveSnapshot.Get(id).Uid, uid => _mediaStore.LiveSnapshot.Get(uid).Id);
+                idkMap.SetMapper(UmbracoObjectTypes.Document, id => GetUid(_contentStore, id), uid => GetId(_contentStore, uid));
+                idkMap.SetMapper(UmbracoObjectTypes.Media, id => GetUid(_mediaStore, id), uid => GetId(_mediaStore, uid));
             }
         }
 

From 6fdada69eb2d96744fb1f640c194a0c626b5ef82 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 10 Feb 2019 18:55:16 +0100
Subject: [PATCH 383/421] Always show folder names in the media picker

---
 .../src/views/components/umb-media-grid.html                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index da9472956264..1f5235146d93 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -4,7 +4,7 @@
             <!--<i ng-show="item.selected" class="icon-check umb-media-grid__checkmark"></i>-->
             <a ng-if="allowOnClickEdit === 'true'" ng-click="clickEdit(item, $event)" ng-href="" class="icon-edit umb-media-grid__edit"></a>
 
-            <div data-element="media-grid-item-edit" class="umb-media-grid__item-overlay" ng-class="{'-locked': item.selected}" ng-click="clickItemName(item, $event, $index)">
+            <div data-element="media-grid-item-edit" class="umb-media-grid__item-overlay" ng-class="{'-locked': item.selected || !item.file}" ng-click="clickItemName(item, $event, $index)">
                 <i ng-if="onDetailsHover" class="icon-info umb-media-grid__info" ng-mouseover="hoverItemDetails(item, $event, true)" ng-mouseleave="hoverItemDetails(item, $event, false)"></i>
                 <div class="umb-media-grid__item-name">{{item.name}}</div>
             </div>

From dd54b0324c6cb0e8fa1a4f00ace3acd71fb1badf Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 11 Feb 2019 14:13:44 +1100
Subject: [PATCH 384/421] fixes up some comments

---
 src/Umbraco.Core/Services/IMediaService.cs  | 4 +---
 src/Umbraco.Core/Services/IMemberService.cs | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs
index 02398c363478..78da440bc697 100644
--- a/src/Umbraco.Core/Services/IMediaService.cs
+++ b/src/Umbraco.Core/Services/IMediaService.cs
@@ -100,9 +100,7 @@ IEnumerable<IMedia> GetPagedChildren(int id, long pageIndex, int pageSize, out l
         /// <param name="pageIndex">Page number</param>
         /// <param name="pageSize">Page size</param>
         /// <param name="totalRecords">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="orderBySystemField">Flag to indicate when ordering by system field</param>
+        /// <param name="ordering"></param>
         /// <param name="filter"></param>
         /// <returns>An Enumerable list of <see cref="IContent"/> objects</returns>
         IEnumerable<IMedia> GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords,
diff --git a/src/Umbraco.Core/Services/IMemberService.cs b/src/Umbraco.Core/Services/IMemberService.cs
index 8a9d11f766f6..ee0e2ef5ed5a 100644
--- a/src/Umbraco.Core/Services/IMemberService.cs
+++ b/src/Umbraco.Core/Services/IMemberService.cs
@@ -99,7 +99,6 @@ IEnumerable<IMember> GetAll(long pageIndex, int pageSize, out long totalRecords,
         /// This is simply a helper method which essentially just wraps the MembershipProvider's ChangePassword method which can be
         /// used during Member creation.
         /// </summary>
-        /// <remarks>
         /// <remarks>This method exists so that Umbraco developers can use one entry point to create/update
         /// this will not work for updating members in most cases (depends on your membership provider settings)
         ///

From e35436225f9bd3d1a9096c888eabf249d300c6ce Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 11 Feb 2019 15:47:13 +1100
Subject: [PATCH 385/421] Fixes JS with the content picker

---
 .../src/common/services/umbrequesthelper.service.js           | 4 ++++
 .../propertyeditors/contentpicker/contentpicker.controller.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index 6991c5d3867d..bad5f4e34213 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -161,6 +161,10 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
 
             }, function (response) {
 
+                if (!response) {
+                    return; //sometimes oddly this happens, nothing we can do
+                }
+
                 if (!response.status && response.message && response.stack) {
                     //this is a JS/angular error that we should deal with
                     return $q.reject({
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 15a1526b9fbb..16aa7efcebbb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -105,6 +105,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
     };
 
     if ($scope.model.config) {
+        //special case, if the `startNode` is falsy on the server config delete it entirely so the default value is merged in
+        if (!$scope.model.config.startNode) {
+            delete $scope.model.config.startNode;
+        }
         //merge the server config on top of the default config, then set the server config to use the result
         $scope.model.config = angular.extend(defaultConfig, $scope.model.config);
     }

From e62de9561bdbf87db1a8e7a7e41b10cda770bf82 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 11 Feb 2019 07:54:39 +0100
Subject: [PATCH 386/421] #4466 - Sets the MacroType when created from Partial
 View Macro Files snippets

---
 src/Umbraco.Web/Editors/MacroRenderingController.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index 3cd2e86dd815..49b58416cd74 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -124,7 +124,7 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
             // When rendering the macro in the backoffice the default setting would be to use the Culture of the logged in user.
             // Since a Macro might contain thing thats related to the culture of the "IPublishedContent" (ie Dictionary keys) we want
             // to set the current culture to the culture related to the content item. This is hacky but it works.
-            
+
             var culture = publishedContent.GetCulture();
             _variationContextAccessor.VariationContext = new VariationContext(); //must have an active variation context!
             if (culture != null)
@@ -156,7 +156,8 @@ public HttpResponseMessage CreatePartialViewMacroWithFile(CreatePartialViewMacro
             {
                 Alias = macroName.ToSafeAlias(),
                 Name = macroName,
-                MacroSource = model.VirtualPath.EnsureStartsWith("~")
+                MacroSource = model.VirtualPath.EnsureStartsWith("~"),
+                MacroType = MacroTypes.PartialView
             };
 
             _macroService.Save(macro); // may throw

From 153b665d0a9b434a2f1269371381ef0e547b5170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 11 Feb 2019 09:39:54 +0100
Subject: [PATCH 387/421] #4430 change grid-editor settings to use
 editorService

---
 .../grid/dialogs/editconfig.controller.js     |  16 ++
 .../grid/dialogs/editconfig.html              |  53 +++++++
 .../grid/dialogs/layoutconfig.controller.js   |  28 +++-
 .../grid/dialogs/layoutconfig.html            |  52 ++++++-
 .../grid/dialogs/rowconfig.controller.js      |  26 +++-
 .../grid/dialogs/rowconfig.html               |  51 ++++++-
 .../dialogs/rowdeleteconfirm.controller.js    |  16 ++
 .../grid/dialogs/rowdeleteconfirm.html        |  38 ++++-
 .../grid/grid.prevalues.controller.js         | 139 ++++++++----------
 .../propertyeditors/grid/grid.prevalues.html  |  24 ---
 10 files changed, 330 insertions(+), 113 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.controller.js

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
new file mode 100644
index 000000000000..3441b6a0607b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
@@ -0,0 +1,16 @@
+function EditConfigController($scope) {
+
+    $scope.close = function() {
+        if($scope.model.close) {
+            $scope.model.close();
+        }
+    }
+    
+    $scope.submit = function() {
+        if($scope.model && $scope.model.submit) {
+            $scope.model.submit($scope.model);
+        }
+    }
+}
+
+angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.EditConfigController", EditConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
index fb541ecf8470..9c42e04f75f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
@@ -1,3 +1,25 @@
+<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.EditConfigController">
+
+
+
+        <umb-editor-view>
+
+            <form novalidate name="EditConfigForm" val-form-manager>
+
+            <umb-editor-header
+                name="model.title"
+                name-locked="true"
+                hide-alias="true"
+                hide-icon="true"
+                hide-description="true">
+            </umb-editor-header>
+
+            <umb-editor-container>
+                <umb-box>
+                    <umb-box-content>
+
+
+
 <form name="gridConfigEditor">
 
    <h4>{{model.name}}</h4>
@@ -12,3 +34,34 @@ <h4>{{model.name}}</h4>
    </div>
 
 </form>
+
+
+
+
+                            </umb-box-content>
+                        </umb-box>
+                    </umb-editor-container>
+
+                    <umb-editor-footer>
+                    <umb-editor-footer-content-right>
+                    <umb-button
+                        type="button"
+                        button-style="link"
+                        label-key="general_close"
+                        shortcut="esc"
+                        action="close()">
+                    </umb-button>
+                    <umb-button
+                        type="button"
+                        button-style="success"
+                        label-key="general_submit"
+                        action="submit()">
+                    </umb-button>
+                </umb-editor-footer-content-right>
+            </umb-editor-footer>
+
+        </form>
+
+    </umb-editor-view>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
index 566535fc9870..4ad857b1e704 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
@@ -1,10 +1,25 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.GridPrevalueEditor.LayoutConfigController",
-    function ($scope) {
+    function ($scope, localizationService) {
+
+        
+            function init() {
+                setTitle();
+            }
+
+            function setTitle() {
+                if (!$scope.model.title) {
+                    localizationService.localize("grid_addGridLayout")
+                        .then(function(data){
+                            $scope.model.title = data;
+                        });
+                }
+            }
 
     		$scope.currentLayout = $scope.model.currentLayout;
     		$scope.columns = $scope.model.columns;
     		$scope.rows = $scope.model.rows;
+            $scope.currentSection = undefined;
 
     		$scope.scaleUp = function(section, max, overflow){
     		   var add = 1;
@@ -57,9 +72,12 @@ angular.module("umbraco")
     			template.sections.splice(index, 1);
     		};
     		
-    		$scope.closeSection = function(){
-    		    $scope.currentSection = undefined;
-    		};
+    		
+            $scope.close = function() {
+                if($scope.model.close) {
+                    $scope.model.close();
+                }
+            }
 
     		$scope.$watch("currentLayout", function(layout){
     		    if(layout){
@@ -71,4 +89,6 @@ angular.module("umbraco")
     		        $scope.availableLayoutSpace = $scope.columns - total;
     		    }
     		}, true);
+            
+            init();
     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
index 0e1a92a62c56..6f70c5e7ef81 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
@@ -1,8 +1,31 @@
 <div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.LayoutConfigController">
 
+
+
+
+    <umb-editor-view>
+
+        <form novalidate name="LayoutConfigForm" val-form-manager>
+
+        <umb-editor-header
+            name="model.title"
+            name-locked="true"
+            hide-alias="true"
+            hide-icon="true"
+            hide-description="true">
+        </umb-editor-header>
+
+        <umb-editor-container>
+            <umb-box>
+                <umb-box-content>
+
+
+
+
+
+
    <div class="umb-forms-settings">
 
-      <h5><localize key="grid_addGridLayout" /></h5>
       <p><localize key="grid_addGridLayoutDetail" /></p>
 
       <umb-control-group label="@general_name">
@@ -32,7 +55,7 @@ <h5><localize key="grid_addGridLayout" /></h5>
           </div>
       </div>
 
-      <div ng-if="currentSection" style="padding-bottom: 50px;">
+      <div ng-if="currentSection != null" style="padding-bottom: 50px;">
 
           <umb-control-group label="@general_width">
              <div class="grid-size-scaler">
@@ -111,4 +134,27 @@ <h5><localize key="grid_addGridLayout" /></h5>
 
    </div>
 
-</div>
+
+
+
+                   </umb-box-content>
+               </umb-box>
+           </umb-editor-container>
+
+           <umb-editor-footer>
+               <umb-editor-footer-content-right>
+                   <umb-button
+                       type="button"
+                       button-style="link"
+                       label-key="general_close"
+                       shortcut="esc"
+                       action="close()">
+                   </umb-button>
+               </umb-editor-footer-content-right>
+           </umb-editor-footer>
+
+           </form>
+
+       </umb-editor-view>
+
+   </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
index 4e3dde50e4e3..1bb7516f306b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
@@ -1,5 +1,19 @@
-function RowConfigController($scope) {
+function RowConfigController($scope, localizationService) {
 
+    function init() {
+        setTitle();
+    }
+
+    function setTitle() {
+        if (!$scope.model.title) {
+            localizationService.localize("grid_addRowConfiguration")
+                .then(function(data){
+                    $scope.model.title = data;
+                });
+        }
+    }
+    
+    
     $scope.currentRow = $scope.model.currentRow;
     $scope.editors = $scope.model.editors;
     $scope.columns = $scope.model.columns;
@@ -69,6 +83,12 @@ function RowConfigController($scope) {
     $scope.closeArea = function() {
         $scope.currentCell = undefined;
     };
+    
+    $scope.close = function() {
+        if($scope.model.close) {
+            $scope.model.close();
+        }
+    }
 
     $scope.nameChanged = false;
     var originalName = $scope.currentRow.name;
@@ -93,6 +113,10 @@ function RowConfigController($scope) {
         }
     }, true);
 
+    
+    init();
+    
+
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController", RowConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
index c9a0d807ea43..12d83f23fd60 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
@@ -1,8 +1,30 @@
 <div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
 
+
+
+        <umb-editor-view>
+
+            <form novalidate name="RowConfigurationForm" val-form-manager>
+
+            <umb-editor-header
+                name="model.title"
+                name-locked="true"
+                hide-alias="true"
+                hide-icon="true"
+                hide-description="true">
+            </umb-editor-header>
+
+            <umb-editor-container>
+                <umb-box>
+                    <umb-box-content>
+
+
+
+
+
+
    <div class="umb-form-settings">
 
-      <h5><localize key="grid_addRowConfiguration" /></h5>
       <p><localize key="grid_addRowConfigurationDetail" /></p>
 
       <div class="alert alert-warn ng-scope" ng-show="nameChanged">
@@ -14,7 +36,7 @@ <h5><localize key="grid_addRowConfiguration" /></h5>
        <umb-control-group label="@general_name">
            <input type="text" ng-model="currentRow.name" />
        </umb-control-group>
-       
+
        <umb-control-group label="@general_label">
            <input type="text" ng-model="currentRow.label" placeholder="Overrides name" />
        </umb-control-group>
@@ -54,7 +76,7 @@ <h5><localize key="grid_addRowConfiguration" /></h5>
                   </a>
               </div>
           </umb-control-group>
-          
+
           <umb-control-group label="@grid_maxItems" description="@grid_maxItemsDescription">
               <input type="number" ng-model="currentCell.maxItems" class="umb-property-editor-tiny" placeholder="Max" min="0" />
           </umb-control-group>
@@ -97,4 +119,27 @@ <h5><localize key="grid_addRowConfiguration" /></h5>
 
    </div>
 
+
+
+
+                            </umb-box-content>
+                        </umb-box>
+                    </umb-editor-container>
+
+                    <umb-editor-footer>
+                    <umb-editor-footer-content-right>
+                    <umb-button
+                        type="button"
+                        button-style="link"
+                        label-key="general_close"
+                        shortcut="esc"
+                        action="close()">
+                    </umb-button>
+                </umb-editor-footer-content-right>
+            </umb-editor-footer>
+
+        </form>
+
+    </umb-editor-view>
+
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.controller.js
new file mode 100644
index 000000000000..10b560130426
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.controller.js
@@ -0,0 +1,16 @@
+function DeleteRowConfirmController($scope) {
+
+    $scope.close = function() {
+        if($scope.model.close) {
+            $scope.model.close();
+        }
+    }
+    
+    $scope.submit = function() {
+        if($scope.model && $scope.model.submit) {
+            $scope.model.submit($scope.model);
+        }
+    }
+}
+
+angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.DeleteRowConfirmController", DeleteRowConfirmController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.html
index c69ae2cb8f31..2bf1f00b0e2a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.html
@@ -1,4 +1,13 @@
-<div>
+<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.DeleteRowConfirmController">
+
+
+        <umb-editor-view>
+
+            <umb-editor-container>
+                <umb-box>
+                    <umb-box-content>
+
+
 
    <h3 class="alert alert-warn ng-scope">Warning!</h3>
 
@@ -15,4 +24,31 @@ <h3 class="alert alert-warn ng-scope">Warning!</h3>
       <localize key="general_areyousure">Are you sure?</localize>
    </p>
 
+
+
+
+                            </umb-box-content>
+                        </umb-box>
+                    </umb-editor-container>
+
+                    <umb-editor-footer>
+                    <umb-editor-footer-content-right>
+                        <umb-button
+                            type="button"
+                            button-style="link"
+                            label-key="general_close"
+                            shortcut="esc"
+                            action="close()">
+                        </umb-button>
+                        <umb-button
+                            type="button"
+                            button-style="warning"
+                            label-key="general_delete"
+                            action="submit(model)">
+                        </umb-button>
+                </umb-editor-footer-content-right>
+            </umb-editor-footer>
+
+    </umb-editor-view>
+
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
index 19057fa842f4..d38697d35160 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
@@ -1,6 +1,6 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.GridPrevalueEditorController",
-    function ($scope, gridService) {
+    function ($scope, gridService, editorService) {
 
         var emptyModel = {
             styles:[
@@ -89,28 +89,23 @@ angular.module("umbraco")
               };
               $scope.model.value.templates.push(template);
            }
+            
+            var layoutConfigOverlay = {
+                currentLayout: template,
+                rows: $scope.model.value.layouts,
+                columns: $scope.model.value.columns,
+                view: "views/propertyEditors/grid/dialogs/layoutconfig.html",
+                size: "small",
+                submit: function(model) {
+                    editorService.close();
+                },
+                close: function(model) {
+                    editorService.close();
+                }
+            };
 
-           $scope.layoutConfigOverlay = {};
-           $scope.layoutConfigOverlay.view = "views/propertyEditors/grid/dialogs/layoutconfig.html";
-           $scope.layoutConfigOverlay.currentLayout = template;
-           $scope.layoutConfigOverlay.rows = $scope.model.value.layouts;
-           $scope.layoutConfigOverlay.columns = $scope.model.value.columns;
-           $scope.layoutConfigOverlay.show = true;
+            editorService.open(layoutConfigOverlay);
            
-           $scope.layoutConfigOverlay.submit = function(model) {
-              $scope.layoutConfigOverlay.show = false;
-              $scope.layoutConfigOverlay = null;
-           };
-
-           $scope.layoutConfigOverlay.close = function(oldModel) {
-
-              //reset templates
-              $scope.model.value.templates = templatesCopy;
-
-              $scope.layoutConfigOverlay.show = false;
-              $scope.layoutConfigOverlay = null;
-           }
-
         };
 
         $scope.deleteTemplate = function(index){
@@ -135,50 +130,44 @@ angular.module("umbraco")
                 };
                 $scope.model.value.layouts.push(layout);
            }
-
-           $scope.rowConfigOverlay = {};
-           $scope.rowConfigOverlay.view = "views/propertyEditors/grid/dialogs/rowconfig.html";
-           $scope.rowConfigOverlay.currentRow = layout;
-           $scope.rowConfigOverlay.editors = $scope.editors;
-           $scope.rowConfigOverlay.columns = $scope.model.value.columns;
-           $scope.rowConfigOverlay.show = true;
-
-           $scope.rowConfigOverlay.submit = function(model) {
-             $scope.rowConfigOverlay.show = false;
-             $scope.rowConfigOverlay = null;
-           };
-
-           $scope.rowConfigOverlay.close = function(oldModel) {
-             $scope.model.value.layouts = layoutsCopy;
-             $scope.rowConfigOverlay.show = false;
-             $scope.rowConfigOverlay = null;
+           
+           var rowConfigOverlay = {
+               currentRow: layout,
+               editors: $scope.editors,
+               columns: $scope.model.value.columns,
+               view: "views/propertyEditors/grid/dialogs/rowconfig.html",
+               size: "small",
+               submit: function(model) {
+                   editorService.close();
+               },
+               close: function(model) {
+                   editorService.close();
+               }
            };
 
+           editorService.open(rowConfigOverlay);
+           
         };
 
         //var rowDeletesPending = false;
         $scope.deleteLayout = function(index) {
+            
+            var rowDeleteOverlay = {
+                dialogData: {
+                  rowName: $scope.model.value.layouts[index].name
+                },
+                view: "views/propertyEditors/grid/dialogs/rowdeleteconfirm.html",
+                size: "small",
+                submit: function(model) {
+                    $scope.model.value.layouts.splice(index, 1);
+                    editorService.close();
+                },
+                close: function(model) {
+                    editorService.close();
+                }
+            };
 
-           $scope.rowDeleteOverlay = {};
-           $scope.rowDeleteOverlay.view = "views/propertyEditors/grid/dialogs/rowdeleteconfirm.html";
-           $scope.rowDeleteOverlay.dialogData = {
-             rowName: $scope.model.value.layouts[index].name
-           };
-           $scope.rowDeleteOverlay.show = true;
-
-           $scope.rowDeleteOverlay.submit = function(model) {
-
-             $scope.model.value.layouts.splice(index, 1);
-
-             $scope.rowDeleteOverlay.show = false;
-             $scope.rowDeleteOverlay = null;
-           };
-
-           $scope.rowDeleteOverlay.close = function(oldModel) {
-             $scope.rowDeleteOverlay.show = false;
-             $scope.rowDeleteOverlay = null;
-           };
-
+            editorService.open(rowDeleteOverlay);
         };
 
 
@@ -210,26 +199,22 @@ angular.module("umbraco")
         };
 
         var editConfigCollection = function(configValues, title, callback) {
+            
+            var editConfigCollectionOverlay = {
+                config: configValues,
+                title: title,
+                view: "views/propertyeditors/grid/dialogs/editconfig.html",
+                size: "small",
+                submit: function(model) {
+                    callback(model.config);
+                    editorService.close();
+                },
+                close: function(model) {
+                    editorService.close();
+                }
+            };
 
-           $scope.editConfigCollectionOverlay = {};
-           $scope.editConfigCollectionOverlay.view = "views/propertyeditors/grid/dialogs/editconfig.html";
-           $scope.editConfigCollectionOverlay.config = configValues;
-           $scope.editConfigCollectionOverlay.title = title;
-           $scope.editConfigCollectionOverlay.show = true;
-
-           $scope.editConfigCollectionOverlay.submit = function(model) {
-               
-              callback(model.config);
-
-              $scope.editConfigCollectionOverlay.show = false;
-              $scope.editConfigCollectionOverlay = null;
-           };
-
-           $scope.editConfigCollectionOverlay.close = function(oldModel) {
-              $scope.editConfigCollectionOverlay.show = false;
-              $scope.editConfigCollectionOverlay = null;
-           };
-
+            editorService.open(editConfigCollectionOverlay);
         };
 
         $scope.editConfig = function() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index 539433821b95..92d1a9ef26d0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -158,28 +158,4 @@ <h4><localize key="grid_rowConfigurations" /></h4>
         </umb-control-group>
     </div>
 
-    <umb-overlay ng-if="layoutConfigOverlay.show"
-                 model="layoutConfigOverlay"
-                 view="layoutConfigOverlay.view"
-                 position="right">
-    </umb-overlay>
-
-    <umb-overlay ng-if="rowConfigOverlay.show"
-                 model="rowConfigOverlay"
-                 view="rowConfigOverlay.view"
-                 position="right">
-    </umb-overlay>
-
-    <umb-overlay ng-if="editConfigCollectionOverlay.show"
-                 model="editConfigCollectionOverlay"
-                 view="editConfigCollectionOverlay.view"
-                 position="right">
-    </umb-overlay>
-
-    <umb-overlay ng-if="rowDeleteOverlay.show"
-                 model="rowDeleteOverlay"
-                 view="rowDeleteOverlay.view"
-                 position="right">
-    </umb-overlay>
-
 </div>

From 14f878b690d489ace56dd104e05c757119b12ed0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 11 Feb 2019 10:36:54 +0100
Subject: [PATCH 388/421] #4477 - Align Dropdown, checkbox list and radio
 button list

---
 .../Migrations/Upgrade/UmbracoPlan.cs         |   1 +
 .../CheckBoxListPropertyEditorsMigration.cs   | 150 ++++++++++++++++++
 .../RadioButtonPropertyEditorsMigration.cs    |   6 +-
 .../CheckboxListValueConverter.cs             |   5 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 .../checkboxlist/checkboxlist.controller.js   |   6 +-
 .../checkboxlist/checkboxlist.html            |   2 +-
 .../PublishValuesMultipleValueEditor.cs       |  13 +-
 .../FlexibleDropdownPropertyValueConverter.cs |   7 +-
 9 files changed, 172 insertions(+), 19 deletions(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/CheckBoxListPropertyEditorsMigration.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index c8247aa835cd..d185c31a2b1c 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -128,6 +128,7 @@ protected void DefinePlan()
             To<UpdatePickerIntegerValuesToUdi>("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
             To<RenameUmbracoDomainsTable>("{6017F044-8E70-4E10-B2A3-336949692ADD}");
             To<RadioButtonPropertyEditorsMigration>("{940FD19A-00A8-4D5C-B8FF-939143585726}");
+            To<CheckBoxListPropertyEditorsMigration>("{C62C9BF1-833E-4866-B959-C8AB59E43E51}");
 
 
             //FINAL
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/CheckBoxListPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/CheckBoxListPropertyEditorsMigration.cs
new file mode 100644
index 000000000000..87a77963a811
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/CheckBoxListPropertyEditorsMigration.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class CheckBoxListPropertyEditorsMigration : MigrationBase
+    {
+        public CheckBoxListPropertyEditorsMigration(IMigrationContext context)
+            : base(context)
+        {
+        }
+
+        public override void Migrate()
+        {
+            //need to convert the old drop down data types to use the new one
+            var dataTypes = Database.Fetch<DataTypeDto>(Sql()
+                .Select<DataTypeDto>()
+                .From<DataTypeDto>()
+                .Where<DataTypeDto>(x => x.EditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.CheckBoxList)));
+
+            var refreshCache = false;
+            foreach (var dataType in dataTypes)
+            {
+                ValueListConfiguration config;
+
+                if (!dataType.Configuration.IsNullOrWhiteSpace())
+                {
+                    // parse configuration, and update everything accordingly
+                    try
+                    {
+                        config = (ValueListConfiguration) new ValueListConfigurationEditor().FromDatabase(
+                            dataType.Configuration);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Error<DropDownPropertyEditorsMigration>(
+                            ex,
+                            "Invalid drop down configuration detected: \"{Configuration}\", cannot convert editor, values will be cleared",
+                            dataType.Configuration);
+
+                        continue;
+                    }
+
+                    // get property data dtos
+                    var propertyDataDtos = Database.Fetch<PropertyDataDto>(Sql()
+                        .Select<PropertyDataDto>()
+                        .From<PropertyDataDto>()
+                        .InnerJoin<PropertyTypeDto>()
+                        .On<PropertyTypeDto, PropertyDataDto>((pt, pd) => pt.Id == pd.PropertyTypeId)
+                        .InnerJoin<DataTypeDto>()
+                        .On<DataTypeDto, PropertyTypeDto>((dt, pt) => dt.NodeId == pt.DataTypeId)
+                        .Where<PropertyTypeDto>(x => x.DataTypeId == dataType.NodeId));
+
+                    // update dtos
+                    var updatedDtos = propertyDataDtos.Where(x => UpdatePropertyDataDto(x, config));
+
+                    // persist changes
+                    foreach (var propertyDataDto in updatedDtos) Database.Update(propertyDataDto);
+
+                    UpdateDataType(dataType);
+                    refreshCache = true;
+                }
+            }
+
+            if (refreshCache)
+            {
+                //FIXME: trigger cache rebuild. Currently the data in the database tables is wrong.
+            }
+
+        }
+
+        private void UpdateDataType(DataTypeDto dataType)
+        {
+            dataType.DbType = ValueStorageType.Nvarchar.ToString();
+            Database.Update(dataType);
+        }
+
+        private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfiguration config)
+        {
+            //Get the INT ids stored for this property/drop down
+            int[] ids = null;
+            if (!propData.VarcharValue.IsNullOrWhiteSpace())
+            {
+                ids = ConvertStringValues(propData.VarcharValue);
+            }
+            else if (!propData.TextValue.IsNullOrWhiteSpace())
+            {
+                ids = ConvertStringValues(propData.TextValue);
+            }
+            else if (propData.IntegerValue.HasValue)
+            {
+                ids = new[] { propData.IntegerValue.Value };
+            }
+
+            //if there are INT ids, convert them to values based on the configuration
+            if (ids == null || ids.Length <= 0) return false;
+
+            //map the ids to values
+            var values = new List<string>();
+            var canConvert = true;
+
+            foreach (var id in ids)
+            {
+                var val = config.Items.FirstOrDefault(x => x.Id == id);
+                if (val != null)
+                    values.Add(val.Value);
+                else
+                {
+                    Logger.Warn<DropDownPropertyEditorsMigration>(
+                        "Could not find associated data type configuration for stored Id {DataTypeId}", id);
+                    canConvert = false;
+                }
+            }
+
+            if (!canConvert) return false;
+
+            propData.VarcharValue = JsonConvert.SerializeObject(values);
+            propData.TextValue = null;
+            propData.IntegerValue = null;
+            return true;
+        }
+
+        private class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfiguration>
+        {
+        }
+
+        private int[] ConvertStringValues(string val)
+        {
+            var splitVals = JsonConvert.DeserializeObject<string[]>(val);
+
+            var intVals = splitVals
+                .Select(x => int.TryParse(x, out var i) ? i : int.MinValue)
+                .Where(x => x != int.MinValue)
+                .ToArray();
+
+            //only return if the number of values are the same (i.e. All INTs)
+            if (splitVals.Length == intVals.Length)
+                return intVals;
+
+            return null;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
index 2c4e601a9e83..e032cdea4365 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
@@ -25,7 +25,7 @@ public override void Migrate()
             var dataTypes = Database.Fetch<DataTypeDto>(Sql()
                 .Select<DataTypeDto>()
                 .From<DataTypeDto>()
-                .Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.RadioButtonList"));
+                .Where<DataTypeDto>(x => x.EditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.RadioButtonList)));
 
             var refreshCache = false;
             foreach (var dataType in dataTypes)
@@ -123,7 +123,7 @@ private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfigurat
 
             if (!canConvert) return false;
 
-            propData.VarcharValue = string.Join(",", values);
+            propData.VarcharValue = values.FirstOrDefault() ?? string.Empty;
             propData.TextValue = null;
             propData.IntegerValue = null;
             return true;
@@ -135,7 +135,7 @@ private class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfig
 
         private int[] ConvertStringValues(string val)
         {
-            var splitVals = val.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            var splitVals = new []{ val.Trim() };
 
             var intVals = splitVals
                 .Select(x => int.TryParse(x, out var i) ? i : int.MinValue)
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs
index 4062ed731174..3d69c37b8ba6 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core.PropertyEditors.ValueConverters
@@ -8,8 +9,6 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
     [DefaultPropertyValueConverter]
     public class CheckboxListValueConverter : PropertyValueConverterBase
     {
-        private static readonly char[] Comma = { ',' };
-
         public override bool IsConverter(PublishedPropertyType propertyType)
             => propertyType.EditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.CheckBoxList);
 
@@ -26,7 +25,7 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, Publ
             if (string.IsNullOrEmpty(sourceString))
                 return Enumerable.Empty<string>();
 
-            return sourceString.Split(Comma, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
+            return JsonConvert.DeserializeObject<string[]>(sourceString);
         }
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 72dbb03a9b87..da6c4a672c29 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -370,6 +370,7 @@
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoAuditTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoConsentTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\CreateSensitiveDataUserGroup.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\CheckBoxListPropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\ConvertRelatedLinksToMultiUrlPicker.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddLogTableColumns.cs" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index 9ef1b69aad3c..069965871190 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -54,7 +54,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
             $scope.selectedItems = [];
 
             for (var i = 0; i < configItems.length; i++) {
-                var isChecked = _.contains($scope.model.value, configItems[i].id);
+                var isChecked = _.contains($scope.model.value, configItems[i].value);
                 $scope.selectedItems.push({
                     checked: isChecked,
                     key: configItems[i].id,
@@ -68,11 +68,11 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
                 function (v) {
                     return v === item.key;
                 });
-
+            
             if (item.checked) {
                 //if it doesn't exist in the model, then add it
                 if (index < 0) {
-                    $scope.model.value.push(item.key);
+                    $scope.model.value.push(item.val);
                 }
             }
             else {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index 29760e3f5b10..f777dc4797f1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -6,7 +6,7 @@
                 <input type="checkbox" name="checkboxlist"
                        value="{{item.key}}"
                        ng-model="item.checked"
-                       ng-change="changed(item)" 
+                       ng-change="changed(item)"
                        ng-required="model.validation.mandatory && !model.value.length" />
                 {{item.val}}
             </label>
diff --git a/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs b/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs
index 8e0737dedd87..13b060cf3de5 100644
--- a/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -36,8 +35,8 @@ internal PublishValuesMultipleValueEditor(ILogger logger, DataEditorAttribute at
         /// <returns></returns>
         public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
         {
-            var delimited = base.ToEditor(property, dataTypeService, culture, segment).ToString();
-            return delimited.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            var json = base.ToEditor(property, dataTypeService, culture, segment).ToString();
+            return JsonConvert.DeserializeObject<string[]>(json) ?? Array.Empty<string>();
         }
 
         /// <summary>
@@ -55,9 +54,9 @@ public override object FromEditor(Core.Models.Editors.ContentPropertyData editor
                 return null;
             }
 
-            var values = json.Select(item => item.Value<string>()).ToList();
-            //change to delimited
-            return string.Join(",", values);
+            var values = json.Select(item => item.Value<string>()).ToArray();
+
+            return JsonConvert.SerializeObject(values);
         }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
index d470f54662b9..43add3432759 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
@@ -17,8 +18,10 @@ public override bool IsConverter(PublishedPropertyType propertyType)
 
         public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
         {
-            return source?.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(v => v.Trim()).ToArray()
-                ?? Enumerable.Empty<string>();
+            if(source == null) return Array.Empty<string>();
+
+
+            return JsonConvert.DeserializeObject<string[]>(source.ToString()) ?? Array.Empty<string>();
         }
 
         public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)

From a892ae1567284e800e89fd87d88e49943ef85386 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 11 Feb 2019 11:35:21 +0100
Subject: [PATCH 389/421] Add missing index on UserLogin table (prevents
 deadlocks)

---
 src/Umbraco.Core/Migrations/MigrationBase_Extra.cs | 6 ++++++
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs | 2 +-
 src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs  | 7 +++++--
 src/Umbraco.Core/Umbraco.Core.csproj               | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/MigrationBase_Extra.cs b/src/Umbraco.Core/Migrations/MigrationBase_Extra.cs
index 6d936e8407cd..bf07e4d08f08 100644
--- a/src/Umbraco.Core/Migrations/MigrationBase_Extra.cs
+++ b/src/Umbraco.Core/Migrations/MigrationBase_Extra.cs
@@ -96,6 +96,12 @@ protected bool TableExists(string tableName)
             return tables.Any(x => x.InvariantEquals(tableName));
         }
 
+        protected bool IndexExists(string indexName)
+        {
+            var indexes = SqlSyntax.GetDefinedIndexes(Context.Database);
+            return indexes.Any(x => x.Item2.InvariantEquals(indexName));
+        }
+
         protected bool ColumnExists(string tableName, string columnName)
         {
             var columns = SqlSyntax.GetColumnsInSchema(Context.Database).Distinct().ToArray();
diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index a9444a09180d..cfa82748d207 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -127,7 +127,7 @@ protected void DefinePlan()
             To<ConvertRelatedLinksToMultiUrlPicker>("{ED28B66A-E248-4D94-8CDB-9BDF574023F0}");
             To<UpdatePickerIntegerValuesToUdi>("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
             To<RenameUmbracoDomainsTable>("{6017F044-8E70-4E10-B2A3-336949692ADD}");
-
+            To<AddUserLoginDtoDateIndex>("98339BEF-E4B2-48A8-B9D1-D173DC842BBE");
 
             //FINAL
 
diff --git a/src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs b/src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs
index e03efa8fe946..d7d02631b70a 100644
--- a/src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs
@@ -30,11 +30,14 @@ internal class UserLoginDto
         /// Updated every time a user's session is validated
         /// </summary>
         /// <remarks>
-        /// This allows us to guess if a session is timed out if a user doesn't actively log out
-        /// and also allows us to trim the data in the table
+        /// <para>This allows us to guess if a session is timed out if a user doesn't actively
+        /// log out and also allows us to trim the data in the table.</para>
+        /// <para>The index is IMPORTANT as it prevents deadlocks during deletion of
+        /// old sessions (DELETE ... WHERE lastValidatedUtc &lt; date).</para>
         /// </remarks>
         [Column("lastValidatedUtc")]
         [NullSetting(NullSetting = NullSettings.NotNull)]
+        [Index(IndexTypes.NonClustered, Name = "IX_userLoginDto_lastValidatedUtc")]
         public DateTime LastValidatedUtc { get; set; }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b80d607d4f58..f5bdc417bddf 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -367,6 +367,7 @@
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoAuditTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoConsentTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\CreateSensitiveDataUserGroup.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\AddUserLoginDtoDateIndex.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\ConvertRelatedLinksToMultiUrlPicker.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddLogTableColumns.cs" />

From e08a7c3ea8530ad59ea69e5893509ef7c7065cf3 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 11 Feb 2019 11:54:51 +0100
Subject: [PATCH 390/421] Need to clone the object before removing $-prefixed
 variables. Otherwise we are modifying the same data as the views are using

---
 .../donotpostdollarvariablesrequest.interceptor.js            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
index eabb61132042..03373089d7db 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
@@ -26,7 +26,9 @@
             //dealing with requests:
             'request': function(config) {
                 if(config.method === "POST"){
-                    transform(config.data);
+                    var clone = angular.copy(config);
+                    transform(clone.data);
+                    return clone;
                 }
                 
                 return config;

From 0bdd1131bb4173b2df859fa88cad653b76dd4b6f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 11 Feb 2019 11:57:13 +0100
Subject: [PATCH 391/421] Add missing file

---
 .../V_8_0_0/AddUserLoginDtoDateIndex.cs       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddUserLoginDtoDateIndex.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddUserLoginDtoDateIndex.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddUserLoginDtoDateIndex.cs
new file mode 100644
index 000000000000..0ccc2d93ff69
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddUserLoginDtoDateIndex.cs
@@ -0,0 +1,22 @@
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class AddUserLoginDtoDateIndex : MigrationBase
+    {
+        public AddUserLoginDtoDateIndex(IMigrationContext context)
+            : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            if (!IndexExists("IX_umbracoUserLogin_lastValidatedUtc"))
+                Create.Index("IX_umbracoUserLogin_lastValidatedUtc")
+                    .OnTable(UserLoginDto.TableName)
+                    .OnColumn("lastValidatedUtc")
+                    .Ascending()
+                    .WithOptions().NonClustered()
+                    .Do();
+        }
+    }
+}

From 5342e65f7c0597aed0c0b2933305d2a0b96d1290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 11 Feb 2019 12:46:23 +0100
Subject: [PATCH 392/421] V8: update selection colors for users section

---
 .../subheader/umb-editor-sub-header.less      |  7 ++
 .../less/components/users/umb-user-cards.less | 44 ++++++++-----
 .../src/less/tables.less                      |  9 +++
 .../src/views/member/edit.html                |  9 +--
 .../propertyeditors/listview/listview.html    | 14 ++--
 .../src/views/users/user.html                 |  5 +-
 .../src/views/users/views/groups/groups.html  | 29 +++++----
 .../users/views/users/users.controller.js     | 18 ++----
 .../src/views/users/views/users/users.html    | 64 +++++++++----------
 9 files changed, 112 insertions(+), 87 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 2b9f1e31a561..1aadb1c39b57 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -15,6 +15,13 @@
     }
 }
 
+.umb-editor-sub-header.--state-selection {
+    padding-left: 10px;
+    padding-right: 10px;
+    background-color: @pinkLight;
+    border-radius: 3px;
+}
+
 .umb-editor-sub-header.-umb-sticky-bar {
     box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);
     transition: box-shadow 1s;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
index de2dca5f91ae..e24f68078b94 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
@@ -8,6 +8,8 @@
     box-sizing: border-box;
     max-width: 100%;
     display: flex;
+    position: relative;
+    user-select: none;
 }
 
 .umb-user-card:hover,
@@ -15,6 +17,22 @@
     outline: none;
     text-decoration: none !important;
 }
+.umb-user-card.-selected {
+    &::before {
+        content: "";
+        position: absolute;
+        z-index:2;
+        top: -2px;
+        left: -2px;
+        right: -2px;
+        bottom: -2px;
+        border: 2px solid @ui-selected-border;
+        border-radius: 5px;
+        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
+        pointer-events: none;
+    }
+    
+}
 
 .umb-user-card__content {
     position: relative;
@@ -30,9 +48,12 @@
     max-width: 100%;
 }
 
-.umb-user-card__content:hover,
-.umb-user-card:focus .umb-user-card__content {
-    border-color: @turquoise;
+.umb-user-card__goToUser {
+    &:hover {
+        .umb-user-card__name {
+        text-decoration: underline;
+        }
+    }
 }
 
 .umb-user-card__avatar {
@@ -47,24 +68,13 @@
     left: 10px;
 }
 
+
 .umb-user-card__name {
     font-size: 15px;
     font-weight: bold;
     text-align: center;
     margin-bottom: 2px;
-    word-wrap: break-word; 
-}
-
-.umb-user-card__checkmark {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    display: none;
-}
-
-.umb-user-card:hover .umb-user-card__checkmark,
-.umb-user-card__checkmark--visible {
-    display: block;
+    word-wrap: break-word;
 }
 
 .umb-user-card__group {
@@ -77,4 +87,4 @@
     font-size: 13px;
     text-align: center;
     margin-top: auto;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/tables.less b/src/Umbraco.Web.UI.Client/src/less/tables.less
index fa8a44ec47b8..09b6ea8a425b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tables.less
@@ -62,6 +62,15 @@ table {
 }
 
 
+.table tr > td:first-child {
+    border-left: 4px solid transparent;
+}
+.table tr.--selected > td:first-child {
+    border-left-color:@ui-selected-border;
+}
+
+
+
 
 // CONDENSED TABLE W/ HALF PADDING
 // -------------------------------
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index 310559b4d42a..ee6e9c625cad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -24,13 +24,13 @@
                     <div>{{ group.label }}</div>
                     <ins class="umb-expansion-panel__expand" ng-class="{'icon-navigation-down': !group.open, 'icon-navigation-up': group.open}" class="icon-navigation-right">&nbsp;</ins>
                 </div>
-        
+
                 <div class="umb-expansion-panel__content" ng-show="group.open">
                     <umb-property data-element="property-{{group.alias}}" ng-repeat="property in group.properties track by property.alias" property="property">
                         <umb-property-editor model="property"></umb-property-editor>
                     </umb-property>
                 </div>
-        
+
             </div>
 
          </umb-editor-container>
@@ -38,8 +38,8 @@
          <umb-editor-footer>
 
             <umb-editor-footer-content-left>
-                <umb-breadcrumbs 
-                  ng-if="ancestors && ancestors.length > 0" 
+                <umb-breadcrumbs
+                  ng-if="ancestors && ancestors.length > 0"
                   ancestors="ancestors">
                 </umb-breadcrumbs>
             </umb-editor-footer-content-left>
@@ -51,6 +51,7 @@
                   ng-if="page.listViewPath"
                   type="link"
                   href="#{{page.listViewPath}}"
+                  button-style="link"
                   label="Return to list"
                   label-key="buttons_returnToList">
                </umb-button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 9a638d91fae9..2c70ba573084 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -6,7 +6,7 @@
 
    <div class="row-fluid" ng-switch-when="false">
 
-       <umb-editor-sub-header>
+       <umb-editor-sub-header ng-class="{'--state-selection':(selection.length > 0)}">
 
            <umb-editor-sub-header-content-left>
 
@@ -85,7 +85,7 @@
                        type="button"
                        label="Clear selection"
                        label-key="buttons_clearSelection"
-                       button-style="selection"
+                       button-style="white"
                        action="clearSelection()"
                        disabled="actionInProgress">
                    </umb-button>
@@ -140,7 +140,7 @@
                        ng-if="options.allowBulkPublish && (buttonPermissions == null || buttonPermissions.canPublish)"
                        style="margin-right: 5px;"
                        type="button"
-                       button-style="selection"
+                       button-style="white"
                        label-key="actions_publish"
                        icon="icon-globe"
                        action="publish()"
@@ -153,7 +153,7 @@
                        ng-if="options.allowBulkUnpublish && (buttonPermissions == null || buttonPermissions.canUnpublish)"
                        style="margin-right: 5px;"
                        type="button"
-                       button-style="selection"
+                       button-style="white"
                        label-key="actions_unpublish"
                        icon="icon-block"
                        action="unpublish()"
@@ -166,7 +166,7 @@
                        ng-if="options.allowBulkCopy && (buttonPermissions == null || buttonPermissions.canCopy)"
                        style="margin-right: 5px;"
                        type="button"
-                       button-style="selection"
+                       button-style="white"
                        label-key="actions_copy"
                        icon="icon-documents"
                        action="copy()"
@@ -179,7 +179,7 @@
                        ng-if="options.allowBulkMove && (buttonPermissions == null || buttonPermissions.canMove)"
                        style="margin-right: 5px;"
                        type="button"
-                       button-style="selection"
+                       button-style="white"
                        label-key="actions_move"
                        icon="icon-enter"
                        action="move()"
@@ -191,7 +191,7 @@
                    <umb-button
                        ng-if="options.allowBulkDelete && (buttonPermissions == null || buttonPermissions.canDelete)"
                        type="button"
-                       button-style="selection"
+                       button-style="white"
                        label-key="actions_delete"
                        icon="icon-trash"
                        action="delete()"
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html
index 74b43eb2aa65..3af5cc064a5a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html
@@ -12,9 +12,9 @@
                                hide-alias="true"
                                navigation="vm.user.navigation">
             </umb-editor-header>
-            
+
             <umb-editor-container>
-                
+
                 <div ng-if="!vm.loading" class="umb-user-details-view-wrapper" style="padding: 0;">
 
                     <umb-editor-sub-views
@@ -42,6 +42,7 @@
 
                     <umb-button type="button"
                                 action="vm.goToPage(vm.breadcrumbs[0])"
+                                button-style="link"
                                 label="Return to list"
                                 label-key="buttons_returnToList"
                                 disabled="vm.loading">
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
index deee402fd5fe..863d9658ae9a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
@@ -2,13 +2,13 @@
 
     <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
-    <umb-editor-sub-header>
-            
+    <umb-editor-sub-header ng-class="{'--state-selection':(vm.selection.length > 0)}">
+
         <!-- No selection -->
         <umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
             <umb-button
                 type="button"
-                button-style="success"
+                button-style="action"
                 action="vm.createUserGroup()"
                 label="Create Group"
                 label-key="actions_createGroup">
@@ -40,6 +40,7 @@
                 <umb-button
                     type="button"
                     label-key="buttons_clearSelection"
+                    button-style="white"
                     action="vm.clearSelection()"
                     size="xs">
                 </umb-button>
@@ -54,6 +55,7 @@
                 type="button"
                 label="Delete"
                 label-key="general_delete"
+                button-style="white"
                 icon="icon-trash"
                 action="vm.deleteUserGroups()"
                 size="xs">
@@ -64,7 +66,7 @@
 
     <div style="margin-bottom: 20px;" class="flex items-center">
         <div style="font-size: 16px;">
-            <span class="bold"><localize key="general_groups">Groups</localize> </span> <span>({{vm.userGroups.length}})</span> 
+            <span class="bold"><localize key="general_groups">Groups</localize> </span> <span>({{vm.userGroups.length}})</span>
         </div>
     </div>
 
@@ -76,19 +78,20 @@
             </tr>
         </thead>
         <tbody>
-            <tr ng-repeat="group in vm.userGroups | filter:vm.filter" 
-                ng-click="vm.goToUserGroup(group)" 
-                ng-class="{'cursor-pointer': group.hasAccess, 'cursor-not-allowed': !group.hasAccess}">
-                
-                <td style="width: 20px; padding-right: 5px">
+            <tr ng-repeat="group in vm.userGroups | filter:vm.filter"
+                ng-click="vm.goToUserGroup(group)"
+                ng-class="{'cursor-pointer': group.hasAccess, 'cursor-not-allowed': !group.hasAccess, '--selected': group.selected}">
+
+                <td style="padding-right: 5px">
                     <input
                         ng-show="group.hasAccess && group.group.alias !== 'admin' && group.group.alias !== 'translator'"
-                        type="checkbox" 
+                        type="checkbox"
                         ng-model="group.selected"
-                        ng-click="vm.selectUserGroup(group, vm.selection, $event)" />
+                        ng-click="vm.selectUserGroup(group, vm.selection, $event)"
+                        style="width: 20px; height: 100px;"/>
                 </td>
                 <td>
-                    <umb-user-group-preview 
+                    <umb-user-group-preview
                         style="border-bottom: none; margin-bottom: 0; padding: 0;"
                         icon="group.group.icon"
                         name="group.group.name"
@@ -101,4 +104,4 @@
         </tbody>
     </table>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 92ed10267d12..6e624bfbe3ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -199,14 +199,14 @@
             vm.activeLayout = selectedLayout;
         }
 
-        function selectUser(user, selection, event) {
+        function selectUser(user, event) {
 
-            // prevent the current user to be selected
-            if (!user.isCurrentUser) {
+            // prevent the current user to be selected, why?
+            //if (!user.isCurrentUser) {
 
                 if (user.selected) {
-                    var index = selection.indexOf(user.id);
-                    selection.splice(index, 1);
+                    var index = vm.selection.indexOf(user.id);
+                    vm.selection.splice(index, 1);
                     user.selected = false;
                 } else {
                     user.selected = true;
@@ -219,7 +219,7 @@
                     event.preventDefault();
                     event.stopPropagation();
                 }
-            }
+            //}
         }
 
         function clearSelection() {
@@ -230,11 +230,7 @@
         }
 
         function clickUser(user) {
-            if (vm.selection.length > 0) {
-                selectUser(user, vm.selection);
-            } else {
-                goToUser(user.id);
-            }
+            goToUser(user.id);
         }
 
         function disableUsers() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 4b6f77e696ec..c270e823e6af 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -5,7 +5,7 @@
 
         <umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
 
-        <umb-editor-sub-header>
+        <umb-editor-sub-header ng-class="{'--state-selection':(vm.selection.length > 0)}">
 
             <!-- No selection -->
             <umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
@@ -49,7 +49,7 @@
                     <umb-button
                         type="button"
                         size="xs"
-                        button-style="outline"
+                        button-style="white"
                         label-key="buttons_clearSelection"
                         action="vm.clearSelection()"
                         disabled="actionInProgress">
@@ -58,16 +58,16 @@
                 <umb-editor-sub-header-section>
                     <strong>{{ vm.selection.length }} <localize key="general_of">of</localize> {{ vm.users.length }} <localize key="general_selected">selected</localize></strong>
                 </umb-editor-sub-header-section>
-                
+
             </umb-editor-sub-header-content-left>
 
             <umb-editor-sub-header-content-right ng-if="vm.selection.length > 0">
                 <umb-button
                     style="margin-right: 5px;"
                     ng-if="vm.allowSetUserGroup"
-                    type="button" 
+                    type="button"
                     size="xs"
-                    button-style="outline"
+                    button-style="white"
                     label-key="actions_setGroup"
                     icon="icon-users"
                     action="vm.openBulkUserGroupPicker()">
@@ -78,19 +78,19 @@
                     ng-if="vm.allowEnableUser"
                     type="button"
                     size="xs"
-                    button-style="outline"
+                    button-style="white"
                     state="vm.enableUserButtonState"
                     label-key="actions_enable"
                     icon="icon-check"
                     action="vm.enableUsers()">
                 </umb-button>
-      
+
                 <umb-button
                     style="margin-right: 5px;"
                     ng-if="vm.allowUnlockUser"
                     type="button"
                     size="xs"
-                    button-style="outline"
+                    button-style="white"
                     state="vm.unlockUserButtonState"
                     label-key="actions_unlock"
                     icon="icon-unlocked"
@@ -101,7 +101,7 @@
                     ng-if="vm.allowDisableUser"
                     type="button"
                     size="xs"
-                    button-style="outline"
+                    button-style="white"
                     state="vm.disableUserButtonState"
                     label-key="actions_disable"
                     icon="icon-block"
@@ -124,7 +124,7 @@
                 <!-- State filter -->
                 <div style="position: relative;" ng-if="vm.userStatesFilter.length > 0">
                     <a class="btn btn-link dropdown-toggle flex" href="" ng-click="vm.toggleFilter('state')">
-                        <span><localize key="general_status">Status</localize>:</span> 
+                        <span><localize key="general_status">Status</localize>:</span>
                         <span class="bold truncate dib" style="margin-left: 5px; margin-right: 3px; max-width: 150px;">{{ vm.getFilterName(vm.userStatesFilter) }}</span>
                         <span class="caret"></span>
                     </a>
@@ -168,7 +168,7 @@
                 <!-- Order By -->
                 <div style="position: relative;">
                     <a class="btn btn-link dropdown-toggle flex" href="" ng-click="vm.toggleFilter('orderBy')">
-                        <span><localize key="general_orderBy">Order by</localize>:</span> 
+                        <span><localize key="general_orderBy">Order by</localize>:</span>
                         <span class="bold" style="margin-left: 2px;">{{ vm.getSortLabel(vm.usersOptions.orderBy, vm.usersOptions.orderDirection) }} </span>
                         <span class="caret"></span>
                     </a>
@@ -192,20 +192,18 @@
 
         <!-- Layout: Cards -->
         <div class="umb-user-cards" ng-if="vm.activeLayout.path === '1' && vm.loading === false">
-            <a href="" class="umb-user-card" ng-repeat="user in vm.users track by user.key" ng-click="vm.clickUser(user)">
-                <div class="umb-user-card__content" ng-class="{'umb-user-card__content--selected': user.selected}">
-                    <umb-badge class="umb-user-card__badge" size="xs" ng-if="user.userDisplayState.key !== 'Active'" color="{{user.userDisplayState.color}}">
-                        {{ user.userDisplayState.name }}
-                    </umb-badge>
-                    <div class="umb-user-card__avatar">
-                        <umb-avatar size="l" color="secondary" name="{{user.name}}" img-src="{{user.avatars[2]}}" img-srcset="{{user.avatars[3]}} 2x, {{user.avatars[4]}} 3x">
-                        </umb-avatar>
-                    </div>
-                    <div class="umb-user-card__checkmark" ng-class="{'umb-user-card__checkmark--visible': user.selected || vm.selection.length > 0 }"
-                        ng-click="vm.selectUser(user, vm.selection, $event)">
-                        <umb-checkmark ng-if="!user.isCurrentUser" checked="user.selected" size="s"></umb-checkmark>
+            <div class="umb-user-card" ng-class="{'-selected': user.selected}" ng-repeat="user in vm.users track by user.key" ng-click="vm.selectUser(user)">
+                <div class="umb-user-card__content">
+                    <div class="umb-user-card__goToUser" ng-click="vm.clickUser(user)">
+                        <umb-badge class="umb-user-card__badge" size="xs" ng-if="user.userDisplayState.key !== 'Active'" color="{{user.userDisplayState.color}}">
+                            {{ user.userDisplayState.name }}
+                        </umb-badge>
+                        <div class="umb-user-card__avatar">
+                            <umb-avatar size="l" color="secondary" name="{{user.name}}" img-src="{{user.avatars[2]}}" img-srcset="{{user.avatars[3]}} 2x, {{user.avatars[4]}} 3x">
+                            </umb-avatar>
+                        </div>
+                        <div class="umb-user-card__name">{{user.name}}</div>
                     </div>
-                    <div class="umb-user-card__name" href="">{{user.name}}</div>
                     <div class="umb-user-card__group">
                         <span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span>
                     </div>
@@ -223,7 +221,7 @@
                         </div>
                     </div>
                 </div>
-            </a>
+            </div>
         </div>
 
         <!-- Layout: Table -->
@@ -332,7 +330,7 @@ <h3 class="bold" style="margin-bottom: 0;">
                                 <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
                                 <span class="help-inline" ng-message="valServerField">{{addUserForm.name.errorMsg}}</span>
                             </span>
-                            
+
                         </umb-control-group>
 
                         <umb-control-group label="@general_username" label-for="username" required="true" ng-if="!vm.usernameIsEmail">
@@ -342,7 +340,7 @@ <h3 class="bold" style="margin-bottom: 0;">
                                 <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
                                 <span class="help-inline" ng-message="valServerField">{{addUserForm.username.errorMsg}}</span>
                             </span>
-                            
+
                         </umb-control-group>
 
                         <umb-control-group label="@general_email" label-for="email" required="true">
@@ -356,7 +354,7 @@ <h3 class="bold" style="margin-bottom: 0;">
                         </umb-control-group>
 
                         <umb-control-group label="@user_usergroup" description="@user_groupsHelp" required="true">
-                            
+
                             <umb-user-group-preview
                                 ng-repeat="group in vm.newUser.userGroups"
                                 icon="group.icon"
@@ -418,18 +416,18 @@ <h3 class="bold" style="margin-bottom: 0;">
 
     <!-- Create user success -->
     <div ng-if="vm.usersViewState === 'createUserSuccess'">
-        
+
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
                 <a class="umb-package-details__back-link" href="" ng-click="vm.setUsersViewState('overview');">&larr; <localize key="user_backToUsers">Back to users</localize></a>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
-        
+
         <div class="flex justify-center">
 
             <umb-box style="max-width: 500px;">
                 <umb-box-content>
-                
+
                     <!-- Success text -->
                     <div class="flex items-center" style="margin-bottom: 15px;">
                         <umb-checkmark
@@ -443,7 +441,7 @@ <h3 class="bold" style="margin: 0 0 0 10px;">
                     </div>
 
                     <p style="line-height: 1.6em; margin-bottom: 20px;"><localize key="user_userCreatedSuccessHelp"></localize></p>
-                    
+
                     <!-- New password -->
                     <div>
                         <label class="bold"><localize key="user_password">Password</localize></label>
@@ -511,7 +509,7 @@ <h3 class="bold" style="margin: 0 0 0 10px;">
 
             <umb-box style="max-width: 500px;">
                 <umb-box-content>
-                    
+
                 <!-- Success text -->
                 <div class="flex items-center" style="margin-bottom: 15px;">
                     <umb-checkmark

From a6fc9f4ede78d1181038ef94b6791266f21ab0e8 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 11 Feb 2019 13:27:50 +0100
Subject: [PATCH 393/421] v8: Fix users layout switcher (#4458)

* Localize edit link, remove duplicate class attributes and only make remove link red

* Revert "Localize edit link, remove duplicate class attributes and only make remove link red"

This reverts commit 63cc250c0f929b1f7e6f9f05fae2fd302682d418.

* Use built-in $id function for tracky by since users doesn't have name property

* Set active layout to card layout

* Update onLayoutSelect

* Format document
---
 .../components/umblayoutselector.directive.js |  2 +-
 .../views/components/umb-layout-selector.html |  2 +-
 .../users/views/users/users.controller.js     |  9 +++------
 .../src/views/users/views/users/users.html    | 19 +++++++++----------
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
index 87cd84ca403e..58a5e1be0e42 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
@@ -10,7 +10,7 @@
             bindings: {
                 layouts: '<',
                 activeLayout: '<',
-                onLayoutSelect: "&"
+                onLayoutSelect: '&'
             }
         });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
index 21840cb1d111..c84e63a359db 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
@@ -8,7 +8,7 @@
         class="umb-layout-selector__dropdown shadow-depth-3 animated -half-second fadeIn"
         on-outside-click="vm.closeLayoutDropdown()">
 
-       <div ng-repeat="layout in vm.layouts | filter:{selected:true} track by layout.name"
+       <div ng-repeat="layout in vm.layouts | filter:{selected:true} track by $id(layout)"
             class="umb-layout-selector__dropdown-item"
             ng-click="vm.pickLayout(layout)"
             ng-class="{'-active': layout.active }"
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 92ed10267d12..2001b95e9992 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -59,13 +59,10 @@
             }
         ];
 
-        vm.activeLayout = {
-            "icon": "icon-thumbnails-small",
-            "path": "1",
-            "selected": true
-        };
+        // Set card layout to active by default
+        vm.activeLayout = vm.layouts[0];
 
-        //don't show the invite button if no email is configured
+        // Don't show the invite button if no email is configured
         if (Umbraco.Sys.ServerVariables.umbracoSettings.showUserInvite) {
             vm.defaultButton = {
                 labelKey: "user_inviteUser",
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 4b6f77e696ec..c764e919c88e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -23,21 +23,20 @@
                         ng-if="vm.layouts"
                         layouts="vm.layouts"
                         active-layout="vm.activeLayout"
-                        on-layout-select="vm.selectLayout">
+                        on-layout-select="vm.selectLayout(layout)">
                     </umb-layout-selector>
                 </umb-editor-sub-header-section>
                 <umb-editor-sub-header-section>
                     <div class="form-search -no-margin-bottom pull-right">
                         <div class="inner-addon left-addon">
                             <i class="icon icon-search"></i>
-                            <input
-                                class="form-control search-input"
-                                type="text" localize="placeholder"
-                                placeholder="@general_typeToSearch"
-                                ng-model="vm.usersOptions.filter"
-                                ng-change="vm.searchUsers()"
-                                prevent-enter-submit
-                                no-dirty-check>
+                            <input class="form-control search-input"
+                                   type="text" localize="placeholder"
+                                   placeholder="@general_typeToSearch"
+                                   ng-model="vm.usersOptions.filter"
+                                   ng-change="vm.searchUsers()"
+                                   prevent-enter-submit
+                                   no-dirty-check>
                         </div>
                     </div>
                 </umb-editor-sub-header-section>
@@ -229,7 +228,7 @@
         <!-- Layout: Table -->
         <div ng-if="vm.activeLayout.path === '2'">
 
-      <table class="table table-hover">
+            <table class="table table-hover">
                 <thead>
                     <tr>
                         <th style="padding-left: 10px; width: 10px;">

From 64f41541fe399419f1650c5178d0ca2005767c78 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 11 Feb 2019 13:33:52 +0100
Subject: [PATCH 394/421] Fix the tree item state annotations (#4497)

---
 .../src/less/components/tree/umb-tree.less    | 35 +++++++++----------
 .../views/components/tree/umb-tree-item.html  |  7 ++--
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 698a4211f5ae..eaa26b5d1a86 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -232,43 +232,40 @@ body.touch .umb-tree {
     }
 }
 
-.protected,
-.has-unpublished-version,
-.is-container,
-.locked {
+.umb-tree-item__annotation {
     &::before {
         font-family: 'icomoon';
         position: absolute;
-        font-size: 20px;
-        padding-left: 7px;
-        padding-top: 7px;
         bottom: 0;
     }
 }
 
-.protected::before {
-    content: "\e256";
-    color: @red;
-}
-
-.has-unpublished-version::before {
+.has-unpublished-version > .umb-tree-item__inner > .umb-tree-item__annotation::before {
     content: "\e25a";
     color: @green;
+    font-size: 20px;
+    margin-left: -25px;
 }
 
-.is-container::before {
+.is-container > .umb-tree-item__inner > .umb-tree-item__annotation::before {
     content: "\e04e";
     color: @blue;
-    font-size: 8px;
-    padding-left: 13px;
-    padding-top: 8px;
-    pointer-events: none;
+    font-size: 9px;
+    margin-left: -20px;
 }
 
+.protected > .umb-tree-item__inner > .umb-tree-item__annotation::before {
+    content: "\e256";
+    color: @red;
+    font-size: 20px;
+    margin-left: -25px;
+}
 
-.locked::before {
+.locked > .umb-tree-item__inner > .umb-tree-item__annotation::before {
     content: "\e0a7";
     color: @red;
+    font-size: 9px;
+    margin-left: -20px;
 }
 
 .no-access {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
index 9474e9835067..b11b656c8ea7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
@@ -1,11 +1,12 @@
 <li class="umb-tree-item" data-element="tree-item-{{::node.dataElement}}" ng-class="getNodeCssClass(node)" on-right-click="altSelect(node, $event)">
     <div class="umb-tree-item__inner" ng-swipe-right="options(node, $event)" ng-dblclick="load(node)" >
         <ins data-element="tree-item-expand"
-            ng-class="{'icon-navigation-right': !node.expanded || node.metaData.isContainer, 'icon-navigation-down': node.expanded && !node.metaData.isContainer}"
-            ng-style="{'visibility': (scope.enablelistviewexpand === 'true' || node.hasChildren && (!node.metaData.isContainer || isDialog)) ? 'visible' : 'hidden'}"
-            ng-click="load(node)">&nbsp;</ins>
+             ng-class="{'icon-navigation-right': !node.expanded || node.metaData.isContainer, 'icon-navigation-down': node.expanded && !node.metaData.isContainer}"
+             ng-style="{'visibility': (scope.enablelistviewexpand === 'true' || node.hasChildren && (!node.metaData.isContainer || isDialog)) ? 'visible' : 'hidden'}"
+             ng-click="load(node)">&nbsp;</ins>
 
         <i class="icon umb-tree-icon sprTree" ng-class="::node.cssClass" title="{{::node.routePath}}" ng-click="select(node, $event)" ng-style="::node.style"></i>
+        <span class="umb-tree-item__annotation"></span>
         <a class="umb-tree-item__label" ng-href="#/{{::node.routePath}}" ng-click="select(node, $event)">{{node.name}}</a>
 
         <!-- NOTE: These are the 'option' elipses -->

From 154b59c84b9f365391e381405b6dcc0da3031d9d Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 11 Feb 2019 14:09:40 +0100
Subject: [PATCH 395/421] Fix redirect tracking

---
 .../Routing/RedirectTrackingComponent.cs      | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
index c49dffd6e422..acbd022f2e59 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
@@ -38,16 +38,24 @@ private static Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute> OldRoutes
         {
             get
             {
-                var oldRoutes =
-                    (Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute>) UmbracoContext.Current.HttpContext.Items[
-                        ContextKey3];
+                var oldRoutes = (Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute>) UmbracoContext.Current.HttpContext.Items[ContextKey3];
                 if (oldRoutes == null)
-                    UmbracoContext.Current.HttpContext.Items[ContextKey3] =
-                        oldRoutes = new Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute>();
+                    UmbracoContext.Current.HttpContext.Items[ContextKey3] = oldRoutes = new Dictionary<ContentIdAndCulture, ContentKeyAndOldRoute>();
                 return oldRoutes;
             }
         }
 
+        private static bool HasOldRoutes
+        {
+            get
+            {
+                if (Current.UmbracoContext == null) return false;
+                if (Current.UmbracoContext.HttpContext == null) return false;
+                if (Current.UmbracoContext.HttpContext.Items[ContextKey3] == null) return false;
+                return true;
+            }
+        }
+
         private static bool LockedEvents
         {
             get => Moving && UmbracoContext.Current.HttpContext.Items[ContextKey2] != null;
@@ -97,8 +105,8 @@ public void Initialize()
             ContentService.Published += ContentService_Published;
             ContentService.Moving += ContentService_Moving;
             ContentService.Moved += ContentService_Moved;
-            ContentCacheRefresher.CacheUpdated += ContentCacheRefresher_CacheUpdated;
 
+            ContentCacheRefresher.CacheUpdated += ContentCacheRefresher_CacheUpdated;
 
             // kill all redirects once a content is deleted
             //ContentService.Deleted += ContentService_Deleted;
@@ -111,21 +119,26 @@ public void Initialize()
         public void Terminate()
         { }
 
-        private static void ContentCacheRefresher_CacheUpdated(ContentCacheRefresher sender,
-            CacheRefresherEventArgs args)
+        private static void ContentCacheRefresher_CacheUpdated(ContentCacheRefresher sender, CacheRefresherEventArgs args)
         {
+            // that event is a distributed even that triggers on all nodes
+            // BUT it should totally NOT run on nodes other that the one that handled the other events
+            // and besides, it cannot run on a background thread!
+            if (!HasOldRoutes)
+                return;
+
             // sanity checks
             if (args.MessageType != MessageType.RefreshByPayload)
             {
                 throw new InvalidOperationException("ContentCacheRefresher MessageType should be ByPayload.");
             }
+
             if (args.MessageObject == null)
             {
                 return;
             }
 
-            var payloads = args.MessageObject as ContentCacheRefresher.JsonPayload[];
-            if (payloads == null)
+            if (!(args.MessageObject is ContentCacheRefresher.JsonPayload[]))
             {
                 throw new InvalidOperationException("ContentCacheRefresher MessageObject should be JsonPayload[].");
             }
@@ -137,8 +150,7 @@ private static void ContentCacheRefresher_CacheUpdated(ContentCacheRefresher sen
             {
                 // assuming we cannot have 'CacheUpdated' for only part of the infos else we'd need
                 // to set a flag in 'Published' to indicate which entities have been refreshed ok
-                CreateRedirect(oldRoute.Key.ContentId, oldRoute.Key.Culture, oldRoute.Value.ContentKey,
-                    oldRoute.Value.OldRoute);
+                CreateRedirect(oldRoute.Key.ContentId, oldRoute.Key.Culture, oldRoute.Value.ContentKey, oldRoute.Value.OldRoute);
                 removeKeys.Add(oldRoute.Key);
             }
 

From e4a492dc572f16a41a80c4fb1702cfd9b8277168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 11 Feb 2019 14:30:01 +0100
Subject: [PATCH 396/421] Disable button dont hide them + dont select current
 user

---
 .../users/views/users/users.controller.js     | 67 +++++++++----------
 .../src/views/users/views/users/users.html    | 21 +++---
 2 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 6862ffa1f63b..c0e59be8e450 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -196,27 +196,23 @@
             vm.activeLayout = selectedLayout;
         }
 
-        function selectUser(user, event) {
-
-            // prevent the current user to be selected, why?
-            //if (!user.isCurrentUser) {
-
-                if (user.selected) {
-                    var index = vm.selection.indexOf(user.id);
-                    vm.selection.splice(index, 1);
-                    user.selected = false;
-                } else {
-                    user.selected = true;
-                    vm.selection.push(user.id);
-                }
-
-                setBulkActions(vm.users);
-
-                if (event) {
-                    event.preventDefault();
-                    event.stopPropagation();
-                }
-            //}
+        function selectUser(user) {
+            
+            if (user.isCurrentUser) {
+                return;
+            }
+            
+            if (user.selected) {
+                var index = vm.selection.indexOf(user.id);
+                vm.selection.splice(index, 1);
+                user.selected = false;
+            } else {
+                user.selected = true;
+                vm.selection.push(user.id);
+            }
+            
+            setBulkActions(vm.users);
+            
         }
 
         function clearSelection() {
@@ -621,18 +617,20 @@
             var firstSelectedUserGroups;
 
             angular.forEach(users, function (user) {
-
+                
                 if (!user.selected) {
                     return;
                 }
-
+                
+                console.log("CHECK")
                 // if the current user is selected prevent any bulk actions with the user included
                 if (user.isCurrentUser) {
                     vm.allowDisableUser = false;
                     vm.allowEnableUser = false;
                     vm.allowUnlockUser = false;
                     vm.allowSetUserGroup = false;
-                    return;
+                    console.log("IS CURRENT!")
+                    return false;
                 }
 
                 if (user.userDisplayState && user.userDisplayState.key === "Disabled") {
@@ -656,16 +654,17 @@
                 }
 
                 // store the user group aliases of the first selected user
-                if (!firstSelectedUserGroups) {
-                    firstSelectedUserGroups = user.userGroups.map(function (ug) { return ug.alias; });
-                    vm.allowSetUserGroup = true;
-                } else if (vm.allowSetUserGroup === true) {
-                    // for 2nd+ selected user, compare the user group aliases to determine if we should allow bulk editing.
-                    // we don't allow bulk editing of users not currently having the same assigned user groups, as we can't
-                    // really support that in the user group picker.
-                    var userGroups = user.userGroups.map(function (ug) { return ug.alias; });
-                    if (_.difference(firstSelectedUserGroups, userGroups).length > 0) {
-                        vm.allowSetUserGroup = false;
+                if (vm.allowSetUserGroup === true) {
+                    if (!firstSelectedUserGroups) {
+                        firstSelectedUserGroups = user.userGroups.map(function (ug) { return ug.alias; });
+                    } else {
+                        // for 2nd+ selected user, compare the user group aliases to determine if we should allow bulk editing.
+                        // we don't allow bulk editing of users not currently having the same assigned user groups, as we can't
+                        // really support that in the user group picker.
+                        var userGroups = user.userGroups.map(function (ug) { return ug.alias; });
+                        if (_.difference(firstSelectedUserGroups, userGroups).length > 0) {
+                            vm.allowSetUserGroup = false;
+                        }
                     }
                 }
             });
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index b0a64fa6c0b2..cefc3c5c8617 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -63,7 +63,7 @@
             <umb-editor-sub-header-content-right ng-if="vm.selection.length > 0">
                 <umb-button
                     style="margin-right: 5px;"
-                    ng-if="vm.allowSetUserGroup"
+                    disabled="!vm.allowSetUserGroup"
                     type="button"
                     size="xs"
                     button-style="white"
@@ -74,7 +74,7 @@
 
                 <umb-button
                     style="margin-right: 5px;"
-                    ng-if="vm.allowEnableUser"
+                    disabled="!vm.allowEnableUser"
                     type="button"
                     size="xs"
                     button-style="white"
@@ -86,7 +86,7 @@
 
                 <umb-button
                     style="margin-right: 5px;"
-                    ng-if="vm.allowUnlockUser"
+                    disabled="!vm.allowUnlockUser"
                     type="button"
                     size="xs"
                     button-style="white"
@@ -97,7 +97,7 @@
                 </umb-button>
 
                 <umb-button
-                    ng-if="vm.allowDisableUser"
+                    disabled="!vm.allowDisableUser"
                     type="button"
                     size="xs"
                     button-style="white"
@@ -242,9 +242,14 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="user in vm.users track by user.key" ng-click="vm.clickUser(user)" style="cursor: pointer;" ng-mouseenter="user.hover = true" ng-mouseleave="user.hover = false">
+                    <tr ng-repeat="user in vm.users track by user.key"
+                        ng-click="vm.selectUser(user, vm.selection, $event)"
+                        ng-class="{'--selected': user.selected}"
+                        style="cursor: pointer;"
+                        ng-mouseenter="user.hover = true"
+                        ng-mouseleave="user.hover = false">
                         <td style="padding-left: 10px;">
-                            <div ng-if="!user.isCurrentUser" ng-click="vm.selectUser(user, vm.selection, $event)">
+                            <div ng-if="!user.isCurrentUser">
                                 <umb-checkmark
                                     ng-if="vm.selection.length > 0 || user.hover"
                                     checked="user.selected"
@@ -252,7 +257,7 @@
                                 </umb-checkmark>
                             </div>
                         </td>
-                        <td scope="row">
+                        <td scope="row" ng-click="vm.clickUser(user)">
                             <umb-avatar
                                 size="xs"
                                 color="secondary"
@@ -261,7 +266,7 @@
                                 img-srcset="{{user.avatars[1]}} 2x, {{user.avatars[2]}} 3x">
                             </umb-avatar>
                         </td>
-                        <td class="bold">{{user.name}}</td>
+                        <td class="bold" ng-click="vm.clickUser(user)">{{user.name}}</td>
                         <td><span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span></td>
                         <td>{{ user.formattedLastLogin }}</td>
                         <td style="text-transform: capitalize;">

From 944c8d59d764cf99a255c7acdda57f5dab56c92e Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 11 Feb 2019 15:30:11 +0100
Subject: [PATCH 397/421] Need to clone the object before removing $-prefixed
 variables. Otherwise we are modifying the same data as the views are using

---
 src/Umbraco.Core/Constants-Applications.cs    |  9 +-
 .../Migrations/Install/DatabaseDataCreator.cs |  4 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  1 +
 .../dashboard/dashboard.tabs.controller.js    | 99 -------------------
 .../dashboard/forms/formsdashboardintro.html  |  8 --
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 +
 .../Umbraco/config/lang/en_us.xml             |  3 +-
 src/Umbraco.Web/Dashboards/FormsDashboard.cs  |  3 +-
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  1 +
 .../Trees/FormsBackOfficeSection.cs           | 14 +++
 src/Umbraco.Web/Trees/FormsTreeController.cs  | 27 +++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +
 12 files changed, 57 insertions(+), 115 deletions(-)
 create mode 100644 src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
 create mode 100644 src/Umbraco.Web/Trees/FormsTreeController.cs

diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index 2d4042fad08a..e66df3a5f972 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -45,7 +45,7 @@ public static class Applications
             /// <summary>
             /// Application alias for the forms section.
             /// </summary>
-            public const string Forms = "forms";
+            public const string FormsInstaller = "formsInstaller";
         }
 
         /// <summary>
@@ -77,7 +77,7 @@ public static class Trees
             /// alias for the macro tree.
             /// </summary>
             public const string Macros = "macros";
-            
+
             /// <summary>
             /// alias for the datatype tree.
             /// </summary>
@@ -92,7 +92,7 @@ public static class Trees
             /// alias for the dictionary tree.
             /// </summary>
             public const string Dictionary = "dictionary";
-            
+
             public const string Stylesheets = "stylesheets";
 
             /// <summary>
@@ -121,7 +121,7 @@ public static class Trees
             public const string Templates = "templates";
 
             public const string RelationTypes = "relationTypes";
-            
+
             public const string Languages = "languages";
 
             /// <summary>
@@ -138,6 +138,7 @@ public static class Trees
             /// alias for the users tree.
             /// </summary>
             public const string Users = "users";
+            public const string Forms = "formsInstaller";
 
             public const string Scripts = "scripts";
 
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 7f7229ccd6bd..055b8992316d 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -189,13 +189,13 @@ private void CreateUserGroup2AppData()
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Members });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Settings });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Users });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Forms });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.FormsInstaller });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 2, AppAlias = Constants.Applications.Content });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Content });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Media });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Forms });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.FormsInstaller });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 4, AppAlias = Constants.Applications.Translation });
         }
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index c404e0404d7f..a868245940d7 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -228,6 +228,7 @@ protected virtual void ComposeWeb()
                 .Append<PackagesBackOfficeSection>()
                 .Append<UsersBackOfficeSection>()
                 .Append<MembersBackOfficeSection>()
+                .Append<FormsBackOfficeSection>()
                 .Append<TranslationBackOfficeSection>();
             Composition.RegisterUnique<ISectionService, SectionService>();
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index ed3d6ded33fa..e801e2cc5839 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -192,7 +192,6 @@ function FormsController($scope, $route, $cookies, packageResource, localization
     function Video_player (videoId) {
       // Get dom elements
       this.container      = document.getElementById(videoId);
-      this.video          = this.container.getElementsByTagName('video')[0];
 
       //Create controls
       this.controls = document.createElement('div');
@@ -215,104 +214,6 @@ function FormsController($scope, $route, $cookies, packageResource, localization
       this.controls.appendChild(this.loader);
       this.loader.appendChild(this.progress_bar);
     }
-
-
-    Video_player.prototype
-      .seeking = function() {
-        // get the value of the seekbar (hidden input[type="range"])
-        var time = this.video.duration * (this.seek_bar.value / 100);
-
-        // Update video to seekbar value
-        this.video.currentTime = time;
-      };
-
-    // Stop video when user initiates seeking
-    Video_player.prototype
-      .start_seek = function() {
-        this.video.pause();
-      };
-
-    // Start video when user stops seeking
-    Video_player.prototype
-      .stop_seek = function() {
-        this.video.play();
-      };
-
-    // Update the progressbar (span.loader) according to video.currentTime
-    Video_player.prototype
-      .update_progress_bar = function() {
-        // Get video progress in %
-        var value = (100 / this.video.duration) * this.video.currentTime;
-
-        // Update progressbar
-        this.progress_bar.style.width = value + '%';
-      };
-
-    // Bind progressbar to mouse when seeking
-    Video_player.prototype
-      .handle_mouse_move = function(event) {
-        // Get position of progressbar relative to browser window
-        var pos = this.progress_bar.getBoundingClientRect().left;
-
-        // Make sure event is reckonized cross-browser
-        event = event || window.event;
-
-        // Update progressbar
-        this.progress_bar.style.width = (event.clientX - pos) + "px";
-      };
-
-    // Eventlisteners for seeking
-    Video_player.prototype
-      .video_event_handler = function(videoPlayer, interval) {
-        // Update the progress bar
-        var animate_progress_bar = setInterval(function () {
-              videoPlayer.update_progress_bar();
-            }, interval);
-
-        // Fire when input value changes (user seeking)
-        videoPlayer.seek_bar
-          .addEventListener("change", function() {
-              videoPlayer.seeking();
-          });
-
-        // Fire when user clicks on seekbar
-        videoPlayer.seek_bar
-          .addEventListener("mousedown", function (clickEvent) {
-              // Pause video playback
-              videoPlayer.start_seek();
-
-              // Stop updating progressbar according to video progress
-              clearInterval(animate_progress_bar);
-
-              // Update progressbar to where user clicks
-              videoPlayer.handle_mouse_move(clickEvent);
-
-              // Bind progressbar to cursor
-              window.onmousemove = function(moveEvent){
-                videoPlayer.handle_mouse_move(moveEvent);
-              };
-          });
-
-        // Fire when user releases seekbar
-        videoPlayer.seek_bar
-          .addEventListener("mouseup", function () {
-
-              // Unbind progressbar from cursor
-              window.onmousemove = null;
-
-              // Start video playback
-              videoPlayer.stop_seek();
-
-              // Animate the progressbar
-              animate_progress_bar = setInterval(function () {
-                  videoPlayer.update_progress_bar();
-              }, interval);
-          });
-      };
-
-
-    var videoPlayer = new Video_player('video_1');
-    videoPlayer.video_event_handler(videoPlayer, 17);
 }
 
 angular.module("umbraco").controller("Umbraco.Dashboard.FormsDashboardController", FormsController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
index 3b382367c431..c18e7f4ccf4a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
@@ -8,14 +8,6 @@ <h3>Umbraco Forms</h3>
 
 		<div class="step-one" ng-hide="state"> <!-- STEP one -->
 
-			<div id="video_1" class="video_player" style="margin-bottom: 40px">
-				<video autoplay loop>
-					<!-- <source src="videos/gif.webm" type="video/webm"> -->
-					<source src="https://player.vimeo.com/external/110229004.hd.mp4?s=823f701836260bd08fb783d38389f628" type="video/mp4">
-					Sorry, you don't have HTML5 video and we didn't catch this properly in javascript.
-				</video>
-			</div>
-
 			<p style="font-size: 16px; line-height: 1.5; color: #4c4c4c; margin-bottom: 20px;">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</p>
 
 			<umb-button
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 548d6932a6c6..91a4d9378c8d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1244,6 +1244,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="courier">Courier</key>
     <key alias="developer">Developer</key>
     <key alias="forms">Forms</key>
+    <key alias="formsInstaller">Forms</key>
     <key alias="help" version="7.0">Help</key>
     <key alias="installer">Umbraco Configuration Wizard</key>
     <key alias="media">Media</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 852abcd5d82b..b9aa3b6ece6e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1247,6 +1247,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="sections">
     <key alias="content">Content</key>
     <key alias="forms">Forms</key>
+    <key alias="formsInstaller">Forms</key>
     <key alias="media">Media</key>
     <key alias="member">Members</key>
     <key alias="packages">Packages</key>
@@ -1388,7 +1389,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="styles">Styles</key>
     <key alias="stylesHelp">The CSS that should be applied in the rich text editor, e.g. "color:red;"</key>
     <key alias="tabCode">Code</key>
-    <key alias="tabRules">Rich Text Editor</key>   
+    <key alias="tabRules">Rich Text Editor</key>
   </area>
   <area alias="template">
     <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
diff --git a/src/Umbraco.Web/Dashboards/FormsDashboard.cs b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
index a3e1123369cc..bb21a04fdc64 100644
--- a/src/Umbraco.Web/Dashboards/FormsDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
@@ -9,7 +10,7 @@ public class FormsDashboard : IDashboard
     {
         public string Alias => "formsInstall";
 
-        public string[] Sections => new [] { "forms" };
+        public string[] Sections => new [] { Constants.Applications.FormsInstaller };
 
         public string View => "views/dashboard/forms/formsdashboardintro.html";
 
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 3afe6aa39708..52373184b41b 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -220,6 +220,7 @@ public override void Compose(Composition composition)
                 .Append<PackagesBackOfficeSection>()
                 .Append<UsersBackOfficeSection>()
                 .Append<MembersBackOfficeSection>()
+                .Append<FormsBackOfficeSection>()
                 .Append<TranslationBackOfficeSection>();
 
             // register core CMS dashboards and 3rd party types - will be ordered by weight attribute & merged with package.manifest dashboards
diff --git a/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs b/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
new file mode 100644
index 000000000000..681fe6199333
--- /dev/null
+++ b/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
@@ -0,0 +1,14 @@
+using Umbraco.Core;
+using Umbraco.Core.Models.Trees;
+
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// Defines the back office media section
+    /// </summary>
+    public class FormsBackOfficeSection : IBackOfficeSection
+    {
+        public string Alias => Constants.Applications.FormsInstaller;
+        public string Name => "Forms";
+    }
+}
diff --git a/src/Umbraco.Web/Trees/FormsTreeController.cs b/src/Umbraco.Web/Trees/FormsTreeController.cs
new file mode 100644
index 000000000000..2c6885cf9765
--- /dev/null
+++ b/src/Umbraco.Web/Trees/FormsTreeController.cs
@@ -0,0 +1,27 @@
+using System.Net.Http.Formatting;
+using Umbraco.Web.Models.Trees;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
+
+namespace Umbraco.Web.Trees
+{
+    [UmbracoTreeAuthorize(Constants.Trees.Forms)]
+    [Tree(Constants.Applications.FormsInstaller, Constants.Trees.Forms, SortOrder = 0, IsSingleNodeTree = true)]
+    [PluginController("UmbracoTrees")]
+    [CoreTree]
+    public class FormsTreeController : TreeController
+    {
+        protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
+        {
+            //full screen app without tree nodes
+            return TreeNodeCollection.Empty;
+        }
+
+        protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
+        {
+            //doesn't have a menu, this is a full screen app without tree nodes
+            return MenuItemCollection.Empty;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8699540e4b85..23ae727c3594 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -214,6 +214,8 @@
     <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerValueConverter.cs" />
     <Compile Include="Templates\ITemplateRenderer.cs" />
     <Compile Include="Trees\BackOfficeSectionCollectionBuilder.cs" />
+    <Compile Include="Trees\FormsBackOfficeSection.cs" />
+    <Compile Include="Trees\FormsTreeController.cs" />
     <Compile Include="Trees\MediaBackOfficeSection.cs" />
     <Compile Include="Trees\MembersBackOfficeSection.cs" />
     <Compile Include="Trees\PackagesBackOfficeSection.cs" />

From 60ca85fe25e4874adfff3bd853990481ef6139e5 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 11 Feb 2019 15:30:11 +0100
Subject: [PATCH 398/421] Introduced the forms section in the sections menu.

---
 src/Umbraco.Core/Constants-Applications.cs    |  9 +-
 .../Migrations/Install/DatabaseDataCreator.cs |  4 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  1 +
 .../dashboard/dashboard.tabs.controller.js    | 99 -------------------
 .../dashboard/forms/formsdashboardintro.html  |  8 --
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 +
 .../Umbraco/config/lang/en_us.xml             |  3 +-
 src/Umbraco.Web/Dashboards/FormsDashboard.cs  |  3 +-
 src/Umbraco.Web/Runtime/WebRuntimeComposer.cs |  1 +
 .../Trees/FormsBackOfficeSection.cs           | 14 +++
 src/Umbraco.Web/Trees/FormsTreeController.cs  | 27 +++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +
 12 files changed, 57 insertions(+), 115 deletions(-)
 create mode 100644 src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
 create mode 100644 src/Umbraco.Web/Trees/FormsTreeController.cs

diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index 2d4042fad08a..e66df3a5f972 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -45,7 +45,7 @@ public static class Applications
             /// <summary>
             /// Application alias for the forms section.
             /// </summary>
-            public const string Forms = "forms";
+            public const string FormsInstaller = "formsInstaller";
         }
 
         /// <summary>
@@ -77,7 +77,7 @@ public static class Trees
             /// alias for the macro tree.
             /// </summary>
             public const string Macros = "macros";
-            
+
             /// <summary>
             /// alias for the datatype tree.
             /// </summary>
@@ -92,7 +92,7 @@ public static class Trees
             /// alias for the dictionary tree.
             /// </summary>
             public const string Dictionary = "dictionary";
-            
+
             public const string Stylesheets = "stylesheets";
 
             /// <summary>
@@ -121,7 +121,7 @@ public static class Trees
             public const string Templates = "templates";
 
             public const string RelationTypes = "relationTypes";
-            
+
             public const string Languages = "languages";
 
             /// <summary>
@@ -138,6 +138,7 @@ public static class Trees
             /// alias for the users tree.
             /// </summary>
             public const string Users = "users";
+            public const string Forms = "formsInstaller";
 
             public const string Scripts = "scripts";
 
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 7f7229ccd6bd..055b8992316d 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -189,13 +189,13 @@ private void CreateUserGroup2AppData()
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Members });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Settings });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Users });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Forms });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.FormsInstaller });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 2, AppAlias = Constants.Applications.Content });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Content });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Media });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Forms });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.FormsInstaller });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 4, AppAlias = Constants.Applications.Translation });
         }
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index c404e0404d7f..a868245940d7 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -228,6 +228,7 @@ protected virtual void ComposeWeb()
                 .Append<PackagesBackOfficeSection>()
                 .Append<UsersBackOfficeSection>()
                 .Append<MembersBackOfficeSection>()
+                .Append<FormsBackOfficeSection>()
                 .Append<TranslationBackOfficeSection>();
             Composition.RegisterUnique<ISectionService, SectionService>();
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index ed3d6ded33fa..e801e2cc5839 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -192,7 +192,6 @@ function FormsController($scope, $route, $cookies, packageResource, localization
     function Video_player (videoId) {
       // Get dom elements
       this.container      = document.getElementById(videoId);
-      this.video          = this.container.getElementsByTagName('video')[0];
 
       //Create controls
       this.controls = document.createElement('div');
@@ -215,104 +214,6 @@ function FormsController($scope, $route, $cookies, packageResource, localization
       this.controls.appendChild(this.loader);
       this.loader.appendChild(this.progress_bar);
     }
-
-
-    Video_player.prototype
-      .seeking = function() {
-        // get the value of the seekbar (hidden input[type="range"])
-        var time = this.video.duration * (this.seek_bar.value / 100);
-
-        // Update video to seekbar value
-        this.video.currentTime = time;
-      };
-
-    // Stop video when user initiates seeking
-    Video_player.prototype
-      .start_seek = function() {
-        this.video.pause();
-      };
-
-    // Start video when user stops seeking
-    Video_player.prototype
-      .stop_seek = function() {
-        this.video.play();
-      };
-
-    // Update the progressbar (span.loader) according to video.currentTime
-    Video_player.prototype
-      .update_progress_bar = function() {
-        // Get video progress in %
-        var value = (100 / this.video.duration) * this.video.currentTime;
-
-        // Update progressbar
-        this.progress_bar.style.width = value + '%';
-      };
-
-    // Bind progressbar to mouse when seeking
-    Video_player.prototype
-      .handle_mouse_move = function(event) {
-        // Get position of progressbar relative to browser window
-        var pos = this.progress_bar.getBoundingClientRect().left;
-
-        // Make sure event is reckonized cross-browser
-        event = event || window.event;
-
-        // Update progressbar
-        this.progress_bar.style.width = (event.clientX - pos) + "px";
-      };
-
-    // Eventlisteners for seeking
-    Video_player.prototype
-      .video_event_handler = function(videoPlayer, interval) {
-        // Update the progress bar
-        var animate_progress_bar = setInterval(function () {
-              videoPlayer.update_progress_bar();
-            }, interval);
-
-        // Fire when input value changes (user seeking)
-        videoPlayer.seek_bar
-          .addEventListener("change", function() {
-              videoPlayer.seeking();
-          });
-
-        // Fire when user clicks on seekbar
-        videoPlayer.seek_bar
-          .addEventListener("mousedown", function (clickEvent) {
-              // Pause video playback
-              videoPlayer.start_seek();
-
-              // Stop updating progressbar according to video progress
-              clearInterval(animate_progress_bar);
-
-              // Update progressbar to where user clicks
-              videoPlayer.handle_mouse_move(clickEvent);
-
-              // Bind progressbar to cursor
-              window.onmousemove = function(moveEvent){
-                videoPlayer.handle_mouse_move(moveEvent);
-              };
-          });
-
-        // Fire when user releases seekbar
-        videoPlayer.seek_bar
-          .addEventListener("mouseup", function () {
-
-              // Unbind progressbar from cursor
-              window.onmousemove = null;
-
-              // Start video playback
-              videoPlayer.stop_seek();
-
-              // Animate the progressbar
-              animate_progress_bar = setInterval(function () {
-                  videoPlayer.update_progress_bar();
-              }, interval);
-          });
-      };
-
-
-    var videoPlayer = new Video_player('video_1');
-    videoPlayer.video_event_handler(videoPlayer, 17);
 }
 
 angular.module("umbraco").controller("Umbraco.Dashboard.FormsDashboardController", FormsController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
index 3b382367c431..c18e7f4ccf4a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
@@ -8,14 +8,6 @@ <h3>Umbraco Forms</h3>
 
 		<div class="step-one" ng-hide="state"> <!-- STEP one -->
 
-			<div id="video_1" class="video_player" style="margin-bottom: 40px">
-				<video autoplay loop>
-					<!-- <source src="videos/gif.webm" type="video/webm"> -->
-					<source src="https://player.vimeo.com/external/110229004.hd.mp4?s=823f701836260bd08fb783d38389f628" type="video/mp4">
-					Sorry, you don't have HTML5 video and we didn't catch this properly in javascript.
-				</video>
-			</div>
-
 			<p style="font-size: 16px; line-height: 1.5; color: #4c4c4c; margin-bottom: 20px;">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</p>
 
 			<umb-button
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 548d6932a6c6..91a4d9378c8d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1244,6 +1244,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="courier">Courier</key>
     <key alias="developer">Developer</key>
     <key alias="forms">Forms</key>
+    <key alias="formsInstaller">Forms</key>
     <key alias="help" version="7.0">Help</key>
     <key alias="installer">Umbraco Configuration Wizard</key>
     <key alias="media">Media</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 852abcd5d82b..b9aa3b6ece6e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1247,6 +1247,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="sections">
     <key alias="content">Content</key>
     <key alias="forms">Forms</key>
+    <key alias="formsInstaller">Forms</key>
     <key alias="media">Media</key>
     <key alias="member">Members</key>
     <key alias="packages">Packages</key>
@@ -1388,7 +1389,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="styles">Styles</key>
     <key alias="stylesHelp">The CSS that should be applied in the rich text editor, e.g. "color:red;"</key>
     <key alias="tabCode">Code</key>
-    <key alias="tabRules">Rich Text Editor</key>   
+    <key alias="tabRules">Rich Text Editor</key>
   </area>
   <area alias="template">
     <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
diff --git a/src/Umbraco.Web/Dashboards/FormsDashboard.cs b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
index a3e1123369cc..bb21a04fdc64 100644
--- a/src/Umbraco.Web/Dashboards/FormsDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
 
@@ -9,7 +10,7 @@ public class FormsDashboard : IDashboard
     {
         public string Alias => "formsInstall";
 
-        public string[] Sections => new [] { "forms" };
+        public string[] Sections => new [] { Constants.Applications.FormsInstaller };
 
         public string View => "views/dashboard/forms/formsdashboardintro.html";
 
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 3afe6aa39708..52373184b41b 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -220,6 +220,7 @@ public override void Compose(Composition composition)
                 .Append<PackagesBackOfficeSection>()
                 .Append<UsersBackOfficeSection>()
                 .Append<MembersBackOfficeSection>()
+                .Append<FormsBackOfficeSection>()
                 .Append<TranslationBackOfficeSection>();
 
             // register core CMS dashboards and 3rd party types - will be ordered by weight attribute & merged with package.manifest dashboards
diff --git a/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs b/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
new file mode 100644
index 000000000000..681fe6199333
--- /dev/null
+++ b/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
@@ -0,0 +1,14 @@
+using Umbraco.Core;
+using Umbraco.Core.Models.Trees;
+
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// Defines the back office media section
+    /// </summary>
+    public class FormsBackOfficeSection : IBackOfficeSection
+    {
+        public string Alias => Constants.Applications.FormsInstaller;
+        public string Name => "Forms";
+    }
+}
diff --git a/src/Umbraco.Web/Trees/FormsTreeController.cs b/src/Umbraco.Web/Trees/FormsTreeController.cs
new file mode 100644
index 000000000000..2c6885cf9765
--- /dev/null
+++ b/src/Umbraco.Web/Trees/FormsTreeController.cs
@@ -0,0 +1,27 @@
+using System.Net.Http.Formatting;
+using Umbraco.Web.Models.Trees;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
+
+namespace Umbraco.Web.Trees
+{
+    [UmbracoTreeAuthorize(Constants.Trees.Forms)]
+    [Tree(Constants.Applications.FormsInstaller, Constants.Trees.Forms, SortOrder = 0, IsSingleNodeTree = true)]
+    [PluginController("UmbracoTrees")]
+    [CoreTree]
+    public class FormsTreeController : TreeController
+    {
+        protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
+        {
+            //full screen app without tree nodes
+            return TreeNodeCollection.Empty;
+        }
+
+        protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
+        {
+            //doesn't have a menu, this is a full screen app without tree nodes
+            return MenuItemCollection.Empty;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8699540e4b85..23ae727c3594 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -214,6 +214,8 @@
     <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerValueConverter.cs" />
     <Compile Include="Templates\ITemplateRenderer.cs" />
     <Compile Include="Trees\BackOfficeSectionCollectionBuilder.cs" />
+    <Compile Include="Trees\FormsBackOfficeSection.cs" />
+    <Compile Include="Trees\FormsTreeController.cs" />
     <Compile Include="Trees\MediaBackOfficeSection.cs" />
     <Compile Include="Trees\MembersBackOfficeSection.cs" />
     <Compile Include="Trees\PackagesBackOfficeSection.cs" />

From 0d963d3c4d2fa68db21c1234e6dc6dbff74edaca Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 01:58:42 +1100
Subject: [PATCH 399/421] Fixing package installation for content templates

---
 .../Packaging/PackageDataInstallation.cs      | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index a569954629d1..064e6cc9594d 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -294,8 +294,21 @@ private IContent CreateContentFromXml(XElement element, IContentType contentType
                              where property.Attribute("isDoc") == null
                              select property;
 
+            //TODO: This will almost never work, we can't reference a template by an INT Id within a package manifest, we need to change the
+            // packager to package templates by UDI and resolve by the same, in 98% of cases, this isn't going to work, or it will resolve the wrong template.
             var template = templateId.HasValue ? _fileService.GetTemplate(templateId.Value) : null;
 
+            //now double check this is correct since its an INT it could very well be pointing to an invalid template :/
+            if (template != null)
+            {
+                if (!contentType.IsAllowedTemplate(template.Alias))
+                {
+                    //well this is awkward, we'll set the template to null and it will be wired up to the default template
+                    // when it's persisted in the document repository
+                    template = null;
+                }
+            }
+
             IContent content = parent == null
                 ? new Content(nodeName, parentId, contentType)
                 {
@@ -312,6 +325,8 @@ where property.Attribute("isDoc") == null
                     Key = key
                 };
 
+            var propTypes = contentType.PropertyTypes.ToDictionary(x => x.Alias, x => x);
+
             foreach (var property in properties)
             {
                 string propertyTypeAlias = property.Name.LocalName;
@@ -319,10 +334,11 @@ where property.Attribute("isDoc") == null
                 {
                     var propertyValue = property.Value;
 
-                    var propertyType = contentType.PropertyTypes.FirstOrDefault(pt => pt.Alias == propertyTypeAlias);
-
-                    //set property value
-                    content.SetValue(propertyTypeAlias, propertyValue);
+                    if (propTypes.TryGetValue(propertyTypeAlias, out var propertyType))
+                    {
+                        //set property value
+                        content.SetValue(propertyTypeAlias, propertyValue);
+                    }
                 }
             }
 

From 59f437ebf8a7dd2faeaf9582d7fccb70f7a5f108 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 02:03:21 +1100
Subject: [PATCH 400/421] update to latest examine

---
 build/NuSpecs/UmbracoCms.Web.nuspec        | 2 +-
 src/Umbraco.Examine/Umbraco.Examine.csproj | 2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj     | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj   | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index c52c8831e08c..cf4958bc985b 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -27,7 +27,7 @@
                 <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
                 <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
                 <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.0-beta078,1.999999)" />
+                <dependency id="Examine" version="[1.0.0-beta079,1.999999)" />
                 <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
                 <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
                 <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 989afd8d1ced..7b5a195a31fd 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.0-beta078" />
+    <PackageReference Include="Examine" Version="1.0.0-beta079" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index e88aa5ae616e..e0ad304c4f72 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -80,7 +80,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="Castle.Core" Version="4.3.1" />
-    <PackageReference Include="Examine" Version="1.0.0-beta078" />
+    <PackageReference Include="Examine" Version="1.0.0-beta079" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 3658ef706665..922181bb89f8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -87,7 +87,7 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
-    <PackageReference Include="Examine" Version="1.0.0-beta078" />
+    <PackageReference Include="Examine" Version="1.0.0-beta079" />
     <PackageReference Include="ImageProcessor.Web" Version="4.9.3.25" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.4.1.19" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8699540e4b85..11d2be5b70e6 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -63,7 +63,7 @@
     <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.0-beta078" />
+    <PackageReference Include="Examine" Version="1.0.0-beta079" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
     <PackageReference Include="ImageProcessor">
       <Version>2.6.2.25</Version>

From b5bd138bf7c6209489aeaba77dd36a9621433e06 Mon Sep 17 00:00:00 2001
From: Robert <copilaurobert@gmail.com>
Date: Mon, 11 Feb 2019 22:13:04 +0100
Subject: [PATCH 401/421] Taking composite PropertyType's into consideration
 when creating content from xml (PackageInstallation)

---
 .../Packaging/PackageDataInstallation.cs      | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 064e6cc9594d..963ab7050f2c 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -102,8 +102,8 @@ public UninstallationSummary UninstallPackageData(PackageDefinition package, int
             {
                 // TODO: I don't think this ordering is necessary
                 var orderedTypes = (from contentType in contentTypes
-                                   orderby contentType.ParentId descending, contentType.Id descending
-                                   select contentType).ToList();
+                                    orderby contentType.ParentId descending, contentType.Id descending
+                                    select contentType).ToList();
                 removedContentTypes.AddRange(orderedTypes);
                 contentTypeService.Delete(orderedTypes, userId);
             }
@@ -157,7 +157,7 @@ public UninstallationSummary UninstallPackageData(PackageDefinition package, int
                 DictionaryItemsUninstalled = removedDictionaryItems,
                 DataTypesUninstalled = removedDataTypes,
                 LanguagesUninstalled = removedLanguages,
-                
+
             };
 
             return summary;
@@ -188,8 +188,8 @@ public IEnumerable<IContent> ImportContent(CompiledPackageDocument packageDocume
             var element = packageDocument.XmlData;
 
             var roots = from doc in element.Elements()
-                where (string)doc.Attribute("isDoc") == ""
-                select doc;
+                        where (string)doc.Attribute("isDoc") == ""
+                        select doc;
 
             var contents = ParseDocumentRootXml(roots, parentId, importedDocumentTypes).ToList();
             if (contents.Any())
@@ -289,7 +289,7 @@ private IContent CreateContentFromXml(XElement element, IContentType contentType
             var nodeName = element.Attribute("nodeName").Value;
             var path = element.Attribute("path").Value;
             var templateId = element.AttributeValue<int?>("template");
-            
+
             var properties = from property in element.Elements()
                              where property.Attribute("isDoc") == null
                              select property;
@@ -325,7 +325,11 @@ where property.Attribute("isDoc") == null
                     Key = key
                 };
 
-            var propTypes = contentType.PropertyTypes.ToDictionary(x => x.Alias, x => x);
+            //Here we make sure that we take composition properties in account as well
+            //otherwise we would skip them and end up losing content
+            var propTypes = contentType.CompositionPropertyTypes.Any()
+                ? contentType.CompositionPropertyTypes.ToDictionary(x => x.Alias, x => x)
+                : contentType.PropertyTypes.ToDictionary(x => x.Alias, x => x);
 
             foreach (var property in properties)
             {
@@ -351,7 +355,7 @@ where property.Attribute("isDoc") == null
 
         public IEnumerable<IContentType> ImportDocumentType(XElement docTypeElement, int userId)
         {
-            return ImportDocumentTypes(new []{ docTypeElement }, userId);
+            return ImportDocumentTypes(new[] { docTypeElement }, userId);
         }
 
         /// <summary>
@@ -375,7 +379,7 @@ public IEnumerable<IContentType> ImportDocumentTypes(IEnumerable<XElement> docTy
         public IEnumerable<IContentType> ImportDocumentTypes(IReadOnlyCollection<XElement> unsortedDocumentTypes, bool importStructure, int userId)
         {
             var importedContentTypes = new Dictionary<string, IContentType>();
-            
+
             //When you are importing a single doc type we have to assume that the dependencies are already there.
             //Otherwise something like uSync won't work.
             var graph = new TopoGraph<string, TopoGraph.Node<string, XElement>>(x => x.Key, x => x.Dependencies);
@@ -468,7 +472,7 @@ public IEnumerable<IContentType> ImportDocumentTypes(IReadOnlyCollection<XElemen
                 if (updatedContentTypes.Any())
                     _contentTypeService.Save(updatedContentTypes, userId);
             }
-            
+
             return list;
         }
 
@@ -870,7 +874,7 @@ public IEnumerable<IDataType> ImportDataTypes(IReadOnlyCollection<XElement> data
             {
                 _dataTypeService.Save(dataTypes, userId, true);
             }
-            
+
             return dataTypes;
         }
 
@@ -953,7 +957,7 @@ private IEnumerable<IDictionaryItem> ImportDictionaryItems(IEnumerable<XElement>
             var items = new List<IDictionaryItem>();
             foreach (var dictionaryItemElement in dictionaryItemElementList)
                 items.AddRange(ImportDictionaryItem(dictionaryItemElement, languages, parentId, userId));
-            
+
             return items;
         }
 
@@ -1040,7 +1044,7 @@ public IEnumerable<ILanguage> ImportLanguages(IEnumerable<XElement> languageElem
                 _localizationService.Save(langauge, userId);
                 list.Add(langauge);
             }
-            
+
             return list;
         }
 
@@ -1203,7 +1207,7 @@ public IEnumerable<IFile> ImportStylesheets(IEnumerable<XElement> stylesheetElem
 
         public IEnumerable<ITemplate> ImportTemplate(XElement templateElement, int userId)
         {
-            return ImportTemplates(new[] {templateElement}, userId);
+            return ImportTemplates(new[] { templateElement }, userId);
         }
 
         /// <summary>
@@ -1250,7 +1254,7 @@ public IEnumerable<ITemplate> ImportTemplates(IReadOnlyCollection<XElement> temp
                 var alias = templateElement.Element("Alias").Value;
                 var design = templateElement.Element("Design").Value;
                 var masterElement = templateElement.Element("Master");
-                
+
                 var existingTemplate = _fileService.GetTemplate(alias) as Template;
                 var template = existingTemplate ?? new Template(templateName, alias);
                 template.Content = design;

From 978f59ffe8f7fcc710f2d07e47cf725895d6b427 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 10:53:30 +1100
Subject: [PATCH 402/421] Removes the xml cache tables - we don't use them
 apart from in unit tests

---
 .../Install/DatabaseSchemaCreator.cs          |  2 -
 .../Upgrade/V_8_0_0/DropTaskTables.cs         |  1 -
 .../Upgrade/V_8_0_0/DropXmlTables.cs          | 17 +++++++
 .../Persistence/Constants-DatabaseSchema.cs   | 49 +++++++++----------
 .../Implement/DocumentRepository.cs           |  2 -
 .../Implement/MemberRepository.cs             |  1 -
 src/Umbraco.Core/Umbraco.Core.csproj          |  3 +-
 .../LegacyXmlPublishedCache}/ContentXmlDto.cs |  7 +--
 .../LegacyXmlPublishedCache}/PreviewXmlDto.cs |  7 +--
 .../LegacyXmlPublishedCache/XmlStore.cs       |  1 -
 .../Persistence/SqlCeTableByTableTest.cs      |  1 +
 .../SqlCeSyntaxProviderTests.cs               |  1 +
 .../Services/ContentServiceTests.cs           |  1 +
 .../Services/ContentTypeServiceTests.cs       |  1 +
 .../Services/MediaServiceTests.cs             |  1 +
 .../Services/MemberServiceTests.cs            |  1 +
 .../Services/MemberTypeServiceTests.cs        |  1 +
 .../Services/PerformanceTests.cs              |  1 +
 .../TestHelpers/TestWithDatabaseBase.cs       |  7 +++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 +
 20 files changed, 67 insertions(+), 40 deletions(-)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropXmlTables.cs
 rename src/{Umbraco.Core/Persistence/Dtos => Umbraco.Tests/LegacyXmlPublishedCache}/ContentXmlDto.cs (81%)
 rename src/{Umbraco.Core/Persistence/Dtos => Umbraco.Tests/LegacyXmlPublishedCache}/PreviewXmlDto.cs (81%)

diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
index 5cc818a6d219..b33e6245765d 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
@@ -50,8 +50,6 @@ public DatabaseSchemaCreator(IUmbracoDatabase database, ILogger logger)
             typeof (MemberTypeDto),
             typeof (MemberDto),
             typeof (Member2MemberGroupDto),
-            typeof (ContentXmlDto),
-            typeof (PreviewXmlDto),
             typeof (PropertyTypeGroupDto),
             typeof (PropertyTypeDto),
             typeof (PropertyDataDto),
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs
index 008b3e4b5f04..061b96976a4e 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs
@@ -1,6 +1,5 @@
 namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
-
     public class DropTaskTables : MigrationBase
     {
         public DropTaskTables(IMigrationContext context)
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropXmlTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropXmlTables.cs
new file mode 100644
index 000000000000..be79178932df
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropXmlTables.cs
@@ -0,0 +1,17 @@
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class DropXmlTables : MigrationBase
+    {
+        public DropXmlTables(IMigrationContext context)
+            : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            if (TableExists("cmsContentXml"))
+                Delete.Table("cmsContentXml").Do();
+            if (TableExists("cmsPreviewXml"))
+                Delete.Table("cmsPreviewXml").Do();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
index b874c6e04a2f..b62a99ce83d5 100644
--- a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
+++ b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
@@ -5,17 +5,16 @@ public static partial class Constants
     {
         public static class DatabaseSchema
         {
+            //TODO: Why aren't all table names with the same prefix?
             public const string TableNamePrefix = "umbraco";
 
             public static class Tables
             {
-                public const string Lock = /*TableNamePrefix*/ "umbraco" + "Lock";
-                public const string Log = /*TableNamePrefix*/ "umbraco" + "Log";
+                public const string Lock = TableNamePrefix + "Lock";
+                public const string Log = TableNamePrefix + "Log";
 
-                public const string Node = /*TableNamePrefix*/ "umbraco" + "Node";
+                public const string Node = TableNamePrefix + "Node";
                 public const string NodeData = /*TableNamePrefix*/ "cms" + "ContentNu";
-                public const string NodeXml = /*TableNamePrefix*/ "cms" + "ContentXml"; // TODO: get rid of these with the xml cache
-                public const string NodePreviewXml = /*TableNamePrefix*/ "cms" + "PreviewXml"; // TODO: get rid of these with the xml cache
 
                 public const string ContentType = /*TableNamePrefix*/ "cms" + "ContentType";
                 public const string ContentChildType = /*TableNamePrefix*/ "cms" + "ContentTypeAllowedContentType";
@@ -37,22 +36,22 @@ public static class Tables
                 public const string PropertyTypeGroup = /*TableNamePrefix*/ "cms" + "PropertyTypeGroup";
                 public const string PropertyData = TableNamePrefix + "PropertyData";
 
-                public const string RelationType = /*TableNamePrefix*/ "umbraco" + "RelationType";
-                public const string Relation = /*TableNamePrefix*/ "umbraco" + "Relation";
+                public const string RelationType = TableNamePrefix + "RelationType";
+                public const string Relation = TableNamePrefix + "Relation";
 
-                public const string Domain = /*TableNamePrefix*/ "umbraco" + "Domain";
-                public const string Language = /*TableNamePrefix*/ "umbraco" + "Language";
+                public const string Domain = TableNamePrefix + "Domain";
+                public const string Language = TableNamePrefix + "Language";
                 public const string DictionaryEntry = /*TableNamePrefix*/ "cms" + "Dictionary";
                 public const string DictionaryValue = /*TableNamePrefix*/ "cms" + "LanguageText";
 
-                public const string User = /*TableNamePrefix*/ "umbraco" + "User";
-                public const string UserGroup = /*TableNamePrefix*/ "umbraco" + "UserGroup";
-                public const string UserStartNode = /*TableNamePrefix*/ "umbraco" + "UserStartNode";
-                public const string User2UserGroup = /*TableNamePrefix*/ "umbraco" + "User2UserGroup";
-                public const string User2NodeNotify = /*TableNamePrefix*/ "umbraco" + "User2NodeNotify";
-                public const string UserGroup2App = /*TableNamePrefix*/ "umbraco" + "UserGroup2App";
-                public const string UserGroup2NodePermission = /*TableNamePrefix*/ "umbraco" + "UserGroup2NodePermission";
-                public const string ExternalLogin = /*TableNamePrefix*/ "umbraco" + "ExternalLogin";
+                public const string User = TableNamePrefix + "User";
+                public const string UserGroup = TableNamePrefix + "UserGroup";
+                public const string UserStartNode = TableNamePrefix + "UserStartNode";
+                public const string User2UserGroup = TableNamePrefix + "User2UserGroup";
+                public const string User2NodeNotify = TableNamePrefix + "User2NodeNotify";
+                public const string UserGroup2App = TableNamePrefix + "UserGroup2App";
+                public const string UserGroup2NodePermission = TableNamePrefix + "UserGroup2NodePermission";
+                public const string ExternalLogin = TableNamePrefix + "ExternalLogin";
 
                 public const string Macro = /*TableNamePrefix*/ "cms" + "Macro";
                 public const string MacroProperty = /*TableNamePrefix*/ "cms" + "MacroProperty";
@@ -61,21 +60,21 @@ public static class Tables
                 public const string MemberType = /*TableNamePrefix*/ "cms" + "MemberType";
                 public const string Member2MemberGroup = /*TableNamePrefix*/ "cms" + "Member2MemberGroup";
 
-                public const string Access = /*TableNamePrefix*/ "umbraco" + "Access";
-                public const string AccessRule = /*TableNamePrefix*/ "umbraco" + "AccessRule";
-                public const string RedirectUrl = /*TableNamePrefix*/ "umbraco" + "RedirectUrl";
+                public const string Access = TableNamePrefix + "Access";
+                public const string AccessRule = TableNamePrefix + "AccessRule";
+                public const string RedirectUrl = TableNamePrefix + "RedirectUrl";
 
-                public const string CacheInstruction = /*TableNamePrefix*/ "umbraco" + "CacheInstruction";
-                public const string Server = /*TableNamePrefix*/ "umbraco" + "Server";
+                public const string CacheInstruction = TableNamePrefix + "CacheInstruction";
+                public const string Server = TableNamePrefix + "Server";
 
                 public const string Tag = /*TableNamePrefix*/ "cms" + "Tags";
                 public const string TagRelationship = /*TableNamePrefix*/ "cms" + "TagRelationship";
                 
                 public const string KeyValue = TableNamePrefix + "KeyValue";
 
-                public const string AuditEntry = /*TableNamePrefix*/ "umbraco" + "Audit";
-                public const string Consent = /*TableNamePrefix*/ "umbraco" + "Consent";
-                public const string UserLogin = /*TableNamePrefix*/ "umbraco" + "UserLogin";
+                public const string AuditEntry = TableNamePrefix + "Audit";
+                public const string Consent = TableNamePrefix + "Consent";
+                public const string UserLogin = TableNamePrefix + "UserLogin";
             }
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index d8e6fd2c0e73..24b50d294b0e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -202,10 +202,8 @@ protected override IEnumerable<string> GetDeleteClauses()
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.DocumentCultureVariation + " WHERE nodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.DocumentVersion + " WHERE id IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
-                "DELETE FROM cmsPreviewXml WHERE nodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersionCultureVariation + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
-                "DELETE FROM cmsContentXml WHERE nodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.Access + " WHERE nodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id"
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
index ba3526f1f049..808f61305a17 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
@@ -188,7 +188,6 @@ protected override IEnumerable<string> GetDeleteClauses()
                 "DELETE FROM cmsMember2MemberGroup WHERE Member = @id",
                 "DELETE FROM cmsMember WHERE nodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
-                "DELETE FROM cmsContentXml WHERE nodeId = @id",
                 "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
                 "DELETE FROM umbracoNode WHERE id = @id"
             };
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index f5bdc417bddf..57aee5ffbf9a 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -379,6 +379,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropPreValueTable.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropTaskTables.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DropTemplateDesignColumn.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\DropXmlTables.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\FixLockTablePrimaryKey.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\LanguageColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MakeRedirectUrlVariant.cs" />
@@ -826,7 +827,6 @@
     <Compile Include="Persistence\Dtos\ContentTypeDto.cs" />
     <Compile Include="Persistence\Dtos\ContentTypeTemplateDto.cs" />
     <Compile Include="Persistence\Dtos\ContentVersionDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentXmlDto.cs" />
     <Compile Include="Persistence\Dtos\DataTypeDto.cs" />
     <Compile Include="Persistence\Dtos\DictionaryDto.cs" />
     <Compile Include="Persistence\Dtos\DocumentDto.cs" />
@@ -846,7 +846,6 @@
     <Compile Include="Persistence\Dtos\MemberTypeDto.cs" />
     <Compile Include="Persistence\Dtos\MemberTypeReadOnlyDto.cs" />
     <Compile Include="Persistence\Dtos\NodeDto.cs" />
-    <Compile Include="Persistence\Dtos\PreviewXmlDto.cs" />
     <Compile Include="Persistence\Dtos\PropertyDataDto.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeDto.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeGroupDto.cs" />
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentXmlDto.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/ContentXmlDto.cs
similarity index 81%
rename from src/Umbraco.Core/Persistence/Dtos/ContentXmlDto.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/ContentXmlDto.cs
index 5929f5cb81b6..2f2c1e787a1f 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentXmlDto.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/ContentXmlDto.cs
@@ -1,9 +1,10 @@
 using NPoco;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
+using Umbraco.Core.Persistence.Dtos;
 
-namespace Umbraco.Core.Persistence.Dtos
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
-    [TableName(Constants.DatabaseSchema.Tables.NodeXml)]
+    [TableName("cmsContentXml")]
     [PrimaryKey("nodeId", AutoIncrement = false)]
     [ExplicitColumns]
     internal class ContentXmlDto
@@ -20,4 +21,4 @@ internal class ContentXmlDto
         [Column("rv")]
         public long Rv { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Dtos/PreviewXmlDto.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewXmlDto.cs
similarity index 81%
rename from src/Umbraco.Core/Persistence/Dtos/PreviewXmlDto.cs
rename to src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewXmlDto.cs
index 40cc50b00ae4..4fcbef820aa1 100644
--- a/src/Umbraco.Core/Persistence/Dtos/PreviewXmlDto.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewXmlDto.cs
@@ -1,9 +1,10 @@
 using NPoco;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
+using Umbraco.Core.Persistence.Dtos;
 
-namespace Umbraco.Core.Persistence.Dtos
+namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
-    [TableName(Constants.DatabaseSchema.Tables.NodePreviewXml)]
+    [TableName("cmsPreviewXml")]
     [PrimaryKey("nodeId", AutoIncrement = false)]
     [ExplicitColumns]
     internal class PreviewXmlDto
@@ -20,4 +21,4 @@ internal class PreviewXmlDto
         [Column("rv")]
         public long Rv { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
index 6dec9f244804..3b675c2f07ed 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
@@ -12,7 +12,6 @@
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
diff --git a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
index 38daa2c1a75c..dcbf5919eb23 100644
--- a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
+++ b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
@@ -5,6 +5,7 @@
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
diff --git a/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs b/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs
index 557de9eb113f..1d87bb35e71c 100644
--- a/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs
+++ b/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs
@@ -14,6 +14,7 @@
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Scoping;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 85c195e55313..bcbf01d3f0c6 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -18,6 +18,7 @@
 using Umbraco.Tests.Testing;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Cache;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 
 namespace Umbraco.Tests.Services
 {
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index 7a7aad690531..341371ca0273 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -10,6 +10,7 @@
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Scoping;
diff --git a/src/Umbraco.Tests/Services/MediaServiceTests.cs b/src/Umbraco.Tests/Services/MediaServiceTests.cs
index b9e1fee0dbde..17711fbd3195 100644
--- a/src/Umbraco.Tests/Services/MediaServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MediaServiceTests.cs
@@ -14,6 +14,7 @@
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index 0c9c543b0d3f..98553941cd74 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -17,6 +17,7 @@
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Security.Providers;
diff --git a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
index 5f4a87c3eb8e..24709469e939 100644
--- a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
@@ -5,6 +5,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs
index 7d73d95e7475..449e933c24b0 100644
--- a/src/Umbraco.Tests/Services/PerformanceTests.cs
+++ b/src/Umbraco.Tests/Services/PerformanceTests.cs
@@ -13,6 +13,7 @@
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.TestHelpers.Stubs;
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 2bfc1b6dc801..643deab30464 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -307,6 +307,13 @@ protected virtual void InitializeDatabase()
                     var schemaHelper = new DatabaseSchemaCreator(scope.Database, Logger);
                     //Create the umbraco database and its base data
                     schemaHelper.InitializeDatabaseSchema();
+
+                    //Special case, we need to create the xml cache tables manually since they are not part of the default
+                    //setup.
+                    //TODO: Remove this when we update all tests to use nucache
+                    schemaHelper.CreateTable<ContentXmlDto>();
+                    schemaHelper.CreateTable<PreviewXmlDto>();
+
                     scope.Complete();
                 }
 
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index e0ad304c4f72..5aa1588ef254 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -126,6 +126,8 @@
     <Compile Include="CoreThings\GuidUtilsTests.cs" />
     <Compile Include="CoreThings\HexEncoderTests.cs" />
     <Compile Include="CoreXml\RenamedRootNavigatorTests.cs" />
+    <Compile Include="LegacyXmlPublishedCache\ContentXmlDto.cs" />
+    <Compile Include="LegacyXmlPublishedCache\PreviewXmlDto.cs" />
     <Compile Include="Logging\LogviewerTests.cs" />
     <Compile Include="Manifest\ManifestContentAppTests.cs" />
     <Compile Include="Migrations\MigrationPlanTests.cs" />

From 3d729eb2c325b9239749719440e89d10e25b0d8b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 10:54:18 +1100
Subject: [PATCH 403/421] updates umb plan

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index cfa82748d207..08d1cc8f4f07 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -127,7 +127,8 @@ protected void DefinePlan()
             To<ConvertRelatedLinksToMultiUrlPicker>("{ED28B66A-E248-4D94-8CDB-9BDF574023F0}");
             To<UpdatePickerIntegerValuesToUdi>("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
             To<RenameUmbracoDomainsTable>("{6017F044-8E70-4E10-B2A3-336949692ADD}");
-            To<AddUserLoginDtoDateIndex>("98339BEF-E4B2-48A8-B9D1-D173DC842BBE");
+            To<AddUserLoginDtoDateIndex>("{98339BEF-E4B2-48A8-B9D1-D173DC842BBE}");
+            To<DropXmlTables>("{CDBEDEE4-9496-4903-9CF2-4104E00FF960}");
 
             //FINAL
 

From 77d70c7e7f2fac6e2a1e611fb8f56d5de33412ba Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 11:43:34 +1100
Subject: [PATCH 404/421] Fixes test

---
 .../Migrations/Install/DatabaseSchemaCreator.cs           | 7 ++++++-
 src/Umbraco.Tests/Persistence/SchemaValidationTest.cs     | 8 ++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
index b33e6245765d..d8283fd112eb 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
@@ -137,13 +137,18 @@ public void InitializeDatabaseSchema()
         /// Validates the schema of the current database.
         /// </summary>
         internal DatabaseSchemaResult ValidateSchema()
+        {
+            return ValidateSchema(OrderedTables);
+        }
+
+        internal DatabaseSchemaResult ValidateSchema(IEnumerable<Type> orderedTables)
         {
             var result = new DatabaseSchemaResult(SqlSyntax);
 
             result.IndexDefinitions.AddRange(SqlSyntax.GetDefinedIndexes(_database)
                 .Select(x => new DbIndexDefinition(x)));
 
-            result.TableDefinitions.AddRange(OrderedTables
+            result.TableDefinitions.AddRange(orderedTables
                 .Select(x => DefinitionFactory.GetTableDefinition(x, SqlSyntax)));
 
             ValidateDbTables(result);
diff --git a/src/Umbraco.Tests/Persistence/SchemaValidationTest.cs b/src/Umbraco.Tests/Persistence/SchemaValidationTest.cs
index 2c875d6afcfe..c7118dac797e 100644
--- a/src/Umbraco.Tests/Persistence/SchemaValidationTest.cs
+++ b/src/Umbraco.Tests/Persistence/SchemaValidationTest.cs
@@ -1,9 +1,11 @@
-using Moq;
+using System.Linq;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
@@ -21,7 +23,9 @@ public void DatabaseSchemaCreation_Produces_DatabaseSchemaResult_With_Zero_Error
             using (var scope = ScopeProvider.CreateScope())
             {
                 var schema = new DatabaseSchemaCreator(scope.Database, Logger);
-                result = schema.ValidateSchema();
+                result = schema.ValidateSchema(
+                    //TODO: When we remove the xml cache from tests we can remove this too
+                    DatabaseSchemaCreator.OrderedTables.Concat(new []{typeof(ContentXmlDto), typeof(PreviewXmlDto)}));
             }
 
             // Assert

From 1a1222905b4967c25773448949b28d673399d1b3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 12:22:36 +1100
Subject: [PATCH 405/421] reverts the formsInstaller alias, fixes the
 ApplicationTreeController to allow full screen sections without trees,
 removes the forms tree controller

---
 src/Umbraco.Core/Constants-Applications.cs    |  3 +--
 .../Migrations/Install/DatabaseDataCreator.cs |  4 +--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 -
 .../Umbraco/config/lang/en_us.xml             |  1 -
 src/Umbraco.Web/Dashboards/FormsDashboard.cs  |  2 +-
 src/Umbraco.Web/Editors/SectionController.cs  |  2 +-
 .../Trees/ApplicationTreeController.cs        | 19 ++++++++++---
 .../Trees/FormsBackOfficeSection.cs           |  2 +-
 src/Umbraco.Web/Trees/FormsTreeController.cs  | 27 -------------------
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 10 files changed, 21 insertions(+), 41 deletions(-)
 delete mode 100644 src/Umbraco.Web/Trees/FormsTreeController.cs

diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index e66df3a5f972..b53a2b8eafa6 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -45,7 +45,7 @@ public static class Applications
             /// <summary>
             /// Application alias for the forms section.
             /// </summary>
-            public const string FormsInstaller = "formsInstaller";
+            public const string Forms = "forms";
         }
 
         /// <summary>
@@ -138,7 +138,6 @@ public static class Trees
             /// alias for the users tree.
             /// </summary>
             public const string Users = "users";
-            public const string Forms = "formsInstaller";
 
             public const string Scripts = "scripts";
 
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 055b8992316d..7f7229ccd6bd 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -189,13 +189,13 @@ private void CreateUserGroup2AppData()
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Members });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Settings });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Users });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.FormsInstaller });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Forms });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 2, AppAlias = Constants.Applications.Content });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Content });
             _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Media });
-            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.FormsInstaller });
+            _database.Insert(new UserGroup2AppDto { UserGroupId = 3, AppAlias = Constants.Applications.Forms });
 
             _database.Insert(new UserGroup2AppDto { UserGroupId = 4, AppAlias = Constants.Applications.Translation });
         }
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 91a4d9378c8d..548d6932a6c6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1244,7 +1244,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="courier">Courier</key>
     <key alias="developer">Developer</key>
     <key alias="forms">Forms</key>
-    <key alias="formsInstaller">Forms</key>
     <key alias="help" version="7.0">Help</key>
     <key alias="installer">Umbraco Configuration Wizard</key>
     <key alias="media">Media</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index b9aa3b6ece6e..7dcd101aff1b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1247,7 +1247,6 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="sections">
     <key alias="content">Content</key>
     <key alias="forms">Forms</key>
-    <key alias="formsInstaller">Forms</key>
     <key alias="media">Media</key>
     <key alias="member">Members</key>
     <key alias="packages">Packages</key>
diff --git a/src/Umbraco.Web/Dashboards/FormsDashboard.cs b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
index bb21a04fdc64..867e8af3aa93 100644
--- a/src/Umbraco.Web/Dashboards/FormsDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/FormsDashboard.cs
@@ -10,7 +10,7 @@ public class FormsDashboard : IDashboard
     {
         public string Alias => "formsInstall";
 
-        public string[] Sections => new [] { Constants.Applications.FormsInstaller };
+        public string[] Sections => new [] { Constants.Applications.Forms };
 
         public string View => "views/dashboard/forms/formsdashboardintro.html";
 
diff --git a/src/Umbraco.Web/Editors/SectionController.cs b/src/Umbraco.Web/Editors/SectionController.cs
index 0a2f17cd15fa..52034b9c95c0 100644
--- a/src/Umbraco.Web/Editors/SectionController.cs
+++ b/src/Umbraco.Web/Editors/SectionController.cs
@@ -43,7 +43,7 @@ public IEnumerable<Section> GetSections()
             
             // this is a bit nasty since we'll be proxying via the app tree controller but we sort of have to do that
             // since tree's by nature are controllers and require request contextual data
-            var appTreeController = new ApplicationTreeController(GlobalSettings, UmbracoContext, SqlContext, Services, AppCaches, Logger, RuntimeState, _treeService, Umbraco)
+            var appTreeController = new ApplicationTreeController(GlobalSettings, UmbracoContext, SqlContext, Services, AppCaches, Logger, RuntimeState, _treeService, _sectionService, Umbraco)
             {
                 ControllerContext = ControllerContext
             };
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 162d001e9626..b8fe70973834 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -32,13 +32,15 @@ namespace Umbraco.Web.Trees
     public class ApplicationTreeController : UmbracoAuthorizedApiController
     {
         private readonly ITreeService _treeService;
+        private readonly ISectionService _sectionService;
 
         public ApplicationTreeController(IGlobalSettings globalSettings, UmbracoContext umbracoContext,
             ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger,
-            IRuntimeState runtimeState, ITreeService treeService, UmbracoHelper umbracoHelper)
+            IRuntimeState runtimeState, ITreeService treeService, ISectionService sectionService, UmbracoHelper umbracoHelper)
             : base(globalSettings, umbracoContext, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _treeService = treeService;
+            _sectionService = sectionService;
         }
 
         /// <summary>
@@ -56,12 +58,21 @@ public async Task<TreeRootNode> GetApplicationTrees(string application, string t
             if (string.IsNullOrEmpty(application))
                 throw new HttpResponseException(HttpStatusCode.NotFound);
 
+            var section = _sectionService.GetByAlias(application);
+            if (section == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
             //find all tree definitions that have the current application alias
             var groupedTrees = _treeService.GetBySectionGrouped(application, use);
             var allTrees = groupedTrees.Values.SelectMany(x => x).ToList();
 
             if (allTrees.Count == 0)
-                throw new HttpResponseException(HttpStatusCode.NotFound);
+            {
+                //if there are no trees defined for this section but the section is defined then we can have a simple
+                //full screen section without trees
+                var name = Services.TextService.Localize("sections/" + application);
+                return TreeRootNode.CreateSingleTreeRoot(Constants.System.Root.ToInvariantString(), null, null, name, TreeNodeCollection.Empty, true);
+            }   
 
             // handle request for a specific tree / or when there is only one tree
             if (!tree.IsNullOrWhiteSpace() || allTrees.Count == 1)
@@ -101,8 +112,8 @@ public async Task<TreeRootNode> GetApplicationTrees(string application, string t
                     return treeRootNode;
                 }
 
-                // otherwise it's a section with no tree, aka a fullscreen section
-                // todo is this true? what if we just failed to TryGetRootNode on all of them?
+                // otherwise it's a section with all empty trees, aka a fullscreen section
+                // todo is this true? what if we just failed to TryGetRootNode on all of them? SD: Yes it's true but we should check the result of TryGetRootNode and throw?
                 return TreeRootNode.CreateSingleTreeRoot(Constants.System.Root.ToInvariantString(), null, null, name, TreeNodeCollection.Empty, true);
             }
 
diff --git a/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs b/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
index 681fe6199333..048ed47f11d4 100644
--- a/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
+++ b/src/Umbraco.Web/Trees/FormsBackOfficeSection.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Trees
     /// </summary>
     public class FormsBackOfficeSection : IBackOfficeSection
     {
-        public string Alias => Constants.Applications.FormsInstaller;
+        public string Alias => Constants.Applications.Forms;
         public string Name => "Forms";
     }
 }
diff --git a/src/Umbraco.Web/Trees/FormsTreeController.cs b/src/Umbraco.Web/Trees/FormsTreeController.cs
deleted file mode 100644
index 2c6885cf9765..000000000000
--- a/src/Umbraco.Web/Trees/FormsTreeController.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Net.Http.Formatting;
-using Umbraco.Web.Models.Trees;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi.Filters;
-using Constants = Umbraco.Core.Constants;
-
-namespace Umbraco.Web.Trees
-{
-    [UmbracoTreeAuthorize(Constants.Trees.Forms)]
-    [Tree(Constants.Applications.FormsInstaller, Constants.Trees.Forms, SortOrder = 0, IsSingleNodeTree = true)]
-    [PluginController("UmbracoTrees")]
-    [CoreTree]
-    public class FormsTreeController : TreeController
-    {
-        protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
-        {
-            //full screen app without tree nodes
-            return TreeNodeCollection.Empty;
-        }
-
-        protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
-        {
-            //doesn't have a menu, this is a full screen app without tree nodes
-            return MenuItemCollection.Empty;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 23ae727c3594..6522ac9a051c 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -215,7 +215,6 @@
     <Compile Include="Templates\ITemplateRenderer.cs" />
     <Compile Include="Trees\BackOfficeSectionCollectionBuilder.cs" />
     <Compile Include="Trees\FormsBackOfficeSection.cs" />
-    <Compile Include="Trees\FormsTreeController.cs" />
     <Compile Include="Trees\MediaBackOfficeSection.cs" />
     <Compile Include="Trees\MembersBackOfficeSection.cs" />
     <Compile Include="Trees\PackagesBackOfficeSection.cs" />

From c00f805ea2fd8ce511c4ab9c19ab0f78a79e7de5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 13:36:32 +1100
Subject: [PATCH 406/421] Fixes dirty tracking on tags editor when it's csv
 format

---
 .../tags/umbtagseditor.directive.js           | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index edf54ca034a8..5131dc3dcbfc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -29,6 +29,8 @@
         let typeahead;
         let tagsHound;
 
+        let initLoad = true;
+
         vm.$onInit = onInit;
         vm.$onChanges = onChanges;
         vm.$onDestroy = onDestroy;
@@ -138,9 +140,17 @@
             if (changes.value) {
                 if (!changes.value.isFirstChange() && changes.value.currentValue !== changes.value.previousValue) {
 
-                    configureViewModel();
-                    reValidate()
-
+                    if (initLoad) {
+                        //this occurs if we have to re-format the model on the init load, so set the flag to false
+                        //so the next time it actually changes we process it.
+                        initLoad = false;
+                        //we need to reset the form since it actually hasn't changed but it will be detected as changed
+                        vm.tagEditorForm.$setPristine();
+                    }
+                    else {
+                        configureViewModel();
+                        reValidate();
+                    }
                 }
             }
         }
@@ -161,6 +171,7 @@
                         //json storage
                         vm.viewModel = JSON.parse(vm.value);
                         updateModelValue(vm.viewModel);
+                        return;
                     }
                     else {
                         //csv storage
@@ -175,13 +186,15 @@
                         });
 
                         updateModelValue(vm.viewModel);
-                        
+                        return;
                     }
                 }
                 else if (angular.isArray(vm.value)) {
                     vm.viewModel = vm.value;
                 }
             }
+            //if we've made it here we haven't had to re-format the model so we'll set this to false
+            initLoad = false;
         }
 
         function updateModelValue(val) {

From 54aa1924c0cee7d39f75fdc8ec32fd6ee413ee12 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 13:55:50 +1100
Subject: [PATCH 407/421] ok, properly fixes dirty tracking on the tags editor

---
 .../tags/umbtagseditor.directive.js           | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
index 5131dc3dcbfc..40def728ed5b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
@@ -55,7 +55,7 @@
                 vm.isLoading = false;
 
                 //ensure that the models are formatted correctly
-                configureViewModel();
+                configureViewModel(true);
 
                 // Set the visible prompt to -1 to ensure it will not be visible
                 vm.promptIsVisible = "-1";
@@ -140,17 +140,8 @@
             if (changes.value) {
                 if (!changes.value.isFirstChange() && changes.value.currentValue !== changes.value.previousValue) {
 
-                    if (initLoad) {
-                        //this occurs if we have to re-format the model on the init load, so set the flag to false
-                        //so the next time it actually changes we process it.
-                        initLoad = false;
-                        //we need to reset the form since it actually hasn't changed but it will be detected as changed
-                        vm.tagEditorForm.$setPristine();
-                    }
-                    else {
-                        configureViewModel();
-                        reValidate();
-                    }
+                    configureViewModel();
+                    reValidate();
                 }
             }
         }
@@ -164,14 +155,19 @@
             $element.find('.tags-' + vm.htmlId).typeahead('destroy');
         }
 
-        function configureViewModel() {
+        function configureViewModel(isInitLoad) {
             if (vm.value) {
                 if (angular.isString(vm.value) && vm.value.length > 0) {
                     if (vm.config.storageType === "Json") {
                         //json storage
                         vm.viewModel = JSON.parse(vm.value);
-                        updateModelValue(vm.viewModel);
-                        return;
+
+                        //if this is the first load, we are just re-formatting the underlying model to be consistent
+                        //we don't want to notify the component parent of any changes, that will occur if the user actually
+                        //changes a value. If we notify at this point it will signal a form dirty change which we don't want.
+                        if (!isInitLoad) {
+                            updateModelValue(vm.viewModel);
+                        }
                     }
                     else {
                         //csv storage
@@ -185,16 +181,18 @@
                             return self.indexOf(v) === i;
                         });
 
-                        updateModelValue(vm.viewModel);
-                        return;
+                        //if this is the first load, we are just re-formatting the underlying model to be consistent
+                        //we don't want to notify the component parent of any changes, that will occur if the user actually
+                        //changes a value. If we notify at this point it will signal a form dirty change which we don't want.
+                        if (!isInitLoad) {
+                            updateModelValue(vm.viewModel);
+                        }
                     }
                 }
                 else if (angular.isArray(vm.value)) {
                     vm.viewModel = vm.value;
                 }
             }
-            //if we've made it here we haven't had to re-format the model so we'll set this to false
-            initLoad = false;
         }
 
         function updateModelValue(val) {

From 118e31d6478ce11bdfeb23df9094a8f7baece548 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 14:03:22 +1100
Subject: [PATCH 408/421] removes/renames list view settings that don't make
 sense for v8

---
 .../views/propertyeditors/listview/listview.controller.js   | 1 -
 src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs    | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index a3fc33d2ea41..44c0c4ae7bc7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -142,7 +142,6 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
     }
 
     $scope.options = {
-        displayAtTabNumber: $scope.model.config.displayAtTabNumber ? $scope.model.config.displayAtTabNumber : 1,
         pageSize: $scope.model.config.pageSize ? $scope.model.config.pageSize : 10,
         pageNumber: ($routeParams.page && Number($routeParams.page) != NaN && Number($routeParams.page) > 0) ? $routeParams.page : 1,
         filter: '',
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
index 6448a3354c8c..bcddc18369c4 100644
--- a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
@@ -13,7 +13,6 @@ public ListViewConfiguration()
             // initialize defaults
 
             PageSize = 10;
-            DisplayAtTabNumber = 1;
             OrderBy = "SortOrder";
             OrderDirection = "asc";
 
@@ -43,9 +42,6 @@ public ListViewConfiguration()
         [ConfigurationField("pageSize", "Page Size", "number", Description = "Number of items per page")]
         public int PageSize { get; set; }
         
-        [ConfigurationField("displayAtTabNumber", "Display At Tab Number", "number", Description = "Which tab position that the list of child items will be displayed")]
-        public int DisplayAtTabNumber { get; set; }
-
         [ConfigurationField("orderBy", "Order By", "views/propertyeditors/listview/sortby.prevalues.html",
             Description = "The default sort order for the list")]
         public string OrderBy { get; set; }
@@ -64,7 +60,7 @@ public ListViewConfiguration()
             Description = "The bulk actions that are allowed from the list view")]
         public BulkActionPermissionSettings BulkActionPermissions { get; set; } = new BulkActionPermissionSettings(); // TODO: managing defaults?
 
-        [ConfigurationField("tabName", "Tab Name", "textstring", Description = "The name of the listview tab (default if empty: 'Child Items')")]
+        [ConfigurationField("tabName", "Content app name", "textstring", Description = "The name of the listview content app (default if empty: 'Child Items')")]
         public string TabName { get; set; }
 
         public class Property

From c4eb76faad5b268914998b4ec1eb1863c9b89bc8 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Feb 2019 15:02:27 +1100
Subject: [PATCH 409/421] Updates the checkbox html editor to store the string
 values, not int ids, renames the underlying confg editor and updates
 comments, updates the migration and we'll need to migrate the checkbox data
 too.

---
 .../Migrations/Upgrade/UmbracoPlan.cs         |   2 +-
 ...tonAndCheckboxPropertyEditorsMigration.cs} | 110 ++++++++++--------
 src/Umbraco.Core/Umbraco.Core.csproj          |   5 +-
 .../checkboxlist/checkboxlist.controller.js   |   8 +-
 .../checkboxlist/checkboxlist.html            |   2 +-
 .../CheckBoxListPropertyEditor.cs             |   7 +-
 .../DropDownFlexiblePropertyEditor.cs         |   2 +-
 ...eValueEditor.cs => MultipleValueEditor.cs} |   8 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 +-
 9 files changed, 78 insertions(+), 68 deletions(-)
 rename src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/{RadioButtonPropertyEditorsMigration.cs => RadioButtonAndCheckboxPropertyEditorsMigration.cs} (56%)
 rename src/Umbraco.Web/PropertyEditors/{PublishValuesMultipleValueEditor.cs => MultipleValueEditor.cs} (84%)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index ccacaa8893d4..ddc428971851 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -128,7 +128,7 @@ protected void DefinePlan()
             To<UpdatePickerIntegerValuesToUdi>("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
             To<RenameUmbracoDomainsTable>("{6017F044-8E70-4E10-B2A3-336949692ADD}");
             To<AddUserLoginDtoDateIndex>("98339BEF-E4B2-48A8-B9D1-D173DC842BBE");
-            To<RadioButtonPropertyEditorsMigration>("{940FD19A-00A8-4D5C-B8FF-939143585726}");
+            To<RadioButtonAndCheckboxPropertyEditorsMigration>("{940FD19A-00A8-4D5C-B8FF-939143585726}");
 
             //FINAL
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs
similarity index 56%
rename from src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs
index 2c4e601a9e83..ec60a22ecd93 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs
@@ -1,81 +1,98 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Sync;
-using Umbraco.Web.Cache;
 
 namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
-    public class RadioButtonPropertyEditorsMigration : MigrationBase
+    public class RadioButtonAndCheckboxPropertyEditorsMigration : MigrationBase
     {
-        public RadioButtonPropertyEditorsMigration(IMigrationContext context)
+        public RadioButtonAndCheckboxPropertyEditorsMigration(IMigrationContext context)
             : base(context)
         {
         }
 
         public override void Migrate()
         {
-            //need to convert the old drop down data types to use the new one
-            var dataTypes = Database.Fetch<DataTypeDto>(Sql()
-                .Select<DataTypeDto>()
-                .From<DataTypeDto>()
-                .Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.RadioButtonList"));
+            MigrateRadioButtons();
+            MigrateCheckBoxes();
+        }
+
+        private void MigrateCheckBoxes()
+        {
+            //fixme: complete this
+
+            var dataTypes = GetDataTypes(Constants.PropertyEditors.Aliases.CheckBoxList);
+
+
+        }
+
+        private void MigrateRadioButtons()
+        {
+            var dataTypes = GetDataTypes(Constants.PropertyEditors.Aliases.RadioButtonList);
 
             var refreshCache = false;
             foreach (var dataType in dataTypes)
             {
                 ValueListConfiguration config;
 
-                if (!dataType.Configuration.IsNullOrWhiteSpace())
+                if (dataType.Configuration.IsNullOrWhiteSpace())
+                    continue;
+
+                // parse configuration, and update everything accordingly
+                try
                 {
-                    // parse configuration, and update everything accordingly
-                    try
-                    {
-                        config = (ValueListConfiguration) new ValueListConfigurationEditor().FromDatabase(
-                            dataType.Configuration);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.Error<DropDownPropertyEditorsMigration>(
-                            ex,
-                            "Invalid drop down configuration detected: \"{Configuration}\", cannot convert editor, values will be cleared",
-                            dataType.Configuration);
-
-                        continue;
-                    }
-
-                    // get property data dtos
-                    var propertyDataDtos = Database.Fetch<PropertyDataDto>(Sql()
-                        .Select<PropertyDataDto>()
-                        .From<PropertyDataDto>()
-                        .InnerJoin<PropertyTypeDto>()
-                        .On<PropertyTypeDto, PropertyDataDto>((pt, pd) => pt.Id == pd.PropertyTypeId)
-                        .InnerJoin<DataTypeDto>()
-                        .On<DataTypeDto, PropertyTypeDto>((dt, pt) => dt.NodeId == pt.DataTypeId)
-                        .Where<PropertyTypeDto>(x => x.DataTypeId == dataType.NodeId));
-
-                    // update dtos
-                    var updatedDtos = propertyDataDtos.Where(x => UpdatePropertyDataDto(x, config));
-
-                    // persist changes
-                    foreach (var propertyDataDto in updatedDtos) Database.Update(propertyDataDto);
-
-                    UpdateDataType(dataType);
-                    refreshCache = true;
+                    config = (ValueListConfiguration)new ValueListConfigurationEditor().FromDatabase(
+                        dataType.Configuration);
                 }
+                catch (Exception ex)
+                {
+                    Logger.Error<DropDownPropertyEditorsMigration>(
+                        ex,
+                        "Invalid radio button configuration detected: \"{Configuration}\", cannot convert editor, values will be cleared",
+                        dataType.Configuration);
+
+                    continue;
+                }
+
+                // get property data dtos
+                var propertyDataDtos = Database.Fetch<PropertyDataDto>(Sql()
+                    .Select<PropertyDataDto>()
+                    .From<PropertyDataDto>()
+                    .InnerJoin<PropertyTypeDto>()
+                    .On<PropertyTypeDto, PropertyDataDto>((pt, pd) => pt.Id == pd.PropertyTypeId)
+                    .InnerJoin<DataTypeDto>()
+                    .On<DataTypeDto, PropertyTypeDto>((dt, pt) => dt.NodeId == pt.DataTypeId)
+                    .Where<PropertyTypeDto>(x => x.DataTypeId == dataType.NodeId));
+
+                // update dtos
+                var updatedDtos = propertyDataDtos.Where(x => UpdatePropertyDataDto(x, config));
+
+                // persist changes
+                foreach (var propertyDataDto in updatedDtos) Database.Update(propertyDataDto);
+
+                UpdateDataType(dataType);
+                refreshCache = true;
             }
 
             if (refreshCache)
             {
                 //FIXME: trigger cache rebuild. Currently the data in the database tables is wrong.
             }
+        }
 
+        private List<DataTypeDto> GetDataTypes(string editorAlias)
+        {
+            //need to convert the old drop down data types to use the new one
+            var dataTypes = Database.Fetch<DataTypeDto>(Sql()
+                .Select<DataTypeDto>()
+                .From<DataTypeDto>()
+                .Where<DataTypeDto>(x => x.EditorAlias == editorAlias));
+            return dataTypes;
         }
 
         private void UpdateDataType(DataTypeDto dataType)
@@ -123,7 +140,8 @@ private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfigurat
 
             if (!canConvert) return false;
 
-            propData.VarcharValue = string.Join(",", values);
+            //The radio button only supports selecting a single value, so if there are multiple for some insane reason we can only use the first
+            propData.VarcharValue = values.Count > 0 ? values[0] : string.Empty;
             propData.TextValue = null;
             propData.IntegerValue = null;
             return true;
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 4358fdbd427b..d43aedc2d060 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -52,9 +52,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\Umbraco.Tests\bin\Debug\Umbraco.Web.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
@@ -389,7 +386,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorMacroColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorVariantsModel.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RadioButtonPropertyEditorsMigration.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\RadioButtonAndCheckboxPropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameUmbracoDomainsTable.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\SuperZero.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TablesForScheduledPublishing.cs" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index 9ef1b69aad3c..8897c59cef9b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -42,7 +42,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
                         return f.checked;
                     }),
                 function(m) {
-                    return m.key;
+                    return m.value;
                 });
             //get all of the same values between the arrays
             var same = _.intersection($scope.model.value, selectedVals);
@@ -54,7 +54,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
             $scope.selectedItems = [];
 
             for (var i = 0; i < configItems.length; i++) {
-                var isChecked = _.contains($scope.model.value, configItems[i].id);
+                var isChecked = _.contains($scope.model.value, configItems[i].value);
                 $scope.selectedItems.push({
                     checked: isChecked,
                     key: configItems[i].id,
@@ -66,13 +66,13 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
         function changed(item) {
             var index = _.findIndex($scope.model.value,
                 function (v) {
-                    return v === item.key;
+                    return v === item.value;
                 });
 
             if (item.checked) {
                 //if it doesn't exist in the model, then add it
                 if (index < 0) {
-                    $scope.model.value.push(item.key);
+                    $scope.model.value.push(item.value);
                 }
             }
             else {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index 29760e3f5b10..6e9150d07c21 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -4,7 +4,7 @@
         <li ng-repeat="item in selectedItems track by item.key">
             <label class="checkbox">
                 <input type="checkbox" name="checkboxlist"
-                       value="{{item.key}}"
+                       value="{{item.value}}"
                        ng-model="item.checked"
                        ng-change="changed(item)" 
                        ng-required="model.validation.mandatory && !model.value.length" />
diff --git a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
index 7f8dc3f03a74..e0f7184dc7c4 100644
--- a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
@@ -8,11 +8,6 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// A property editor to allow multiple checkbox selection of pre-defined items.
     /// </summary>
-    /// <remarks>
-    /// Due to remaining backwards compatible, this stores the id of the checkbox items in the database
-    /// as INT and we have logic in here to ensure it is formatted correctly including ensuring that the string value is published
-    /// in cache and not the int ID.
-    /// </remarks>
     [DataEditor(Constants.PropertyEditors.Aliases.CheckBoxList, "Checkbox list", "checkboxlist", Icon="icon-bulleted-list", Group="lists")]
     public class CheckBoxListPropertyEditor : DataEditor
     {
@@ -31,6 +26,6 @@ public CheckBoxListPropertyEditor(ILogger logger, ILocalizedTextService textServ
         protected override IConfigurationEditor CreateConfigurationEditor() => new ValueListConfigurationEditor(_textService);
 
         /// <inheritdoc />
-        protected override IDataValueEditor CreateValueEditor() => new PublishValuesMultipleValueEditor(Logger, Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new MultipleValueEditor(Logger, Attribute);
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
index 4424e1d24592..eac692fcdde6 100644
--- a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
@@ -18,7 +18,7 @@ public DropDownFlexiblePropertyEditor(ILocalizedTextService textService, ILogger
 
         protected override IDataValueEditor CreateValueEditor()
         {
-            return new PublishValuesMultipleValueEditor(Logger, Attribute);
+            return new MultipleValueEditor(Logger, Attribute);
         }
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new DropDownFlexibleConfigurationEditor(_textService);
diff --git a/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
similarity index 84%
rename from src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs
rename to src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
index 8e0737dedd87..83a74c0a4e8a 100644
--- a/src/Umbraco.Web/PropertyEditors/PublishValuesMultipleValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
@@ -11,23 +11,23 @@
 namespace Umbraco.Web.PropertyEditors
 {
     /// <summary>
-    /// Custom value editor to handle posted json data and to return json data for the multiple selected items
+    /// A value editor to handle posted json array data and to return array data for the multiple selected csv items
     /// </summary>
     /// <remarks>
     /// This is re-used by editors such as the multiple drop down list or check box list
     /// </remarks>
-    internal class PublishValuesMultipleValueEditor : DataValueEditor
+    internal class MultipleValueEditor : DataValueEditor
     {
         private readonly ILogger _logger;
 
-        internal PublishValuesMultipleValueEditor(ILogger logger, DataEditorAttribute attribute)
+        internal MultipleValueEditor(ILogger logger, DataEditorAttribute attribute)
             : base(attribute)
         {
             _logger = logger;
         }
 
         /// <summary>
-        /// Override so that we can return a json array to the editor for multi-select values
+        /// Override so that we can return an array to the editor for multi-select values
         /// </summary>
         /// <param name="property"></param>
         /// <param name="dataTypeService"></param>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 11d2be5b70e6..e484661c3f0e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -860,7 +860,7 @@
     <Compile Include="PropertyEditors\DateTimeValidator.cs" />
     <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PublishValuesMultipleValueEditor.cs" />
+    <Compile Include="PropertyEditors\MultipleValueEditor.cs" />
     <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
     <Compile Include="PropertyEditors\RichTextConfigurationEditor.cs" />

From 3f314fe5beddb88f724c4384d34562efb5d20718 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Feb 2019 08:09:42 +0100
Subject: [PATCH 410/421] #4490 Updated the tour to match v8

---
 .../BackOfficeTours/getting-started.json      | 68 +++++--------------
 1 file changed, 16 insertions(+), 52 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
index a926a7c1d3dd..e300e6562e5f 100644
--- a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
+++ b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
@@ -6,32 +6,26 @@
         "groupOrder": 100,
         "allowDisable": true,
         "requiredSections": [
-            "content",
-            "media",
-            "settings",
-            "developer",
-            "users",
-            "member",
-            "forms"
+            "content"
         ],
         "steps": [
             {
                 "title": "Welcome to Umbraco - The Friendly CMS",
-                "content": "<p>Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</p><p>In this quick tour we will introduce you to the main areas of Umbraco and show you how to best get started.</p><p><em>If you don't want to take the tour now you can always start it by opening the Help drawer in the bottom left corner.<em></p>",
+                "content": "<p>Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</p><p>In this quick tour we will introduce you to the main areas of Umbraco and show you how to best get started.</p><p><em>If you don't want to take the tour now you can always start it by opening the Help drawer in the top right corner.<em></p>",
                 "type": "intro"
             },
             {
                 "element": "[data-element='sections']",
                 "elementPreventClick": true,
                 "title": "Main Menu",
-                "content": "This is the main menu in Umbraco backoffice. Here you can navigate between the different sections, see your user profile and open the help drawer.",
+                "content": "This is the main menu in Umbraco backoffice. Here you can navigate between the different sections, search for items, see your user profile and open the help drawer.",
                 "backdropOpacity": 0.6
             },
             {
                 "element": "[data-element='section-content']",
                 "elementPreventClick": true,
                 "title": "Sections",
-                "content": "Each area in Umbraco is called a <b>Section</b>. Right now you are in the Content section, when you want to go to another section simply click on the appropriate icon in the main menu and you'll be there in no time.",
+                "content": "Each area in Umbraco is called a <b>Section</b>. Right now you are in the Content section, when you want to go to another section simply click on the appropriate name in the main menu and you'll be there in no time.",
                 "backdropOpacity": 0.6
             },
             {
@@ -62,7 +56,7 @@
                 "element": "[data-element~='overlay-user']",
                 "elementPreventClick": true,
                 "title": "User profile",
-                "content": "<p>Here you can see details about your user, what Umbraco version the site is running, change your password and log out of Umbraco.</p><p>In the <b>User section</b> you will be able to do more advanced user management.</p>"
+                "content": "<p>Here you can see details about your user, change your password and log out of Umbraco.</p><p>In the <b>User section</b> you will be able to do more advanced user management.</p>"
             },
             {
                 "element": "[data-element~='overlay-user'] [data-element='button-overlayClose']",
@@ -97,13 +91,7 @@
         "group": "Getting Started",
         "groupOrder": 100,
         "requiredSections": [
-            "content",
-            "media",
-            "settings",
-            "developer",
-            "users",
-            "member",
-            "forms"
+            "settings"
         ],
         "steps": [
             {
@@ -150,8 +138,8 @@
             },
             {
                 "element": "[data-element='group-name-field']",
-                "title": "Name the tab",
-                "content": "<p>Enter <code>Home</code> in the tab name.</p><p><em>You can name a tab anything you want and if you have a lot of properties it can be useful to add multiple tabs.</em></p>",
+                "title": "Name the group",
+                "content": "<p>Enter <code>Home</code> in the group name.</p><p><em>You can name a group anything you want and if you have a lot of properties it can be useful to add multiple groups.</em></p>",
                 "view": "tabName"
             },
             {
@@ -233,13 +221,7 @@
         "group": "Getting Started",
         "groupOrder": 100,
         "requiredSections": [
-            "content",
-            "media",
-            "settings",
-            "developer",
-            "users",
-            "member",
-            "forms"
+            "content"
         ],
         "steps": [
             {
@@ -292,13 +274,7 @@
         "group": "Getting Started",
         "groupOrder": 100,
         "requiredSections": [
-            "content",
-            "media",
-            "settings",
-            "developer",
-            "users",
-            "member",
-            "forms"
+            "settings"
         ],
         "steps": [
             {
@@ -347,13 +323,7 @@
         "group": "Getting Started",
         "groupOrder": 100,
         "requiredSections": [
-            "content",
-            "media",
-            "settings",
-            "developer",
-            "users",
-            "member",
-            "forms"
+            "content"
         ],
         "steps": [
             {
@@ -376,7 +346,7 @@
                 "eventElement": "#tree [data-element='tree-item-Home'] a.umb-tree-item__label"
             },
             {
-                "element": "[data-element='editor-content'] [data-element='sub-view-info']",
+                "element": "[data-element='editor-content'] [data-element='sub-view-umbInfo']",
                 "title": "Info",
                 "content": "<p>Under the Info-app you will find the default information about a content item.</p>",
                 "event": "click"
@@ -396,13 +366,7 @@
         "group": "Getting Started",
         "groupOrder": 100,
         "requiredSections": [
-            "content",
-            "media",
-            "settings",
-            "developer",
-            "users",
-            "member",
-            "forms"
+            "media"
         ],
         "steps": [
             {
@@ -451,7 +415,7 @@
             {
                 "element": "[data-element='editor-media'] [data-element='media-grid-item-0']",
                 "title": "View media item details",
-                "content": "Hover over the media item and <b>Click the purple bar</b> to view details about the media item.",
+                "content": "Hover over the media item and <b>Click the white bar</b> to view details about the media item.",
                 "event": "click",
                 "eventElement": "[data-element='editor-media'] [data-element='media-grid-item-0'] [data-element='media-grid-item-edit']"
             },
@@ -467,9 +431,9 @@
                 "content": "<p>You will also find other details about the image, like the size.</p><p>Media items work in much the same way as content. So you can add extra properties to an image by creating or editing the <b>Media types</b> in the Settings section.</p>"
             },
             {
-                "element": "[data-element='editor-media'] [data-element='sub-view-info']",
+                "element": "[data-element='editor-media'] [data-element='sub-view-umbInfo']",
                 "title": "Info",
-                "content": "Like the content section you can also find default information about the media item. You will find these under the info tab.",
+                "content": "Like the content section you can also find default information about the media item. You will find these under the info app.",
                 "event": "click"
             },
             {

From 724eca75756eb918adc6be22cbec85d57c7a8ac8 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Feb 2019 08:10:18 +0100
Subject: [PATCH 411/421] #4490 - Fixed the TextArea configuration, to match
 the text in the tour

---
 src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs      | 4 ++--
 .../PropertyEditors/TextAreaConfigurationEditor.cs            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs b/src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs
index e00252b07603..86a418430796 100644
--- a/src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs
@@ -8,9 +8,9 @@ namespace Umbraco.Web.PropertyEditors
     public class TextAreaConfiguration
     {
         [ConfigurationField("maxChars", "Maximum allowed characters", "number", Description = "If empty - no character limit")]
-        public int MaxChars { get; set; }
+        public int? MaxChars { get; set; }
 
         [ConfigurationField("rows", "Number of rows", "number", Description = "If empty - 10 rows would be set as the default value")]
-        public int Rows { get; set; }
+        public int? Rows { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/TextAreaConfigurationEditor.cs
index d02a2225900d..210a571c1752 100644
--- a/src/Umbraco.Web/PropertyEditors/TextAreaConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextAreaConfigurationEditor.cs
@@ -5,6 +5,6 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents the configuration editor for the textarea value editor.
     /// </summary>
-    public class TextAreaConfigurationEditor : ConfigurationEditor
+    public class TextAreaConfigurationEditor : ConfigurationEditor<TextAreaConfiguration>
     { }
-}
\ No newline at end of file
+}

From f4db35651190e7272df36e54fe23fc0d14646edf Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Feb 2019 08:58:49 +0100
Subject: [PATCH 412/421] WIP - Handle migration of Checkbox list data

---
 .../CheckBoxListPropertyEditorsMigration.cs   | 150 ------------------
 ...ttonAndCheckboxPropertyEditorsMigration.cs |  60 +++----
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 -
 3 files changed, 25 insertions(+), 186 deletions(-)
 delete mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/CheckBoxListPropertyEditorsMigration.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/CheckBoxListPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/CheckBoxListPropertyEditorsMigration.cs
deleted file mode 100644
index 87a77963a811..000000000000
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/CheckBoxListPropertyEditorsMigration.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
-{
-    public class CheckBoxListPropertyEditorsMigration : MigrationBase
-    {
-        public CheckBoxListPropertyEditorsMigration(IMigrationContext context)
-            : base(context)
-        {
-        }
-
-        public override void Migrate()
-        {
-            //need to convert the old drop down data types to use the new one
-            var dataTypes = Database.Fetch<DataTypeDto>(Sql()
-                .Select<DataTypeDto>()
-                .From<DataTypeDto>()
-                .Where<DataTypeDto>(x => x.EditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.CheckBoxList)));
-
-            var refreshCache = false;
-            foreach (var dataType in dataTypes)
-            {
-                ValueListConfiguration config;
-
-                if (!dataType.Configuration.IsNullOrWhiteSpace())
-                {
-                    // parse configuration, and update everything accordingly
-                    try
-                    {
-                        config = (ValueListConfiguration) new ValueListConfigurationEditor().FromDatabase(
-                            dataType.Configuration);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.Error<DropDownPropertyEditorsMigration>(
-                            ex,
-                            "Invalid drop down configuration detected: \"{Configuration}\", cannot convert editor, values will be cleared",
-                            dataType.Configuration);
-
-                        continue;
-                    }
-
-                    // get property data dtos
-                    var propertyDataDtos = Database.Fetch<PropertyDataDto>(Sql()
-                        .Select<PropertyDataDto>()
-                        .From<PropertyDataDto>()
-                        .InnerJoin<PropertyTypeDto>()
-                        .On<PropertyTypeDto, PropertyDataDto>((pt, pd) => pt.Id == pd.PropertyTypeId)
-                        .InnerJoin<DataTypeDto>()
-                        .On<DataTypeDto, PropertyTypeDto>((dt, pt) => dt.NodeId == pt.DataTypeId)
-                        .Where<PropertyTypeDto>(x => x.DataTypeId == dataType.NodeId));
-
-                    // update dtos
-                    var updatedDtos = propertyDataDtos.Where(x => UpdatePropertyDataDto(x, config));
-
-                    // persist changes
-                    foreach (var propertyDataDto in updatedDtos) Database.Update(propertyDataDto);
-
-                    UpdateDataType(dataType);
-                    refreshCache = true;
-                }
-            }
-
-            if (refreshCache)
-            {
-                //FIXME: trigger cache rebuild. Currently the data in the database tables is wrong.
-            }
-
-        }
-
-        private void UpdateDataType(DataTypeDto dataType)
-        {
-            dataType.DbType = ValueStorageType.Nvarchar.ToString();
-            Database.Update(dataType);
-        }
-
-        private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfiguration config)
-        {
-            //Get the INT ids stored for this property/drop down
-            int[] ids = null;
-            if (!propData.VarcharValue.IsNullOrWhiteSpace())
-            {
-                ids = ConvertStringValues(propData.VarcharValue);
-            }
-            else if (!propData.TextValue.IsNullOrWhiteSpace())
-            {
-                ids = ConvertStringValues(propData.TextValue);
-            }
-            else if (propData.IntegerValue.HasValue)
-            {
-                ids = new[] { propData.IntegerValue.Value };
-            }
-
-            //if there are INT ids, convert them to values based on the configuration
-            if (ids == null || ids.Length <= 0) return false;
-
-            //map the ids to values
-            var values = new List<string>();
-            var canConvert = true;
-
-            foreach (var id in ids)
-            {
-                var val = config.Items.FirstOrDefault(x => x.Id == id);
-                if (val != null)
-                    values.Add(val.Value);
-                else
-                {
-                    Logger.Warn<DropDownPropertyEditorsMigration>(
-                        "Could not find associated data type configuration for stored Id {DataTypeId}", id);
-                    canConvert = false;
-                }
-            }
-
-            if (!canConvert) return false;
-
-            propData.VarcharValue = JsonConvert.SerializeObject(values);
-            propData.TextValue = null;
-            propData.IntegerValue = null;
-            return true;
-        }
-
-        private class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfiguration>
-        {
-        }
-
-        private int[] ConvertStringValues(string val)
-        {
-            var splitVals = JsonConvert.DeserializeObject<string[]>(val);
-
-            var intVals = splitVals
-                .Select(x => int.TryParse(x, out var i) ? i : int.MinValue)
-                .Where(x => x != int.MinValue)
-                .ToArray();
-
-            //only return if the number of values are the same (i.e. All INTs)
-            if (splitVals.Length == intVals.Length)
-                return intVals;
-
-            return null;
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs
index ec60a22ecd93..ace104b785fd 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
@@ -18,24 +19,22 @@ public RadioButtonAndCheckboxPropertyEditorsMigration(IMigrationContext context)
 
         public override void Migrate()
         {
-            MigrateRadioButtons();
-            MigrateCheckBoxes();
-        }
-
-        private void MigrateCheckBoxes()
-        {
-            //fixme: complete this
-
-            var dataTypes = GetDataTypes(Constants.PropertyEditors.Aliases.CheckBoxList);
+            var refreshCache = false;
 
+            refreshCache |= Migrate(Constants.PropertyEditors.Aliases.RadioButtonList, str => str.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries));
+            refreshCache |= Migrate(Constants.PropertyEditors.Aliases.CheckBoxList, JsonConvert.DeserializeObject<string[]>);
 
+            if (refreshCache)
+            {
+                //FIXME: trigger cache rebuild. Currently the data in the database tables is wrong.
+            }
         }
 
-        private void MigrateRadioButtons()
+        private bool Migrate(string editorAlias, Func<string, string[]> splitValuesFunc)
         {
-            var dataTypes = GetDataTypes(Constants.PropertyEditors.Aliases.RadioButtonList);
-
             var refreshCache = false;
+            var dataTypes = GetDataTypes(editorAlias);
+
             foreach (var dataType in dataTypes)
             {
                 ValueListConfiguration config;
@@ -46,7 +45,7 @@ private void MigrateRadioButtons()
                 // parse configuration, and update everything accordingly
                 try
                 {
-                    config = (ValueListConfiguration)new ValueListConfigurationEditor().FromDatabase(
+                    config = (ValueListConfiguration) new ValueListConfigurationEditor().FromDatabase(
                         dataType.Configuration);
                 }
                 catch (Exception ex)
@@ -70,7 +69,7 @@ private void MigrateRadioButtons()
                     .Where<PropertyTypeDto>(x => x.DataTypeId == dataType.NodeId));
 
                 // update dtos
-                var updatedDtos = propertyDataDtos.Where(x => UpdatePropertyDataDto(x, config));
+                var updatedDtos = propertyDataDtos.Where(x => UpdateRadioPropertyDataDto(x, config, splitValuesFunc));
 
                 // persist changes
                 foreach (var propertyDataDto in updatedDtos) Database.Update(propertyDataDto);
@@ -79,10 +78,7 @@ private void MigrateRadioButtons()
                 refreshCache = true;
             }
 
-            if (refreshCache)
-            {
-                //FIXME: trigger cache rebuild. Currently the data in the database tables is wrong.
-            }
+            return refreshCache;
         }
 
         private List<DataTypeDto> GetDataTypes(string editorAlias)
@@ -101,22 +97,16 @@ private void UpdateDataType(DataTypeDto dataType)
             Database.Update(dataType);
         }
 
-        private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfiguration config)
+        private bool UpdateRadioPropertyDataDto(PropertyDataDto propData, ValueListConfiguration config,
+            Func<string, string[]> splitValuesFunc)
         {
             //Get the INT ids stored for this property/drop down
             int[] ids = null;
             if (!propData.VarcharValue.IsNullOrWhiteSpace())
-            {
-                ids = ConvertStringValues(propData.VarcharValue);
-            }
+                ids = ConvertStringValues(propData.VarcharValue, splitValuesFunc);
             else if (!propData.TextValue.IsNullOrWhiteSpace())
-            {
-                ids = ConvertStringValues(propData.TextValue);
-            }
-            else if (propData.IntegerValue.HasValue)
-            {
-                ids = new[] { propData.IntegerValue.Value };
-            }
+                ids = ConvertStringValues(propData.TextValue, splitValuesFunc);
+            else if (propData.IntegerValue.HasValue) ids = new[] {propData.IntegerValue.Value};
 
             //if there are INT ids, convert them to values based on the configuration
             if (ids == null || ids.Length <= 0) return false;
@@ -147,13 +137,9 @@ private bool UpdatePropertyDataDto(PropertyDataDto propData, ValueListConfigurat
             return true;
         }
 
-        private class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfiguration>
-        {
-        }
-
-        private int[] ConvertStringValues(string val)
+        private int[] ConvertStringValues(string val, Func<string, string[]> splitValuesFunc)
         {
-            var splitVals = val.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            var splitVals = splitValuesFunc(val);
 
             var intVals = splitVals
                 .Select(x => int.TryParse(x, out var i) ? i : int.MinValue)
@@ -166,5 +152,9 @@ private int[] ConvertStringValues(string val)
 
             return null;
         }
+
+        private class ValueListConfigurationEditor : ConfigurationEditor<ValueListConfiguration>
+        {
+        }
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 18cebfaa57f4..d43aedc2d060 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -367,7 +367,6 @@
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoAuditTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\AddUmbracoConsentTable.cs" />
     <Compile Include="Migrations\Upgrade\V_7_9_0\CreateSensitiveDataUserGroup.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\CheckBoxListPropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddUserLoginDtoDateIndex.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\ConvertRelatedLinksToMultiUrlPicker.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />

From bb27a3f42ea0b331da29092bf85ee823d54d06f1 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Feb 2019 10:36:36 +0100
Subject: [PATCH 413/421] #4477 - Migration of radio button, checkbox and
 dropdown to align underlying data structures

---
 .../Migrations/Upgrade/UmbracoPlan.cs         |  2 +-
 ...boxAndDropdownPropertyEditorsMigration.cs} | 50 +++++++++++++------
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +-
 3 files changed, 38 insertions(+), 16 deletions(-)
 rename src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/{RadioButtonAndCheckboxPropertyEditorsMigration.cs => RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs} (69%)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index ddc428971851..a4b7f4f4af6a 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -128,7 +128,7 @@ protected void DefinePlan()
             To<UpdatePickerIntegerValuesToUdi>("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
             To<RenameUmbracoDomainsTable>("{6017F044-8E70-4E10-B2A3-336949692ADD}");
             To<AddUserLoginDtoDateIndex>("98339BEF-E4B2-48A8-B9D1-D173DC842BBE");
-            To<RadioButtonAndCheckboxPropertyEditorsMigration>("{940FD19A-00A8-4D5C-B8FF-939143585726}");
+            To<RadioAndCheckboxAndDropdownPropertyEditorsMigration>("{940FD19A-00A8-4D5C-B8FF-939143585726}");
 
             //FINAL
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs
similarity index 69%
rename from src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs
index ace104b785fd..5327a344a4c1 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioButtonAndCheckboxPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs
@@ -10,9 +10,9 @@
 
 namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 {
-    public class RadioButtonAndCheckboxPropertyEditorsMigration : MigrationBase
+    public class RadioAndCheckboxAndDropdownPropertyEditorsMigration : MigrationBase
     {
-        public RadioButtonAndCheckboxPropertyEditorsMigration(IMigrationContext context)
+        public RadioAndCheckboxAndDropdownPropertyEditorsMigration(IMigrationContext context)
             : base(context)
         {
         }
@@ -21,8 +21,9 @@ public override void Migrate()
         {
             var refreshCache = false;
 
-            refreshCache |= Migrate(Constants.PropertyEditors.Aliases.RadioButtonList, str => str.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries));
-            refreshCache |= Migrate(Constants.PropertyEditors.Aliases.CheckBoxList, JsonConvert.DeserializeObject<string[]>);
+            refreshCache |= Migrate(Constants.PropertyEditors.Aliases.RadioButtonList, (dto, configuration) =>  UpdateRadioOrCheckboxPropertyDataDto(dto, configuration, true));
+            refreshCache |= Migrate(Constants.PropertyEditors.Aliases.CheckBoxList, (dto, configuration) =>  UpdateRadioOrCheckboxPropertyDataDto(dto, configuration, false));
+            refreshCache |= Migrate(Constants.PropertyEditors.Aliases.DropDownListFlexible, UpdateDropDownPropertyDataDto);
 
             if (refreshCache)
             {
@@ -30,7 +31,7 @@ public override void Migrate()
             }
         }
 
-        private bool Migrate(string editorAlias, Func<string, string[]> splitValuesFunc)
+        private bool Migrate(string editorAlias, Func<PropertyDataDto, ValueListConfiguration, bool> updateRadioPropertyDataFunc)
         {
             var refreshCache = false;
             var dataTypes = GetDataTypes(editorAlias);
@@ -69,7 +70,7 @@ private bool Migrate(string editorAlias, Func<string, string[]> splitValuesFunc)
                     .Where<PropertyTypeDto>(x => x.DataTypeId == dataType.NodeId));
 
                 // update dtos
-                var updatedDtos = propertyDataDtos.Where(x => UpdateRadioPropertyDataDto(x, config, splitValuesFunc));
+                var updatedDtos = propertyDataDtos.Where(x => updateRadioPropertyDataFunc(x, config));
 
                 // persist changes
                 foreach (var propertyDataDto in updatedDtos) Database.Update(propertyDataDto);
@@ -97,16 +98,22 @@ private void UpdateDataType(DataTypeDto dataType)
             Database.Update(dataType);
         }
 
-        private bool UpdateRadioPropertyDataDto(PropertyDataDto propData, ValueListConfiguration config,
-            Func<string, string[]> splitValuesFunc)
+        private bool UpdateRadioOrCheckboxPropertyDataDto(PropertyDataDto propData, ValueListConfiguration config, bool singleValue)
         {
             //Get the INT ids stored for this property/drop down
             int[] ids = null;
             if (!propData.VarcharValue.IsNullOrWhiteSpace())
-                ids = ConvertStringValues(propData.VarcharValue, splitValuesFunc);
+            {
+                ids = ConvertStringValues(propData.VarcharValue);
+            }
             else if (!propData.TextValue.IsNullOrWhiteSpace())
-                ids = ConvertStringValues(propData.TextValue, splitValuesFunc);
-            else if (propData.IntegerValue.HasValue) ids = new[] {propData.IntegerValue.Value};
+            {
+                ids = ConvertStringValues(propData.TextValue);
+            }
+            else if (propData.IntegerValue.HasValue)
+            {
+                ids = new[] {propData.IntegerValue.Value};
+            }
 
             //if there are INT ids, convert them to values based on the configuration
             if (ids == null || ids.Length <= 0) return false;
@@ -131,15 +138,30 @@ private bool UpdateRadioPropertyDataDto(PropertyDataDto propData, ValueListConfi
             if (!canConvert) return false;
 
             //The radio button only supports selecting a single value, so if there are multiple for some insane reason we can only use the first
-            propData.VarcharValue = values.Count > 0 ? values[0] : string.Empty;
+            propData.VarcharValue = singleValue ? values[0] : JsonConvert.SerializeObject(values);
+            propData.TextValue = null;
+            propData.IntegerValue = null;
+            return true;
+        }
+
+        private bool UpdateDropDownPropertyDataDto(PropertyDataDto propData, ValueListConfiguration config)
+        {
+            //Get the INT ids stored for this property/drop down
+            var values = propData.VarcharValue.Split(new []{","}, StringSplitOptions.RemoveEmptyEntries);
+
+            //if there are INT ids, convert them to values based on the configuration
+            if (values == null || values.Length <= 0) return false;
+
+            //The radio button only supports selecting a single value, so if there are multiple for some insane reason we can only use the first
+            propData.VarcharValue = JsonConvert.SerializeObject(values);
             propData.TextValue = null;
             propData.IntegerValue = null;
             return true;
         }
 
-        private int[] ConvertStringValues(string val, Func<string, string[]> splitValuesFunc)
+        private int[] ConvertStringValues(string val)
         {
-            var splitVals = splitValuesFunc(val);
+            var splitVals = val.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
 
             var intVals = splitVals
                 .Select(x => int.TryParse(x, out var i) ? i : int.MinValue)
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index d43aedc2d060..13ffa2b0121a 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -386,7 +386,7 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorMacroColumns.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorVariantsModel.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RadioButtonAndCheckboxPropertyEditorsMigration.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameUmbracoDomainsTable.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\SuperZero.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\TablesForScheduledPublishing.cs" />

From 7b84c755b308713c800baa8b33f4e91aeac98c8a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Feb 2019 11:20:10 +0100
Subject: [PATCH 414/421] #4477 - Fixed tests

---
 .../PropertyEditorValueConverterTests.cs           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
index 7ec23158f6fb..43c1a83d3341 100644
--- a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
@@ -65,9 +65,9 @@ public void CanConvertYesNoPropertyEditor(object value, bool expected)
             Assert.AreEqual(expected, result);
         }
 
-        [TestCase("apples", new[] { "apples" })]
-        [TestCase("apples,oranges", new[] { "apples", "oranges" })]
-        [TestCase(" apples, oranges, pears ", new[] { "apples", "oranges", "pears" })]
+        [TestCase("[\"apples\"]", new[] { "apples" })]
+        [TestCase("[\"apples\",\"oranges\"]", new[] { "apples", "oranges" })]
+        [TestCase("[\"apples\",\"oranges\",\"pears\"]", new[] { "apples", "oranges", "pears" })]
         [TestCase("", new string[] { })]
         [TestCase(null, new string[] { })]
         public void CanConvertCheckboxListPropertyEditor(object value, IEnumerable<string> expected)
@@ -78,9 +78,9 @@ public void CanConvertCheckboxListPropertyEditor(object value, IEnumerable<strin
             Assert.AreEqual(expected, result);
         }
 
-        [TestCase("apples", new[] { "apples" })]
-        [TestCase("apples,oranges", new[] { "apples", "oranges" })]
-        [TestCase("apples , oranges, pears ", new[] { "apples", "oranges", "pears" })]
+        [TestCase("[\"apples\"]", new[] { "apples" })]
+        [TestCase("[\"apples\",\"oranges\"]", new[] { "apples", "oranges" })]
+        [TestCase("[\"apples\",\"oranges\",\"pears\"]", new[] { "apples", "oranges", "pears" })]
         [TestCase("", new string[] { })]
         [TestCase(null, new string[] { })]
         public void CanConvertDropdownListMultiplePropertyEditor(object value, IEnumerable<string> expected)
@@ -104,7 +104,7 @@ public void CanConvertDropdownListMultiplePropertyEditor(object value, IEnumerab
 
             Assert.AreEqual(expected, result);
         }
-        
+
         [TestCase("1", 1)]
         [TestCase("1", 1)]
         [TestCase("0", 0)]

From 810d8fa87a5f111c4ef7dee6ac0bb266ced0bd5e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 12 Feb 2019 10:57:39 +0000
Subject: [PATCH 415/421] Update
 src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js

---
 .../src/views/users/views/users/users.controller.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index c0e59be8e450..74a6e67f4310 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -629,7 +629,7 @@
                     vm.allowEnableUser = false;
                     vm.allowUnlockUser = false;
                     vm.allowSetUserGroup = false;
-                    console.log("IS CURRENT!")
+                    
                     return false;
                 }
 

From 20dc1b5c100932465cd2c88d723dec5d62e4064d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 12 Feb 2019 11:57:43 +0100
Subject: [PATCH 416/421] Corrected colors for buttons + disable select-image
 button in media-picker if nothing is selected

---
 src/Umbraco.Web.UI.Client/src/less/buttons.less        | 10 +++++-----
 src/Umbraco.Web.UI.Client/src/less/mixins.less         |  2 +-
 src/Umbraco.Web.UI.Client/src/less/variables.less      |  9 +++++----
 .../infiniteeditors/mediapicker/mediapicker.html       |  1 +
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index c6a844734258..7fd62e31c790 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -191,13 +191,13 @@ input[type="button"] {
 .btn-success {
   .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight, @btnSuccessType);
 }
-// Info appears as a neutral blue
+// Info appears as a sand color
 .btn-info {
-  .buttonBackground(@sand-5, @blueDark, @blueExtraDark, @u-white);
+  .buttonBackground(@sand-5, @sand-6, @blueExtraDark, @blueMid);
 }
 // Made for Umbraco, 2019
 .btn-action {
-  .buttonBackground(@blueExtraDark, @blueDark, @pinkLight, @u-white);
+  .buttonBackground(@blueExtraDark, @blueDark, @white, @u-white);
 }
 // Made for Umbraco, 2019
 .btn-selection {
@@ -236,11 +236,11 @@ input[type="button"] {
     padding: 15px 50px;
     font-size: 16px;
     border: none;
-    background: @green;
+    background: @ui-btn-positive;
     color: @white;
     font-weight: bold;
     &:hover {
-        background: @green-d1;
+        background: @ui-btn-positive-hover;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index b67fd1dd2507..0dadc906ef2e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -539,7 +539,7 @@
   
   &.disabled, &[disabled] {
     color: @white;
-    background-color: @sand-2;
+    background-color: @sand-1;
   }
   /*
   // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 80665e4c64f8..92d4e09895b7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -76,9 +76,10 @@
 @gray-10:               #F3F3F5;
 @gray-11:               #F6F6F7;
 
-@sand-1:                hsl(22, 33%, 93%);// added 2019
+@sand-1:                hsl(22, 18%, 84%);// added 2019
 @sand-2:                hsl(22, 34%, 88%);// added 2019
 @sand-5:                hsl(22, 31%, 93%);// added 2019
+@sand-6:                hsl(22, 29%, 95%);// added 2019
 @sand-7:                hsl(22, 26%, 97%);// added 2019
 
 
@@ -138,8 +139,8 @@
 @ui-active-type:        @blueExtraDark;
 @ui-active-type-hover:  @blueMid;
 
-@ui-selected:           @sand-1;
-@ui-selected-hover:     ligthen(@sand-1, 10);
+@ui-selected:           @sand-5;
+@ui-selected-hover:     ligthen(@sand-5, 10);
 @ui-selected-type:           @blueExtraDark;
 @ui-selected-type-hover:     @blueMid;
 @ui-selected-border:           @pinkLight;
@@ -176,7 +177,7 @@
 @ui-btn-type:                   @white;
 
 @ui-btn-positive:               @green;
-@ui-btn-positive-hover:         @green-l1;
+@ui-btn-positive-hover:         lighten(@green, 6%);
 @ui-btn-positive-type:          @white;
 
 @ui-btn-negative:               @red;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index 44b70ea6134f..eb85cc5fd2b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -180,6 +180,7 @@ <h5>
                 button-style="success"
                 label="Select image"
                 type="button"
+                disabled="model.selection.length === 0"
                 action="submit(model)">
             </umb-button>
 

From 4a1c36c8d0ea3a272ddc21a1d3a4603160c36ee4 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 12 Feb 2019 10:57:47 +0000
Subject: [PATCH 417/421] Update
 src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js

---
 .../src/views/users/views/users/users.controller.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 74a6e67f4310..38f67586513b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -622,7 +622,7 @@
                     return;
                 }
                 
-                console.log("CHECK")
+                
                 // if the current user is selected prevent any bulk actions with the user included
                 if (user.isCurrentUser) {
                     vm.allowDisableUser = false;

From 786c9ff3ccdd9b5a4737f59caa133bcba6b9785f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Feb 2019 12:38:43 +0100
Subject: [PATCH 418/421] form horizontal

---
 .../src/views/propertyeditors/grid/dialogs/layoutconfig.html    | 2 +-
 .../src/views/propertyeditors/grid/dialogs/rowconfig.html       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
index 6f70c5e7ef81..4f0b665e244d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
@@ -24,7 +24,7 @@
 
 
 
-   <div class="umb-forms-settings">
+   <div class="umb-forms-settings form-horizontal">
 
       <p><localize key="grid_addGridLayoutDetail" /></p>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
index 12d83f23fd60..10af5ade3c25 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
@@ -23,7 +23,7 @@
 
 
 
-   <div class="umb-form-settings">
+   <div class="umb-form-settings form-horizontal">
 
       <p><localize key="grid_addRowConfigurationDetail" /></p>
 

From 1def9014cd44c1a9e35c4810b6e1c9e13348efc1 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Feb 2019 15:11:07 +0100
Subject: [PATCH 419/421] Reload templates when creating a doc type with
 template

---
 .../src/views/documenttypes/edit.controller.js           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index b4f031935acd..794888730974 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -480,6 +480,15 @@
             loadDocumentType();
         }));
 
+        evts.push(eventsService.on("editors.documentType.saved", function(name, args) {
+            if(args.documentType.allowedTemplates.length > 0){
+                navigationService.syncTree({ tree: "templates", path: [], forceReload: true })
+                    .then(function (syncArgs) {
+                        navigationService.reloadNode(syncArgs.node)
+                    });
+            }
+        }));
+
         //ensure to unregister from all events!
         $scope.$on('$destroy', function () {
             for (var e in evts) {

From f016d04c1f736f76565cc0edc9eead1f6abc4914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 12 Feb 2019 16:52:52 +0100
Subject: [PATCH 420/421] V8 UI - umb-sticky-bar corrected width and height set
 by JS.

---
 .../common/directives/components/umbstickybar.directive.js    | 4 ++--
 .../components/editor/subheader/umb-editor-sub-header.less    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index e8d8315b7a12..a00138db1554 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -119,9 +119,9 @@ Use this directive make an element sticky and follow the page when scrolling.
             }
 
             function calculateSize() {
+                var width = bar.innerWidth();
                 clonedBar.css({
-                    width: bar.outerWidth(),
-                    height: bar.height()
+                    width: width
                 });
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 1aadb1c39b57..0c1134984149 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -7,6 +7,7 @@
    margin-top: -10px;
    position: relative;
    top: 0;
+   box-sizing: border-box;
 
     &.nested {
         margin-top: 0;

From ee4c7514233a602ff4edef0f9178a88ffb77da38 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 13 Feb 2019 15:30:39 +1100
Subject: [PATCH 421/421] fix typo

---
 .../RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs
index 5327a344a4c1..0da9d3b8ec46 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxAndDropdownPropertyEditorsMigration.cs
@@ -53,7 +53,7 @@ private bool Migrate(string editorAlias, Func<PropertyDataDto, ValueListConfigur
                 {
                     Logger.Error<DropDownPropertyEditorsMigration>(
                         ex,
-                        "Invalid radio button configuration detected: \"{Configuration}\", cannot convert editor, values will be cleared",
+                        "Invalid property editor configuration detected: \"{Configuration}\", cannot convert editor, values will be cleared",
                         dataType.Configuration);
 
                     continue;