From 988be21990ef56c6b452fb4a83b28cfa67a08b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 13 Feb 2019 13:20:01 +0100
Subject: [PATCH 01/50] making the grid work in splitview

---
 .../src/less/components/umb-grid.less         | 37 +++++-----
 .../propertyeditors/grid/grid.controller.js   | 68 +++++++++++--------
 .../src/views/propertyeditors/grid/grid.html  | 40 +++++------
 3 files changed, 81 insertions(+), 64 deletions(-)

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 e7f24d08fa..6bf8cd612a 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
@@ -128,9 +128,10 @@
     position: relative;
     margin-bottom: 40px;
     padding-top: 10px;
+    border: 1px solid @grayLighter;
 
     &:hover {
-        background-color: @grayLighter;
+        border-color: @grayLight;
     }
 
     &[ng-click],
@@ -161,15 +162,16 @@
 }
 
 .umb-grid .umb-row .umb-cell-placeholder {
-    min-height: 130px;
-    background-color: @gray-10;
-    border-width: 2px;
+    min-height: 88px;
+    border-width: 1px;
     border-style: dashed;
-    border-color: @gray-8;
+    border-color: @ui-action-disgrete-border;
+    color: @ui-action-disgrete-type;
     transition: border-color 100ms linear;
 
     &:hover {
-        border-color: @blueMid;
+        border-color: @ui-action-disgrete-border-hover;
+        color: @ui-action-disgrete-type-hover;
         cursor: pointer;
     }
 }
@@ -207,9 +209,9 @@
 }
 
 .umb-grid .cell-tools-add {
-    color: @ui-action-type;
+    color: @ui-action-disgrete-type;
     &:focus, &:hover {
-        color: @ui-action-type-hover;
+        color: @ui-action-disgrete-type-hover;
         text-decoration: none;
     }
 }
@@ -219,16 +221,18 @@
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    color: @ui-action-type;
+    color: @ui-action-disgrete-type;
 }
 
 .umb-grid .cell-tools-add.-bar {
     display: block;
-    background: @gray-10;
     text-align: center;
     padding: 5px;
-    border: 1px dashed @gray-7;
+    border: 1px dashed @ui-action-disgrete-border;
     margin: 10px;
+    &:focus, &:hover {
+        border-color: @ui-action-disgrete-border-hover;
+    }
 }
 
 
@@ -249,7 +253,6 @@
 
 .umb-grid .cell-tools-edit {
     display: inline-block;
-    color: @white;
 }
 
 .umb-grid .drop-overlay {
@@ -412,12 +415,12 @@
 
 // Row states
 .umb-grid .umb-row.-active {
-    background-color: @ui-action-type;
+    border-color: @ui-action-type;
 
     .umb-row-title-bar {
         cursor: move;
     }
-
+    /*
     .row-tool,
     .umb-row-title {
         color: @white;
@@ -436,12 +439,13 @@
     .umb-cell .umb-cell-content {
         border-color: transparent;
     }
+    */
 }
 
 
 .umb-grid .umb-row.-active-child {
     background-color: @gray-10;
-
+    
     .umb-row-title-bar {
         cursor: inherit;
     }
@@ -449,7 +453,7 @@
     .umb-row-title {
         color: @gray-3;
     }
-
+    /*
     .row-tool {
         color: fade(@black, 23);
     }
@@ -465,6 +469,7 @@
             border-color: fade(@gray, 44);
         }
     }
+    */
 }
 
 
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 b40305f5f5..0ea5842612 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
@@ -14,11 +14,16 @@ angular.module("umbraco")
         // Grid status variables
         var placeHolder = "";
         var currentForm = angularHelper.getCurrentForm($scope);
-
+        
+        $scope.currentRowWithActiveChild = null;
+        $scope.currentCellWithActiveChild = null;
+        $scope.active = null;
+        
         $scope.currentRow = null;
         $scope.currentCell = null;
         $scope.currentToolsControl = null;
         $scope.currentControl = null;
+        
         $scope.openRTEToolbarId = null;
         $scope.hasSettings = false;
         $scope.showRowConfigurations = true;
@@ -235,10 +240,16 @@ angular.module("umbraco")
                 }, 500, false);
 
                 $scope.$apply(function () {
-
+                    
+                    console.log("$apply function called...")
+                    
                     var cell = $(e.target).scope().area;
-                    cell.hasActiveChild = hasActiveChild(cell, cell.controls);
-                    cell.active = false;
+                    
+                    if(hasActiveChild(cell, cell.controls)) {
+                        $scope.currentCellWithActiveChild = cell;
+                    }
+                    $scope.active = cell;
+                    
                 });
             }
 
@@ -307,12 +318,13 @@ angular.module("umbraco")
         // Row management function
         // *********************************************
 
-        $scope.clickRow = function(index, rows) {
-            rows[index].active = true;
-        };
-
-        $scope.clickOutsideRow = function(index, rows) {
-            rows[index].active = false;
+        $scope.clickRow = function(index, rows, $event) {
+            console.log("clickRow")
+            //rows[index].active = true;
+            $scope.currentRowWithActiveChild = null;
+            $scope.active = rows[index];
+            
+            $event.stopPropagation();
         };
 
         function getAllowedLayouts(section) {
@@ -359,6 +371,7 @@ angular.module("umbraco")
             if (section.rows.length > 0) {
                 section.rows.splice($index, 1);
                 $scope.currentRow = null;
+                $scope.currentRowWithActiveChild = null;
                 $scope.openRTEToolbarId = null;
                 currentForm.$setDirty();
             }
@@ -513,14 +526,13 @@ angular.module("umbraco")
         // Area management functions
         // *********************************************
 
-        $scope.clickCell = function(index, cells, row) {
-            cells[index].active = true;
-            row.hasActiveChild = true;
-        };
-
-        $scope.clickOutsideCell = function(index, cells, row) {
-            cells[index].active = false;
-            row.hasActiveChild = hasActiveChild(row, cells);
+        $scope.clickCell = function(index, cells, row, $event) {
+            
+            $scope.currentCellWithActiveChild = null;
+            
+            $scope.active = cells[index];
+            $scope.currentRowWithActiveChild = row;
+            $event.stopPropagation();
         };
 
         $scope.cellPreview = function (cell) {
@@ -536,14 +548,14 @@ angular.module("umbraco")
         // *********************************************
         // Control management functions
         // *********************************************
-        $scope.clickControl = function (index, controls, cell) {
-            controls[index].active = true;
-            cell.hasActiveChild = true;
-        };
-
-        $scope.clickOutsideControl = function (index, controls, cell) {
-            controls[index].active = false;
-            cell.hasActiveChild = hasActiveChild(cell, controls);
+        $scope.clickControl = function (index, controls, cell, $event) {
+            
+            console.log("clickControl");
+            
+            $scope.active = controls[index];
+            $scope.currentCellWithActiveChild = cell;
+            
+            $event.stopPropagation();
         };
 
         function hasActiveChild(item, children) {
@@ -594,8 +606,8 @@ angular.module("umbraco")
             if (index === undefined) {
                 index = cell.controls.length;
             }
-
-            newControl.active = true;
+            
+            $scope.active = newControl;
 
             //populate control
             $scope.initControl(newControl, index + 1);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 22e72daff9..eeb70718f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -69,13 +69,13 @@
                         <!-- ng-mouseleave="disableCurrentRow()"  -->
                         <div class="umb-row"
                              ng-repeat="row in section.rows"
-                             ng-click="clickRow($index, section.rows)"
+                             ng-click="clickRow($index, section.rows, $event)"
                              ng-class="{
                                      '-has-config': row.hasConfig,
-                                     '-active': row.active,
-                                     '-active-child': row.hasActiveChild}"
-                             on-outside-click="clickOutsideRow($index, section.rows)"
-                             bind-click-on="{{row.active}}"
+                                     '-active': row === active,
+                                     '-active-child': row === currentRowWithActiveChild}"
+
+                             bind-click-on="{{row === active || row === currentRowWithActiveChild}}"
                              data-rowid="{{row.$uniqueId}}">
 
                             <div class="umb-row-title-bar">
@@ -89,7 +89,7 @@
                                 </div>
 
                                <!-- Row tool -->
-                               <div class="umb-tools row-tools" ng-show="row.active && !sortMode">
+                               <div class="umb-tools row-tools" ng-show="(row === active || row === currentRowWithActiveChild) && !sortMode">
 
                                    <div class="cell-tools-edit row-tool" ng-if="hasSettings">
                                        <i class="icon icon-settings" title="@grid_settings" localize="title" ng-click="editGridItemSettings(row, 'row')"></i>
@@ -123,17 +123,17 @@
                                                  ng-style="{width: area.$percentage + '%'}"
                                                  ng-class="{
                                                     '-has-config': area.hasConfig,
-                                                    '-active': area.active,
-                                                    '-active-child': area.hasActiveChild}"
+                                                    '-active': area === active,
+                                                    '-active-child': area === currentCellWithActiveChild}"
                                                  ng-model="area.controls"
-                                                 ng-click="clickCell($index, row.areas, row)"
-                                                 on-outside-click="clickOutsideCell($index, row.areas, row)"
-                                                 bind-click-on="{{area.active}}">
+                                                 ng-click="clickCell($index, row.areas, row, $event)"
+
+                                                 bind-click-on="{{area === active}}">
 
                                                  <!-- Cell -->
                                                  <div class="umb-cell-content"
                                                       ng-class="
-                                                        {'-active': area.active,
+                                                        {'-active': area === active,
                                                         '-has-editors': area.controls.length > 0,
                                                         '-collapsed': sortMode}">
 
@@ -153,7 +153,7 @@
                                                          <localize key="grid_settingsApplied" />
                                                       </div>
 
-                                                      <div class="cell-tools" ng-if="area.active && !sortMode">
+                                                      <div class="cell-tools" ng-if="(area === active || area === currentCellWithActiveChild) && !sortMode">
                                                          <div class="cell-tool" ng-click="editGridItemSettings(area, 'cell')">
                                                             <i class="icon-settings"></i>
                                                          </div>
@@ -172,14 +172,14 @@
                                                           <!-- for each control in areas -->
                                                           <div class="umb-control"
                                                               ng-repeat="control in area.controls"
-                                                              ng-click="clickControl($index, area.controls, area)"
-                                                              ng-class="{'-active': control.active}"
-                                                              on-outside-click="clickOutsideControl($index, area.controls, area)"
-                                                              bind-click-on="{{control.active}}"
+                                                              ng-click="clickControl($index, area.controls, area, $event)"
+                                                              ng-class="{'-active': control === active}"
+
+                                                              bind-click-on="{{control === active}}"
                                                               umb-set-dirty-on-change="{{control.value}}"
                                                               data-itemid="{{control.$uniqueId}}">
 
-                                                              <div class="umb-control-click-overlay" ng-show="!control.active && !sortMode"></div>
+                                                              <div class="umb-control-click-overlay" ng-show="control !== active && !sortMode"></div>
 
                                                               <div class="umb-control-collapsed umb-control-handle" ng-show="sortMode">
                                                                   {{control.editor.name}}
@@ -189,11 +189,11 @@
 
                                                                    <div class="umb-control-bar umb-control-handle">
 
-                                                                      <div class="umb-control-title" ng-if="control.active">
+                                                                      <div class="umb-control-title" ng-if="control === active">
                                                                          {{control.editor.name}}
                                                                       </div>
 
-                                                                      <div class="umb-tools" ng-if="control.active">
+                                                                      <div class="umb-tools" ng-if="control === active">
 
                                                                           <div class="umb-control-tool" ng-if="control.editor.config.settings">
                                                                               <i class="umb-control-tool-icon icon-settings" ng-click="editGridItemSettings(control, 'control')"></i>

From 60fa931f3f6c64a97f5350421461f14b99bca507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 13 Feb 2019 14:38:25 +0100
Subject: [PATCH 02/50] Grid-RTE got a unique ID, which fixes TineMCE code,
 which is dependent on a unique ID. #4011

---
 .../components/grid/grid.rte.directive.js          | 14 ++++++--------
 .../src/views/components/grid/grid-rte.html        |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

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 6472dd3d38..dbbb0e98a2 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
@@ -13,6 +13,10 @@ angular.module("umbraco.directives")
                 // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
                 var promises = [];
+                
+                var d = new Date();
+                var n = d.getTime();
+                scope.textAreaHtmlId = scope.uniqueId + "_" + n + "_rte";
 
                 //queue file loading
                 if (typeof (tinymce) === "undefined") {
@@ -28,7 +32,7 @@ angular.module("umbraco.directives")
                 var tinyMceEditor = null;
 
                 promises.push(tinyMceService.getTinyMceEditorConfig({
-                    htmlId: scope.uniqueId,
+                    htmlId: scope.textAreaHtmlId,
                     stylesheets: scope.configuration ? scope.configuration.stylesheets : null,
                     toolbar: toolbar,
                     mode: scope.configuration.mode
@@ -132,17 +136,11 @@ angular.module("umbraco.directives")
                         }
 
                     });
-
-                    //listen for formSubmitting event (the result is callback used to remove the event subscription)
-                    var formSubmittingListener = scope.$on("formSubmitting", function () {
-                        scope.value = tinyMceEditor ? tinyMceEditor.getContent() : null;
-                    });
-
+                    
                     //when the element is disposed we need to unsubscribe!
                     // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom
                     // element might still be there even after the modal has been hidden.
                     scope.$on('$destroy', function () {
-                        formSubmittingListener();
                         eventsService.unsubscribe(tabShownListener);
                         //ensure we unbind this in case the blur doesn't fire above
                         $('.umb-panel-body').off('scroll', pinToolbar);
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
index f3b854a062..afa9869676 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
@@ -1,3 +1,3 @@
 <div class="umb-rte">
-    <div id="{{uniqueId}}"></div>
+    <div id="{{textAreaHtmlId}}"></div>
 </div>

From 13a326b4673a89fa5694ed81de0ff06470110ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Feb 2019 10:58:59 +0100
Subject: [PATCH 03/50] remove logs

---
 .../src/views/propertyeditors/grid/grid.controller.js       | 6 ------
 1 file changed, 6 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 0ea5842612..650717b7c0 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
@@ -240,9 +240,6 @@ angular.module("umbraco")
                 }, 500, false);
 
                 $scope.$apply(function () {
-                    
-                    console.log("$apply function called...")
-                    
                     var cell = $(e.target).scope().area;
                     
                     if(hasActiveChild(cell, cell.controls)) {
@@ -319,7 +316,6 @@ angular.module("umbraco")
         // *********************************************
 
         $scope.clickRow = function(index, rows, $event) {
-            console.log("clickRow")
             //rows[index].active = true;
             $scope.currentRowWithActiveChild = null;
             $scope.active = rows[index];
@@ -550,8 +546,6 @@ angular.module("umbraco")
         // *********************************************
         $scope.clickControl = function (index, controls, cell, $event) {
             
-            console.log("clickControl");
-            
             $scope.active = controls[index];
             $scope.currentCellWithActiveChild = cell;
             

From 2e4091145066435bf8eba2d9e7bce5d1399fbe36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Feb 2019 10:59:30 +0100
Subject: [PATCH 04/50] get uniq ID by using String.CreateGuid()

---
 .../directives/components/grid/grid.rte.directive.js     | 9 +++++----
 .../src/views/propertyeditors/rte/rte.controller.js      | 4 +---
 2 files changed, 6 insertions(+), 7 deletions(-)

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 dbbb0e98a2..0f933a4ccc 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
@@ -14,10 +14,11 @@ angular.module("umbraco.directives")
 
                 var promises = [];
                 
-                var d = new Date();
-                var n = d.getTime();
-                scope.textAreaHtmlId = scope.uniqueId + "_" + n + "_rte";
-
+                //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
+                // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
+                // we have this mini content editor panel that can be launched with MNTP.
+                scope.textAreaHtmlId = scope.uniqueId + "_" + String.CreateGuid();
+                
                 //queue file loading
                 if (typeof (tinymce) === "undefined") {
                     promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", scope));
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 6099c5dad4..43da0cb66f 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
@@ -9,9 +9,7 @@ angular.module("umbraco")
             //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
             // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
             // we have this mini content editor panel that can be launched with MNTP.
-            var d = new Date();
-            var n = d.getTime();
-            $scope.textAreaHtmlId = $scope.model.alias + "_" + n + "_rte";
+            $scope.textAreaHtmlId = $scope.model.alias + "_" + String.CreateGuid();
 
             var editorConfig = $scope.model.config ? $scope.model.config.editor : null;
             if (!editorConfig || angular.isString(editorConfig)) {

From 44b1a738bf5a4d9ca04b105399d61990ac469bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Feb 2019 10:59:40 +0100
Subject: [PATCH 05/50] clean up css for grid

---
 .../src/less/components/umb-grid.less         | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

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 6bf8cd612a..5283e259c7 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
@@ -420,26 +420,6 @@
     .umb-row-title-bar {
         cursor: move;
     }
-    /*
-    .row-tool,
-    .umb-row-title {
-        color: @white;
-    }
-
-    .umb-grid-has-config {
-        color: fade(@white, 66);
-    }
-
-    .umb-cell {
-        .umb-grid-has-config {
-            color: fade(@black, 44);
-        }
-    }
-
-    .umb-cell .umb-cell-content {
-        border-color: transparent;
-    }
-    */
 }
 
 
@@ -453,23 +433,7 @@
     .umb-row-title {
         color: @gray-3;
     }
-    /*
-    .row-tool {
-        color: fade(@black, 23);
-    }
-
-    .umb-grid-has-config {
-        color: fade(@black, 44);
-    }
-
-    .umb-cell-content.-placeholder {
-        border-color: @gray-8;
-
-        &:hover {
-            border-color: fade(@gray, 44);
-        }
-    }
-    */
+    
 }
 
 

From 3f13baa8e773d9435ae9eab239c7d883881bd193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 18 Feb 2019 11:00:47 +0100
Subject: [PATCH 06/50] make Embed and Media work for Grid in SplitView when
 grid is not allowed to vary.

---
 .../grid/editors/embed.controller.js          | 21 +++++-------------
 .../propertyeditors/grid/editors/embed.html   |  4 ++--
 .../grid/editors/media.controller.js          | 22 ++++++-------------
 .../propertyeditors/grid/editors/media.html   |  4 ++--
 4 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
index beb8edab20..17916299bc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
@@ -2,24 +2,16 @@ angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.EmbedController",
     function ($scope, $timeout, $sce, editorService) {
 
-        function onInit() {
-            $scope.trustedValue = null;
-            $scope.trustedValue = $sce.trustAsHtml($scope.control.value);
-
-            if(!$scope.control.value) {
-                $timeout(function(){
-                    if($scope.control.$initializing){
-                        $scope.setEmbed();
-                    }
-                }, 200);
-            }
+    	$scope.hasEmbed = function(){
+            return $scope.control.value !== null;
+        }
+    	$scope.getEmbed = function(){
+            return $sce.trustAsHtml($scope.control.value);
         }
-
     	$scope.setEmbed = function(){
             var embed = {
                 submit: function(model) {
                     $scope.control.value = model.embed.preview;
-                    $scope.trustedValue = $sce.trustAsHtml(model.embed.preview);
                     editorService.close();
                 },
                 close: function() {
@@ -28,6 +20,5 @@ angular.module("umbraco")
             };
             editorService.embed(embed);
         };
-
-        onInit();
+        
 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index 87109e1eb9..32ebfd3257 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -1,10 +1,10 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.EmbedController">
 
-	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="trustedValue === null">
+	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="hasEmbed() === false">
 		<i class="icon icon-movie-alt"></i>
 		<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
 	</div>
 
-	<div ng-if="control.value" ng-bind-html="trustedValue"></div>
+	<div ng-if="control.value" ng-bind-html="getEmbed()"></div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index e267133cf4..c290b8ae7d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -8,13 +8,7 @@ angular.module("umbraco")
                 $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
             });
         }
-
-        function onInit() {
-            if($scope.control.value){
-                $scope.setUrl();
-            }
-        }
-
+        
         $scope.setImage = function(){
             var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
             var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
@@ -34,10 +28,8 @@ angular.module("umbraco")
                         id: selectedImage.id,
                         udi: selectedImage.udi,
                         image: selectedImage.image,
-                        altText: selectedImage.altText
-                    };   
-
-                    $scope.setUrl();
+                        caption: selectedImage.altText
+                    };
                     
                     editorService.close();
                 },
@@ -49,7 +41,7 @@ angular.module("umbraco")
             editorService.mediaPicker(mediaPicker);
         };
 
-        $scope.setUrl = function(){
+        $scope.getThumbnailUrl = function(){
 
             if($scope.control.value.image){
                 var url = $scope.control.value.image;
@@ -70,10 +62,10 @@ angular.module("umbraco")
                 {
                     url += "?width=800&upscale=false&animationprocessmode=false"
                 }
-                $scope.url = url;
+                return url;
             }
+            
+            return "";
         };
 
-        onInit();
-
 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
index 7ffb26d831..1a91fe52b8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
@@ -7,9 +7,9 @@
 
 	<div ng-if="control.value">
 		<img
-			ng-if="url"
+			ng-if="getThumbnailUrl()"
 			ng-click="setImage()"
-			ng-src="{{url}}"
+			ng-src="{{getThumbnailUrl()}}"
 			class="fullSizeImage" />
         <input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
  	</div>

From 6f673184324a90f10109a18e87e60e2b65f76ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Feb 2019 10:18:01 +0100
Subject: [PATCH 07/50] corrected color variables

---
 .../src/less/components/umb-grid.less                      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 3aab0340a8..5a14294ebf 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
@@ -542,14 +542,13 @@
     display: inline-block;
     cursor: pointer;
     border-radius: 200px;
-    background: @gray-10;
-    border: 1px solid @gray-7;
+    border: 1px solid @ui-action-disgrete-border;
     margin: 2px;
 
     &:hover, &:hover * {
-        background: @ui-action-type-hover !important;
+        background: @ui-action-disgrete-type-hover !important;
         color: @white !important;
-        border-color: @ui-action-type-hover !important;
+        border-color: @ui-action-disgrete-border-hover !important;
         text-decoration: none;
     }
 }

From 592d8db3e72194eeafa7a52229287ce538e7974c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Feb 2019 10:18:13 +0100
Subject: [PATCH 08/50] removed comment

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

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 650717b7c0..ff01c8cc71 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
@@ -316,7 +316,7 @@ angular.module("umbraco")
         // *********************************************
 
         $scope.clickRow = function(index, rows, $event) {
-            //rows[index].active = true;
+            
             $scope.currentRowWithActiveChild = null;
             $scope.active = rows[index];
             

From 564117e62edd23f5e786c9619f02a9f72ad60455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Feb 2019 10:19:02 +0100
Subject: [PATCH 09/50] Grid editor to use $watch for values that needs to
 transform for presentation

---
 .../grid/editors/embed.controller.js          | 24 ++++++++++++++-----
 .../propertyeditors/grid/editors/embed.html   |  2 +-
 .../grid/editors/media.controller.js          | 22 +++++++++++++----
 .../propertyeditors/grid/editors/media.html   |  5 ++--
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
index 17916299bc..8e9ea06a84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
@@ -1,14 +1,26 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.EmbedController",
     function ($scope, $timeout, $sce, editorService) {
-
-    	$scope.hasEmbed = function(){
-            return $scope.control.value !== null;
-        }
-    	$scope.getEmbed = function(){
+        
+        
+        
+    	function getEmbed() {
             return $sce.trustAsHtml($scope.control.value);
         }
-    	$scope.setEmbed = function(){
+        
+        
+        $scope.embedHtml = getEmbed();
+        $scope.$watch('control.value', function(newValue, oldValue) {
+            if(angular.equals(newValue, oldValue)){
+                return; // simply skip that
+            }
+            
+            $scope.embedHtml = getEmbed();
+        }, false);
+    	$scope.hasEmbed = function() {
+            return $scope.control.value !== null;
+        }
+    	$scope.setEmbed = function() {
             var embed = {
                 submit: function(model) {
                     $scope.control.value = model.embed.preview;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index 32ebfd3257..0178c3b3ec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -5,6 +5,6 @@
 		<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
 	</div>
 
-	<div ng-if="control.value" ng-bind-html="getEmbed()"></div>
+	<div ng-if="control.value" ng-bind-html="embedHtml"></div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index c290b8ae7d..eb1032a9c7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -1,7 +1,11 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
     function ($scope, $timeout, userService, editorService) {
-
+        
+        
+        $scope.thumbnailUrl = getThumbnailUrl();
+        
+        
         if (!$scope.model.config.startNodeId) {
             userService.getCurrentUser().then(function (userData) {
                 $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
@@ -40,10 +44,18 @@ angular.module("umbraco")
             
             editorService.mediaPicker(mediaPicker);
         };
+        
+        $scope.$watch('control.value', function(newValue, oldValue) {
+            if(angular.equals(newValue, oldValue)){
+                return; // simply skip that
+            }
+            
+            $scope.thumbnailUrl = getThumbnailUrl();
+        }, true);
+        
+        function getThumbnailUrl() {
 
-        $scope.getThumbnailUrl = function(){
-
-            if($scope.control.value.image){
+            if($scope.control.value && $scope.control.value.image) {
                 var url = $scope.control.value.image;
 
                 if($scope.control.editor.config && $scope.control.editor.config.size){
@@ -65,7 +77,7 @@ angular.module("umbraco")
                 return url;
             }
             
-            return "";
+            return null;
         };
 
 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
index 1a91fe52b8..184f707ebf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
@@ -5,11 +5,10 @@
         <div ng-id="!control.$inserted" class="help-text"><localize key="grid_clickToInsertImage">Click to insert image</localize></div>
 	</div>
 
-	<div ng-if="control.value">
+	<div ng-if="thumbnailUrl !== null">
 		<img
-			ng-if="getThumbnailUrl()"
 			ng-click="setImage()"
-			ng-src="{{getThumbnailUrl()}}"
+			ng-src="{{thumbnailUrl}}"
 			class="fullSizeImage" />
         <input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
  	</div>

From 1f7172e98dc4306c28dc2f2a5f4b9349d646d3ea Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Tue, 12 Mar 2019 21:54:13 +0000
Subject: [PATCH 10/50] Cleaned up class names in logviewer overview to use new
 logviewer classes and made a logviewer specific less stylesheet. Also left
 aligned the saved searches to make them look better

---
 src/Umbraco.Web.UI.Client/src/less/belle.less |  1 +
 .../src/less/components/umb-logviewer.less    | 42 +++++++++++++++++++
 .../src/views/logviewer/overview.html         | 10 ++---
 3 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less

diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 88988485fe..82fe416319 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -137,6 +137,7 @@
 @import "components/umb-iconpicker.less";
 @import "components/umb-insert-code-box.less";
 @import "components/umb-packages.less";
+@import "components/umb-logviewer.less";
 @import "components/umb-package-local-install.less";
 @import "components/umb-panel-group.less";
 @import "components/umb-lightbox.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
new file mode 100644
index 0000000000..f7aa0e4558
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
@@ -0,0 +1,42 @@
+/* PACKAGE DETAILS */
+
+.umb-logviewer {
+    display: flex;
+    flex-flow: row wrap;
+}
+
+@sidebarwidth: 350px; // Width of sidebar. Ugly hack because of old version of Less
+
+.umb-logviewer__main-content {
+    flex: 1 1 auto;
+    margin-right: 20px;
+    width: calc(~'100%' - ~'@{sidebarwidth}' - ~'20px'); // Make sure that the main content area doesn't gets affected by inline styling
+    min-width: 500px;
+
+    .btn-link {
+        text-align: left;
+    }
+}
+
+.umb-logviewer__sidebar {
+    flex: 0 0 @sidebarwidth;
+}
+
+@media (max-width: 768px) {
+
+    .umb-logviewer {
+        flex-direction: column;
+    }
+
+    .umb-logviewer__main-content {
+        flex: 1 1 auto;
+        width: 100%;
+        margin-bottom: 30px;
+        margin-right: 0;        
+    }
+
+    .umb-logviewer__sidebar {
+        flex: 1 1 auto;
+        width: 100%;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 67d89e5ee7..a46853f97e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -1,4 +1,4 @@
-<div data-element="editor-logs" ng-controller="Umbraco.Editors.LogViewer.OverviewController as vm" class="clearfix">
+<div data-element="editor-logs" ng-controller="Umbraco.Editors.LogViewer.OverviewController as vm" class="clearfix" id="logview">
 
     <umb-editor-view footer="false">
 
@@ -24,8 +24,8 @@
                 </umb-box>
             </div>
 
-            <div class="umb-package-details" ng-show="!vm.loading && vm.canLoadLogs">
-                <div class="umb-package-details__main-content">
+            <div class="umb-logviewer" ng-show="!vm.loading && vm.canLoadLogs">
+                <div class="umb-logviewer__main-content">
                     <!-- Saved Searches -->
                     <umb-box>
                         <umb-box-header title="Saved Searches"></umb-box-header>
@@ -68,7 +68,7 @@
                     </umb-box>
                 </div>
 
-                <div class="umb-package-details__sidebar">
+                <div class="umb-logviewer__sidebar">
                     <!-- No of Errors -->
                     <umb-box ng-click="vm.searchLogQuery('Has(@Exception)')" style="cursor:pointer;">
                         <umb-box-header title="Number of Errors"></umb-box-header>
@@ -95,4 +95,4 @@
             </div>
         </umb-editor-container>
     </umb-editor-view>
-</div>
\ No newline at end of file
+</div>

From 7f334540029f76761525b494c7d2ac40c9c6b98b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 18 Mar 2019 17:51:04 +0100
Subject: [PATCH 11/50] Better ServerMessenger configuration

---
 src/Umbraco.Core/CompositionExtensions.cs     | 22 +++++
 .../BatchedDatabaseServerMessenger.cs         |  5 +-
 ...aseServerRegistrarAndMessengerComponent.cs | 80 ++++++++-----------
 3 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs
index e1c7ad4467..828a577c34 100644
--- a/src/Umbraco.Core/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions.cs
@@ -203,6 +203,28 @@ namespace Umbraco.Core
             composition.RegisterUnique(_ => registrar);
         }
 
+        /// <summary>
+        /// Sets the database server messenger options.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="factory">A function creating the options.</param>
+        /// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
+        public static void SetDatabaseServerMessengerOptions(this Composition composition, Func<IFactory, DatabaseServerMessengerOptions> factory)
+        {
+            composition.RegisterUnique(factory);
+        }
+
+        /// <summary>
+        /// Sets the database server messenger options.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="options">Options.</param>
+        /// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
+        public static void SetDatabaseServerMessengerOptions(this Composition composition, DatabaseServerMessengerOptions options)
+        {
+            composition.RegisterUnique(_ => options);
+        }
+
         /// <summary>
         /// Sets the short string helper.
         /// </summary>
diff --git a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
index 76d7565862..818e8ecf77 100644
--- a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
+++ b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
@@ -27,9 +27,8 @@ namespace Umbraco.Web
         private readonly IUmbracoDatabaseFactory _databaseFactory;
 
         public BatchedDatabaseServerMessenger(
-            IRuntimeState runtime, IUmbracoDatabaseFactory databaseFactory, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, IGlobalSettings globalSettings,
-            bool enableDistCalls, DatabaseServerMessengerOptions options)
-            : base(runtime, scopeProvider, sqlContext, proflog, globalSettings, enableDistCalls, options)
+            IRuntimeState runtime, IUmbracoDatabaseFactory databaseFactory, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, IGlobalSettings globalSettings, DatabaseServerMessengerOptions options)
+            : base(runtime, scopeProvider, sqlContext, proflog, globalSettings, true, options)
         {
             _databaseFactory = databaseFactory;
         }
diff --git a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index 086aa9b197..a68e137665 100644
--- a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -38,54 +38,44 @@ namespace Umbraco.Web.Compose
 
     public sealed class DatabaseServerRegistrarAndMessengerComposer : ComponentComposer<DatabaseServerRegistrarAndMessengerComponent>, ICoreComposer
     {
+        public static DatabaseServerMessengerOptions GetDefaultOptions(IFactory factory)
+        {
+            var logger = factory.GetInstance<ILogger>();
+            var indexRebuilder = factory.GetInstance<IndexRebuilder>();
+
+            return new DatabaseServerMessengerOptions
+            {
+                //These callbacks will be executed if the server has not been synced
+                // (i.e. it is a new server or the lastsynced.txt file has been removed)
+                InitializingCallbacks = new Action[]
+                {
+                    //rebuild the xml cache file if the server is not synced
+                    () =>
+                    {
+                        // rebuild the published snapshot caches entirely, if the server is not synced
+                        // this is equivalent to DistributedCache RefreshAll... but local only
+                        // (we really should have a way to reuse RefreshAll... locally)
+                        // note: refresh all content & media caches does refresh content types too
+                        var svc = Current.PublishedSnapshotService;
+                        svc.Notify(new[] { new DomainCacheRefresher.JsonPayload(0, DomainChangeTypes.RefreshAll) });
+                        svc.Notify(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _, out _);
+                        svc.Notify(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _);
+                    },
+
+                    //rebuild indexes if the server is not synced
+                    // NOTE: This will rebuild ALL indexes including the members, if developers want to target specific
+                    // indexes then they can adjust this logic themselves.
+                    () => { ExamineComponent.RebuildIndexes(indexRebuilder, logger, false, 5000); }
+                }
+            };
+        }
+
         public override void Compose(Composition composition)
         {
             base.Compose(composition);
 
-            composition.SetServerMessenger(factory =>
-            {
-                var runtime = factory.GetInstance<IRuntimeState>();
-                var databaseFactory = factory.GetInstance<IUmbracoDatabaseFactory>();
-                var globalSettings = factory.GetInstance<IGlobalSettings>();
-                var proflog = factory.GetInstance<IProfilingLogger>();
-                var scopeProvider = factory.GetInstance<IScopeProvider>();
-                var sqlContext = factory.GetInstance<ISqlContext>();
-                var logger = factory.GetInstance<ILogger>();
-                var indexRebuilder = factory.GetInstance<IndexRebuilder>();
-
-                return new BatchedDatabaseServerMessenger(
-                    runtime, databaseFactory, scopeProvider, sqlContext, proflog, globalSettings,
-                    true,
-                    //Default options for web including the required callbacks to build caches
-                    new DatabaseServerMessengerOptions
-                    {
-                        //These callbacks will be executed if the server has not been synced
-                        // (i.e. it is a new server or the lastsynced.txt file has been removed)
-                        InitializingCallbacks = new Action[]
-                        {
-                            //rebuild the xml cache file if the server is not synced
-                            () =>
-                            {
-                                // rebuild the published snapshot caches entirely, if the server is not synced
-                                // this is equivalent to DistributedCache RefreshAll... but local only
-                                // (we really should have a way to reuse RefreshAll... locally)
-                                // note: refresh all content & media caches does refresh content types too
-                                var svc = Current.PublishedSnapshotService;
-                                svc.Notify(new[] { new DomainCacheRefresher.JsonPayload(0, DomainChangeTypes.RefreshAll) });
-                                svc.Notify(new[] { new ContentCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _, out _);
-                                svc.Notify(new[] { new MediaCacheRefresher.JsonPayload(0, TreeChangeTypes.RefreshAll) }, out _);
-                            },
-
-                            //rebuild indexes if the server is not synced
-                            // NOTE: This will rebuild ALL indexes including the members, if developers want to target specific
-                            // indexes then they can adjust this logic themselves.
-                            () =>
-                            {
-                                ExamineComponent.RebuildIndexes(indexRebuilder, logger, false, 5000);
-                            }
-                        }
-                    });
-            });
+            composition.SetDatabaseServerMessengerOptions(GetDefaultOptions);
+            composition.SetServerMessenger<BatchedDatabaseServerMessenger>();
         }
     }
 
@@ -128,7 +118,7 @@ namespace Umbraco.Web.Compose
         }
 
         public void Initialize()
-        { 
+        {
             //We will start the whole process when a successful request is made
             if (_registrar != null || _messenger != null)
                 UmbracoModule.RouteAttempt += RegisterBackgroundTasksOnce;

From 019ac523098f79361e5ecd93d585212903912760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 16:06:07 +0100
Subject: [PATCH 12/50] emit "editors.dataTypeSettings.saved"-event

---
 .../datatypesettings.controller.js            | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 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 099439fa4b..46a4238c0c 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,8 @@
 (function () {
     "use strict";
 
-    function DataTypeSettingsController($scope, dataTypeResource, dataTypeHelper, localizationService, notificationsService, overlayService, formHelper) {
+    function DataTypeSettingsController($scope, dataTypeResource, dataTypeHelper, 
+        localizationService, notificationsService, overlayService, formHelper, eventsService) {
 
         var vm = this;
 
@@ -103,27 +104,33 @@
 
             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";
+            dataTypeResource.save(vm.dataType, preValues, $scope.model.create).then(
+                function(newDataType) {
+                    $scope.model.dataType = newDataType;
+                    
+                    var args = { dataType: newDataType };
+                    eventsService.emit("editors.dataTypeSettings.saved", args);
+                    
+                    vm.saveButtonState = "success";
 
-                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);
+                    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]);
+                            for (var e in err.data.ModelState) {
+                                notificationsService.error("Validation", err.data.ModelState[e][0]);
+                            }
                         }
                     }
                 }
-            });
+            );
             
         }
 

From af4dc97b10505848e519535f32562a31de3acf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 16:06:39 +0100
Subject: [PATCH 13/50] changed ' to "

---
 .../components/content/umbcontentnodeinfo.directive.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d4b617f94b..e58ff14e21 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
@@ -147,7 +147,7 @@
                     id: documentType.id,
                     submit: function (model) {
                         const args = { node: scope.node };
-                        eventsService.emit('editors.content.reload', args);
+                        eventsService.emit("editors.content.reload", args);
                         editorService.close();
                     },
                     close: function () {

From da503cc9b5730cb01611dbe16761956215b3bb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 16:19:56 +0100
Subject: [PATCH 14/50] listen for "editors.dataTypeSettings.saved"

---
 .../components/umbgroupsbuilder.directive.js  | 54 ++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)

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 15f5a1d46a..da51528bd2 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
@@ -1,13 +1,17 @@
 (function() {
   'use strict';
 
-  function GroupsBuilderDirective(contentTypeHelper, contentTypeResource, mediaTypeResource, dataTypeHelper, dataTypeResource, $filter, iconHelper, $q, $timeout, notificationsService, localizationService, editorService) {
+  function GroupsBuilderDirective(contentTypeHelper, contentTypeResource, mediaTypeResource, 
+      dataTypeHelper, dataTypeResource, $filter, iconHelper, $q, $timeout, notificationsService, 
+      localizationService, editorService, eventsService) {
     
     function link(scope, el, attr, ctrl) {
-
+        
+        var eventBindings = [];
         var validationTranslated = "";
         var tabNoSortOrderTranslated = "";
 
+      scope.dataTypeHasChanged = false;
       scope.sortingMode = false;
       scope.toolbar = [];
       scope.sortableOptionsGroup = {};
@@ -613,18 +617,44 @@
           });
         });
       }
-
-
-      var unbindModelWatcher = scope.$watch('model', function(newValue, oldValue) {
-        if (newValue !== undefined && newValue.groups !== undefined) {
-          activate();
+      
+        function hasPropertyOfDataTypeId(dataTypeId) {
+            
+            // look at each property
+            var result = _.filter(scope.model.groups, function(group) {
+                return _.filter(group.properties, function(property) {
+                    return (property.dataTypeId === dataTypeId);
+                });
+            });
+            
+            return (result.length > 0);
         }
-      });
 
-      // clean up
-      scope.$on('$destroy', function(){
-        unbindModelWatcher();
-      });
+
+        eventBindings.push(scope.$watch('model', function(newValue, oldValue) {
+            if (newValue !== undefined && newValue.groups !== undefined) {
+                activate();
+            }
+        }));
+        
+        // clean up
+        eventBindings.push(eventsService.on("editors.dataTypeSettings.saved", function (name, args) {
+            if(hasPropertyOfDataTypeId(args.dataType.id)) {
+                scope.dataTypeHasChanged = true;
+            }
+        }));
+        
+        // clean up
+        eventBindings.push(scope.$on('$destroy', function() {
+            for(var e in eventBindings) {
+                eventBindings[e]();
+            }
+            // if a dataType has changed, we want to notify which properties that are affected by this dataTypeSettings change
+            if(scope.dataTypeHasChanged === true) {
+                var args = {documentType: scope.model};
+                eventsService.emit("editors.documentType.saved", args);
+            }
+        }));
 
     }
 

From d806855698d374378bae65878cb4c006d76eb22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 22 Mar 2019 16:22:36 +0100
Subject: [PATCH 15/50] listen for "editors.documentType.saved" instead of
 "editors.content.reload"

---
 .../components/content/edit.controller.js        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 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 80b5f4ed39..a7ce013bc3 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
@@ -116,6 +116,13 @@
         function isContentCultureVariant() {
             return $scope.content.variants.length > 1;
         }
+        
+        function reload() {
+            $scope.page.loading = true;
+            loadContent().then(function() {
+                $scope.page.loading = false;
+            });
+        }
 
         function bindEvents() {
             //bindEvents can be called more than once and we don't want to have multiple bound events
@@ -123,13 +130,10 @@
                 eventsService.unsubscribe(evts[e]);
             }
 
-            evts.push(eventsService.on("editors.content.reload", function (name, args) {
+            evts.push(eventsService.on("editors.documentType.saved", function (name, args) {
                 // if this content item uses the updated doc type we need to reload the content item
-                if(args && args.node && args.node.key === $scope.content.key) {
-                    $scope.page.loading = true;
-                    loadContent().then(function() {
-                        $scope.page.loading = false;
-                    });
+                if(args && args.documentType && $scope.content.documentType.id === args.documentType.id) {
+                    reload();
                 }
             }));
 

From 15d5c67cd3192ba65ff72ec4416ff7eeb8c3d22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 13:42:05 +0100
Subject: [PATCH 16/50] global text-color variables

---
 src/Umbraco.Web.UI.Client/src/less/variables.less | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 6400ae0321..55be161cf8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -112,7 +112,7 @@
 @blueExtraDark:         #1b264f;// added 2019
 @blueLight:             #ADD8E6;
 @blueNight:             #162335;// added 2019
-@orange:                #f79c37;// updated 2019
+//@orange:              #f79c37;// updated 2019
 @pink:                  #D93F4C;// #C3325F;// update 2019
 @pinkLight:             #f5c1bc;// added 2019
 @pinkRedLight:          #ff8a89;// added 2019
@@ -199,6 +199,16 @@
 .turquoise{color: @turquoise;}
 .turquoise-d1{color: @turquoise-d1;}
 
+.text-warning {
+    color: @orange;
+}
+.text-error {
+    color: @red;
+}
+.text-success {
+    color: @green;
+}
+
 
 //icon colors for tree icons
 .color-red, .color-red i{color: @red-d1 !important;}

From 0cc6e51b7a9ae3999a9ddfdaa089cc20e7186821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 13:43:03 +0100
Subject: [PATCH 17/50] simplify controller + only show text when near limit +
 different text when exceeding limit

---
 .../textarea/textarea.controller.js           | 24 +++-----------
 .../propertyeditors/textarea/textarea.html    |  9 ++++--
 .../textbox/textbox.controller.js             | 31 +++----------------
 .../propertyeditors/textbox/textbox.html      |  9 ++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  5 +--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  5 +--
 .../Umbraco/config/lang/en_us.xml             |  5 +--
 7 files changed, 31 insertions(+), 57 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
index 60d762738f..4934adb5dd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
@@ -13,25 +13,11 @@ function textAreaController($scope) {
     $scope.model.maxlength = false;
     if ($scope.model.config && $scope.model.config.maxChars) {
         $scope.model.maxlength = true;
-        if($scope.model.value == undefined) {
-            $scope.model.count = ($scope.model.config.maxChars * 1);
-        } else {
-            $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
-        }
     }
-
-    $scope.model.change = function() {
-        if ($scope.model.config && $scope.model.config.maxChars) {
-            if($scope.model.value == undefined) {
-                $scope.model.count = ($scope.model.config.maxChars * 1);
-            } else {
-                $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
-            }
-            if($scope.model.count < 0) {
-                $scope.model.value = $scope.model.value.substring(0, ($scope.model.config.maxChars * 1));
-                $scope.model.count = 0;
-            }
-        }
+    
+    $scope.model.change = function () {
+        $scope.model.count = $scope.model.value.length;
     }
+    $scope.model.change();
 }
-angular.module('umbraco').controller("Umbraco.PropertyEditors.textAreaController", textAreaController);
\ No newline at end of file
+angular.module('umbraco').controller("Umbraco.PropertyEditors.textAreaController", textAreaController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 2fdca5d654..80da759fba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -7,9 +7,12 @@
             <span class="help-inline" ng-message="valServer">{{textareaFieldForm.textarea.errorMsg}}</span>
         </span>
 
-        <div class="help" ng-if="model.maxlength">
-            <strong>{{model.count}}</strong>
-            <localize key="textbox_characters_left">characters left</localize>
+        <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
+            <localize key="textbox_characters_left" tokens="[model.count, model.config.maxChars]">characters left</localize>
         </div>
+        <div class="help text-error" ng-if="model.maxlength === true && model.count > model.config.maxChars">
+            <localize key="textbox_characters_exceed" tokens="[model.count, model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+        </div>
+
     </ng-form>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
index 734903e46c..4ab827db59 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
@@ -4,39 +4,18 @@ function textboxController($scope) {
     if (!$scope.model.config) {
         $scope.model.config = {};
     }
-
-    $scope.model.maxlength = false;
-    if ($scope.model.config && $scope.model.config.maxChars) {
-        $scope.model.maxlength = true;
-    }
-
+    
     if (!$scope.model.config.maxChars) {
         // 500 is the maximum number that can be stored
         // in the database, so set it to the max, even
         // if no max is specified in the config
         $scope.model.config.maxChars = 500;
     }
-
-    if ($scope.model.maxlength) {
-        if ($scope.model.value === undefined) {
-            $scope.model.count = ($scope.model.config.maxChars * 1);
-        } else {
-            $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
-        }
-    }
-
+    
     $scope.model.change = function () {
-        if ($scope.model.config && $scope.model.config.maxChars) {
-            if ($scope.model.value === undefined) {
-                $scope.model.count = ($scope.model.config.maxChars * 1);
-            } else {
-                $scope.model.count = ($scope.model.config.maxChars * 1) - $scope.model.value.length;
-            }
-            if ($scope.model.count < 0) {
-                $scope.model.value = $scope.model.value.substring(0, ($scope.model.config.maxChars * 1));
-                $scope.model.count = 0;
-            }
-        }
+        $scope.model.count = $scope.model.value.length;
     }
+    $scope.model.change();
+    
 }
 angular.module('umbraco').controller("Umbraco.PropertyEditors.textboxController", textboxController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 6f6ed6bdf6..0e041e7f34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -12,9 +12,12 @@
             <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
         </span>
 
-        <div class="help" ng-if="model.maxlength">
-            <strong>{{model.count}}</strong>
-            <localize key="textbox_characters_left">characters left</localize>
+        <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
+            <localize key="textbox_characters_left" tokens="[model.count, model.config.maxChars]">characters left</localize>
         </div>
+        <div class="help text-error" ng-if="model.count > model.config.maxChars">
+            <localize key="textbox_characters_exceed" tokens="[model.count, model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+        </div>
+
     </ng-form>
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 875948d4d2..11dcd6ac57 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1568,8 +1568,9 @@ Mange hilsner fra Umbraco robotten
   <area alias="emptyStates">
     <key alias="emptyDictionaryTree">Ingen ordbog elementer at vælge imellem</key>
   </area>
-  <area alias="textbox">
-    <key alias="characters_left">Karakterer tilbage</key>
+  <area alias="textbox">
+    <key alias="characters_left">><![CDATA[<strong>{0}</strong> tegn tilbage.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maksimum {0} tegn, <strong>{1}</strong> for mange.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Slettet indhold med Id: {0} Relateret til original "parent" med id: {1}</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index fa6f689845..d10bc6ea0c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2078,8 +2078,9 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="emptyStates">
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
-  <area alias="textbox">
-    <key alias="characters_left">characters left</key>
+  <area alias="textbox">
+    <key alias="characters_left">><![CDATA[<strong>{0}</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</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 6ff4d32f08..c04f639c3a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2090,8 +2090,9 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="emptyStates">
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
-  <area alias="textbox">
-    <key alias="characters_left">characters left</key>
+  <area alias="textbox">
+    <key alias="characters_left">><![CDATA[<strong>{0}</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>

From 286978647eb57371bddee1b58a4a0026da8bce2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 14:04:31 +0100
Subject: [PATCH 18/50] fix type mistake, plus correcting math.

---
 .../src/views/propertyeditors/textarea/textarea.html          | 4 ++--
 .../src/views/propertyeditors/textbox/textbox.html            | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 80da759fba..e08668fb20 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -8,10 +8,10 @@
         </span>
 
         <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.count, model.config.maxChars]">characters left</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">characters left</localize>
         </div>
         <div class="help text-error" ng-if="model.maxlength === true && model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.count, model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 0e041e7f34..8385c951b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -13,10 +13,10 @@
         </span>
 
         <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.count, model.config.maxChars]">characters left</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">characters left</localize>
         </div>
         <div class="help text-error" ng-if="model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.count, model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 11dcd6ac57..52be26e2fc 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1569,7 +1569,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="emptyDictionaryTree">Ingen ordbog elementer at vælge imellem</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left">><![CDATA[<strong>{0}</strong> tegn tilbage.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>{0}</strong> tegn tilbage.]]></key>
     <key alias="characters_exceed"><![CDATA[Maksimum {0} tegn, <strong>{1}</strong> for mange.]]></key>
   </area>
   <area alias="recycleBin">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index d10bc6ea0c..218812270d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2079,7 +2079,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left">><![CDATA[<strong>{0}</strong> characters left.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>{0}</strong> characters left.]]></key>
     <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
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 c04f639c3a..9f578da1b6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2091,7 +2091,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left">><![CDATA[<strong>{0}</strong> characters left.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>{0}</strong> characters left.]]></key>
     <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">

From 50ee60e8c35eb4b8f4ed7fcf666950c369eb1ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 14:09:29 +0100
Subject: [PATCH 19/50] correcting translate tokens to use %

---
 .../src/views/propertyeditors/textarea/textarea.html          | 4 ++--
 .../src/views/propertyeditors/textbox/textbox.html            | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml                 | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                 | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml              | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index e08668fb20..94935423e8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -8,10 +8,10 @@
         </span>
 
         <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">characters left</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">%0% characters left.</localize>
         </div>
         <div class="help text-error" ng-if="model.maxlength === true && model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 8385c951b1..6e8543de26 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -13,10 +13,10 @@
         </span>
 
         <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">characters left</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">%0% characters left.</localize>
         </div>
         <div class="help text-error" ng-if="model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum {0} characters ({1} too many)</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 52be26e2fc..b7a8196e92 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1569,8 +1569,8 @@ Mange hilsner fra Umbraco robotten
     <key alias="emptyDictionaryTree">Ingen ordbog elementer at vælge imellem</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left"><![CDATA[<strong>{0}</strong> tegn tilbage.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maksimum {0} tegn, <strong>{1}</strong> for mange.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> tegn tilbage.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maksimum %0% tegn, <strong>%1%</strong> for mange.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Slettet indhold med Id: {0} Relateret til original "parent" med id: {1}</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 218812270d..ab3a281114 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2079,8 +2079,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left"><![CDATA[<strong>{0}</strong> characters left.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum %0% characters, <strong>%1%</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</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 9f578da1b6..9c66d1bef8 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2091,8 +2091,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left"><![CDATA[<strong>{0}</strong> characters left.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maximum {0} characters, <strong>{1}</strong> too many.]]></key>
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum %0% characters, <strong>%1%</strong> too many.]]></key>
   </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>

From 118f6c7e50c1619bfb6e1f24b5832829754fbe4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 25 Mar 2019 14:46:42 +0100
Subject: [PATCH 20/50] added the ability to watch tokens in localization
 service

---
 .../localization/localize.directive.js        | 19 +++++++---
 .../common/services/localization.service.js   | 36 +++++++++++++------
 .../propertyeditors/textarea/textarea.html    |  4 +--
 .../propertyeditors/textbox/textbox.html      |  4 +--
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
index c3093eee9e..df3770056e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
@@ -32,16 +32,27 @@ angular.module("umbraco.directives")
             restrict: 'E',
             scope:{
                 key: '@',
-                tokens: '='
+                tokens: '=',
+                watchTokens: '@'
             },
             replace: true,
 
             link: function (scope, element, attrs) {
                 var key = scope.key;
-                var tokens = scope.tokens ? scope.tokens : null;
-                localizationService.localize(key, tokens).then(function(value){
-                    element.html(value);
+                scope.text = "";
+                
+                // A render function to be able to update tokens as values update.
+                function render() {
+                    element.html(localizationService.tokenReplace(scope.text, scope.tokens || null));
+                }
+                
+                localizationService.localize(key).then(function(value){
+                    scope.text = value;
+                    render();
                 });
+                if (scope.watchTokens === 'true') {
+                    scope.$watch("tokens", render, true);
+                }
             }
         };
     })
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 2a9afdfa94..ea2ad73263 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
@@ -43,16 +43,11 @@ angular.module('umbraco.services')
 
         var entry = dictionary[value];
         if (entry) {
-            if (tokens) {
-                for (var i = 0; i < tokens.length; i++) {
-                    entry = entry.replace("%" + i + "%", tokens[i]);
-                }
-            }
-            return entry;
+            return service.tokenReplace(entry, tokens);
         }
         return "[" + value + "]";
     }
-
+    
     var service = {
         // array to hold the localized resource string entries
         dictionary: [],
@@ -127,7 +122,29 @@ angular.module('umbraco.services')
             }
             return value;
         },
-
+        
+        
+        /**
+         * @ngdoc method
+         * @name umbraco.services.localizationService#tokenReplace
+         * @methodOf umbraco.services.localizationService
+         *
+         * @description
+         * Helper to replace tokens
+         * @param {String} value the text-string to manipulate
+         * @param {Array} tekens An array of tokens values 
+         * @returns {String} Replaced test-string
+         */
+        tokenReplace: function (text, tokens) {
+            if (tokens) {
+                for (var i = 0; i < tokens.length; i++) {
+                    text = text.replace("%" + i + "%", tokens[i]);
+                }
+            }
+            return text;
+        },
+        
+        
         /**
          * @ngdoc method
          * @name umbraco.services.localizationService#localize
@@ -146,8 +163,7 @@ angular.module('umbraco.services')
          */
         localize: function (value, tokens) {
             return service.initLocalizedResources().then(function (dic) {
-                var val = _lookup(value, tokens, dic);
-                return val;
+                return _lookup(value, tokens, dic);
             });
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 94935423e8..1be37d92d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -8,10 +8,10 @@
         </span>
 
         <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">%0% characters left.</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]" watch-tokens="true">%0% characters left.</localize>
         </div>
         <div class="help text-error" ng-if="model.maxlength === true && model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 6e8543de26..92f02b9f5b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -13,10 +13,10 @@
         </span>
 
         <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]">%0% characters left.</localize>
+            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]" watch-tokens="true">%0% characters left.</localize>
         </div>
         <div class="help text-error" ng-if="model.count > model.config.maxChars">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
+            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
         </div>
 
     </ng-form>

From 2bfa81c7079d28625a7f4b65bc5e6dbaa50d3b96 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 26 Mar 2019 20:07:42 +1100
Subject: [PATCH 21/50] fixes 4627 + makes front-end validations appear as soon
 as they are invalid again.

---
 .../directives/validation/valpropertymsg.directive.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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 9ee83dc2ba..c027e0778e 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
@@ -62,8 +62,8 @@ function valPropertyMsg(serverValidationManager) {
                 if (!watcher) {
                     watcher = scope.$watch("currentProperty.value",
                         function (newValue, oldValue) {
-
-                            if (!newValue || angular.equals(newValue, oldValue)) {
+                            
+                            if (angular.equals(newValue, oldValue)) {
                                 return;
                             }
 
@@ -78,10 +78,12 @@ function valPropertyMsg(serverValidationManager) {
                             // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
                             // is the only one, then we'll clear.
 
-                            if ((errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
+                            if (errCount === 0 || (errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
                                 scope.errorMsg = "";
                                 formCtrl.$setValidity('valPropertyMsg', true);
-                                stopWatch();
+                            } else if (showValidation && scope.errorMsg === "") {
+                                formCtrl.$setValidity('valPropertyMsg', false);
+                                scope.errorMsg = getErrorMsg();
                             }
                         }, true);
                 }
@@ -152,6 +154,7 @@ function valPropertyMsg(serverValidationManager) {
                 showValidation = true;
                 if (hasError && scope.errorMsg === "") {
                     scope.errorMsg = getErrorMsg();
+                    startWatch();
                 }
                 else if (!hasError) {
                     scope.errorMsg = "";

From 080ace90b208b29ecca5e34bd0046fc7019d56ce Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 26 Mar 2019 20:09:12 +1100
Subject: [PATCH 22/50] Bugfix:
 https://github.com/umbraco/Umbraco-CMS/issues/4827 - Fixed
 MediaPickerValueConverter when config is Only Images

---
 .../MediaPickerValueConverter.cs              | 58 +++++++++++++------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
index 802f42ed9e..fb3134c9a3 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
@@ -14,11 +15,18 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
     [DefaultPropertyValueConverter]
     public class MediaPickerValueConverter : PropertyValueConverterBase
     {
+        // hard-coding "image" here but that's how it works at UI level too
+        private const string ImageTypeAlias = "image";
+
+        private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
 
-        public MediaPickerValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor)
+        public MediaPickerValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor,
+            IPublishedModelFactory publishedModelFactory)
         {
-            _publishedSnapshotAccessor = publishedSnapshotAccessor ?? throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
+            _publishedSnapshotAccessor = publishedSnapshotAccessor ??
+                                         throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
+            _publishedModelFactory = publishedModelFactory;
         }
 
         public override bool IsConverter(PublishedPropertyType propertyType)
@@ -31,15 +39,19 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             var isMultiple = IsMultipleDataType(propertyType.DataType);
             var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
 
-            // hard-coding "image" here but that's how it works at UI level too
-
             return isMultiple
-                ? (isOnlyImages ? typeof(IEnumerable<>).MakeGenericType(ModelType.For("image")) : typeof(IEnumerable<IPublishedContent>))
-                : (isOnlyImages ? ModelType.For("image") : typeof(IPublishedContent));
+                ? isOnlyImages
+                    ? typeof(IEnumerable<>).MakeGenericType(ModelType.For(ImageTypeAlias))
+                    : typeof(IEnumerable<IPublishedContent>)
+                : isOnlyImages
+                    ? ModelType.For(ImageTypeAlias)
+                    : typeof(IPublishedContent);
         }
 
         public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType)
-            => PropertyCacheLevel.Snapshot;
+        {
+            return PropertyCacheLevel.Snapshot;
+        }
 
         private bool IsMultipleDataType(PublishedDataType dataType)
         {
@@ -53,26 +65,31 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return config.OnlyImages;
         }
 
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType,
+            object source, bool preview)
         {
             if (source == null) return null;
 
             var nodeIds = source.ToString()
-                .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
+                .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
                 .Select(Udi.Parse)
                 .ToArray();
             return nodeIds;
         }
 
-        public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel cacheLevel, object source, bool preview)
+        public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType,
+            PropertyCacheLevel cacheLevel, object source, bool preview)
         {
-            if (source == null)
-            {
-                return null;
-            }
+            var isMultiple = IsMultipleDataType(propertyType.DataType);
+            var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
+
+            var udis = (Udi[]) source;
+            var mediaItems = isOnlyImages
+                ? _publishedModelFactory.CreateModelList(ImageTypeAlias)
+                : new List<IPublishedContent>();
+
+            if (source == null) return isMultiple ? mediaItems : null;
 
-            var udis = (Udi[])source;
-            var mediaItems = new List<IPublishedContent>();
             if (udis.Any())
             {
                 foreach (var udi in udis)
@@ -84,12 +101,15 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                         mediaItems.Add(item);
                 }
 
-                if (IsMultipleDataType(propertyType.DataType))
-                    return mediaItems;
-                return mediaItems.FirstOrDefault();
+                return isMultiple ? mediaItems : FirstOrDefault(mediaItems);
             }
 
             return source;
         }
+
+        private object FirstOrDefault(IList mediaItems)
+        {
+            return mediaItems.Count == 0 ? null : mediaItems[0];
+        }
     }
 }

From 4fcf2ce7bdac14b49ca318021335d4fdd89ea252 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 12 Mar 2019 08:17:09 +0100
Subject: [PATCH 23/50] Fixed issue when creating variant content templates,
 but the properties is invariant. Before this change an exception was thrown

---
 src/Umbraco.Core/Services/Implement/ContentService.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 5bdc0959da..82ebd92f0b 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -2875,7 +2875,14 @@ namespace Umbraco.Core.Services.Implement
             {
                 foreach (var property in blueprint.Properties)
                 {
-                    content.SetValue(property.Alias, property.GetValue(culture), culture);
+                    if (property.PropertyType.VariesByCulture())
+                    {
+                        content.SetValue(property.Alias, property.GetValue(culture), culture);
+                    }
+                    else
+                    {
+                        content.SetValue(property.Alias, property.GetValue());
+                    }
                 }
 
                 content.Name = blueprint.Name;

From 8a56b3db163620a6c0e04bba6f0f1ca015eb06ee Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 17 Mar 2019 20:51:42 +0100
Subject: [PATCH 24/50] Fix the "Language" dropdown in the "Culture and
 Hostnames" dialog

---
 .../src/views/content/content.assigndomain.controller.js       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
index 0f27f3046c..5fa1eebd0b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
@@ -46,8 +46,7 @@
 
                     if (data.language !== "undefined") {
                         var lang = vm.languages.filter(function (l) {
-                            return matchLanguageById(l, data.language.Id);
-
+                            return matchLanguageById(l, data.language);
                         });
                         if (lang.length > 0) {
                             vm.language = lang[0];

From a70cb51559a225f6e13c38be3893759867c4e3e2 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:27:22 +0100
Subject: [PATCH 25/50] NuCache: cleanup scoped objects

---
 .../Scoping/ScopeContextualBase.cs            | 33 +++++++++++++++--
 .../NuCache/PublishedSnapshotService.cs       | 36 +++++++++----------
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
index 7461142234..1f2b6155e6 100644
--- a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
@@ -2,24 +2,43 @@
 
 namespace Umbraco.Core.Scoping
 {
-    // base class for an object that will be enlisted in scope context, if any. it
-    // must be used in a 'using' block, and if not scoped, released when disposed,
-    // else when scope context runs enlisted actions
+    /// <summary>
+    /// Provides a base class for scope contextual objects.
+    /// </summary>
+    /// <remarks>
+    /// <para>A scope contextual object is enlisted in the current scope context,
+    /// if any, and released when the context exists. It must be used in a 'using'
+    /// block, and will be released when disposed, if not part of a scope.</para>
+    /// </remarks>
     public abstract class ScopeContextualBase : IDisposable
     {
         private bool _using, _scoped;
 
+        /// <summary>
+        /// Gets a contextual object.
+        /// </summary>
+        /// <typeparam name="T">The type of the object.</typeparam>
+        /// <param name="scopeProvider">A scope provider.</param>
+        /// <param name="key">A context key for the object.</param>
+        /// <param name="ctor">A function producing the contextual object.</param>
+        /// <returns>The contextual object.</returns>
+        /// <remarks>
+        /// <para></para>
+        /// </remarks>
         public static T Get<T>(IScopeProvider scopeProvider, string key, Func<bool, T> ctor)
             where T : ScopeContextualBase
         {
+            // no scope context = create a non-scoped object
             var scopeContext = scopeProvider.Context;
             if (scopeContext == null)
                 return ctor(false);
 
+            // create & enlist the scoped object
             var w = scopeContext.Enlist("ScopeContextualBase_" + key,
                 () => ctor(true),
                 (completed, item) => { item.Release(completed); });
 
+            // the object can be 'used' only once at a time
             if (w._using) throw new InvalidOperationException("panic: used.");
             w._using = true;
             w._scoped = true;
@@ -27,6 +46,10 @@ namespace Umbraco.Core.Scoping
             return w;
         }
 
+        /// <inheritdoc />
+        /// <remarks>
+        /// <para>If not scoped, then this releases the contextual object.</para>
+        /// </remarks>
         public void Dispose()
         {
             _using = false;
@@ -35,6 +58,10 @@ namespace Umbraco.Core.Scoping
                 Release(true);
         }
 
+        /// <summary>
+        /// Releases the contextual object.
+        /// </summary>
+        /// <param name="completed">A value indicating whether the scoped operation completed.</param>
         public abstract void Release(bool completed);
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index e19531a25b..541ff2ea23 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -330,14 +330,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadContent(Action<IScope> action)
         {
+            // first get a writer, then a scope
+            // if there already is a scope, the writer will attach to it
+            // otherwise, it will only exist here - cheap
             using (_contentStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.ContentTree);
-                    action(scope);
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.ContentTree);
+                action(scope);
+                scope.Complete();
             }
         }
 
@@ -399,14 +400,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadMedia(Action<IScope> action)
         {
+            // see note in LockAndLoadContent
             using (_mediaStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.MediaTree);
-                    action(scope);
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.MediaTree);
+                action(scope);
+                scope.Complete();
             }
         }
 
@@ -528,14 +528,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadDomains()
         {
+            // see note in LockAndLoadContent
             using (_domainStore.GetWriter(_scopeProvider))
+            using (var scope = _scopeProvider.CreateScope())
             {
-                using (var scope = _scopeProvider.CreateScope())
-                {
-                    scope.ReadLock(Constants.Locks.Domains);
-                    LoadDomainsLocked();
-                    scope.Complete();
-                }
+                scope.ReadLock(Constants.Locks.Domains);
+                LoadDomainsLocked();
+                scope.Complete();
             }
         }
 
@@ -858,6 +857,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (_isReady == false)
                 return;
 
+            // see note in LockAndLoadContent
             using (_domainStore.GetWriter(_scopeProvider))
             {
                 foreach (var payload in payloads)

From 13a8548d3a19e6de90ef180a9f87115c80abf1c3 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:30:55 +0100
Subject: [PATCH 26/50] NuCache: rename things

---
 .../Cache/SnapDictionaryTests.cs              | 10 ++--
 .../PublishedCache/NuCache/ContentStore.cs    | 56 ++++++++---------
 .../PublishedCache/NuCache/SnapDictionary.cs  | 60 +++++++++----------
 3 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 013dbadbb8..0ee0d180c3 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -388,8 +388,8 @@ namespace Umbraco.Tests.Cache
             // collect liveGen
             GC.Collect();
 
-            SnapDictionary<int, string>.GenerationObject genObj;
-            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
+            SnapDictionary<int, string>.GenObj genObj;
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
             genObj = null;
 
             // in Release mode, it works, but in Debug mode, the weak reference is still alive
@@ -399,14 +399,14 @@ namespace Umbraco.Tests.Cache
             GC.Collect();
 #endif
 
-            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
-            Assert.IsFalse(genObj.WeakReference.IsAlive); // snapshot is gone, along with its reference
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
+            Assert.IsFalse(genObj.WeakGenRef.IsAlive); // snapshot is gone, along with its reference
 
             await d.CollectAsync();
 
             Assert.AreEqual(0, d.Test.GetValues(1).Length); // null value is gone
             Assert.AreEqual(0, d.Count); // item is gone
-            Assert.AreEqual(0, d.Test.GenerationObjects.Count);
+            Assert.AreEqual(0, d.Test.GenObjs.Count);
             Assert.AreEqual(0, d.SnapCount); // snapshot is gone
             Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
         }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index b3996050a6..e78c4d419e 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -29,8 +29,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private readonly ILogger _logger;
         private BPlusTree<int, ContentNodeKit> _localDb;
-        private readonly ConcurrentQueue<GenRefRef> _genRefRefs;
-        private GenRefRef _genRefRef;
+        private readonly ConcurrentQueue<GenObj> _genObjs;
+        private GenObj _genObj;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -64,8 +64,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _contentTypesByAlias = new ConcurrentDictionary<string, LinkedNode<PublishedContentType>>(StringComparer.InvariantCultureIgnoreCase);
             _xmap = new ConcurrentDictionary<Guid, int>();
 
-            _genRefRefs = new ConcurrentQueue<GenRefRef>();
-            _genRefRef = null; // no initial gen exists
+            _genObjs = new ConcurrentQueue<GenObj>();
+            _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -836,8 +836,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
-                if (_nextGen == false && _genRefRef != null)
-                    return new Snapshot(this, _genRefRef.GetGenRef()
+                if (_nextGen == false && _genObj != null)
+                    return new Snapshot(this, _genObj.GetGenRef()
 #if DEBUG
                         , _logger
 #endif
@@ -852,15 +852,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
                     // create a new gen ref unless we already have it
-                    if (_genRefRef == null)
-                        _genRefRefs.Enqueue(_genRefRef = new GenRefRef(snapGen));
-                    else if (_genRefRef.Gen != snapGen)
+                    if (_genObj == null)
+                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+                    else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
                     // not write-locked, can use latest gen, create a new gen ref
-                    _genRefRefs.Enqueue(_genRefRef = new GenRefRef(_liveGen));
+                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
@@ -873,7 +873,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _genRefRef.GetGenRef()
+                var snapshot = new Snapshot(this, _genObj.GetGenRef()
 #if DEBUG
                     , _logger
 #endif
@@ -930,10 +930,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 #if DEBUG
             _logger.Debug<ContentStore>("Collect.");
 #endif
-            while (_genRefRefs.TryPeek(out GenRefRef genRefRef) && (genRefRef.Count == 0 || genRefRef.WGenRef.IsAlive == false))
+            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
             {
-                _genRefRefs.TryDequeue(out genRefRef); // cannot fail since TryPeek has succeeded
-                _floorGen = genRefRef.Gen;
+                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
+                _floorGen = genObj.Gen;
 #if DEBUG
                 //_logger.Debug<ContentStore>("_floorGen=" + _floorGen + ", _liveGen=" + _liveGen);
 #endif
@@ -1009,9 +1009,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 await task;
         }
 
-        public long GenCount => _genRefRefs.Count;
+        public long GenCount => _genObjs.Count;
 
-        public long SnapCount => _genRefRefs.Sum(x => x.Count);
+        public long SnapCount => _genObjs.Sum(x => x.Count);
 
         #endregion
 
@@ -1100,7 +1100,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _store = store;
                 _genRef = genRef;
                 _gen = genRef.Gen;
-                Interlocked.Increment(ref genRef.GenRefRef.Count);
+                Interlocked.Increment(ref genRef.GenObj.Count);
                 //_thisCount = _count++;
 
 #if DEBUG
@@ -1201,46 +1201,46 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 if (_gen < 0) return;
 #if DEBUG
-                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenRefRef.Count.ToString() ?? "live");
+                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenObj.Count.ToString() ?? "live");
 #endif
                 _gen = -1;
                 if (_genRef != null)
-                    Interlocked.Decrement(ref _genRef.GenRefRef.Count);
+                    Interlocked.Decrement(ref _genRef.GenObj.Count);
                 GC.SuppressFinalize(this);
             }
         }
 
-        internal class GenRefRef
+        internal class GenObj
         {
-            public GenRefRef(long gen)
+            public GenObj(long gen)
             {
                 Gen = gen;
-                WGenRef = new WeakReference(null);
+                WeakGenRef = new WeakReference(null);
             }
 
             public GenRef GetGenRef()
             {
                 // not thread-safe but always invoked from within a lock
-                var genRef = (GenRef) WGenRef.Target;
+                var genRef = (GenRef) WeakGenRef.Target;
                 if (genRef == null)
-                    WGenRef.Target = genRef = new GenRef(this, Gen);
+                    WeakGenRef.Target = genRef = new GenRef(this, Gen);
                 return genRef;
             }
 
             public readonly long Gen;
-            public readonly WeakReference WGenRef;
+            public readonly WeakReference WeakGenRef;
             public int Count;
         }
 
         internal class GenRef
         {
-            public GenRef(GenRefRef genRefRef, long gen)
+            public GenRef(GenObj genObj, long gen)
             {
-                GenRefRef = genRefRef;
+                GenObj = genObj;
                 Gen = gen;
             }
 
-            public readonly GenRefRef GenRefRef;
+            public readonly GenObj GenObj;
             public readonly long Gen;
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 30f6e7e638..eebbe3122f 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -21,8 +21,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // Readers are lock-free
 
         private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
-        private readonly ConcurrentQueue<GenerationObject> _generationObjects;
-        private GenerationObject _generationObject;
+        private readonly ConcurrentQueue<GenObj> _genObjs;
+        private GenObj _genObj;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -41,8 +41,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public SnapDictionary()
         {
             _items = new ConcurrentDictionary<TKey, LinkedNode>();
-            _generationObjects = new ConcurrentQueue<GenerationObject>();
-            _generationObject = null; // no initial gen exists
+            _genObjs = new ConcurrentQueue<GenObj>();
+            _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -339,8 +339,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
-                if (_nextGen == false && _generationObject != null)
-                    return new Snapshot(this, _generationObject.GetReference());
+                if (_nextGen == false && _genObj != null)
+                    return new Snapshot(this, _genObj.GetGenRef());
 
                 // else we need to try to create a new gen ref
                 // whether we are wlocked or not, noone can rlock while we do,
@@ -351,15 +351,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
                     // create a new gen ref unless we already have it
-                    if (_generationObject == null)
-                        _generationObjects.Enqueue(_generationObject = new GenerationObject(snapGen));
-                    else if (_generationObject.Gen != snapGen)
+                    if (_genObj == null)
+                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+                    else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
                     // not write-locked, can use latest gen, create a new gen ref
-                    _generationObjects.Enqueue(_generationObject = new GenerationObject(_liveGen));
+                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
@@ -372,7 +372,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _generationObject.GetReference());
+                var snapshot = new Snapshot(this, _genObj.GetGenRef());
 
                 // reading _floorGen is safe if _collectTask is null
                 if (_collectTask == null && _collectAuto && _liveGen - _floorGen > CollectMinGenDelta)
@@ -416,10 +416,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void Collect()
         {
             // see notes in CreateSnapshot
-            while (_generationObjects.TryPeek(out GenerationObject generationObject) && (generationObject.Count == 0 || generationObject.WeakReference.IsAlive == false))
+            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
             {
-                _generationObjects.TryDequeue(out generationObject); // cannot fail since TryPeek has succeeded
-                _floorGen = generationObject.Gen;
+                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
+                _floorGen = genObj.Gen;
             }
 
             Collect(_items);
@@ -490,9 +490,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             //    await task;
         }
 
-        public long GenCount => _generationObjects.Count;
+        public long GenCount => _genObjs.Count;
 
-        public long SnapCount => _generationObjects.Sum(x => x.Count);
+        public long SnapCount => _genObjs.Sum(x => x.Count);
 
         #endregion
 
@@ -520,7 +520,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _dict._collectAuto = value;
             }
 
-            public ConcurrentQueue<GenerationObject> GenerationObjects => _dict._generationObjects;
+            public ConcurrentQueue<GenObj> GenObjs => _dict._genObjs;
 
             public Snapshot LiveSnapshot => new Snapshot(_dict, _dict._liveGen);
 
@@ -586,8 +586,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 _store = store;
                 _generationReference = generationReference;
-                _gen = generationReference.GenerationObject.Gen;
-                _generationReference.GenerationObject.Reference();
+                _gen = generationReference.GenObj.Gen;
+                _generationReference.GenObj.Reference();
             }
 
             internal Snapshot(SnapDictionary<TKey, TValue> store, long gen)
@@ -634,30 +634,30 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 if (_gen < 0) return;
                 _gen = -1;
-                _generationReference?.GenerationObject.Release();
+                _generationReference?.GenObj.Release();
                 GC.SuppressFinalize(this);
             }
         }
 
-        internal class GenerationObject
+        internal class GenObj
         {
-            public GenerationObject(long gen)
+            public GenObj(long gen)
             {
                 Gen = gen;
-                WeakReference = new WeakReference(null);
+                WeakGenRef = new WeakReference(null);
             }
 
-            public GenerationReference GetReference()
+            public GenerationReference GetGenRef()
             {
                 // not thread-safe but always invoked from within a lock
-                var generationReference = (GenerationReference) WeakReference.Target;
+                var generationReference = (GenerationReference) WeakGenRef.Target;
                 if (generationReference == null)
-                    WeakReference.Target = generationReference = new GenerationReference(this);
+                    WeakGenRef.Target = generationReference = new GenerationReference(this);
                 return generationReference;
             }
 
             public readonly long Gen;
-            public readonly WeakReference WeakReference;
+            public readonly WeakReference WeakGenRef;
             public int Count;
 
             public void Reference()
@@ -673,12 +673,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         internal class GenerationReference
         {
-            public GenerationReference(GenerationObject generationObject)
+            public GenerationReference(GenObj genObj)
             {
-                GenerationObject = generationObject;
+                GenObj = genObj;
             }
 
-            public readonly GenerationObject GenerationObject;
+            public readonly GenObj GenObj;
         }
 
         #endregion

From c56b8863eec4eb64504da614828a35bf4ec53e65 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 16:03:39 +0100
Subject: [PATCH 27/50] NuCache: reorg some classes

---
 .../Cache/SnapDictionaryTests.cs              |  4 +-
 .../PublishedCache/NuCache/ContentStore.cs    | 53 +-----------
 .../PublishedCache/NuCache/Snap/GenObj.cs     | 37 +++++++++
 .../PublishedCache/NuCache/Snap/GenRef.cs     | 13 +++
 .../PublishedCache/NuCache/Snap/LinkedNode.cs | 20 +++++
 .../PublishedCache/NuCache/SnapDictionary.cs  | 80 +++----------------
 src/Umbraco.Web/Umbraco.Web.csproj            |  3 +
 7 files changed, 87 insertions(+), 123 deletions(-)
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
 create mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 0ee0d180c3..82c27ebc38 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -5,6 +5,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Scoping;
 using Umbraco.Web.PublishedCache.NuCache;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Tests.Cache
 {
@@ -388,8 +389,7 @@ namespace Umbraco.Tests.Cache
             // collect liveGen
             GC.Collect();
 
-            SnapDictionary<int, string>.GenObj genObj;
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
+            Assert.IsTrue(d.Test.GenObjs.TryPeek(out var genObj));
             genObj = null;
 
             // in Release mode, it works, but in Debug mode, the weak reference is still alive
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index e78c4d419e..dd5805daa1 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -8,6 +8,7 @@ using CSharpTest.Net.Collections;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Scoping;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -1061,24 +1062,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
-        private class LinkedNode<TValue>
-            where TValue: class
-        {
-            public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
-            {
-                Value = value;
-                Gen = gen;
-                Next = next;
-            }
-
-            internal readonly long Gen;
-
-            // reading & writing references is thread-safe on all .NET platforms
-            // mark as volatile to ensure we always read the correct value
-            internal volatile TValue Value;
-            internal volatile LinkedNode<TValue> Next;
-        }
-
         public class Snapshot : IDisposable
         {
             private readonly ContentStore _store;
@@ -1210,40 +1193,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        internal class GenObj
-        {
-            public GenObj(long gen)
-            {
-                Gen = gen;
-                WeakGenRef = new WeakReference(null);
-            }
-
-            public GenRef GetGenRef()
-            {
-                // not thread-safe but always invoked from within a lock
-                var genRef = (GenRef) WeakGenRef.Target;
-                if (genRef == null)
-                    WeakGenRef.Target = genRef = new GenRef(this, Gen);
-                return genRef;
-            }
-
-            public readonly long Gen;
-            public readonly WeakReference WeakGenRef;
-            public int Count;
-        }
-
-        internal class GenRef
-        {
-            public GenRef(GenObj genObj, long gen)
-            {
-                GenObj = genObj;
-                Gen = gen;
-            }
-
-            public readonly GenObj GenObj;
-            public readonly long Gen;
-        }
-
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
new file mode 100644
index 0000000000..b69dab7dac
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Threading;
+
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class GenObj
+    {
+        public GenObj(long gen)
+        {
+            Gen = gen;
+            WeakGenRef = new WeakReference(null);
+        }
+
+        public GenRef GetGenRef()
+        {
+            // not thread-safe but always invoked from within a lock
+            var genRef = (GenRef)WeakGenRef.Target;
+            if (genRef == null)
+                WeakGenRef.Target = genRef = new GenRef(this);
+            return genRef;
+        }
+
+        public readonly long Gen;
+        public readonly WeakReference WeakGenRef;
+        public int Count;
+
+        public void Reference()
+        {
+            Interlocked.Increment(ref Count);
+        }
+
+        public void Release()
+        {
+            Interlocked.Decrement(ref Count);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
new file mode 100644
index 0000000000..ade0251b8d
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
@@ -0,0 +1,13 @@
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class GenRef
+    {
+        public GenRef(GenObj genObj)
+        {
+            GenObj = genObj;
+        }
+
+        public readonly GenObj GenObj;
+        public long Gen => GenObj.Gen;
+    }
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
new file mode 100644
index 0000000000..20d7e7ddcd
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
@@ -0,0 +1,20 @@
+namespace Umbraco.Web.PublishedCache.NuCache.Snap
+{
+    internal class LinkedNode<TValue>
+        where TValue : class
+    {
+        public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
+        {
+            Value = value;
+            Gen = gen;
+            Next = next;
+        }
+
+        public readonly long Gen;
+
+        // reading & writing references is thread-safe on all .NET platforms
+        // mark as volatile to ensure we always read the correct value
+        public volatile TValue Value;
+        public volatile LinkedNode<TValue> Next;
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index eebbe3122f..f117a395b5 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Umbraco.Core.Scoping;
+using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -20,7 +21,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // This class is optimized for many readers, few writers
         // Readers are lock-free
 
-        private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
+        private readonly ConcurrentDictionary<TKey, LinkedNode<TValue>> _items;
         private readonly ConcurrentQueue<GenObj> _genObjs;
         private GenObj _genObj;
         private readonly object _wlocko = new object();
@@ -40,7 +41,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public SnapDictionary()
         {
-            _items = new ConcurrentDictionary<TKey, LinkedNode>();
+            _items = new ConcurrentDictionary<TKey, LinkedNode<TValue>>();
             _genObjs = new ConcurrentQueue<GenObj>();
             _genObj = null; // no initial gen exists
             _liveGen = _floorGen = 0;
@@ -198,9 +199,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public int Count => _items.Count;
 
-        private LinkedNode GetHead(TKey key)
+        private LinkedNode<TValue> GetHead(TKey key)
         {
-            _items.TryGetValue(key, out LinkedNode link); // else null
+            _items.TryGetValue(key, out var link); // else null
             return link;
         }
 
@@ -221,7 +222,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                         // for an older gen - if value is different then insert a new
                         // link for the new gen, with the new value
                         if (link.Value != value)
-                            _items.TryUpdate(key, new LinkedNode(value, _liveGen, link), link);
+                            _items.TryUpdate(key, new LinkedNode<TValue>(value, _liveGen, link), link);
                     }
                     else
                     {
@@ -235,7 +236,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
                 else
                 {
-                    _items.TryAdd(key, new LinkedNode(value, _liveGen));
+                    _items.TryAdd(key, new LinkedNode<TValue>(value, _liveGen));
                 }
             }
             finally
@@ -261,7 +262,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     if (kvp.Value.Gen < _liveGen)
                     {
-                        var link = new LinkedNode(null, _liveGen, kvp.Value);
+                        var link = new LinkedNode<TValue>(null, _liveGen, kvp.Value);
                         _items.TryUpdate(kvp.Key, link, kvp.Value);
                     }
                     else
@@ -425,7 +426,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             Collect(_items);
         }
 
-        private void Collect(ConcurrentDictionary<TKey, LinkedNode> dict)
+        private void Collect(ConcurrentDictionary<TKey, LinkedNode<TValue>> dict)
         {
             // it is OK to enumerate a concurrent dictionary and it does not lock
             // it - and here it's not an issue if we skip some items, they will be
@@ -460,7 +461,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // not live, null value, no next link = remove that one -- but only if
                     // the dict has not been updated, have to do it via ICollection<> (thanks
                     // Mr Toub) -- and if the dict has been updated there is nothing to collect
-                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode>>;
+                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode<TValue>>>;
                     /*var removed =*/ idict.Remove(kvp);
                     //Console.WriteLine("remove (" + (removed ? "true" : "false") + ")");
                     continue;
@@ -526,7 +527,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public GenVal[] GetValues(TKey key)
             {
-                _dict._items.TryGetValue(key, out LinkedNode link); // else null
+                _dict._items.TryGetValue(key, out var link); // else null
 
                 if (link == null)
                     return new GenVal[0];
@@ -559,23 +560,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
-        private class LinkedNode
-        {
-            public LinkedNode(TValue value, long gen, LinkedNode next = null)
-            {
-                Value = value;
-                Gen = gen;
-                Next = next;
-            }
-
-            internal readonly long Gen;
-
-            // reading & writing references is thread-safe on all .NET platforms
-            // mark as volatile to ensure we always read the correct value
-            internal volatile TValue Value;
-            internal volatile LinkedNode Next;
-        }
-
         public class Snapshot : IDisposable
         {
             private readonly SnapDictionary<TKey, TValue> _store;
@@ -639,48 +623,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        internal class GenObj
-        {
-            public GenObj(long gen)
-            {
-                Gen = gen;
-                WeakGenRef = new WeakReference(null);
-            }
-
-            public GenerationReference GetGenRef()
-            {
-                // not thread-safe but always invoked from within a lock
-                var generationReference = (GenerationReference) WeakGenRef.Target;
-                if (generationReference == null)
-                    WeakGenRef.Target = generationReference = new GenerationReference(this);
-                return generationReference;
-            }
-
-            public readonly long Gen;
-            public readonly WeakReference WeakGenRef;
-            public int Count;
-
-            public void Reference()
-            {
-                Interlocked.Increment(ref Count);
-            }
-
-            public void Release()
-            {
-                Interlocked.Decrement(ref Count);
-            }
-        }
-
-        internal class GenerationReference
-        {
-            public GenerationReference(GenObj genObj)
-            {
-                GenObj = genObj;
-            }
-
-            public readonly GenObj GenObj;
-        }
-
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 09cc7d856a..c6cbc7cbaa 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -205,6 +205,9 @@
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
+    <Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />

From 7e413ed4060b5aab7c4197be79214a77e8e0f050 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 22 Feb 2019 15:43:37 +0100
Subject: [PATCH 28/50] NuCache: troubleshooting

---
 .../Cache/SnapDictionaryTests.cs              | 174 ++++++++++++++++--
 .../PublishedCache/NuCache/ContentStore.cs    |   7 +-
 .../PublishedCache/NuCache/SnapDictionary.cs  | 105 +++++++----
 3 files changed, 233 insertions(+), 53 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index 82c27ebc38..eb034eec26 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -712,16 +712,102 @@ namespace Umbraco.Tests.Cache
         }
 
         [Test]
-        public void NestedWriteLocking()
+        public void NestedWriteLocking1()
+        {
+            var d = new SnapDictionary<int, string>();
+            var t = d.Test;
+            t.CollectAuto = false;
+
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            // no scope context: writers nest, last one to be disposed commits
+
+            var scopeProvider = GetScopeProvider();
+
+            using (var w1 = d.GetWriter(scopeProvider))
+            {
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                using (var w2 = d.GetWriter(scopeProvider))
+                {
+                    Assert.AreEqual(1, t.LiveGen);
+                    Assert.AreEqual(2, t.WLocked);
+                    Assert.IsTrue(t.NextGen);
+
+                    Assert.AreNotSame(w1, w2); // get a new writer each time
+
+                    d.Set(1, "one");
+
+                    Assert.AreEqual(0, d.CreateSnapshot().Gen);
+                }
+
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                Assert.AreEqual(0, d.CreateSnapshot().Gen);
+            }
+
+            Assert.AreEqual(1, t.LiveGen);
+            Assert.AreEqual(0, t.WLocked);
+            Assert.IsTrue(t.NextGen);
+
+            Assert.AreEqual(1, d.CreateSnapshot().Gen);
+        }
+
+        [Test]
+        public void NestedWriteLocking2()
         {
             var d = new SnapDictionary<int, string>();
             d.Test.CollectAuto = false;
 
-            var scopeProvider = GetScopeProvider();
-            using (d.GetWriter(scopeProvider))
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            // scope context: writers enlist
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
+
+            using (var w1 = d.GetWriter(scopeProvider))
             {
-                using (d.GetWriter(scopeProvider))
+                using (var w2 = d.GetWriter(scopeProvider))
                 {
+                    Assert.AreSame(w1, w2);
+
+                    d.Set(1, "one");
+                }
+            }
+        }
+
+        [Test]
+        public void NestedWriteLocking3()
+        {
+            var d = new SnapDictionary<int, string>();
+            var t = d.Test;
+            t.CollectAuto = false;
+
+            Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider1 = GetScopeProvider();
+            var scopeProvider2 = GetScopeProvider(scopeContext);
+
+            using (var w1 = d.GetWriter(scopeProvider1))
+            {
+                Assert.AreEqual(1, t.LiveGen);
+                Assert.AreEqual(1, t.WLocked);
+                Assert.IsTrue(t.NextGen);
+
+                using (var w2 = d.GetWriter(scopeProvider2))
+                {
+                    Assert.AreEqual(1, t.LiveGen);
+                    Assert.AreEqual(2, t.WLocked);
+                    Assert.IsTrue(t.NextGen);
+
+                    Assert.AreNotSame(w1, w2);
+
                     d.Set(1, "one");
                 }
             }
@@ -846,7 +932,8 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            var scopeProvider = GetScopeProvider(true);
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
 
             using (d.GetWriter(scopeProvider))
             {
@@ -867,7 +954,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
-            ((ScopeContext) scopeProvider.Context).ScopeExit(true);
+            scopeContext.ScopeExit(true);
 
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(3, s5.Gen);
@@ -878,7 +965,8 @@ namespace Umbraco.Tests.Cache
         public void ScopeLocking2()
         {
             var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
+            var t = d.Test;
+            t.CollectAuto = false;
 
             // gen 1
             d.Set(1, "one");
@@ -891,10 +979,11 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            var scopeProviderMock = new Mock<IScopeProvider>();
+            Assert.AreEqual(2, t.LiveGen);
+            Assert.IsFalse(t.NextGen);
+
             var scopeContext = new ScopeContext();
-            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
-            var scopeProvider = scopeProviderMock.Object;
+            var scopeProvider = GetScopeProvider(scopeContext);
 
             using (d.GetWriter(scopeProvider))
             {
@@ -905,18 +994,72 @@ namespace Umbraco.Tests.Cache
                 Assert.AreEqual(2, s3.Gen);
                 Assert.AreEqual("uno", s3.Get(1));
 
+                // we made some changes, so a next gen is required
+                Assert.AreEqual(3, t.LiveGen);
+                Assert.IsTrue(t.NextGen);
+                Assert.AreEqual(1, t.WLocked);
+
                 // but live snapshot contains changes
-                var ls = d.Test.LiveSnapshot;
+                var ls = t.LiveSnapshot;
                 Assert.AreEqual("ein", ls.Get(1));
                 Assert.AreEqual(3, ls.Gen);
             }
 
+            // nothing is committed until scope exits
+            Assert.AreEqual(3, t.LiveGen);
+            Assert.IsTrue(t.NextGen);
+            Assert.AreEqual(1, t.WLocked);
+
+            // no changes until exit
             var s4 = d.CreateSnapshot();
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
+            // fixme - remove debugging code
+            /*
+            Exception caught = null;
+            var genFlip = 0;
+            var lckFlip = 0;
+            var thread = new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    for (var i = 0; i < 20; i++)
+                    {
+                        if (t.LiveGen == 2 && genFlip == 0) genFlip = i; // flips at 1
+                        if (t.WLocked == 0 && lckFlip == 0) lckFlip = i; // flips at 10 ie 5s, as expected
+                        d.CreateSnapshot();
+                        System.Threading.Thread.Sleep(500);
+                    }
+                }
+                catch (Exception e)
+                {
+                    caught = e;
+                }
+            });
+            thread.Start();
+            */
+
             scopeContext.ScopeExit(false);
 
+            // fixme - remove debugging code
+            /*
+            thread.Join();
+
+            Assert.IsNull(caught); // but then how can it be not null?
+
+            Console.WriteLine(genFlip);
+            Console.WriteLine(lckFlip);
+            Assert.AreEqual(1, genFlip);
+            Assert.AreEqual(10, lckFlip);
+            */
+
+            // now things have changed
+            Assert.AreEqual(2, t.LiveGen);
+            Assert.IsFalse(t.NextGen);
+            Assert.AreEqual(0, t.WLocked);
+
+            // no changes since not completed
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(2, s5.Gen);
             Assert.AreEqual("uno", s5.Get(1));
@@ -955,12 +1098,11 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual("four", all[3]);
         }
 
-        private IScopeProvider GetScopeProvider(bool withContext = false)
+        private IScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
         {
-            var scopeProviderMock = new Mock<IScopeProvider>();
-            var scopeContext = withContext ? new ScopeContext() : null;
-            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
-            var scopeProvider = scopeProviderMock.Object;
+            var scopeProvider = Mock.Of<IScopeProvider>();
+            Mock.Get(scopeProvider)
+                .Setup(x => x.Context).Returns(scopeContext);
             return scopeProvider;
         }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index dd5805daa1..2548046e23 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -95,7 +95,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private class ContentStoreWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private ContentStore _store;
+            private readonly ContentStore _store;
+            private int _released;
 
             public ContentStoreWriter(ContentStore store, bool scoped)
             {
@@ -105,9 +106,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (_store== null) return;
+                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
+                    return;
                 _store.Release(_lockinfo, completed);
-                _store = null;
             }
         }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index f117a395b5..1d462f1b76 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -90,7 +90,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private class SnapDictionaryWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private SnapDictionary<TKey, TValue> _dictionary;
+            private readonly SnapDictionary<TKey, TValue> _dictionary;
+            private int _released;
 
             public SnapDictionaryWriter(SnapDictionary<TKey, TValue> dictionary, bool scoped)
             {
@@ -100,14 +101,18 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (_dictionary == null) return;
+                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
+                    return;
                 _dictionary.Release(_lockinfo, completed);
-                _dictionary = null;
             }
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // GetScopedWriter? should the dict have a ref onto the scope provider?
+        // fixme GetScopedWriter? should the dict have a ref onto the scope provider?
+        // fixme this is not a "writer" but a "write lock" => rename GetWriteLock
+        // the dict is write-locked until the write-lock is released
+        //  which happens when it is disposed (non-scoped)
+        //  or when the scope context exits (scoped)
         public IDisposable GetWriter(IScopeProvider scopeProvider)
         {
             return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped));
@@ -130,13 +135,22 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 //RuntimeHelpers.PrepareConstrainedRegions();
                 try { } finally
                 {
+                    // increment the lock count, and register that this lock is counting
                     _wlocked++;
                     lockInfo.Count = true;
+
+                    // fixme - this comment: "ok to have holes in generation objects" is annoying
+                    // 'cos if you have a hole, then doing _liveGen-1 in some places would be wrong
+                    // besides, forceGen is used only when getting a scoped write lock, which is not reentrant?
+                    //
+                    // but... if _wlocked ==1 and we just incremented it, it means it was 0, so it wasnt locked, so wtf?
+                    // this is the only place where _nextGen would turn true so ... this makes no sense at all!
+
                     if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true;
+                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
                         _liveGen += 1;
                     }
                 }
@@ -154,6 +168,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void Release(WriteLockInfo lockInfo, bool commit = true)
         {
+            // if the lock wasn't taken in the first place, do nothing
+            if (!lockInfo.Taken)
+                return;
+
             if (commit == false)
             {
                 var rtaken = false;
@@ -162,6 +180,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     Monitor.Enter(_rlocko, ref rtaken);
                     try { } finally
                     {
+                        // forget about the temp. liveGen
                         _nextGen = false;
                         _liveGen -= 1;
                     }
@@ -184,8 +203,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
             }
 
+            // fixme - pretend we need to do something that takes time
+            //System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
+
+            // decrement the lock count, if counting, then exit the lock
             if (lockInfo.Count) _wlocked--;
-            if (lockInfo.Taken) Monitor.Exit(_wlocko);
+            Monitor.Exit(_wlocko);
         }
 
         private void Release(ReadLockInfo lockInfo)
@@ -338,12 +361,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 Lock(lockInfo);
 
-                // if no next generation is required, and we already have one,
-                // use it and create a new snapshot
+                // if no next generation is required, and we already have a gen object,
+                // use it to create a new snapshot
                 if (_nextGen == false && _genObj != null)
                     return new Snapshot(this, _genObj.GetGenRef());
 
-                // else we need to try to create a new gen ref
+                // else we need to try to create a new gen object
                 // whether we are wlocked or not, noone can rlock while we do,
                 // so _liveGen and _nextGen are safe
                 if (_wlocked > 0) // volatile, cannot ++ but could --
@@ -351,26 +374,32 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // write-locked, cannot use latest gen (at least 1) so use previous
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
-                    // create a new gen ref unless we already have it
+                    // create a new gen object if we don't already have one
+                    // (happens the first time a snapshot is created)
                     if (_genObj == null)
                         _genObjs.Enqueue(_genObj = new GenObj(snapGen));
+
+                    // fixme - getting a panic exception here
+                    // means _genObj != null, means _nextGen == true
+
+                    // if we have one already, ensure it's consistent
                     else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
-                    // not write-locked, can use latest gen, create a new gen ref
+                    // not write-locked, can use latest gen (_liveGen), create a corresponding new gen object
                     _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
                 // so...
-                // the genRefRef has a weak ref to the genRef, and is queued
-                // the snapshot has a ref to the genRef, which has a ref to the genRefRef
-                // when the snapshot is disposed, it decreases genRefRef counter
+                // the genObj has a weak ref to the genRef, and is queued
+                // the snapshot has a ref to the genRef, which has a ref to the genObj
+                // when the snapshot is disposed, it decreases genObj counter
                 // so after a while, one of these conditions is going to be true:
-                // - the genRefRef counter is zero because all snapshots have properly been disposed
-                // - the genRefRef weak ref is dead because all snapshots have been collected
+                // - genObj.Count is zero because all snapshots have properly been disposed
+                // - genObj.WeakGenRef is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
                 var snapshot = new Snapshot(this, _genObj.GetGenRef());
@@ -486,7 +515,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 task = _collectTask;
             }
-            return task ?? Task.FromResult(0);
+            return task ?? Task.CompletedTask;
             //if (task != null)
             //    await task;
         }
@@ -514,6 +543,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             public long LiveGen => _dict._liveGen;
             public long FloorGen => _dict._floorGen;
             public bool NextGen => _dict._nextGen;
+            public int WLocked => _dict._wlocked;
 
             public bool CollectAuto
             {
@@ -563,15 +593,20 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public class Snapshot : IDisposable
         {
             private readonly SnapDictionary<TKey, TValue> _store;
-            private readonly GenerationReference _generationReference;
-            private long _gen; // copied for perfs
+            private readonly GenRef _genRef;
+            private readonly long _gen; // copied for perfs
+            private int _disposed;
 
-            internal Snapshot(SnapDictionary<TKey, TValue> store, GenerationReference generationReference)
+            //private static int _count;
+            //private readonly int _thisCount;
+
+            internal Snapshot(SnapDictionary<TKey, TValue> store, GenRef genRef)
             {
                 _store = store;
-                _generationReference = generationReference;
-                _gen = generationReference.GenObj.Gen;
-                _generationReference.GenObj.Reference();
+                _genRef = genRef;
+                _gen = genRef.GenObj.Gen;
+                _genRef.GenObj.Reference();
+                //_thisCount = _count++;
             }
 
             internal Snapshot(SnapDictionary<TKey, TValue> store, long gen)
@@ -580,17 +615,21 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _gen = gen;
             }
 
+            private void EnsureNotDisposed()
+            {
+                if (_disposed > 0)
+                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+            }
+
             public TValue Get(TKey key)
             {
-                if (_gen < 0)
-                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                EnsureNotDisposed();
                 return _store.Get(key, _gen);
             }
 
             public IEnumerable<TValue> GetAll()
             {
-                if (_gen < 0)
-                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                EnsureNotDisposed();
                 return _store.GetAll(_gen);
             }
 
@@ -598,8 +637,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    if (_gen < 0)
-                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                    EnsureNotDisposed();
                     return _store.IsEmpty(_gen);
                 }
             }
@@ -608,17 +646,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    if (_gen < 0)
-                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                    EnsureNotDisposed();
                     return _gen;
                 }
             }
 
             public void Dispose()
             {
-                if (_gen < 0) return;
-                _gen = -1;
-                _generationReference?.GenObj.Release();
+                if (Interlocked.CompareExchange(ref _disposed, 1, 0) != 0)
+                    return;
+                _genRef?.GenObj.Release();
                 GC.SuppressFinalize(this);
             }
         }

From 851c844c8b3268909b0939bb3ec8a5202ea554c5 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 14 Mar 2019 18:56:23 +0100
Subject: [PATCH 29/50] NuCache: fix panic exception

---
 .../Cache/SnapDictionaryTests.cs              | 81 +++++++++++++++++++
 .../PublishedCache/NuCache/ContentStore.cs    |  4 +-
 .../PublishedCache/NuCache/SnapDictionary.cs  | 15 +---
 3 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index eb034eec26..e4ca35fbd3 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -1098,6 +1098,87 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual("four", all[3]);
         }
 
+        [Test]
+        public void DontPanic()
+        {
+            var d = new SnapDictionary<int, string>();
+            d.Test.CollectAuto = false;
+
+            Assert.IsNull(d.Test.GenObj); // set with first snapshot or first lock, then never null
+
+            // gen 1
+            d.Set(1, "one");
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(1, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj); // set with lock
+
+            var s1 = d.CreateSnapshot();
+            Assert.IsFalse(d.Test.NextGen);
+            Assert.AreEqual(1, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(1, d.Test.GenObj.Gen);
+
+            Assert.AreEqual(1, s1.Gen);
+            Assert.AreEqual("one", s1.Get(1));
+
+            d.Set(1, "uno");
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(2, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(1, d.Test.GenObj.Gen);
+
+            var scopeContext = new ScopeContext();
+            var scopeProvider = GetScopeProvider(scopeContext);
+
+            // scopeProvider.Context == scopeContext -> writer is scoped
+            // writer is scope contextual and scoped
+            //  when disposed, nothing happens
+            //  when the context exists, the writer is released
+            using (d.GetWriter(scopeProvider))
+            {
+                d.Set(1, "ein");
+                Assert.IsTrue(d.Test.NextGen);
+                Assert.AreEqual(3, d.Test.LiveGen);
+                Assert.IsNotNull(d.Test.GenObj);
+                Assert.AreEqual(2, d.Test.GenObj.Gen);
+            }
+
+            // writer has not released
+            Assert.AreEqual(1, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+
+            // nothing changed
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+
+            // panic!
+            var s2 = d.CreateSnapshot();
+
+            Assert.AreEqual(1, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsTrue(d.Test.NextGen);
+
+            // release writer
+            scopeContext.ScopeExit(true);
+
+            Assert.AreEqual(0, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsTrue(d.Test.NextGen);
+
+            var s3 = d.CreateSnapshot();
+
+            Assert.AreEqual(0, d.Test.WLocked);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(3, d.Test.GenObj.Gen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsFalse(d.Test.NextGen);
+        }
+
         private IScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
         {
             var scopeProvider = Mock.Of<IScopeProvider>();
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 2548046e23..2b9c9bee4d 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -133,11 +133,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     _wlocked++;
                     lockInfo.Count = true;
-                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
+                    if (_nextGen == false || (forceGen && _wlocked == 1))
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
                         _nextGen = true;
+                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
                     }
                 }
@@ -214,7 +215,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 else
                     dictionary.TryUpdate(key, link.Next, link);
             }
-
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 1d462f1b76..73904d1452 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -139,18 +139,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     _wlocked++;
                     lockInfo.Count = true;
 
-                    // fixme - this comment: "ok to have holes in generation objects" is annoying
-                    // 'cos if you have a hole, then doing _liveGen-1 in some places would be wrong
-                    // besides, forceGen is used only when getting a scoped write lock, which is not reentrant?
-                    //
-                    // but... if _wlocked ==1 and we just incremented it, it means it was 0, so it wasnt locked, so wtf?
-                    // this is the only place where _nextGen would turn true so ... this makes no sense at all!
-
-                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
+                    if (_nextGen == false || (forceGen && _wlocked == 1))
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
                         _nextGen = true; // this is the ONLY place where _nextGen becomes true
+                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
                     }
                 }
@@ -379,9 +373,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     if (_genObj == null)
                         _genObjs.Enqueue(_genObj = new GenObj(snapGen));
 
-                    // fixme - getting a panic exception here
-                    // means _genObj != null, means _nextGen == true
-
                     // if we have one already, ensure it's consistent
                     else if (_genObj.Gen != snapGen)
                         throw new Exception("panic");
@@ -551,6 +542,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _dict._collectAuto = value;
             }
 
+            public GenObj GenObj => _dict._genObj;
+
             public ConcurrentQueue<GenObj> GenObjs => _dict._genObjs;
 
             public Snapshot LiveSnapshot => new Snapshot(_dict, _dict._liveGen);

From dfe6f2029ac5d65aa8bac1c91f27bc0da5ca5253 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 14 Mar 2019 19:48:44 +0100
Subject: [PATCH 30/50] NuCache: better fixing, cleanup

---
 .../Scoping/ScopeContextualBase.cs            |  7 +-
 .../Cache/SnapDictionaryTests.cs              | 67 +++++--------------
 .../PublishedCache/NuCache/ContentStore.cs    | 13 ++--
 .../NuCache/PublishedSnapshotService.cs       | 18 ++---
 .../PublishedCache/NuCache/SnapDictionary.cs  | 18 ++---
 5 files changed, 39 insertions(+), 84 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
index 1f2b6155e6..25f176d471 100644
--- a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Scoping
     /// </remarks>
     public abstract class ScopeContextualBase : IDisposable
     {
-        private bool _using, _scoped;
+        private bool _scoped;
 
         /// <summary>
         /// Gets a contextual object.
@@ -38,9 +38,6 @@ namespace Umbraco.Core.Scoping
                 () => ctor(true),
                 (completed, item) => { item.Release(completed); });
 
-            // the object can be 'used' only once at a time
-            if (w._using) throw new InvalidOperationException("panic: used.");
-            w._using = true;
             w._scoped = true;
 
             return w;
@@ -52,8 +49,6 @@ namespace Umbraco.Core.Scoping
         /// </remarks>
         public void Dispose()
         {
-            _using = false;
-
             if (_scoped == false)
                 Release(true);
         }
diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index e4ca35fbd3..b435af9e77 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -632,7 +632,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(1, d.Test.LiveGen);
             Assert.IsTrue(d.Test.NextGen);
 
-            using (d.GetWriter(GetScopeProvider()))
+            using (d.GetScopedWriteLock(GetScopeProvider()))
             {
                 var s1 = d.CreateSnapshot();
 
@@ -685,7 +685,7 @@ namespace Umbraco.Tests.Cache
             Assert.IsFalse(d.Test.NextGen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            using (d.GetWriter(GetScopeProvider()))
+            using (d.GetScopedWriteLock(GetScopeProvider()))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -724,13 +724,13 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (var w1 = d.GetWriter(scopeProvider))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider))
             {
                 Assert.AreEqual(1, t.LiveGen);
                 Assert.AreEqual(1, t.WLocked);
                 Assert.IsTrue(t.NextGen);
 
-                using (var w2 = d.GetWriter(scopeProvider))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider))
                 {
                     Assert.AreEqual(1, t.LiveGen);
                     Assert.AreEqual(2, t.WLocked);
@@ -770,9 +770,9 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (var w1 = d.GetWriter(scopeProvider))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider))
             {
-                using (var w2 = d.GetWriter(scopeProvider))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider))
                 {
                     Assert.AreSame(w1, w2);
 
@@ -794,13 +794,13 @@ namespace Umbraco.Tests.Cache
             var scopeProvider1 = GetScopeProvider();
             var scopeProvider2 = GetScopeProvider(scopeContext);
 
-            using (var w1 = d.GetWriter(scopeProvider1))
+            using (var w1 = d.GetScopedWriteLock(scopeProvider1))
             {
                 Assert.AreEqual(1, t.LiveGen);
                 Assert.AreEqual(1, t.WLocked);
                 Assert.IsTrue(t.NextGen);
 
-                using (var w2 = d.GetWriter(scopeProvider2))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider2))
                 {
                     Assert.AreEqual(1, t.LiveGen);
                     Assert.AreEqual(2, t.WLocked);
@@ -850,7 +850,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -895,7 +895,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -935,7 +935,7 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -985,7 +985,7 @@ namespace Umbraco.Tests.Cache
             var scopeContext = new ScopeContext();
             var scopeProvider = GetScopeProvider(scopeContext);
 
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -1015,45 +1015,8 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
-            // fixme - remove debugging code
-            /*
-            Exception caught = null;
-            var genFlip = 0;
-            var lckFlip = 0;
-            var thread = new System.Threading.Thread(() =>
-            {
-                try
-                {
-                    for (var i = 0; i < 20; i++)
-                    {
-                        if (t.LiveGen == 2 && genFlip == 0) genFlip = i; // flips at 1
-                        if (t.WLocked == 0 && lckFlip == 0) lckFlip = i; // flips at 10 ie 5s, as expected
-                        d.CreateSnapshot();
-                        System.Threading.Thread.Sleep(500);
-                    }
-                }
-                catch (Exception e)
-                {
-                    caught = e;
-                }
-            });
-            thread.Start();
-            */
-
             scopeContext.ScopeExit(false);
 
-            // fixme - remove debugging code
-            /*
-            thread.Join();
-
-            Assert.IsNull(caught); // but then how can it be not null?
-
-            Console.WriteLine(genFlip);
-            Console.WriteLine(lckFlip);
-            Assert.AreEqual(1, genFlip);
-            Assert.AreEqual(10, lckFlip);
-            */
-
             // now things have changed
             Assert.AreEqual(2, t.LiveGen);
             Assert.IsFalse(t.NextGen);
@@ -1104,13 +1067,13 @@ namespace Umbraco.Tests.Cache
             var d = new SnapDictionary<int, string>();
             d.Test.CollectAuto = false;
 
-            Assert.IsNull(d.Test.GenObj); // set with first snapshot or first lock, then never null
+            Assert.IsNull(d.Test.GenObj);
 
             // gen 1
             d.Set(1, "one");
             Assert.IsTrue(d.Test.NextGen);
             Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj); // set with lock
+            Assert.IsNull(d.Test.GenObj);
 
             var s1 = d.CreateSnapshot();
             Assert.IsFalse(d.Test.NextGen);
@@ -1134,7 +1097,7 @@ namespace Umbraco.Tests.Cache
             // writer is scope contextual and scoped
             //  when disposed, nothing happens
             //  when the context exists, the writer is released
-            using (d.GetWriter(scopeProvider))
+            using (d.GetScopedWriteLock(scopeProvider))
             {
                 d.Set(1, "ein");
                 Assert.IsTrue(d.Test.NextGen);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 2b9c9bee4d..7ab4a64f31 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -92,13 +92,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class ContentStoreWriter : ScopeContextualBase
+        private class ScopedWriteLock : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
             private readonly ContentStore _store;
             private int _released;
 
-            public ContentStoreWriter(ContentStore store, bool scoped)
+            public ScopedWriteLock(ContentStore store, bool scoped)
             {
                 _store = store;
                 store.Lock(_lockinfo, scoped);
@@ -114,9 +114,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         // gets a scope contextual representing a locked writer to the dictionary
         // TODO: GetScopedWriter? should the dict have a ref onto the scope provider?
-        public IDisposable GetWriter(IScopeProvider scopeProvider)
+        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ContentStoreWriter(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -137,9 +137,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true;
-                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                        if (_nextGen)
+                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
+                        _nextGen = true;
                     }
                 }
             }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 541ff2ea23..9c5587fbd5 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -333,7 +333,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // first get a writer, then a scope
             // if there already is a scope, the writer will attach to it
             // otherwise, it will only exist here - cheap
-            using (_contentStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.ContentTree);
@@ -401,7 +401,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void LockAndLoadMedia(Action<IScope> action)
         {
             // see note in LockAndLoadContent
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.MediaTree);
@@ -529,7 +529,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void LockAndLoadDomains()
         {
             // see note in LockAndLoadContent
-            using (_domainStore.GetWriter(_scopeProvider))
+            using (_domainStore.GetScopedWriteLock(_scopeProvider))
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.ReadLock(Constants.Locks.Domains);
@@ -586,7 +586,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_contentStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool draftChanged2, out bool publishedChanged2);
                 draftChanged = draftChanged2;
@@ -682,7 +682,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool anythingChanged2);
                 anythingChanged = anythingChanged2;
@@ -803,7 +803,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             if (removedIds.Count == 0 && refreshedIds.Count == 0 && otherIds.Count == 0 && newIds.Count == 0) return;
 
-            using (store.GetWriter(_scopeProvider))
+            using (store.GetScopedWriteLock(_scopeProvider))
             {
                 // ReSharper disable AccessToModifiedClosure
                 action(removedIds, refreshedIds, otherIds, newIds);
@@ -824,8 +824,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     payload.Removed ? "Removed" : "Refreshed",
                     payload.Id);
 
-            using (_contentStore.GetWriter(_scopeProvider))
-            using (_mediaStore.GetWriter(_scopeProvider))
+            using (_contentStore.GetScopedWriteLock(_scopeProvider))
+            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
             {
                 // TODO: need to add a datatype lock
                 // this is triggering datatypes reload in the factory, and right after we create some
@@ -858,7 +858,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
 
             // see note in LockAndLoadContent
-            using (_domainStore.GetWriter(_scopeProvider))
+            using (_domainStore.GetScopedWriteLock(_scopeProvider))
             {
                 foreach (var payload in payloads)
                 {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index 73904d1452..c5b1df1206 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -87,13 +87,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class SnapDictionaryWriter : ScopeContextualBase
+        private class ScopedWriteLock : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
             private readonly SnapDictionary<TKey, TValue> _dictionary;
             private int _released;
 
-            public SnapDictionaryWriter(SnapDictionary<TKey, TValue> dictionary, bool scoped)
+            public ScopedWriteLock(SnapDictionary<TKey, TValue> dictionary, bool scoped)
             {
                 _dictionary = dictionary;
                 dictionary.Lock(_lockinfo, scoped);
@@ -108,14 +108,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // fixme GetScopedWriter? should the dict have a ref onto the scope provider?
-        // fixme this is not a "writer" but a "write lock" => rename GetWriteLock
         // the dict is write-locked until the write-lock is released
         //  which happens when it is disposed (non-scoped)
         //  or when the scope context exits (scoped)
-        public IDisposable GetWriter(IScopeProvider scopeProvider)
+        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -143,9 +141,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
-                        _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                        if (_nextGen)
+                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
                         _liveGen += 1;
+                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
                     }
                 }
             }
@@ -197,9 +196,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
             }
 
-            // fixme - pretend we need to do something that takes time
-            //System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
-
             // decrement the lock count, if counting, then exit the lock
             if (lockInfo.Count) _wlocked--;
             Monitor.Exit(_wlocko);

From b36288b987cd37122da42f4b261b1ab5a90bcfd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 26 Mar 2019 14:11:01 +0100
Subject: [PATCH 31/50] infinity editing dim-layer for umb-modelcolumn

---
 src/Umbraco.Web.UI.Client/src/less/modals.less | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 771be1bc2a..8e88774613 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -55,6 +55,16 @@
 	position: absolute;;	
 }
 
+.--notInFront .umb-modalcolumn::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    background: rgba(0,0,0,.4);
+}
+
 /* re-align loader */
 .umb-modal .umb-loader-wrapper, .umb-modalcolumn .umb-loader-wrapper, .umb-dialog .umb-loader-wrapper{
     position:relative; 

From 458e51096151a1578e02241d9949ae547ebfa7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 26 Mar 2019 14:57:13 +0100
Subject: [PATCH 32/50] remove double ;;

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

diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 771be1bc2a..f922d7d95a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -52,7 +52,7 @@
 	bottom: 0px;
 	left: 0px;
 	right: 0px;
-	position: absolute;;	
+	position: absolute;	
 }
 
 /* re-align loader */

From 4a14d45a64199673125e846d51f60b3e76a1216b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 26 Mar 2019 14:57:30 +0100
Subject: [PATCH 33/50] remove inline styling

---
 .../src/views/content/overlays/schedule.html              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index 2bf290b752..42f6ae7b98 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -27,7 +27,7 @@
                                 {{vm.variants[0].releaseDateFormatted}}
                             </button>
 
-                            <a ng-hide="vm.variants[0].releaseDate" href="" class="bold" style="color: #00aea2; text-decoration: underline;">
+                            <a ng-hide="vm.variants[0].releaseDate" href="">
                                 <localize key="content_setDate">Set date</localize>
                             </a>
                         </div>
@@ -59,7 +59,7 @@
                                 {{vm.variants[0].expireDateFormatted}}
                             </button>
 
-                            <a ng-hide="vm.variants[0].expireDate" href="" class="bold" style="color: #00aea2; text-decoration: underline;">
+                            <a ng-hide="vm.variants[0].expireDate" href="">
                                 <localize key="content_setDate">Set date</localize>
                             </a>
                         </div>
@@ -123,7 +123,7 @@
                                                     {{variant.releaseDateFormatted}}
                                                 </button>
 
-                                                <a ng-hide="variant.releaseDate" href="" class="bold" style="color: #00aea2; text-decoration: underline;">
+                                                <a ng-hide="variant.releaseDate" href="">
                                                     <localize key="content_setDate">Set date</localize>
                                                 </a>
                                             </div>
@@ -149,7 +149,7 @@
                                                     {{variant.expireDateFormatted}}
                                                 </button>
 
-                                                <a ng-hide="variant.expireDate" href="" class="bold" style="color: #00aea2; text-decoration: underline;">
+                                                <a ng-hide="variant.expireDate" href="">
                                                     <localize key="content_setDate">Set date</localize>
                                                 </a>
                                             </div>

From d6be02aaecd83823c8b0578a6314a807a86859af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 26 Mar 2019 14:57:45 +0100
Subject: [PATCH 34/50] style set date input

---
 .../src/less/properties.less                  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index 916f1b5a3a..d3e69a2d79 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -16,6 +16,31 @@
     border-left: 1px solid @gray-10;
 }
 
+.date-wrapper__date .flatpickr-input > a {
+    
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: 700;
+    padding: 5px 15px;
+    box-sizing: border-box;
+    min-width: 200px;
+    
+    color: @ui-action-discreet-type;
+    border: 1px dashed @ui-action-discreet-border;
+    border-radius: 3px;
+    
+    &:hover {
+        text-decoration: none;
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-border-hover;
+        
+        localize {
+            text-decoration: none;
+        }
+    }
+}
+
 //------------------- HISTORY ------------------
 
 .history {

From 719a4a8b6a50b829e7b8ce1166a5afaafdde436b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 27 Mar 2019 08:29:04 +0100
Subject: [PATCH 35/50] adjusted size

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

diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index d3e69a2d79..d206b2a413 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -22,7 +22,7 @@
     align-items: center;
     justify-content: center;
     font-weight: 700;
-    padding: 5px 15px;
+    padding: 4px 15px;
     box-sizing: border-box;
     min-width: 200px;
     

From 8da9ecc9e4d0f967d9aea54674801b53ed13f85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 27 Mar 2019 12:49:03 +0100
Subject: [PATCH 36/50] date-wrapper styles for variants schedule publishing

---
 .../src/less/properties.less                  | 48 ++++++++++++++++++-
 .../src/views/content/overlays/schedule.html  | 28 ++---------
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index d206b2a413..e14bb5c0d6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -30,7 +30,51 @@
     border: 1px dashed @ui-action-discreet-border;
     border-radius: 3px;
     
-    &:hover {
+    &:hover, &:focus {
+        text-decoration: none;
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-border-hover;
+        
+        localize {
+            text-decoration: none;
+        }
+    }
+}
+
+//----- VARIANTS SCHEDULED PUBLISH ------
+
+.date-wrapper-mini {
+    display: flex;
+    flex-direction: row;
+}
+
+.date-wrapper-mini__date {
+    display: flex;
+    
+    margin-left: 5px;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    
+    &:first-of-type {
+        margin-left: 0;
+    }
+}
+
+.date-wrapper-mini__date .flatpickr-input > a {
+    
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: 700;
+    padding: 1px 15px;
+    box-sizing: border-box;
+    min-width: 180px;
+    
+    color: @ui-action-discreet-type;
+    border: 1px dashed @ui-action-discreet-border;
+    border-radius: 3px;
+    
+    &:hover, &:focus {
         text-decoration: none;
         color: @ui-action-discreet-type-hover;
         border-color: @ui-action-discreet-border-hover;
@@ -96,4 +140,4 @@
     .history-line {
         display: none;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index 42f6ae7b98..8cdc4a0abc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -84,8 +84,8 @@
 
         <div class="umb-list umb-list--condensed">
 
-            <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter">
-                <ng-form name="scheduleSelectorForm">
+            <div class="umb-list-item" ng-repeat="variant in vm.variants">
+                <ng-form name="scheduleSelectorForm" style="width:100%;">
                     <div class="flex">
 
                         <umb-checkbox
@@ -106,9 +106,9 @@
                                 </span>
                             </label>
 
-                            <div class="flex items-center" style="margin-top: 10px; margin-bottom: 10px;">
+                            <div class="date-wrapper-mini">
+                                <div class="date-wrapper-mini__date" ng-if="vm.dirtyVariantFilter(variant) && (variant.releaseDate || variant.save)">
 
-                                <div class="flex items-center" ng-if="variant.releaseDate || variant.save">
                                     <div style="font-size: 13px; margin-right: 5px;">Publish:<em ng-show="!variant.save">&nbsp;&nbsp;{{variant.releaseDateFormatted}}</em></div>
 
                                     <div class="btn-group flex" style="font-size: 14px; margin-right: 10px;" ng-if="variant.save">
@@ -134,7 +134,7 @@
                                     </div>
                                 </div>
 
-                                <div class="flex items-center" ng-if="variant.expireDate || variant.save">
+                                <div class="date-wrapper-mini__date" ng-if="variant.expireDate || variant.save">
                                     <div style="font-size: 13px; margin-right: 5px;">Unpublish:<em ng-show="!variant.save">&nbsp;&nbsp;{{variant.expireDateFormatted}}</em></div>
 
                                     <div class="btn-group flex" style="font-size: 14px;" ng-if="variant.save">
@@ -182,24 +182,6 @@
             <br />
         </div>
 
-        <div class="umb-list umb-list--condensed" ng-if="vm.hasPristineVariants">
-            <div style="margin-bottom: 15px; font-weight: bold;">
-                <p><localize key="content_publishedLanguages"></localize></p>
-            </div>
-
-            <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.pristineVariantFilter track by variant.language.culture">
-                <div>
-                    <div style="margin-bottom: 2px;">
-                        <span>{{ variant.language.name }}</span>
-                    </div>
-                    <div class="umb-permission__description">
-                        <umb-variant-state variant="variant"></umb-variant-state>
-                        <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
-                    </div>
-                </div>
-            </div>
-        </div>
-
     </div>
 
 </div>

From d49d4bcdebe623af2ebff643ccc0a63d5b0258c3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 28 Mar 2019 17:10:41 +0100
Subject: [PATCH 37/50] Align the logviewer search icons to the right of the
 search field

---
 src/Umbraco.Web.UI.Client/src/views/logviewer/search.html | 4 ++--
 1 file changed, 2 insertions(+), 2 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 fad7698969..e22e8909d1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
@@ -54,8 +54,8 @@
                             <input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" style="width:100%;" placeholder="Search logs&hellip;" />
 
                             <!-- Save Search & Clear Search icon buttons -->
-                            <ins class="icon-rate" ng-if="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()" style="float: left; position: absolute; top: 0; line-height: 32px; right: 160px; color: #fdb45c; cursor: pointer;">&nbsp;</ins>
-                            <ins class="icon-wrong" ng-if="vm.logOptions.filterExpression" ng-click="vm.resetSearch()" style="float: left; position: absolute; top: 0; line-height: 32px; right: 140px; color: #bbbabf; cursor: pointer;">&nbsp;</ins>
+                            <ins class="icon-rate" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()" style="position: absolute; top: 0; line-height: 32px; right: 20px; color: #fdb45c; cursor: pointer;">&nbsp;</ins>
+                            <ins class="icon-wrong" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()" style="position: absolute; top: 0; line-height: 32px; right: 0px; color: #bbbabf; cursor: pointer;">&nbsp;</ins>
 
                             <a class="umb-variant-switcher__toggle ng-scope" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen" style="top:0;">
                                 <span class="ng-binding">Example Searches</span>

From 6a69906fb6139b187b754371b5fd213c30d4ed20 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 28 Mar 2019 17:11:00 +0100
Subject: [PATCH 38/50] Make the "save search" dialog a little prettier

---
 .../common/overlays/logviewersearch/logviewersearch.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
index 464a24517a..8ee9d1aa64 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
@@ -6,6 +6,6 @@
 
     <p>
         <strong>Name:</strong><br/>
-        <input ng-model="model.name" type="text" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0"/>
+        <input style="width: 100%" ng-model="model.name" type="text" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0"/>
     </p>
-</div>
\ No newline at end of file
+</div>

From cea8753ff28a3b6c695ffd10e183c9f4e6fb5e45 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 28 Mar 2019 12:10:59 +0100
Subject: [PATCH 39/50] Replace dynamic ViewBag with ViewData

---
 .../Umbraco/Install/Views/Index.cshtml        |  6 +-
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  4 +-
 .../Umbraco/Views/Default.cshtml              |  4 +-
 .../Editors/BackOfficeController.cs           | 37 ++++------
 .../Install/Controllers/InstallController.cs  |  4 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 src/Umbraco.Web/ViewDataExtensions.cs         | 71 +++++++++++++++++++
 7 files changed, 95 insertions(+), 32 deletions(-)
 create mode 100644 src/Umbraco.Web/ViewDataExtensions.cs

diff --git a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
index 1d397bfd01..e74dbea217 100644
--- a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
@@ -7,7 +7,7 @@
 <!doctype html>
 <html lang="en">
 <head>
-    <base href="@ViewBag.UmbracoBaseFolder/" />
+    <base href="@ViewData.GetUmbracoBaseFolder()/" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -66,8 +66,8 @@
         var Umbraco = {};
         Umbraco.Sys = {};
         Umbraco.Sys.ServerVariables = {
-            "installApiBaseUrl": "@ViewBag.InstallApiBaseUrl",
-            "umbracoBaseUrl": "@ViewBag.UmbracoBaseFolder"
+            "installApiBaseUrl": "@ViewData.GetInstallApiBaseUrl()",
+            "umbracoBaseUrl": "@ViewData.GetUmbracoBaseFolder()"
         };
     </script>
     <script src="lib/lazyload-js/lazyload.min.js"></script>
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index fba9a83789..b7c1e6540c 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -51,7 +51,7 @@
     @{
         var externalLoginUrl = Url.Action("ExternalLogin", "BackOffice", new
         {
-            area = ViewBag.UmbracoPath,
+            area = ViewData.GetUmbracoPath(),
             //Custom redirect URL since we don't want to just redirect to the back office since this is for authing upgrades
             redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
         });
@@ -61,7 +61,7 @@
     <script type="text/javascript">
     document.angularReady = function (app) {
 
-        @Html.AngularValueExternalLoginInfoScript((IEnumerable<string>)ViewBag.ExternalSignInError)
+        @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
         @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
 
     }
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index b6432166c9..790a62f271 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -112,12 +112,12 @@
         on-login="hideLoginScreen()">
     </umb-login>
 
-    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewBag.UmbracoPath }), Model.Features, Current.Configs.Global())
+    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Current.Configs.Global())
 
     <script>
 
         document.angularReady = function(app) {
-            @Html.AngularValueExternalLoginInfoScript((IEnumerable<string>)ViewBag.ExternalSignInError)
+            @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 9add60aade..7ed87c44dd 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -45,10 +45,6 @@ namespace Umbraco.Web.Editors
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
         private BackOfficeSignInManager _signInManager;
 
-        private const string TokenExternalSignInError = "ExternalSignInError";
-        private const string TokenPasswordResetCode = "PasswordResetCode";
-        private static readonly string[] TempDataTokenNames = { TokenExternalSignInError, TokenPasswordResetCode };
-
         public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
         {
@@ -294,13 +290,13 @@ namespace Umbraco.Web.Editors
                 if (result)
                 {
                     //Add a flag and redirect for it to be displayed
-                    TempData[TokenPasswordResetCode] = new ValidatePasswordResetCodeModel { UserId = userId, ResetCode = resetCode };
+                    TempData[ViewDataExtensions.TokenPasswordResetCode] = new ValidatePasswordResetCodeModel { UserId = userId, ResetCode = resetCode };
                     return RedirectToLocal(Url.Action("Default", "BackOffice"));
                 }
             }
 
             //Add error and redirect for it to be displayed
-            TempData[TokenPasswordResetCode] = new[] { Services.TextService.Localize("login/resetCodeExpired") };
+            TempData[ViewDataExtensions.TokenPasswordResetCode] = new[] { Services.TextService.Localize("login/resetCodeExpired") };
             return RedirectToLocal(Url.Action("Default", "BackOffice"));
         }
 
@@ -314,7 +310,7 @@ namespace Umbraco.Web.Editors
             if (loginInfo == null)
             {
                 //Add error and redirect for it to be displayed
-                TempData[TokenExternalSignInError] = new[] { "An error occurred, could not get external login info" };
+                TempData[ViewDataExtensions.TokenExternalSignInError] = new[] { "An error occurred, could not get external login info" };
                 return RedirectToLocal(Url.Action("Default", "BackOffice"));
             }
 
@@ -325,7 +321,7 @@ namespace Umbraco.Web.Editors
             }
 
             //Add errors and redirect for it to be displayed
-            TempData[TokenExternalSignInError] = result.Errors;
+            TempData[ViewDataExtensions.TokenExternalSignInError] = result.Errors;
             return RedirectToLocal(Url.Action("Default", "BackOffice"));
         }
 
@@ -341,17 +337,12 @@ namespace Umbraco.Web.Editors
             if (defaultResponse == null) throw new ArgumentNullException("defaultResponse");
             if (externalSignInResponse == null) throw new ArgumentNullException("externalSignInResponse");
 
-            ViewBag.UmbracoPath = GlobalSettings.GetUmbracoMvcArea();
+            ViewData.SetUmbracoPath(GlobalSettings.GetUmbracoMvcArea());
 
             //check if there is the TempData with the any token name specified, if so, assign to view bag and render the view
-            foreach (var tempDataTokenName in TempDataTokenNames)
-            {
-                if (TempData[tempDataTokenName] != null)
-                {
-                    ViewData[tempDataTokenName] = TempData[tempDataTokenName];
-                    return defaultResponse();
-                }
-            }
+            if (ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) ||
+                ViewData.FromTempData(TempData, ViewDataExtensions.TokenPasswordResetCode))
+                return defaultResponse();
 
             //First check if there's external login info, if there's not proceed as normal
             var loginInfo = await OwinContext.Authentication.GetExternalLoginInfoAsync(
@@ -416,7 +407,7 @@ namespace Umbraco.Web.Editors
             {
                 if (await AutoLinkAndSignInExternalAccount(loginInfo, autoLinkOptions) == false)
                 {
-                    ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to an account" };
+                    ViewData.SetExternalSignInError(new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to an account" });
                 }
 
                 //Remove the cookie otherwise this message will keep appearing
@@ -440,7 +431,7 @@ namespace Umbraco.Web.Editors
             //we are allowing auto-linking/creating of local accounts
             if (loginInfo.Email.IsNullOrWhiteSpace())
             {
-                ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not provided an email address, the account cannot be linked." };
+                ViewData.SetExternalSignInError(new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not provided an email address, the account cannot be linked." });
             }
             else
             {
@@ -448,7 +439,7 @@ namespace Umbraco.Web.Editors
                 var foundByEmail = Services.UserService.GetByEmail(loginInfo.Email);
                 if (foundByEmail != null)
                 {
-                    ViewData[TokenExternalSignInError] = new[] { "A user with this email address already exists locally. You will need to login locally to Umbraco and link this external provider: " + loginInfo.Login.LoginProvider };
+                    ViewData.SetExternalSignInError(new[] { "A user with this email address already exists locally. You will need to login locally to Umbraco and link this external provider: " + loginInfo.Login.LoginProvider });
                 }
                 else
                 {
@@ -477,21 +468,21 @@ namespace Umbraco.Web.Editors
 
                     if (userCreationResult.Succeeded == false)
                     {
-                        ViewData[TokenExternalSignInError] = userCreationResult.Errors;
+                        ViewData.SetExternalSignInError(userCreationResult.Errors);
                     }
                     else
                     {
                         var linkResult = await UserManager.AddLoginAsync(autoLinkUser.Id, loginInfo.Login);
                         if (linkResult.Succeeded == false)
                         {
-                            ViewData[TokenExternalSignInError] = linkResult.Errors;
+                            ViewData.SetExternalSignInError(linkResult.Errors);
 
                             //If this fails, we should really delete the user since it will be in an inconsistent state!
                             var deleteResult = await UserManager.DeleteAsync(autoLinkUser);
                             if (deleteResult.Succeeded == false)
                             {
                                 //DOH! ... this isn't good, combine all errors to be shown
-                                ViewData[TokenExternalSignInError] = linkResult.Errors.Concat(deleteResult.Errors);
+                                ViewData.SetExternalSignInError(linkResult.Errors.Concat(deleteResult.Errors));
                             }
                         }
                         else
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index cd616be8db..f45e7a0ae0 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -60,10 +60,10 @@ namespace Umbraco.Web.Install.Controllers
             }
 
             // gen the install base url
-            ViewBag.InstallApiBaseUrl = Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup");
+            ViewData.SetInstallApiBaseUrl(Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup"));
 
             // get the base umbraco folder
-            ViewBag.UmbracoBaseFolder = IOHelper.ResolveUrl(SystemDirectories.Umbraco);
+            ViewData.SetUmbracoBaseFolder(IOHelper.ResolveUrl(SystemDirectories.Umbraco));
 
             _installHelper.InstallStatus(false, "");
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index aea5d9376a..d0185c9d8d 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -216,6 +216,7 @@
     <Compile Include="Models\TemplateQuery\OperatorFactory.cs" />
     <Compile Include="UmbracoContextFactory.cs" />
     <Compile Include="UmbracoContextReference.cs" />
+    <Compile Include="ViewDataExtensions.cs" />
     <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
     <Compile Include="WebApi\Filters\OnlyLocalRequestsAttribute.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerConfiguration.cs" />
diff --git a/src/Umbraco.Web/ViewDataExtensions.cs b/src/Umbraco.Web/ViewDataExtensions.cs
new file mode 100644
index 0000000000..e47171f1ba
--- /dev/null
+++ b/src/Umbraco.Web/ViewDataExtensions.cs
@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using System.Web.Mvc;
+
+namespace Umbraco.Web
+{
+    public static class ViewDataExtensions
+    {
+        public const string TokenUmbracoPath = "UmbracoPath";
+        public const string TokenInstallApiBaseUrl = "InstallApiBaseUrl";
+        public const string TokenUmbracoBaseFolder = "UmbracoBaseFolder";
+        public const string TokenExternalSignInError = "ExternalSignInError";
+        public const string TokenPasswordResetCode = "PasswordResetCode";
+
+        public static bool FromTempData(this ViewDataDictionary viewData, TempDataDictionary tempData, string token)
+        {
+            if (tempData[token] == null) return false;
+            viewData[token] = tempData[token];
+            return true;
+        }
+
+        public static string GetUmbracoPath(this ViewDataDictionary viewData)
+        {
+            return (string)viewData[TokenUmbracoPath];
+        }
+
+        public static void SetUmbracoPath(this ViewDataDictionary viewData, string value)
+        {
+            viewData[TokenUmbracoPath] = value;
+        }
+
+        public static string GetInstallApiBaseUrl(this ViewDataDictionary viewData)
+        {
+            return (string)viewData[TokenInstallApiBaseUrl];
+        }
+
+        public static void SetInstallApiBaseUrl(this ViewDataDictionary viewData, string value)
+        {
+            viewData[TokenInstallApiBaseUrl] = value;
+        }
+
+        public static string GetUmbracoBaseFolder(this ViewDataDictionary viewData)
+        {
+            return (string)viewData[TokenUmbracoBaseFolder];
+        }
+
+        public static void SetUmbracoBaseFolder(this ViewDataDictionary viewData, string value)
+        {
+            viewData[TokenUmbracoBaseFolder] = value;
+        }
+
+        public static IEnumerable<string> GetExternalSignInError(this ViewDataDictionary viewData)
+        {
+            return (IEnumerable<string>)viewData[TokenExternalSignInError];
+        }
+
+        public static void SetExternalSignInError(this ViewDataDictionary viewData, IEnumerable<string> value)
+        {
+            viewData[TokenExternalSignInError] = value;
+        }
+
+        public static string GetPasswordResetCode(this ViewDataDictionary viewData)
+        {
+            return (string)viewData[TokenPasswordResetCode];
+        }
+
+        public static void SetPasswordResetCode(this ViewDataDictionary viewData, string value)
+        {
+            viewData[TokenPasswordResetCode] = value;
+        }
+    }
+}

From f4bd0cd1f54f7dfe2ebca410ee7c07bb1bc0ffa8 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:06:23 +0000
Subject: [PATCH 40/50] Swapped all `System.Root` string conversions

to use the `System.RootString` constant.

This saves on integer parsing and reduces the number of
new strings being created.

Since the `System.Root` is `-1`, it didn't need the culture invariant
conversion.
---
 src/Umbraco.Core/Models/UserExtensions.cs                 | 6 +++---
 .../Repositories/Implement/ContentTypeRepositoryBase.cs   | 2 +-
 src/Umbraco.Core/Services/Implement/ContentService.cs     | 2 +-
 src/Umbraco.Web/Editors/CodeFileController.cs             | 4 ++--
 src/Umbraco.Web/Models/Trees/TreeRootNode.cs              | 2 +-
 src/Umbraco.Web/Trees/ApplicationTreeController.cs        | 6 +++---
 src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs   | 4 ++--
 src/Umbraco.Web/Trees/ContentTreeController.cs            | 2 +-
 src/Umbraco.Web/Trees/ContentTreeControllerBase.cs        | 8 ++++----
 src/Umbraco.Web/Trees/ContentTypeTreeController.cs        | 2 +-
 src/Umbraco.Web/Trees/DataTypeTreeController.cs           | 2 +-
 src/Umbraco.Web/Trees/DictionaryTreeController.cs         | 4 ++--
 src/Umbraco.Web/Trees/FileSystemTreeController.cs         | 8 ++++----
 src/Umbraco.Web/Trees/MacrosTreeController.cs             | 4 ++--
 src/Umbraco.Web/Trees/MediaTreeController.cs              | 2 +-
 src/Umbraco.Web/Trees/MediaTypeTreeController.cs          | 2 +-
 src/Umbraco.Web/Trees/MemberTreeController.cs             | 4 ++--
 .../Trees/MemberTypeAndGroupTreeControllerBase.cs         | 2 +-
 src/Umbraco.Web/Trees/RelationTypeTreeController.cs       | 4 ++--
 src/Umbraco.Web/Trees/TemplatesTreeController.cs          | 4 ++--
 src/Umbraco.Web/Trees/TreeControllerBase.cs               | 2 +-
 21 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index f9aa1113b3..14f3cdaca8 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -151,7 +151,7 @@ namespace Umbraco.Core.Models
 
         internal static bool HasContentRootAccess(this IUser user, IEntityService entityService)
         {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.Root.ToInvariantString(), user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
         }
 
         internal static bool HasContentBinAccess(this IUser user, IEntityService entityService)
@@ -161,7 +161,7 @@ namespace Umbraco.Core.Models
 
         internal static bool HasMediaRootAccess(this IUser user, IEntityService entityService)
         {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.Root.ToInvariantString(), user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
         }
 
         internal static bool HasMediaBinAccess(this IUser user, IEntityService entityService)
@@ -327,7 +327,7 @@ namespace Umbraco.Core.Models
                 ? entityService.GetAllPaths(objectType, asn).ToDictionary(x => x.Id, x => x.Path)
                 : new Dictionary<int, string>();
 
-            paths[Constants.System.Root] = Constants.System.Root.ToString(); // entityService does not get that one
+            paths[Constants.System.Root] = Constants.System.RootString; // entityService does not get that one
 
             var binPath = GetBinPath(objectType);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index e9b952f11d..924efa1e11 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // move to parent (or -1), update path, save
             moving.ParentId = parentId;
             var movingPath = moving.Path + ","; // save before changing
-            moving.Path = (container == null ? Constants.System.Root.ToString() : container.Path) + "," + moving.Id;
+            moving.Path = (container == null ? Constants.System.RootString : container.Path) + "," + moving.Id;
             moving.Level = container == null ? 1 : container.Level + 1;
             Save(moving);
 
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index f2bef52922..ef1d61d4a8 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -533,7 +533,7 @@ namespace Umbraco.Core.Services.Implement
             //null check otherwise we get exceptions
             if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
 
-            var rootId = Constants.System.Root.ToInvariantString();
+            var rootId = Constants.System.RootString;
             var ids = content.Path.Split(',')
                 .Where(x => x != rootId && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
             if (ids.Any() == false)
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index bd6b837c2c..3f1ffa55d9 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -94,7 +94,7 @@ namespace Umbraco.Web.Editors
 
             // 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
-            if (parentId == Core.Constants.System.Root.ToInvariantString())
+            if (parentId == Core.Constants.System.RootString)
             {
                 parentId = string.Empty;
             }
@@ -276,7 +276,7 @@ namespace Umbraco.Web.Editors
             // Make sure that the root virtual path ends with '/'
             codeFileDisplay.VirtualPath = codeFileDisplay.VirtualPath.EnsureEndsWith("/");
 
-            if (id != Core.Constants.System.Root.ToInvariantString())
+            if (id != Core.Constants.System.RootString)
             {
                 codeFileDisplay.VirtualPath += id.TrimStart("/").EnsureEndsWith("/");
                 //if it's not new then it will have a path, otherwise it won't
diff --git a/src/Umbraco.Web/Models/Trees/TreeRootNode.cs b/src/Umbraco.Web/Models/Trees/TreeRootNode.cs
index 730f6e2962..e26dffe5e4 100644
--- a/src/Umbraco.Web/Models/Trees/TreeRootNode.cs
+++ b/src/Umbraco.Web/Models/Trees/TreeRootNode.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Web.Models.Trees
     [DataContract(Name = "node", Namespace = "")]
     public sealed class TreeRootNode : TreeNode
     {
-        private static readonly string RootId = Core.Constants.System.Root.ToString(CultureInfo.InvariantCulture);
+        private static readonly string RootId = Core.Constants.System.RootString;
         private bool _isGroup;
         private bool _isSingleNodeTree;
 
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 007fd53e60..f0a860496e 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -71,7 +71,7 @@ namespace Umbraco.Web.Trees
                 //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);
+                return TreeRootNode.CreateSingleTreeRoot(Constants.System.RootString, null, null, name, TreeNodeCollection.Empty, true);
             }
 
             // handle request for a specific tree / or when there is only one tree
@@ -114,7 +114,7 @@ namespace Umbraco.Web.Trees
 
                 // 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);
+                return TreeRootNode.CreateSingleTreeRoot(Constants.System.RootString, null, null, name, TreeNodeCollection.Empty, true);
             }
 
             // for many groups
@@ -180,7 +180,7 @@ namespace Umbraco.Web.Trees
             var rootNode = await GetRootNode(tree, querystring);
 
             var sectionRoot = TreeRootNode.CreateSingleTreeRoot(
-                Constants.System.Root.ToInvariantString(),
+                Constants.System.RootString,
                 rootNode.ChildNodesUrl,
                 rootNode.MenuUrl,
                 rootNode.Name,
diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
index 87a707102d..8c23a91d5a 100644
--- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Trees
             var entities = Services.EntityService.GetChildren(Constants.System.Root, UmbracoObjectTypes.DocumentBlueprint).ToArray();
 
             //check if we're rendering the root in which case we'll render the content types that have blueprints
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //get all blueprint content types
                 var contentTypeAliases = entities.Select(x => ((ContentEntitySlim) x).ContentTypeAlias).Distinct();
@@ -91,7 +91,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // root actions
                 menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index b90e1964b8..4249d1639e 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -109,7 +109,7 @@ namespace Umbraco.Web.Trees
 
         protected override MenuItemCollection PerformGetMenuForNode(string id, FormDataCollection queryStrings)
         {
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 var menu = new MenuItemCollection();
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index e521deca40..0c02dd6e46 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -120,7 +120,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            var rootIdString = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
+            var rootIdString = Constants.System.RootString;
             var hasAccessToRoot = UserStartNodes.Contains(Constants.System.Root);
 
             var startNodeId = queryStrings.HasKey(TreeQueryStringParameters.StartNodeId)
@@ -256,7 +256,7 @@ namespace Umbraco.Web.Trees
         protected sealed override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
             //check if we're rendering the root
-            if (id == Constants.System.Root.ToInvariantString() && UserStartNodes.Contains(Constants.System.Root))
+            if (id == Constants.System.RootString && UserStartNodes.Contains(Constants.System.Root))
             {
                 var altStartId = string.Empty;
 
@@ -264,7 +264,7 @@ namespace Umbraco.Web.Trees
                     altStartId = queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId);
 
                 //check if a request has been made to render from a specific start node
-                if (string.IsNullOrEmpty(altStartId) == false && altStartId != "undefined" && altStartId != Constants.System.Root.ToString(CultureInfo.InvariantCulture))
+                if (string.IsNullOrEmpty(altStartId) == false && altStartId != "undefined" && altStartId != Constants.System.RootString)
                 {
                     id = altStartId;
                 }
@@ -272,7 +272,7 @@ namespace Umbraco.Web.Trees
                 var nodes = GetTreeNodesInternal(id, queryStrings);
 
                 //only render the recycle bin if we are not in dialog and the start id id still the root
-                if (IsDialog(queryStrings) == false && id == Constants.System.Root.ToInvariantString())
+                if (IsDialog(queryStrings) == false && id == Constants.System.RootString)
                 {
                     nodes.Add(CreateTreeNode(
                         RecycleBinId.ToInvariantString(),
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 66cb9fe36e..b8374f9d94 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 8a0a83d94f..a9e29697fc 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
index 5f0b7b5df0..3f7b89bcdf 100644
--- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs
+++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Web.Trees
 
             Func<IDictionaryItem, string> ItemSort() => item => item.ItemKey;
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 nodes.AddRange(
                     Services.LocalizationService.GetRootDictionaryItems().OrderBy(ItemSort()).Select(
@@ -104,7 +104,7 @@ namespace Umbraco.Web.Trees
 
             menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
 
-            if (id != Constants.System.Root.ToInvariantString())
+            if (id != Constants.System.RootString)
                 menu.Items.Add<ActionDelete>(Services.TextService, true, opensDialog: true);
 
             menu.Items.Add(new RefreshNode(Services.TextService, true));
diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
index 9aea6e03dd..6e21c8114f 100644
--- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Web.Trees
 
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
-            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.Root.ToInvariantString()
+            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
                 ? HttpUtility.UrlDecode(id).TrimStart("/")
                 : "";
 
@@ -84,7 +84,7 @@ namespace Umbraco.Web.Trees
         {
             var root = base.CreateRootNode(queryStrings);
             //check if there are any children
-            root.HasChildren = GetTreeNodes(Constants.System.Root.ToInvariantString(), queryStrings).Any();
+            root.HasChildren = GetTreeNodes(Constants.System.RootString, queryStrings).Any();
             return root;
         }
 
@@ -139,14 +139,14 @@ namespace Umbraco.Web.Trees
         protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
         {
             //if root node no need to visit the filesystem so lets just create the menu and return it
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 return GetMenuForRootNode(queryStrings);
             }
 
             var menu = new MenuItemCollection();
 
-            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.Root.ToInvariantString()
+            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
                 ? HttpUtility.UrlDecode(id).TrimStart("/")
                 : "";
 
diff --git a/src/Umbraco.Web/Trees/MacrosTreeController.cs b/src/Umbraco.Web/Trees/MacrosTreeController.cs
index 77b13416ff..02636cbea8 100644
--- a/src/Umbraco.Web/Trees/MacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/MacrosTreeController.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 foreach (var macro in Services.MacroService.GetAll())
                 {
@@ -50,7 +50,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //Create the normal create action
                 menu.Items.Add<ActionNew>(Services.TextService);
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index 5797dd930d..fc3d23f092 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -86,7 +86,7 @@ namespace Umbraco.Web.Trees
             //set the default
             menu.DefaultMenuAlias = ActionNew.ActionAlias;
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // if the user's start node is not the root then the only menu item to display is refresh
                 if (UserStartNodes.Contains(Constants.System.Root) == false)
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index 30db2ea12a..bb6b867751 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -65,7 +65,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index 6107540c0c..bb0091af54 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -121,7 +121,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 nodes.Add(
                         CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, Services.TextService.Localize("member/allMembers"), "icon-users", true,
@@ -148,7 +148,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // root actions
                 if (_provider.IsUmbracoMembershipProvider())
diff --git a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
index d3f9ee77c9..5e71266bca 100644
--- a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 // root actions
                 menu.Items.Add(new CreateChildEntity(Services.TextService));
diff --git a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
index 82e07c5226..ab6dd39820 100644
--- a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //Create the normal create action
                 menu.Items.Add<ActionNew>(Services.TextService.Localize("actions", ActionNew.ActionAlias));
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 nodes.AddRange(Services.RelationService.GetAllRelationTypes()
                     .Select(rt => CreateTreeNode(rt.Id.ToString(), id, queryStrings, rt.Name,
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index 916e5d4b4d..601964c30d 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Trees
         {
             var nodes = new TreeNodeCollection();
 
-            var found = id == Constants.System.Root.ToInvariantString()
+            var found = id == Constants.System.RootString
                 ? Services.FileService.GetTemplates(-1)
                 : Services.FileService.GetTemplates(int.Parse(id));
 
@@ -77,7 +77,7 @@ namespace Umbraco.Web.Trees
             var item = menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
             item.NavigateToRoute($"{queryStrings.GetRequiredValue<string>("application")}/templates/edit/{id}?create=true");
 
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.RootString)
             {
                 //refresh action
                 menu.Items.Add(new RefreshNode(Services.TextService, true));
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 4e43e6c093..daa8300b4f 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -173,7 +173,7 @@ namespace Umbraco.Web.Trees
         /// <returns></returns>
         protected virtual TreeNode CreateRootNode(FormDataCollection queryStrings)
         {
-            var rootNodeAsString = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
+            var rootNodeAsString = Constants.System.RootString;
             var currApp = queryStrings.GetValue<string>(TreeQueryStringParameters.Application);
 
             var node = new TreeNode(

From 13564c72ef9342f520001f89f1459fa2a135072c Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:13:38 +0000
Subject: [PATCH 41/50] Replaced hardcoded "-1" with
 `Constants.System.RootString`

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

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index ef1d61d4a8..5e1e0529b6 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1922,7 +1922,7 @@ namespace Umbraco.Core.Services.Implement
             // if uow is not immediate, content.Path will be updated only when the UOW commits,
             // and because we want it now, we have to calculate it by ourselves
             //paths[content.Id] = content.Path;
-            paths[content.Id] = (parent == null ? (parentId == Constants.System.RecycleBinContent ? "-1,-20" : "-1") : parent.Path) + "," + content.Id;
+            paths[content.Id] = (parent == null ? (parentId == Constants.System.RecycleBinContent ? "-1,-20" : Constants.System.RootString) : parent.Path) + "," + content.Id;
 
             const int pageSize = 500;
             var page = 0;

From a4c96678e5abc142f3c973183b5e9b04808d49e9 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:14:27 +0000
Subject: [PATCH 42/50] Swapped `System.RecycleBinContent` string conversions

to use the `System.RecycleBinContentString` constant.

This saves on integer parsing and reduces the number of
new strings being created.

Since the `System.RecycleBinContentString` is `-20`, it didn't
need the culture invariant conversion.
---
 src/Umbraco.Core/Compose/RelateOnTrashComponent.cs | 2 +-
 src/Umbraco.Core/Models/UserExtensions.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
index 501907a6e7..1b32d36a71 100644
--- a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
+++ b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Compose
 
         private static void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
         {
-            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContent.ToInvariantString())))
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContentString)))
             {
                 var relationService = Current.Services.RelationService;
                 const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index 14f3cdaca8..b76f2656ad 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -156,7 +156,7 @@ namespace Umbraco.Core.Models
 
         internal static bool HasContentBinAccess(this IUser user, IEntityService entityService)
         {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinContent.ToInvariantString(), user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinContentString, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
         }
 
         internal static bool HasMediaRootAccess(this IUser user, IEntityService entityService)

From 31e4701487d5c78da2af4145f520b81334ad014d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 29 Mar 2019 13:17:00 +0100
Subject: [PATCH 43/50] Re-style things so the saved searches link is inside
 the input field

---
 .../src/views/logviewer/search.html               | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 e22e8909d1..5981b41598 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
@@ -51,18 +51,19 @@
 
                         <div style="position:relative; width:100%;">
                             <!-- Search/expression filter -->
-                            <input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" style="width:100%;" placeholder="Search logs&hellip;" />
+                            <input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" style="width:100%; padding-right: 160px;" placeholder="Search logs&hellip;" />
 
                             <!-- Save Search & Clear Search icon buttons -->
-                            <ins class="icon-rate" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()" style="position: absolute; top: 0; line-height: 32px; right: 20px; color: #fdb45c; cursor: pointer;">&nbsp;</ins>
-                            <ins class="icon-wrong" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()" style="position: absolute; top: 0; line-height: 32px; right: 0px; color: #bbbabf; cursor: pointer;">&nbsp;</ins>
+                            <ins class="icon-rate" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()" style="position: absolute; top: 0; line-height: 32px; right: 140px; color: #fdb45c; cursor: pointer;">&nbsp;</ins>
+                            <ins class="icon-wrong" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()" style="position: absolute; top: 0; line-height: 32px; right: 120px; color: #bbbabf; cursor: pointer;">&nbsp;</ins>
 
-                            <a class="umb-variant-switcher__toggle ng-scope" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen" style="top:0;">
-                                <span class="ng-binding">Example Searches</span>
-                                <ins class="umb-variant-switcher__expand icon-navigation-down" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</ins>
+                            <!-- Saved Searches -->
+                            <a class="umb-variant-switcher__toggle ng-scope" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen" style="top: 1px; right: 0; position: absolute;">
+                                <span class="ng-binding">Saved Searches</span>
+                                <ins class="umb-variant-switcher__expand icon-navigation-down" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}" style="margin-top: 0;"></ins>
                             </a>
 
-                            <!-- Common Searches Dropdown -->
+                            <!-- Saved Searches Dropdown -->
                             <umb-dropdown ng-if="vm.dropdownOpen"  style="width: 100%; max-height: 250px; overflow-y: scroll; margin-top: -10px;" 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}" ng-repeat="search in vm.searches">
                                     <a href="" class="umb-variant-switcher__name-wrapper" ng-click="vm.selectSearch(search)" prevent-default>

From b44360aa99f33dcd8ae701fbc159c461e4447a5f Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:17:12 +0000
Subject: [PATCH 44/50] Swapped `System.RecycleBinMedia` string conversions

to use the `System.RecycleBinMediaString` constant.

This saves on integer parsing and reduces the number of
new strings being created.

Since the `System.RecycleBinMedia` is `-21`, it didn't
need the culture invariant conversion.
---
 src/Umbraco.Core/Compose/RelateOnTrashComponent.cs | 2 +-
 src/Umbraco.Core/Models/UserExtensions.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
index 1b32d36a71..8371f9b279 100644
--- a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
+++ b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Core.Compose
 
         private static void MediaService_Moved(IMediaService sender, MoveEventArgs<IMedia> e)
         {
-            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMedia.ToInvariantString())))
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMediaString)))
             {
                 var relationService = Current.Services.RelationService;
                 const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index b76f2656ad..0f83cf78a4 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -166,7 +166,7 @@ namespace Umbraco.Core.Models
 
         internal static bool HasMediaBinAccess(this IUser user, IEntityService entityService)
         {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinMedia.ToInvariantString(), user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinMediaString, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
         }
 
         internal static bool HasPathAccess(this IUser user, IContent content, IEntityService entityService)

From 533d2cf8ddf4c312c44dfebf486fd5bd6ae847b0 Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:18:52 +0000
Subject: [PATCH 45/50] Replaced hardcoded "-1" with
 `Constants.System.RootString`

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

diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index a1aea45f11..fa72896239 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -995,7 +995,7 @@ namespace Umbraco.Core.Services.Implement
             // if uow is not immediate, content.Path will be updated only when the UOW commits,
             // and because we want it now, we have to calculate it by ourselves
             //paths[media.Id] = media.Path;
-            paths[media.Id] = (parent == null ? (parentId == Constants.System.RecycleBinMedia ? "-1,-21" : "-1") : parent.Path) + "," + media.Id;
+            paths[media.Id] = (parent == null ? (parentId == Constants.System.RecycleBinMedia ? "-1,-21" : Constants.System.RootString) : parent.Path) + "," + media.Id;
 
             const int pageSize = 500;
             var page = 0;

From 0a687ab7ce59a16960d3c4be3e900c3ec369a4fd Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Fri, 29 Mar 2019 12:26:42 +0000
Subject: [PATCH 46/50] Whitespace formatting in the Constants classes

Also removed unused namespaces.
---
 src/Umbraco.Core/Constants-AppSettings.cs     |   1 -
 src/Umbraco.Core/Constants-Applications.cs    |   4 +-
 src/Umbraco.Core/Constants-Conventions.cs     | 132 +++++++++---------
 src/Umbraco.Core/Constants-Icons.cs           |  12 +-
 src/Umbraco.Core/Constants-Indexes.cs         |   5 +-
 src/Umbraco.Core/Constants-ObjectTypes.cs     |   1 -
 .../Constants-PackageRepository.cs            |   2 +-
 src/Umbraco.Core/Constants-PropertyEditors.cs |   1 -
 src/Umbraco.Core/Constants-Web.cs             |   6 +-
 .../Persistence/Constants-DatabaseSchema.cs   |   2 +-
 src/Umbraco.Core/UdiEntityType.cs             |   2 +-
 11 files changed, 74 insertions(+), 94 deletions(-)

diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index ac0cbde8de..509be46b61 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -93,7 +93,6 @@ namespace Umbraco.Core
             /// </summary>
             public const string DisableElectionForSingleServer = "Umbraco.Core.DisableElectionForSingleServer";
 
-            
             /// <summary>
             /// Debug specific web.config AppSetting keys for Umbraco
             /// </summary>
diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index b53a2b8eaf..cf4f80d87b 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -145,11 +145,11 @@
 
             public const string PartialViewMacros = "partialViewMacros";
 
-			public const string LogViewer = "logViewer";
+            public const string LogViewer = "logViewer";
 
             public static class Groups
             {
-				public const string Settings = "settingsGroup";
+                public const string Settings = "settingsGroup";
 
                 public const string Templating = "templatingGroup";
 
diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
index d49244d9f9..6c9407667a 100644
--- a/src/Umbraco.Core/Constants-Conventions.cs
+++ b/src/Umbraco.Core/Constants-Conventions.cs
@@ -92,10 +92,10 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string Extension = "umbracoExtension";
 
-				/// <summary>
-				/// The default height/width of an image file if the size can't be determined from the metadata
-				/// </summary>
-				public const int DefaultSize = 200;
+                /// <summary>
+                /// The default height/width of an image file if the size can't be determined from the metadata
+                /// </summary>
+                public const int DefaultSize = 200;
             }
 
             /// <summary>
@@ -209,71 +209,71 @@ namespace Umbraco.Core
                 public static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
                 {
                     return new Dictionary<string, PropertyType>
+                    {
                         {
+                            Comments,
+                            new PropertyType(PropertyEditors.Aliases.TextArea, ValueStorageType.Ntext, true, Comments)
                             {
-                                Comments,
-                                new PropertyType(PropertyEditors.Aliases.TextArea, ValueStorageType.Ntext, true, Comments)
-                                    {
-                                        Name = CommentsLabel
-                                    }
-                            },
-                            {
-                                FailedPasswordAttempts,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Integer, true, FailedPasswordAttempts)
-                                    {
-                                        Name = FailedPasswordAttemptsLabel
-                                    }
-                            },
-                            {
-                                IsApproved,
-                                new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsApproved)
-                                    {
-                                        Name = IsApprovedLabel
-                                    }
-                            },
-                            {
-                                IsLockedOut,
-                                new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsLockedOut)
-                                    {
-                                        Name = IsLockedOutLabel
-                                    }
-                            },
-                            {
-                                LastLockoutDate,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLockoutDate)
-                                    {
-                                        Name = LastLockoutDateLabel
-                                    }
-                            },
-                            {
-                                LastLoginDate,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLoginDate)
-                                    {
-                                        Name = LastLoginDateLabel
-                                    }
-                            },
-                            {
-                                LastPasswordChangeDate,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastPasswordChangeDate)
-                                    {
-                                        Name = LastPasswordChangeDateLabel
-                                    }
-                            },
-                            {
-                                PasswordAnswer,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordAnswer)
-                                    {
-                                        Name = PasswordAnswerLabel
-                                    }
-                            },
-                            {
-                                PasswordQuestion,
-                                new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordQuestion)
-                                    {
-                                        Name = PasswordQuestionLabel
-                                    }
+                                Name = CommentsLabel
                             }
-                        };
+                        },
+                        {
+                            FailedPasswordAttempts,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Integer, true, FailedPasswordAttempts)
+                            {
+                                Name = FailedPasswordAttemptsLabel
+                            }
+                        },
+                        {
+                            IsApproved,
+                            new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsApproved)
+                            {
+                                Name = IsApprovedLabel
+                            }
+                        },
+                        {
+                            IsLockedOut,
+                            new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsLockedOut)
+                            {
+                                Name = IsLockedOutLabel
+                            }
+                        },
+                        {
+                            LastLockoutDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLockoutDate)
+                            {
+                                Name = LastLockoutDateLabel
+                            }
+                        },
+                        {
+                            LastLoginDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLoginDate)
+                            {
+                                Name = LastLoginDateLabel
+                            }
+                        },
+                        {
+                            LastPasswordChangeDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastPasswordChangeDate)
+                            {
+                                Name = LastPasswordChangeDateLabel
+                            }
+                        },
+                        {
+                            PasswordAnswer,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordAnswer)
+                            {
+                                Name = PasswordAnswerLabel
+                            }
+                        },
+                        {
+                            PasswordQuestion,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordQuestion)
+                            {
+                                Name = PasswordQuestionLabel
+                            }
+                        }
+                    };
                 }
             }
 
diff --git a/src/Umbraco.Core/Constants-Icons.cs b/src/Umbraco.Core/Constants-Icons.cs
index f74b44b70b..d3e8b4ad3b 100644
--- a/src/Umbraco.Core/Constants-Icons.cs
+++ b/src/Umbraco.Core/Constants-Icons.cs
@@ -1,17 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
     public static partial class Constants
     {
         public static class Icons
         {
-
-
             /// <summary>
             /// System contenttype icon
             /// </summary>
@@ -42,12 +34,10 @@ namespace Umbraco.Core
             /// </summary>
             public const string MemberType = "icon-users";
 
-
             /// <summary>
             /// System member icon
             /// </summary>
             public const string Template = "icon-layout";
-
         }
     }
 }
diff --git a/src/Umbraco.Core/Constants-Indexes.cs b/src/Umbraco.Core/Constants-Indexes.cs
index c73a170b62..1add0f721b 100644
--- a/src/Umbraco.Core/Constants-Indexes.cs
+++ b/src/Umbraco.Core/Constants-Indexes.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
     public static partial class Constants
     {
diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs
index 4bf944e1e1..9a6a1a0632 100644
--- a/src/Umbraco.Core/Constants-ObjectTypes.cs
+++ b/src/Umbraco.Core/Constants-ObjectTypes.cs
@@ -123,7 +123,6 @@ namespace Umbraco.Core
             public static readonly Guid Template = new Guid(Strings.Template);
 
             public static readonly Guid ContentItem = new Guid(Strings.ContentItem);
-
         }
     }
 }
diff --git a/src/Umbraco.Core/Constants-PackageRepository.cs b/src/Umbraco.Core/Constants-PackageRepository.cs
index 59005b3e2c..42cf61f982 100644
--- a/src/Umbraco.Core/Constants-PackageRepository.cs
+++ b/src/Umbraco.Core/Constants-PackageRepository.cs
@@ -3,7 +3,7 @@
     public static partial class Constants
     {
         /// <summary>
-        ///     Defines the constants used for the Umbraco package repository
+        /// Defines the constants used for the Umbraco package repository
         /// </summary>
         public static class PackageRepository
         {
diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 32f9407616..0c2e246721 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -34,7 +34,6 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string ContentPicker = "Umbraco.ContentPicker";
 
-   
                 /// <summary>
                 /// DateTime.
                 /// </summary>
diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 0da5431e91..64216ba571 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
     public static partial class Constants
     {
@@ -22,7 +19,6 @@ namespace Umbraco.Core
             public const string PreviewCookieName = "UMB_PREVIEW";
 
             public const string InstallerCookieName = "umb_installId";
-
         }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
index b62a99ce83..272158551d 100644
--- a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
+++ b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Core
 
                 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 + "Audit";
diff --git a/src/Umbraco.Core/UdiEntityType.cs b/src/Umbraco.Core/UdiEntityType.cs
index 86197ce6a8..75a137bd2e 100644
--- a/src/Umbraco.Core/UdiEntityType.cs
+++ b/src/Umbraco.Core/UdiEntityType.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core
 
             internal static Dictionary<string, UdiType> GetTypes()
             {
-                return new Dictionary<string,UdiType>
+                return new Dictionary<string, UdiType>
                 {
                     { Unknown, UdiType.Unknown },
 

From 043f4f3d02cfd000a799b93e412858b481ead139 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Apr 2019 14:20:47 +1100
Subject: [PATCH 47/50] Revert "Merge remote-tracking branch 'origin/v8/8.0'
 into temp8-4011"

This reverts commit e73cf590b7f7af8f6f31cb495fca11a7964965b3, reversing
changes made to 89903a633b2762dd6da017a53d05963a76a6886c.
---
 build/NuSpecs/UmbracoCms.Core.nuspec          |   2 +-
 build/NuSpecs/UmbracoCms.Web.nuspec           |   2 +-
 build/NuSpecs/UmbracoCms.nuspec               |   2 +-
 .../Scoping/ScopeContextualBase.cs            |  38 +--
 .../Services/Implement/ContentService.cs      |   9 +-
 .../Cache/SnapDictionaryTests.cs              | 240 ++----------------
 .../validation/valpropertymsg.directive.js    |  11 +-
 .../src/preview/preview.controller.js         |   7 +-
 .../content.assigndomain.controller.js        |   3 +-
 .../MediaPickerValueConverter.cs              |  58 ++---
 .../PublishedCache/NuCache/ContentStore.cs    | 113 ++++++---
 .../NuCache/PublishedSnapshotService.cs       |  54 ++--
 .../PublishedCache/NuCache/Snap/GenObj.cs     |  37 ---
 .../PublishedCache/NuCache/Snap/GenRef.cs     |  13 -
 .../PublishedCache/NuCache/Snap/LinkedNode.cs |  20 --
 .../PublishedCache/NuCache/SnapDictionary.cs  | 218 +++++++++-------
 src/Umbraco.Web/Umbraco.Web.csproj            |   3 -
 17 files changed, 298 insertions(+), 532 deletions(-)
 delete mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
 delete mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
 delete mode 100644 src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 11b1870b90..b257f8dcdd 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="4.6.0">
         <id>UmbracoCms.Core</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index e81c199288..79113a7c94 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="4.6.0">
         <id>UmbracoCms.Web</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index c93a82c691..8ec1484452 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="4.6.0">
         <id>UmbracoCms</id>
         <version>8.0.0</version>
         <title>Umbraco Cms</title>
diff --git a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
index 25f176d471..7461142234 100644
--- a/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
+++ b/src/Umbraco.Core/Scoping/ScopeContextualBase.cs
@@ -2,61 +2,39 @@
 
 namespace Umbraco.Core.Scoping
 {
-    /// <summary>
-    /// Provides a base class for scope contextual objects.
-    /// </summary>
-    /// <remarks>
-    /// <para>A scope contextual object is enlisted in the current scope context,
-    /// if any, and released when the context exists. It must be used in a 'using'
-    /// block, and will be released when disposed, if not part of a scope.</para>
-    /// </remarks>
+    // base class for an object that will be enlisted in scope context, if any. it
+    // must be used in a 'using' block, and if not scoped, released when disposed,
+    // else when scope context runs enlisted actions
     public abstract class ScopeContextualBase : IDisposable
     {
-        private bool _scoped;
+        private bool _using, _scoped;
 
-        /// <summary>
-        /// Gets a contextual object.
-        /// </summary>
-        /// <typeparam name="T">The type of the object.</typeparam>
-        /// <param name="scopeProvider">A scope provider.</param>
-        /// <param name="key">A context key for the object.</param>
-        /// <param name="ctor">A function producing the contextual object.</param>
-        /// <returns>The contextual object.</returns>
-        /// <remarks>
-        /// <para></para>
-        /// </remarks>
         public static T Get<T>(IScopeProvider scopeProvider, string key, Func<bool, T> ctor)
             where T : ScopeContextualBase
         {
-            // no scope context = create a non-scoped object
             var scopeContext = scopeProvider.Context;
             if (scopeContext == null)
                 return ctor(false);
 
-            // create & enlist the scoped object
             var w = scopeContext.Enlist("ScopeContextualBase_" + key,
                 () => ctor(true),
                 (completed, item) => { item.Release(completed); });
 
+            if (w._using) throw new InvalidOperationException("panic: used.");
+            w._using = true;
             w._scoped = true;
 
             return w;
         }
 
-        /// <inheritdoc />
-        /// <remarks>
-        /// <para>If not scoped, then this releases the contextual object.</para>
-        /// </remarks>
         public void Dispose()
         {
+            _using = false;
+
             if (_scoped == false)
                 Release(true);
         }
 
-        /// <summary>
-        /// Releases the contextual object.
-        /// </summary>
-        /// <param name="completed">A value indicating whether the scoped operation completed.</param>
         public abstract void Release(bool completed);
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index f2bef52922..cc962fbe22 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -2875,14 +2875,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 foreach (var property in blueprint.Properties)
                 {
-                    if (property.PropertyType.VariesByCulture())
-                    {
-                        content.SetValue(property.Alias, property.GetValue(culture), culture);
-                    }
-                    else
-                    {
-                        content.SetValue(property.Alias, property.GetValue());
-                    }
+                    content.SetValue(property.Alias, property.GetValue(culture), culture);
                 }
 
                 content.Name = blueprint.Name;
diff --git a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
index b435af9e77..013dbadbb8 100644
--- a/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
+++ b/src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
@@ -5,7 +5,6 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Scoping;
 using Umbraco.Web.PublishedCache.NuCache;
-using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Tests.Cache
 {
@@ -389,7 +388,8 @@ namespace Umbraco.Tests.Cache
             // collect liveGen
             GC.Collect();
 
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out var genObj));
+            SnapDictionary<int, string>.GenerationObject genObj;
+            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
             genObj = null;
 
             // in Release mode, it works, but in Debug mode, the weak reference is still alive
@@ -399,14 +399,14 @@ namespace Umbraco.Tests.Cache
             GC.Collect();
 #endif
 
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
-            Assert.IsFalse(genObj.WeakGenRef.IsAlive); // snapshot is gone, along with its reference
+            Assert.IsTrue(d.Test.GenerationObjects.TryPeek(out genObj));
+            Assert.IsFalse(genObj.WeakReference.IsAlive); // snapshot is gone, along with its reference
 
             await d.CollectAsync();
 
             Assert.AreEqual(0, d.Test.GetValues(1).Length); // null value is gone
             Assert.AreEqual(0, d.Count); // item is gone
-            Assert.AreEqual(0, d.Test.GenObjs.Count);
+            Assert.AreEqual(0, d.Test.GenerationObjects.Count);
             Assert.AreEqual(0, d.SnapCount); // snapshot is gone
             Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
         }
@@ -632,7 +632,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(1, d.Test.LiveGen);
             Assert.IsTrue(d.Test.NextGen);
 
-            using (d.GetScopedWriteLock(GetScopeProvider()))
+            using (d.GetWriter(GetScopeProvider()))
             {
                 var s1 = d.CreateSnapshot();
 
@@ -685,7 +685,7 @@ namespace Umbraco.Tests.Cache
             Assert.IsFalse(d.Test.NextGen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            using (d.GetScopedWriteLock(GetScopeProvider()))
+            using (d.GetWriter(GetScopeProvider()))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -712,102 +712,16 @@ namespace Umbraco.Tests.Cache
         }
 
         [Test]
-        public void NestedWriteLocking1()
-        {
-            var d = new SnapDictionary<int, string>();
-            var t = d.Test;
-            t.CollectAuto = false;
-
-            Assert.AreEqual(0, d.CreateSnapshot().Gen);
-
-            // no scope context: writers nest, last one to be disposed commits
-
-            var scopeProvider = GetScopeProvider();
-
-            using (var w1 = d.GetScopedWriteLock(scopeProvider))
-            {
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.AreEqual(1, t.WLocked);
-                Assert.IsTrue(t.NextGen);
-
-                using (var w2 = d.GetScopedWriteLock(scopeProvider))
-                {
-                    Assert.AreEqual(1, t.LiveGen);
-                    Assert.AreEqual(2, t.WLocked);
-                    Assert.IsTrue(t.NextGen);
-
-                    Assert.AreNotSame(w1, w2); // get a new writer each time
-
-                    d.Set(1, "one");
-
-                    Assert.AreEqual(0, d.CreateSnapshot().Gen);
-                }
-
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.AreEqual(1, t.WLocked);
-                Assert.IsTrue(t.NextGen);
-
-                Assert.AreEqual(0, d.CreateSnapshot().Gen);
-            }
-
-            Assert.AreEqual(1, t.LiveGen);
-            Assert.AreEqual(0, t.WLocked);
-            Assert.IsTrue(t.NextGen);
-
-            Assert.AreEqual(1, d.CreateSnapshot().Gen);
-        }
-
-        [Test]
-        public void NestedWriteLocking2()
+        public void NestedWriteLocking()
         {
             var d = new SnapDictionary<int, string>();
             d.Test.CollectAuto = false;
 
-            Assert.AreEqual(0, d.CreateSnapshot().Gen);
-
-            // scope context: writers enlist
-
-            var scopeContext = new ScopeContext();
-            var scopeProvider = GetScopeProvider(scopeContext);
-
-            using (var w1 = d.GetScopedWriteLock(scopeProvider))
+            var scopeProvider = GetScopeProvider();
+            using (d.GetWriter(scopeProvider))
             {
-                using (var w2 = d.GetScopedWriteLock(scopeProvider))
+                using (d.GetWriter(scopeProvider))
                 {
-                    Assert.AreSame(w1, w2);
-
-                    d.Set(1, "one");
-                }
-            }
-        }
-
-        [Test]
-        public void NestedWriteLocking3()
-        {
-            var d = new SnapDictionary<int, string>();
-            var t = d.Test;
-            t.CollectAuto = false;
-
-            Assert.AreEqual(0, d.CreateSnapshot().Gen);
-
-            var scopeContext = new ScopeContext();
-            var scopeProvider1 = GetScopeProvider();
-            var scopeProvider2 = GetScopeProvider(scopeContext);
-
-            using (var w1 = d.GetScopedWriteLock(scopeProvider1))
-            {
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.AreEqual(1, t.WLocked);
-                Assert.IsTrue(t.NextGen);
-
-                using (var w2 = d.GetScopedWriteLock(scopeProvider2))
-                {
-                    Assert.AreEqual(1, t.LiveGen);
-                    Assert.AreEqual(2, t.WLocked);
-                    Assert.IsTrue(t.NextGen);
-
-                    Assert.AreNotSame(w1, w2);
-
                     d.Set(1, "one");
                 }
             }
@@ -850,7 +764,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetScopedWriteLock(scopeProvider))
+            using (d.GetWriter(scopeProvider))
             {
                 // gen 3
                 Assert.AreEqual(2, d.Test.GetValues(1).Length);
@@ -895,7 +809,7 @@ namespace Umbraco.Tests.Cache
 
             var scopeProvider = GetScopeProvider();
 
-            using (d.GetScopedWriteLock(scopeProvider))
+            using (d.GetWriter(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -932,10 +846,9 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            var scopeContext = new ScopeContext();
-            var scopeProvider = GetScopeProvider(scopeContext);
+            var scopeProvider = GetScopeProvider(true);
 
-            using (d.GetScopedWriteLock(scopeProvider))
+            using (d.GetWriter(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -954,7 +867,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
-            scopeContext.ScopeExit(true);
+            ((ScopeContext) scopeProvider.Context).ScopeExit(true);
 
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(3, s5.Gen);
@@ -965,8 +878,7 @@ namespace Umbraco.Tests.Cache
         public void ScopeLocking2()
         {
             var d = new SnapDictionary<int, string>();
-            var t = d.Test;
-            t.CollectAuto = false;
+            d.Test.CollectAuto = false;
 
             // gen 1
             d.Set(1, "one");
@@ -979,13 +891,12 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(2, s2.Gen);
             Assert.AreEqual("uno", s2.Get(1));
 
-            Assert.AreEqual(2, t.LiveGen);
-            Assert.IsFalse(t.NextGen);
-
+            var scopeProviderMock = new Mock<IScopeProvider>();
             var scopeContext = new ScopeContext();
-            var scopeProvider = GetScopeProvider(scopeContext);
+            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
+            var scopeProvider = scopeProviderMock.Object;
 
-            using (d.GetScopedWriteLock(scopeProvider))
+            using (d.GetWriter(scopeProvider))
             {
                 // creating a snapshot in a write-lock does NOT return the "current" content
                 // it uses the previous snapshot, so new snapshot created only on release
@@ -994,35 +905,18 @@ namespace Umbraco.Tests.Cache
                 Assert.AreEqual(2, s3.Gen);
                 Assert.AreEqual("uno", s3.Get(1));
 
-                // we made some changes, so a next gen is required
-                Assert.AreEqual(3, t.LiveGen);
-                Assert.IsTrue(t.NextGen);
-                Assert.AreEqual(1, t.WLocked);
-
                 // but live snapshot contains changes
-                var ls = t.LiveSnapshot;
+                var ls = d.Test.LiveSnapshot;
                 Assert.AreEqual("ein", ls.Get(1));
                 Assert.AreEqual(3, ls.Gen);
             }
 
-            // nothing is committed until scope exits
-            Assert.AreEqual(3, t.LiveGen);
-            Assert.IsTrue(t.NextGen);
-            Assert.AreEqual(1, t.WLocked);
-
-            // no changes until exit
             var s4 = d.CreateSnapshot();
             Assert.AreEqual(2, s4.Gen);
             Assert.AreEqual("uno", s4.Get(1));
 
             scopeContext.ScopeExit(false);
 
-            // now things have changed
-            Assert.AreEqual(2, t.LiveGen);
-            Assert.IsFalse(t.NextGen);
-            Assert.AreEqual(0, t.WLocked);
-
-            // no changes since not completed
             var s5 = d.CreateSnapshot();
             Assert.AreEqual(2, s5.Gen);
             Assert.AreEqual("uno", s5.Get(1));
@@ -1061,92 +955,12 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual("four", all[3]);
         }
 
-        [Test]
-        public void DontPanic()
+        private IScopeProvider GetScopeProvider(bool withContext = false)
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            Assert.IsNull(d.Test.GenObj);
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNull(d.Test.GenObj);
-
-            var s1 = d.CreateSnapshot();
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(1, d.Test.GenObj.Gen);
-
-            Assert.AreEqual(1, s1.Gen);
-            Assert.AreEqual("one", s1.Get(1));
-
-            d.Set(1, "uno");
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(1, d.Test.GenObj.Gen);
-
-            var scopeContext = new ScopeContext();
-            var scopeProvider = GetScopeProvider(scopeContext);
-
-            // scopeProvider.Context == scopeContext -> writer is scoped
-            // writer is scope contextual and scoped
-            //  when disposed, nothing happens
-            //  when the context exists, the writer is released
-            using (d.GetScopedWriteLock(scopeProvider))
-            {
-                d.Set(1, "ein");
-                Assert.IsTrue(d.Test.NextGen);
-                Assert.AreEqual(3, d.Test.LiveGen);
-                Assert.IsNotNull(d.Test.GenObj);
-                Assert.AreEqual(2, d.Test.GenObj.Gen);
-            }
-
-            // writer has not released
-            Assert.AreEqual(1, d.Test.WLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-
-            // nothing changed
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-
-            // panic!
-            var s2 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, d.Test.WLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            // release writer
-            scopeContext.ScopeExit(true);
-
-            Assert.AreEqual(0, d.Test.WLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            var s3 = d.CreateSnapshot();
-
-            Assert.AreEqual(0, d.Test.WLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(3, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-        }
-
-        private IScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
-        {
-            var scopeProvider = Mock.Of<IScopeProvider>();
-            Mock.Get(scopeProvider)
-                .Setup(x => x.Context).Returns(scopeContext);
+            var scopeProviderMock = new Mock<IScopeProvider>();
+            var scopeContext = withContext ? new ScopeContext() : null;
+            scopeProviderMock.Setup(x => x.Context).Returns(scopeContext);
+            var scopeProvider = scopeProviderMock.Object;
             return scopeProvider;
         }
     }
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 c027e0778e..9ee83dc2ba 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
@@ -62,8 +62,8 @@ function valPropertyMsg(serverValidationManager) {
                 if (!watcher) {
                     watcher = scope.$watch("currentProperty.value",
                         function (newValue, oldValue) {
-                            
-                            if (angular.equals(newValue, oldValue)) {
+
+                            if (!newValue || angular.equals(newValue, oldValue)) {
                                 return;
                             }
 
@@ -78,12 +78,10 @@ function valPropertyMsg(serverValidationManager) {
                             // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
                             // is the only one, then we'll clear.
 
-                            if (errCount === 0 || (errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
+                            if ((errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
                                 scope.errorMsg = "";
                                 formCtrl.$setValidity('valPropertyMsg', true);
-                            } else if (showValidation && scope.errorMsg === "") {
-                                formCtrl.$setValidity('valPropertyMsg', false);
-                                scope.errorMsg = getErrorMsg();
+                                stopWatch();
                             }
                         }, true);
                 }
@@ -154,7 +152,6 @@ function valPropertyMsg(serverValidationManager) {
                 showValidation = true;
                 if (hasError && scope.errorMsg === "") {
                     scope.errorMsg = getErrorMsg();
-                    startWatch();
                 }
                 else if (!hasError) {
                     scope.errorMsg = "";
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 4733c58556..7d6584d2f1 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -113,12 +113,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         $scope.exitPreview = function () {
 
             var culture = $location.search().culture || getParameterByName("culture");
-            var relativeUrl = "/" +  $scope.pageId;
-            
-            if(culture){
-                relativeUrl +='?culture='+ culture;
-            }
-            
+            var relativeUrl = "/" +  $scope.pageId +'?culture='+ culture;
             window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
         };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
index 5fa1eebd0b..0f27f3046c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
@@ -46,7 +46,8 @@
 
                     if (data.language !== "undefined") {
                         var lang = vm.languages.filter(function (l) {
-                            return matchLanguageById(l, data.language);
+                            return matchLanguageById(l, data.language.Id);
+
                         });
                         if (lang.length > 0) {
                             vm.language = lang[0];
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
index fb3134c9a3..802f42ed9e 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
@@ -15,18 +14,11 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
     [DefaultPropertyValueConverter]
     public class MediaPickerValueConverter : PropertyValueConverterBase
     {
-        // hard-coding "image" here but that's how it works at UI level too
-        private const string ImageTypeAlias = "image";
-
-        private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
 
-        public MediaPickerValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor,
-            IPublishedModelFactory publishedModelFactory)
+        public MediaPickerValueConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor)
         {
-            _publishedSnapshotAccessor = publishedSnapshotAccessor ??
-                                         throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
-            _publishedModelFactory = publishedModelFactory;
+            _publishedSnapshotAccessor = publishedSnapshotAccessor ?? throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
         }
 
         public override bool IsConverter(PublishedPropertyType propertyType)
@@ -39,19 +31,15 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             var isMultiple = IsMultipleDataType(propertyType.DataType);
             var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
 
+            // hard-coding "image" here but that's how it works at UI level too
+
             return isMultiple
-                ? isOnlyImages
-                    ? typeof(IEnumerable<>).MakeGenericType(ModelType.For(ImageTypeAlias))
-                    : typeof(IEnumerable<IPublishedContent>)
-                : isOnlyImages
-                    ? ModelType.For(ImageTypeAlias)
-                    : typeof(IPublishedContent);
+                ? (isOnlyImages ? typeof(IEnumerable<>).MakeGenericType(ModelType.For("image")) : typeof(IEnumerable<IPublishedContent>))
+                : (isOnlyImages ? ModelType.For("image") : typeof(IPublishedContent));
         }
 
         public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType)
-        {
-            return PropertyCacheLevel.Snapshot;
-        }
+            => PropertyCacheLevel.Snapshot;
 
         private bool IsMultipleDataType(PublishedDataType dataType)
         {
@@ -65,31 +53,26 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return config.OnlyImages;
         }
 
-        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType,
-            object source, bool preview)
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
         {
             if (source == null) return null;
 
             var nodeIds = source.ToString()
-                .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
+                .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
                 .Select(Udi.Parse)
                 .ToArray();
             return nodeIds;
         }
 
-        public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType,
-            PropertyCacheLevel cacheLevel, object source, bool preview)
+        public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel cacheLevel, object source, bool preview)
         {
-            var isMultiple = IsMultipleDataType(propertyType.DataType);
-            var isOnlyImages = IsOnlyImagesDataType(propertyType.DataType);
-
-            var udis = (Udi[]) source;
-            var mediaItems = isOnlyImages
-                ? _publishedModelFactory.CreateModelList(ImageTypeAlias)
-                : new List<IPublishedContent>();
-
-            if (source == null) return isMultiple ? mediaItems : null;
+            if (source == null)
+            {
+                return null;
+            }
 
+            var udis = (Udi[])source;
+            var mediaItems = new List<IPublishedContent>();
             if (udis.Any())
             {
                 foreach (var udi in udis)
@@ -101,15 +84,12 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                         mediaItems.Add(item);
                 }
 
-                return isMultiple ? mediaItems : FirstOrDefault(mediaItems);
+                if (IsMultipleDataType(propertyType.DataType))
+                    return mediaItems;
+                return mediaItems.FirstOrDefault();
             }
 
             return source;
         }
-
-        private object FirstOrDefault(IList mediaItems)
-        {
-            return mediaItems.Count == 0 ? null : mediaItems[0];
-        }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index 7ab4a64f31..b3996050a6 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -8,7 +8,6 @@ using CSharpTest.Net.Collections;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Scoping;
-using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -30,8 +29,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private readonly ILogger _logger;
         private BPlusTree<int, ContentNodeKit> _localDb;
-        private readonly ConcurrentQueue<GenObj> _genObjs;
-        private GenObj _genObj;
+        private readonly ConcurrentQueue<GenRefRef> _genRefRefs;
+        private GenRefRef _genRefRef;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -65,8 +64,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _contentTypesByAlias = new ConcurrentDictionary<string, LinkedNode<PublishedContentType>>(StringComparer.InvariantCultureIgnoreCase);
             _xmap = new ConcurrentDictionary<Guid, int>();
 
-            _genObjs = new ConcurrentQueue<GenObj>();
-            _genObj = null; // no initial gen exists
+            _genRefRefs = new ConcurrentQueue<GenRefRef>();
+            _genRefRef = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -92,13 +91,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class ScopedWriteLock : ScopeContextualBase
+        private class ContentStoreWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private readonly ContentStore _store;
-            private int _released;
+            private ContentStore _store;
 
-            public ScopedWriteLock(ContentStore store, bool scoped)
+            public ContentStoreWriter(ContentStore store, bool scoped)
             {
                 _store = store;
                 store.Lock(_lockinfo, scoped);
@@ -106,17 +104,17 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
-                    return;
+                if (_store== null) return;
                 _store.Release(_lockinfo, completed);
+                _store = null;
             }
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
         // TODO: GetScopedWriter? should the dict have a ref onto the scope provider?
-        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
+        public IDisposable GetWriter(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ContentStoreWriter(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -133,14 +131,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     _wlocked++;
                     lockInfo.Count = true;
-                    if (_nextGen == false || (forceGen && _wlocked == 1))
+                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        if (_nextGen)
-                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
-                        _liveGen += 1;
                         _nextGen = true;
+                        _liveGen += 1;
                     }
                 }
             }
@@ -216,6 +212,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 else
                     dictionary.TryUpdate(key, link.Next, link);
             }
+
         }
 
         #endregion
@@ -839,8 +836,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
-                if (_nextGen == false && _genObj != null)
-                    return new Snapshot(this, _genObj.GetGenRef()
+                if (_nextGen == false && _genRefRef != null)
+                    return new Snapshot(this, _genRefRef.GetGenRef()
 #if DEBUG
                         , _logger
 #endif
@@ -855,15 +852,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
                     // create a new gen ref unless we already have it
-                    if (_genObj == null)
-                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
-                    else if (_genObj.Gen != snapGen)
+                    if (_genRefRef == null)
+                        _genRefRefs.Enqueue(_genRefRef = new GenRefRef(snapGen));
+                    else if (_genRefRef.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
                     // not write-locked, can use latest gen, create a new gen ref
-                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                    _genRefRefs.Enqueue(_genRefRef = new GenRefRef(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
@@ -876,7 +873,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _genObj.GetGenRef()
+                var snapshot = new Snapshot(this, _genRefRef.GetGenRef()
 #if DEBUG
                     , _logger
 #endif
@@ -933,10 +930,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
 #if DEBUG
             _logger.Debug<ContentStore>("Collect.");
 #endif
-            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
+            while (_genRefRefs.TryPeek(out GenRefRef genRefRef) && (genRefRef.Count == 0 || genRefRef.WGenRef.IsAlive == false))
             {
-                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
-                _floorGen = genObj.Gen;
+                _genRefRefs.TryDequeue(out genRefRef); // cannot fail since TryPeek has succeeded
+                _floorGen = genRefRef.Gen;
 #if DEBUG
                 //_logger.Debug<ContentStore>("_floorGen=" + _floorGen + ", _liveGen=" + _liveGen);
 #endif
@@ -1012,9 +1009,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 await task;
         }
 
-        public long GenCount => _genObjs.Count;
+        public long GenCount => _genRefRefs.Count;
 
-        public long SnapCount => _genObjs.Sum(x => x.Count);
+        public long SnapCount => _genRefRefs.Sum(x => x.Count);
 
         #endregion
 
@@ -1064,6 +1061,24 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
+        private class LinkedNode<TValue>
+            where TValue: class
+        {
+            public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
+            {
+                Value = value;
+                Gen = gen;
+                Next = next;
+            }
+
+            internal readonly long Gen;
+
+            // reading & writing references is thread-safe on all .NET platforms
+            // mark as volatile to ensure we always read the correct value
+            internal volatile TValue Value;
+            internal volatile LinkedNode<TValue> Next;
+        }
+
         public class Snapshot : IDisposable
         {
             private readonly ContentStore _store;
@@ -1085,7 +1100,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _store = store;
                 _genRef = genRef;
                 _gen = genRef.Gen;
-                Interlocked.Increment(ref genRef.GenObj.Count);
+                Interlocked.Increment(ref genRef.GenRefRef.Count);
                 //_thisCount = _count++;
 
 #if DEBUG
@@ -1186,15 +1201,49 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 if (_gen < 0) return;
 #if DEBUG
-                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenObj.Count.ToString() ?? "live");
+                _logger.Debug<Snapshot>("Dispose snapshot ({Snapshot})", _genRef?.GenRefRef.Count.ToString() ?? "live");
 #endif
                 _gen = -1;
                 if (_genRef != null)
-                    Interlocked.Decrement(ref _genRef.GenObj.Count);
+                    Interlocked.Decrement(ref _genRef.GenRefRef.Count);
                 GC.SuppressFinalize(this);
             }
         }
 
+        internal class GenRefRef
+        {
+            public GenRefRef(long gen)
+            {
+                Gen = gen;
+                WGenRef = new WeakReference(null);
+            }
+
+            public GenRef GetGenRef()
+            {
+                // not thread-safe but always invoked from within a lock
+                var genRef = (GenRef) WGenRef.Target;
+                if (genRef == null)
+                    WGenRef.Target = genRef = new GenRef(this, Gen);
+                return genRef;
+            }
+
+            public readonly long Gen;
+            public readonly WeakReference WGenRef;
+            public int Count;
+        }
+
+        internal class GenRef
+        {
+            public GenRef(GenRefRef genRefRef, long gen)
+            {
+                GenRefRef = genRefRef;
+                Gen = gen;
+            }
+
+            public readonly GenRefRef GenRefRef;
+            public readonly long Gen;
+        }
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 9c5587fbd5..e19531a25b 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -330,15 +330,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadContent(Action<IScope> action)
         {
-            // first get a writer, then a scope
-            // if there already is a scope, the writer will attach to it
-            // otherwise, it will only exist here - cheap
-            using (_contentStore.GetScopedWriteLock(_scopeProvider))
-            using (var scope = _scopeProvider.CreateScope())
+            using (_contentStore.GetWriter(_scopeProvider))
             {
-                scope.ReadLock(Constants.Locks.ContentTree);
-                action(scope);
-                scope.Complete();
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    scope.ReadLock(Constants.Locks.ContentTree);
+                    action(scope);
+                    scope.Complete();
+                }
             }
         }
 
@@ -400,13 +399,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadMedia(Action<IScope> action)
         {
-            // see note in LockAndLoadContent
-            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
-            using (var scope = _scopeProvider.CreateScope())
+            using (_mediaStore.GetWriter(_scopeProvider))
             {
-                scope.ReadLock(Constants.Locks.MediaTree);
-                action(scope);
-                scope.Complete();
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    scope.ReadLock(Constants.Locks.MediaTree);
+                    action(scope);
+                    scope.Complete();
+                }
             }
         }
 
@@ -528,13 +528,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void LockAndLoadDomains()
         {
-            // see note in LockAndLoadContent
-            using (_domainStore.GetScopedWriteLock(_scopeProvider))
-            using (var scope = _scopeProvider.CreateScope())
+            using (_domainStore.GetWriter(_scopeProvider))
             {
-                scope.ReadLock(Constants.Locks.Domains);
-                LoadDomainsLocked();
-                scope.Complete();
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    scope.ReadLock(Constants.Locks.Domains);
+                    LoadDomainsLocked();
+                    scope.Complete();
+                }
             }
         }
 
@@ -586,7 +587,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_contentStore.GetScopedWriteLock(_scopeProvider))
+            using (_contentStore.GetWriter(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool draftChanged2, out bool publishedChanged2);
                 draftChanged = draftChanged2;
@@ -682,7 +683,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
             }
 
-            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
+            using (_mediaStore.GetWriter(_scopeProvider))
             {
                 NotifyLocked(payloads, out bool anythingChanged2);
                 anythingChanged = anythingChanged2;
@@ -803,7 +804,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             if (removedIds.Count == 0 && refreshedIds.Count == 0 && otherIds.Count == 0 && newIds.Count == 0) return;
 
-            using (store.GetScopedWriteLock(_scopeProvider))
+            using (store.GetWriter(_scopeProvider))
             {
                 // ReSharper disable AccessToModifiedClosure
                 action(removedIds, refreshedIds, otherIds, newIds);
@@ -824,8 +825,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     payload.Removed ? "Removed" : "Refreshed",
                     payload.Id);
 
-            using (_contentStore.GetScopedWriteLock(_scopeProvider))
-            using (_mediaStore.GetScopedWriteLock(_scopeProvider))
+            using (_contentStore.GetWriter(_scopeProvider))
+            using (_mediaStore.GetWriter(_scopeProvider))
             {
                 // TODO: need to add a datatype lock
                 // this is triggering datatypes reload in the factory, and right after we create some
@@ -857,8 +858,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (_isReady == false)
                 return;
 
-            // see note in LockAndLoadContent
-            using (_domainStore.GetScopedWriteLock(_scopeProvider))
+            using (_domainStore.GetWriter(_scopeProvider))
             {
                 foreach (var payload in payloads)
                 {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
deleted file mode 100644
index b69dab7dac..0000000000
--- a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Threading;
-
-namespace Umbraco.Web.PublishedCache.NuCache.Snap
-{
-    internal class GenObj
-    {
-        public GenObj(long gen)
-        {
-            Gen = gen;
-            WeakGenRef = new WeakReference(null);
-        }
-
-        public GenRef GetGenRef()
-        {
-            // not thread-safe but always invoked from within a lock
-            var genRef = (GenRef)WeakGenRef.Target;
-            if (genRef == null)
-                WeakGenRef.Target = genRef = new GenRef(this);
-            return genRef;
-        }
-
-        public readonly long Gen;
-        public readonly WeakReference WeakGenRef;
-        public int Count;
-
-        public void Reference()
-        {
-            Interlocked.Increment(ref Count);
-        }
-
-        public void Release()
-        {
-            Interlocked.Decrement(ref Count);
-        }
-    }
-}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
deleted file mode 100644
index ade0251b8d..0000000000
--- a/src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Umbraco.Web.PublishedCache.NuCache.Snap
-{
-    internal class GenRef
-    {
-        public GenRef(GenObj genObj)
-        {
-            GenObj = genObj;
-        }
-
-        public readonly GenObj GenObj;
-        public long Gen => GenObj.Gen;
-    }
-}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs b/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
deleted file mode 100644
index 20d7e7ddcd..0000000000
--- a/src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Umbraco.Web.PublishedCache.NuCache.Snap
-{
-    internal class LinkedNode<TValue>
-        where TValue : class
-    {
-        public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
-        {
-            Value = value;
-            Gen = gen;
-            Next = next;
-        }
-
-        public readonly long Gen;
-
-        // reading & writing references is thread-safe on all .NET platforms
-        // mark as volatile to ensure we always read the correct value
-        public volatile TValue Value;
-        public volatile LinkedNode<TValue> Next;
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index c5b1df1206..30f6e7e638 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Umbraco.Core.Scoping;
-using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
@@ -21,9 +20,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // This class is optimized for many readers, few writers
         // Readers are lock-free
 
-        private readonly ConcurrentDictionary<TKey, LinkedNode<TValue>> _items;
-        private readonly ConcurrentQueue<GenObj> _genObjs;
-        private GenObj _genObj;
+        private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
+        private readonly ConcurrentQueue<GenerationObject> _generationObjects;
+        private GenerationObject _generationObject;
         private readonly object _wlocko = new object();
         private readonly object _rlocko = new object();
         private long _liveGen, _floorGen;
@@ -41,9 +40,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public SnapDictionary()
         {
-            _items = new ConcurrentDictionary<TKey, LinkedNode<TValue>>();
-            _genObjs = new ConcurrentQueue<GenObj>();
-            _genObj = null; // no initial gen exists
+            _items = new ConcurrentDictionary<TKey, LinkedNode>();
+            _generationObjects = new ConcurrentQueue<GenerationObject>();
+            _generationObject = null; // no initial gen exists
             _liveGen = _floorGen = 0;
             _nextGen = false; // first time, must create a snapshot
             _collectAuto = true; // collect automatically by default
@@ -87,13 +86,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
         }
 
         // a scope contextual that represents a locked writer to the dictionary
-        private class ScopedWriteLock : ScopeContextualBase
+        private class SnapDictionaryWriter : ScopeContextualBase
         {
             private readonly WriteLockInfo _lockinfo = new WriteLockInfo();
-            private readonly SnapDictionary<TKey, TValue> _dictionary;
-            private int _released;
+            private SnapDictionary<TKey, TValue> _dictionary;
 
-            public ScopedWriteLock(SnapDictionary<TKey, TValue> dictionary, bool scoped)
+            public SnapDictionaryWriter(SnapDictionary<TKey, TValue> dictionary, bool scoped)
             {
                 _dictionary = dictionary;
                 dictionary.Lock(_lockinfo, scoped);
@@ -101,19 +99,17 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             public override void Release(bool completed)
             {
-                if (Interlocked.CompareExchange(ref _released, 1, 0) != 0)
-                    return;
+                if (_dictionary == null) return;
                 _dictionary.Release(_lockinfo, completed);
+                _dictionary = null;
             }
         }
 
         // gets a scope contextual representing a locked writer to the dictionary
-        // the dict is write-locked until the write-lock is released
-        //  which happens when it is disposed (non-scoped)
-        //  or when the scope context exits (scoped)
-        public IDisposable GetScopedWriteLock(IScopeProvider scopeProvider)
+        // GetScopedWriter? should the dict have a ref onto the scope provider?
+        public IDisposable GetWriter(IScopeProvider scopeProvider)
         {
-            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new ScopedWriteLock(this, scoped));
+            return ScopeContextualBase.Get(scopeProvider, _instanceId, scoped => new SnapDictionaryWriter(this, scoped));
         }
 
         private void Lock(WriteLockInfo lockInfo, bool forceGen = false)
@@ -133,18 +129,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 //RuntimeHelpers.PrepareConstrainedRegions();
                 try { } finally
                 {
-                    // increment the lock count, and register that this lock is counting
                     _wlocked++;
                     lockInfo.Count = true;
-
-                    if (_nextGen == false || (forceGen && _wlocked == 1))
+                    if (_nextGen == false || (forceGen && _wlocked == 1)) // if true already... ok to have "holes" in generation objects
                     {
                         // because we are changing things, a new generation
                         // is created, which will trigger a new snapshot
-                        if (_nextGen)
-                            _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                        _nextGen = true;
                         _liveGen += 1;
-                        _nextGen = true; // this is the ONLY place where _nextGen becomes true
                     }
                 }
             }
@@ -161,10 +153,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void Release(WriteLockInfo lockInfo, bool commit = true)
         {
-            // if the lock wasn't taken in the first place, do nothing
-            if (!lockInfo.Taken)
-                return;
-
             if (commit == false)
             {
                 var rtaken = false;
@@ -173,7 +161,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     Monitor.Enter(_rlocko, ref rtaken);
                     try { } finally
                     {
-                        // forget about the temp. liveGen
                         _nextGen = false;
                         _liveGen -= 1;
                     }
@@ -196,9 +183,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
             }
 
-            // decrement the lock count, if counting, then exit the lock
             if (lockInfo.Count) _wlocked--;
-            Monitor.Exit(_wlocko);
+            if (lockInfo.Taken) Monitor.Exit(_wlocko);
         }
 
         private void Release(ReadLockInfo lockInfo)
@@ -212,9 +198,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public int Count => _items.Count;
 
-        private LinkedNode<TValue> GetHead(TKey key)
+        private LinkedNode GetHead(TKey key)
         {
-            _items.TryGetValue(key, out var link); // else null
+            _items.TryGetValue(key, out LinkedNode link); // else null
             return link;
         }
 
@@ -235,7 +221,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                         // for an older gen - if value is different then insert a new
                         // link for the new gen, with the new value
                         if (link.Value != value)
-                            _items.TryUpdate(key, new LinkedNode<TValue>(value, _liveGen, link), link);
+                            _items.TryUpdate(key, new LinkedNode(value, _liveGen, link), link);
                     }
                     else
                     {
@@ -249,7 +235,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 }
                 else
                 {
-                    _items.TryAdd(key, new LinkedNode<TValue>(value, _liveGen));
+                    _items.TryAdd(key, new LinkedNode(value, _liveGen));
                 }
             }
             finally
@@ -275,7 +261,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     if (kvp.Value.Gen < _liveGen)
                     {
-                        var link = new LinkedNode<TValue>(null, _liveGen, kvp.Value);
+                        var link = new LinkedNode(null, _liveGen, kvp.Value);
                         _items.TryUpdate(kvp.Key, link, kvp.Value);
                     }
                     else
@@ -351,12 +337,12 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 Lock(lockInfo);
 
-                // if no next generation is required, and we already have a gen object,
-                // use it to create a new snapshot
-                if (_nextGen == false && _genObj != null)
-                    return new Snapshot(this, _genObj.GetGenRef());
+                // if no next generation is required, and we already have one,
+                // use it and create a new snapshot
+                if (_nextGen == false && _generationObject != null)
+                    return new Snapshot(this, _generationObject.GetReference());
 
-                // else we need to try to create a new gen object
+                // else we need to try to create a new gen ref
                 // whether we are wlocked or not, noone can rlock while we do,
                 // so _liveGen and _nextGen are safe
                 if (_wlocked > 0) // volatile, cannot ++ but could --
@@ -364,32 +350,29 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // write-locked, cannot use latest gen (at least 1) so use previous
                     var snapGen = _nextGen ? _liveGen - 1 : _liveGen;
 
-                    // create a new gen object if we don't already have one
-                    // (happens the first time a snapshot is created)
-                    if (_genObj == null)
-                        _genObjs.Enqueue(_genObj = new GenObj(snapGen));
-
-                    // if we have one already, ensure it's consistent
-                    else if (_genObj.Gen != snapGen)
+                    // create a new gen ref unless we already have it
+                    if (_generationObject == null)
+                        _generationObjects.Enqueue(_generationObject = new GenerationObject(snapGen));
+                    else if (_generationObject.Gen != snapGen)
                         throw new Exception("panic");
                 }
                 else
                 {
-                    // not write-locked, can use latest gen (_liveGen), create a corresponding new gen object
-                    _genObjs.Enqueue(_genObj = new GenObj(_liveGen));
+                    // not write-locked, can use latest gen, create a new gen ref
+                    _generationObjects.Enqueue(_generationObject = new GenerationObject(_liveGen));
                     _nextGen = false; // this is the ONLY thing that triggers a _liveGen++
                 }
 
                 // so...
-                // the genObj has a weak ref to the genRef, and is queued
-                // the snapshot has a ref to the genRef, which has a ref to the genObj
-                // when the snapshot is disposed, it decreases genObj counter
+                // the genRefRef has a weak ref to the genRef, and is queued
+                // the snapshot has a ref to the genRef, which has a ref to the genRefRef
+                // when the snapshot is disposed, it decreases genRefRef counter
                 // so after a while, one of these conditions is going to be true:
-                // - genObj.Count is zero because all snapshots have properly been disposed
-                // - genObj.WeakGenRef is dead because all snapshots have been collected
+                // - the genRefRef counter is zero because all snapshots have properly been disposed
+                // - the genRefRef weak ref is dead because all snapshots have been collected
                 // in both cases, we will dequeue and collect
 
-                var snapshot = new Snapshot(this, _genObj.GetGenRef());
+                var snapshot = new Snapshot(this, _generationObject.GetReference());
 
                 // reading _floorGen is safe if _collectTask is null
                 if (_collectTask == null && _collectAuto && _liveGen - _floorGen > CollectMinGenDelta)
@@ -433,16 +416,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private void Collect()
         {
             // see notes in CreateSnapshot
-            while (_genObjs.TryPeek(out var genObj) && (genObj.Count == 0 || genObj.WeakGenRef.IsAlive == false))
+            while (_generationObjects.TryPeek(out GenerationObject generationObject) && (generationObject.Count == 0 || generationObject.WeakReference.IsAlive == false))
             {
-                _genObjs.TryDequeue(out genObj); // cannot fail since TryPeek has succeeded
-                _floorGen = genObj.Gen;
+                _generationObjects.TryDequeue(out generationObject); // cannot fail since TryPeek has succeeded
+                _floorGen = generationObject.Gen;
             }
 
             Collect(_items);
         }
 
-        private void Collect(ConcurrentDictionary<TKey, LinkedNode<TValue>> dict)
+        private void Collect(ConcurrentDictionary<TKey, LinkedNode> dict)
         {
             // it is OK to enumerate a concurrent dictionary and it does not lock
             // it - and here it's not an issue if we skip some items, they will be
@@ -477,7 +460,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // not live, null value, no next link = remove that one -- but only if
                     // the dict has not been updated, have to do it via ICollection<> (thanks
                     // Mr Toub) -- and if the dict has been updated there is nothing to collect
-                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode<TValue>>>;
+                    var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode>>;
                     /*var removed =*/ idict.Remove(kvp);
                     //Console.WriteLine("remove (" + (removed ? "true" : "false") + ")");
                     continue;
@@ -502,14 +485,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 task = _collectTask;
             }
-            return task ?? Task.CompletedTask;
+            return task ?? Task.FromResult(0);
             //if (task != null)
             //    await task;
         }
 
-        public long GenCount => _genObjs.Count;
+        public long GenCount => _generationObjects.Count;
 
-        public long SnapCount => _genObjs.Sum(x => x.Count);
+        public long SnapCount => _generationObjects.Sum(x => x.Count);
 
         #endregion
 
@@ -530,7 +513,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             public long LiveGen => _dict._liveGen;
             public long FloorGen => _dict._floorGen;
             public bool NextGen => _dict._nextGen;
-            public int WLocked => _dict._wlocked;
 
             public bool CollectAuto
             {
@@ -538,15 +520,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 set => _dict._collectAuto = value;
             }
 
-            public GenObj GenObj => _dict._genObj;
-
-            public ConcurrentQueue<GenObj> GenObjs => _dict._genObjs;
+            public ConcurrentQueue<GenerationObject> GenerationObjects => _dict._generationObjects;
 
             public Snapshot LiveSnapshot => new Snapshot(_dict, _dict._liveGen);
 
             public GenVal[] GetValues(TKey key)
             {
-                _dict._items.TryGetValue(key, out var link); // else null
+                _dict._items.TryGetValue(key, out LinkedNode link); // else null
 
                 if (link == null)
                     return new GenVal[0];
@@ -579,23 +559,35 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Classes
 
+        private class LinkedNode
+        {
+            public LinkedNode(TValue value, long gen, LinkedNode next = null)
+            {
+                Value = value;
+                Gen = gen;
+                Next = next;
+            }
+
+            internal readonly long Gen;
+
+            // reading & writing references is thread-safe on all .NET platforms
+            // mark as volatile to ensure we always read the correct value
+            internal volatile TValue Value;
+            internal volatile LinkedNode Next;
+        }
+
         public class Snapshot : IDisposable
         {
             private readonly SnapDictionary<TKey, TValue> _store;
-            private readonly GenRef _genRef;
-            private readonly long _gen; // copied for perfs
-            private int _disposed;
+            private readonly GenerationReference _generationReference;
+            private long _gen; // copied for perfs
 
-            //private static int _count;
-            //private readonly int _thisCount;
-
-            internal Snapshot(SnapDictionary<TKey, TValue> store, GenRef genRef)
+            internal Snapshot(SnapDictionary<TKey, TValue> store, GenerationReference generationReference)
             {
                 _store = store;
-                _genRef = genRef;
-                _gen = genRef.GenObj.Gen;
-                _genRef.GenObj.Reference();
-                //_thisCount = _count++;
+                _generationReference = generationReference;
+                _gen = generationReference.GenerationObject.Gen;
+                _generationReference.GenerationObject.Reference();
             }
 
             internal Snapshot(SnapDictionary<TKey, TValue> store, long gen)
@@ -604,21 +596,17 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 _gen = gen;
             }
 
-            private void EnsureNotDisposed()
-            {
-                if (_disposed > 0)
-                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
-            }
-
             public TValue Get(TKey key)
             {
-                EnsureNotDisposed();
+                if (_gen < 0)
+                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
                 return _store.Get(key, _gen);
             }
 
             public IEnumerable<TValue> GetAll()
             {
-                EnsureNotDisposed();
+                if (_gen < 0)
+                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
                 return _store.GetAll(_gen);
             }
 
@@ -626,7 +614,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    EnsureNotDisposed();
+                    if (_gen < 0)
+                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
                     return _store.IsEmpty(_gen);
                 }
             }
@@ -635,20 +624,63 @@ namespace Umbraco.Web.PublishedCache.NuCache
             {
                 get
                 {
-                    EnsureNotDisposed();
+                    if (_gen < 0)
+                        throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
                     return _gen;
                 }
             }
 
             public void Dispose()
             {
-                if (Interlocked.CompareExchange(ref _disposed, 1, 0) != 0)
-                    return;
-                _genRef?.GenObj.Release();
+                if (_gen < 0) return;
+                _gen = -1;
+                _generationReference?.GenerationObject.Release();
                 GC.SuppressFinalize(this);
             }
         }
 
+        internal class GenerationObject
+        {
+            public GenerationObject(long gen)
+            {
+                Gen = gen;
+                WeakReference = new WeakReference(null);
+            }
+
+            public GenerationReference GetReference()
+            {
+                // not thread-safe but always invoked from within a lock
+                var generationReference = (GenerationReference) WeakReference.Target;
+                if (generationReference == null)
+                    WeakReference.Target = generationReference = new GenerationReference(this);
+                return generationReference;
+            }
+
+            public readonly long Gen;
+            public readonly WeakReference WeakReference;
+            public int Count;
+
+            public void Reference()
+            {
+                Interlocked.Increment(ref Count);
+            }
+
+            public void Release()
+            {
+                Interlocked.Decrement(ref Count);
+            }
+        }
+
+        internal class GenerationReference
+        {
+            public GenerationReference(GenerationObject generationObject)
+            {
+                GenerationObject = generationObject;
+            }
+
+            public readonly GenerationObject GenerationObject;
+        }
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c6cbc7cbaa..09cc7d856a 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -205,9 +205,6 @@
     <Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
     <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
-    <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
-    <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
-    <Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />

From b4885f48d77aa160fc19166386678ea075ede043 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 1 Apr 2019 14:31:34 +1100
Subject: [PATCH 48/50] fixing bad merge problem

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

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index b257f8dcdd..11b1870b90 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms.Core</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 79113a7c94..e81c199288 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms.Web</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 8ec1484452..c93a82c691 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.6.0">
+    <metadata minClientVersion="4.1.0">
         <id>UmbracoCms</id>
         <version>8.0.0</version>
         <title>Umbraco Cms</title>

From 76e2f2f38013cd3a5f2fe65315ab925afee9c494 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Apr 2019 09:15:30 +0200
Subject: [PATCH 49/50] #4011 - Not using a unnecessary function call in views

---
 .../src/views/propertyeditors/grid/editors/embed.controller.js | 3 ---
 .../src/views/propertyeditors/grid/editors/embed.html          | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
index 8e9ea06a84..a45e569897 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
@@ -17,9 +17,6 @@ angular.module("umbraco")
             
             $scope.embedHtml = getEmbed();
         }, false);
-    	$scope.hasEmbed = function() {
-            return $scope.control.value !== null;
-        }
     	$scope.setEmbed = function() {
             var embed = {
                 submit: function(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index 0178c3b3ec..8cfa71f082 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.EmbedController">
 
-	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="hasEmbed() === false">
+	<div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="control.value === null">
 		<i class="icon icon-movie-alt"></i>
 		<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
 	</div>

From a9f5d3c1e8e9e0c9ec460181d6f0153762526ae7 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Apr 2019 09:41:29 +0200
Subject: [PATCH 50/50] #4011 - Use discreet word not disgrete

---
 .../src/less/components/umb-grid.less         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

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 5a14294ebf..b5abbe06bc 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
@@ -165,13 +165,13 @@
     min-height: 88px;
     border-width: 1px;
     border-style: dashed;
-    border-color: @ui-action-disgrete-border;
-    color: @ui-action-disgrete-type;
+    border-color: @ui-action-discreet-border;
+    color: @ui-action-discreet-type;
     transition: border-color 100ms linear;
 
     &:hover {
-        border-color: @ui-action-disgrete-border-hover;
-        color: @ui-action-disgrete-type-hover;
+        border-color: @ui-action-discreet-border-hover;
+        color: @ui-action-discreet-type-hover;
         cursor: pointer;
     }
 }
@@ -209,9 +209,9 @@
 }
 
 .umb-grid .cell-tools-add {
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
     &:focus, &:hover {
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
         text-decoration: none;
     }
 }
@@ -221,17 +221,17 @@
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
 }
 
 .umb-grid .cell-tools-add.-bar {
     display: block;
     text-align: center;
     padding: 5px;
-    border: 1px dashed @ui-action-disgrete-border;
+    border: 1px dashed @ui-action-discreet-border;
     margin: 10px;
     &:focus, &:hover {
-        border-color: @ui-action-disgrete-border-hover;
+        border-color: @ui-action-discreet-border-hover;
     }
 }
 
@@ -542,13 +542,13 @@
     display: inline-block;
     cursor: pointer;
     border-radius: 200px;
-    border: 1px solid @ui-action-disgrete-border;
+    border: 1px solid @ui-action-discreet-border;
     margin: 2px;
 
     &:hover, &:hover * {
-        background: @ui-action-disgrete-type-hover !important;
+        background: @ui-action-discreet-type-hover !important;
         color: @white !important;
-        border-color: @ui-action-disgrete-border-hover !important;
+        border-color: @ui-action-discreet-border-hover !important;
         text-decoration: none;
     }
 }