From 7eee09758e0f32d57831f3b174899c8c0aaf1e06 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 24 Nov 2020 09:49:58 +1100
Subject: [PATCH 001/202] Ensure there's explicit scopes used for all service
 access in the Examine indexing logic

---
 .../Services/Implement/PublicAccessService.cs |  6 +-
 .../ContentValueSetValidator.cs               | 47 ++++++++++---
 src/Umbraco.Web/Search/ExamineComponent.cs    | 67 ++++++++++++-------
 3 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/PublicAccessService.cs b/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
index ab9ea64292..06570da725 100644
--- a/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
+++ b/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
@@ -62,12 +62,10 @@ namespace Umbraco.Core.Services.Implement
             //start with the deepest id
             ids.Reverse();
 
-            using (var scope = ScopeProvider.CreateScope())
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
                 //This will retrieve from cache!
-                var entries = _publicAccessRepository.GetMany().ToArray();
-
-                scope.Complete();
+                var entries = _publicAccessRepository.GetMany().ToList();
                 foreach (var id in ids)
                 {
                     var found = entries.FirstOrDefault(x => x.ProtectedNodeId == id);
diff --git a/src/Umbraco.Examine/ContentValueSetValidator.cs b/src/Umbraco.Examine/ContentValueSetValidator.cs
index 9555566c53..f702e8197d 100644
--- a/src/Umbraco.Examine/ContentValueSetValidator.cs
+++ b/src/Umbraco.Examine/ContentValueSetValidator.cs
@@ -4,7 +4,9 @@ using System.Linq;
 using Examine;
 using Examine.LuceneEngine.Providers;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 
 namespace Umbraco.Examine
@@ -15,9 +17,9 @@ namespace Umbraco.Examine
     public class ContentValueSetValidator : ValueSetValidator, IContentValueSetValidator
     {
         private readonly IPublicAccessService _publicAccessService;
-
+        private readonly IScopeProvider _scopeProvider;
         private const string PathKey = "path";
-        private static readonly IEnumerable<string> ValidCategories = new[] {IndexTypes.Content, IndexTypes.Media};
+        private static readonly IEnumerable<string> ValidCategories = new[] { IndexTypes.Content, IndexTypes.Media };
         protected override IEnumerable<string> ValidIndexCategories => ValidCategories;
 
         public bool PublishedValuesOnly { get; }
@@ -53,25 +55,38 @@ namespace Umbraco.Examine
 
         public bool ValidateProtectedContent(string path, string category)
         {
-            if (category == IndexTypes.Content
-                && !SupportProtectedContent
-                //if the service is null we can't look this up so we'll return false
-                && (_publicAccessService == null || _publicAccessService.IsProtected(path)))
+            if (category == IndexTypes.Content && !SupportProtectedContent)
             {
-                return false;
+                //if the service is null we can't look this up so we'll return false
+                if (_publicAccessService == null || _scopeProvider == null)
+                {
+                    return false;
+                }
+
+                // explicit scope since we may be in a background thread
+                using (_scopeProvider.CreateScope(autoComplete: true))
+                {
+                    if (_publicAccessService.IsProtected(path))
+                    {
+                        return false;
+                    }
+                }
             }
 
             return true;
         }
 
+        // used for tests
         public ContentValueSetValidator(bool publishedValuesOnly, int? parentId = null,
             IEnumerable<string> includeItemTypes = null, IEnumerable<string> excludeItemTypes = null)
-            : this(publishedValuesOnly, true, null, parentId, includeItemTypes, excludeItemTypes)
+            : this(publishedValuesOnly, true, null, null, parentId, includeItemTypes, excludeItemTypes)
         {
         }
 
         public ContentValueSetValidator(bool publishedValuesOnly, bool supportProtectedContent,
-            IPublicAccessService publicAccessService, int? parentId = null,
+            IPublicAccessService publicAccessService,
+            IScopeProvider scopeProvider,
+            int? parentId = null,
             IEnumerable<string> includeItemTypes = null, IEnumerable<string> excludeItemTypes = null)
             : base(includeItemTypes, excludeItemTypes, null, null)
         {
@@ -79,6 +94,16 @@ namespace Umbraco.Examine
             SupportProtectedContent = supportProtectedContent;
             ParentId = parentId;
             _publicAccessService = publicAccessService;
+            _scopeProvider = scopeProvider;
+        }
+
+        [Obsolete("Use the ctor with all parameters instead")]
+        public ContentValueSetValidator(bool publishedValuesOnly, bool supportProtectedContent,
+            IPublicAccessService publicAccessService, int? parentId = null,
+            IEnumerable<string> includeItemTypes = null, IEnumerable<string> excludeItemTypes = null)
+            : this(publishedValuesOnly, supportProtectedContent, publicAccessService, Current.ScopeProvider,
+                  parentId, includeItemTypes, excludeItemTypes)
+        {
         }
 
         public override ValueSetValidationResult Validate(ValueSet valueSet)
@@ -103,7 +128,7 @@ namespace Umbraco.Examine
                     && variesByCulture.Count > 0 && variesByCulture[0].Equals("y"))
                 {
                     //so this valueset is for a content that varies by culture, now check for non-published cultures and remove those values
-                    foreach(var publishField in valueSet.Values.Where(x => x.Key.StartsWith($"{UmbracoExamineIndex.PublishedFieldName}_")).ToList())
+                    foreach (var publishField in valueSet.Values.Where(x => x.Key.StartsWith($"{UmbracoExamineIndex.PublishedFieldName}_")).ToList())
                     {
                         if (publishField.Value.Count <= 0 || !publishField.Value[0].Equals("y"))
                         {
@@ -134,7 +159,7 @@ namespace Umbraco.Examine
                 || !ValidateProtectedContent(path, valueSet.Category))
                 return ValueSetValidationResult.Filtered;
 
-            return isFiltered ? ValueSetValidationResult.Filtered: ValueSetValidationResult.Valid;
+            return isFiltered ? ValueSetValidationResult.Filtered : ValueSetValidationResult.Valid;
         }
     }
 }
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index c9d7b7cf56..bb3f30d4cf 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -629,22 +629,27 @@ namespace Umbraco.Web.Search
                 // perform the ValueSet lookup on a background thread
                 examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    // for content we have a different builder for published vs unpublished
-                    // we don't want to build more value sets than is needed so we'll lazily build 2 one for published one for non-published
-                    var builders = new Dictionary<bool, Lazy<List<ValueSet>>>
+                    // Background thread, wrap the whole thing in an explicit scope since we know
+                    // DB services are used within this logic.
+                    using (examineComponent._scopeProvider.CreateScope(autoComplete: true))
                     {
-                        [true] = new Lazy<List<ValueSet>>(() => examineComponent._publishedContentValueSetBuilder.GetValueSets(content).ToList()),
-                        [false] = new Lazy<List<ValueSet>>(() => examineComponent._contentValueSetBuilder.GetValueSets(content).ToList())
-                    };
+                        // for content we have a different builder for published vs unpublished
+                        // we don't want to build more value sets than is needed so we'll lazily build 2 one for published one for non-published
+                        var builders = new Dictionary<bool, Lazy<List<ValueSet>>>
+                        {
+                            [true] = new Lazy<List<ValueSet>>(() => examineComponent._publishedContentValueSetBuilder.GetValueSets(content).ToList()),
+                            [false] = new Lazy<List<ValueSet>>(() => examineComponent._contentValueSetBuilder.GetValueSets(content).ToList())
+                        };
 
-                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                        //filter the indexers
-                        .Where(x => isPublished || !x.PublishedValuesOnly)
-                        .Where(x => x.EnableDefaultEventHandler))
-                    {
-                        var valueSet = builders[index.PublishedValuesOnly].Value;
-                        index.IndexItems(valueSet);
-                    }
+                        foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                            //filter the indexers
+                            .Where(x => isPublished || !x.PublishedValuesOnly)
+                            .Where(x => x.EnableDefaultEventHandler))
+                        {
+                            var valueSet = builders[index.PublishedValuesOnly].Value;
+                            index.IndexItems(valueSet);
+                        }
+                    }   
                 }));
             }
         }
@@ -675,14 +680,19 @@ namespace Umbraco.Web.Search
                 // perform the ValueSet lookup on a background thread
                 examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    var valueSet = examineComponent._mediaValueSetBuilder.GetValueSets(media).ToList();
-
-                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                        //filter the indexers
-                        .Where(x => isPublished || !x.PublishedValuesOnly)
-                        .Where(x => x.EnableDefaultEventHandler))
+                    // Background thread, wrap the whole thing in an explicit scope since we know
+                    // DB services are used within this logic.
+                    using (examineComponent._scopeProvider.CreateScope(autoComplete: true))
                     {
-                        index.IndexItems(valueSet);
+                        var valueSet = examineComponent._mediaValueSetBuilder.GetValueSets(media).ToList();
+
+                        foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                            //filter the indexers
+                            .Where(x => isPublished || !x.PublishedValuesOnly)
+                            .Where(x => x.EnableDefaultEventHandler))
+                        {
+                            index.IndexItems(valueSet);
+                        }
                     }
                 })); 
             }
@@ -712,12 +722,17 @@ namespace Umbraco.Web.Search
                 // perform the ValueSet lookup on a background thread
                 examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    var valueSet = examineComponent._memberValueSetBuilder.GetValueSets(member).ToList();
-                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                        //filter the indexers
-                        .Where(x => x.EnableDefaultEventHandler))
+                    // Background thread, wrap the whole thing in an explicit scope since we know
+                    // DB services are used within this logic.
+                    using (examineComponent._scopeProvider.CreateScope(autoComplete: true))
                     {
-                        index.IndexItems(valueSet);
+                        var valueSet = examineComponent._memberValueSetBuilder.GetValueSets(member).ToList();
+                        foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                            //filter the indexers
+                            .Where(x => x.EnableDefaultEventHandler))
+                        {
+                            index.IndexItems(valueSet);
+                        }
                     }
                 }));
             }

From 348ae22d91f72336e6bcbc7bcb2be63bf0355eca Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 14 Dec 2020 12:37:30 +1100
Subject: [PATCH 002/202] Fixing tests

---
 .../UmbracoContentValueSetValidatorTests.cs   | 81 +++++++++++++++----
 1 file changed, 66 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs b/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
index 8bdb0c71c7..330529a5db 100644
--- a/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
@@ -8,6 +8,7 @@ using Umbraco.Core;
 using Umbraco.Core.Models;
 using System;
 using System.Linq;
+using Umbraco.Core.Scoping;
 
 namespace Umbraco.Tests.UmbracoExamine
 {
@@ -17,10 +18,14 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Invalid_Category()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationResult.Valid, result);            
+            Assert.AreEqual(ValueSetValidationResult.Valid, result);
 
             result = validator.Validate(ValueSet.FromObject("777", IndexTypes.Media, new { hello = "world", path = "-1,555" }));
             Assert.AreEqual(ValueSetValidationResult.Valid, result);
@@ -33,7 +38,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Must_Have_Path()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world" }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
@@ -45,7 +54,12 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Parent_Id()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>(), 555);
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>(),
+                555);
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
             Assert.AreEqual(ValueSetValidationResult.Filtered, result);
@@ -63,7 +77,9 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Inclusion_Field_List()
         {
-            var validator = new ValueSetValidator(null, null,
+            var validator = new ValueSetValidator(
+                null,
+                null,
                 new[] { "hello", "world" },
                 null);
 
@@ -79,7 +95,9 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Exclusion_Field_List()
         {
-            var validator = new ValueSetValidator(null, null,
+            var validator = new ValueSetValidator(
+                null,
+                null,
                 null,
                 new[] { "hello", "world" });
 
@@ -95,7 +113,9 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Inclusion_Exclusion_Field_List()
         {
-            var validator = new ValueSetValidator(null, null,
+            var validator = new ValueSetValidator(
+                null,
+                null,
                 new[] { "hello", "world" },
                 new[] { "world" });
 
@@ -111,7 +131,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Inclusion_Type_List()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>(),
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>(),
                 includeItemTypes: new List<string> { "include-content" });
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555" }));
@@ -127,7 +151,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Exclusion_Type_List()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>(),
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>(),
                 excludeItemTypes: new List<string> { "exclude-content" });
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555" }));
@@ -143,7 +171,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Inclusion_Exclusion_Type_List()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>(),
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>(),
                 includeItemTypes: new List<string> { "include-content", "exclude-content" },
                 excludeItemTypes: new List<string> { "exclude-content" });
 
@@ -163,7 +195,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Recycle_Bin_Content()
         {
-            var validator = new ContentValueSetValidator(true, false, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                true,
+                false,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,-20,555" }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
@@ -187,7 +223,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Recycle_Bin_Media()
         {
-            var validator = new ContentValueSetValidator(true, false, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                true,
+                false,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Media, new { hello = "world", path = "-1,-21,555" }));
             Assert.AreEqual(ValueSetValidationResult.Filtered, result);
@@ -203,7 +243,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Published_Only()
         {
-            var validator = new ContentValueSetValidator(true, true, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                true,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
@@ -230,7 +274,10 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Published_Only_With_Variants()
         {
-            var validator = new ContentValueSetValidator(true, true, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(true,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(new ValueSet("555", IndexTypes.Content,
                 new Dictionary<string, object>
@@ -288,7 +335,11 @@ namespace Umbraco.Tests.UmbracoExamine
                 .Returns(Attempt.Succeed(new PublicAccessEntry(Guid.NewGuid(), 555, 444, 333, Enumerable.Empty<PublicAccessRule>())));
             publicAccessService.Setup(x => x.IsProtected("-1,777"))
                 .Returns(Attempt.Fail<PublicAccessEntry>());
-            var validator = new ContentValueSetValidator(false, false, publicAccessService.Object);
+            var validator = new ContentValueSetValidator(
+                false,
+                false,
+                publicAccessService.Object,
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
             Assert.AreEqual(ValueSetValidationResult.Filtered, result);

From 55124fff81b077770ea9d4ca1b36c6fedbf65b29 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 7 Feb 2021 02:50:20 +0100
Subject: [PATCH 003/202] Update icons in umb-tree-search-results component
 (#9757)

* Avoid use of ng-if

* Green class is not necessary

* Ensure button element use full width

* Left align text inside button element
---
 .../src/less/components/tree/umb-tree.less          |  3 ++-
 .../components/tree/umb-tree-search-results.html    | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 8234618393..6ab663a8b2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -132,7 +132,6 @@ body.touch .umb-tree {
 .umb-tree .umb-search-group {
     position: inherit;
     display: inherit;
-
     list-style: none;
 
     h6 {
@@ -155,6 +154,8 @@ body.touch .umb-tree {
 
         &-link {
             display: block;
+            width: 100%;
+            text-align: left;
         }
 
         &-name {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
index 1264d68c76..f472251624 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
@@ -7,13 +7,14 @@
     <li class="root">
       <ul class="umb-search-group">
         <li class="umb-search-group-item" ng-repeat="result in results">
-          <div ng-class="{'umb-tree-node-checked' : result.selected}">
-            <button type="button" class="btn-reset umb-search-group-item-link" ng-class="{first:$first}"
-                ng-click="selectResultCallback($event, result)">
+          <div ng-class="{ 'umb-tree-node-checked': result.selected }">
+            <button type="button"
+                    class="btn-reset umb-search-group-item-link"
+                    ng-class="{ first: $first }"
+                    ng-click="selectResultCallback($event, result)">
                 <span class="umb-search-group-item-name">
-                    <umb-icon ng-if="result.selected" icon="icon-check" class="icon umb-tree-icon green sprTree icon-check">
-                    </umb-icon>
-                    <umb-icon ng-if="!result.selected" icon="{{result.icon}}" class="icon umb-tree-icon sprTree {{result.icon}}">
+                    <umb-icon icon="{{result.selected ? 'icon-check' : result.icon}}"
+                              class="icon umb-tree-icon sprTree {{result.selected ? 'icon-check' : result.icon}}">
                     </umb-icon>
                     <span class="umb-search-group-item-name__text">{{ result.name }}</span>
                 </span>

From 06e5d07650b2ab729623411019ad0180e3bc9653 Mon Sep 17 00:00:00 2001
From: Chad <chad.d.currie@gmail.com>
Date: Mon, 8 Feb 2021 12:56:56 +1300
Subject: [PATCH 004/202] Fix eventService memory leaks (#9752)

* fix leak by unbinding event from $rootscope

* destroy more events

* $scope unavailable

* no need to destroy in services as they are singletons

Co-authored-by: nzdev <nzdev@github.com>
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 .../content/umbvariantcontenteditors.directive.js      |  4 ++--
 .../components/editor/umbeditorheader.directive.js     |  5 ++++-
 .../src/common/services/editor.service.js              |  3 +--
 .../src/common/services/localization.service.js        |  1 +
 .../src/common/services/navigation.service.js          |  1 +
 .../prevalueeditors/treesourcetypepicker.controller.js | 10 ++++++++--
 .../colorpicker/multicolorpicker.controller.js         | 10 +++++++---
 .../nestedcontent/nestedcontent.controller.js          |  6 ++++--
 .../src/views/relationtypes/edit.controller.js         |  5 ++++-
 9 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index c3fd0dc9c4..3e227bfcb3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -187,8 +187,7 @@
             }
         }
 
-        eventsService.on("editors.content.splitViewRequest", (_, args) => requestSplitView(args));
-
+        var unbindSplitViewRequest = eventsService.on("editors.content.splitViewRequest", (_, args) => requestSplitView(args));
         /** Closes the split view */
         function closeSplitView(editorIndex) {
             // TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
@@ -201,6 +200,7 @@
 
             $location.search({"cculture": culture, "csegment": vm.editors[0].content.segment});
             splitViewChanged();
+            unbindSplitViewRequest();
         }
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index 2dfb0d5158..6f272f1ea2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -357,9 +357,12 @@ Use this directive to construct a header inside the main editor window.
                     scope.$emit("$changeTitle", title);
             }
 
-            $rootScope.$on('$setAccessibleHeader', function (event, isNew, editorFor, nameLocked, name, contentTypeName, setTitle) {
+            var unbindEventHandler = $rootScope.$on('$setAccessibleHeader', function (event, isNew, editorFor, nameLocked, name, contentTypeName, setTitle) {
                 setAccessibilityHeaderDirective(isNew, editorFor, nameLocked, name, contentTypeName, setTitle);
             });
+            scope.$on('$destroy', function () {
+                unbindEventHandler();
+            });
         }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index e512e52643..08cd67460e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -179,8 +179,7 @@ When building a custom infinite editor view you can use the same components as a
             } else {
                 focus();
             }
-        });
-
+        });      
 
         /**
          * @ngdoc method
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 f8493ab39d..99162eaf53 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
@@ -330,6 +330,7 @@ angular.module('umbraco.services')
         resourceFileLoadStatus = "none";
         resourceLoadingPromise = [];
     });
+    
 
     // return the local instance when called
     return service;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 3164c3ab19..c628e3a5b1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -30,6 +30,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
         var element = $(args.element);
         element.addClass('above-backdrop');
     });
+    
 
     //A list of query strings defined that when changed will not cause a reload of the route
     var nonRoutingQueryStrings = ["mculture", "cculture", "csegment", "lq", "sr"];
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
index a87377c84b..dcc9add395 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
@@ -83,8 +83,8 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe
         $scope.model.value = _.pluck(vm.itemTypes, "alias").join();
         angularHelper.getCurrentForm($scope).$setDirty();
     }
-
-    eventsService.on("treeSourceChanged", function (e, args) {
+    var evts = [];
+    evts.push(eventsService.on("treeSourceChanged", function (e, args) {
         // reset the model value if we changed node type (but not on the initial load)
         if (!!currentItemType && currentItemType !== args.value) {
             vm.itemTypes = [];
@@ -92,6 +92,12 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe
         }
         currentItemType = args.value;
         init();
+    }));
+
+    $scope.$on('$destroy', function () {
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
+        }
     });
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
index 6312ab9df6..967137b930 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
@@ -48,11 +48,15 @@
                 }
             });
         }
-
-        eventsService.on("toggleValue", function (e, args) {
+        var evts = [];
+        evts.push(eventsService.on("toggleValue", function (e, args) {
             vm.labelEnabled = args.value;
+        }));
+        $scope.$on('$destroy', function () {
+            for (var e in evts) {
+                eventsService.unsubscribe(evts[e]);
+            }
         });
-
         if (!Utilities.isArray($scope.model.value)) {
             //make an array from the dictionary
             var items = [];
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index a629bd2eea..f262647a0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -507,8 +507,10 @@
             vm.showPaste = clipboardService.hasEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, contentTypeAliases);
         }
 
-        eventsService.on("clipboardService.storageUpdate", checkAbilityToPasteContent);
-
+        var storageUpdate = eventsService.on("clipboardService.storageUpdate", checkAbilityToPasteContent);
+        $scope.$on('$destroy', function () {
+            storageUpdate();
+        });
         var notSupported = [
             "Umbraco.Tags",
             "Umbraco.UploadField",
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
index a0b2a6afa1..62117728d0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
@@ -54,11 +54,14 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
         });
 
         // load references when the 'relations' tab is first activated/switched to
-        eventsService.on("app.tabChange", function (event, args) {
+        var appTabChange =  eventsService.on("app.tabChange", function (event, args) {
             if (args.alias === "relations") {
                 loadRelations();
             }
         });
+        $scope.$on('$destroy', function () {
+            appTabChange();
+        });
 
         // Inital page/overview API call of relation type
         relationTypeResource.getById($routeParams.id)

From 2d4984d434a1cbbe7e5cad239b65491785b7176e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.com>
Date: Mon, 25 Jan 2021 17:05:05 +0100
Subject: [PATCH 005/202] =?UTF-8?q?check=20for=20=C2=B4err=C2=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 3734b22bf3..b56c7212db 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
@@ -478,7 +478,7 @@
 
                     syncTreeNode($scope.content, $scope.content.path);
 
-                    if (err.status === 400 && err.data) {
+                    if (err && err.status === 400 && err.data) {
                         // content was saved but is invalid.
                         eventsService.emit("content.saved", { content: $scope.content, action: args.action, valid: false });
                     }

From a76924f196029febd5893c7834d84be251627c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 8 Feb 2021 01:10:46 +0100
Subject: [PATCH 006/202] Stop using .length !== 0 when its not jQuery (#9715)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* stop using .length !== 0 as its causing errors.

* revert to only change native find()

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
---
 .../src/common/services/formhelper.service.js             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
index bd6bbcc5b3..773aa85f6f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
@@ -46,7 +46,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
             args.scope.$broadcast("formSubmitting", { scope: args.scope, action: args.action });
 
             this.focusOnFirstError(currentForm);
-            
+
             // Some property editors need to perform an action after all property editors have reacted to the formSubmitting.
             args.scope.$broadcast("formSubmittingFinalPhase", { scope: args.scope, action: args.action });
 
@@ -80,7 +80,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
          *
          * @description
          * Called by submitForm when a form has been submitted, it will fire a focus on the first found invalid umb-property it finds in the form..
-         * 
+         *
          * @param {object} form Pass in a form object.
          */
         focusOnFirstError: function(form) {
@@ -89,9 +89,9 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
 
             if(firstInvalidNgForm.length !== 0) {
                 var focusableFields = [...firstInvalidNgForm.find("umb-range-slider .noUi-handle,input,textarea,select,button")];
-                if(focusableFields.length !== 0) { 
+                if(focusableFields.length !== 0) {
                     var firstErrorEl = focusableFields.find(el => el.type !== "hidden" && el.hasAttribute("readonly") === false);
-                    if(firstErrorEl.length !== 0) {
+                    if(firstErrorEl !== undefined) {
                         firstErrorEl.focus();
                     }
                 }

From eb9c4e4d828bf291d5c09aa42989225b288af8eb Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 6 Jan 2021 10:31:13 +0100
Subject: [PATCH 007/202] Document onChange in umbPagination

---
 .../components/umbpagination.directive.js     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
index b49d47b979..f939eb5e46 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
@@ -16,6 +16,7 @@ Use this directive to generate a pagination.
             total-pages="vm.pagination.totalPages"
             on-next="vm.nextPage"
             on-prev="vm.prevPage"
+            on-change="vm.changePage"
             on-go-to-page="vm.goToPage">
         </umb-pagination>
 
@@ -34,10 +35,11 @@ Use this directive to generate a pagination.
             vm.pagination = {
                 pageNumber: 1,
                 totalPages: 10
-            }
+            };
 
             vm.nextPage = nextPage;
             vm.prevPage = prevPage;
+            vm.changePage = changePage;
             vm.goToPage = goToPage;
 
             function nextPage(pageNumber) {
@@ -51,6 +53,12 @@ Use this directive to generate a pagination.
                 console.log(pageNumber);
                 alert("prevpage");
             }
+            
+            function changePage(pageNumber) {
+                // do magic here
+                console.log(pageNumber);
+                alert("changepage");
+            }
 
             function goToPage(pageNumber) {
                 // do magic here
@@ -81,6 +89,11 @@ Use this directive to generate a pagination.
     <ul>
         <li><code>pageNumber</code>: The page number</li>
     </ul>
+@param {callback=} onChange (<code>binding</code>): Callback method when changing page.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>pageNumber</code>: The page number</li>
+    </ul>
 **/
 
 (function() {
@@ -175,9 +188,7 @@ Use this directive to generate a pagination.
                  scope.onGoToPage(scope.pageNumber);
              }
              if (scope.onChange) {
-                 if (scope.onChange) {
-                     scope.onChange({ "pageNumber": scope.pageNumber });
-                 }
+                 scope.onChange({ "pageNumber": scope.pageNumber });
              }
          };
 

From 5fc37dfeb4816e4bd23a9638948bcbc84c7bcfe5 Mon Sep 17 00:00:00 2001
From: mcl-sz <sjouke.zonneveld@znb.nl>
Date: Mon, 8 Feb 2021 07:32:54 +0100
Subject: [PATCH 008/202] Prevent overflow of searchresults with long urls
 (#9739)

* Prevent overflow of searchresults with long urls

Small css change to prevent overflow of searchresults with long url's

* fixes wrapping in node-picker search, stop icon shrinking

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 .../src/less/components/tree/umb-tree.less             | 10 ++++++----
 .../src/less/components/umb-icon.less                  |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 6ab663a8b2..d80034a786 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -48,6 +48,8 @@
         color: @gray-7;
         display: block;
         padding-left: 35px;
+        white-space: initial;
+        text-align: left;
     }
 }
 
@@ -102,10 +104,9 @@ body.touch .umb-tree {
         .umb-button-ellipsis--hidden {
             opacity: 1;
         }
-        
+         
         .umb-tree-icon {
             color: @ui-option-type-hover;
-            flex-shrink: 0;
         }
     }
 }
@@ -161,8 +162,10 @@ body.touch .umb-tree {
         &-name {
             display: flex;
 
-            &__text {
+            &__text { 
                 margin: 1px 0 0;
+                overflow:hidden;
+                text-overflow: ellipsis;
             }
         }
     }
@@ -337,7 +340,6 @@ body.touch .umb-tree {
 .umb-tree-icon { 
     vertical-align: middle;
     margin: 0 13px 0 0;
-    //color: @gray-1;
     color: @ui-option-type;
     font-size: 20px;   
     
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less
index e08174e378..318ce0a563 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less
@@ -2,6 +2,7 @@
     display: inline-block;
     width: 1em;
     height: 1em;
+    flex-shrink: 0;
 
     svg {
         width: 100%;

From 044573d9f13e08b3c391e4d9dd368b11f8561936 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 3 Feb 2021 20:40:23 +0100
Subject: [PATCH 009/202] Use umb-icon component in tree item

---
 .../directives/components/tree/umbtree.directive.js  |  2 +-
 .../src/less/components/tree/umb-tree.less           |  7 ++++++-
 .../src/views/components/tree/umb-tree.html          | 12 ++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index e27ae11e6c..7868f79809 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -348,7 +348,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
             };
 
             $scope.selectEnabledNodeClass = node =>
-                node && node.selected ? 'icon umb-tree-icon sprTree icon-check green temporary' : '';            
+                node && node.selected ? 'icon sprTree icon-check green temporary' : '-hidden';
 
             /* helper to force reloading children of a tree node */
             $scope.loadChildren = (node, forceReload) => loadChildren(node, forceReload);
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index d80034a786..a39a38fbde 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -341,7 +341,12 @@ body.touch .umb-tree {
     vertical-align: middle;
     margin: 0 13px 0 0;
     color: @ui-option-type;
-    font-size: 20px;   
+    font-size: 20px;
+
+    &.-hidden {
+        display: none;
+        visibility: hidden;
+    }
     
     &.blue {
         color: @blue;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
index aa36c1ad08..6531114567 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
@@ -4,7 +4,11 @@
         <div class="umb-tree-root" data-element="tree-root" ng-class="getNodeCssClass(tree.root)" ng-hide="hideheader === 'true'" on-right-click="altSelect(tree.root, $event)">
             <h5>
                 <a ng-href="#/{{section}}" ng-click="select(tree.root, $event)" class="umb-tree-root-link umb-outline" data-element="tree-root-link">
-                    <i ng-if="enablecheckboxes === 'true'" ng-class="selectEnabledNodeClass(tree.root)" aria-hidden="true"></i>
+                    <umb-icon icon="icon-check"
+                              class="umb-tree-icon icon-check"
+                              ng-class="selectEnabledNodeClass(tree.root)"
+                              ng-if="enablecheckboxes === 'true'">
+                    </umb-icon>
                     {{tree.name}}
                 </a>
             </h5>
@@ -38,7 +42,11 @@
         <div class="umb-tree-root" data-element="tree-root" ng-class="getNodeCssClass(group)" ng-hide="hideheader === 'true'" on-right-click="altSelect(group, $event)">
             <h5>
                 <a ng-href="#/{{section}}" ng-click="select(group, $event)" class="umb-tree-root-link umb-outline" data-element="tree-root-link">
-                    <i ng-if="enablecheckboxes === 'true'" ng-class="selectEnabledNodeClass(group)" aria-hidden="true"></i>
+                    <umb-icon icon="icon-check"
+                              class="umb-tree-icon icon-check"
+                              ng-class="selectEnabledNodeClass(group)"
+                              ng-if="enablecheckboxes === 'true'">
+                    </umb-icon>
                     {{group.name}}
                 </a>
             </h5>

From 3a9cc910a04ae409a2a549e7531783bbff3ff5d3 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 28 Jan 2021 20:36:58 +0100
Subject: [PATCH 010/202] Add more constants for tree icons

---
 src/Umbraco.Core/Constants-Icons.cs           | 25 +++++++++++++++++++
 .../Trees/DataTypeTreeController.cs           |  2 +-
 .../Trees/DictionaryTreeController.cs         |  4 +--
 .../Trees/LanguageTreeController.cs           |  2 +-
 .../Trees/LogViewerTreeController.cs          |  4 +--
 .../Trees/PackagesTreeController.cs           |  2 +-
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Constants-Icons.cs b/src/Umbraco.Core/Constants-Icons.cs
index 05213ed1c4..d5cc37c9a5 100644
--- a/src/Umbraco.Core/Constants-Icons.cs
+++ b/src/Umbraco.Core/Constants-Icons.cs
@@ -24,6 +24,26 @@
             /// </summary>
             public const string DataType = "icon-autofill";
 
+            /// <summary>
+            /// System dictionary icon
+            /// </summary>
+            public const string Dictionary = "icon-book-alt";
+
+            /// <summary>
+            /// System generic folder icon
+            /// </summary>
+            public const string Folder = "icon-folder";
+
+            /// <summary>
+            /// System language icon
+            /// </summary>
+            public const string Language = "icon-globe";
+
+            /// <summary>
+            /// System logviewer icon
+            /// </summary>
+            public const string LogViewer = "icon-box-alt";
+
             /// <summary>
             /// System list view icon
             /// </summary>
@@ -69,6 +89,11 @@
             /// </summary>
             public const string MemberType = "icon-users";
 
+            /// <summary>
+            /// System packages icon
+            /// </summary>
+            public const string Packages = "icon-box";
+            
             /// <summary>
             /// System property editor icon
             /// </summary>
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 6a7fb7f5ad..8dd41e19bf 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Web.Trees
                    .OrderBy(entity => entity.Name)
                    .Select(dt =>
                    {
-                       var node = CreateTreeNode(dt, Constants.ObjectTypes.DataType, id, queryStrings, "icon-folder", dt.HasChildren);
+                       var node = CreateTreeNode(dt, Constants.ObjectTypes.DataType, id, queryStrings, Constants.Icons.Folder, dt.HasChildren);
                        node.Path = dt.Path;
                        node.NodeType = "container";
                        // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
index f21f0b2868..6540eb4a63 100644
--- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs
+++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Web.Trees
                             id,
                             queryStrings,
                             x.ItemKey,
-                            "icon-book-alt",
+                            Constants.Icons.Dictionary,
                             Services.LocalizationService.GetDictionaryItemChildren(x.Key).Any())));
             }
             else
@@ -83,7 +83,7 @@ namespace Umbraco.Web.Trees
                         id,
                         queryStrings,
                         x.ItemKey,
-                        "icon-book-alt",
+                        Constants.Icons.Dictionary,
                         Services.LocalizationService.GetDictionaryItemChildren(x.Key).Any())));
             }
 
diff --git a/src/Umbraco.Web/Trees/LanguageTreeController.cs b/src/Umbraco.Web/Trees/LanguageTreeController.cs
index ac2c0571e0..863f94a9f5 100644
--- a/src/Umbraco.Web/Trees/LanguageTreeController.cs
+++ b/src/Umbraco.Web/Trees/LanguageTreeController.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Trees
 
             //this will load in a custom UI instead of the dashboard for the root node
             root.RoutePath = $"{Constants.Applications.Settings}/{Constants.Trees.Languages}/overview";
-            root.Icon = "icon-globe";
+            root.Icon = Constants.Icons.Language;
             root.HasChildren = false;
             root.MenuUrl = null;
 
diff --git a/src/Umbraco.Web/Trees/LogViewerTreeController.cs b/src/Umbraco.Web/Trees/LogViewerTreeController.cs
index 7452828d00..964852d4bd 100644
--- a/src/Umbraco.Web/Trees/LogViewerTreeController.cs
+++ b/src/Umbraco.Web/Trees/LogViewerTreeController.cs
@@ -33,8 +33,8 @@ namespace Umbraco.Web.Trees
             var root = base.CreateRootNode(queryStrings);
 
             //this will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = string.Format("{0}/{1}/{2}", Constants.Applications.Settings, Constants.Trees.LogViewer, "overview");
-            root.Icon = "icon-box-alt";
+            root.RoutePath = $"{Constants.Applications.Settings}/{Constants.Trees.LogViewer}/overview";
+            root.Icon = Constants.Icons.LogViewer;
             root.HasChildren = false;
             root.MenuUrl = null;
 
diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs
index 9b1bf98823..b6921771b6 100644
--- a/src/Umbraco.Web/Trees/PackagesTreeController.cs
+++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Web.Trees
 
             //this will load in a custom UI instead of the dashboard for the root node
             root.RoutePath = $"{Constants.Applications.Packages}/{Constants.Trees.Packages}/repo";
-            root.Icon = "icon-box";
+            root.Icon = Constants.Icons.Packages;
 
             root.HasChildren = false;
             return root;

From fcd802ba47b4001fb0da003b504dddb28afddb98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Knippers?= <daniel.knippers@perplex.nl>
Date: Mon, 8 Feb 2021 15:16:25 +0100
Subject: [PATCH 011/202] V8/bugfix/9074 current urls segments (#9075)

---
 .../content/umbcontentnodeinfo.directive.js   | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index 22b85b8b39..c20c2a368d 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
@@ -1,4 +1,4 @@
-(function () {
+(function () {
     'use strict';
 
     function ContentNodeInfoDirective($timeout, logResource, eventsService, userService, localizationService, dateHelper, editorService, redirectUrlsResource, overlayService, entityResource) {
@@ -159,7 +159,7 @@
             }
 
             scope.openTemplate = function () {
-                var template = _.findWhere(scope.allTemplates, {alias: scope.node.template})
+                var template = _.findWhere(scope.allTemplates, { alias: scope.node.template })
                 if (!template) {
                     return;
                 }
@@ -200,7 +200,7 @@
 
                 //don't load this if it's already done
                 if (auditTrailLoaded && !forceReload) {
-                    return; 
+                    return;
                 }
 
                 scope.loadingAuditTrail = true;
@@ -251,7 +251,7 @@
 
             function setAuditTrailLogTypeColor(auditTrail) {
                 angular.forEach(auditTrail, function (item) {
-                    
+
                     switch (item.logType) {
                         case "Save":
                             item.logTypeColor = "primary";
@@ -263,7 +263,7 @@
                         case "Unpublish":
                         case "UnpublishVariant":
                             item.logTypeColor = "warning";
-                        break;
+                            break;
                         case "Delete":
                             item.logTypeColor = "danger";
                             break;
@@ -318,14 +318,9 @@
                     return;
                 }
 
-                // find the URLs for the currently selected language
-                if (scope.node.variants.length > 1) {
-                    // nodes with variants
-                    scope.currentUrls = _.filter(scope.node.urls, (url) => (scope.currentVariant.language && scope.currentVariant.language.culture === url.culture));
-                } else {
-                    // invariant nodes
-                    scope.currentUrls = scope.node.urls;
-                }
+                // find the urls for the currently selected language
+                // when there is no selected language (allow vary by culture == false), show all urls of the node.
+                scope.currentUrls = _.filter(scope.node.urls, (url) => (scope.currentVariant.language == null || scope.currentVariant.language.culture === url.culture));
 
                 // figure out if multiple cultures apply across the content URLs
                 scope.currentUrlsHaveMultipleCultures = _.keys(_.groupBy(scope.currentUrls, url => url.culture)).length > 1;

From f8de0fca8fbd649a2eef225deb328a7101539637 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Tue, 9 Feb 2021 11:43:59 +1000
Subject: [PATCH 012/202] 5596 allow editing alt text in grid (#9681)

* languages

* add service method for media crop details, might be useful elsewhere

* update UI to add buttons for changing image / editing existing

* update mediapicker controller to use named editor service method

* Update media.controller.js

undefined should be null, consistent use of arrow func

* move buttons to the top right - close to the grid toolbar, so more obvious
---
 .../src/common/services/editor.service.js     |  20 ++-
 .../src/less/components/umb-grid.less         |  14 +-
 src/Umbraco.Web.UI.Client/src/less/main.less  |   3 +
 .../mediapicker/mediapicker.controller.js     |   5 +-
 .../overlays/mediacropdetails.controller.js   |  25 ++--
 .../overlays/mediacropdetails.html            |   9 +-
 .../grid/editors/media.controller.js          | 135 ++++++++++--------
 .../propertyeditors/grid/editors/media.html   |  27 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |   1 +
 .../Umbraco/config/lang/en_us.xml             |   1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml |   1 +
 11 files changed, 149 insertions(+), 92 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 08cd67460e..326123f797 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -592,6 +592,23 @@ When building a custom infinite editor view you can use the same components as a
             open(editor);
         }
 
+        /**
+         * @ngdoc method
+         * @name umbraco.services.editorService#mediaCropDetails
+         * @methodOf umbraco.services.editorService
+         *
+         * @description
+         * Opens the media crop details editor in infinite editing, the submit callback returns the updated media object.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object
+         */
+        function mediaCropDetails(editor) {
+            editor.view = "views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html";
+            open(editor);
+        }
+
         /**
          * @ngdoc method
          * @name umbraco.services.editorService#iconPicker
@@ -1054,7 +1071,8 @@ When building a custom infinite editor view you can use the same components as a
             macroPicker: macroPicker,
             memberGroupPicker: memberGroupPicker,
             memberPicker: memberPicker,
-            memberEditor: memberEditor
+            memberEditor: memberEditor,
+            mediaCropDetails
         };
 
         return service;
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 e1fc5573e5..3b084c9905 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
@@ -475,9 +475,19 @@
     }
 }
 
+// Control states 
+.umb-grid-media--controls {
+    display:none;
+    position: absolute;
+    top:0.5rem;
+    right:0.5rem;    
+}
 
-
-
+.umb-grid .umb-row .umb-control.-active {
+    .umb-grid-media--controls {
+        display:flex;
+    }
+}
 
 // Title bar and tools
 .umb-grid .umb-row-title-bar {
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index f9bd179caf..31bb8484c4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -606,6 +606,9 @@ table thead button:focus{
 	display: inline;
 }
 
+.relative {
+  position:relative;
+}
 
 // Input label styles
 // @Simon: not sure where to put this part yet
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 7214e0b0ea..6f9ce6ee34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -373,12 +373,11 @@ angular.module("umbraco")
             function openDetailsDialog() {
 
                 const dialog = {
-                    view: "views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html",
                     size: "small",
                     cropSize: $scope.cropSize,
                     target: $scope.target,
                     disableFocalPoint: $scope.disableFocalPoint,
-                    submit: function (model) {
+                    submit: function () {
 
                         $scope.model.selection.push($scope.target);
                         $scope.model.submit($scope.model);
@@ -392,7 +391,7 @@ angular.module("umbraco")
 
                 localizationService.localize("defaultdialogs_editSelectedMedia").then(value => {
                     dialog.title = value;
-                    editorService.open(dialog);
+                    editorService.mediaCropDetails(dialog);
                 });
             };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
index 1c7b2a7520..c6927cbaa9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
@@ -7,8 +7,9 @@
             vm.submit = submit;
             vm.close = close;
             vm.hasCrops = cropSet() === true;
-
+            vm.focalPointChanged = focalPointChanged;
             vm.disableFocalPoint = false;
+            
             if(typeof $scope.model.disableFocalPoint === "boolean") {
                 vm.disableFocalPoint = $scope.model.disableFocalPoint
             }
@@ -20,25 +21,17 @@
                 $scope.model.target.focalPoint = { left: .5, top: .5 };
             }
 
-            vm.shouldShowUrl = shouldShowUrl;
-            vm.focalPointChanged = focalPointChanged;
-
             if (!$scope.model.target.image) {
                 $scope.model.target.image = $scope.model.target.url;
             }
 
-            function shouldShowUrl() {
-                if (!$scope.model.target) {
-                    return false;
-                }
-                if ($scope.model.target.id) {
-                    return false;
-                }
-                if ($scope.model.target.url && $scope.model.target.url.toLower().indexOf("blob:") === 0) {
-                    return false;
-                }
-                return true;
-            }
+            if (!$scope.model.target 
+                || $scope.model.target.id 
+                || ($scope.model.target.url && $scope.model.target.url.toLowerCase().startsWith("blob:"))) {
+                vm.shouldShowUrl = false;
+            } else {
+                vm.shouldShowUrl = true;
+            }         
 
             /**
              * Called when the umbImageGravity component updates the focal point value
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
index da6e3f439c..de936da163 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
@@ -10,7 +10,7 @@
 
         <umb-editor-container>
 
-            <div class="umb-control-group" ng-if="vm.shouldShowUrl()">
+            <div class="umb-control-group" ng-if="vm.shouldShowUrl">
                 <h5>
                     <localize key="@general_url"></localize>
                 </h5>
@@ -24,6 +24,13 @@
                 <input type="text" class="umb-property-editor umb-textstring" ng-model="model.target.altText" umb-auto-focus />
             </div>
 
+            <div class="umb-control-group" ng-if="model.target">
+                <h5>
+                    <localize key="@content_captionTextOptional"></localize>
+                </h5>
+                <input type="text" class="umb-property-editor umb-textstring" ng-model="model.target.caption" />
+            </div>
+
             <div class="umb-control-group" ng-if="model.target">
                 <div ng-if="vm.hasCrops === false && vm.disableFocalPoint">
                     <h5>
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 c2c4d8081c..716ca405c1 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,10 +1,8 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
-    function ($scope, $timeout, userService, editorService) {
-        
-        
-        $scope.thumbnailUrl = getThumbnailUrl();
+    function ($scope, userService, editorService, localizationService) {        
         
+        $scope.thumbnailUrl = getThumbnailUrl();        
         
         if (!$scope.model.config.startNodeId) {
             if ($scope.model.config.ignoreUserStartNodes === true) {
@@ -12,101 +10,118 @@ angular.module("umbraco")
                 $scope.model.config.startNodeIsVirtual = true;
 
             } else {
-                userService.getCurrentUser().then(function (userData) {
+                userService.getCurrentUser().then(userData => {
                     $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
                     $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
                 });
             }
         }
-        
-        $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;
-            var value = $scope.control.value;
-            var target = value
-                ? {
-                    udi: value.udi,
-                    url: value.image,
-                    image: value.image,
-                    focalPoint: value.focalPoint,
-                    coordinates: value.coordinates
-                }
-                : null;
+
+        $scope.setImage = function() {
+            var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : null;
+
             var mediaPicker = {
                 startNodeId: startNodeId,
-                startNodeIsVirtual: startNodeIsVirtual,
-                cropSize: $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined,
+                startNodeIsVirtual: startNodeId ? $scope.model.config.startNodeIsVirtual : null,
+                cropSize: $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : null,
                 showDetails: true,
                 disableFolderSelect: true,
                 onlyImages: true,
                 dataTypeKey: $scope.model.dataTypeKey,
-                currentTarget: target,
-                submit: function(model) {
-                    var selectedImage = model.selection[0];
-                   
-                    $scope.control.value = {
-                        focalPoint: selectedImage.focalPoint,
-                        coordinates: selectedImage.coordinates,
-                        id: selectedImage.id,
-                        udi: selectedImage.udi,
-                        image: selectedImage.image,
-                        caption: selectedImage.altText
-                    };
-                    
+                submit: model => {
+                    updateControlValue(model.selection[0]);                    
                     editorService.close();
                 },
-                close: function() {
-                    editorService.close();
-                }
-            }
-            
+                close: () => editorService.close()                
+            };
+
             editorService.mediaPicker(mediaPicker);
         };
+
+        $scope.editImage = function() {               
+
+            const mediaCropDetailsConfig = {
+                size: 'small',
+                target: $scope.control.value,
+                submit: model => {
+                    updateControlValue(model.target);
+                    editorService.close();
+                },
+                close: () => editorService.close()                
+            };
+
+            localizationService.localize('defaultdialogs_editSelectedMedia').then(value => {
+                mediaCropDetailsConfig.title = value;
+                editorService.mediaCropDetails(mediaCropDetailsConfig);
+            });        
+        }
         
-        $scope.$watch('control.value', function(newValue, oldValue) {
-            if(Utilities.equals(newValue, oldValue)){
-                return; // simply skip that
-            }
-            
-            $scope.thumbnailUrl = getThumbnailUrl();
-        }, true);
-        
+        /**
+         * 
+         */
         function getThumbnailUrl() {
 
-            if($scope.control.value && $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){
+                if ($scope.control.editor.config && $scope.control.editor.config.size){
                     if ($scope.control.value.coordinates) {
                         // New way, crop by percent must come before width/height.
                         var coords = $scope.control.value.coordinates;
-                        url += "?crop=" + coords.x1 + "," + coords.y1 + "," + coords.x2 + "," + coords.y2 + "&cropmode=percentage";
+                        url += `?crop=${coords.x1},${coords.y1},${coords.x2},${coords.y2}&cropmode=percentage`;
                     } else {
                         // Here in order not to break existing content where focalPoint were used.
                         // For some reason width/height have to come first when mode=crop.
                         if ($scope.control.value.focalPoint) {
-                            url += "?center=" + $scope.control.value.focalPoint.top + "," + $scope.control.value.focalPoint.left;
-                            url += "&mode=crop";
+                            url += `?center=${$scope.control.value.focalPoint.top},${$scope.control.value.focalPoint.left}`;
+                            url += '&mode=crop';
                         } else {
                             // Prevent black padding and no crop when focal point not set / changed from default
-                            url += "?center=0.5,0.5&mode=crop";
+                            url += '?center=0.5,0.5&mode=crop';
                         }
                     }
-                    url += "&width=" + $scope.control.editor.config.size.width;
-                    url += "&height=" + $scope.control.editor.config.size.height;
-                    url += "&animationprocessmode=first";
 
+                    url += '&width=' + $scope.control.editor.config.size.width;
+                    url += '&height=' + $scope.control.editor.config.size.height;
+                    url += '&animationprocessmode=first';
                 }
 
                 // set default size if no crop present (moved from the view)
-                if (url.indexOf('?') == -1)
+                if (url.includes('?') === false)
                 {
-                    url += "?width=800&upscale=false&animationprocessmode=false"
+                    url += '?width=800&upscale=false&animationprocessmode=false'
                 }
+
                 return url;
             }
             
             return null;
-        };
+        }
 
-});
+        /**
+         * 
+         * @param {object} selectedImage 
+         */
+        function updateControlValue(selectedImage) {
+
+            const doGetThumbnail = $scope.control.value.focalPoint !== selectedImage.focalPoint 
+                || $scope.control.value.image !== selectedImage.image;
+
+            // we could apply selectedImage directly to $scope.control.value,
+            // but this allows excluding fields in future if needed
+            $scope.control.value = {
+                focalPoint: selectedImage.focalPoint,
+                coordinates: selectedImage.coordinates,
+                id: selectedImage.id,
+                udi: selectedImage.udi,
+                image: selectedImage.image,
+                caption: selectedImage.caption,
+                altText: selectedImage.altText
+            };
+
+
+            if (doGetThumbnail) {
+                $scope.thumbnailUrl = getThumbnailUrl();
+            }
+        }       
+    });
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 2ab42807fd..2f73dc82ec 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
@@ -6,14 +6,23 @@
         </span>
     </button>
 
-    <div ng-if="thumbnailUrl !== null">
-        <button type="button" class="btn-reset" ng-click="setImage()">
-            <img ng-src="{{thumbnailUrl}}" class="fullSizeImage" alt="" />
-        </button>
-        <label class="sr-only" for="grid-media-{{control.value.id}}">
-            <localize key="visuallyHiddenTexts_addImageCaption">Add image caption</localize>
-        </label>
-        <input id="grid-media-{{control.value.id}}" type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
-    </div>
+    <div ng-if="thumbnailUrl !== null" class="relative">
+        
+        <img ng-src="{{thumbnailUrl}}" class="fullSizeImage" alt="" />
 
+        <div class="umb-grid-media--controls">
+            <umb-button                
+                action="setImage()"
+                type="button"
+                button-style="info"
+                label-key="defaultdialogs_selectMedia">
+            </umb-button>            
+            <umb-button                
+                action="editImage()"
+                type="button"
+                button-style="info"
+                label-key="general_edit">
+            </umb-button>
+        </div>
+    </div>
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 97fc223cc3..bc2f4c0c1e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -268,6 +268,7 @@
     <key alias="statistics">Statistics</key>
     <key alias="titleOptional">Title (optional)</key>
     <key alias="altTextOptional">Alternative text (optional)</key>
+    <key alias="captionTextOptional">Caption (optional)</key>
     <key alias="type">Type</key>
     <key alias="unpublish">Unpublish</key>
     <key alias="unpublished">Unpublished</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 1456cce9f0..94645eaa85 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -272,6 +272,7 @@
     <key alias="statistics">Statistics</key>
     <key alias="titleOptional">Title (optional)</key>
     <key alias="altTextOptional">Alternative text (optional)</key>
+    <key alias="captionTextOptional">Caption (optional)</key>
     <key alias="type">Type</key>
     <key alias="unpublish">Unpublish</key>
     <key alias="unpublished">Draft</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 75377f54c9..88c6458a31 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -263,6 +263,7 @@
     <key alias="statistics">Statistiques</key>
     <key alias="titleOptional">Titre (optionnel)</key>
     <key alias="altTextOptional">Texte alternatif (optionnel)</key>
+    <key alias="captionTextOptional">Légende (optionnel)</key>
     <key alias="type">Type</key>
     <key alias="unpublish">Dépublier</key>
     <key alias="unpublished">Dépublié</key>

From 3b3d55ca263af995251db360de701442b0ae4c5d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 9 Feb 2021 13:43:28 +1100
Subject: [PATCH 013/202] Fixes issue with broken caches used for user
 permissions

Calculating start nodes is expensive and this is supposed to be cached but the cache was not working.
---
 src/Umbraco.Core/Cache/CacheKeys.cs           |   5 +
 .../Models/Identity/IdentityMapDefinition.cs  |  15 +-
 src/Umbraco.Core/Models/Membership/User.cs    |   8 +-
 src/Umbraco.Core/Models/UserExtensions.cs     | 172 +++++++++---------
 .../Security/BackOfficeUserStore.cs           |  22 ++-
 .../Security/ContentPermissionsHelper.cs      |  21 ++-
 .../Models/UserExtensionsTests.cs             |   3 +-
 .../Controllers/ContentControllerUnitTests.cs |  27 +--
 .../Controllers/MediaControllerUnitTests.cs   |  15 +-
 .../UserEditorAuthorizationHelperTests.cs     |  37 ++--
 src/Umbraco.Web/Cache/UserCacheRefresher.cs   |   7 +
 src/Umbraco.Web/Editors/ContentController.cs  |   2 +-
 src/Umbraco.Web/Editors/EntityController.cs   |   8 +-
 .../Filters/ContentSaveValidationAttribute.cs |  11 +-
 .../MediaItemSaveValidationAttribute.cs       |   9 +-
 .../UserGroupAuthorizationAttribute.cs        |   3 +-
 .../UserGroupEditorAuthorizationHelper.cs     |   9 +-
 src/Umbraco.Web/Editors/MediaController.cs    |  11 +-
 .../Editors/UserEditorAuthorizationHelper.cs  |  13 +-
 .../Editors/UserGroupsController.cs           |   6 +-
 src/Umbraco.Web/Editors/UsersController.cs    |   6 +-
 .../Models/Mapping/ContentMapDefinition.cs    |  22 ++-
 .../Models/Mapping/UserMapDefinition.cs       |   8 +-
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs |  38 +++-
 .../Trees/ContentTreeController.cs            |   4 +-
 .../Trees/ContentTreeControllerBase.cs        |  12 +-
 src/Umbraco.Web/Trees/MediaTreeController.cs  |   4 +-
 .../Filters/AdminUsersAuthorizeAttribute.cs   |   2 +-
 .../CheckIfUserTicketDataIsStaleAttribute.cs  |   4 +-
 ...EnsureUserPermissionForContentAttribute.cs |   4 +-
 .../EnsureUserPermissionForMediaAttribute.cs  |   1 +
 .../FilterAllowedOutgoingContentAttribute.cs  |  34 ++--
 .../FilterAllowedOutgoingMediaAttribute.cs    |   2 +-
 33 files changed, 325 insertions(+), 220 deletions(-)

diff --git a/src/Umbraco.Core/Cache/CacheKeys.cs b/src/Umbraco.Core/Cache/CacheKeys.cs
index b8ee0e97c4..0e9a9a3862 100644
--- a/src/Umbraco.Core/Cache/CacheKeys.cs
+++ b/src/Umbraco.Core/Cache/CacheKeys.cs
@@ -12,5 +12,10 @@
 
         public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
         public const string MacroFromAliasCacheKey = "macroFromAlias_";
+
+        public const string UserAllContentStartNodesPrefix = "AllContentStartNodes";
+        public const string UserAllMediaStartNodesPrefix = "AllMediaStartNodes";
+        public const string UserMediaStartNodePathsPrefix = "MediaStartNodePaths";
+        public const string UserContentStartNodePathsPrefix = "ContentStartNodePaths";
     }
 }
diff --git a/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs b/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs
index 57e1c9ee5c..47d33f3014 100644
--- a/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs
+++ b/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Membership;
@@ -11,7 +12,9 @@ namespace Umbraco.Core.Models.Identity
         private readonly ILocalizedTextService _textService;
         private readonly IEntityService _entityService;
         private readonly IGlobalSettings _globalSettings;
+        private readonly AppCaches _appCaches;
 
+        [Obsolete("Use constructor specifying all dependencies")]
         public IdentityMapDefinition(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings)
         {
             _textService = textService;
@@ -19,6 +22,14 @@ namespace Umbraco.Core.Models.Identity
             _globalSettings = globalSettings;
         }
 
+        public IdentityMapDefinition(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings, AppCaches appCaches)
+        {
+            _textService = textService;
+            _entityService = entityService;
+            _globalSettings = globalSettings;
+            _appCaches = appCaches;
+        }
+
         public void DefineMaps(UmbracoMapper mapper)
         {
             mapper.Define<IUser, BackOfficeIdentityUser>(
@@ -46,8 +57,8 @@ namespace Umbraco.Core.Models.Identity
             target.Groups = source.Groups.ToArray();
             */
 
-            target.CalculatedMediaStartNodeIds = source.CalculateMediaStartNodeIds(_entityService);
-            target.CalculatedContentStartNodeIds = source.CalculateContentStartNodeIds(_entityService);
+            target.CalculatedMediaStartNodeIds = source.CalculateMediaStartNodeIds(_entityService, _appCaches);
+            target.CalculatedContentStartNodeIds = source.CalculateContentStartNodeIds(_entityService, _appCaches);
             target.Email = source.Email;
             target.UserName = source.Username;
             target.LastPasswordChangeDateUtc = source.LastPasswordChangeDate.ToUniversalTime();
diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs
index 3d071b0a18..dc39463925 100644
--- a/src/Umbraco.Core/Models/Membership/User.cs
+++ b/src/Umbraco.Core/Models/Membership/User.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
@@ -384,11 +385,10 @@ namespace Umbraco.Core.Models.Membership
 
         #endregion
 
-        /// <summary>
-        /// This is used as an internal cache for this entity - specifically for calculating start nodes so we don't re-calculated all of the time
-        /// </summary>
         [IgnoreDataMember]
         [DoNotClone]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("This should not be used, it's currently used for only a single edge case - should probably be removed for netcore")]
         internal IDictionary<string, object> AdditionalData
         {
             get
@@ -402,6 +402,8 @@ namespace Umbraco.Core.Models.Membership
 
         [IgnoreDataMember]
         [DoNotClone]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Not used, will be removed in future versions")]
         internal object AdditionalDataLock => _additionalDataLock;
 
         protected override void PerformDeepClone(object clone)
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index 5be66bac47..fdb833a821 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -150,48 +150,40 @@ namespace Umbraco.Core.Models
             }
         }
 
-        internal static bool HasContentRootAccess(this IUser user, IEntityService entityService)
-        {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
-        }
+        internal static bool HasContentRootAccess(this IUser user, IEntityService entityService, AppCaches appCaches)
+            => ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateContentStartNodeIds(entityService, appCaches), Constants.System.RecycleBinContent);
 
-        internal static bool HasContentBinAccess(this IUser user, IEntityService entityService)
-        {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinContentString, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
-        }
+        internal static bool HasContentBinAccess(this IUser user, IEntityService entityService, AppCaches appCaches)
+            => ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinContentString, user.CalculateContentStartNodeIds(entityService, appCaches), Constants.System.RecycleBinContent);
 
-        internal static bool HasMediaRootAccess(this IUser user, IEntityService entityService)
-        {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
-        }
+        internal static bool HasMediaRootAccess(this IUser user, IEntityService entityService, AppCaches appCaches)
+            => ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateMediaStartNodeIds(entityService, appCaches), Constants.System.RecycleBinMedia);
 
-        internal static bool HasMediaBinAccess(this IUser user, IEntityService entityService)
-        {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinMediaString, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
-        }
+        internal static bool HasMediaBinAccess(this IUser user, IEntityService entityService, AppCaches appCaches)
+            => ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinMediaString, user.CalculateMediaStartNodeIds(entityService, appCaches), Constants.System.RecycleBinMedia);
 
-        internal static bool HasPathAccess(this IUser user, IContent content, IEntityService entityService)
+        internal static bool HasPathAccess(this IUser user, IContent content, IEntityService entityService, AppCaches appCaches)
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
-            return ContentPermissionsHelper.HasPathAccess(content.Path, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
+            return ContentPermissionsHelper.HasPathAccess(content.Path, user.CalculateContentStartNodeIds(entityService, appCaches), Constants.System.RecycleBinContent);
         }
 
-        internal static bool HasPathAccess(this IUser user, IMedia media, IEntityService entityService)
+        internal static bool HasPathAccess(this IUser user, IMedia media, IEntityService entityService, AppCaches appCaches)
         {
             if (media == null) throw new ArgumentNullException(nameof(media));
-            return ContentPermissionsHelper.HasPathAccess(media.Path, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
+            return ContentPermissionsHelper.HasPathAccess(media.Path, user.CalculateMediaStartNodeIds(entityService, appCaches), Constants.System.RecycleBinMedia);
         }
 
-        internal static bool HasContentPathAccess(this IUser user, IUmbracoEntity entity, IEntityService entityService)
+        internal static bool HasContentPathAccess(this IUser user, IUmbracoEntity entity, IEntityService entityService, AppCaches appCaches)
         {
             if (entity == null) throw new ArgumentNullException(nameof(entity));
-            return ContentPermissionsHelper.HasPathAccess(entity.Path, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
+            return ContentPermissionsHelper.HasPathAccess(entity.Path, user.CalculateContentStartNodeIds(entityService, appCaches), Constants.System.RecycleBinContent);
         }
 
-        internal static bool HasMediaPathAccess(this IUser user, IUmbracoEntity entity, IEntityService entityService)
+        internal static bool HasMediaPathAccess(this IUser user, IUmbracoEntity entity, IEntityService entityService, AppCaches appCaches)
         {
             if (entity == null) throw new ArgumentNullException(nameof(entity));
-            return ContentPermissionsHelper.HasPathAccess(entity.Path, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
+            return ContentPermissionsHelper.HasPathAccess(entity.Path, user.CalculateMediaStartNodeIds(entityService, appCaches), Constants.System.RecycleBinMedia);
         }
 
         /// <summary>
@@ -204,84 +196,92 @@ namespace Umbraco.Core.Models
             return user.Groups != null && user.Groups.Any(x => x.Alias == Constants.Security.SensitiveDataGroupAlias);
         }
 
-        // calc. start nodes, combining groups' and user's, and excluding what's in the bin
+        [Obsolete("Use the overload specifying all parameters instead")]
         public static int[] CalculateContentStartNodeIds(this IUser user, IEntityService entityService)
-        {
-            const string cacheKey = "AllContentStartNodes";
-            //try to look them up from cache so we don't recalculate
-            var valuesInUserCache = FromUserCache<int[]>(user, cacheKey);
-            if (valuesInUserCache != null) return valuesInUserCache;
+            => CalculateContentStartNodeIds(user, entityService, Current.AppCaches);
 
-            var gsn = user.Groups.Where(x => x.StartContentId.HasValue).Select(x => x.StartContentId.Value).Distinct().ToArray();
-            var usn = user.StartContentIds;
-            var vals = CombineStartNodes(UmbracoObjectTypes.Document, gsn, usn, entityService);
-            ToUserCache(user, cacheKey, vals);
-            return vals;
+        /// <summary>
+        /// Calculate start nodes, combining groups' and user's, and excluding what's in the bin
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="entityService"></param>
+        /// <param name="runtimeCache"></param>
+        /// <returns></returns>
+        public static int[] CalculateContentStartNodeIds(this IUser user, IEntityService entityService, AppCaches appCaches)
+        {
+            var cacheKey = CacheKeys.UserAllContentStartNodesPrefix + user.Id;
+            var runtimeCache = appCaches.IsolatedCaches.GetOrCreate<IUser>();
+            var result = runtimeCache.GetCacheItem(cacheKey, () =>
+            {
+                var gsn = user.Groups.Where(x => x.StartContentId.HasValue).Select(x => x.StartContentId.Value).Distinct().ToArray();
+                var usn = user.StartContentIds;
+                var vals = CombineStartNodes(UmbracoObjectTypes.Document, gsn, usn, entityService);
+                return vals;
+            }, TimeSpan.FromMinutes(2), true);
+
+            return result;
         }
 
-        // calc. start nodes, combining groups' and user's, and excluding what's in the bin
+        [Obsolete("Use the overload specifying all parameters instead")]
         public static int[] CalculateMediaStartNodeIds(this IUser user, IEntityService entityService)
-        {
-            const string cacheKey = "AllMediaStartNodes";
-            //try to look them up from cache so we don't recalculate
-            var valuesInUserCache = FromUserCache<int[]>(user, cacheKey);
-            if (valuesInUserCache != null) return valuesInUserCache;
+            => CalculateMediaStartNodeIds(user, entityService, Current.AppCaches);
 
-            var gsn = user.Groups.Where(x => x.StartMediaId.HasValue).Select(x => x.StartMediaId.Value).Distinct().ToArray();
-            var usn = user.StartMediaIds;
-            var vals = CombineStartNodes(UmbracoObjectTypes.Media, gsn, usn, entityService);
-            ToUserCache(user, cacheKey, vals);
-            return vals;
+        /// <summary>
+        /// Calculate start nodes, combining groups' and user's, and excluding what's in the bin
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="entityService"></param>
+        /// <param name="runtimeCache"></param>
+        /// <returns></returns>
+        public static int[] CalculateMediaStartNodeIds(this IUser user, IEntityService entityService, AppCaches appCaches)
+        {
+            var cacheKey = CacheKeys.UserAllMediaStartNodesPrefix + user.Id;
+            var runtimeCache = appCaches.IsolatedCaches.GetOrCreate<IUser>();
+            var result = runtimeCache.GetCacheItem(cacheKey, () =>
+            {
+                var gsn = user.Groups.Where(x => x.StartMediaId.HasValue).Select(x => x.StartMediaId.Value).Distinct().ToArray();
+                var usn = user.StartMediaIds;
+                var vals = CombineStartNodes(UmbracoObjectTypes.Media, gsn, usn, entityService);
+                return vals;
+            }, TimeSpan.FromMinutes(2), true);
+
+            return result;
         }
 
+        [Obsolete("Use the overload specifying all parameters instead")]
         public static string[] GetMediaStartNodePaths(this IUser user, IEntityService entityService)
-        {
-            const string cacheKey = "MediaStartNodePaths";
-            //try to look them up from cache so we don't recalculate
-            var valuesInUserCache = FromUserCache<string[]>(user, cacheKey);
-            if (valuesInUserCache != null) return valuesInUserCache;
+            => GetMediaStartNodePaths(user, entityService, Current.AppCaches);
 
-            var startNodeIds = user.CalculateMediaStartNodeIds(entityService);
-            var vals = entityService.GetAllPaths(UmbracoObjectTypes.Media, startNodeIds).Select(x => x.Path).ToArray();
-            ToUserCache(user, cacheKey, vals);
-            return vals;
+        public static string[] GetMediaStartNodePaths(this IUser user, IEntityService entityService, AppCaches appCaches)
+        {
+            var cacheKey = CacheKeys.UserMediaStartNodePathsPrefix + user.Id;
+            var runtimeCache = appCaches.IsolatedCaches.GetOrCreate<IUser>();
+            var result = runtimeCache.GetCacheItem(cacheKey, () =>
+            {
+                var startNodeIds = user.CalculateMediaStartNodeIds(entityService, appCaches);
+                var vals = entityService.GetAllPaths(UmbracoObjectTypes.Media, startNodeIds).Select(x => x.Path).ToArray();
+                return vals;
+            }, TimeSpan.FromMinutes(2), true);
+
+            return result;
         }
 
+        [Obsolete("Use the overload specifying all parameters instead")]
         public static string[] GetContentStartNodePaths(this IUser user, IEntityService entityService)
+            => GetContentStartNodePaths(user, entityService, Current.AppCaches);
+
+        public static string[] GetContentStartNodePaths(this IUser user, IEntityService entityService, AppCaches appCaches)
         {
-            const string cacheKey = "ContentStartNodePaths";
-            //try to look them up from cache so we don't recalculate
-            var valuesInUserCache = FromUserCache<string[]>(user, cacheKey);
-            if (valuesInUserCache != null) return valuesInUserCache;
-
-            var startNodeIds = user.CalculateContentStartNodeIds(entityService);
-            var vals = entityService.GetAllPaths(UmbracoObjectTypes.Document, startNodeIds).Select(x => x.Path).ToArray();
-            ToUserCache(user, cacheKey, vals);
-            return vals;
-        }
-
-        private static T FromUserCache<T>(IUser user, string cacheKey)
-            where T: class
-        {
-            if (!(user is User entityUser)) return null;
-
-            lock (entityUser.AdditionalDataLock)
+            var cacheKey = CacheKeys.UserContentStartNodePathsPrefix + user.Id;
+            var runtimeCache = appCaches.IsolatedCaches.GetOrCreate<IUser>();
+            var result = runtimeCache.GetCacheItem(cacheKey, () =>
             {
-                return entityUser.AdditionalData.TryGetValue(cacheKey, out var allContentStartNodes)
-                    ? allContentStartNodes as T
-                    : null;
-            }
-        }
+                var startNodeIds = user.CalculateContentStartNodeIds(entityService, appCaches);
+                var vals = entityService.GetAllPaths(UmbracoObjectTypes.Document, startNodeIds).Select(x => x.Path).ToArray();
+                return vals;
+            }, TimeSpan.FromMinutes(2), true);
 
-        private static void ToUserCache<T>(IUser user, string cacheKey, T vals)
-            where T: class
-        {
-            if (!(user is User entityUser)) return;
-
-            lock (entityUser.AdditionalDataLock)
-            {
-                entityUser.AdditionalData[cacheKey] = vals;
-            }
+            return result;
         }
 
         private static bool StartsWithPath(string test, string path)
diff --git a/src/Umbraco.Core/Security/BackOfficeUserStore.cs b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
index 7df328b5b7..fe1673bca6 100644
--- a/src/Umbraco.Core/Security/BackOfficeUserStore.cs
+++ b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Security;
 using Microsoft.AspNet.Identity;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
@@ -38,20 +40,26 @@ namespace Umbraco.Core.Security
         private readonly IExternalLoginService _externalLoginService;
         private readonly IGlobalSettings _globalSettings;
         private readonly UmbracoMapper _mapper;
+        private readonly AppCaches _appCaches;
         private bool _disposed = false;
 
+        [Obsolete("Use the constructor specifying all dependencies")]
         public BackOfficeUserStore(IUserService userService, IMemberTypeService memberTypeService, IEntityService entityService, IExternalLoginService externalLoginService, IGlobalSettings globalSettings, MembershipProviderBase usersMembershipProvider, UmbracoMapper mapper)
+            : this(userService, memberTypeService, entityService, externalLoginService, globalSettings, usersMembershipProvider, mapper, Current.AppCaches) { }
+
+        public BackOfficeUserStore(IUserService userService, IMemberTypeService memberTypeService, IEntityService entityService, IExternalLoginService externalLoginService, IGlobalSettings globalSettings, MembershipProviderBase usersMembershipProvider, UmbracoMapper mapper, AppCaches appCaches)
         {
+            if (userService == null) throw new ArgumentNullException("userService");
+            if (usersMembershipProvider == null) throw new ArgumentNullException("usersMembershipProvider");
+            if (externalLoginService == null) throw new ArgumentNullException("externalLoginService");
+
             _userService = userService;
             _memberTypeService = memberTypeService;
             _entityService = entityService;
             _externalLoginService = externalLoginService;
-            _globalSettings = globalSettings;
-            if (userService == null) throw new ArgumentNullException("userService");
-            if (usersMembershipProvider == null) throw new ArgumentNullException("usersMembershipProvider");
-            if (externalLoginService == null) throw new ArgumentNullException("externalLoginService");
+            _globalSettings = globalSettings;            
             _mapper = mapper;
-
+            _appCaches = appCaches;
             _userService = userService;
             _externalLoginService = externalLoginService;
 
@@ -775,8 +783,8 @@ namespace Umbraco.Core.Security
             }
 
             //we should re-set the calculated start nodes
-            identityUser.CalculatedMediaStartNodeIds = user.CalculateMediaStartNodeIds(_entityService);
-            identityUser.CalculatedContentStartNodeIds = user.CalculateContentStartNodeIds(_entityService);
+            identityUser.CalculatedMediaStartNodeIds = user.CalculateMediaStartNodeIds(_entityService, _appCaches);
+            identityUser.CalculatedContentStartNodeIds = user.CalculateContentStartNodeIds(_entityService, _appCaches);
 
             //reset all changes
             identityUser.ResetDirtyProperties(false);
diff --git a/src/Umbraco.Core/Security/ContentPermissionsHelper.cs b/src/Umbraco.Core/Security/ContentPermissionsHelper.cs
index 1a329fcdcb..8c3a138f6a 100644
--- a/src/Umbraco.Core/Security/ContentPermissionsHelper.cs
+++ b/src/Umbraco.Core/Security/ContentPermissionsHelper.cs
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
@@ -25,6 +26,7 @@ namespace Umbraco.Core.Security
             IUser user,
             IUserService userService,
             IEntityService entityService,
+            AppCaches appCaches,
             params char[] permissionsToCheck)
         {
             if (user == null) throw new ArgumentNullException("user");
@@ -33,7 +35,7 @@ namespace Umbraco.Core.Security
 
             if (content == null) return ContentAccess.NotFound;
 
-            var hasPathAccess = user.HasPathAccess(content, entityService);
+            var hasPathAccess = user.HasPathAccess(content, entityService, appCaches);
 
             if (hasPathAccess == false)
                 return ContentAccess.Denied;
@@ -52,6 +54,7 @@ namespace Umbraco.Core.Security
             IUser user,
             IUserService userService,
             IEntityService entityService,
+            AppCaches appCaches,
             params char[] permissionsToCheck)
         {
             if (user == null) throw new ArgumentNullException("user");
@@ -60,7 +63,7 @@ namespace Umbraco.Core.Security
 
             if (entity == null) return ContentAccess.NotFound;
 
-            var hasPathAccess = user.HasContentPathAccess(entity, entityService);
+            var hasPathAccess = user.HasContentPathAccess(entity, entityService, appCaches);
 
             if (hasPathAccess == false)
                 return ContentAccess.Denied;
@@ -89,6 +92,7 @@ namespace Umbraco.Core.Security
             IUser user,
             IUserService userService,
             IEntityService entityService,
+            AppCaches appCaches,
             out IUmbracoEntity entity,
             params char[] permissionsToCheck)
         {
@@ -100,16 +104,16 @@ namespace Umbraco.Core.Security
             entity = null;
 
             if (nodeId == Constants.System.Root)
-                hasPathAccess = user.HasContentRootAccess(entityService);
+                hasPathAccess = user.HasContentRootAccess(entityService, appCaches);
             else if (nodeId == Constants.System.RecycleBinContent)
-                hasPathAccess = user.HasContentBinAccess(entityService);
+                hasPathAccess = user.HasContentBinAccess(entityService, appCaches);
 
             if (hasPathAccess.HasValue)
                 return hasPathAccess.Value ? ContentAccess.Granted : ContentAccess.Denied;
 
             entity = entityService.Get(nodeId, UmbracoObjectTypes.Document);
             if (entity == null) return ContentAccess.NotFound;
-            hasPathAccess = user.HasContentPathAccess(entity, entityService);
+            hasPathAccess = user.HasContentPathAccess(entity, entityService, appCaches);
 
             if (hasPathAccess == false)
                 return ContentAccess.Denied;
@@ -140,6 +144,7 @@ namespace Umbraco.Core.Security
             IUserService userService,
             IContentService contentService,
             IEntityService entityService,
+            AppCaches appCaches,
             out IContent contentItem,
             params char[] permissionsToCheck)
         {
@@ -152,16 +157,16 @@ namespace Umbraco.Core.Security
             contentItem = null;
 
             if (nodeId == Constants.System.Root)
-                hasPathAccess = user.HasContentRootAccess(entityService);
+                hasPathAccess = user.HasContentRootAccess(entityService, appCaches);
             else if (nodeId == Constants.System.RecycleBinContent)
-                hasPathAccess = user.HasContentBinAccess(entityService);
+                hasPathAccess = user.HasContentBinAccess(entityService, appCaches);
 
             if (hasPathAccess.HasValue)
                 return hasPathAccess.Value ? ContentAccess.Granted : ContentAccess.Denied;
 
             contentItem = contentService.GetById(nodeId);
             if (contentItem == null) return ContentAccess.NotFound;
-            hasPathAccess = user.HasPathAccess(contentItem, entityService);
+            hasPathAccess = user.HasPathAccess(contentItem, entityService, appCaches);
 
             if (hasPathAccess == false)
                 return ContentAccess.Denied;
diff --git a/src/Umbraco.Tests/Models/UserExtensionsTests.cs b/src/Umbraco.Tests/Models/UserExtensionsTests.cs
index bf76031b59..18ece0c841 100644
--- a/src/Umbraco.Tests/Models/UserExtensionsTests.cs
+++ b/src/Umbraco.Tests/Models/UserExtensionsTests.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
@@ -34,7 +35,7 @@ namespace Umbraco.Tests.Models
                 .Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
                 .Returns<UmbracoObjectTypes, int[]>((type, ids) => new[] { new TreeEntityPath { Id = startNodeId, Path = startNodePath } });
 
-            Assert.AreEqual(outcome, user.HasPathAccess(content, esmock.Object));
+            Assert.AreEqual(outcome, user.HasPathAccess(content, esmock.Object, AppCaches.Disabled));
         }
 
         [TestCase("", "1", "1")] // single user start, top level
diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs
index f55a4e593b..26aea30c26 100644
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs
@@ -2,6 +2,7 @@
 using System.Web.Http;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
@@ -34,7 +35,7 @@ namespace Umbraco.Tests.Web.Controllers
             var userService = userServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, out var foundContent);
+            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent);
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Granted, result);
@@ -62,7 +63,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, out var foundContent, new[] { 'F' });
+            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent, new[] { 'F' });
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.NotFound, result);
@@ -93,7 +94,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, out var foundContent, new[] { 'F' });
+            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent, new[] { 'F' });
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Denied, result);
@@ -124,7 +125,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, out var foundContent, new[] { 'F' });
+            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent, new[] { 'F' });
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Denied, result);
@@ -156,7 +157,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, out var foundContent, new[] { 'F' });
+            var result = ContentPermissionsHelper.CheckPermissions(1234, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent, new[] { 'F' });
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Granted, result);
@@ -178,7 +179,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(-1, user, userService, contentService, entityService, out var foundContent);
+            var result = ContentPermissionsHelper.CheckPermissions(-1, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent);
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Granted, result);
@@ -200,7 +201,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(-20, user, userService, contentService, entityService, out var foundContent);
+            var result = ContentPermissionsHelper.CheckPermissions(-20, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent);
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Granted, result);
@@ -224,7 +225,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(-20, user, userService, contentService, entityService, out var foundContent);
+            var result = ContentPermissionsHelper.CheckPermissions(-20, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent);
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Denied, result);
@@ -248,7 +249,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(-1, user, userService, contentService, entityService, out var foundContent);
+            var result = ContentPermissionsHelper.CheckPermissions(-1, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent);
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Denied, result);
@@ -278,7 +279,7 @@ namespace Umbraco.Tests.Web.Controllers
 
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(-1, user, userService, contentService, entityService, out var foundContent, new[] { 'A' });
+            var result = ContentPermissionsHelper.CheckPermissions(-1, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent, new[] { 'A' });
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Granted, result);
@@ -306,7 +307,7 @@ namespace Umbraco.Tests.Web.Controllers
             var contentService = contentServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(-1, user, userService, contentService, entityService, out var foundContent, new[] { 'B' });
+            var result = ContentPermissionsHelper.CheckPermissions(-1, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent, new[] { 'B' });
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Denied, result);
@@ -336,7 +337,7 @@ namespace Umbraco.Tests.Web.Controllers
             var contentService = contentServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(-20, user, userService, contentService, entityService, out var foundContent, new[] { 'A' });
+            var result = ContentPermissionsHelper.CheckPermissions(-20, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent, new[] { 'A' });
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Granted, result);
@@ -364,7 +365,7 @@ namespace Umbraco.Tests.Web.Controllers
             var contentService = contentServiceMock.Object;
 
             //act
-            var result = ContentPermissionsHelper.CheckPermissions(-20, user, userService, contentService, entityService, out var foundContent, new[] { 'B' });
+            var result = ContentPermissionsHelper.CheckPermissions(-20, user, userService, contentService, entityService, AppCaches.Disabled, out var foundContent, new[] { 'B' });
 
             //assert
             Assert.AreEqual(ContentPermissionsHelper.ContentAccess.Denied, result);
diff --git a/src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs b/src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs
index f409d81a2d..c347d81288 100644
--- a/src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs
@@ -2,6 +2,7 @@
 using System.Web.Http;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
@@ -31,7 +32,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, 1234);
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, AppCaches.Disabled, 1234);
 
             //assert
             Assert.IsTrue(result);
@@ -54,7 +55,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act/assert
-            Assert.Throws<HttpResponseException>(() => MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, 1234));
+            Assert.Throws<HttpResponseException>(() => MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, AppCaches.Disabled, 1234));
         }
 
         [Test]
@@ -77,7 +78,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, 1234);
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, AppCaches.Disabled, 1234);
 
             //assert
             Assert.IsFalse(result);
@@ -97,7 +98,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, -1);
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, AppCaches.Disabled, -1);
 
             //assert
             Assert.IsTrue(result);
@@ -119,7 +120,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, -1);
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, AppCaches.Disabled, -1);
 
             //assert
             Assert.IsFalse(result);
@@ -139,7 +140,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, -21);
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, AppCaches.Disabled, -21);
 
             //assert
             Assert.IsTrue(result);
@@ -161,7 +162,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityService = entityServiceMock.Object;
 
             //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, -21);
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, entityService, AppCaches.Disabled, -21);
 
             //assert
             Assert.IsFalse(result);
diff --git a/src/Umbraco.Tests/Web/Controllers/UserEditorAuthorizationHelperTests.cs b/src/Umbraco.Tests/Web/Controllers/UserEditorAuthorizationHelperTests.cs
index 04694b21ee..4478b59085 100644
--- a/src/Umbraco.Tests/Web/Controllers/UserEditorAuthorizationHelperTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UserEditorAuthorizationHelperTests.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
@@ -32,7 +33,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new string[0]);
 
@@ -54,7 +56,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new string[0]);
 
@@ -79,7 +82,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] {"FunGroup"});
 
@@ -104,7 +108,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] { "test" });
 
@@ -141,7 +146,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             //adding 5555 which currentUser has access to since it's a child of 9876 ... adding is still ok even though currentUser doesn't have access to 1234
             var result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 1234, 5555 }, new int[0], new string[0]);
@@ -179,7 +185,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             //removing 4567 start node even though currentUser doesn't have acces to it ... removing is ok
             var result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 1234 }, new int[0], new string[0]);
@@ -217,7 +224,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             //adding 1234 but currentUser doesn't have access to it ... nope
             var result = authHelper.IsAuthorized(currentUser, savingUser, new []{1234}, new int[0], new string[0]);
@@ -255,7 +263,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             //adding 5555 which currentUser has access to since it's a child of 9876 ... ok
             var result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 5555 }, new int[0], new string[0]);
@@ -293,7 +302,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             //adding 1234 but currentUser doesn't have access to it ... nope
             var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] {1234}, new string[0]);
@@ -331,7 +341,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             //adding 5555 which currentUser has access to since it's a child of 9876 ... ok
             var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 5555 }, new string[0]);
@@ -369,7 +380,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             //adding 5555 which currentUser has access to since it's a child of 9876 ... adding is still ok even though currentUser doesn't have access to 1234
             var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 1234, 5555 }, new string[0]);
@@ -407,7 +419,8 @@ namespace Umbraco.Tests.Web.Controllers
                 contentService.Object,
                 mediaService.Object,
                 userService.Object,
-                entityService.Object);
+                entityService.Object,
+                AppCaches.Disabled);
 
             //removing 4567 start node even though currentUser doesn't have acces to it ... removing is ok
             var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 1234 }, new string[0]);
diff --git a/src/Umbraco.Web/Cache/UserCacheRefresher.cs b/src/Umbraco.Web/Cache/UserCacheRefresher.cs
index 922a9df385..ce2cbbf754 100644
--- a/src/Umbraco.Web/Cache/UserCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/UserCacheRefresher.cs
@@ -42,7 +42,14 @@ namespace Umbraco.Web.Cache
         {
             var userCache = AppCaches.IsolatedCaches.Get<IUser>();
             if (userCache)
+            {
                 userCache.Result.Clear(RepositoryCacheKeys.GetKey<IUser>(id));
+                userCache.Result.ClearByKey(CacheKeys.UserContentStartNodePathsPrefix + id);
+                userCache.Result.ClearByKey(CacheKeys.UserMediaStartNodePathsPrefix + id);
+                userCache.Result.ClearByKey(CacheKeys.UserAllContentStartNodesPrefix + id);
+                userCache.Result.ClearByKey(CacheKeys.UserAllMediaStartNodesPrefix + id);
+            }
+                
 
             base.Remove(id);
         }
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 6f85a08751..7093edf23d 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1168,7 +1168,7 @@ namespace Umbraco.Web.Editors
                     //if this item's path has already been denied or if the user doesn't have access to it, add to the deny list
                     if (denied.Any(x => c.Path.StartsWith($"{x.Path},"))
                         || (ContentPermissionsHelper.CheckPermissions(c,
-                            Security.CurrentUser, Services.UserService, Services.EntityService,
+                            Security.CurrentUser, Services.UserService, Services.EntityService, AppCaches,
                             ActionPublish.ActionLetter) == ContentPermissionsHelper.ContentAccess.Denied))
                     {
                         denied.Add(c);
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 65d9305906..456e0e20f2 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -670,9 +670,9 @@ namespace Umbraco.Web.Editors
             switch (type)
             {
                 case UmbracoEntityTypes.Document:
-                    return Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                    return Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService, AppCaches);
                 case UmbracoEntityTypes.Media:
-                    return Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                    return Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService, AppCaches);
                 default:
                     return  Array.Empty<int>();
             }
@@ -811,10 +811,10 @@ namespace Umbraco.Web.Editors
                     switch (entityType)
                     {
                         case UmbracoEntityTypes.Document:
-                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
+                            aids = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService, AppCaches);
                             break;
                         case UmbracoEntityTypes.Media:
-                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
+                            aids = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService, AppCaches);
                             break;
                     }
 
diff --git a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
index fbce2d0414..c0e190989a 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
@@ -7,6 +7,7 @@ using System.Web.Http;
 using System.Web.Http.Controllers;
 using System.Web.Http.Filters;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Security;
@@ -29,11 +30,12 @@ namespace Umbraco.Web.Editors.Filters
         private readonly IContentService _contentService;
         private readonly IUserService _userService;
         private readonly IEntityService _entityService;
+        private readonly AppCaches _appCaches;
 
-        public ContentSaveValidationAttribute(): this(Current.Logger, Current.UmbracoContextAccessor, Current.Services.TextService, Current.Services.ContentService, Current.Services.UserService, Current.Services.EntityService)
+        public ContentSaveValidationAttribute(): this(Current.Logger, Current.UmbracoContextAccessor, Current.Services.TextService, Current.Services.ContentService, Current.Services.UserService, Current.Services.EntityService, Current.AppCaches)
         { }
 
-        public ContentSaveValidationAttribute(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService textService, IContentService contentService, IUserService userService, IEntityService entityService)
+        public ContentSaveValidationAttribute(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService textService, IContentService contentService, IUserService userService, IEntityService entityService, AppCaches appCaches)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
@@ -41,6 +43,7 @@ namespace Umbraco.Web.Editors.Filters
             _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
             _userService = userService ?? throw new ArgumentNullException(nameof(userService));
             _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
+            _appCaches = appCaches;
         }
 
         public override void OnActionExecuting(HttpActionContext actionContext)
@@ -195,13 +198,13 @@ namespace Umbraco.Web.Editors.Filters
 
                 accessResult = ContentPermissionsHelper.CheckPermissions(
                     contentToCheck, webSecurity.CurrentUser,
-                    _userService, _entityService, permissionToCheck.ToArray());
+                    _userService, _entityService, _appCaches, permissionToCheck.ToArray());
             }
             else
             {
                 accessResult = ContentPermissionsHelper.CheckPermissions(
                        contentIdToCheck, webSecurity.CurrentUser,
-                       _userService, _contentService, _entityService,
+                       _userService, _contentService, _entityService, _appCaches,
                        out contentToCheck,
                        permissionToCheck.ToArray());
                 if (contentToCheck != null)
diff --git a/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
index 449ef95675..af973d0662 100644
--- a/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
@@ -4,6 +4,7 @@ using System.Net.Http;
 using System.Web.Http.Controllers;
 using System.Web.Http.Filters;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
@@ -23,18 +24,20 @@ namespace Umbraco.Web.Editors.Filters
         private readonly ILocalizedTextService _textService;
         private readonly IMediaService _mediaService;
         private readonly IEntityService _entityService;
+        private readonly AppCaches _appCaches;
 
-        public MediaItemSaveValidationAttribute() : this(Current.Logger, Current.UmbracoContextAccessor, Current.Services.TextService, Current.Services.MediaService, Current.Services.EntityService)
+        public MediaItemSaveValidationAttribute() : this(Current.Logger, Current.UmbracoContextAccessor, Current.Services.TextService, Current.Services.MediaService, Current.Services.EntityService, Current.AppCaches)
         {
         }
 
-        public MediaItemSaveValidationAttribute(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService textService, IMediaService mediaService, IEntityService entityService)
+        public MediaItemSaveValidationAttribute(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService textService, IMediaService mediaService, IEntityService entityService, AppCaches appCaches)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
             _textService = textService ?? throw new ArgumentNullException(nameof(textService));
             _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService));
             _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
+            _appCaches = appCaches;
         }
 
         public override void OnActionExecuting(HttpActionContext actionContext)
@@ -91,7 +94,7 @@ namespace Umbraco.Web.Editors.Filters
             if (MediaController.CheckPermissions(
                     actionContext.Request.Properties,
                     _umbracoContextAccessor.UmbracoContext.Security.CurrentUser,
-                    _mediaService, _entityService,
+                    _mediaService, _entityService, _appCaches,
                     contentIdToCheck, contentToCheck) == false)
             {
                 actionContext.Response = actionContext.Request.CreateUserNoAccessResponse();
diff --git a/src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs b/src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
index e1d6626055..e94098db82 100644
--- a/src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
@@ -54,7 +54,8 @@ namespace Umbraco.Web.Editors.Filters
                 Current.Services.UserService,
                 Current.Services.ContentService,
                 Current.Services.MediaService,
-                Current.Services.EntityService);
+                Current.Services.EntityService,
+                Current.AppCaches);
             return authHelper.AuthorizeGroupAccess(currentUser, intIds);
         }
     }
diff --git a/src/Umbraco.Web/Editors/Filters/UserGroupEditorAuthorizationHelper.cs b/src/Umbraco.Web/Editors/Filters/UserGroupEditorAuthorizationHelper.cs
index 985c42bbbf..ea403758d0 100644
--- a/src/Umbraco.Web/Editors/Filters/UserGroupEditorAuthorizationHelper.cs
+++ b/src/Umbraco.Web/Editors/Filters/UserGroupEditorAuthorizationHelper.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
@@ -13,13 +14,15 @@ namespace Umbraco.Web.Editors.Filters
         private readonly IContentService _contentService;
         private readonly IMediaService _mediaService;
         private readonly IEntityService _entityService;
+        private readonly AppCaches _appCaches;
 
-        public UserGroupEditorAuthorizationHelper(IUserService userService, IContentService contentService, IMediaService mediaService, IEntityService entityService)
+        public UserGroupEditorAuthorizationHelper(IUserService userService, IContentService contentService, IMediaService mediaService, IEntityService entityService, AppCaches appCaches)
         {
             _userService = userService;
             _contentService = contentService;
             _mediaService = mediaService;
             _entityService = entityService;
+            _appCaches = appCaches;
         }
 
         /// <summary>
@@ -111,7 +114,7 @@ namespace Umbraco.Web.Editors.Filters
                 var content = _contentService.GetById(proposedContentStartId.Value);
                 if (content != null)
                 {
-                    if (currentUser.HasPathAccess(content, _entityService) == false)
+                    if (currentUser.HasPathAccess(content, _entityService, _appCaches) == false)
                         return Attempt.Fail("Current user doesn't have access to the content path " + content.Path);
                 }
             }
@@ -121,7 +124,7 @@ namespace Umbraco.Web.Editors.Filters
                 var media = _mediaService.GetById(proposedMediaStartId.Value);
                 if (media != null)
                 {
-                    if (currentUser.HasPathAccess(media, _entityService) == false)
+                    if (currentUser.HasPathAccess(media, _entityService, _appCaches) == false)
                         return Attempt.Fail("Current user doesn't have access to the media path " + media.Path);
                 }
             }
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index dfe6939552..022512e2a4 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -239,7 +239,7 @@ namespace Umbraco.Web.Editors
 
         protected int[] UserStartNodes
         {
-            get { return _userStartNodes ?? (_userStartNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService)); }
+            get { return _userStartNodes ?? (_userStartNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService, AppCaches)); }
         }
 
         /// <summary>
@@ -835,6 +835,7 @@ namespace Umbraco.Web.Editors
                     Security.CurrentUser,
                     Services.MediaService,
                     Services.EntityService,
+                    AppCaches,
                     intParentId) == false)
             {
                 throw new HttpResponseException(Request.CreateResponse(
@@ -919,7 +920,7 @@ namespace Umbraco.Web.Editors
         /// <param name="nodeId">The content to lookup, if the contentItem is not specified</param>
         /// <param name="media">Specifies the already resolved content item to check against, setting this ignores the nodeId</param>
         /// <returns></returns>
-        internal static bool CheckPermissions(IDictionary<string, object> storage, IUser user, IMediaService mediaService, IEntityService entityService, int nodeId, IMedia media = null)
+        internal static bool CheckPermissions(IDictionary<string, object> storage, IUser user, IMediaService mediaService, IEntityService entityService, AppCaches appCaches, int nodeId, IMedia media = null)
         {
             if (storage == null) throw new ArgumentNullException("storage");
             if (user == null) throw new ArgumentNullException("user");
@@ -940,10 +941,10 @@ namespace Umbraco.Web.Editors
             }
 
             var hasPathAccess = (nodeId == Constants.System.Root)
-                ? user.HasMediaRootAccess(entityService)
+                ? user.HasMediaRootAccess(entityService, appCaches)
                 : (nodeId == Constants.System.RecycleBinMedia)
-                    ? user.HasMediaBinAccess(entityService)
-                    : user.HasPathAccess(media, entityService);
+                    ? user.HasMediaBinAccess(entityService, appCaches)
+                    : user.HasPathAccess(media, entityService, appCaches);
 
             return hasPathAccess;
         }
diff --git a/src/Umbraco.Web/Editors/UserEditorAuthorizationHelper.cs b/src/Umbraco.Web/Editors/UserEditorAuthorizationHelper.cs
index 320580aaf9..f666b6d5a3 100644
--- a/src/Umbraco.Web/Editors/UserEditorAuthorizationHelper.cs
+++ b/src/Umbraco.Web/Editors/UserEditorAuthorizationHelper.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Security;
@@ -14,13 +15,15 @@ namespace Umbraco.Web.Editors
         private readonly IMediaService _mediaService;
         private readonly IUserService _userService;
         private readonly IEntityService _entityService;
+        private readonly AppCaches _appCaches;
 
-        public UserEditorAuthorizationHelper(IContentService contentService, IMediaService mediaService, IUserService userService, IEntityService entityService)
+        public UserEditorAuthorizationHelper(IContentService contentService, IMediaService mediaService, IUserService userService, IEntityService entityService, AppCaches appCaches)
         {
             _contentService = contentService;
             _mediaService = mediaService;
             _userService = userService;
             _entityService = entityService;
+            _appCaches = appCaches;
         }
 
         /// <summary>
@@ -114,7 +117,7 @@ namespace Umbraco.Web.Editors
                 {
                     if (contentId == Constants.System.Root)
                     {
-                        var hasAccess = ContentPermissionsHelper.HasPathAccess("-1", currentUser.CalculateContentStartNodeIds(_entityService), Constants.System.RecycleBinContent);
+                        var hasAccess = ContentPermissionsHelper.HasPathAccess("-1", currentUser.CalculateContentStartNodeIds(_entityService, _appCaches), Constants.System.RecycleBinContent);
                         if (hasAccess == false)
                             return Attempt.Fail("The current user does not have access to the content root");
                     }
@@ -122,7 +125,7 @@ namespace Umbraco.Web.Editors
                     {
                         var content = _contentService.GetById(contentId);
                         if (content == null) continue;
-                        var hasAccess = currentUser.HasPathAccess(content, _entityService);
+                        var hasAccess = currentUser.HasPathAccess(content, _entityService, _appCaches);
                         if (hasAccess == false)
                             return Attempt.Fail("The current user does not have access to the content path " + content.Path);
                     }
@@ -135,7 +138,7 @@ namespace Umbraco.Web.Editors
                 {
                     if (mediaId == Constants.System.Root)
                     {
-                        var hasAccess = ContentPermissionsHelper.HasPathAccess("-1", currentUser.CalculateMediaStartNodeIds(_entityService), Constants.System.RecycleBinMedia);
+                        var hasAccess = ContentPermissionsHelper.HasPathAccess("-1", currentUser.CalculateMediaStartNodeIds(_entityService, _appCaches), Constants.System.RecycleBinMedia);
                         if (hasAccess == false)
                             return Attempt.Fail("The current user does not have access to the media root");
                     }
@@ -143,7 +146,7 @@ namespace Umbraco.Web.Editors
                     {
                         var media = _mediaService.GetById(mediaId);
                         if (media == null) continue;
-                        var hasAccess = currentUser.HasPathAccess(media, _entityService);
+                        var hasAccess = currentUser.HasPathAccess(media, _entityService, _appCaches);
                         if (hasAccess == false)
                             return Attempt.Fail("The current user does not have access to the media path " + media.Path);
                     }
diff --git a/src/Umbraco.Web/Editors/UserGroupsController.cs b/src/Umbraco.Web/Editors/UserGroupsController.cs
index b081ca6137..77f7a305af 100644
--- a/src/Umbraco.Web/Editors/UserGroupsController.cs
+++ b/src/Umbraco.Web/Editors/UserGroupsController.cs
@@ -28,7 +28,11 @@ namespace Umbraco.Web.Editors
 
             //authorize that the user has access to save this user group
             var authHelper = new UserGroupEditorAuthorizationHelper(
-                Services.UserService, Services.ContentService, Services.MediaService, Services.EntityService);
+                Services.UserService,
+                Services.ContentService,
+                Services.MediaService,
+                Services.EntityService,
+                AppCaches);
 
             var isAuthorized = authHelper.AuthorizeGroupAccess(Security.CurrentUser, userGroupSave.Alias);
             if (isAuthorized == false)
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index b022e6f27a..21a32ef12f 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -304,7 +304,7 @@ namespace Umbraco.Web.Editors
             CheckUniqueEmail(userSave.Email, null);
 
             //Perform authorization here to see if the current user can actually save this user with the info being requested
-            var authHelper = new UserEditorAuthorizationHelper(Services.ContentService, Services.MediaService, Services.UserService, Services.EntityService);
+            var authHelper = new UserEditorAuthorizationHelper(Services.ContentService, Services.MediaService, Services.UserService, Services.EntityService, AppCaches);
             var canSaveUser = authHelper.IsAuthorized(Security.CurrentUser, null, null, null, userSave.UserGroups);
             if (canSaveUser == false)
             {
@@ -398,7 +398,7 @@ namespace Umbraco.Web.Editors
             }
 
             //Perform authorization here to see if the current user can actually save this user with the info being requested
-            var authHelper = new UserEditorAuthorizationHelper(Services.ContentService, Services.MediaService, Services.UserService, Services.EntityService);
+            var authHelper = new UserEditorAuthorizationHelper(Services.ContentService, Services.MediaService, Services.UserService, Services.EntityService, AppCaches);
             var canSaveUser = authHelper.IsAuthorized(Security.CurrentUser, user, null, null, userSave.UserGroups);
             if (canSaveUser == false)
             {
@@ -573,7 +573,7 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.NotFound);
 
             //Perform authorization here to see if the current user can actually save this user with the info being requested
-            var authHelper = new UserEditorAuthorizationHelper(Services.ContentService, Services.MediaService, Services.UserService, Services.EntityService);
+            var authHelper = new UserEditorAuthorizationHelper(Services.ContentService, Services.MediaService, Services.UserService, Services.EntityService, AppCaches);
             var canSaveUser = authHelper.IsAuthorized(Security.CurrentUser, found, userSave.StartContentIds, userSave.StartMediaIds, userSave.UserGroups);
             if (canSaveUser == false)
             {
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
index 983172f8e1..ec3367d4d3 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
@@ -29,14 +31,25 @@ namespace Umbraco.Web.Models.Mapping
         private readonly ILogger _logger;
         private readonly IUserService _userService;
         private readonly IEntityService _entityService;
+        private readonly AppCaches _appCaches;
         private readonly TabsAndPropertiesMapper<IContent> _tabsAndPropertiesMapper;
         private readonly ContentSavedStateMapper<ContentPropertyDisplay> _stateMapper;
         private readonly ContentBasicSavedStateMapper<ContentPropertyBasic> _basicStateMapper;
         private readonly ContentVariantMapper _contentVariantMapper;
 
-        public ContentMapDefinition(CommonMapper commonMapper, ILocalizedTextService localizedTextService, IContentService contentService, IContentTypeService contentTypeService,
-            IFileService fileService, IUmbracoContextAccessor umbracoContextAccessor, IPublishedRouter publishedRouter, ILocalizationService localizationService, ILogger logger,
-            IUserService userService, IEntityService entityService)
+        public ContentMapDefinition(
+            CommonMapper commonMapper,
+            ILocalizedTextService localizedTextService,
+            IContentService contentService,
+            IContentTypeService contentTypeService,
+            IFileService fileService,
+            IUmbracoContextAccessor umbracoContextAccessor,
+            IPublishedRouter publishedRouter,
+            ILocalizationService localizationService,
+            ILogger logger,
+            IUserService userService,
+            IEntityService entityService,
+            AppCaches appCaches)
         {
             _commonMapper = commonMapper;
             _localizedTextService = localizedTextService;
@@ -49,6 +62,7 @@ namespace Umbraco.Web.Models.Mapping
             _logger = logger;
             _userService = userService;
             _entityService = entityService;
+            _appCaches = appCaches;
             _tabsAndPropertiesMapper = new TabsAndPropertiesMapper<IContent>(localizedTextService);
             _stateMapper = new ContentSavedStateMapper<ContentPropertyDisplay>();
             _basicStateMapper = new ContentBasicSavedStateMapper<ContentPropertyBasic>();
@@ -238,7 +252,7 @@ namespace Umbraco.Web.Models.Mapping
             // false here.
             if (context.HasItems && context.Items.TryGetValue("CurrentUser", out var usr) && usr is IUser currentUser)
             {
-                userStartNodes = currentUser.CalculateContentStartNodeIds(_entityService);
+                userStartNodes = currentUser.CalculateContentStartNodeIds(_entityService, _appCaches);
                 if (!userStartNodes.Contains(Constants.System.Root))
                 {
                     // return false if this is the user's actual start node, the node will be rendered in the tree
diff --git a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
index aa158799cb..6c58309f57 100644
--- a/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
@@ -273,8 +273,8 @@ namespace Umbraco.Web.Models.Mapping
         {
             target.AvailableCultures = _textService.GetSupportedCultures().ToDictionary(x => x.Name, x => x.DisplayName);
             target.Avatars = source.GetUserAvatarUrls(_appCaches.RuntimeCache);
-            target.CalculatedStartContentIds = GetStartNodes(source.CalculateContentStartNodeIds(_entityService), UmbracoObjectTypes.Document, "content/contentRoot", context);
-            target.CalculatedStartMediaIds = GetStartNodes(source.CalculateMediaStartNodeIds(_entityService), UmbracoObjectTypes.Media, "media/mediaRoot", context);
+            target.CalculatedStartContentIds = GetStartNodes(source.CalculateContentStartNodeIds(_entityService, _appCaches), UmbracoObjectTypes.Document, "content/contentRoot", context);
+            target.CalculatedStartMediaIds = GetStartNodes(source.CalculateMediaStartNodeIds(_entityService, _appCaches), UmbracoObjectTypes.Media, "media/mediaRoot", context);
             target.CreateDate = source.CreateDate;
             target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString();
             target.Email = source.Email;
@@ -327,8 +327,8 @@ namespace Umbraco.Web.Models.Mapping
             target.Email = source.Email;
             target.EmailHash = source.Email.ToLowerInvariant().Trim().GenerateHash();
             target.Name = source.Name;
-            target.StartContentIds = source.CalculateContentStartNodeIds(_entityService);
-            target.StartMediaIds = source.CalculateMediaStartNodeIds(_entityService);
+            target.StartContentIds = source.CalculateContentStartNodeIds(_entityService, _appCaches);
+            target.StartMediaIds = source.CalculateMediaStartNodeIds(_entityService, _appCaches);
             target.UserId = source.Id;
 
             //we need to map the legacy UserType
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index a22e2a6f6a..6d777287d6 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -5,6 +5,8 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Examine;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
@@ -30,14 +32,29 @@ namespace Umbraco.Web.Search
         private readonly UmbracoMapper _mapper;
         private readonly ISqlContext _sqlContext;
         private readonly IUmbracoTreeSearcherFields _umbracoTreeSearcherFields;
+        private readonly AppCaches _appCaches;
 
-
-        public UmbracoTreeSearcher(IExamineManager examineManager,
+        [Obsolete("Use constructor specifying all dependencies instead")]
+        public UmbracoTreeSearcher(
+            IExamineManager examineManager,
             UmbracoContext umbracoContext,
             ILocalizationService languageService,
             IEntityService entityService,
             UmbracoMapper mapper,
-            ISqlContext sqlContext,IUmbracoTreeSearcherFields umbracoTreeSearcherFields)
+            ISqlContext sqlContext,
+            IUmbracoTreeSearcherFields umbracoTreeSearcherFields)
+            : this(examineManager, umbracoContext, languageService, entityService, mapper, sqlContext, umbracoTreeSearcherFields, Current.AppCaches)
+        { }
+
+        public UmbracoTreeSearcher(
+            IExamineManager examineManager,
+            UmbracoContext umbracoContext,
+            ILocalizationService languageService,
+            IEntityService entityService,
+            UmbracoMapper mapper,
+            ISqlContext sqlContext,
+            IUmbracoTreeSearcherFields umbracoTreeSearcherFields,
+            AppCaches appCaches)
         {
             _examineManager = examineManager ?? throw new ArgumentNullException(nameof(examineManager));
             _umbracoContext = umbracoContext;
@@ -46,6 +63,7 @@ namespace Umbraco.Web.Search
             _mapper = mapper;
             _sqlContext = sqlContext;
             _umbracoTreeSearcherFields = umbracoTreeSearcherFields;
+            _appCaches = appCaches;
         }
 
         /// <summary>
@@ -112,13 +130,13 @@ namespace Umbraco.Web.Search
                 case UmbracoEntityTypes.Media:
                     type = "media";
                     fields.AddRange(_umbracoTreeSearcherFields.GetBackOfficeMediaFields());
-                    var allMediaStartNodes = _umbracoContext.Security.CurrentUser.CalculateMediaStartNodeIds(_entityService);
+                    var allMediaStartNodes = _umbracoContext.Security.CurrentUser.CalculateMediaStartNodeIds(_entityService, _appCaches);
                     AppendPath(sb, UmbracoObjectTypes.Media, allMediaStartNodes, searchFrom, ignoreUserStartNodes, _entityService);
                     break;
                 case UmbracoEntityTypes.Document:
                     type = "content";
                     fields.AddRange(_umbracoTreeSearcherFields.GetBackOfficeDocumentFields());
-                    var allContentStartNodes = _umbracoContext.Security.CurrentUser.CalculateContentStartNodeIds(_entityService);
+                    var allContentStartNodes = _umbracoContext.Security.CurrentUser.CalculateContentStartNodeIds(_entityService, _appCaches);
                     AppendPath(sb, UmbracoObjectTypes.Document, allContentStartNodes, searchFrom, ignoreUserStartNodes, _entityService);
                     break;
                 default:
@@ -462,11 +480,13 @@ namespace Umbraco.Web.Search
             var defaultLang = _languageService.GetDefaultLanguageIsoCode();
             foreach (var result in results)
             {
-                var entity = _mapper.Map<SearchResultEntity>(result, context => {
-                        if(culture != null) {
-                            context.SetCulture(culture);
-                        }
+                var entity = _mapper.Map<SearchResultEntity>(result, context =>
+                {
+                    if (culture != null)
+                    {
+                        context.SetCulture(culture);
                     }
+                }
                 );
 
                 var intId = entity.Id.TryConvertTo<int>();
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 663af43643..4bf5be4008 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Web.Trees
         private int[] _userStartNodes;
 
         protected override int[] UserStartNodes
-            => _userStartNodes ?? (_userStartNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService));
+            => _userStartNodes ?? (_userStartNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService, AppCaches));
 
         public ContentTreeController(UmbracoTreeSearcher treeSearcher, ActionCollection actions, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
@@ -165,7 +165,7 @@ namespace Umbraco.Web.Trees
             }
 
             //if the user has no path access for this node, all they can do is refresh
-            if (!Security.CurrentUser.HasContentPathAccess(item, Services.EntityService))
+            if (!Security.CurrentUser.HasContentPathAccess(item, Services.EntityService, AppCaches))
             {
                 var menu = new MenuItemCollection();
                 menu.Items.Add(new RefreshNode(Services.TextService, true));
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 95de72b7bf..afb38dea07 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -126,12 +126,12 @@ namespace Umbraco.Web.Trees
             switch (RecycleBinId)
             {
                 case Constants.System.RecycleBinMedia:
-                    startNodeIds = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
-                    startNodePaths = Security.CurrentUser.GetMediaStartNodePaths(Services.EntityService);
+                    startNodeIds = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService, AppCaches);
+                    startNodePaths = Security.CurrentUser.GetMediaStartNodePaths(Services.EntityService, AppCaches);
                     break;
                 case Constants.System.RecycleBinContent:
-                    startNodeIds = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
-                    startNodePaths = Security.CurrentUser.GetContentStartNodePaths(Services.EntityService);
+                    startNodeIds = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService, AppCaches);
+                    startNodePaths = Security.CurrentUser.GetContentStartNodePaths(Services.EntityService, AppCaches);
                     break;
                 default:
                     throw new NotSupportedException("Path access is only determined on content or media");
@@ -291,8 +291,8 @@ namespace Umbraco.Web.Trees
         {
             if (entity == null) return false;
             return RecycleBinId == Constants.System.RecycleBinContent
-                ? Security.CurrentUser.HasContentPathAccess(entity, Services.EntityService)
-                : Security.CurrentUser.HasMediaPathAccess(entity, Services.EntityService);
+                ? Security.CurrentUser.HasContentPathAccess(entity, Services.EntityService, AppCaches)
+                : Security.CurrentUser.HasMediaPathAccess(entity, Services.EntityService, AppCaches);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index df44a809c9..2ad3c2af0a 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Web.Trees
 
         private int[] _userStartNodes;
         protected override int[] UserStartNodes
-            => _userStartNodes ?? (_userStartNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService));
+            => _userStartNodes ?? (_userStartNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService, AppCaches));
 
         /// <summary>
         /// Creates a tree node for a content item based on an UmbracoEntity
@@ -117,7 +117,7 @@ namespace Umbraco.Web.Trees
             }
 
             //if the user has no path access for this node, all they can do is refresh
-            if (!Security.CurrentUser.HasMediaPathAccess(item, Services.EntityService))
+            if (!Security.CurrentUser.HasMediaPathAccess(item, Services.EntityService, AppCaches))
             {
                 menu.Items.Add(new RefreshNode(Services.TextService, true));
                 return menu;
diff --git a/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
index 96226622b0..3494a5c0c7 100644
--- a/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Web.WebApi.Filters
             if (userIds.Length == 0) return base.IsAuthorized(actionContext);
 
             var users = Current.Services.UserService.GetUsersById(userIds);
-            var authHelper = new UserEditorAuthorizationHelper(Current.Services.ContentService, Current.Services.MediaService, Current.Services.UserService, Current.Services.EntityService);
+            var authHelper = new UserEditorAuthorizationHelper(Current.Services.ContentService, Current.Services.MediaService, Current.Services.UserService, Current.Services.EntityService, Current.AppCaches);
             return users.All(user => authHelper.IsAuthorized(Current.UmbracoContext.Security.CurrentUser, user, null, null, null) != false);
         }
     }
diff --git a/src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs b/src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
index 2a57ec10b2..3bbee7ca41 100644
--- a/src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
@@ -85,12 +85,12 @@ namespace Umbraco.Web.WebApi.Filters
                 () => user.Groups.Select(x => x.Alias).UnsortedSequenceEqual(identity.Roles) == false,
                 () =>
                 {
-                    var startContentIds = UserExtensions.CalculateContentStartNodeIds(user, Current.Services.EntityService);
+                    var startContentIds = UserExtensions.CalculateContentStartNodeIds(user, Current.Services.EntityService, Current.AppCaches);
                     return startContentIds.UnsortedSequenceEqual(identity.StartContentNodes) == false;
                 },
                 () =>
                 {
-                    var startMediaIds = UserExtensions.CalculateMediaStartNodeIds(user, Current.Services.EntityService);
+                    var startMediaIds = UserExtensions.CalculateMediaStartNodeIds(user, Current.Services.EntityService, Current.AppCaches);
                     return startMediaIds.UnsortedSequenceEqual(identity.StartMediaNodes) == false;
                 }
             };
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
index 28f09b46b7..fcf8cf1dd6 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
@@ -115,11 +115,13 @@ namespace Umbraco.Web.WebApi.Filters
                 nodeId = _nodeId.Value;
             }
 
-            var permissionResult = ContentPermissionsHelper.CheckPermissions(nodeId,
+            var permissionResult = ContentPermissionsHelper.CheckPermissions(
+                nodeId,
                 Current.UmbracoContext.Security.CurrentUser,
                 Current.Services.UserService,
                 Current.Services.ContentService,
                 Current.Services.EntityService,
+                Current.AppCaches,
                 out var contentItem,
                 _permissionToCheck.HasValue ? new[] { _permissionToCheck.Value } : null);
 
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
index 60e2889fd5..ef99aa4778 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
@@ -124,6 +124,7 @@ namespace Umbraco.Web.WebApi.Filters
                 Current.UmbracoContext.Security.CurrentUser,
                 Current.Services.MediaService,
                 Current.Services.EntityService,
+                Current.AppCaches,
                 nodeId))
             {
                 base.OnActionExecuting(actionContext);
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs
index 31e0b22ce1..23512aa144 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs
@@ -9,7 +9,7 @@ using Umbraco.Core;
 using Umbraco.Web.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Web.Actions;
-
+using Umbraco.Core.Cache;
 
 namespace Umbraco.Web.WebApi.Filters
 {
@@ -21,52 +21,48 @@ namespace Umbraco.Web.WebApi.Filters
     {
         private readonly IUserService _userService;
         private readonly IEntityService _entityService;
+        private readonly AppCaches _appCaches;
         private readonly char _permissionToCheck;
 
         public FilterAllowedOutgoingContentAttribute(Type outgoingType)
-            : this(outgoingType, Current.Services.UserService, Current.Services.EntityService)
+            : this(outgoingType, ActionBrowse.ActionLetter, string.Empty, Current.Services.UserService, Current.Services.EntityService, Current.AppCaches)
         {
-            _permissionToCheck = ActionBrowse.ActionLetter;
         }
 
         public FilterAllowedOutgoingContentAttribute(Type outgoingType, char permissionToCheck)
-            : this(outgoingType, Current.Services.UserService, Current.Services.EntityService)
+            : this(outgoingType, permissionToCheck, string.Empty, Current.Services.UserService, Current.Services.EntityService, Current.AppCaches)
         {
-            _permissionToCheck = permissionToCheck;
         }
 
         public FilterAllowedOutgoingContentAttribute(Type outgoingType, string propertyName)
-            : this(outgoingType, propertyName, Current.Services.UserService, Current.Services.EntityService)
+            : this(outgoingType, ActionBrowse.ActionLetter, propertyName, Current.Services.UserService, Current.Services.EntityService, Current.AppCaches)
         {
-            _permissionToCheck = ActionBrowse.ActionLetter;
         }
 
         public FilterAllowedOutgoingContentAttribute(Type outgoingType, IUserService userService, IEntityService entityService)
-            : base(outgoingType)
+            : this(outgoingType, ActionBrowse.ActionLetter, string.Empty, userService, entityService, Current.AppCaches)
         {
-            _userService = userService ?? throw new ArgumentNullException(nameof(userService));
-            _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
-            _permissionToCheck = ActionBrowse.ActionLetter;
         }
 
         public FilterAllowedOutgoingContentAttribute(Type outgoingType, char permissionToCheck, IUserService userService, IEntityService entityService)
-            : base(outgoingType)
+            : this(outgoingType, permissionToCheck, string.Empty, userService, entityService, Current.AppCaches)
         {
-            _userService = userService ?? throw new ArgumentNullException(nameof(userService));
-            _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
-            _userService = userService;
-            _entityService = entityService;
-            _permissionToCheck = permissionToCheck;
         }
 
         public FilterAllowedOutgoingContentAttribute(Type outgoingType, string propertyName, IUserService userService, IEntityService entityService)
+            : this(outgoingType, ActionBrowse.ActionLetter, propertyName, userService, entityService, Current.AppCaches)
+        {
+        }
+
+        private FilterAllowedOutgoingContentAttribute(Type outgoingType, char permissionToCheck, string propertyName, IUserService userService, IEntityService entityService, AppCaches appCaches)
             : base(outgoingType, propertyName)
         {
             _userService = userService ?? throw new ArgumentNullException(nameof(userService));
             _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
+            _appCaches = appCaches;
             _userService = userService;
             _entityService = entityService;
-            _permissionToCheck = ActionBrowse.ActionLetter;
+            _permissionToCheck = permissionToCheck;
         }
 
         protected override void FilterItems(IUser user, IList items)
@@ -78,7 +74,7 @@ namespace Umbraco.Web.WebApi.Filters
 
         protected override int[] GetUserStartNodes(IUser user)
         {
-            return user.CalculateContentStartNodeIds(_entityService);
+            return user.CalculateContentStartNodeIds(_entityService, _appCaches);
         }
 
         protected override int RecycleBinId
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
index 21dc60e6cc..5e308bd3c1 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Web.WebApi.Filters
 
         protected virtual int[] GetUserStartNodes(IUser user)
         {
-            return user.CalculateMediaStartNodeIds(Current.Services.EntityService);
+            return user.CalculateMediaStartNodeIds(Current.Services.EntityService, Current.AppCaches);
         }
 
         protected virtual int RecycleBinId => Constants.System.RecycleBinMedia;

From 6b4f99394d952deb347e1d8c6ac2ade947f52fc6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 9 Feb 2021 15:30:39 +1100
Subject: [PATCH 014/202] Fix mini profiler so that it actually profiles the
 Content APIs in the back office

---
 src/Umbraco.Web/Logging/WebProfiler.cs         | 10 +++++++---
 src/Umbraco.Web/Logging/WebProfilerProvider.cs |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Logging/WebProfiler.cs b/src/Umbraco.Web/Logging/WebProfiler.cs
index 512edb2296..740afba6a7 100755
--- a/src/Umbraco.Web/Logging/WebProfiler.cs
+++ b/src/Umbraco.Web/Logging/WebProfiler.cs
@@ -26,12 +26,16 @@ namespace Umbraco.Web.Logging
             _provider = new WebProfilerProvider();
 
             //see https://miniprofiler.com/dotnet/AspDotNet
-            MiniProfiler.Configure(new MiniProfilerOptions
+            var options = new MiniProfilerOptions
             {
                 SqlFormatter = new SqlServerFormatter(),
-                StackMaxLength = 5000, 
+                StackMaxLength = 5000,
                 ProfilerProvider = _provider
-            });
+            };
+            // this is a default path and by default it performs a 'contains' check which will match our content controller
+            // (and probably other requests) and ignore them.
+            options.IgnoredPaths.Remove("/content/"); 
+            MiniProfiler.Configure(options);
         }
 
         public void UmbracoApplicationBeginRequest(object sender, EventArgs e)
diff --git a/src/Umbraco.Web/Logging/WebProfilerProvider.cs b/src/Umbraco.Web/Logging/WebProfilerProvider.cs
index dbb81cf232..f38a606745 100755
--- a/src/Umbraco.Web/Logging/WebProfilerProvider.cs
+++ b/src/Umbraco.Web/Logging/WebProfilerProvider.cs
@@ -85,7 +85,11 @@ namespace Umbraco.Web.Logging
         public override MiniProfiler Start(string profilerName, MiniProfilerBaseOptions options)
         {
             var first = Interlocked.Exchange(ref _first, 1) == 0;
-            if (first == false) return base.Start(profilerName, options);
+            if (first == false)
+            {
+                var profiler = base.Start(profilerName, options);
+                return profiler;
+            }
 
             _startupProfiler = new MiniProfiler("StartupProfiler", options);
             CurrentProfiler = _startupProfiler;

From 4a10c9971767e2031ae68c3380f70ce7cd99ea8c Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 9 Feb 2021 13:17:28 +0100
Subject: [PATCH 015/202] Adds CoC enforcement document

---
 .github/CODE_OF_CONDUCT.md             |  2 +
 .github/CODE_OF_CONDUCT_ENFORCEMENT.md | 57 ++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 .github/CODE_OF_CONDUCT_ENFORCEMENT.md

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
index 7a81989037..cdb57cd7c9 100644
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -43,6 +43,8 @@ Community leaders (e.g. Meetup & festival organizers, moderators, maintainers, .
 
 Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.  
 
+Specific enforcement steps are listed in the [Code of Conduct Enforcement Guidelines](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/.github/CODE_OF_CONDUCT_ENFORCEMENT.md) document which is an appendix of this document, updated and maintained by the Code of Conduct Team.
+
 ## Scope
 This Code of Conduct applies within all community spaces and events supported by Umbraco HQ or using the Umbraco name. It also applies when an individual is officially representing the community in public spaces. 
 
diff --git a/.github/CODE_OF_CONDUCT_ENFORCEMENT.md b/.github/CODE_OF_CONDUCT_ENFORCEMENT.md
new file mode 100644
index 0000000000..ac2e812528
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT_ENFORCEMENT.md
@@ -0,0 +1,57 @@
+# Umbraco Code of Conduct Enforcement guidelines - Consequence Ladder
+
+These are the steps followed by the [Umbraco Code of Conduct Team](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/.github/CODE_OF_CONDUCT.md) when we respond to an issue or incident brought to our attention by a community member.  
+
+This is an appendix to the Code of Conduct and is updated and maintained by the Code of Conduct Team.  
+
+To make sure that all reports will be reviewed and investigated promptly and fairly, as highlighted in the Umbraco Code of Conduct, we are following [Mozilla’s Consequence Ladder approach](https://github.com/mozilla/inclusion/blob/master/code-of-conduct-enforcement/consequence-ladder.md).  
+
+This approach helps the Team enforce the Code of Conduct in a structured manner and can be used as a way of communicating escalation. Each time the Team takes an action (warning, ban) the individual is made aware of future consequences. The Team can either follow the order of the levels in the ladder or decide to jump levels. When needed, the team can go directly to a permanent ban.  
+
+**Level 0: No Action**  
+Recommendations do not indicate a violation of the Code of Conduct.  
+
+**Level 1: Simple Warning Issued**  
+A private, written warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior.  
+
+**Level 2: Warning**  
+A private, written warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* Communication of next-level consequences if behaviors are repeated (according to this ladder).
+
+**Level 3: Warning + Mandatory Cooling Off Period (Access Retained)**  
+A private warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* Request to avoid interaction on community messaging platforms (public forums, Our, commenting on issues).  
+  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to his ladder.
+* Require they do not interact with others in the report, or those who they suspect are involved in the report.  
+* Suggestions for 'out of office' type of message on platforms, to reduce curiosity, or suspicion among those not involved.  
+
+**Level 4: Temporary Ban (Access Revoked)**  
+Private communication of ban from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:
+
+* 3-6 months imposed break.  
+* All accounts deactivated, or blocked during this time (Our, HQ Slack if applicable).  
+* Require to avoid interaction on community messaging platforms (public forums, Our, commenting on issues).  
+  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to his ladder.  
+* All community leadership roles (e.g. Community Teams, Meetup/festival organizer, Commit right on Github..) suspended. (onboarding/reapplication required outside of this process)  
+* No attendance at Umbraco events during the ban period.  
+* Not allowed to enter Umbraco HQ offices during the ban period.  
+* Permission to use the MVP title, if applicable, is revoked during this ban period.  
+* The community leaders running events and other initiatives are informed of the ban.  
+
+**Level 5: Permanent Ban**  
+Private communication of ban from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* All accounts deactivated permanently.  
+* No attendance at Umbraco events going forward.  
+* Not allowed to enter Umbraco HQ offices permanently.  
+* All community leadership roles (e.g. Community Teams, Meetup/festival organizer, Commit right on Github..) permanently suspended.  
+* Permission to use the MVP title, if applicable, revoked.  
+* The community leaders running events and other initiatives are informed of the ban.  
+
+
+Sources:  
+* [Mozilla Code of Conduct - Enforcement Consequence Ladder](https://github.com/mozilla/inclusion/blob/master/code-of-conduct-enforcement/consequence-ladder.md)  
+* [Drupal Conflict Resolution Policy and Process](https://www.drupal.org/conflict-resolution)  
+* [Django Code of Conduct - Enforcement Manual](https://www.djangoproject.com/conduct/enforcement-manual/)  

From 6694690a1114694c5c94d512758adca79dbceeae Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 9 Feb 2021 13:20:32 +0100
Subject: [PATCH 016/202] Duh forgot to save latest version

---
 .github/CODE_OF_CONDUCT_ENFORCEMENT.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/CODE_OF_CONDUCT_ENFORCEMENT.md b/.github/CODE_OF_CONDUCT_ENFORCEMENT.md
index ac2e812528..2bb45644c2 100644
--- a/.github/CODE_OF_CONDUCT_ENFORCEMENT.md
+++ b/.github/CODE_OF_CONDUCT_ENFORCEMENT.md
@@ -1,4 +1,4 @@
-# Umbraco Code of Conduct Enforcement guidelines - Consequence Ladder
+# Umbraco Code of Conduct Enforcement guidelines - Consequence Ladder  
 
 These are the steps followed by the [Umbraco Code of Conduct Team](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/.github/CODE_OF_CONDUCT.md) when we respond to an issue or incident brought to our attention by a community member.  
 
@@ -17,23 +17,23 @@ A private, written warning from the Code of Conduct Team, with clarity of violat
 **Level 2: Warning**  
 A private, written warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
 
-* Communication of next-level consequences if behaviors are repeated (according to this ladder).
+* Communication of next-level consequences if behaviors are repeated (according to this ladder).  
 
 **Level 3: Warning + Mandatory Cooling Off Period (Access Retained)**  
 A private warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
 
 * Request to avoid interaction on community messaging platforms (public forums, Our, commenting on issues).  
-  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to his ladder.
+  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to this ladder.  
 * Require they do not interact with others in the report, or those who they suspect are involved in the report.  
 * Suggestions for 'out of office' type of message on platforms, to reduce curiosity, or suspicion among those not involved.  
 
 **Level 4: Temporary Ban (Access Revoked)**  
-Private communication of ban from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:
+Private communication of ban from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
 
 * 3-6 months imposed break.  
 * All accounts deactivated, or blocked during this time (Our, HQ Slack if applicable).  
 * Require to avoid interaction on community messaging platforms (public forums, Our, commenting on issues).  
-  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to his ladder.  
+  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to this ladder.  
 * All community leadership roles (e.g. Community Teams, Meetup/festival organizer, Commit right on Github..) suspended. (onboarding/reapplication required outside of this process)  
 * No attendance at Umbraco events during the ban period.  
 * Not allowed to enter Umbraco HQ offices during the ban period.  

From deb38d3f79dbdd945a356e5d949ffbdd77b8c37b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 9 Feb 2021 14:42:55 +0100
Subject: [PATCH 017/202] Clarification of the CoC

---
 .github/CODE_OF_CONDUCT.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
index cdb57cd7c9..e97b03e7e3 100644
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -60,6 +60,8 @@ Or alternatively, you can reach out directly to any of the team members behind t
 
 The review process is done with full respect for the privacy and security of the reporter of any incident.  
 
+People with a conflict of interest should exclude themselves or if necessary be excluded by the other team members.  
+
 ## Enforcement Guidelines
 
 Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:

From e9429cfe44507e028ab714c9e2bc1740c746e004 Mon Sep 17 00:00:00 2001
From: Jakob Bagterp <25110864+jakob-bagterp@users.noreply.github.com>
Date: Thu, 4 Feb 2021 23:54:01 +0100
Subject: [PATCH 018/202] Separate remove button and label for settings and
 styles in Grid Layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's inconvenient that the click area for the remove button laps over the label of settings and styles in the Grid Layout property editor. Simply as the editor may remove the style/setting by accident – and especially since there isn't an undo option.

Known issue: Linebreak of long text labels doesn't appear pretty, but this is cosmetic and can be fixed.
---
 .../src/views/propertyeditors/grid/grid.prevalues.html     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index 9bf32675e3..f1f1a90ef4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -117,11 +117,10 @@
 
                 <li ng-repeat="configValue in model.value.config">
                     <i class="icon icon-navigation handle" aria-hidden="true"></i>
-
                     <button type="button" class="btn-link" ng-click="vm.removeConfigValue(model.value.config, $index)">
                         <i class="icon icon-delete red" aria-hidden="true"></i>
-                        {{configValue.label}}
                     </button>
+                    <span>{{configValue.label}}</span>
                 </li>
             </ul>
 
@@ -145,12 +144,10 @@
 
                 <li ng-repeat="style in model.value.styles">
                     <i class="icon icon-navigation handle" aria-hidden="true"></i>
-
                     <button type="button" class="btn-link" ng-click="vm.removeConfigValue(model.value.styles, $index)">
                         <i class="icon icon-delete red" aria-hidden="true"></i>
-                        {{style.label}}
                     </button>
-
+                    <span>{{style.label}}</span>
                 </li>
             </ul>
 

From 230bf1052cde249587d4ce06a2fb23859094f414 Mon Sep 17 00:00:00 2001
From: Marc Goodson <marc@moriyama.co.uk>
Date: Wed, 10 Feb 2021 23:25:38 +0000
Subject: [PATCH 019/202] V8/feature/super doctype create menu (#9174)

* WIP - added options from superdoctypecreate package

resolve merge conflict in create html file

* fiddling with the wording but it will never be perfect

* looks like ng-if should be ng-show

* Update data-elements for uniqueness (I'm not sure what these are used for!)

* pass 'iscomposition' on the querystring when choosing the 'composition' option from the menu

Why? - in the future we could hide the 'Compositions...' button when choosing to create a composition

* Remove PostCreateCollection implementation now the Create Collection is removed in this PR from the DocType Create menu

resolve merge conflict in Remove PostCreateCollection implementation now the Create Collection is removed in this PR from the DocType Create menu

* Add translations

* Put back PostSave method. It's useful.

Co-authored-by: Kenn Jacobsen <post@kennjacobsen.dk>
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 .../common/resources/contenttype.resource.js  | 35 +------
 .../views/documenttypes/create.controller.js  | 75 ++++----------
 .../src/views/documenttypes/create.html       | 99 ++++++-------------
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 10 ++
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 10 ++
 .../Umbraco/config/lang/en_us.xml             | 10 ++
 .../Editors/ContentTypeController.cs          | 86 +++-------------
 7 files changed, 96 insertions(+), 229 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
index 01b6360d07..6acf702546 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
@@ -511,41 +511,8 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateContainer", { parentId: parentId, name: encodeURIComponent(name) })),
                 'Failed to create a folder under parent id ' + parentId);
 
-        },
 
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#createCollection
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Create a collection of a content types
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.createCollection(1244,"testcollectionname",true,"collectionItemName",true,"icon-name","icon-name")
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        *
-        * @param {Int} parentId the ID of the parent content type underneath which to create the collection
-        * @param {String} collectionName the name of the collection
-        * @param {Boolean} collectionCreateTemplate true/false to specify whether to create a default template for the collection
-        * @param {String} collectionItemName the name of the collection item
-        * @param {Boolean} collectionItemCreateTemplate true/false to specify whether to create a default template for the collection item
-        * @param {String} collectionIcon the icon for the collection
-        * @param {String} collectionItemIcon the icon for the collection item
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        createCollection: function (parentId, collectionName, collectionCreateTemplate, collectionItemName, collectionItemCreateTemplate, collectionIcon, collectionItemIcon) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateCollection", { parentId: parentId, collectionName: collectionName, collectionCreateTemplate: collectionCreateTemplate, collectionItemName: collectionItemName, collectionItemCreateTemplate: collectionItemCreateTemplate, collectionIcon: collectionIcon, collectionItemIcon: collectionItemIcon})),
-                'Failed to create collection under ' + parentId);
-
-        },
+        }, 
 
         /**
         * @ngdoc method
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
index 71eee085ee..23173a404d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
@@ -11,8 +11,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
     $scope.model = {
         allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === "container",
         folderName: "",
-        creatingFolder: false,
-        creatingDoctypeCollection: false
+        creatingFolder: false
     };
 
     var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
@@ -24,12 +23,6 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
         $scope.model.creatingFolder = true;
     };
 
-    $scope.showCreateDocTypeCollection = function () {
-        $scope.model.creatingDoctypeCollection = true;
-        $scope.model.collectionCreateTemplate = !$scope.model.disableTemplates;
-        $scope.model.collectionItemCreateTemplate = !$scope.model.disableTemplates;
-    };
-
     $scope.createContainer = function () {
 
         if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createFolderForm })) {
@@ -58,55 +51,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
 
             });
         }
-    };
-
-    $scope.createCollection = function () {
-
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createDoctypeCollectionForm, statusMessage: "Creating Doctype Collection..." })) {
-
-            // see if we can find matching icons
-            var collectionIcon = "icon-folders", collectionItemIcon = "icon-document";
-            iconHelper.getIcons().then(function (icons) {
-
-                for (var i = 0; i < icons.length; i++) {
-                    // for matching we'll require a full match for collection, partial match for item
-                    if (icons[i].substring(5) == $scope.model.collectionName.toLowerCase()) {
-                        collectionIcon = icons[i];
-                    } else if (icons[i].substring(5).indexOf($scope.model.collectionItemName.toLowerCase()) > -1) {
-                        collectionItemIcon = icons[i];
-                    }
-                }
-
-                contentTypeResource.createCollection(node.id, $scope.model.collectionName, $scope.model.collectionCreateTemplate, $scope.model.collectionItemName, $scope.model.collectionItemCreateTemplate, collectionIcon, collectionItemIcon)
-                    .then(function (collectionData) {
-
-                        navigationService.hideMenu();
-                        $location.search('create', null);
-                        $location.search('notemplate', null);
-
-                        formHelper.resetForm({ scope: $scope, formCtrl: this.createDoctypeCollectionForm });
-
-                        var section = appState.getSectionState("currentSection");
-
-                        // redirect to the item id
-                        $location.path("/" + section + "/documenttypes/edit/" + collectionData.containerId);
-
-                    }, function (err) {
-
-                        formHelper.resetForm({ scope: $scope, formCtrl: this.createDoctypeCollectionForm, hasErrors: true });
-                        $scope.error = err;
-
-                        //show any notifications
-                        if (Utilities.isArray(err.data.notifications)) {
-                            for (var i = 0; i < err.data.notifications.length; i++) {
-                                notificationsService.showNotification(err.data.notifications[i]);
-                            }
-                        }
-                    });
-            });
-        }
-
-    };
+    };   
 
     // Disabling logic for creating document type with template if disableTemplates is set to true
     if (!disableTemplates) {
@@ -125,6 +70,22 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
         navigationService.hideMenu();
     };
 
+    $scope.createComposition = function () {
+        $location.search('create', null);
+        $location.search('notemplate', null);
+        $location.search('iscomposition', null);
+        $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true").search("iscomposition", "true");
+        navigationService.hideMenu();
+    };
+
+    $scope.createElement = function () {
+        $location.search('create', null);
+        $location.search('notemplate', null);
+        $location.search('iselement', null);
+        $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true").search("iselement", "true");
+        navigationService.hideMenu();
+    };
+
     $scope.close = function() {
         const showMenu = true;
         navigationService.hideDialog(showMenu);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 4ebb96c09b..208b4eaeda 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -1,16 +1,15 @@
 <div ng-controller="Umbraco.Editors.DocumentTypes.CreateController">
-
     <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
-
-        <div class="umb-pane" ng-show="!model.creatingFolder && !model.creatingDoctypeCollection">
+        <div class="umb-pane" ng-show="!model.creatingFolder">
             <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
             <ul class="umb-actions umb-actions-child">
                 <li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
                     <button type="button" ng-click="createDocType()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
-                        <i class="large icon icon-item-arrangement" aria-hidden="true"></i>
+                        <i class="large icon icon-document" aria-hidden="true"></i>
                         <span class="menu-label">
-                            <localize key="content_documentType">Document type</localize>
+                            <localize key="create_documentTypeWithTemplate">Document Type with Template</localize>
+                            <small><localize key="create_documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</localize></small>
                         </span>
                     </button>
                 </li>
@@ -18,24 +17,38 @@
                     <button type="button" ng-click="createComponent()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-item-arrangement" aria-hidden="true"></i>
                         <span class="menu-label">
-                            <localize ng-if="model.disableTemplates === false" key="create_documentTypeWithoutTemplate"></localize>
-                            <localize ng-if="model.disableTemplates === true" key="content_documentType">Document type></localize>
+                            <localize key="create_documentType">Document Type</localize>
+                            <small><localize key="create_documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</localize></small>
                         </span>
                     </button>
                 </li>
-                <li data-element="action-documentTypeCollection" class="umb-action">
-                    <button type="button" ng-click="showCreateDocTypeCollection()" class="umb-action-link umb-outline btn-reset">
-                        <i class="large icon icon-thumbnail-list" aria-hidden="true"></i>
+                <li data-element="action-documentTypeWithIsElementTypeChecked" class="umb-action">
+                    <button type="button" ng-click="createElement()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
+                        <i class="large icon icon-science" aria-hidden="true"></i>
                         <span class="menu-label">
-                            Document Type Collection...
-                            <!--<localize key="content_documentType_collection">Document Type Collection</localize>-->
+                            <localize key="create_elementType">Element Type</localize>
+                            <small><localize key="create_elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</localize></small>
+                        </span>
+                    </button>
+                </li>
+                <li data-element="action-documentTypeWithoutTemplateForComposition" class="umb-action">
+                    <button type="button" ng-click="createComposition()" class="umb-action-link umb-outline btn-reset">
+                        <i class="large icon icon-defrag" aria-hidden="true"></i>
+                        <span class="menu-label">
+                            <localize key="create_composition">Composition</localize>
+                            <small><localize key="create_compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</localize></small>
                         </span>
                     </button>
                 </li>
                 <li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
                     <button type="button" ng-click="showCreateFolder()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-folder" aria-hidden="true"></i>
-                        <span class="menu-label"><localize key="general_folder"></localize>...</span>
+                        <span class="menu-label">
+                            <localize key="create_folder">Folder</localize>
+                            <small>
+                                <localize key="create_folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</localize>
+                            </small>
+                        </span>
                     </button>
                 </li>
             </ul>
@@ -43,8 +56,8 @@
 
         <div class="umb-pane" ng-show="model.creatingFolder">
             <form novalidate name="createFolderForm"
-                ng-submit="createContainer()"
-                val-form-manager>
+                  ng-submit="createContainer()"
+                  val-form-manager>
 
                 <div ng-show="error">
                     <div class="alert alert-error">
@@ -61,59 +74,11 @@
             </form>
         </div>
 
-        <div class="umb-pane" ng-if="model.creatingDoctypeCollection">
-            <small>
-                A Document Type collection is a fast way to create two Document Types in one task.
-                The Item Document Type will automatically be
-                allowed under the Parent Document Type.
-            </small>
-            <p>&nbsp;</p>
-            <form novalidate name="createDoctypeCollectionForm"
-                ng-submit="createCollection()"
-                val-form-manager>
-
-                <div ng-show="error">
-                    <div class="alert alert-error">
-                        <div><strong>{{error.errorMsg}}</strong></div>
-                        <div>{{error.data.message}}</div>
-                    </div>
-                </div>
-
-                <umb-control-group>
-                    <label for="collectionName" class="control-label">Name of the Parent Document Type</label>
-                    <input type="text" name="collectionName" id="collectionName" ng-model="model.collectionName" maxlength="255" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-
-                    <umb-checkbox ng-if="model.disableTemplates === false"
-                                  name="collectionCreateTemplate"
-                                  model="model.collectionCreateTemplate"
-                                  text="Create template for the Parent Document Type">
-                    </umb-checkbox>
-
-                </umb-control-group>
-
-                <umb-control-group>
-                    <label for="collectionItemName" class="control-label">Name of the Item Document Type</label>
-                    <input type="text" name="collectionItemName" id="collectionItemName" ng-model="model.collectionItemName" maxlength="255" class="umb-textstring textstring input-block-level" required />
-
-                    <umb-checkbox ng-if="model.disableTemplates === false"
-                                  name="collectionItemCreateTemplate"
-                                  model="model.collectionItemCreateTemplate"
-                                  text="Create template for the Item Document Type">
-                    </umb-checkbox>
-
-                </umb-control-group>
-
-                <div class="mt3">
-                    <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
-                </div>
-            </form>
+        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
+            <button class="btn btn-info" ng-click="close(true)">
+                <localize key="buttons_somethingElse">Do something else</localize>
+            </button>
         </div>
-    </div>
 
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-        <button class="btn btn-info" ng-click="close(true)">
-            <localize key="buttons_somethingElse">Do something else</localize>
-        </button>
     </div>
-
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 3897e139ba..494416d777 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -350,6 +350,16 @@
     <key alias="noMediaTypesWithNoSettingsAccess">Det valgte medie i træet tillader ikke at medier oprettes under det.</key>
     <key alias="noMediaTypesEditPermissions">Rediger tilladelser for denne medietype.</key>
     <key alias="documentTypeWithoutTemplate">Dokumenttype uden skabelon</key>
+    <key alias="documentTypeWithTemplate">Dokumenttype med skabelon</key>
+    <key alias="documentTypeWithTemplateDescription">Definerer en indholdsside, der kan oprettes af redaktørerne i indholdstræet, og som er kan tilgås direkte på en URL.</key>
+    <key alias="documentType">Dokumenttype</key>
+    <key alias="documentTypeDescription">Definerer en indholdskomponent, der kan oprettes af redaktørerne i indholdstræet og benyttes i sammenhæng med andet indhold, men som ikke kan tilgås direkte på en URL.</key>
+    <key alias="elementType">Element-type</key>
+    <key alias="elementTypeDescription">Definerer skabelonen for et sæt at egenskaber, der kan anvendes som skema i avancerede felter som f.eks. 'Block List' eller 'Nested Content'.</key>
+    <key alias="composition">Komposition</key>
+    <key alias="compositionDescription">Definerer et sæt genbrugbare egenskaber, der kan inkluderes i definitionen af andre dokumenttyper - f.eks. et sæt 'Almindelige side-data'.</key>
+    <key alias="folder">Mappe</key>
+    <key alias="folderDescription">Benyttes til at organisere dokumenttyper, element-typer og kompositioner i dokumenttype-træet.</key>
     <key alias="newFolder">Ny mappe</key>
     <key alias="newDataType">Ny datatype</key>
     <key alias="newJavascriptFile">Ny JavaScript-fil</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index bc2f4c0c1e..c6a5ce4821 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -371,6 +371,16 @@
     <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
     <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
+    <key alias="documentTypeWithTemplate">Document Type with Template</key>
+    <key alias="documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</key>
+    <key alias="elementType">Element Type</key>
+    <key alias="elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</key>
+    <key alias="composition">Composition</key>
+    <key alias="compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</key>
+    <key alias="folder">Folder</key>
+    <key alias="folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</key>
     <key alias="newFolder">New folder</key>
     <key alias="newDataType">New data type</key>
     <key alias="newJavascriptFile">New JavaScript file</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 94645eaa85..ad5992a195 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -378,6 +378,16 @@
     <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
     <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
+    <key alias="documentTypeWithTemplate">Document Type with Template</key>
+    <key alias="documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</key>
+    <key alias="elementType">Element Type</key>
+    <key alias="elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</key>
+    <key alias="composition">Composition</key>
+    <key alias="compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</key>
+    <key alias="folder">Folder</key>
+    <key alias="folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</key>
     <key alias="newFolder">New folder</key>
     <key alias="newDataType">New data type</key>
     <key alias="newJavascriptFile">New JavaScript file</key>
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 1803fa735c..5074a14782 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -282,91 +282,35 @@ namespace Umbraco.Web.Editors
                 : Request.CreateNotificationValidationErrorResponse(result.Exception.Message);
         }
 
-        public CreatedContentTypeCollectionResult PostCreateCollection(int parentId, string collectionName, bool collectionCreateTemplate, string collectionItemName, bool collectionItemCreateTemplate, string collectionIcon, string collectionItemIcon)
-        {
-            // create item doctype
-            var itemDocType = new ContentType(parentId);
-            itemDocType.Name = collectionItemName;
-            itemDocType.Alias = collectionItemName.ToSafeAlias(true);
-            itemDocType.Icon = collectionItemIcon;
-
-            // create item doctype template
-            if (collectionItemCreateTemplate)
-            {
-                var template = CreateTemplateForContentType(itemDocType.Alias, itemDocType.Name);
-                itemDocType.SetDefaultTemplate(template);
-            }
-
-            // save item doctype
-            Services.ContentTypeService.Save(itemDocType);
-
-            // create collection doctype
-            var collectionDocType = new ContentType(parentId);
-            collectionDocType.Name = collectionName;
-            collectionDocType.Alias = collectionName.ToSafeAlias(true);
-            collectionDocType.Icon = collectionIcon;
-            collectionDocType.IsContainer = true;
-            collectionDocType.AllowedContentTypes = new List<ContentTypeSort>()
-            {
-                new ContentTypeSort(itemDocType.Id, 0)
-            };
-
-            // create collection doctype template
-            if (collectionCreateTemplate)
-            {
-                var template = CreateTemplateForContentType(collectionDocType.Alias, collectionDocType.Name);
-                collectionDocType.SetDefaultTemplate(template);
-            }
-
-            // save collection doctype
-            Services.ContentTypeService.Save(collectionDocType);
-
-            // test if the parent exist and then allow the collection underneath
-            var parentCt = Services.ContentTypeService.Get(parentId);
-            if (parentCt != null)
-            {
-                var allowedCts = parentCt.AllowedContentTypes.ToList();
-                allowedCts.Add(new ContentTypeSort(collectionDocType.Id, allowedCts.Count()));
-                parentCt.AllowedContentTypes = allowedCts;
-                Services.ContentTypeService.Save(parentCt);
-            }
-
-            return new CreatedContentTypeCollectionResult
-            {
-                CollectionId = collectionDocType.Id,
-                ContainerId = itemDocType.Id
-            };
-        }
-
         public DocumentTypeDisplay PostSave(DocumentTypeSave contentTypeSave)
         {
-            //Before we send this model into this saving/mapping pipeline, we need to do some cleanup on variations.
-            //If the doc type does not allow content variations, we need to update all of it's property types to not allow this either
-            //else we may end up with ysods. I'm unsure if the service level handles this but we'll make sure it is updated here
+            //Before we send this model into this saving/mapping pipeline, we need to do some cleanup on variations.	
+            //If the doc type does not allow content variations, we need to update all of it's property types to not allow this either	
+            //else we may end up with ysods. I'm unsure if the service level handles this but we'll make sure it is updated here	
             if (!contentTypeSave.AllowCultureVariant)
             {
-                foreach(var prop in contentTypeSave.Groups.SelectMany(x => x.Properties))
+                foreach (var prop in contentTypeSave.Groups.SelectMany(x => x.Properties))
                 {
                     prop.AllowCultureVariant = false;
                 }
             }
 
             var savedCt = PerformPostSave<DocumentTypeDisplay, DocumentTypeSave, PropertyTypeBasic>(
-                contentTypeSave:    contentTypeSave,
-                getContentType:     i => Services.ContentTypeService.Get(i),
-                saveContentType:    type => Services.ContentTypeService.Save(type),
-                beforeCreateNew:    ctSave =>
+                contentTypeSave: contentTypeSave,
+                getContentType: i => Services.ContentTypeService.Get(i),
+                saveContentType: type => Services.ContentTypeService.Save(type),
+                beforeCreateNew: ctSave =>
                 {
-                    //create a default template if it doesn't exist -but only if default template is == to the content type
+                    //create a default template if it doesn't exist -but only if default template is == to the content type	
                     if (ctSave.DefaultTemplate.IsNullOrWhiteSpace() == false && ctSave.DefaultTemplate == ctSave.Alias)
                     {
                         var template = CreateTemplateForContentType(ctSave.Alias, ctSave.Name);
 
-                        // If the alias has been manually updated before the first save,
-                        // make sure to also update the first allowed template, as the
-                        // name will come back as a SafeAlias of the document type name,
-                        // not as the actual document type alias.
-                        // For more info: http://issues.umbraco.org/issue/U4-11059
+                        // If the alias has been manually updated before the first save,	
+                        // make sure to also update the first allowed template, as the	
+                        // name will come back as a SafeAlias of the document type name,	
+                        // not as the actual document type alias.	
+                        // For more info: http://issues.umbraco.org/issue/U4-11059	
                         if (ctSave.DefaultTemplate != template.Alias)
                         {
                             var allowedTemplates = ctSave.AllowedTemplates.ToArray();
@@ -375,7 +319,7 @@ namespace Umbraco.Web.Editors
                             ctSave.AllowedTemplates = allowedTemplates;
                         }
 
-                        //make sure the template alias is set on the default and allowed template so we can map it back
+                        //make sure the template alias is set on the default and allowed template so we can map it back	
                         ctSave.DefaultTemplate = template.Alias;
 
                     }

From e6462eded613a4f1cc61f06b5a12adde7d1c949a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 15 Feb 2021 11:15:45 +0100
Subject: [PATCH 020/202] V8/feature/10273 variant sorting (#9797)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
---
 .../components/content/edit.controller.js     |  1 -
 .../umbeditorcontentheader.directive.js       | 20 +++++--
 .../services/contenteditinghelper.service.js  | 53 +++++++++++++++++++
 .../editor/umb-variant-switcher.less          |  4 --
 .../editor/umb-editor-content-header.html     | 10 ++--
 .../content/overlays/publish.controller.js    | 22 +-------
 .../src/views/content/overlays/publish.html   |  2 +-
 .../overlays/publishdescendants.controller.js | 22 +-------
 .../content/overlays/publishdescendants.html  |  2 +-
 .../views/content/overlays/save.controller.js | 20 +------
 .../src/views/content/overlays/save.html      |  2 +-
 .../content/overlays/schedule.controller.js   | 23 +-------
 .../src/views/content/overlays/schedule.html  |  2 +-
 .../overlays/sendtopublish.controller.js      | 22 +-------
 .../views/content/overlays/sendtopublish.html |  2 +-
 .../content/overlays/unpublish.controller.js  | 22 +-------
 .../src/views/content/overlays/unpublish.html |  2 +-
 17 files changed, 94 insertions(+), 137 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 5a9f30fe24..0892a892d2 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
@@ -223,7 +223,6 @@
             //we are editing so get the content item from the server
             return $scope.getMethod()($scope.contentId)
                 .then(function (data) {
-
                     $scope.content = data;
 
                     appendRuntimeData();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 846d5c85fe..31e51fe115 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function EditorContentHeader(serverValidationManager, localizationService, editorState) {
+    function EditorContentHeader(serverValidationManager, localizationService, editorState, contentEditingHelper) {
         function link(scope) {
 
             var unsubscribe = [];
@@ -92,7 +92,6 @@
             }
 
             function onInit() {
-
                 // find default + check if we have variants.
                 scope.content.variants.forEach(function (variant) {
                     if (variant.language !== null && variant.language.isDefault) {
@@ -115,11 +114,13 @@
                 if (scope.vm.hasCulture) {
                     scope.content.variants.forEach((v) => {
                         if (v.language !== null && v.segment === null) {
+                            const subVariants = scope.content.variants.filter((subVariant) => subVariant.language.culture === v.language.culture && subVariant.segment !== null).sort(contentEditingHelper.sortVariants);
+
                             var variantMenuEntry = {
                                 key: String.CreateGuid(),
                                 open: v.language && v.language.culture === scope.editor.culture,
                                 variant: v,
-                                subVariants: scope.content.variants.filter((subVariant) => subVariant.language.culture === v.language.culture && subVariant.segment !== null)
+                                subVariants
                             };
                             scope.vm.variantMenu.push(variantMenuEntry);
                         }
@@ -147,7 +148,12 @@
                     }
                     unsubscribe.push(serverValidationManager.subscribe(null, variant.language !== null ? variant.language.culture : null, null, onVariantValidation, variant.segment));
                 });
+                
+                scope.vm.variantMenu.sort(sortVariantsMenu);
+            }
 
+            function sortVariantsMenu (a, b) {
+                return contentEditingHelper.sortVariants(a.variant, b.variant);
             }
 
             scope.goBack = function () {
@@ -200,6 +206,14 @@
                 return false;
             }
 
+            scope.toggleDropdown = function () {
+                scope.vm.dropdownOpen = !scope.vm.dropdownOpen;
+                
+                if (scope.vm.dropdownOpen) {
+                    scope.vm.variantMenu.sort(sortVariantsMenu);
+                }
+            };
+
             onInit();
 
             scope.$on('$destroy', function () {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index 46bbe2de23..f19ba54244 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -759,6 +759,59 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
             //don't add a browser history for this
             $location.replace();
             return true;
+        },
+
+        /**
+         * @ngdoc function
+         * @name umbraco.services.contentEditingHelper#sortVariants
+         * @methodOf umbraco.services.contentEditingHelper
+         * @function
+         *
+         * @description
+         * Sorts the variants so default language is shown first. Mandatory languages are shown next and all other underneath. Both Mandatory and non mandatory languages are
+         * sorted in the following groups 'Published', 'Draft', 'Not Created'. Within each of those groups the variants are
+         * sorted by the language display name.
+         *
+         */
+        sortVariants: function (a, b) {
+            const statesOrder = {'PublishedPendingChanges':1, 'Published': 1, 'Draft': 2, 'NotCreated': 3};
+            const compareDefault = (a,b) => (!a.language.isDefault ? 1 : -1) - (!b.language.isDefault ? 1 : -1);
+
+            // Make sure mandatory variants goes on top, unless they are published, cause then they already goes to the top and then we want to mix them with other published variants.
+            const compareMandatory = (a,b) => (a.state === 'PublishedPendingChanges' || a.state === 'Published') ? 0 : (!a.language.isMandatory ? 1 : -1) - (!b.language.isMandatory ? 1 : -1);
+            const compareState = (a, b) => (statesOrder[a.state] || 99) - (statesOrder[b.state] || 99);
+            const compareName = (a, b) => a.displayName.localeCompare(b.displayName);
+
+            return compareDefault(a, b) || compareMandatory(a, b) || compareState(a, b) || compareName(a, b);
+        },
+
+        /**
+         * @ngdoc function
+         * @name umbraco.services.contentEditingHelper#getSortedVariantsAndSegments
+         * @methodOf umbraco.services.contentEditingHelper
+         * @function
+         *
+         * @description
+         * Returns an array of variants and segments sorted by the rules in the sortVariants method.
+         * A variant language is followed by its segments in the array. If a segment doesn't have a parent variant it is
+         * added to the end of the array.
+         *
+         */
+        getSortedVariantsAndSegments: function (variantsAndSegments) {
+            const sortedVariants = variantsAndSegments.filter(variant => !variant.segment).sort(this.sortVariants);
+            let segments = variantsAndSegments.filter(variant => variant.segment);
+            let sortedAvailableVariants = [];
+
+            sortedVariants.forEach((variant) => {
+                const sortedMatchedSegments = segments.filter(segment => segment.language.culture === variant.language.culture).sort(this.sortVariants);
+                segments = segments.filter(segment => segment.language.culture !== variant.language.culture);
+                sortedAvailableVariants = [...sortedAvailableVariants, ...[variant], ...sortedMatchedSegments];
+            })
+
+            // if we have segments without a parent language variant we need to add the remaining segments to the array
+            sortedAvailableVariants = [...sortedAvailableVariants, ...segments.sort(this.sortVariants)];
+
+            return sortedAvailableVariants;
         }
     };
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
index 95625d9e73..9d2782f184 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
@@ -196,10 +196,6 @@ button.umb-variant-switcher__toggle {
 
 .umb-variant-switcher__item.--current {
     color: @ui-light-active-type;
-    //background-color: @pinkExtraLight;
-    .umb-variant-switcher__name-wrapper {
-        border-left: 4px solid @ui-active;
-    }
     .umb-variant-switcher__name {
         //color: @ui-light-active-type;
         font-weight: 700;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 687c8ef24e..6978672e99 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -40,7 +40,7 @@
                                maxlength="255" />
                     </ng-form>
 
-                    <button type="button" ng-if="vm.hasVariants === true && hideChangeVariant !== true" class="umb-variant-switcher__toggle umb-outline" ng-click="vm.dropdownOpen = !vm.dropdownOpen" ng-class="{'--error': vm.errorsOnOtherVariants}" aria-haspopup="true" aria-expanded="{{vm.dropdownOpen}}">
+                    <button type="button" ng-if="vm.hasVariants === true && hideChangeVariant !== true" class="umb-variant-switcher__toggle umb-outline" ng-click="toggleDropdown()" ng-class="{'--error': vm.errorsOnOtherVariants}" aria-haspopup="true" aria-expanded="{{vm.dropdownOpen}}">
                         <span ng-bind="editor.content.displayName"></span>
                         <umb-icon icon="{{vm.dropdownOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-variant-switcher__expand" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</umb-icon>
                     </button>
@@ -51,7 +51,7 @@
 
                     <umb-dropdown ng-if="vm.dropdownOpen" class="umb-variant-switcher" ng-class="{'--has-sub-variants': vm.hasSubVariants === true}" on-close="vm.dropdownOpen = false" umb-keyboard-list>
                         <umb-dropdown-item
-                            ng-repeat-start="entry in vm.variantMenu | orderBy:'variant.displayName' track by entry.key"
+                            ng-repeat-start="entry in vm.variantMenu track by entry.key"
                             class="umb-variant-switcher__item"
                             ng-class="{'--current': entry.variant === editor.content, '--active': entry.variant.active && vm.dropdownOpen, '--error': entry.variant.active !== true && entry.variant.hasError, '--state-notCreated':entry.variant.state==='NotCreated' && entry.variant.name == null, '--state-draft':entry.variant.state==='Draft' || (entry.variant.state==='NotCreated' && entry.variant.name != null)}"
                         >
@@ -60,7 +60,11 @@
                             </button>
                             <button type="button" class="umb-variant-switcher__name-wrapper umb-outline" ng-click="selectVariant($event, entry.variant)">
                                 <span class="umb-variant-switcher__name" ng-bind="entry.variant.displayName"></span>
-                                <umb-variant-state variant="entry.variant" class="umb-variant-switcher__state"></umb-variant-state>
+                                <span class="umb-variant-switcher__state">
+                                    <umb-variant-state variant="entry.variant"></umb-variant-state>
+                                    <span ng-if="entry.variant.language.isMandatory"> - <localize key="general_mandatory"></localize></span>
+                                    <span ng-if="entry.variant.language.isDefault"> - <localize key="general_default"></localize></span>
+                                </span>
                             </button>
                             <div ng-if="splitViewOpen !== true && !entry.variant.active" class="umb-variant-switcher__split-view umb-outline" ng-click="openInSplitView($event, entry.variant)">Open in split view</div>
                         </umb-dropdown-item>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
index b924793fcd..4e3496cde1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function PublishController($scope, localizationService) {
+    function PublishController($scope, localizationService, contentEditingHelper) {
 
         var vm = this;
         vm.loading = true;
@@ -143,25 +143,7 @@
             });
 
             if (vm.availableVariants.length !== 0) {
-                vm.availableVariants.sort((a, b) => {
-                    if (a.language && b.language) {
-                        if (a.language.name < b.language.name) {
-                            return -1;
-                        }
-                        if (a.language.name > b.language.name) {
-                            return 1;
-                        }
-                    }
-                    if (a.segment && b.segment) {
-                        if (a.segment < b.segment) {
-                            return -1;
-                        }
-                        if (a.segment > b.segment) {
-                            return 1;
-                        }
-                    }
-                    return 0;
-                });
+                vm.availableVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.availableVariants);
             }
 
             $scope.model.disableSubmitButton = !canPublish();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index c3e0b90f5f..888b6ab0f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -30,7 +30,7 @@
                         <span class="umb-variant-selector-entry__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                             <umb-variant-state variant="variant"></umb-variant-state>
                             <span ng-if="variant.isMandatory"> - </span>
-                            <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.state !== 'Published' && variant.state !== 'PublishedPendingChanges' && variant.publish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
+                            <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.state !== 'Published' && variant.state !== 'PublishedPendingChanges' && variant.publish === false) }"><localize key="general_mandatory"></localize></span>
                         </span>
                         <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                             <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
index f6fd6cb3cb..f9ad2eade8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function PublishDescendantsController($scope, localizationService) {
+    function PublishDescendantsController($scope, localizationService, contentEditingHelper) {
 
         var vm = this;
         vm.includeUnpublished = $scope.model.includeUnpublished || false;
@@ -38,25 +38,7 @@
 
             if (vm.variants.length > 1) {
 
-                vm.displayVariants.sort((a, b) => {
-                    if (a.language && b.language) {
-                        if (a.language.name < b.language.name) {
-                            return -1;
-                        }
-                        if (a.language.name > b.language.name) {
-                            return 1;
-                        }
-                    }
-                    if (a.segment && b.segment) {
-                        if (a.segment < b.segment) {
-                            return -1;
-                        }
-                        if (a.segment > b.segment) {
-                            return 1;
-                        }
-                    }
-                    return 0;
-                });
+                vm.displayVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.displayVariants);
 
                 var active = vm.variants.find(v => v.active);
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
index 61fd78a035..bb1d20c321 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
@@ -60,7 +60,7 @@
                             <span class="umb-variant-selector-entry__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
                                 <span ng-if="variant.isMandatory"> - </span>
-                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
+                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="general_mandatory"></localize></span>
                             </span>
                             <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
index aa0d3797d4..bfde6afbe3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
@@ -85,25 +85,7 @@
                     active.save = true;
                 }
 
-                vm.availableVariants.sort((a, b) => {
-                    if (a.language && b.language) {
-                        if (a.language.name < b.language.name) {
-                            return -1;
-                        }
-                        if (a.language.name > b.language.name) {
-                            return 1;
-                        }
-                    }
-                    if (a.segment && b.segment) {
-                        if (a.segment < b.segment) {
-                            return -1;
-                        }
-                        if (a.segment > b.segment) {
-                            return 1;
-                        }
-                    }
-                    return 0;
-                });
+                vm.availableVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.availableVariants);
 
             } else {
                 //disable save button if we have nothing to save
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
index 661dd4162e..fa9ab8c437 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
@@ -36,7 +36,7 @@
                             <span class="umb-variant-selector-entry__description" ng-if="!saveVariantSelectorForm.saveVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
                                 <span ng-if="variant.isMandatory"> - </span>
-                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
+                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="general_mandatory"></localize></span>
                             </span>
                             <span class="umb-variant-selector-entry__description" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
index 8bf23ae6d5..2de526b503 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
     
-    function ScheduleContentController($scope, $timeout, localizationService, dateHelper, userService) {
+    function ScheduleContentController($scope, $timeout, localizationService, dateHelper, userService, contentEditingHelper) {
 
         var vm = this;
 
@@ -43,26 +43,7 @@
             // Check for variants: if a node is invariant it will still have the default language in variants
             // so we have to check for length > 1
             if (vm.variants.length > 1) {
-
-                vm.displayVariants.sort((a, b) => {
-                    if (a.language && b.language) {
-                        if (a.language.name < b.language.name) {
-                            return -1;
-                        }
-                        if (a.language.name > b.language.name) {
-                            return 1;
-                        }
-                    }
-                    if (a.segment && b.segment) {
-                        if (a.segment < b.segment) {
-                            return -1;
-                        }
-                        if (a.segment > b.segment) {
-                            return 1;
-                        }
-                    }
-                    return 0;
-                });
+                vm.displayVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.displayVariants);
 
                 vm.variants.forEach(v => {
                     if (v.active) {
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 e854f72717..563793862d 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
@@ -107,7 +107,7 @@
                             <span class="umb-variant-selector-entry__description"
                                   ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
+                                <span ng-show="variant.language.isMandatory"> - <localize key="general_mandatory"></localize></span>
                             </span>
 
                         </umb-checkbox>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
index d91d814886..dd9960d352 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function SendToPublishController($scope, localizationService) {
+    function SendToPublishController($scope, localizationService, contentEditingHelper) {
 
         var vm = this;
         vm.loading = true;
@@ -27,25 +27,7 @@
             
             if (vm.availableVariants.length !== 0) {
 
-                vm.availableVariants.sort((a, b) => {
-                    if (a.language && b.language) {
-                        if (a.language.name < b.language.name) {
-                            return -1;
-                        }
-                        if (a.language.name > b.language.name) {
-                            return 1;
-                        }
-                    }
-                    if (a.segment && b.segment) {
-                        if (a.segment < b.segment) {
-                            return -1;
-                        }
-                        if (a.segment > b.segment) {
-                            return 1;
-                        }
-                    }
-                    return 0;
-                });
+                vm.availableVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.availableVariants);
 
                 vm.availableVariants.forEach(v => {
                     if(v.active) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
index abf39c6542..8217da5752 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
@@ -32,7 +32,7 @@
                         <span class="umb-variant-selector-entry__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                             <umb-variant-state variant="variant"></umb-variant-state>
                             <span ng-if="variant.isMandatory"> - </span>
-                            <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
+                            <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="general_mandatory"></localize></span>
                         </span>
                         <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                             <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js
index 63c5b2da26..936ab3b104 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function UnpublishController($scope, localizationService) {
+    function UnpublishController($scope, localizationService, contentEditingHelper) {
 
         var vm = this;
         var autoSelectedVariants = [];
@@ -27,25 +27,7 @@
             // node has variants
             if (vm.variants.length !== 1) {
                 
-                vm.unpublishableVariants.sort((a, b) => {
-                    if (a.language && b.language) {
-                        if (a.language.name < b.language.name) {
-                            return -1;
-                        }
-                        if (a.language.name > b.language.name) {
-                            return 1;
-                        }
-                    }
-                    if (a.segment && b.segment) {
-                        if (a.segment < b.segment) {
-                            return -1;
-                        }
-                        if (a.segment > b.segment) {
-                            return 1;
-                        }
-                    }
-                    return 0;
-                });
+                vm.unpublishableVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.unpublishableVariants);
 
                 var active = vm.variants.find(v => v.active);
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
index 5ab32abf00..dc3862879a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
@@ -36,7 +36,7 @@
                             <span class="umb-variant-selector-entry__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
                                 <span ng-if="variant.isMandatory"> - </span>
-                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
+                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="general_mandatory"></localize></span>
                             </span>
                             <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>

From 7ebfd0e63c757f215d8b7797ed9cf94f35e72e58 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 15 Feb 2021 13:19:16 +0100
Subject: [PATCH 021/202] Added Xamlx extension to the DisallowedUploadFiles

---
 .../Configuration/UmbracoSettings/ContentElement.cs  |  4 ++--
 .../UmbracoSettings/ContentElementTests.cs           |  2 +-
 .../UmbracoSettings/umbracoSettings.config           | 12 ++++++------
 .../config/umbracoSettings.Release.config            |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index 3ebb632882..7c6ff4405f 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -29,11 +29,11 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         internal InnerTextConfigurationElement<MacroErrorBehaviour> MacroErrors => GetOptionalTextElement("MacroErrors", MacroErrorBehaviour.Inline);
 
         [ConfigurationProperty("disallowedUploadFiles")]
-        internal CommaDelimitedConfigurationElement DisallowedUploadFiles => GetOptionalDelimitedElement("disallowedUploadFiles", new[] {"ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd"});
+        internal CommaDelimitedConfigurationElement DisallowedUploadFiles => GetOptionalDelimitedElement("disallowedUploadFiles", new[] {"ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd", "xamlx"});
 
         [ConfigurationProperty("allowedUploadFiles")]
         internal CommaDelimitedConfigurationElement AllowedUploadFiles => GetOptionalDelimitedElement("allowedUploadFiles", new string[0]);
-        
+
         [ConfigurationProperty("showDeprecatedPropertyEditors")]
         internal InnerTextConfigurationElement<bool> ShowDeprecatedPropertyEditors => GetOptionalTextElement("showDeprecatedPropertyEditors", false);
 
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 33df3caaad..498c12101c 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -83,7 +83,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public void DisallowedUploadFiles()
         {
-            Assert.IsTrue(SettingsSection.Content.DisallowedUploadFiles.All(x => "ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd".Split(',').Contains(x)));
+            Assert.IsTrue(SettingsSection.Content.DisallowedUploadFiles.All(x => "ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,xamlx".Split(',').Contains(x)));
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 8cbb799d88..d802cfc7ad 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -18,9 +18,9 @@
           <lengthFieldAlias>umbracoBytes2</lengthFieldAlias>
           <extensionFieldAlias>umbracoExtension2</extensionFieldAlias>
         </uploadField>
-      </autoFillImageProperties>      
+      </autoFillImageProperties>
     </imaging>
-   
+
     <errors>
       <!-- the id of the page that should be shown if the page is not found -->
       <!--<error404>
@@ -50,12 +50,12 @@
                         error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
              Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
     <MacroErrors>inline</MacroErrors>
-    
+
     <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd</disallowedUploadFiles>
+    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,xamlx</disallowedUploadFiles>
 
     <!-- If completed, only the file extensions listed below will be allowed to be uploaded.  If empty, disallowedUploadFiles will apply to prevent upload of specific file extensions. -->
-    <allowedUploadFiles>jpg,png,gif</allowedUploadFiles>    
+    <allowedUploadFiles>jpg,png,gif</allowedUploadFiles>
 
   </content>
 
@@ -108,7 +108,7 @@
     <maxLogAge>1440</maxLogAge>
   </logging>
 
-  <!-- 
+  <!--
     web.routing
       @trySkipIisCustomErrors
         Tries to skip IIS custom errors.
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index c20ef3038b..5ce2c24d41 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -183,7 +183,7 @@
     <MacroErrors>throw</MacroErrors>
 
     <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
+    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess,xamlx</disallowedUploadFiles>
 
     <!-- You can specify your own background image for the login screen here. This path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/login.jpg -->
     <loginBackgroundImage>assets/img/login.jpg</loginBackgroundImage>

From fc8dc76d808e306c7c5883dee64b90f7bac6ef33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jim=20L=C3=B6fgren?= <jim.lofgren@isotop.se>
Date: Thu, 11 Feb 2021 14:06:44 +0100
Subject: [PATCH 022/202] Changed grid view labels and values to display:
 inline instead of display: inline-block to fix weird line break.

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

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 47fc8a10b9..c590421b97 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -102,11 +102,11 @@
 
 .umb-content-grid__details-label {
    font-weight: bold;
-   display: inline-block;
+   display: inline;
 }
 
 .umb-content-grid__details-value {
-   display: inline-block;
+   display: inline;
    word-break: break-word;
    margin-left: 3px;
 }

From 97ad14c8958489bfa52458dc9c9757185366f15a Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Fri, 8 Jan 2021 17:52:02 +0100
Subject: [PATCH 023/202] Update to noUiSlider v14.6.3

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

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 4d0c15204e..12cc7cd4bb 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -41,7 +41,7 @@
     "lazyload-js": "1.0.0",
     "moment": "2.22.2",
     "ng-file-upload": "12.2.13",
-    "nouislider": "14.6.2",
+    "nouislider": "14.6.3",
     "npm": "^6.14.7",
     "signalr": "2.4.0",
     "spectrum-colorpicker2": "2.0.3",

From 247795149301701ed5ab0abcc6952dc9f22b3dc1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 16 Feb 2021 17:07:12 +1100
Subject: [PATCH 024/202] Adds better logging for URL collision detection.

---
 .../Routing/UrlProviderExtensions.cs          | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
index 077680d2e2..39be81177c 100644
--- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
@@ -78,7 +78,7 @@ namespace Umbraco.Web.Routing
                 if (urls.Add(otherUrl)) //avoid duplicates
                     yield return otherUrl;
         }
-        
+
         /// <summary>
         /// Tries to return a <see cref="UrlInfo"/> for each culture for the content while detecting collisions/errors
         /// </summary>
@@ -131,10 +131,14 @@ namespace Umbraco.Web.Routing
 
                     // got a url, deal with collisions, add url
                     default:
-                        if (DetectCollision(content, url, culture, umbracoContext, publishedRouter, textService, out var urlInfo)) // detect collisions, etc
+                        if (DetectCollision(logger, content, url, culture, umbracoContext, publishedRouter, textService, out var urlInfo)) // detect collisions, etc
+                        {
                             yield return urlInfo;
+                        }
                         else
+                        {
                             yield return UrlInfo.Url(url, culture);
+                        }
                         break;
                 }
             }
@@ -152,16 +156,23 @@ namespace Umbraco.Web.Routing
             while (parent != null && parent.Published && (!parent.ContentType.VariesByCulture() || parent.IsCulturePublished(culture)));
 
             if (parent == null) // oops, internal error
+            {
                 return UrlInfo.Message(textService.Localize("content/parentNotPublishedAnomaly"), culture);
+            }
 
             else if (!parent.Published) // totally not published
-                return UrlInfo.Message(textService.Localize("content/parentNotPublished", new[] {parent.Name}), culture);
+            {
+                return UrlInfo.Message(textService.Localize("content/parentNotPublished", new[] { parent.Name }), culture);
+            }
 
-            else // culture not published
-                return UrlInfo.Message(textService.Localize("content/parentCultureNotPublished", new[] {parent.Name}), culture);
+            else
+            {
+                // culture not published
+                return UrlInfo.Message(textService.Localize("content/parentCultureNotPublished", new[] { parent.Name }), culture);
+            }
         }
 
-        private static bool DetectCollision(IContent content, string url, string culture, UmbracoContext umbracoContext, IPublishedRouter publishedRouter, ILocalizedTextService textService, out UrlInfo urlInfo)
+        private static bool DetectCollision(ILogger logger, IContent content, string url, string culture, UmbracoContext umbracoContext, IPublishedRouter publishedRouter, ILocalizedTextService textService, out UrlInfo urlInfo)
         {
             // test for collisions on the 'main' url
             var uri = new Uri(url.TrimEnd('/'), UriKind.RelativeOrAbsolute);
@@ -174,6 +185,16 @@ namespace Umbraco.Web.Routing
 
             if (pcr.HasPublishedContent == false)
             {
+                var logMsg = nameof(DetectCollision) + " did not resolve a content item for original url: {Url}, translated to {TranslatedUrl} and culture: {Culture}";
+                if (pcr.IgnorePublishedContentCollisions)
+                {
+                    logger.Debug(typeof(UrlProviderExtensions), logMsg, url, uri, culture);
+                }
+                else
+                {
+                    logger.Warn(typeof(UrlProviderExtensions), logMsg, url, uri, culture);
+                }
+
                 urlInfo = UrlInfo.Message(textService.Localize("content/routeErrorCannotRoute"), culture);
                 return true;
             }
@@ -193,7 +214,7 @@ namespace Umbraco.Web.Routing
                 l.Reverse();
                 var s = "/" + string.Join("/", l) + " (id=" + pcr.PublishedContent.Id + ")";
 
-                 urlInfo = UrlInfo.Message(textService.Localize("content/routeError", new[] { s }), culture);
+                urlInfo = UrlInfo.Message(textService.Localize("content/routeError", new[] { s }), culture);
                 return true;
             }
 

From 176b10cf5d3236f80c199cce7ba840ca109e1883 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 16 Feb 2021 10:56:16 +0100
Subject: [PATCH 025/202] Added overloads to inject AppCaches + Fixed tests

---
 .../FilterAllowedOutgoingContentAttributeTests.cs    | 12 +++++++-----
 .../Filters/FilterAllowedOutgoingContentAttribute.cs | 12 +++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs b/src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs
index 634d58b3fd..4f1beb6e8d 100644
--- a/src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs
@@ -6,6 +6,8 @@ using System.Net.Http.Headers;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
@@ -26,7 +28,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityServiceMock = new Mock<IEntityService>();
             var entityService = entityServiceMock.Object;
 
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), userService, entityService);
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), userService, entityService, AppCaches.Disabled);
             var val = new List<ContentItemBasic>() {new ContentItemBasic()};
             var result = att.GetValueFromResponse(
                 new ObjectContent(typeof (IEnumerable<ContentItemBasic>),
@@ -46,7 +48,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityServiceMock = new Mock<IEntityService>();
             var entityService = entityServiceMock.Object;
 
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), "MyList", userService, entityService);
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), "MyList", userService, entityService, AppCaches.Disabled);
             var val = new List<ContentItemBasic>() { new ContentItemBasic() };
             var container = new MyTestClass() {MyList = val};
 
@@ -68,7 +70,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityServiceMock = new Mock<IEntityService>();
             var entityService = entityServiceMock.Object;
 
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), "DontFind", userService, entityService);
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), "DontFind", userService, entityService, AppCaches.Disabled);
             var val = new List<ContentItemBasic>() { new ContentItemBasic() };
             var container = new MyTestClass() { MyList = val };
 
@@ -96,7 +98,7 @@ namespace Umbraco.Tests.Web.Controllers
                 .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 5 && entity.Path == "-1,5") });
             var entityService = entityServiceMock.Object;
 
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), userService, entityService);
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), userService, entityService, AppCaches.Disabled);
             var list = new List<dynamic>();
             var path = "";
             for (var i = 0; i < 10; i++)
@@ -144,7 +146,7 @@ namespace Umbraco.Tests.Web.Controllers
             var entityServiceMock = new Mock<IEntityService>();
             var entityService = entityServiceMock.Object;
 
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), userService, entityService);
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), userService, entityService, AppCaches.Disabled);
             att.FilterBasedOnPermissions(list, user);
 
             Assert.AreEqual(3, list.Count);
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs
index 23512aa144..24fd60cd26 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs
@@ -44,6 +44,11 @@ namespace Umbraco.Web.WebApi.Filters
         {
         }
 
+        public FilterAllowedOutgoingContentAttribute(Type outgoingType, IUserService userService, IEntityService entityService, AppCaches appCaches)
+            : this(outgoingType, ActionBrowse.ActionLetter, string.Empty, userService, entityService, appCaches)
+        {
+        }
+
         public FilterAllowedOutgoingContentAttribute(Type outgoingType, char permissionToCheck, IUserService userService, IEntityService entityService)
             : this(outgoingType, permissionToCheck, string.Empty, userService, entityService, Current.AppCaches)
         {
@@ -54,6 +59,11 @@ namespace Umbraco.Web.WebApi.Filters
         {
         }
 
+        public FilterAllowedOutgoingContentAttribute(Type outgoingType, string propertyName, IUserService userService, IEntityService entityService, AppCaches appCaches)
+            : this(outgoingType, ActionBrowse.ActionLetter, propertyName, userService, entityService, appCaches)
+        {
+        }
+
         private FilterAllowedOutgoingContentAttribute(Type outgoingType, char permissionToCheck, string propertyName, IUserService userService, IEntityService entityService, AppCaches appCaches)
             : base(outgoingType, propertyName)
         {
@@ -106,7 +116,7 @@ namespace Umbraco.Web.WebApi.Filters
                     if (nodePermission.Contains(_permissionToCheck.ToString(CultureInfo.InvariantCulture)) == false)
                     {
                         toRemove.Add(item);
-                    }                    
+                    }
                 }
                 foreach (var item in toRemove)
                 {

From e1b52128100767f5d807e0e6628608e0bcf7dcc3 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 16 Feb 2021 12:56:07 +0100
Subject: [PATCH 026/202] Fixed potential NullReferenceException when using
 obsolete ctor.

---
 .../Models/Identity/IdentityMapDefinition.cs     | 16 +++++++++++-----
 src/Umbraco.Core/Umbraco.Core.csproj             |  1 -
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs b/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs
index 47d33f3014..2d7eda0bc2 100644
--- a/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs
+++ b/src/Umbraco.Core/Models/Identity/IdentityMapDefinition.cs
@@ -1,5 +1,6 @@
 using System;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Membership;
@@ -15,14 +16,19 @@ namespace Umbraco.Core.Models.Identity
         private readonly AppCaches _appCaches;
 
         [Obsolete("Use constructor specifying all dependencies")]
-        public IdentityMapDefinition(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings)
+        public IdentityMapDefinition(
+            ILocalizedTextService textService,
+            IEntityService entityService,
+            IGlobalSettings globalSettings)
+            : this(textService, entityService, globalSettings, Current.AppCaches)
         {
-            _textService = textService;
-            _entityService = entityService;
-            _globalSettings = globalSettings;
         }
 
-        public IdentityMapDefinition(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings, AppCaches appCaches)
+        public IdentityMapDefinition(
+            ILocalizedTextService textService,
+            IEntityService entityService,
+            IGlobalSettings globalSettings,
+            AppCaches appCaches)
         {
             _textService = textService;
             _entityService = entityService;
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 4b2acbd114..4930fe70fd 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -131,7 +131,6 @@
     <Compile Include="Collections\EventClearingObservableCollection.cs" />
     <Compile Include="Constants-SqlTemplates.cs" />
     <Compile Include="Exceptions\UnattendedInstallException.cs" />
-    <Compile Include="Collections\EventClearingObservableCollection.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />

From 68ff157cf0b509067bf4d638a5d6a98194b57e40 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 16 Feb 2021 12:42:29 +0000
Subject: [PATCH 027/202] Ignores build.tmp folder at root as we don't want to
 analyze the tmp build output

---
 .github/workflows/codeql-config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-config.yml b/.github/workflows/codeql-config.yml
index 59b55e48ec..7bac345491 100644
--- a/.github/workflows/codeql-config.yml
+++ b/.github/workflows/codeql-config.yml
@@ -9,5 +9,6 @@ paths-ignore:
   - Umbraco.Tests.AcceptanceTest
   - Umbraco.Tests.Benchmarks
   - bin
+  - build.tmp
 paths:
-  - src   
\ No newline at end of file
+  - src   

From 16836951b4c0ee32bbe74001cbdfc9c72147d9e3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 17 Feb 2021 12:45:59 +1100
Subject: [PATCH 028/202] Fixes logging for PublishedRouter

---
 src/Umbraco.Web/Routing/PublishedRouter.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 6e768c28b6..64382e553d 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -417,8 +417,8 @@ namespace Umbraco.Web.Routing
             // some finders may implement caching
 
             using (_profilingLogger.DebugDuration<PublishedRouter>(
-                $"{tracePrefix}Begin finders",
-                $"{tracePrefix}End finders, {(request.HasPublishedContent ? "a document was found" : "no document was found")}"))
+                $"{tracePrefix}Executing finders...",
+                $"{tracePrefix}Completed executing finders"))
             {
                 //iterate but return on first one that finds it
                 var found = _contentFinders.Any(finder =>
@@ -426,6 +426,16 @@ namespace Umbraco.Web.Routing
                     _logger.Debug<PublishedRouter>("Finder {ContentFinderType}", finder.GetType().FullName);
                     return finder.TryFindContent(request);
                 });
+
+                _profilingLogger.Debug<PublishedRouter>(
+                    "Found? {Found} Content: {PublishedContentId}, Template: {TemplateAlias}, Domain: {Domain}, Culture: {Culture}, Is404: {Is404}, StatusCode: {StatusCode}",
+                    found,
+                    request.HasPublishedContent ? request.PublishedContent.Id : "NULL",
+                    request.HasTemplate ? request.TemplateAlias : "NULL",
+                    request.HasDomain ? request.Domain.ToString() : "NULL",
+                    request.Culture?.Name ?? "NULL",
+                    request.Is404,
+                    request.ResponseStatusCode);
             }
 
             // indicate that the published content (if any) we have at the moment is the

From 02963e7b29a60865728e9824c13474ac7d8e0e1c Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 18 Feb 2021 17:50:00 +0100
Subject: [PATCH 029/202] Remove HtmlSanitizer (#9803)

---
 build/NuSpecs/UmbracoCms.Web.nuspec        |  1 -
 src/Umbraco.Core/Constants-SvgSanitizer.cs | 23 ----------------------
 src/Umbraco.Core/Umbraco.Core.csproj       |  1 -
 src/Umbraco.Web/Services/IconService.cs    | 10 +---------
 src/Umbraco.Web/Umbraco.Web.csproj         |  3 ---
 5 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 src/Umbraco.Core/Constants-SvgSanitizer.cs

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 82d15d2b95..72619db02e 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -42,7 +42,6 @@
                 <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
                 <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
-                <dependency id="HtmlSanitizer" version="[4.0.217,4.999999)" />
 
             </group>
 
diff --git a/src/Umbraco.Core/Constants-SvgSanitizer.cs b/src/Umbraco.Core/Constants-SvgSanitizer.cs
deleted file mode 100644
index c92b9f56c7..0000000000
--- a/src/Umbraco.Core/Constants-SvgSanitizer.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core
-{
-    public static partial class Constants
-    {
-        /// <summary>
-        /// Defines the alias identifiers for Umbraco's core application sections.
-        /// </summary>
-        public static class SvgSanitizer
-        {
-            /// <summary>
-            /// Allowlist for SVG attributes.
-            /// </summary>
-            public static readonly IList<string> Attributes = new [] { "accent-height", "accumulate", "additive", "alignment-baseline", "allowReorder", "alphabetic", "amplitude", "arabic-form", "ascent", "attributeName", "attributeType", "autoReverse", "azimuth", "baseFrequency", "baseline-shift", "baseProfile", "bbox", "begin", "bias", "by", "calcMode", "cap-height", "class", "clip", "clipPathUnits", "clip-path", "clip-rule", "color", "color-interpolation", "color-interpolation-filters", "color-profile", "color-rendering", "contentScriptType", "contentStyleType", "cursor", "cx", "cy", "d", "decelerate", "descent", "diffuseConstant", "direction", "display", "divisor", "dominant-baseline", "dur", "dx", "dy", "edgeMode", "elevation", "enable-background", "end", "exponent", "externalResourcesRequired", "Section", "fill", "fill-opacity", "fill-rule", "filter", "filterRes", "filterUnits", "flood-color", "flood-opacity", "font-family", "font-size", "font-size-adjust", "font-stretch", "font-style", "font-variant", "font-weight", "format", "from", "fr", "fx", "fy", "g1", "g2", "glyph-name", "glyph-orientation-horizontal", "glyph-orientation-vertical", "glyphRef", "gradientTransform", "gradientUnits", "hanging", "height", "href", "hreflang", "horiz-adv-x", "horiz-origin-x", "ISection", "id", "ideographic", "image-rendering", "in", "in2", "intercept", "k", "k1", "k2", "k3", "k4", "kernelMatrix", "kernelUnitLength", "kerning", "keyPoints", "keySplines", "keyTimes", "lang", "lengthAdjust", "letter-spacing", "lighting-color", "limitingConeAngle", "local", "MSection", "marker-end", "marker-mid", "marker-start", "markerHeight", "markerUnits", "markerWidth", "mask", "maskContentUnits", "maskUnits", "mathematical", "max", "media", "method", "min", "mode", "NSection", "name", "numOctaves", "offset", "opacity", "operator", "order", "orient", "orientation", "origin", "overflow", "overline-position", "overline-thickness", "panose-1", "paint-order", "path", "pathLength", "patternContentUnits", "patternTransform", "patternUnits", "ping", "pointer-events", "points", "pointsAtX", "pointsAtY", "pointsAtZ", "preserveAlpha", "preserveAspectRatio", "primitiveUnits", "r", "radius", "referrerPolicy", "refX", "refY", "rel", "rendering-intent", "repeatCount", "repeatDur", "requiredExtensions", "requiredFeatures", "restart", "result", "rotate", "rx", "ry", "scale", "seed", "shape-rendering", "slope", "spacing", "specularConstant", "specularExponent", "speed", "spreadMethod", "startOffset", "stdDeviation", "stemh", "stemv", "stitchTiles", "stop-color", "stop-opacity", "strikethrough-position", "strikethrough-thickness", "string", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "surfaceScale", "systemLanguage", "tabindex", "tableValues", "target", "targetX", "targetY", "text-anchor", "text-decoration", "text-rendering", "textLength", "to", "transform", "type", "u1", "u2", "underline-position", "underline-thickness", "unicode", "unicode-bidi", "unicode-range", "units-per-em", "v-alphabetic", "v-hanging", "v-ideographic", "v-mathematical", "values", "vector-effect", "version", "vert-adv-y", "vert-origin-x", "vert-origin-y", "viewBox", "viewTarget", "visibility", "width", "widths", "word-spacing", "writing-mode", "x", "x-height", "x1", "x2", "xChannelSelector", "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show", "xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "y", "y1", "y2", "yChannelSelector", "z", "zoomAndPan" };
-
-            /// <summary>
-            /// Allowlist for SVG tabs.
-            /// </summary>
-            public static readonly IList<string> Tags = new [] { "a", "altGlyph", "altGlyphDef", "altGlyphItem", "animate", "animateColor", "animateMotion", "animateTransform", "circle", "clipPath", "color-profile", "cursor", "defs", "desc", "discard", "ellipse", "feBlend", "feColorMatrix", "feComponentTransfer", "feComposite", "feConvolveMatrix", "feDiffuseLighting", "feDisplacementMap", "feDistantLight", "feDropShadow", "feFlood", "feFuncA", "feFuncB", "feFuncG", "feFuncR", "feGaussianBlur", "feImage", "feMerge", "feMergeNode", "feMorphology", "feOffset", "fePointLight", "feSpecularLighting", "feSpotLight", "feTile", "feTurbulence", "filter", "font", "font-face", "font-face-format", "font-face-name", "font-face-src", "font-face-uri", "foreignObject", "g", "glyph", "glyphRef", "hatch", "hatchpath", "hkern", "image", "line", "linearGradient", "marker", "mask", "mesh", "meshgradient", "meshpatch", "meshrow", "metadata", "missing-glyph", "mpath", "path", "pattern", "polygon", "polyline", "radialGradient", "rect", "set", "solidcolor", "stop", "svg", "switch", "symbol", "text", "textPath", "title", "tref", "tspan", "unknown", "use", "view", "vkern" };
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 832b8a5801..b98ad64f7a 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -256,7 +256,6 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
-    <Compile Include="Constants-SvgSanitizer.cs" />
     <Compile Include="Exceptions\PanicException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index 206af296f9..a74fa909e0 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Ganss.XSS;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
@@ -68,20 +67,13 @@ namespace Umbraco.Web.Services
         /// <returns></returns>
         private IconModel CreateIconModel(string iconName, string iconPath)
         {
-            var sanitizer = new HtmlSanitizer();
-            sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
-            sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
-            sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
-
             try
             {
                 var svgContent = System.IO.File.ReadAllText(iconPath);
-                var sanitizedString = sanitizer.Sanitize(svgContent);
-
                 var svg = new IconModel
                 {
                     Name = iconName,
-                    SvgString = sanitizedString
+                    SvgString = svgContent
                 };
 
                 return svg;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8890d9cf25..d93ae18dd5 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -65,9 +65,6 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
-    <PackageReference Include="HtmlSanitizer">
-      <Version>4.0.217</Version>
-    </PackageReference>
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>

From 81f1c2e7d6b569b7d3cd7a5eb62ec2610f78be16 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 18 Feb 2021 22:08:12 +0100
Subject: [PATCH 030/202] Update to latest Examine

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

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 82d15d2b95..59bd7d75aa 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -28,7 +28,7 @@
                 <dependency id="ClientDependency" version="[1.9.9,1.999999)" />
                 <dependency id="ClientDependency-Mvc5" version="[1.9.3,1.999999)" />
                 <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.2,1.999999)" />
+                <dependency id="Examine" version="[1.1.0,1.999999)" />
                 <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
                 <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
                 <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 0e0ee62139..517edf354c 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -49,7 +49,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.2" />
+    <PackageReference Include="Examine" Version="1.1.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub">
       <Version>1.0.0-beta2-19324-01</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 2ac28aa7d7..97604df0c6 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -79,7 +79,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.3.1" />
-    <PackageReference Include="Examine" Version="1.0.2" />
+    <PackageReference Include="Examine" Version="1.1.0" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 01d029cae0..69bdeba643 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -88,7 +88,7 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.9" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.9.3" />
-    <PackageReference Include="Examine" Version="1.0.2" />
+    <PackageReference Include="Examine" Version="1.1.0" />
     <PackageReference Include="ImageProcessor.Web" Version="4.10.0.100" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.5.0.100" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8890d9cf25..16068b66f0 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -63,7 +63,7 @@
   <ItemGroup>
     <PackageReference Include="ClientDependency" Version="1.9.9" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.2" />
+    <PackageReference Include="Examine" Version="1.1.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
     <PackageReference Include="HtmlSanitizer">
       <Version>4.0.217</Version>

From b9b75b37943911005ec4cd3db636918861421e7b Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Sat, 20 Feb 2021 11:30:20 +1000
Subject: [PATCH 031/202] Fix 'Do something else' button position in create
 dialog (#9846)

* fixes do something else button position in create dialog for doc types and media types

* adds type attribute to buttons
---
 .../src/views/documenttypes/create.html       | 10 +--
 .../src/views/mediatypes/create.html          |  2 +-
 .../src/views/membertypes/create.html         | 84 ++++++++++---------
 3 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 208b4eaeda..f9e2402dc6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -73,12 +73,12 @@
                 <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
             </form>
         </div>
+    </div>
 
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-            <button class="btn btn-info" ng-click="close(true)">
-                <localize key="buttons_somethingElse">Do something else</localize>
-            </button>
-        </div>
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
+        <button type="button" class="btn btn-info" ng-click="close(true)">
+            <localize key="buttons_somethingElse">Do something else</localize>
+        </button>
 
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
index 0fa5aa61c8..1ce8ab1465 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
@@ -47,7 +47,7 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-        <button class="btn btn-info" ng-click="close()">
+        <button type="button" class="btn btn-info" ng-click="close()">
             <localize key="buttons_somethingElse">Do something else</localize>
         </button>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
index 46b51b5f34..673b90ef85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
@@ -1,47 +1,53 @@
-<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.MemberTypes.CreateController">
+<div ng-controller="Umbraco.Editors.MemberTypes.CreateController">
+    <div class="umbracoDialog umb-dialog-body with-footer">
+        <div class="umb-pane" ng-if="!model.creatingFolder">
+            <h5>
+                <localize key="create_createUnder">Create a type under</localize> {{currentNode.name}}
+            </h5>
 
-    <div class="umb-pane" ng-if="!model.creatingFolder">
-        <h5><localize key="create_createUnder">Create a type under</localize> {{currentNode.name}}</h5>
+            <ul class="umb-actions umb-actions-child">
+                <li class="umb-action">
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
+                        <i class="large icon icon-folder" aria-hidden="true"></i>
+                        <span class="menu-label">
+                            <localize key="general_folder"></localize>
+                        </span>
+                    </button>
+                </li>
+                <li class="umb-action">
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
 
-        <ul class="umb-actions umb-actions-child">
-            <li class="umb-action">
-                <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
-                    <i class="large icon icon-folder" aria-hidden="true"></i>
-                    <span class="menu-label"><localize key="general_folder"></localize></span>
+                        <i class="large icon icon-item-arrangement"></i>
+
+                        <span class="menu-label">
+                            <localize key="general_new">New</localize>&nbsp;
+                            <localize key="content_memberType">Member type</localize>
+                        </span>
+
+                    </button>
+                </li>
+            </ul>
+        </div>
+
+        <div class="umb-pane" ng-if="model.creatingFolder">
+            <form novalidate name="createFolderForm" ng-submit="createFolder()" val-form-manager>
+
+                <umb-control-group label="Enter a folder name" hide-label="false">
+                    <input type="text" name="folderName" ng-model="model.folderName"
+                        class="umb-textstring textstring input-block-level" required />
+                </umb-control-group>
+
+                <button type="submit" class="btn btn-primary">
+                    <localize key="general_create">Create</localize>
                 </button>
-            </li>
-            <li class="umb-action">
-                <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
+            </form>
+        </div>
 
-                    <i class="large icon icon-item-arrangement"></i>
-
-                    <span class="menu-label">
-                        <localize key="general_new">New</localize>&nbsp;
-                        <localize key="content_memberType">Member type</localize>
-                    </span>
-
-                </button>
-            </li>
-        </ul>
     </div>
 
-    <div class="umb-pane" ng-if="model.creatingFolder">
-        <form novalidate name="createFolderForm"
-              ng-submit="createFolder()"
-              val-form-manager>
-
-            <umb-control-group label="Enter a folder name" hide-label="false">
-                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" required />
-            </umb-control-group>
-
-            <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
-        </form>
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
+        <button type="button" class="btn btn-info" ng-click="nav.hideDialog(true)">
+            <localize key="buttons_somethingElse">Do something else</localize>
+        </button>
     </div>
-
-</div>
-
-<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-    <button class="btn btn-info" ng-click="nav.hideDialog(true)">
-        <localize key="buttons_somethingElse">Do something else</localize>
-    </button>
 </div>

From 2c54adacf23852453f6f0944134c85e8730d7364 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sat, 20 Feb 2021 13:44:15 +0100
Subject: [PATCH 032/202] Add the ability to change the SQL Write Lock TimeOut
 (#9750)

Co-authored-by: Shannon <sdeminick@gmail.com>
---
 .../Configuration/GlobalSettings.cs           |  30 +++-
 src/Umbraco.Core/Constants-AppSettings.cs     |   3 -
 .../SqlSyntax/ISqlSyntaxProvider.cs           |   8 +-
 .../SqlSyntax/SqlCeSyntaxProvider.cs          |  55 +++++--
 .../SqlSyntax/SqlServerSyntaxProvider.cs      |  62 ++++++--
 .../SqlSyntax/SqlSyntaxProviderBase.cs        |   5 +-
 src/Umbraco.Core/Scoping/IScope.cs            |  18 +++
 src/Umbraco.Core/Scoping/Scope.cs             |  25 ++-
 src/Umbraco.Tests/Persistence/LocksTests.cs   | 149 ++++++++++++++++++
 .../TestHelpers/SettingsForTests.cs           |   2 +-
 10 files changed, 317 insertions(+), 40 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 1d1ccaf7b4..b7dce21285 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -6,7 +6,9 @@ using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Xml.Linq;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
 {
@@ -23,6 +25,7 @@ namespace Umbraco.Core.Configuration
         // TODO these should not be static
         private static string _reservedPaths;
         private static string _reservedUrls;
+        private static int _sqlWriteLockTimeOut;
 
         //ensure the built on (non-changeable) reserved paths are there at all times
         internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
@@ -397,21 +400,34 @@ namespace Umbraco.Core.Configuration
         /// An int value representing the time in milliseconds to lock the database for a write operation
         /// </summary>
         /// <remarks>
-        /// The default value is 1800 milliseconds
+        /// The default value is 5000 milliseconds
         /// </remarks>
         /// <value>The timeout in milliseconds.</value>
         public int SqlWriteLockTimeOut
         {
             get
             {
-                try
+                if (_sqlWriteLockTimeOut != default) return _sqlWriteLockTimeOut;
+
+                var timeOut = 5000; // 5 seconds
+                var appSettingSqlWriteLockTimeOut = ConfigurationManager.AppSettings[Constants.AppSettings.SqlWriteLockTimeOut];
+                if(int.TryParse(appSettingSqlWriteLockTimeOut, out var configuredTimeOut))
                 {
-                    return int.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.SqlWriteLockTimeOut]);
-                }
-                catch
-                {
-                    return 1800;
+                    // Only apply this setting if it's not excessively high or low
+                    const int minimumTimeOut = 100;
+                    const int maximumTimeOut = 20000;
+                    if (configuredTimeOut >= minimumTimeOut && configuredTimeOut <= maximumTimeOut) // between 0.1 and 20 seconds
+                    {
+                        timeOut = configuredTimeOut;
+                    }
+                    else
+                    {
+                      Current.Logger.Warn<GlobalSettings>($"The `{Constants.AppSettings.SqlWriteLockTimeOut}` setting in web.config is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms, defaulting back to {timeOut}");
+                    }
                 }
+
+                _sqlWriteLockTimeOut = timeOut;
+                return _sqlWriteLockTimeOut;
             }
         }
     }
diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index 0182034011..f04f0e1f5f 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -144,9 +144,6 @@ namespace Umbraco.Core
             /// <summary>
             /// An int value representing the time in milliseconds to lock the database for a write operation
             /// </summary>
-            /// <remarks>
-            /// The default value is 1800 milliseconds
-            /// </remarks>
             public const string SqlWriteLockTimeOut = "Umbraco.Core.SqlWriteLockTimeOut";
         }
     }
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
index 7ae001bf24..4c322f9648 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
@@ -9,6 +9,12 @@ using Umbraco.Core.Persistence.Querying;
 
 namespace Umbraco.Core.Persistence.SqlSyntax
 {
+    public interface ISqlSyntaxProvider2 : ISqlSyntaxProvider
+    {
+        void ReadLock(IDatabase db, TimeSpan timeout, int lockId);
+        void WriteLock(IDatabase db, TimeSpan timeout, int lockId);
+    }
+
     /// <summary>
     /// Defines an SqlSyntaxProvider
     /// </summary>
@@ -77,7 +83,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         string ConvertIntegerToOrderableString { get; }
         string ConvertDateToOrderableString { get; }
         string ConvertDecimalToOrderableString { get; }
-        
+
         /// <summary>
         /// Returns the default isolation level for the database
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
index 046f54405a..127d00b561 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
@@ -158,6 +158,16 @@ where table_name=@0 and column_name=@1", tableName, columnName).FirstOrDefault()
             return result > 0;
         }
 
+        public override void WriteLock(IDatabase db, TimeSpan timeout, int lockId)
+        {
+            // soon as we get Database, a transaction is started
+
+            if (db.Transaction.IsolationLevel < IsolationLevel.RepeatableRead)
+                throw new InvalidOperationException("A transaction with minimum RepeatableRead isolation level is required.");
+
+            ObtainWriteLock(db, timeout, lockId);
+        }
+
         public override void WriteLock(IDatabase db, params int[] lockIds)
         {
             // soon as we get Database, a transaction is started
@@ -165,17 +175,32 @@ where table_name=@0 and column_name=@1", tableName, columnName).FirstOrDefault()
             if (db.Transaction.IsolationLevel < IsolationLevel.RepeatableRead)
                 throw new InvalidOperationException("A transaction with minimum RepeatableRead isolation level is required.");
 
-            var timeOut = Current.Configs.Global().SqlWriteLockTimeOut;
-            db.Execute(@"SET LOCK_TIMEOUT " + timeOut  + ";");
-            // *not* using a unique 'WHERE IN' query here because the *order* of lockIds is important to avoid deadlocks
+            var timeout = TimeSpan.FromMilliseconds(Current.Configs.Global().SqlWriteLockTimeOut);
+
             foreach (var lockId in lockIds)
             {
-                var i = db.Execute(@"UPDATE umbracoLock SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id", new { id = lockId });
-                if (i == 0) // ensure we are actually locking!
-                    throw new ArgumentException($"LockObject with id={lockId} does not exist.");
+                ObtainWriteLock(db, timeout, lockId);
             }
         }
 
+        private static void ObtainWriteLock(IDatabase db, TimeSpan timeout, int lockId)
+        {
+            db.Execute(@"SET LOCK_TIMEOUT " + timeout.TotalMilliseconds  + ";");
+            var i = db.Execute(@"UPDATE umbracoLock SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id", new { id = lockId });
+            if (i == 0) // ensure we are actually locking!
+                throw new ArgumentException($"LockObject with id={lockId} does not exist.");
+        }
+
+        public override void ReadLock(IDatabase db, TimeSpan timeout, int lockId)
+        {
+            // soon as we get Database, a transaction is started
+
+            if (db.Transaction.IsolationLevel < IsolationLevel.RepeatableRead)
+                throw new InvalidOperationException("A transaction with minimum RepeatableRead isolation level is required.");
+
+            ObtainReadLock(db, timeout, lockId);
+        }
+
         public override void ReadLock(IDatabase db, params int[] lockIds)
         {
             // soon as we get Database, a transaction is started
@@ -183,15 +208,25 @@ where table_name=@0 and column_name=@1", tableName, columnName).FirstOrDefault()
             if (db.Transaction.IsolationLevel < IsolationLevel.RepeatableRead)
                 throw new InvalidOperationException("A transaction with minimum RepeatableRead isolation level is required.");
 
-            // *not* using a unique 'WHERE IN' query here because the *order* of lockIds is important to avoid deadlocks
             foreach (var lockId in lockIds)
             {
-                var i = db.ExecuteScalar<int?>("SELECT value FROM umbracoLock WHERE id=@id", new { id = lockId });
-                if (i == null) // ensure we are actually locking!
-                    throw new ArgumentException($"LockObject with id={lockId} does not exist.");
+                ObtainReadLock(db, null, lockId);
             }
         }
 
+        private static void ObtainReadLock(IDatabase db, TimeSpan? timeout, int lockId)
+        {
+            if (timeout.HasValue)
+            {
+                db.Execute(@"SET LOCK_TIMEOUT " + timeout.Value.TotalMilliseconds + ";");
+            }
+
+            var i = db.ExecuteScalar<int?>("SELECT value FROM umbracoLock WHERE id=@id", new {id = lockId});
+
+            if (i == null) // ensure we are actually locking!
+                throw new ArgumentException($"LockObject with id={lockId} does not exist.");
+        }
+
         protected override string FormatIdentity(ColumnDefinition column)
         {
             return column.IsIdentity ? GetIdentityString(column) : string.Empty;
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index 3fc5e36f6e..372b6837bc 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -254,30 +254,50 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
             return result > 0;
         }
 
-        public override void WriteLock(IDatabase db, params int[] lockIds)
-        {
-            var timeOut = Current.Configs.Global().SqlWriteLockTimeOut;
-            WriteLock(db, TimeSpan.FromMilliseconds(timeOut), lockIds);
-        }
-
-        public void WriteLock(IDatabase db, TimeSpan timeout, params int[] lockIds)
+        public override void WriteLock(IDatabase db, TimeSpan timeout, int lockId)
         {
             // soon as we get Database, a transaction is started
 
             if (db.Transaction.IsolationLevel < IsolationLevel.ReadCommitted)
                 throw new InvalidOperationException("A transaction with minimum ReadCommitted isolation level is required.");
 
+            ObtainWriteLock(db, timeout, lockId);
+        }
+
+        public override void WriteLock(IDatabase db, params int[] lockIds)
+        {
+            // soon as we get Database, a transaction is started
+
+            if (db.Transaction.IsolationLevel < IsolationLevel.ReadCommitted)
+                throw new InvalidOperationException("A transaction with minimum ReadCommitted isolation level is required.");
+
+            var timeout = TimeSpan.FromMilliseconds(Current.Configs.Global().SqlWriteLockTimeOut);
 
-            // *not* using a unique 'WHERE IN' query here because the *order* of lockIds is important to avoid deadlocks
             foreach (var lockId in lockIds)
             {
-                db.Execute($"SET LOCK_TIMEOUT {timeout.TotalMilliseconds};");
-                var i = db.Execute(@"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id", new { id = lockId });
-                if (i == 0) // ensure we are actually locking!
-                    throw new ArgumentException($"LockObject with id={lockId} does not exist.");
+                ObtainWriteLock(db, timeout, lockId);
             }
         }
 
+        private static void ObtainWriteLock(IDatabase db, TimeSpan timeout, int lockId)
+        {
+            db.Execute("SET LOCK_TIMEOUT" + timeout.TotalMilliseconds + ";");
+            var i = db.Execute(
+                @"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id",
+                new {id = lockId});
+            if (i == 0) // ensure we are actually locking!
+                throw new ArgumentException($"LockObject with id={lockId} does not exist.");
+        }
+
+        public override void ReadLock(IDatabase db, TimeSpan timeout, int lockId)
+        {
+            // soon as we get Database, a transaction is started
+
+            if (db.Transaction.IsolationLevel < IsolationLevel.ReadCommitted)
+                throw new InvalidOperationException("A transaction with minimum RepeatableRead isolation level is required.");
+
+            ObtainReadLock(db, timeout, lockId);
+        }
 
         public override void ReadLock(IDatabase db, params int[] lockIds)
         {
@@ -286,15 +306,25 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
             if (db.Transaction.IsolationLevel < IsolationLevel.ReadCommitted)
                 throw new InvalidOperationException("A transaction with minimum ReadCommitted isolation level is required.");
 
-            // *not* using a unique 'WHERE IN' query here because the *order* of lockIds is important to avoid deadlocks
             foreach (var lockId in lockIds)
             {
-                var i = db.ExecuteScalar<int?>("SELECT value FROM umbracoLock WITH (REPEATABLEREAD) WHERE id=@id", new { id = lockId });
-                if (i == null) // ensure we are actually locking!
-                    throw new ArgumentException($"LockObject with id={lockId} does not exist.", nameof(lockIds));
+                ObtainReadLock(db, null, lockId);
             }
         }
 
+        private static void ObtainReadLock(IDatabase db, TimeSpan? timeout, int lockId)
+        {
+            if (timeout.HasValue)
+            {
+                db.Execute(@"SET LOCK_TIMEOUT " + timeout.Value.TotalMilliseconds + ";");
+            }
+
+            var i = db.ExecuteScalar<int?>("SELECT value FROM umbracoLock WITH (REPEATABLEREAD) WHERE id=@id", new {id = lockId});
+
+            if (i == null) // ensure we are actually locking!
+                throw new ArgumentException($"LockObject with id={lockId} does not exist.");
+        }
+
         public override string FormatColumnRename(string tableName, string oldName, string newName)
         {
             return string.Format(RenameColumn, tableName, oldName, newName);
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index 8570c49f69..6f13afb24c 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
     /// All Sql Syntax provider implementations should derive from this abstract class.
     /// </remarks>
     /// <typeparam name="TSyntax"></typeparam>
-    public abstract class SqlSyntaxProviderBase<TSyntax> : ISqlSyntaxProvider
+    public abstract class SqlSyntaxProviderBase<TSyntax> : ISqlSyntaxProvider2
         where TSyntax : ISqlSyntaxProvider
     {
         protected SqlSyntaxProviderBase()
@@ -235,6 +235,9 @@ namespace Umbraco.Core.Persistence.SqlSyntax
 
         public abstract void ReadLock(IDatabase db, params int[] lockIds);
         public abstract void WriteLock(IDatabase db, params int[] lockIds);
+        public abstract void ReadLock(IDatabase db, TimeSpan timeout, int lockId);
+
+        public abstract void WriteLock(IDatabase db, TimeSpan timeout, int lockId);
 
         public virtual bool DoesTableExist(IDatabase db, string tableName)
         {
diff --git a/src/Umbraco.Core/Scoping/IScope.cs b/src/Umbraco.Core/Scoping/IScope.cs
index de4eef0a08..0c38031558 100644
--- a/src/Umbraco.Core/Scoping/IScope.cs
+++ b/src/Umbraco.Core/Scoping/IScope.cs
@@ -5,6 +5,24 @@ using Umbraco.Core.Persistence;
 
 namespace Umbraco.Core.Scoping
 {
+    // TODO: This is for backward compat - Merge this in netcore
+    public interface IScope2 : IScope
+    {
+        /// <summary>
+        /// Write-locks some lock objects.
+        /// </summary>
+        /// <param name="timeout">The database timeout in milliseconds</param>
+        /// <param name="lockId">The lock object identifier.</param>
+        void WriteLock(TimeSpan timeout, int lockId);
+
+        /// <summary>
+        /// Read-locks some lock objects.
+        /// </summary>
+        /// <param name="timeout">The database timeout in milliseconds</param>
+        /// <param name="lockId">The lock object identifier.</param>
+        void ReadLock(TimeSpan timeout, int lockId);
+    }
+
     /// <summary>
     /// Represents a scope.
     /// </summary>
diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 84273e23da..24ef92278c 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Scoping
 {
@@ -13,7 +14,7 @@ namespace Umbraco.Core.Scoping
     /// Implements <see cref="IScope"/>.
     /// </summary>
     /// <remarks>Not thread-safe obviously.</remarks>
-    internal class Scope : IScope
+    internal class Scope : IScope2
     {
         private readonly ScopeProvider _scopeProvider;
         private readonly ILogger _logger;
@@ -488,7 +489,29 @@ namespace Umbraco.Core.Scoping
         /// <inheritdoc />
         public void ReadLock(params int[] lockIds) => Database.SqlContext.SqlSyntax.ReadLock(Database, lockIds);
 
+        /// <inheritdoc />
+        public void ReadLock(TimeSpan timeout, int lockId)
+        {
+            var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
+            if (syntax2 == null)
+            {
+                throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
+            }
+            syntax2.ReadLock(Database, timeout, lockId);
+        }
+
         /// <inheritdoc />
         public void WriteLock(params int[] lockIds) => Database.SqlContext.SqlSyntax.WriteLock(Database, lockIds);
+
+        /// <inheritdoc />
+        public void WriteLock(TimeSpan timeout, int lockId)
+        {
+            var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
+            if (syntax2 == null)
+            {
+                throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
+            }
+            syntax2.WriteLock(Database, timeout, lockId);
+        }
     }
 }
diff --git a/src/Umbraco.Tests/Persistence/LocksTests.cs b/src/Umbraco.Tests/Persistence/LocksTests.cs
index afcd481f9f..1c651b9040 100644
--- a/src/Umbraco.Tests/Persistence/LocksTests.cs
+++ b/src/Umbraco.Tests/Persistence/LocksTests.cs
@@ -1,11 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.Data.SqlServerCe;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using NPoco;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Core.Scoping;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
@@ -275,6 +278,152 @@ namespace Umbraco.Tests.Persistence
             Assert.IsNull(e2);
         }
 
+        [Test]
+        public void Throws_When_Lock_Timeout_Is_Exceeded()
+        {   
+            var t1 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    var realScope = (Scope)scope;
+
+                    Console.WriteLine("Write lock A");
+                    // This will acquire right away 
+                    realScope.WriteLock(TimeSpan.FromMilliseconds(2000), Constants.Locks.ContentTree);
+                    Thread.Sleep(6000); // Wait longer than the Read Lock B timeout
+                    scope.Complete();
+                    Console.WriteLine("Finished Write lock A");
+                }
+            });
+
+            Thread.Sleep(500); // 100% sure task 1 starts first
+
+            var t2 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    var realScope = (Scope)scope;
+
+                    Console.WriteLine("Read lock B");
+
+                    // This will wait for the write lock to release but it isn't going to wait long
+                    // enough so an exception will be thrown.
+                    Assert.Throws<SqlCeLockTimeoutException>(() =>
+                        realScope.ReadLock(TimeSpan.FromMilliseconds(3000), Constants.Locks.ContentTree));
+
+                    scope.Complete();
+                    Console.WriteLine("Finished Read lock B");
+                }
+            });
+
+            var t3 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    var realScope = (Scope)scope;
+
+                    Console.WriteLine("Write lock C");
+
+                    // This will wait for the write lock to release but it isn't going to wait long
+                    // enough so an exception will be thrown.
+                    Assert.Throws<SqlCeLockTimeoutException>(() =>
+                        realScope.WriteLock(TimeSpan.FromMilliseconds(3000), Constants.Locks.ContentTree));
+
+                    scope.Complete();
+                    Console.WriteLine("Finished Write lock C");
+                }
+            });
+
+            Task.WaitAll(t1, t2, t3);
+        }
+
+        [Test]
+        public void Read_Lock_Waits_For_Write_Lock()
+        {
+            var locksCompleted = 0;
+
+            var t1 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    var realScope = (Scope)scope;
+
+                    Console.WriteLine("Write lock A");
+                    // This will acquire right away 
+                    realScope.WriteLock(TimeSpan.FromMilliseconds(2000), Constants.Locks.ContentTree);
+                    Thread.Sleep(4000); // Wait less than the Read Lock B timeout
+                    scope.Complete();
+                    Interlocked.Increment(ref locksCompleted);
+                    Console.WriteLine("Finished Write lock A");
+                }
+            });
+
+            Thread.Sleep(500); // 100% sure task 1 starts first
+
+            var t2 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    var realScope = (Scope)scope;
+
+                    Console.WriteLine("Read lock B");
+
+                    // This will wait for the write lock to release
+                    Assert.DoesNotThrow(() =>
+                        realScope.ReadLock(TimeSpan.FromMilliseconds(6000), Constants.Locks.ContentTree));
+
+                    Assert.GreaterOrEqual(locksCompleted, 1);
+
+                    scope.Complete();
+                    Interlocked.Increment(ref locksCompleted);
+                    Console.WriteLine("Finished Read lock B");
+                }                
+            });
+
+            var t3 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    var realScope = (Scope)scope;
+
+                    Console.WriteLine("Read lock C");
+
+                    // This will wait for the write lock to release
+                    Assert.DoesNotThrow(() =>
+                        realScope.ReadLock(TimeSpan.FromMilliseconds(6000), Constants.Locks.ContentTree));
+
+                    Assert.GreaterOrEqual(locksCompleted, 1);
+
+                    scope.Complete();
+                    Interlocked.Increment(ref locksCompleted);
+                    Console.WriteLine("Finished Read lock C");
+                }
+            });
+
+            Task.WaitAll(t1, t2, t3);
+
+            Assert.AreEqual(3, locksCompleted);
+        }
+
+        [Test]
+        [NUnit.Framework.Ignore("We cannot run this test with SQLCE because it does not support a Command Timeout")]
+        public void Lock_Exceeds_Command_Timeout()
+        {
+            using (var scope = ScopeProvider.CreateScope())
+            {
+                var realScope = (Scope)scope;
+
+                var realDb = (Database)realScope.Database;
+                realDb.CommandTimeout = 1000;
+
+                Console.WriteLine("Write lock A");
+                // TODO: In theory this would throw
+                realScope.WriteLock(TimeSpan.FromMilliseconds(3000), Constants.Locks.ContentTree);
+                scope.Complete();
+                Console.WriteLine("Finished Write lock A");
+            }
+        }
+
         private void NoDeadLockTestThread(int id, EventWaitHandle myEv, WaitHandle otherEv, ref Exception exception)
         {
             using (var scope = ScopeProvider.CreateScope())
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index 1121a48823..c31c037c00 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.TestHelpers
                     settings.LocalTempPath == IOHelper.MapPath("~/App_Data/TEMP") &&
                     settings.ReservedPaths == (GlobalSettings.StaticReservedPaths + "~/umbraco") &&
                     settings.ReservedUrls == GlobalSettings.StaticReservedUrls &&
-                    settings.SqlWriteLockTimeOut == 1800);
+                    settings.SqlWriteLockTimeOut == 5000);
             return config;
         }
 

From f064c074d1c36337b14c7898a96fc8d0cd9de959 Mon Sep 17 00:00:00 2001
From: BeardinaSuit <BeardInASuit@outlook.com>
Date: Sat, 20 Feb 2021 08:37:11 -0500
Subject: [PATCH 033/202] Fix for Issue #135 - Variation < null >, < null> is
 not supported by the property type (#9524)

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
---
 .../Packaging/PackageDataInstallation.cs      | 36 +++++++++++++++++--
 .../Services/Implement/EntityXmlSerializer.cs | 11 ++++--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 4d1f12baaa..6262f99c56 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -358,12 +358,28 @@ namespace Umbraco.Core.Packaging
                     Key = key
                 };
 
+            // Handle culture specific node names
+            const string nodeNamePrefix = "nodeName-";
+            // Get the installed culture iso names, we create a localized content node with a culture that does not exist in the project
+            // We have to use Invariant comparisons, because when we get them from ContentBase in EntityXmlSerializer they're all lowercase.
+            var installedLanguages = _localizationService.GetAllLanguages().Select(l => l.IsoCode).ToArray();
+            foreach (var localizedNodeName in element.Attributes().Where(a => a.Name.LocalName.InvariantStartsWith(nodeNamePrefix)))
+            {
+                var newCulture = localizedNodeName.Name.LocalName.Substring(nodeNamePrefix.Length);
+                // Skip the culture if it does not exist in the current project
+                if (installedLanguages.InvariantContains(newCulture))
+                {
+                    content.SetCultureName(localizedNodeName.Value, newCulture);
+                }
+            }
+
             //Here we make sure that we take composition properties in account as well
             //otherwise we would skip them and end up losing content
             var propTypes = contentType.CompositionPropertyTypes.Any()
                 ? contentType.CompositionPropertyTypes.ToDictionary(x => x.Alias, x => x)
                 : contentType.PropertyTypes.ToDictionary(x => x.Alias, x => x);
 
+            var foundLanguages = new HashSet<string>();
             foreach (var property in properties)
             {
                 string propertyTypeAlias = property.Name.LocalName;
@@ -371,14 +387,30 @@ namespace Umbraco.Core.Packaging
                 {
                     var propertyValue = property.Value;
 
+                    // Handle properties language attributes
+                    var propertyLang = property.Attribute(XName.Get("lang"))?.Value;
+                    foundLanguages.Add(propertyLang);
                     if (propTypes.TryGetValue(propertyTypeAlias, out var propertyType))
                     {
-                        //set property value
-                        content.SetValue(propertyTypeAlias, propertyValue);
+                        // set property value
+                        // Skip unsupported language variation, otherwise we'll get a "not supported error"
+                        // We allow null, because that's invariant
+                        if (installedLanguages.InvariantContains(propertyLang) || propertyLang is null)
+                        {
+                            content.SetValue(propertyTypeAlias, propertyValue, propertyLang);
+                        }
                     }
                 }
             }
 
+            foreach (var propertyLang in foundLanguages)
+            {
+                if (string.IsNullOrEmpty(content.GetCultureName(propertyLang)) && installedLanguages.InvariantContains(propertyLang))
+                {
+                    content.SetCultureName(nodeName, propertyLang);
+                }
+            }
+
             return content;
         }
 
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 4d7694d1b8..8cfcaa1182 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Core.Services.Implement
                     var children = _contentService.GetPagedChildren(content.Id, page++, pageSize, out total);
                     SerializeChildren(children, xml, published);
                 }
-                
+
             }
 
             return xml;
@@ -488,7 +488,7 @@ namespace Umbraco.Core.Services.Implement
                                                    new XElement("Alias", propertyType.Alias),
                                                    new XElement("Key", propertyType.Key),
                                                    new XElement("Type", propertyType.PropertyEditorAlias),
-                                                   new XElement("Definition", definition.Key),                                                   
+                                                   new XElement("Definition", definition.Key),
                                                    new XElement("Tab", propertyGroup == null ? "" : propertyGroup.Name),
                                                    new XElement("SortOrder", propertyType.SortOrder),
                                                    new XElement("Mandatory", propertyType.Mandatory.ToString()),
@@ -553,6 +553,13 @@ namespace Umbraco.Core.Services.Implement
                 new XAttribute("path", contentBase.Path),
                 new XAttribute("isDoc", ""));
 
+
+            // Add culture specific node names
+            foreach (var culture in contentBase.AvailableCultures)
+            {
+                xml.Add(new XAttribute("nodeName-" + culture, contentBase.GetCultureName(culture)));
+            }
+
             foreach (var property in contentBase.Properties)
                 xml.Add(SerializeProperty(property, published));
 

From ea5da426e955a0451f42753bbc0849bba29ae4c9 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sat, 20 Feb 2021 17:20:35 +0100
Subject: [PATCH 034/202] Bump version to 8.12.0-rc

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 3ecfd20f03..cab7b9a12b 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.11.1")]
-[assembly: AssemblyInformationalVersion("8.11.1")]
+[assembly: AssemblyFileVersion("8.12.0")]
+[assembly: AssemblyInformationalVersion("8.12.0-rc")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 69bdeba643..6da1e7bcdf 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -347,9 +347,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8111</DevelopmentServerPort>
+          <DevelopmentServerPort>8120</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8111</IISUrl>
+          <IISUrl>http://localhost:8120</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 5e4d326ec2927d9895154afdbb38c493059211c9 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 08:40:59 +0100
Subject: [PATCH 035/202] Use trim method as trim isn't a property (#9605)

---
 .../editor/umbeditorheader.directive.js       | 13 +++++-----
 src/Umbraco.Web.UI.Client/src/utilities.js    | 25 ++++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index 6f272f1ea2..0ac285c094 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -341,20 +341,19 @@ Use this directive to construct a header inside the main editor window.
                         }
 
                     }
-                    scope.accessibility.a11yMessageVisible = !isEmptyOrSpaces(scope.accessibility.a11yMessage);
-                    scope.accessibility.a11yNameVisible = !isEmptyOrSpaces(scope.accessibility.a11yName);
+
+                    scope.accessibility.a11yMessageVisible = !isNullOrWhitespace(scope.accessibility.a11yMessage);
+                    scope.accessibility.a11yNameVisible = !isNullOrWhitespace(scope.accessibility.a11yName);
 
                 });
             }
 
-
-
-           function isEmptyOrSpaces(str) {
-               return str === null || str===undefined || str.trim ==='';
+            function isNullOrWhitespace(str) {
+               return str === null || str === undefined || str.trim() === '';
             }
 
             function SetPageTitle(title) {
-                    scope.$emit("$changeTitle", title);
+                scope.$emit("$changeTitle", title);
             }
 
             var unbindEventHandler = $rootScope.$on('$setAccessibleHeader', function (event, isNew, editorFor, nameLocked, name, contentTypeName, setTitle) {
diff --git a/src/Umbraco.Web.UI.Client/src/utilities.js b/src/Umbraco.Web.UI.Client/src/utilities.js
index 64884b589b..01e18e4e1c 100644
--- a/src/Umbraco.Web.UI.Client/src/utilities.js
+++ b/src/Umbraco.Web.UI.Client/src/utilities.js
@@ -71,28 +71,29 @@
     const isScope = obj => obj && obj.$evalAsync && obj.$watch;
 
     const toJsonReplacer = (key, value) => {
-        var val = value;      
+        var val = value;
         if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') {
-          val = undefined;
+            val = undefined;
         } else if (isWindow(value)) {
-          val = '$WINDOW';
-        } else if (value &&  window.document === value) {
-          val = '$DOCUMENT';
+            val = '$WINDOW';
+        } else if (value && window.document === value) {
+            val = '$DOCUMENT';
         } else if (isScope(value)) {
-          val = '$SCOPE';
-        }      
+            val = '$SCOPE';
+        }
         return val;
-      }
+    };
+
     /**
      * Equivalent to angular.toJson
      */
     const toJson = (obj, pretty) => {
         if (isUndefined(obj)) return undefined;
         if (!isNumber(pretty)) {
-          pretty = pretty ? 2 : null;
+            pretty = pretty ? 2 : null;
         }
         return JSON.stringify(obj, toJsonReplacer, pretty);
-    }
+    };
 
     /**
      * Equivalent to angular.fromJson
@@ -102,7 +103,7 @@
             return val;
         }
         return JSON.parse(val);
-    }
+    };
 
     /**
      * Not equivalent to angular.forEach. But like the angularJS method this does not fail on null or undefined.
@@ -112,7 +113,7 @@
             return obj.forEach(iterator);
         }
         return obj;
-    }
+    };
 
     let _utilities = {
         noop: noop,

From 451f3da8f4afb009a850b225deda32f3fbb2ebfd Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 08:58:56 +0100
Subject: [PATCH 036/202] Align datatype sidebar box properties (#9632)

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

diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 90b2dbe37e..f38ba8f806 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -800,9 +800,12 @@ legend + .control-group {
 
 // adjustments for properties tab
 .form-horizontal .block-form .control-label {
-  display: block;
-  float: none;
-  width: 100%;
+    display: block;
+    float: none;
+    width: 100%;
+}
+.form-horizontal .block-form .controls {
+    margin-left: 0;
 }
 
 //make sure buttons are always on top

From 4b387242f24e2be0306db54bbf0ac42f218323f6 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 09:04:46 +0100
Subject: [PATCH 037/202] Ensure sub-view components are not self-closed
 elements (#9633)

---
 .../src/views/components/content/umb-variant-content.html      | 3 ++-
 src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html    | 3 ++-
 src/Umbraco.Web.UI.Client/src/views/media/edit.html            | 3 ++-
 src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html      | 3 ++-
 src/Umbraco.Web.UI.Client/src/views/member/edit.html           | 3 ++-
 src/Umbraco.Web.UI.Client/src/views/member/list.html           | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
index 40a88ae6a6..9efc0e80bd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
@@ -36,7 +36,8 @@
 
             <div class="umb-editor-sub-views">
                 <div ng-repeat="app in vm.editor.variantApps track by app.alias">
-                    <umb-editor-sub-view model="app" content="vm.content" variant-content="vm.editor.content"/>
+                    <umb-editor-sub-view model="app" content="vm.content" variant-content="vm.editor.content">
+                    </umb-editor-sub-view>
                 </div>
             </div>
         </umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
index 2981097656..410ad938f8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
@@ -11,7 +11,8 @@
         <umb-editor-container>
             <div class="umb-editor-sub-views">
                 <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                    <umb-editor-sub-view model="app" content="content" />
+                    <umb-editor-sub-view model="app" content="content">
+                    </umb-editor-sub-view>
                 </div>
             </div>
         </umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index d2782a2a21..8f8a62474b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -23,7 +23,8 @@
             <umb-editor-container>
                 <div class="umb-editor-sub-views" ng-if="!page.loading">
                     <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                        <umb-editor-sub-view model="app" content="content"  />
+                        <umb-editor-sub-view model="app" content="content">
+                        </umb-editor-sub-view>
                     </div>
                 </div>
             </umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
index cd4ad6d07e..fddf63bef3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
@@ -12,7 +12,8 @@
         <umb-editor-container>
             <div class="umb-editor-sub-views">
                 <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                    <umb-editor-sub-view model="app" content="content" />
+                    <umb-editor-sub-view model="app" content="content">
+                    </umb-editor-sub-view>
                 </div>
             </div>
         </umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index 3fec222350..50c986bd6a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -26,7 +26,8 @@
         <umb-editor-container>
             <div class="umb-editor-sub-views" ng-if="!page.loading">
                 <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                    <umb-editor-sub-view model="app" content="content"  />
+                    <umb-editor-sub-view model="app" content="content">
+                    </umb-editor-sub-view>
                 </div>
             </div>
         </umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/list.html b/src/Umbraco.Web.UI.Client/src/views/member/list.html
index a61614e8f5..4f27b54aa9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/list.html
@@ -18,7 +18,8 @@
            <umb-editor-container>
                <div class="umb-editor-sub-views">
                    <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                       <umb-editor-sub-view model="app" content="content" />
+                       <umb-editor-sub-view model="app" content="content">
+                       </umb-editor-sub-view>
                    </div>
                </div>
            </umb-editor-container>

From a466b49b2b9c17e8ae4612c6d01ae79293009a3e Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 09:43:42 +0100
Subject: [PATCH 038/202] Eye Dropper Color Picker (#9646)

---
 src/Umbraco.Core/Constants-PropertyEditors.cs |  5 ++
 .../EyeDropperColorPickerConfiguration.cs     | 14 +++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../colorpicker/colorpicker.controller.js     |  8 +--
 .../eyedropper/eyedropper.controller.js       | 44 +++++++++++++++
 .../eyedropper/eyedropper.html                | 11 ++++
 ...yeDropperColorPickerConfigurationEditor.cs | 53 +++++++++++++++++++
 .../EyeDropperColorPickerPropertyEditor.cs    | 22 ++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +
 9 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 src/Umbraco.Core/PropertyEditors/EyeDropperColorPickerConfiguration.cs
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.html
 create mode 100644 src/Umbraco.Web/PropertyEditors/EyeDropperColorPickerConfigurationEditor.cs
 create mode 100644 src/Umbraco.Web/PropertyEditors/EyeDropperColorPickerPropertyEditor.cs

diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 90f5fbd0d0..87739469d1 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -51,6 +51,11 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string ColorPicker = "Umbraco.ColorPicker";
 
+                /// <summary>
+                /// EyeDropper Color Picker.
+                /// </summary>
+                public const string ColorPickerEyeDropper = "Umbraco.ColorPicker.EyeDropper";
+
                 /// <summary>
                 /// Content Picker.
                 /// </summary>
diff --git a/src/Umbraco.Core/PropertyEditors/EyeDropperColorPickerConfiguration.cs b/src/Umbraco.Core/PropertyEditors/EyeDropperColorPickerConfiguration.cs
new file mode 100644
index 0000000000..3e74b074f9
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/EyeDropperColorPickerConfiguration.cs
@@ -0,0 +1,14 @@
+namespace Umbraco.Core.PropertyEditors
+{
+    /// <summary>
+    /// Represents the configuration for the Eye Dropper picker value editor.
+    /// </summary>
+    public class EyeDropperColorPickerConfiguration
+    {
+        [ConfigurationField("showAlpha", "Show alpha", "boolean", Description = "Allow alpha transparency selection.")]
+        public bool ShowAlpha { get; set; }
+
+        [ConfigurationField("showPalette", "Show palette", "boolean", Description = "Show a palette next to the color picker.")]
+        public bool ShowPalette { get; set; }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b98ad64f7a..569fdb4638 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -156,6 +156,7 @@
     <Compile Include="Models\RelationTypeExtensions.cs" />
     <Compile Include="Persistence\Repositories\IInstallationRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\InstallationRepository.cs" />
+    <Compile Include="PropertyEditors\EyeDropperColorPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\ComplexPropertyEditorContentEventHandler.cs" />
     <Compile Include="Services\IIconService.cs" />
     <Compile Include="Services\Implement\InstallationService.cs" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index c1b432b36e..886d051f4d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -2,16 +2,16 @@ function ColorPickerController($scope, $timeout) {
 
     var vm = this;
 
-    //setup the default config
+    // setup the default config
     var config = {
         items: [],
         multiple: false
     };
     
-    //map the user config
-    angular.extend(config, $scope.model.config);
+    // map the user config
+    Utilities.extend(config, $scope.model.config);
 
-    //map back to the model
+    // map back to the model
     $scope.model.config = config;
     
     $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.controller.js
new file mode 100644
index 0000000000..82a0d18cab
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.controller.js
@@ -0,0 +1,44 @@
+function EyeDropperColorPickerController($scope, angularHelper) {
+
+    var vm = this;
+
+    //setup the default config
+    var config = {
+        showAlpha: true,
+        showPalette: true,
+        allowEmpty: true
+    };
+    
+    // map the user config
+    Utilities.extend(config, $scope.model.config);
+
+    // map back to the model
+    $scope.model.config = config;
+
+    vm.options = $scope.model.config;
+
+    vm.color = $scope.model.value || null;
+
+    vm.selectColor = function (color) {
+        angularHelper.safeApply($scope, function () {
+            vm.color = color ? color.toString() : null;
+            $scope.model.value = vm.color;
+            $scope.propertyForm.selectedColor.$setViewValue(vm.color);
+        });
+    };
+
+    // Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
+    $scope.validateMandatory = function () {
+        var isValid = !$scope.model.validation.mandatory || (
+            $scope.model.value != null
+            && $scope.model.value != "");
+
+        return {
+            isValid: isValid,
+            errorMsg: $scope.model.validation.mandatoryMessage || "Value cannot be empty",
+            errorKey: "required"
+        };
+    };
+}
+
+angular.module("umbraco").controller("Umbraco.PropertyEditors.EyeDropperColorPickerController", EyeDropperColorPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.html
new file mode 100644
index 0000000000..821f50f92b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.html
@@ -0,0 +1,11 @@
+<div ng-controller="Umbraco.PropertyEditors.EyeDropperColorPickerController as vm">
+
+    <umb-color-picker
+        ng-model="vm.color"
+        options="vm.options"
+        on-change="vm.selectColor(color)">
+    </umb-color-picker>
+
+    <input type="hidden" name="selectedColor" ng-model="model.selectedColor" val-property-validator="validateMandatory" />
+
+</div>
diff --git a/src/Umbraco.Web/PropertyEditors/EyeDropperColorPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/EyeDropperColorPickerConfigurationEditor.cs
new file mode 100644
index 0000000000..55867feddc
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/EyeDropperColorPickerConfigurationEditor.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    internal class EyeDropperColorPickerConfigurationEditor : ConfigurationEditor<EyeDropperColorPickerConfiguration>
+    {
+        public EyeDropperColorPickerConfigurationEditor()
+        {
+
+        }
+
+        /// <inheritdoc />
+        public override Dictionary<string, object> ToConfigurationEditor(EyeDropperColorPickerConfiguration configuration)
+        {
+            return new Dictionary<string, object>
+            {
+                { "showAlpha", configuration.ShowAlpha },
+                { "showPalette", configuration.ShowPalette }
+            };
+        }
+
+        /// <inheritdoc />
+        public override EyeDropperColorPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EyeDropperColorPickerConfiguration configuration)
+        {
+            var output = new EyeDropperColorPickerConfiguration();
+
+            var showAlpha = true;
+            var showPalette = true;
+
+            if (editorValues.TryGetValue("showAlpha", out var alpha))
+            {
+                var attempt = alpha.TryConvertTo<bool>();
+                if (attempt.Success)
+                    showAlpha = attempt.Result;
+            }
+
+            if (editorValues.TryGetValue("showPalette", out var palette))
+            {
+                var attempt = palette.TryConvertTo<bool>();
+                if (attempt.Success)
+                    showPalette = attempt.Result;
+            }
+
+            return new EyeDropperColorPickerConfiguration
+            {
+                ShowAlpha = showAlpha,
+                ShowPalette = showPalette
+            };
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/EyeDropperColorPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/EyeDropperColorPickerPropertyEditor.cs
new file mode 100644
index 0000000000..cf0d239523
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/EyeDropperColorPickerPropertyEditor.cs
@@ -0,0 +1,22 @@
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.ColorPickerEyeDropper,
+        "Eye Dropper Color Picker",
+        "eyedropper",
+        Icon = "icon-colorpicker",
+        Group = Constants.PropertyEditors.Groups.Pickers)]
+    public class EyeDropperColorPickerPropertyEditor : DataEditor
+    {
+        public EyeDropperColorPickerPropertyEditor(ILogger logger)
+            : base(logger)
+        { }
+
+        /// <inheritdoc />
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EyeDropperColorPickerConfigurationEditor();
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 80c8d19a58..c3aa0433c5 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -254,6 +254,8 @@
     <Compile Include="PropertyEditors\BlockListConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\BlockListPropertyEditor.cs" />
     <Compile Include="Compose\NestedContentPropertyComposer.cs" />
+    <Compile Include="PropertyEditors\EyeDropperColorPickerConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\EyeDropperColorPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\ComplexEditorValidator.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
     <Compile Include="PropertyEditors\RichTextEditorPastedImages.cs" />

From 56938a7bdcc1abab05f0c7b6c83deb209ba69e1a Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 09:57:32 +0100
Subject: [PATCH 039/202] Move relation type id and macro id to sidebar box
 (#9657)

---
 .../src/views/macros/views/settings.html      | 126 ++++++++++--------
 .../relationtypes/views/relationType.html     |  97 ++++++++------
 2 files changed, 127 insertions(+), 96 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
index 9825a6f919..c152c33193 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
@@ -1,62 +1,76 @@
 <div ng-controller="Umbraco.Editors.Macros.SettingsController as vm">
-    <umb-box>
-        <umb-box-header title="Info"></umb-box-header>
-        <umb-box-content>
-            <umb-control-group label="Id">
-                {{model.macro.id}}<br/>
-                {{model.macro.key}}
-            </umb-control-group>
-        </umb-box-content>
-    </umb-box>
-    <umb-box>
-        <umb-box-header title="Macro partial view"></umb-box-header>
-        <umb-box-content>
-            <umb-control-group label="Macro partial view" required="true">
 
-                <umb-node-preview ng-if="model.macro.node"
-                                  icon="model.macro.node.icon"
-                                  name="model.macro.node.name"
-                                  allow-edit="true"
-                                  allow-remove="true"
-                                  on-edit="model.openViewPicker()"
-                                  on-remove="model.removeMacroView()">
-                </umb-node-preview>
+    <div class="umb-package-details">
 
-                <input type="hidden" ng-model="mandatoryViewValidator" ng-required="!model.macro.node" />
+        <div class="umb-package-details__main-content">
 
-                <button type="button"
-                        class="umb-node-preview-add"
-                        ng-show="!model.macro.node"
-                        ng-click="model.openViewPicker()">
-                    <localize key="general_add">Add</localize>
-                </button>
+            <umb-box>
+                <umb-box-header title="Macro partial view"></umb-box-header>
+                <umb-box-content>
+                    <umb-control-group label="Macro partial view" required="true" hide-label="true">
+
+                        <umb-node-preview
+                            ng-if="model.macro.node"
+                            icon="model.macro.node.icon"
+                            name="model.macro.node.name"
+                            allow-edit="true"
+                            allow-remove="true"
+                            on-edit="model.openViewPicker()"
+                            on-remove="model.removeMacroView()">
+                        </umb-node-preview>
+
+                        <input type="hidden" ng-model="mandatoryViewValidator" ng-required="!model.macro.node" />
+
+                        <button type="button"
+                                class="umb-node-preview-add"
+                                ng-show="!model.macro.node"
+                                ng-click="model.openViewPicker()">
+                            <localize key="general_add">Add</localize>
+                        </button>
+
+                    </umb-control-group>
+                </umb-box-content>
+            </umb-box>
+            <umb-box>
+                <umb-box-header title="Editor settings"></umb-box-header>
+                <umb-box-content>
+                    <umb-control-group label="Use in rich text editor and the grid">
+                        <umb-toggle checked="model.macro.useInEditor" on-click="model.toggle('useInEditor')"></umb-toggle>
+                    </umb-control-group>
+                    <umb-control-group label="Render in rich text editor and the grid" ng-if="model.macro.useInEditor">
+                        <umb-toggle checked="model.macro.renderInEditor && model.macro.useInEditor" on-click="model.toggle('renderInEditor')"></umb-toggle>
+                    </umb-control-group>
+                </umb-box-content>
+            </umb-box>
+            <umb-box>
+                <umb-box-header title="Cache settings"></umb-box-header>
+                <umb-box-content>
+                    <umb-control-group label="Cache period">
+                        <input type="number" min="0" ng-model="model.macro.cachePeriod" />
+                    </umb-control-group>
+                    <umb-control-group label="Cache by page">
+                        <umb-toggle checked="model.macro.cacheByPage" on-click="model.toggle('cacheByPage')"></umb-toggle>
+                    </umb-control-group>
+                    <umb-control-group label="Cache personalized">
+                        <umb-toggle checked="model.macro.cacheByUser" on-click="model.toggle('cacheByUser')"></umb-toggle>
+                    </umb-control-group>
+                </umb-box-content>
+            </umb-box>
+
+        </div>
+
+        <div class="umb-package-details__sidebar">
+            <umb-box data-element="node-info-general">
+                <umb-box-header title-key="general_general"></umb-box-header>
+                <umb-box-content class="block-form">
+                    <umb-control-group label="Id">
+                        <div>{{model.macro.id}}</div>
+                        <small>{{model.macro.key}}</small>
+                    </umb-control-group>
+                </umb-box-content>
+            </umb-box>
+        </div>
+
+    </div>
 
-            </umb-control-group>
-        </umb-box-content>
-    </umb-box>
-    <umb-box>
-        <umb-box-header title="Editor settings"></umb-box-header>
-        <umb-box-content>
-            <umb-control-group label="Use in rich text editor and the grid">
-                <umb-toggle checked="model.macro.useInEditor" on-click="model.toggle('useInEditor')"></umb-toggle>
-            </umb-control-group>
-            <umb-control-group label="Render in rich text editor and the grid" ng-if="model.macro.useInEditor">
-                <umb-toggle checked="model.macro.renderInEditor && model.macro.useInEditor" on-click="model.toggle('renderInEditor')"></umb-toggle>
-            </umb-control-group>
-        </umb-box-content>
-    </umb-box>
-    <umb-box>
-        <umb-box-header title="Cache settings"></umb-box-header>
-        <umb-box-content>
-            <umb-control-group label="Cache period">
-               <input type="number" min="0" ng-model="model.macro.cachePeriod"/>
-            </umb-control-group>
-            <umb-control-group label="Cache by page">
-                <umb-toggle checked="model.macro.cacheByPage" on-click="model.toggle('cacheByPage')"></umb-toggle>
-            </umb-control-group>
-            <umb-control-group label="Cache personalized">
-                <umb-toggle checked="model.macro.cacheByUser" on-click="model.toggle('cacheByUser')"></umb-toggle>
-            </umb-control-group>
-        </umb-box-content>
-    </umb-box>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
index 100d8d9d09..8f910a6c86 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
@@ -1,46 +1,63 @@
 <div ng-controller="Umbraco.Editors.RelationTypes.SettingsController as vm">
-    <umb-box>
-        <umb-box-content>
-            <!-- ID -->
-            <umb-control-group label="Id">
-                <div>{{model.relationType.id}}</div>
-                <small>{{model.relationType.key}}</small>
-            </umb-control-group>
 
-            <!-- Direction -->
-            <umb-control-group label="@relationType_direction">
-                <ul class="unstyled">
-                    <li>
-                        <umb-radiobutton name="relationTypeDirection"
-                                         value="false"
-                                         model="model.relationType.isBidirectional"
-                                         text="{{vm.labels.parentToChild}}">
-                        </umb-radiobutton>
-                    </li>
-                    <li>
-                        <umb-radiobutton name="relationTypeDirection"
-                                         value="true"
-                                         model="model.relationType.isBidirectional"
-                                         text="{{vm.labels.bidirectional}}">
-                        </umb-radiobutton>
-                    </li>
-                </ul>
-            </umb-control-group>
+    <div class="umb-package-details">
 
-            <!-- Parent-->
-            <umb-control-group label="@relationType_parent">
-                <div>{{model.relationType.parentObjectTypeName}}</div>
-            </umb-control-group>
+        <div class="umb-package-details__main-content">
 
-            <!-- Child -->
-            <umb-control-group label="@relationType_child">
-                <div>{{model.relationType.childObjectTypeName}}</div>
-            </umb-control-group>
+            <umb-box>
+                <umb-box-content>
 
-            <!-- Relation count -->
-            <umb-control-group label="@relationType_count" ng-if="model.relationType.relations.length > 0">
-                <div>{{model.relationType.relations.length}}</div>
-            </umb-control-group>
-        </umb-box-content>
-    </umb-box>
+                    <!-- Direction -->
+                    <umb-control-group label="@relationType_direction">
+                        <ul class="unstyled">
+                            <li>
+                                <umb-radiobutton name="relationTypeDirection"
+                                                 value="false"
+                                                 model="model.relationType.isBidirectional"
+                                                 text="{{vm.labels.parentToChild}}">
+                                </umb-radiobutton>
+                            </li>
+                            <li>
+                                <umb-radiobutton name="relationTypeDirection"
+                                                 value="true"
+                                                 model="model.relationType.isBidirectional"
+                                                 text="{{vm.labels.bidirectional}}">
+                                </umb-radiobutton>
+                            </li>
+                        </ul>
+                    </umb-control-group>
+
+                    <!-- Parent-->
+                    <umb-control-group label="@relationType_parent">
+                        <div>{{model.relationType.parentObjectTypeName}}</div>
+                    </umb-control-group>
+
+                    <!-- Child -->
+                    <umb-control-group label="@relationType_child">
+                        <div>{{model.relationType.childObjectTypeName}}</div>
+                    </umb-control-group>
+
+                    <!-- Relation count -->
+                    <umb-control-group label="@relationType_count" ng-if="model.relationType.relations.length > 0">
+                        <div>{{model.relationType.relations.length}}</div>
+                    </umb-control-group>
+                </umb-box-content>
+            </umb-box>
+
+        </div>
+
+        <div class="umb-package-details__sidebar">
+            <umb-box data-element="node-info-general">
+                <umb-box-header title-key="general_general"></umb-box-header>
+                <umb-box-content class="block-form">
+                    <umb-control-group label="Id">
+                        <div>{{model.relationType.id}}</div>
+                        <small>{{model.relationType.key}}</small>
+                    </umb-control-group>
+                </umb-box-content>
+            </umb-box>
+        </div>
+
+    </div>
+    
 </div>

From f27a3be4e685be46b6471d7bf424722ccea9846e Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 21 Feb 2021 10:30:17 +0100
Subject: [PATCH 040/202] Fix unit tests after merging PR #9646

---
 src/Umbraco.Tests/Composing/TypeLoaderTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 9cd4f39c17..b0c57b685b 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -268,7 +268,7 @@ AnotherContentFinder
         public void GetDataEditors()
         {
             var types = _typeLoader.GetDataEditors();
-            Assert.AreEqual(39, types.Count());
+            Assert.AreEqual(40, types.Count());
         }
 
         /// <summary>

From 75ee3b96229d2fe5debfdf7fb274c321ae2342a8 Mon Sep 17 00:00:00 2001
From: Chad <chad.d.currie@gmail.com>
Date: Sun, 21 Feb 2021 23:00:00 +1300
Subject: [PATCH 041/202] Speed up boot times and Improve Json
 (De)Serialization performance and reduce memory usage by reusing
 JsonSerializerSettings (#9670)

---
 .../ImageCropperValueConverter.cs             | 12 ++--
 .../NoTypeConverterJsonConverter.cs           |  5 +-
 .../JsonSerializerSettingsBenchmarks.cs       | 69 +++++++++++++++++++
 .../Umbraco.Tests.Benchmarks.csproj           |  1 +
 .../Editors/BackOfficeController.cs           |  6 +-
 .../ImageCropperTemplateExtensions.cs         | 14 ++--
 src/Umbraco.Web/Mvc/JsonNetResult.cs          |  9 +++
 .../MultiUrlPickerValueEditor.cs              | 11 +--
 .../NuCache/DataSource/DatabaseDataSource.cs  | 11 +--
 9 files changed, 112 insertions(+), 26 deletions(-)
 create mode 100644 src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
index 8926174c03..29e501f993 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
@@ -25,6 +25,12 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
         public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
             => PropertyCacheLevel.Element;
 
+        private static readonly JsonSerializerSettings ImageCropperValueJsonSerializerSettings = new JsonSerializerSettings
+        {
+            Culture = CultureInfo.InvariantCulture,
+            FloatParseHandling = FloatParseHandling.Decimal
+        };
+
         /// <inheritdoc />
         public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
         {
@@ -34,11 +40,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             ImageCropperValue value;
             try
             {
-                value = JsonConvert.DeserializeObject<ImageCropperValue>(sourceString, new JsonSerializerSettings
-                {
-                    Culture = CultureInfo.InvariantCulture,
-                    FloatParseHandling = FloatParseHandling.Decimal
-                });
+                value = JsonConvert.DeserializeObject<ImageCropperValue>(sourceString, ImageCropperValueJsonSerializerSettings);
             }
             catch (Exception ex)
             {
diff --git a/src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs b/src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs
index b06ee870de..ab64d5b368 100644
--- a/src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs
+++ b/src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs
@@ -19,6 +19,7 @@ namespace Umbraco.Core.Serialization
     internal class NoTypeConverterJsonConverter<T> : JsonConverter
     {
         static readonly IContractResolver resolver = new NoTypeConverterContractResolver();
+        private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings { ContractResolver = resolver };
 
         private class NoTypeConverterContractResolver : DefaultContractResolver
         {
@@ -41,12 +42,12 @@ namespace Umbraco.Core.Serialization
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = resolver }).Deserialize(reader, objectType);
+            return JsonSerializer.CreateDefault(JsonSerializerSettings).Deserialize(reader, objectType);
         }
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = resolver }).Serialize(writer, value);
+            JsonSerializer.CreateDefault(JsonSerializerSettings).Serialize(writer, value);
         }
     }
 }
diff --git a/src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs
new file mode 100644
index 0000000000..7f419547bd
--- /dev/null
+++ b/src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs
@@ -0,0 +1,69 @@
+using BenchmarkDotNet.Attributes;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Tests.Benchmarks.Config;
+
+namespace Umbraco.Tests.Benchmarks
+{
+    [QuickRunConfig]
+    [MemoryDiagnoser]
+    public class JsonSerializerSettingsBenchmarks
+    {
+        [Benchmark]
+        public void SerializerSettingsInstantiation()
+        {
+            int instances = 1000;
+            for (int i = 0; i < instances; i++)
+            {
+                new JsonSerializerSettings();
+            }
+        }
+
+        [Benchmark(Baseline =true)]
+        public void SerializerSettingsSingleInstantiation()
+        {
+            new JsonSerializerSettings();
+        }
+
+//        // * Summary *
+
+//        BenchmarkDotNet=v0.11.3, OS=Windows 10.0.18362
+//Intel Core i5-8265U CPU 1.60GHz(Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+// [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4250.0
+//  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4250.0
+
+//IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
+//WarmupCount=3
+
+//                                Method |         Mean |        Error |      StdDev |  Ratio | RatioSD | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
+//-------------------------------------- |-------------:|-------------:|------------:|-------:|--------:|------------:|------------:|------------:|--------------------:|
+//       SerializerSettingsInstantiation | 29,120.48 ns | 5,532.424 ns | 303.2508 ns | 997.84 |   23.66 |     73.8122 |           - |           - |            232346 B |
+// SerializerSettingsSingleInstantiation |     29.19 ns |     8.089 ns |   0.4434 ns |   1.00 |    0.00 |      0.0738 |           - |           - |               232 B |
+
+//// * Warnings *
+//MinIterationTime
+//  JsonSerializerSettingsBenchmarks.SerializerSettingsSingleInstantiation: IterationCount= 3, IterationTime= 100.0000 ms, LaunchCount= 1, WarmupCount= 3->MinIterationTime = 96.2493 ms which is very small. It's recommended to increase it.
+
+//// * Legends *
+//  Mean                : Arithmetic mean of all measurements
+//  Error               : Half of 99.9% confidence interval
+//  StdDev              : Standard deviation of all measurements
+//  Ratio               : Mean of the ratio distribution ([Current]/[Baseline])
+//  RatioSD             : Standard deviation of the ratio distribution([Current]/[Baseline])
+//  Gen 0/1k Op         : GC Generation 0 collects per 1k Operations
+//  Gen 1/1k Op         : GC Generation 1 collects per 1k Operations
+//  Gen 2/1k Op         : GC Generation 2 collects per 1k Operations
+//  Allocated Memory/Op : Allocated memory per single operation(managed only, inclusive, 1KB = 1024B)
+//  1 ns                : 1 Nanosecond(0.000000001 sec)
+
+//// * Diagnostic Output - MemoryDiagnoser *
+
+
+//        // ***** BenchmarkRunner: End *****
+//        Run time: 00:00:04 (4.88 sec), executed benchmarks: 2
+    }
+}
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 48d69cf757..58b45aa743 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -53,6 +53,7 @@
     <Compile Include="CtorInvokeBenchmarks.cs" />
     <Compile Include="HexStringBenchmarks.cs" />
     <Compile Include="EnumeratorBenchmarks.cs" />
+    <Compile Include="JsonSerializerSettingsBenchmarks.cs" />
     <Compile Include="LinqCastBenchmarks.cs" />
     <Compile Include="ModelToSqlExpressionHelperBenchmarks.cs" />
     <Compile Include="Program.cs" />
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 458c76b3ae..92b67cbf1b 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -226,7 +226,7 @@ namespace Umbraco.Web.Editors
                 .ToDictionary(pv => pv.Key, pv =>
                     pv.ToDictionary(pve => pve.valueAlias, pve => pve.value));
 
-            return new JsonNetResult { Data = nestedDictionary, Formatting = Formatting.None };
+            return new JsonNetResult(JsonNetResult.DefaultJsonSerializerSettings) { Data = nestedDictionary, Formatting = Formatting.None };
         }
 
         /// <summary>
@@ -273,7 +273,7 @@ namespace Umbraco.Web.Editors
                     GetAssetList,
                     new TimeSpan(0, 2, 0));
 
-            return new JsonNetResult { Data = result, Formatting = Formatting.None };
+            return new JsonNetResult(JsonNetResult.DefaultJsonSerializerSettings) { Data = result, Formatting = Formatting.None };
         }
 
         [UmbracoAuthorize(Order = 0)]
@@ -281,7 +281,7 @@ namespace Umbraco.Web.Editors
         public JsonNetResult GetGridConfig()
         {
             var gridConfig = Current.Configs.Grids();
-            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.None };
+            return new JsonNetResult(JsonNetResult.DefaultJsonSerializerSettings) { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.None };
         }
 
 
diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
index 26dd2a5d36..78b55a8930 100644
--- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
+++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
@@ -253,19 +253,20 @@ namespace Umbraco.Web
             ImageCropRatioMode? ratioMode = null,
             bool upScale = true) => ImageCropperTemplateCoreExtensions.GetCropUrl(imageUrl, Current.ImageUrlGenerator, cropDataSet, width, height, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode, upScale);
 
+        private static readonly JsonSerializerSettings ImageCropperValueJsonSerializerSettings = new JsonSerializerSettings
+        {
+            Culture = CultureInfo.InvariantCulture,
+            FloatParseHandling = FloatParseHandling.Decimal
+        };
 
         internal static ImageCropperValue DeserializeImageCropperValue(this string json)
         {
-            var imageCrops = new ImageCropperValue();
+            ImageCropperValue imageCrops = null;
             if (json.DetectIsJson())
             {
                 try
                 {
-                    imageCrops = JsonConvert.DeserializeObject<ImageCropperValue>(json, new JsonSerializerSettings
-                    {
-                        Culture = CultureInfo.InvariantCulture,
-                        FloatParseHandling = FloatParseHandling.Decimal
-                    });
+                    imageCrops = JsonConvert.DeserializeObject<ImageCropperValue>(json, ImageCropperValueJsonSerializerSettings);
                 }
                 catch (Exception ex)
                 {
@@ -273,6 +274,7 @@ namespace Umbraco.Web
                 }
             }
 
+            imageCrops = imageCrops ?? new ImageCropperValue();
             return imageCrops;
         }
     }
diff --git a/src/Umbraco.Web/Mvc/JsonNetResult.cs b/src/Umbraco.Web/Mvc/JsonNetResult.cs
index da6780451e..3dd6c2f398 100644
--- a/src/Umbraco.Web/Mvc/JsonNetResult.cs
+++ b/src/Umbraco.Web/Mvc/JsonNetResult.cs
@@ -22,10 +22,19 @@ namespace Umbraco.Web.Mvc
         public JsonSerializerSettings SerializerSettings { get; set; }
         public Formatting Formatting { get; set; }
 
+        /// <summary>
+        /// Default, unchanged JsonSerializerSettings
+        /// </summary>
+        public static readonly JsonSerializerSettings DefaultJsonSerializerSettings = new JsonSerializerSettings();
+
         public JsonNetResult()
         {
             SerializerSettings = new JsonSerializerSettings();
         }
+        public JsonNetResult(JsonSerializerSettings jsonSerializerSettings)
+        {
+            SerializerSettings = jsonSerializerSettings;
+        }
 
         public override void ExecuteResult(ControllerContext context)
         {
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
index 5a84e4b20c..560275b29a 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
@@ -121,6 +121,10 @@ namespace Umbraco.Web.PropertyEditors
             return base.ToEditor(property, dataTypeService, culture, segment);
         }
 
+        private static readonly JsonSerializerSettings LinkDisplayJsonSerializerSettings = new JsonSerializerSettings
+        {
+            NullValueHandling = NullValueHandling.Ignore
+        };
 
         public override object FromEditor(ContentPropertyData editorValue, object currentValue)
         {
@@ -142,11 +146,8 @@ namespace Umbraco.Web.PropertyEditors
                         Target = link.Target,
                         Udi = link.Udi,
                         Url = link.Udi == null ? link.Url : null, // only save the URL for external links
-                    },
-                    new JsonSerializerSettings
-                    {
-                        NullValueHandling = NullValueHandling.Ignore
-                    });
+                    }, LinkDisplayJsonSerializerSettings
+                    );
             }
             catch (Exception ex)
             {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
index f62014a368..f9ad0ac715 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
@@ -303,17 +303,18 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             return s;
         }
 
+        private static readonly JsonSerializerSettings NestedContentDataJsonSerializerSettings = new JsonSerializerSettings
+            {
+                Converters = new List<JsonConverter> { new ForceInt32Converter() }
+            };
+
         private static ContentNestedData DeserializeNestedData(string data)
         {
             // by default JsonConvert will deserialize our numeric values as Int64
             // which is bad, because they were Int32 in the database - take care
 
-            var settings = new JsonSerializerSettings
-            {
-                Converters = new List<JsonConverter> { new ForceInt32Converter() }
-            };
 
-            return JsonConvert.DeserializeObject<ContentNestedData>(data, settings);
+            return JsonConvert.DeserializeObject<ContentNestedData>(data, NestedContentDataJsonSerializerSettings);
         }
     }
 }

From ad0b70fc04354876132c2b1129ed0f8977689091 Mon Sep 17 00:00:00 2001
From: Chad <chad.d.currie@gmail.com>
Date: Sun, 21 Feb 2021 23:00:00 +1300
Subject: [PATCH 042/202] Speed up boot times and Improve Json
 (De)Serialization performance and reduce memory usage by reusing
 JsonSerializerSettings (#9670)

(cherry picked from commit 75ee3b96229d2fe5debfdf7fb274c321ae2342a8)
---
 .../ImageCropperValueConverter.cs             | 12 ++--
 .../NoTypeConverterJsonConverter.cs           |  5 +-
 .../JsonSerializerSettingsBenchmarks.cs       | 69 +++++++++++++++++++
 .../Umbraco.Tests.Benchmarks.csproj           |  1 +
 .../Editors/BackOfficeController.cs           |  6 +-
 .../ImageCropperTemplateExtensions.cs         | 14 ++--
 src/Umbraco.Web/Mvc/JsonNetResult.cs          |  9 +++
 .../MultiUrlPickerValueEditor.cs              | 11 +--
 .../NuCache/DataSource/DatabaseDataSource.cs  | 11 +--
 9 files changed, 112 insertions(+), 26 deletions(-)
 create mode 100644 src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
index 8926174c03..29e501f993 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
@@ -25,6 +25,12 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
         public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
             => PropertyCacheLevel.Element;
 
+        private static readonly JsonSerializerSettings ImageCropperValueJsonSerializerSettings = new JsonSerializerSettings
+        {
+            Culture = CultureInfo.InvariantCulture,
+            FloatParseHandling = FloatParseHandling.Decimal
+        };
+
         /// <inheritdoc />
         public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
         {
@@ -34,11 +40,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             ImageCropperValue value;
             try
             {
-                value = JsonConvert.DeserializeObject<ImageCropperValue>(sourceString, new JsonSerializerSettings
-                {
-                    Culture = CultureInfo.InvariantCulture,
-                    FloatParseHandling = FloatParseHandling.Decimal
-                });
+                value = JsonConvert.DeserializeObject<ImageCropperValue>(sourceString, ImageCropperValueJsonSerializerSettings);
             }
             catch (Exception ex)
             {
diff --git a/src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs b/src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs
index b06ee870de..ab64d5b368 100644
--- a/src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs
+++ b/src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs
@@ -19,6 +19,7 @@ namespace Umbraco.Core.Serialization
     internal class NoTypeConverterJsonConverter<T> : JsonConverter
     {
         static readonly IContractResolver resolver = new NoTypeConverterContractResolver();
+        private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings { ContractResolver = resolver };
 
         private class NoTypeConverterContractResolver : DefaultContractResolver
         {
@@ -41,12 +42,12 @@ namespace Umbraco.Core.Serialization
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = resolver }).Deserialize(reader, objectType);
+            return JsonSerializer.CreateDefault(JsonSerializerSettings).Deserialize(reader, objectType);
         }
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = resolver }).Serialize(writer, value);
+            JsonSerializer.CreateDefault(JsonSerializerSettings).Serialize(writer, value);
         }
     }
 }
diff --git a/src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs
new file mode 100644
index 0000000000..7f419547bd
--- /dev/null
+++ b/src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs
@@ -0,0 +1,69 @@
+using BenchmarkDotNet.Attributes;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Tests.Benchmarks.Config;
+
+namespace Umbraco.Tests.Benchmarks
+{
+    [QuickRunConfig]
+    [MemoryDiagnoser]
+    public class JsonSerializerSettingsBenchmarks
+    {
+        [Benchmark]
+        public void SerializerSettingsInstantiation()
+        {
+            int instances = 1000;
+            for (int i = 0; i < instances; i++)
+            {
+                new JsonSerializerSettings();
+            }
+        }
+
+        [Benchmark(Baseline =true)]
+        public void SerializerSettingsSingleInstantiation()
+        {
+            new JsonSerializerSettings();
+        }
+
+//        // * Summary *
+
+//        BenchmarkDotNet=v0.11.3, OS=Windows 10.0.18362
+//Intel Core i5-8265U CPU 1.60GHz(Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+// [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4250.0
+//  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4250.0
+
+//IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
+//WarmupCount=3
+
+//                                Method |         Mean |        Error |      StdDev |  Ratio | RatioSD | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
+//-------------------------------------- |-------------:|-------------:|------------:|-------:|--------:|------------:|------------:|------------:|--------------------:|
+//       SerializerSettingsInstantiation | 29,120.48 ns | 5,532.424 ns | 303.2508 ns | 997.84 |   23.66 |     73.8122 |           - |           - |            232346 B |
+// SerializerSettingsSingleInstantiation |     29.19 ns |     8.089 ns |   0.4434 ns |   1.00 |    0.00 |      0.0738 |           - |           - |               232 B |
+
+//// * Warnings *
+//MinIterationTime
+//  JsonSerializerSettingsBenchmarks.SerializerSettingsSingleInstantiation: IterationCount= 3, IterationTime= 100.0000 ms, LaunchCount= 1, WarmupCount= 3->MinIterationTime = 96.2493 ms which is very small. It's recommended to increase it.
+
+//// * Legends *
+//  Mean                : Arithmetic mean of all measurements
+//  Error               : Half of 99.9% confidence interval
+//  StdDev              : Standard deviation of all measurements
+//  Ratio               : Mean of the ratio distribution ([Current]/[Baseline])
+//  RatioSD             : Standard deviation of the ratio distribution([Current]/[Baseline])
+//  Gen 0/1k Op         : GC Generation 0 collects per 1k Operations
+//  Gen 1/1k Op         : GC Generation 1 collects per 1k Operations
+//  Gen 2/1k Op         : GC Generation 2 collects per 1k Operations
+//  Allocated Memory/Op : Allocated memory per single operation(managed only, inclusive, 1KB = 1024B)
+//  1 ns                : 1 Nanosecond(0.000000001 sec)
+
+//// * Diagnostic Output - MemoryDiagnoser *
+
+
+//        // ***** BenchmarkRunner: End *****
+//        Run time: 00:00:04 (4.88 sec), executed benchmarks: 2
+    }
+}
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 48d69cf757..58b45aa743 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -53,6 +53,7 @@
     <Compile Include="CtorInvokeBenchmarks.cs" />
     <Compile Include="HexStringBenchmarks.cs" />
     <Compile Include="EnumeratorBenchmarks.cs" />
+    <Compile Include="JsonSerializerSettingsBenchmarks.cs" />
     <Compile Include="LinqCastBenchmarks.cs" />
     <Compile Include="ModelToSqlExpressionHelperBenchmarks.cs" />
     <Compile Include="Program.cs" />
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 458c76b3ae..92b67cbf1b 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -226,7 +226,7 @@ namespace Umbraco.Web.Editors
                 .ToDictionary(pv => pv.Key, pv =>
                     pv.ToDictionary(pve => pve.valueAlias, pve => pve.value));
 
-            return new JsonNetResult { Data = nestedDictionary, Formatting = Formatting.None };
+            return new JsonNetResult(JsonNetResult.DefaultJsonSerializerSettings) { Data = nestedDictionary, Formatting = Formatting.None };
         }
 
         /// <summary>
@@ -273,7 +273,7 @@ namespace Umbraco.Web.Editors
                     GetAssetList,
                     new TimeSpan(0, 2, 0));
 
-            return new JsonNetResult { Data = result, Formatting = Formatting.None };
+            return new JsonNetResult(JsonNetResult.DefaultJsonSerializerSettings) { Data = result, Formatting = Formatting.None };
         }
 
         [UmbracoAuthorize(Order = 0)]
@@ -281,7 +281,7 @@ namespace Umbraco.Web.Editors
         public JsonNetResult GetGridConfig()
         {
             var gridConfig = Current.Configs.Grids();
-            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.None };
+            return new JsonNetResult(JsonNetResult.DefaultJsonSerializerSettings) { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.None };
         }
 
 
diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
index 26dd2a5d36..78b55a8930 100644
--- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
+++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
@@ -253,19 +253,20 @@ namespace Umbraco.Web
             ImageCropRatioMode? ratioMode = null,
             bool upScale = true) => ImageCropperTemplateCoreExtensions.GetCropUrl(imageUrl, Current.ImageUrlGenerator, cropDataSet, width, height, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode, upScale);
 
+        private static readonly JsonSerializerSettings ImageCropperValueJsonSerializerSettings = new JsonSerializerSettings
+        {
+            Culture = CultureInfo.InvariantCulture,
+            FloatParseHandling = FloatParseHandling.Decimal
+        };
 
         internal static ImageCropperValue DeserializeImageCropperValue(this string json)
         {
-            var imageCrops = new ImageCropperValue();
+            ImageCropperValue imageCrops = null;
             if (json.DetectIsJson())
             {
                 try
                 {
-                    imageCrops = JsonConvert.DeserializeObject<ImageCropperValue>(json, new JsonSerializerSettings
-                    {
-                        Culture = CultureInfo.InvariantCulture,
-                        FloatParseHandling = FloatParseHandling.Decimal
-                    });
+                    imageCrops = JsonConvert.DeserializeObject<ImageCropperValue>(json, ImageCropperValueJsonSerializerSettings);
                 }
                 catch (Exception ex)
                 {
@@ -273,6 +274,7 @@ namespace Umbraco.Web
                 }
             }
 
+            imageCrops = imageCrops ?? new ImageCropperValue();
             return imageCrops;
         }
     }
diff --git a/src/Umbraco.Web/Mvc/JsonNetResult.cs b/src/Umbraco.Web/Mvc/JsonNetResult.cs
index da6780451e..3dd6c2f398 100644
--- a/src/Umbraco.Web/Mvc/JsonNetResult.cs
+++ b/src/Umbraco.Web/Mvc/JsonNetResult.cs
@@ -22,10 +22,19 @@ namespace Umbraco.Web.Mvc
         public JsonSerializerSettings SerializerSettings { get; set; }
         public Formatting Formatting { get; set; }
 
+        /// <summary>
+        /// Default, unchanged JsonSerializerSettings
+        /// </summary>
+        public static readonly JsonSerializerSettings DefaultJsonSerializerSettings = new JsonSerializerSettings();
+
         public JsonNetResult()
         {
             SerializerSettings = new JsonSerializerSettings();
         }
+        public JsonNetResult(JsonSerializerSettings jsonSerializerSettings)
+        {
+            SerializerSettings = jsonSerializerSettings;
+        }
 
         public override void ExecuteResult(ControllerContext context)
         {
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
index 5a84e4b20c..560275b29a 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
@@ -121,6 +121,10 @@ namespace Umbraco.Web.PropertyEditors
             return base.ToEditor(property, dataTypeService, culture, segment);
         }
 
+        private static readonly JsonSerializerSettings LinkDisplayJsonSerializerSettings = new JsonSerializerSettings
+        {
+            NullValueHandling = NullValueHandling.Ignore
+        };
 
         public override object FromEditor(ContentPropertyData editorValue, object currentValue)
         {
@@ -142,11 +146,8 @@ namespace Umbraco.Web.PropertyEditors
                         Target = link.Target,
                         Udi = link.Udi,
                         Url = link.Udi == null ? link.Url : null, // only save the URL for external links
-                    },
-                    new JsonSerializerSettings
-                    {
-                        NullValueHandling = NullValueHandling.Ignore
-                    });
+                    }, LinkDisplayJsonSerializerSettings
+                    );
             }
             catch (Exception ex)
             {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
index f62014a368..f9ad0ac715 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
@@ -303,17 +303,18 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             return s;
         }
 
+        private static readonly JsonSerializerSettings NestedContentDataJsonSerializerSettings = new JsonSerializerSettings
+            {
+                Converters = new List<JsonConverter> { new ForceInt32Converter() }
+            };
+
         private static ContentNestedData DeserializeNestedData(string data)
         {
             // by default JsonConvert will deserialize our numeric values as Int64
             // which is bad, because they were Int32 in the database - take care
 
-            var settings = new JsonSerializerSettings
-            {
-                Converters = new List<JsonConverter> { new ForceInt32Converter() }
-            };
 
-            return JsonConvert.DeserializeObject<ContentNestedData>(data, settings);
+            return JsonConvert.DeserializeObject<ContentNestedData>(data, NestedContentDataJsonSerializerSettings);
         }
     }
 }

From e554ef044574e0478805f894f96a4e18910eb2be Mon Sep 17 00:00:00 2001
From: rbottema <rowan.bottema@deptagency.com>
Date: Sun, 21 Feb 2021 11:03:28 +0100
Subject: [PATCH 043/202] Fix some exceptions being logged the wrong way
 (#9693)

In these statements, the exception was passed as a log message parameter instead of as the exception. This meant the exception and including stack trace was not logged and thus lost.
---
 src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs     | 2 +-
 src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs   | 2 +-
 src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs | 4 ++--
 src/Umbraco.Web/UmbracoInjectedModule.cs                     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
index 333181f27c..1010d1db19 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
@@ -91,7 +91,7 @@ namespace Umbraco.ModelsBuilder.Embedded
             catch (Exception e)
             {
                 _mbErrors.Report("Failed to build Live models.", e);
-                _logger.Error<LiveModelsProvider>("Failed to generate models.", e);
+                _logger.Error<LiveModelsProvider>(e, "Failed to generate models.");
             }
             finally
             {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index 912d0e3363..8ef99383a4 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -308,7 +308,7 @@ namespace Umbraco.ModelsBuilder.Embedded
                     {
                         try
                         {
-                            _logger.Error<PureLiveModelFactory>("Failed to build models.", e);
+                            _logger.Error<PureLiveModelFactory>(e, "Failed to build models.");
                             _logger.Warn<PureLiveModelFactory>("Running without models."); // be explicit
                             _errors.Report("Failed to build PureLive models.", e);
                         }
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
index 560275b29a..aae691f624 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
@@ -115,7 +115,7 @@ namespace Umbraco.Web.PropertyEditors
             }
             catch (Exception ex)
             {
-                _logger.Error<MultiUrlPickerValueEditor>("Error getting links", ex);
+                _logger.Error<MultiUrlPickerValueEditor>(ex, "Error getting links");
             }
 
             return base.ToEditor(property, dataTypeService, culture, segment);
@@ -151,7 +151,7 @@ namespace Umbraco.Web.PropertyEditors
             }
             catch (Exception ex)
             {
-                _logger.Error<MultiUrlPickerValueEditor>("Error saving links", ex);
+                _logger.Error<MultiUrlPickerValueEditor>(ex, "Error saving links");
             }
 
             return base.FromEditor(editorValue, currentValue);
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index cc130a7b56..c2ee4ce535 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -328,7 +328,7 @@ namespace Umbraco.Web
                 }
                 catch (Exception ex)
                 {
-                    _logger.Error<UmbracoModule>("Could not dispose item with key " + k, ex);
+                    _logger.Error<UmbracoModule>(ex, "Could not dispose item with key {Key}", k);
                 }
                 try
                 {
@@ -336,7 +336,7 @@ namespace Umbraco.Web
                 }
                 catch (Exception ex)
                 {
-                    _logger.Error<UmbracoModule>("Could not dispose item key " + k, ex);
+                    _logger.Error<UmbracoModule>(ex, "Could not dispose item key {Key}", k);
                 }
             }
         }

From 46ace7dc229f00bc0ab1d02f861b39e63bc24d39 Mon Sep 17 00:00:00 2001
From: Andrey Karandashov
 <51944778+AndreyKarandashovUKAD@users.noreply.github.com>
Date: Sun, 21 Feb 2021 12:15:32 +0200
Subject: [PATCH 044/202] added swedish translations for media picker (#9730)

---
 src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
index 511765e604..8c282dd571 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -243,10 +243,10 @@
     <key alias="formsInstall">Installera Umbraco Forms</key>
   </area>
   <area alias="prompt">
-    <key alias="stay">Stanna</key>
-    <key alias="discardChanges">Ignorera ändringar</key>
-    <key alias="unsavedChanges">Du har ändringar som inte är sparade</key>
-    <key alias="unsavedChangesWarning">Vill du verkligen lämna sidan? Du har ändringar som inte är sparade</key>
+    <key alias="stay">Stay</key>
+    <key alias="discardChanges">Discard changes</key>
+    <key alias="unsavedChanges">You have unsaved changes</key>
+    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
   </area>
   <area alias="bulk">
     <key alias="done">Klar</key>
@@ -272,6 +272,8 @@
     <key alias="copiedItemOfItems">Kopierade %0% av %1% objekt</key>
   </area>
   <area alias="defaultdialogs">
+    <key alias="nodeNameLinkPicker">Länktitel</key>
+    <key alias="urlLinkPicker">Länk</key>
     <key alias="anchorInsert">Namn</key>
     <key alias="assignDomain">Hantera domännamn</key>
     <key alias="closeThisWindow">Stäng fönstret</key>
@@ -308,7 +310,9 @@
     <key alias="siterepublished">Cache för webbplatsen har uppdaterats. Allt publicerat innehåll är nu uppdaterat. Innehåll som inte har publicerats är fortfarande opublicerat.</key>
     <key alias="siterepublishHelp">Webbplatsens cache kommer att uppdateras. Allt innehåll som är publicerat kommer att uppdateras. Innehåll som inte är publicerat kommer att förbli opublicerat.</key>
     <key alias="selectContentStartNode">Välj startnod för innehåll</key>
+    <key alias="selectMedia">Välj media</key>
     <key alias="selectIcon">Välj ikon</key>
+    <key alias="selectLink">Välj länk</key>
     <key alias="selectMediaStartNode">Välj startnod för media</key>
     <key alias="selectUserGroups">Välj användargrupper</key>
     <key alias="selectSections">Välj sektioner</key>
@@ -318,6 +322,9 @@
     <key alias="thumbnailimageclickfororiginal">Klicka på förhandsgranskningsbilden för att se bilden i full storlek</key>
     <key alias="treepicker">Välj ett objekt</key>
     <key alias="viewCacheItem">Se cachat objekt</key>
+    <key alias="linkToPage">Länk till sida</key>
+    <key alias="openInNewWindow">Öppnar länken i ett nytt fönster eller flik</key>
+    <key alias="linkToMedia">Länk till media</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description">Redigera de olika översättningarna för ordboksinlägget %0% nedan. Du kan lägga till ytterligare språk under 'språk' i menyn till vänster.</key>
@@ -741,8 +748,8 @@
     <key alias="tabs">Flikar</key>
   </area>
   <area alias="sort">
-    <key alias="sortOrder">Sortera ordningen</key>
-    <key alias="sortCreationDate">Skapandedatum</key>
+    <key alias="sortOrder">Sort order</key>
+    <key alias="sortCreationDate">Creation date</key>
     <key alias="sortDone">Sortering klar</key>
     <key alias="sortHelp">Välj i vilken ordning du vill ha sidorna genom att dra dem upp eller ner i listan. Du kan också klicka på kolumnrubrikerna för att sortera grupper av sidor</key>
     <key alias="sortPleaseWait"><![CDATA[Vänta medan sidorna sorteras. Det kan ta en stund.]]></key>
@@ -815,12 +822,12 @@
   </area>
   <area alias="grid">
     <key alias="media">Bild</key>
-    <key alias="macro">Makro</key>
+    <key alias="macro">Macro</key>
     <key alias="insertControl">Lägg till</key>
-    <key alias="chooseLayout">Välj utformning</key>
+    <key alias="chooseLayout">Choose layout</key>
     <key alias="addRows">Lägg till rad</key>
-    <key alias="addElement">Lägg till innehåll</key>
-    <key alias="dropElement">Släpp innehåll</key>
+    <key alias="addElement">Add content</key>
+    <key alias="dropElement">Drop content</key>
     <key alias="contentNotAllowed">Indholdet er ikke tilladt her</key>
     <key alias="contentAllowed">Indholdet er tilladt her</key>
     <key alias="clickToEmbed">Klicka för att lägga in</key>
@@ -847,7 +854,7 @@
   <area alias="templateEditor">
     <key alias="alternativeField">Alternativt fält</key>
     <key alias="alternativeText">Alternativ text</key>
-    <key alias="casing">Hölje</key>
+    <key alias="casing">Casing</key>
     <key alias="chooseField">Välj fält</key>
     <key alias="convertLineBreaks">Konvertera radbrytningar</key>
     <key alias="convertLineBreaksHelp">Byter radbrytningar mot html-taggen &amp;lt;br&amp;gt;</key>
@@ -963,7 +970,7 @@
     <key alias="lastLockoutDate">Senast utlåst</key>
     <key alias="lastLogin">Senast inloggad</key>
     <key alias="lastPasswordChangeDate">Lösenordet ändrades</key>
-    <key alias="loginname">Logga in</key>
+    <key alias="loginname">Login</key>
     <key alias="mediastartnode">Startnod i mediabiblioteket</key>
     <key alias="mediastartnodehelp">Begränsa media sectionen till en specifik startnod</key>
     <key alias="mediastartnodes">Media startnoder</key>

From d966e89fd97edb9986516259456465f2fad03261 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 11:36:18 +0100
Subject: [PATCH 045/202] Block editor cleanup (#9664)

---
 .../blockeditor/blockeditor.controller.js     |  5 +--
 .../blockeditor/blockeditor.html              | 18 +++--------
 .../umbBlockListPropertyEditor.component.js   | 32 +++++++++----------
 ...tPropertyEditor.createButton.controller.js |  4 +--
 .../blocklist/umbblocklistblock.component.js  |  2 +-
 5 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
index 88cda027a8..d3a87791f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
@@ -1,6 +1,7 @@
 angular.module("umbraco")
     .controller("Umbraco.Editors.BlockEditorController",
         function ($scope, localizationService, formHelper, overlayService) {
+
             var vm = this;
 
             vm.model = $scope.model;
@@ -52,7 +53,7 @@ angular.module("umbraco")
                         vm.saveButtonState = "error";
                     }
                 }
-            }
+            };
 
             vm.close = function () {
                 if (vm.model && vm.model.close) {
@@ -93,7 +94,7 @@ angular.module("umbraco")
                     }
 
                 }
-            }
+            };
 
         }
     );
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html
index 2367771804..8fe5526c53 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html
@@ -1,4 +1,4 @@
-<div class="umb-block-editor"  ng-controller="Umbraco.Editors.BlockEditorController as vm">
+<div class="umb-block-editor" ng-controller="Umbraco.Editors.BlockEditorController as vm">
 
     <ng-form name="vm.blockForm" val-form-manager>
 
@@ -14,20 +14,12 @@
                 hide-description="true">
             </umb-editor-header>
 
-            <div class="umb-editor-container umb-panel-body umb-scrollable row-fluid">
+            <umb-editor-container>
 
-                <!-- Missing Deleted Message Bar (Displayed when viewing node in recycle bin), but Blocks dosnt go into trash-bin jet...
-                    <div ng-show="vm.content.trashed" class="umb-editor--trashed-message">
-                        <i class="icon icon-trash"></i> <localize key="content_nodeIsInTrash">This item is in the Recycle Bin</localize>
-                    </div>
-                -->
+                <umb-editor-sub-views sub-views="vm.tabs" model="vm.model">
+                </umb-editor-sub-views>
 
-                <div class="umb-pane">
-                    <umb-editor-sub-views sub-views="vm.tabs" model="vm.model">
-                    </umb-editor-sub-views>
-                </div>
-
-            </div>
+            </umb-editor-container>
 
             <umb-editor-footer>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index 56dbc68d90..613e6a8c6a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -241,23 +241,24 @@
 
             block.hideContentInOverlay = block.config.forceHideContentEditorInOverlay === true || inlineEditing === true;
             block.showSettings = block.config.settingsElementTypeKey != null;
-            block.showCopy = vm.supportCopy && block.config.contentElementTypeKey != null;// if we have content, otherwise it doesn't make sense to copy.
 
+            // If we have content, otherwise it doesn't make sense to copy.
+            block.showCopy = vm.supportCopy && block.config.contentElementTypeKey != null;
 
             // Index is set by umbblocklistblock component and kept up to date by it.
             block.index = 0;
             block.setParentForm = function (parentForm) {
                 this._parentForm = parentForm;
-            }
+            };
             block.activate = activateBlock.bind(null, block);
             block.edit = function () {
                 var blockIndex = vm.layout.indexOf(this.layout);
                 editBlock(this, false, blockIndex, this._parentForm);
-            }
+            };
             block.editSettings = function () {
                 var blockIndex = vm.layout.indexOf(this.layout);
                 editBlock(this, true, blockIndex, this._parentForm);
-            }
+            };
             block.requestDelete = requestDeleteBlock.bind(null, block);
             block.delete = deleteBlock.bind(null, block);
             block.copy = copyBlock.bind(null, block);
@@ -265,7 +266,6 @@
             return block;
         }
 
-
         function addNewBlock(index, contentElementTypeKey) {
 
             // Create layout entry. (not added to property model jet.)
@@ -292,7 +292,6 @@
             vm.setBlockFocus(blockObject);
 
             return true;
-
         }
 
         function deleteBlock(block) {
@@ -316,7 +315,6 @@
             });
 
             modelObject.removeDataAndDestroyModel(block);
-
         }
 
         function deleteAllBlocks() {
@@ -409,6 +407,7 @@
         }
 
         vm.showCreateDialog = showCreateDialog;
+
         function showCreateDialog(createIndex, $event) {
 
             if (vm.blockTypePicker) {
@@ -524,7 +523,7 @@
 
         };
 
-        var requestCopyAllBlocks = function() {
+        var requestCopyAllBlocks = function () {
 
             var aliases = [];
 
@@ -534,7 +533,7 @@
                     aliases.push(entry.$block.content.contentTypeAlias);
 
                     // No need to clone the data as its begin handled by the clipboardService.
-                    return {"layout": entry.$block.layout, "data": entry.$block.data, "settingsData":entry.$block.settingsData}
+                    return { "layout": entry.$block.layout, "data": entry.$block.data, "settingsData": entry.$block.settingsData }
                 }
             );
 
@@ -543,9 +542,9 @@
 
             var contentNodeName = "?";
             var contentNodeIcon = null;
-            if(vm.umbVariantContent) {
+            if (vm.umbVariantContent) {
                 contentNodeName = vm.umbVariantContent.editor.content.name;
-                if(vm.umbVariantContentEditors) {
+                if (vm.umbVariantContentEditors) {
                     contentNodeIcon = vm.umbVariantContentEditors.content.icon.split(" ")[0];
                 } else if (vm.umbElementEditorContent) {
                     contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
@@ -555,13 +554,15 @@
                 contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
             }
 
-            localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, contentNodeName]).then(function(localizedLabel) {
+            localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, contentNodeName]).then(function (localizedLabel) {
                 clipboardService.copyArray(clipboardService.TYPES.BLOCK, aliases, elementTypesToCopy, localizedLabel, contentNodeIcon || "icon-thumbnail-list", vm.model.id);
             });
-        }
+        };
+
         function copyBlock(block) {
             clipboardService.copy(clipboardService.TYPES.BLOCK, block.content.contentTypeAlias, {"layout": block.layout, "data": block.data, "settingsData":block.settingsData}, block.label, block.content.icon, block.content.udi);
         }
+
         function requestPasteFromClipboard(index, pasteEntry, pasteType) {
 
             if (pasteEntry === undefined) {
@@ -599,7 +600,6 @@
             vm.currentBlockInFocus = blockObject;
 
             return true;
-
         }
 
         function requestDeleteBlock(block) {
@@ -620,6 +620,7 @@
                 overlayService.confirmDelete(overlay);
             });
         }
+
         function requestDeleteAllBlocks() {
             localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
                 overlayService.confirmDelete({
@@ -647,7 +648,7 @@
             requestDeleteBlock: requestDeleteBlock,
             deleteBlock: deleteBlock,
             openSettingsForBlock: openSettingsForBlock
-        }
+        };
 
         vm.sortableOptions = {
             axis: "y",
@@ -664,7 +665,6 @@
             }
         };
 
-
         function onAmountOfBlocksChanged() {
 
             // enable/disable property actions
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js
index 98d4f4ea3a..365ec809ac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js
@@ -9,9 +9,9 @@
         var vm = this;
         vm.plusPosX = 0;
 
-        vm.onMouseMove = function($event) {
+        vm.onMouseMove = function ($event) {
             vm.plusPosX = $event.offsetX;
-        }
+        };
 
     });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
index 41d76475e4..285437b011 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
@@ -78,7 +78,7 @@
                 model.block.index = index;
                 model.block.updateLabel();
             }
-        }
+        };
     }
 
 

From 616992332a720a575ac3e4550c3ff12f665323c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=87a=C4=9Fatay=20UNCU?=
 <34659246+cagatayuncu@users.noreply.github.com>
Date: Sun, 21 Feb 2021 13:40:51 +0300
Subject: [PATCH 046/202] Clean Code and use async methed (#9747)

---
 src/Umbraco.Web/AspNetHttpContextAccessor.cs           | 10 ++--------
 src/Umbraco.Web/FormDataCollectionExtensions.cs        |  4 ++--
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs          |  2 +-
 src/Umbraco.Web/HttpUrlHelperExtensions.cs             |  4 ++--
 src/Umbraco.Web/HybridEventMessagesAccessor.cs         |  4 ++--
 src/Umbraco.Web/ModelStateExtensions.cs                |  4 ++--
 .../WebApi/AngularJsonMediaTypeFormatter.cs            |  4 ++--
 7 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web/AspNetHttpContextAccessor.cs b/src/Umbraco.Web/AspNetHttpContextAccessor.cs
index babd8dfcfa..147c37fe8c 100644
--- a/src/Umbraco.Web/AspNetHttpContextAccessor.cs
+++ b/src/Umbraco.Web/AspNetHttpContextAccessor.cs
@@ -7,14 +7,8 @@ namespace Umbraco.Web
     {
         public HttpContext HttpContext
         {
-            get
-            {
-                return HttpContext.Current;
-            }
-            set
-            {
-                throw new NotSupportedException();
-            }
+            get => HttpContext.Current;
+            set => throw new NotSupportedException();
         }
     }
 }
diff --git a/src/Umbraco.Web/FormDataCollectionExtensions.cs b/src/Umbraco.Web/FormDataCollectionExtensions.cs
index aabf13ac9b..ebabaa74c7 100644
--- a/src/Umbraco.Web/FormDataCollectionExtensions.cs
+++ b/src/Umbraco.Web/FormDataCollectionExtensions.cs
@@ -23,9 +23,9 @@ namespace Umbraco.Web
             if (items.Any() == false) return "";
 
             var builder = new StringBuilder();
-            foreach (var i in items.Where(i => keysToIgnore.InvariantContains(i.Key) == false))
+            foreach (var (key, value) in items.Where(i => keysToIgnore.InvariantContains(i.Key) == false))
             {
-                builder.Append(string.Format("{0}={1}&", i.Key, i.Value));
+                builder.Append($"{key}={value}&");
             }
             return builder.ToString().TrimEnd(Constants.CharArrays.Ampersand);
         }
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index e19ae883e9..2f55f0a1b1 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Web
             var cacheKey = new StringBuilder(partialViewName);
              //let's always cache by the current culture to allow variants to have different cache results
             var cultureName = System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
-            if (!String.IsNullOrEmpty(cultureName))
+            if (!string.IsNullOrEmpty(cultureName))
             {
                 cacheKey.AppendFormat("{0}-", cultureName);
             }
diff --git a/src/Umbraco.Web/HttpUrlHelperExtensions.cs b/src/Umbraco.Web/HttpUrlHelperExtensions.cs
index 4e5533d327..9a2f394d90 100644
--- a/src/Umbraco.Web/HttpUrlHelperExtensions.cs
+++ b/src/Umbraco.Web/HttpUrlHelperExtensions.cs
@@ -103,7 +103,7 @@ namespace Umbraco.Web
             string routeName;
             if (area.IsNullOrWhiteSpace())
             {
-                routeName = string.Format("umbraco-{0}-{1}", "api", controllerName);
+                routeName = $"umbraco-{"api"}-{controllerName}";
                 if (id == null)
                 {
                     return url.Route(routeName, new { controller = controllerName, action = actionName, httproute = "" });
@@ -115,7 +115,7 @@ namespace Umbraco.Web
             }
             else
             {
-                routeName = string.Format("umbraco-{0}-{1}-{2}", "api", area, controllerName);
+                routeName = $"umbraco-{"api"}-{area}-{controllerName}";
                 if (id == null)
                 {
                     return url.Route(routeName, new { controller = controllerName, action = actionName, httproute = "" });
diff --git a/src/Umbraco.Web/HybridEventMessagesAccessor.cs b/src/Umbraco.Web/HybridEventMessagesAccessor.cs
index fddde403d8..ab67b4774f 100644
--- a/src/Umbraco.Web/HybridEventMessagesAccessor.cs
+++ b/src/Umbraco.Web/HybridEventMessagesAccessor.cs
@@ -12,8 +12,8 @@ namespace Umbraco.Web
 
         public EventMessages EventMessages
         {
-            get { return Value; }
-            set { Value = value; }
+            get => Value;
+            set => Value = value;
         }
     }
 }
diff --git a/src/Umbraco.Web/ModelStateExtensions.cs b/src/Umbraco.Web/ModelStateExtensions.cs
index e224a6122b..2b0cd01e21 100644
--- a/src/Umbraco.Web/ModelStateExtensions.cs
+++ b/src/Umbraco.Web/ModelStateExtensions.cs
@@ -24,11 +24,11 @@ namespace Umbraco.Web
         {
             if (dictionary == null)
                 return;
-            foreach (var keyValuePair in dictionary
+            foreach (var (key, value) in dictionary
                 //It can either equal the prefix exactly (model level errors) or start with the prefix. (property level errors)
                 .Where(keyValuePair => keyValuePair.Key == prefix || keyValuePair.Key.StartsWith(prefix + ".")))
             {
-                state[keyValuePair.Key] = keyValuePair.Value;
+                state[key] = value;
             }
         }
 
diff --git a/src/Umbraco.Web/WebApi/AngularJsonMediaTypeFormatter.cs b/src/Umbraco.Web/WebApi/AngularJsonMediaTypeFormatter.cs
index 0e7cf6453a..874afce0e1 100644
--- a/src/Umbraco.Web/WebApi/AngularJsonMediaTypeFormatter.cs
+++ b/src/Umbraco.Web/WebApi/AngularJsonMediaTypeFormatter.cs
@@ -47,8 +47,8 @@ namespace Umbraco.Web.WebApi
             {
                 //write the special encoding for angular json to the start
                 // (see: http://docs.angularjs.org/api/ng.$http)
-                streamWriter.Write(XsrfPrefix);
-                streamWriter.Flush();
+                await streamWriter.WriteAsync(XsrfPrefix);
+                await streamWriter.FlushAsync();
                 await base.WriteToStreamAsync(type, value, writeStream, content, transportContext);
             }
         }

From 63b417477b156f633cc4fd12c78aa28ce638679c Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 11:42:06 +0100
Subject: [PATCH 047/202] Replace tree icon in section picker with umb-icon
 component (#9760)

---
 .../infiniteeditors/sectionpicker/sectionpicker.html  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
index feb3b9ab53..452f4b2364 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
@@ -19,10 +19,15 @@
             <umb-box ng-if="!vm.loading">
                 <umb-box-content>
                     <ul class="umb-tree">
-                        <li ng-repeat="section in vm.sections" class="umb-tree-item">
+                        <li class="umb-tree-item" ng-repeat="section in vm.sections">
                             <div class="umb-tree-item__inner" style="padding: 5px 10px;">
-                                <button type="button" class="btn-reset text-left flex-auto" ng-click="vm.selectSection(section)" ng-class="{'umb-tree-node-checked': section.selected }">
-                                    <i class="icon umb-tree-icon {{section.icon}}" aria-hidden="true"></i>
+                                <button type="button"
+                                        class="btn-reset text-left flex-auto"
+                                        ng-class="{'umb-tree-node-checked': section.selected }"
+                                        ng-click="vm.selectSection(section)">
+                                    <umb-icon icon="{{section.selected ? 'icon-check' : section.icon}}"
+                                              class="icon umb-tree-icon {{section.selected ? 'icon-check color-green' : section.icon}}">
+                                    </umb-icon>
                                     <span>{{ section.name }}</span>
                                 </button>
                             </div>

From f4e1b469683847d5596a73890715d0f434541d30 Mon Sep 17 00:00:00 2001
From: Jakob Bagterp <25110864+jakob-bagterp@users.noreply.github.com>
Date: Sun, 21 Feb 2021 11:47:35 +0100
Subject: [PATCH 048/202] Fix: Verify that grid model is JSON object and not
 IPublishedContent (#9774)

---
 src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml | 2 +-
 src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
index 131b0515ae..bef1b88879 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
@@ -6,7 +6,7 @@
     Razor helpers located at the bottom of this file
 *@
 
-@if (Model != null && Model.sections != null)
+@if (Model != null && Model.GetType() == typeof(JObject) && Model.sections != null)
 {
     var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
 
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
index c30feb2165..801526aaeb 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
@@ -2,7 +2,7 @@
 @using Umbraco.Web.Templates
 @using Newtonsoft.Json.Linq
 
-@if (Model != null && Model.sections != null)
+@if (Model != null && Model.GetType() == typeof(JObject) && Model.sections != null)
 {
     var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
 

From 43a77dc1e458b6f4e600f198a285dc48b5ea7d56 Mon Sep 17 00:00:00 2001
From: patrickdemooij9 <patrickdemooij98@hotmail.com>
Date: Sun, 21 Feb 2021 11:52:49 +0100
Subject: [PATCH 049/202] 9569: Fix image cropper buttons (#9777)

---
 .../views/propertyeditors/imagecropper/imagecropper.html    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
index 91abc3be87..84ddf7ee3b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
@@ -28,9 +28,9 @@
                         </div>
 
                         <div class="button-drawer" ng-if="currentCrop">
-                            <button class="btn btn-link" ng-click="reset()"><localize key="imagecropper_reset">Reset this crop</localize></button>
-                            <button class="btn" ng-click="close()"><localize key="imagecropper_undoEditCrop">Undo edits</localize></button>
-                            <button class="btn btn-success" ng-click="done()"><localize key="imagecropper_updateEditCrop">Done</localize></button>
+                            <button type="button" class="btn btn-link" ng-click="reset()"><localize key="imagecropper_reset">Reset this crop</localize></button>
+                            <button type="button" class="btn" ng-click="close()"><localize key="imagecropper_undoEditCrop">Undo edits</localize></button>
+                            <button type="button" class="btn btn-success" ng-click="done()"><localize key="imagecropper_updateEditCrop">Done</localize></button>
                         </div>
 
                     </div>

From f167f022c150115d9f319cb39a2ced00089d0f6e Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Sun, 21 Feb 2021 21:00:22 +1000
Subject: [PATCH 050/202] 9769 - shift index increment before tryget to allow
 loop to continue if current iteration exits early (#9799)

---
 .../Repositories/Implement/ContentTypeCommonRepository.cs   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
index 90774e4c0b..ec998660fd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
@@ -171,9 +171,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 while (compositionIx < compositionDtos.Count && compositionDtos[compositionIx].ChildId == contentType.Id)
                 {
                     var parentDto = compositionDtos[compositionIx];
-                    if (!contentTypes.TryGetValue(parentDto.ParentId, out var parentContentType)) continue;
-                    contentType.AddContentType(parentContentType);
                     compositionIx++;
+
+                    if (!contentTypes.TryGetValue(parentDto.ParentId, out var parentContentType))
+                        continue;
+                    contentType.AddContentType(parentContentType);
                 }
             }
         }

From fa49d6ed1082dc0ad82ada8fb98c5281ed13271e Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Sun, 21 Feb 2021 22:03:28 +1100
Subject: [PATCH 051/202] Fixes: After deleting a member, a reindex is
 attempted, which fails (#9807)

---
 .../Cache/DistributedCacheExtensions.cs          |  5 ++++-
 src/Umbraco.Web/Cache/MemberCacheRefresher.cs    |  4 ++++
 src/Umbraco.Web/Search/ExamineComponent.cs       | 16 +++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
index f360d37d03..92a9dd6e98 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
@@ -135,7 +135,10 @@ namespace Umbraco.Web.Cache
         public static void RemoveMemberCache(this DistributedCache dc, params IMember[] members)
         {
             if (members.Length == 0) return;
-            dc.RefreshByPayload(MemberCacheRefresher.UniqueId, members.Select(x => new MemberCacheRefresher.JsonPayload(x.Id, x.Username)));
+            dc.RefreshByPayload(MemberCacheRefresher.UniqueId, members.Select(x => new MemberCacheRefresher.JsonPayload(x.Id, x.Username)
+            {
+                Removed = true
+            }));
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
index 736a858af3..48ae40ce3b 100644
--- a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
@@ -33,6 +33,10 @@ namespace Umbraco.Web.Cache
             public int Id { get; }
             public string Username { get; }
 
+            // TODO: In netcore change this to be get only and adjust the ctor. We cannot do that now since that
+            // is a breaking change due to only having a single jsonconstructor allowed.
+            public bool Removed { get; set; }
+
         }
 
         #region Define
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index c9d7b7cf56..eb6b81ba16 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -271,10 +271,20 @@ namespace Umbraco.Web.Search
                     break;
                 case MessageType.RefreshByPayload:
                     var payload = (MemberCacheRefresher.JsonPayload[])args.MessageObject;
-                    var members = payload.Select(x => _services.MemberService.GetById(x.Id));
-                    foreach(var m in members)
+                    foreach(var p in payload)
                     {
-                        ReIndexForMember(m);
+                        if (p.Removed)
+                        {
+                            DeleteIndexForEntity(p.Id, false);
+                        }
+                        else
+                        {
+                            var m = _services.MemberService.GetById(p.Id);
+                            if (m != null)
+                            {
+                                ReIndexForMember(m);
+                            }
+                        }
                     }
                     break;
                 case MessageType.RefreshAll:

From 64117921eada1761c93d6564b932441d92098c0c Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Sun, 21 Feb 2021 22:03:28 +1100
Subject: [PATCH 052/202] Fixes: After deleting a member, a reindex is
 attempted, which fails (#9807)

(cherry picked from commit fa49d6ed1082dc0ad82ada8fb98c5281ed13271e)
---
 .../Cache/DistributedCacheExtensions.cs          |  5 ++++-
 src/Umbraco.Web/Cache/MemberCacheRefresher.cs    |  4 ++++
 src/Umbraco.Web/Search/ExamineComponent.cs       | 16 +++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
index f360d37d03..92a9dd6e98 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
@@ -135,7 +135,10 @@ namespace Umbraco.Web.Cache
         public static void RemoveMemberCache(this DistributedCache dc, params IMember[] members)
         {
             if (members.Length == 0) return;
-            dc.RefreshByPayload(MemberCacheRefresher.UniqueId, members.Select(x => new MemberCacheRefresher.JsonPayload(x.Id, x.Username)));
+            dc.RefreshByPayload(MemberCacheRefresher.UniqueId, members.Select(x => new MemberCacheRefresher.JsonPayload(x.Id, x.Username)
+            {
+                Removed = true
+            }));
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
index 736a858af3..48ae40ce3b 100644
--- a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
@@ -33,6 +33,10 @@ namespace Umbraco.Web.Cache
             public int Id { get; }
             public string Username { get; }
 
+            // TODO: In netcore change this to be get only and adjust the ctor. We cannot do that now since that
+            // is a breaking change due to only having a single jsonconstructor allowed.
+            public bool Removed { get; set; }
+
         }
 
         #region Define
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index c9d7b7cf56..eb6b81ba16 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -271,10 +271,20 @@ namespace Umbraco.Web.Search
                     break;
                 case MessageType.RefreshByPayload:
                     var payload = (MemberCacheRefresher.JsonPayload[])args.MessageObject;
-                    var members = payload.Select(x => _services.MemberService.GetById(x.Id));
-                    foreach(var m in members)
+                    foreach(var p in payload)
                     {
-                        ReIndexForMember(m);
+                        if (p.Removed)
+                        {
+                            DeleteIndexForEntity(p.Id, false);
+                        }
+                        else
+                        {
+                            var m = _services.MemberService.GetById(p.Id);
+                            if (m != null)
+                            {
+                                ReIndexForMember(m);
+                            }
+                        }
                     }
                     break;
                 case MessageType.RefreshAll:

From 1906ef02788fedb27980696118f2233940767d4b Mon Sep 17 00:00:00 2001
From: jesperweber <jweber@jweber.dk>
Date: Sun, 21 Feb 2021 12:35:50 +0100
Subject: [PATCH 053/202] Updating danish translations (#9832)

---
 .../src/views/contentblueprints/intro.html    |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
index 66695ace91..57c29d31d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
@@ -17,7 +17,7 @@
                         <localize key="contentTemplatesDashboard_whatHeadline">What are Content Templates?</localize>
                     </h3>
                     <p>
-                        <localise key="contentTemplatesDashboard_whatDescription">Content Templates are pre-defined content that can be selected when creating a new content node.</localize>
+                        <localize key="contentTemplatesDashboard_whatDescription">Content Templates are pre-defined content that can be selected when creating a new content node.</localize>
                     </p>
                     
                     <h4 class="bold">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 494416d777..e8de8e55aa 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -307,6 +307,7 @@
     <key alias="schedulePublishHelp">Vælg dato og klokkeslæt for at udgive og/eller afpublicere indholdet.</key>
     <key alias="createEmpty">Opret ny</key>
     <key alias="createFromClipboard">Indsæt fra udklipsmappen</key>
+    <key alias="nodeIsInTrash">Dette element er i papirkurven</key>
   </area>
   <area alias="blueprints">
     <key alias="createBlueprintFrom">Opret en ny indholdsskabelon fra '%0%'</key>
@@ -1691,10 +1692,14 @@ Mange hilsner fra Umbraco robotten
     <key alias="maxCount">Du kan kun have</key>
     <key alias="addUpTo">Tilføj op til </key>
     <key alias="items">elementer</key>
+    <key alias="urls">URL(er)</key>
+    <key alias="urlsSelected">URL(er) valgt</key>
     <key alias="itemsSelected">elementer valgt</key>
     <key alias="invalidDate">Ugyldig dato</key>
     <key alias="invalidNumber">Ikke et tal</key>
     <key alias="invalidEmail">Ugyldig e-mail</key>
+    <key alias="invalidNull">Feltet er påkrævet</key>
+    <key alias="invalidEmpty">Feltet er påkrævet</key>
     <key alias="entriesShort"><![CDATA[Minimum %0% element(er), tilføj <strong>%1%</strong> mere.]]></key>
     <key alias="entriesExceed"><![CDATA[Maksimum %0% element(er), <strong>%1%</strong> for mange.]]></key>
   </area>
@@ -1875,6 +1880,23 @@ Mange hilsner fra Umbraco robotten
     <key alias="elementTypeDoesNotExistHeadline">Error!</key>
     <key alias="elementTypeDoesNotExistDescription">The ElementType of this block does not exist anymore</key>
   </area>
+    <area alias="contentTemplatesDashboard">
+        <key alias="whatHeadline">Hvad er Indholdsskabeloner?</key>
+        <key alias="whatDescription">Indholdsskabeloner er foruddefineret indhold der kan vælges når der oprettes nye indholdselementer.</key>
+        <key alias="createHeadline">Hvordan opretter jeg en Indholdsskabelon?</key>
+        <key alias="createDescription">
+            <![CDATA[
+            <p>Der er to måder at oprette Indholdsskabeloner på:</p>
+            <ul>
+                <li>Højreklik på en indholdsnode og vælg "Opret indholdsskabelon" for at oprette en ny Indholdsskabelon.</li>
+                <li>Højreklik på Indholdsskabeloner i sektionen Indstillinger og vælg den dokumenttype du vil oprette en Indholdsskabelon for.</li>
+            </ul>
+            <p>Når indholdsskabelonen har fået et navn, kan redaktører begynde at bruge indholdsskabelonen som udgangspunkt for deres nye side.</p>
+        ]]>
+        </key>
+        <key alias="manageHeadline">Hvordan vedligeholder jeg Indholdsskabeloner?</key>
+        <key alias="manageDescription">Du kan redigere og slette Indholdsskabeloner fra "Indholdsskabeloner" i sektionen Indstillinger. Fold dokumenttypen som Indholdsskabelonen er baseret på ud og klik på den for at redigere eller slette den.</key>
+    </area>
   <area alias="preview">
     <key alias="endLabel">Afslut</key>
     <key alias="endTitle">Afslut forhåndsvisning</key>

From 82701fbacd02cf8aefa26b88eb7ad7ea8b18de04 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 12:37:51 +0100
Subject: [PATCH 054/202] Fixes #9824 - Filtering in block picker doesn't work
 (#9831)

---
 .../blockpicker/blockpicker.controller.js     | 22 +++++++------
 .../blockpicker/blockpicker.html              | 31 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js
index 2894e0bef4..90803a3765 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js
@@ -1,11 +1,14 @@
 angular.module("umbraco")
 .controller("Umbraco.Editors.BlockPickerController",
     function ($scope, localizationService) {
-        var vm = this;
 
+        var vm = this;
 
         vm.navigation = [];
 
+        vm.filter = {
+            searchTerm: ''
+        };
 
         localizationService.localizeMany(["blockEditor_tabCreateEmpty", "blockEditor_tabClipboard"]).then(
             function (data) {
@@ -28,33 +31,32 @@ angular.module("umbraco")
                 vm.activeTab = vm.navigation[0];
             }
         );
-
         
-        vm.onNavigationChanged = function(tab) {
+        vm.onNavigationChanged = function (tab) {
             vm.activeTab.active = false;
             vm.activeTab = tab;
             vm.activeTab.active = true;
-        }
+        };
 
-        vm.clickClearClipboard = function() {
+        vm.clickClearClipboard = function () {
             vm.onNavigationChanged(vm.navigation[0]);
             vm.navigation[1].disabled = true;// disabled ws determined when creating the navigation, so we need to update it here.
             vm.model.clipboardItems = [];// This dialog is not connected via the clipboardService events, so we need to update manually.
             vm.model.clickClearClipboard();
-        }
+        };
 
         vm.model = $scope.model;
 
-        vm.selectItem = function(item, $event) {
+        vm.selectItem = function (item, $event) {
             vm.model.selectedItem = item;
             vm.model.submit($scope.model, $event);
-        }
+        };
 
-        vm.close = function() {
+        vm.close = function () {
             if ($scope.model && $scope.model.close) {
                 $scope.model.close($scope.model);
             }
-        }
+        };
 
     }
 );
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html
index 4b08d4e5fc..b72de0960d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html
@@ -12,35 +12,35 @@
             hide-description="true">
         </umb-editor-header>
 
-        <div class="umb-editor-container umb-panel-body umb-scrollable row-fluid">
+        <umb-editor-container class="block-form">
 
-            <div class="umb-pane" ng-if="vm.activeTab.alias === 'empty'">
+            <div ng-if="vm.activeTab.alias === 'empty'">
 
-                <div class="form-search" ng-if="vm.model.filter === true" style="margin-bottom: 20px;">
-                    <i class="icon-search"></i>
-                    <input type="text"
-                           ng-model="searchTerm"
-                           class="umb-search-field search-query input-block-level -full-width-input"
-                           localize="placeholder"
-                           placeholder="@placeholders_filter"
-                           umb-auto-focus
-                           no-dirty-check />
+                <div class="umb-control-group" ng-if="vm.model.filter === true" style="margin-bottom: 20px;">
+                    <umb-search-filter
+                        input-id="icon-search"
+                        model="vm.filter.searchTerm"
+                        label-key="placeholders_filter"
+                        text="Type to filter..."
+                        css-class="w-100"
+                        auto-focus="true">
+                    </umb-search-filter>
                 </div>
 
                 <div class="umb-block-card-grid">
 
                     <umb-block-card
                         class="umb-outline"
-                        umb-auto-focus="vm.model.filter === false && $index === 0"
-                        ng-repeat="block in vm.model.availableItems | filter:searchTerm"
+                        ng-repeat="block in vm.model.availableItems | filter: vm.filter.searchTerm"
                         block-config-model="block.blockConfigModel"
                         element-type-model="block.elementTypeModel"
                         ng-click="vm.selectItem(block, $event)">
                     </umb-block-card>
+
                 </div>
             </div>
 
-            <div class="umb-pane" ng-if="vm.activeTab.alias === 'clipboard'">
+            <div ng-if="vm.activeTab.alias === 'clipboard'">
                 <div style="margin-bottom:20px; text-align: right;">
                     <umb-button
                         type="button"
@@ -59,10 +59,11 @@
                         ng-repeat="block in vm.model.clipboardItems"
                         ng-click="vm.model.clickPasteItem(block, $event)">
                     </umb-block-card>
+
                 </div>
             </div>
 
-        </div>
+        </umb-editor-container>
 
         <umb-editor-footer>
 

From 01991db257405bf698132c4c63fbf25d99b00c90 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 12:42:20 +0100
Subject: [PATCH 055/202] Fixes #9625 - Searching icons for "box" returns all
 icons (#9848)

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

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
index 59a9aed4bb..51c2c15898 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
@@ -10,6 +10,10 @@ function IconPickerController($scope, localizationService, iconHelper) {
 
     var vm = this;
 
+    vm.filter = {
+        searchTerm: ''
+    };
+
     vm.selectIcon = selectIcon;
     vm.selectColor = selectColor;
     vm.submit = submit;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
index 7368d2f39b..19fe679189 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
@@ -20,7 +20,7 @@
                 <div class="umb-control-group">
                     <umb-search-filter
                         input-id="icon-search"
-                        model="searchTerm"
+                        model="vm.filter.searchTerm"
                         label-key="placeholders_filter"
                         text="Type to filter..."
                         css-class="w-100"
@@ -42,7 +42,7 @@
 
                 <div class="umb-control-group" ng-show="!vm.loading && filtered.length > 0 ">
                     <ul class="umb-iconpicker" ng-class="vm.color.value" ng-show="vm.icons">
-                        <li class="umb-iconpicker-item" ng-class="{'-selected': icon.name == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm | orderBy:'name') track by $id(icon)">
+                        <li class="umb-iconpicker-item" ng-class="{'-selected': icon.name == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: { 'name': vm.filter.searchTerm } | orderBy:'name') track by $id(icon)">
                             <button type="button" title="{{icon.name}}" ng-click="vm.selectIcon(icon.name, vm.color.value)">
                                 <umb-icon class="umb-iconpicker-svg {{icon.name}} large" icon="{{icon.name}}"></umb-icon>
                                 <span class="sr-only"><localize key="buttons_select">Select</localize> {{icon.name}}</span>

From 821cba5cd3223f14161cbb7ccf68a7c26966d525 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 12:52:42 +0100
Subject: [PATCH 056/202] Make sorting in media consistent with sorting in
 content (#9756)

---
 .../src/views/media/media.sort.controller.js           |  2 ++
 src/Umbraco.Web.UI.Client/src/views/media/sort.html    | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
index 95aeb239b9..2cc27be914 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
@@ -11,6 +11,8 @@
         vm.saveButtonState = "init";
         vm.sortOrder = {};
         vm.sortableOptions = {
+            axis: "y",
+            containment: "parent",
             distance: 10,
             tolerance: "pointer",
             opacity: 0.7,
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/sort.html b/src/Umbraco.Web.UI.Client/src/views/media/sort.html
index a483e9c7dc..05a55f435f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/sort.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/sort.html
@@ -19,19 +19,17 @@
                         <tr>
                             <th colspan="2">
                                 <button type="button" class="btn-reset" ng-click="vm.sort('name')">
-                                    <b><localize key="general_name">Name</localize></b>
+                                    <strong><localize key="general_name">Name</localize></strong>
                                     <span ng-if="vm.sortOrder.column === 'name'" aria-hidden="true">
-                                        <i ng-if="vm.sortOrder.reverse" class="icon-navigation-up"></i>
-                                        <i ng-if="!vm.sortOrder.reverse" class="icon-navigation-down"></i>
+                                        <i ng-class="{ 'icon-navigation-up': vm.sortOrder.reverse, 'icon-navigation-down': !vm.sortOrder.reverse }"></i>
                                     </span>
                                 </button>
                             </th>
                             <th>
                                 <button type="button" class="btn-reset" ng-click="vm.sort('createDate')">
-                                    <b><localize key="sort_sortCreationDate">Creation date</localize></b>
+                                    <strong><localize key="sort_sortCreationDate">Creation date</localize></strong>
                                     <span ng-if="vm.sortOrder.column === 'createDate'" aria-hidden="true">
-                                        <i ng-if="vm.sortOrder.reverse" class="icon-navigation-up"></i>
-                                        <i ng-if="!vm.sortOrder.reverse" class="icon-navigation-down"></i>
+                                        <i ng-class="{ 'icon-navigation-up': vm.sortOrder.reverse, 'icon-navigation-down': !vm.sortOrder.reverse }"></i>
                                     </span>
                                 </button>
                             </th>

From c11d07dede63e686e59f8382c899729c0e900448 Mon Sep 17 00:00:00 2001
From: Rachel Breeze <RachBreeze@users.noreply.github.com>
Date: Sun, 21 Feb 2021 12:00:48 +0000
Subject: [PATCH 057/202] Performance and accessibility improvements on the
 embed screen (#9810)

---
 .../infiniteeditors/embed/embed.controller.js | 38 +++++++++++++------
 .../common/infiniteeditors/embed/embed.html   | 17 +++++----
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
index c3d1312109..e29ba996c7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
@@ -18,8 +18,11 @@
             preview: "",
             success: false,
             info: "",
-            supportsDimensions: false
-        };
+            a11yInfo: "",
+            supportsDimensions: false,
+            originalWidth: 360,
+            originalHeight: 240
+   };
 
         if ($scope.model.modify) {
             Utilities.extend($scope.model.embed, $scope.model.modify);
@@ -32,8 +35,8 @@
         vm.changeSize = changeSize;
         vm.submit = submit;
         vm.close = close;
-
-        function onInit() {
+        
+       function onInit() {
             if (!$scope.model.title) {
                 localizationService.localize("general_embed").then(function(value){
                     $scope.model.title = value;
@@ -46,8 +49,8 @@
             if ($scope.model.embed.url) {
                 $scope.model.embed.show = true;
                 $scope.model.embed.info = "";
+                $scope.model.embed.a11yInfo = "";
                 $scope.model.embed.success = false;
-
                 vm.loading = true;
 
                 $http({
@@ -67,6 +70,7 @@
                             //not supported
                             $scope.model.embed.preview = "";
                             $scope.model.embed.info = "Not supported";
+                            $scope.model.embed.a11yInfo = $scope.model.embed.info;
                             $scope.model.embed.success = false;
                             $scope.model.embed.supportsDimensions = false;
                             vm.trustedPreview = null;
@@ -75,6 +79,7 @@
                             //error
                             $scope.model.embed.preview = "";
                             $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
+                            $scope.model.embed.a11yInfo = $scope.model.embed.info;
                             $scope.model.embed.success = false;
                             $scope.model.embed.supportsDimensions = false;
                             vm.trustedPreview = null;
@@ -83,6 +88,8 @@
                             $scope.model.embed.success = true;
                             $scope.model.embed.supportsDimensions = response.data.SupportsDimensions;
                             $scope.model.embed.preview = response.data.Markup;
+                            $scope.model.embed.info = "";
+                            $scope.model.embed.a11yInfo = "Retrieved URL";
                             vm.trustedPreview = $sce.trustAsHtml(response.data.Markup);
                             break;
                     }
@@ -94,24 +101,28 @@
                     $scope.model.embed.supportsDimensions = false;
                     $scope.model.embed.preview = "";
                     $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
-
+                    $scope.model.embed.a11yInfo = $scope.model.embed.info;
                     vm.loading = false;
                 });
             } else {
                 $scope.model.embed.supportsDimensions = false;
                 $scope.model.embed.preview = "";
                 $scope.model.embed.info = "Please enter a URL";
+                $scope.model.embed.a11yInfo = $scope.model.embed.info;
             }
         }
 
        function changeSize(type) {
 
-           var width, height;
+           var width = parseInt($scope.model.embed.width, 10);
+           var height = parseInt($scope.model.embed.height, 10);
+           var originalWidth = parseInt($scope.model.embed.originalWidth, 10);
+           var originalHeight = parseInt($scope.model.embed.originalHeight, 10);
+           var resize = originalWidth !== width || originalHeight !== height;
 
            if ($scope.model.embed.constrain) {
-               width = parseInt($scope.model.embed.width, 10);
-               height = parseInt($scope.model.embed.height, 10);
-               if (type == 'width') {
+
+               if (type === 'width') {
                    origHeight = Math.round((width / origWidth) * height);
                    $scope.model.embed.height = origHeight;
                } else {
@@ -119,9 +130,12 @@
                    $scope.model.embed.width = origWidth;
                }
            }
-           if ($scope.model.embed.url !== "") {
+           $scope.model.embed.originalWidth = $scope.model.embed.width;
+           $scope.model.embed.originalHeight = $scope.model.embed.height;
+           if ($scope.model.embed.url !== "" && resize) {
                showPreview();
            }
+
        }
 
        function toggleConstrain() {
@@ -138,7 +152,7 @@
             if ($scope.model && $scope.model.close) {
                 $scope.model.close();
             }
-        }
+       }
 
         onInit();
    }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
index 19cf9b2278..fd86f55c07 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
@@ -15,7 +15,7 @@
                 <umb-box>
                     <umb-box-content>
 
-                        <umb-control-group label="@general_url">
+                        <umb-control-group label="@general_url" alias="url">
                             <input type="text" id="url" class="umb-property-editor input-block-level" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
                             <umb-button
                                 type="button"
@@ -30,21 +30,22 @@
                         <div ng-if="!vm.loading">
 
                             <umb-control-group>
-                                <p ng-bind="model.embed.info"></p>
+                                <p ng-bind="model.embed.info" aria-hidden="true"></p>
+                                <p ng-bind="model.embed.a11yInfo" class="sr-only" role="alert"></p>
                                 <div ng-bind-html="vm.trustedPreview"></div>
                             </umb-control-group>
                             
                             <div ng-show="model.embed.supportsDimensions && model.embed.success">
-                                <umb-control-group label="@general_width">
-                                    <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.width" ng-blur="vm.changeSize('width')" />
+                                <umb-control-group label="@general_width" alias="width">
+                                    <input type="number" id="width" pattern="[0-9]*" min="0" ng-model="model.embed.width" ng-blur="vm.changeSize('width')" />
                                 </umb-control-group>
                 
-                                <umb-control-group label="@general_height">
-                                    <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.height" ng-blur="vm.changeSize('height')" />
+                                <umb-control-group label="@general_height" alias="height">
+                                    <input type="number" id="height" pattern="[0-9]*" min="0" ng-model="model.embed.height" ng-blur="vm.changeSize('height')" />
                                 </umb-control-group>
                 
-                                <umb-control-group label="@general_constrain">
-                                    <umb-toggle checked="model.embed.constrain" on-click="vm.toggleConstrain()"></umb-toggle>
+                                <umb-control-group label="@general_constrain" alias="constrain">
+                                    <umb-toggle checked="model.embed.constrain" id="constrain"  on-click="vm.toggleConstrain()"></umb-toggle>
                                 </umb-control-group>
                             </div>
 

From 01e572b7420a9dd4e2c16d928bb3bc5beffd528f Mon Sep 17 00:00:00 2001
From: Malthe Petersen <malthebpet@gmail.com>
Date: Sun, 21 Feb 2021 16:51:03 +0100
Subject: [PATCH 058/202] Change access level for TreeChanged event in Media
 and ContentService (#9487)

---
 src/Umbraco.Core/Services/Changes/TreeChange.cs       | 2 +-
 src/Umbraco.Core/Services/Implement/ContentService.cs | 2 +-
 src/Umbraco.Core/Services/Implement/MediaService.cs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Services/Changes/TreeChange.cs b/src/Umbraco.Core/Services/Changes/TreeChange.cs
index 81c9b67c3f..605cde87a2 100644
--- a/src/Umbraco.Core/Services/Changes/TreeChange.cs
+++ b/src/Umbraco.Core/Services/Changes/TreeChange.cs
@@ -3,7 +3,7 @@ using System.Linq;
 
 namespace Umbraco.Core.Services.Changes
 {
-    internal class TreeChange<TItem>
+    public class TreeChange<TItem>
     {
         public TreeChange(TItem changedItem, TreeChangeTypes changeTypes)
         {
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index a809b83f23..8b1af5ca31 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -2606,7 +2606,7 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Occurs after change.
         /// </summary>
-        internal static event TypedEventHandler<IContentService, TreeChange<IContent>.EventArgs> TreeChanged;
+        public static event TypedEventHandler<IContentService, TreeChange<IContent>.EventArgs> TreeChanged;
 
         /// <summary>
         /// Occurs after a blueprint has been saved.
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index ac9c83458d..ec84c0738e 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -1279,7 +1279,7 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Occurs after change.
         /// </summary>
-        internal static event TypedEventHandler<IMediaService, TreeChange<IMedia>.EventArgs> TreeChanged;
+        public static event TypedEventHandler<IMediaService, TreeChange<IMedia>.EventArgs> TreeChanged;
 
         #endregion
 

From 033a245a21f64f55d27b96ad929056a887210211 Mon Sep 17 00:00:00 2001
From: vidyesh-phases <44634042+vidyesh-phases@users.noreply.github.com>
Date: Sun, 21 Feb 2021 21:22:43 +0530
Subject: [PATCH 059/202] Added UmbracoAuthorize attribute for
 BackOfficeController.ExternalLinkLoginCallback (#9500)

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

diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 92b67cbf1b..ff618ba0a6 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -351,6 +351,7 @@ namespace Umbraco.Web.Editors
             return RedirectToLocal(Url.Action("Default", "BackOffice"));
         }
 
+        [UmbracoAuthorize]
         [HttpGet]
         public async Task<ActionResult> ExternalLinkLoginCallback()
         {

From 6cc005315de28512de85a8794890c482e1fd66c7 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Sun, 21 Feb 2021 15:57:23 +0000
Subject: [PATCH 060/202] Unhelpful unsupported property message in Block
 Editor (#9525)

---
 .../src/views/propertyeditors/notsupported/notsupported.html   | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml                  | 3 +--
 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 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml                  | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml                  | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html
index a2fbb0e907..f052415a05 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html
@@ -1,3 +1,3 @@
 <div class="umb-property-editor umb-property-editor--notsupported">
-    <localize key="errors_errorPropertyEditorNotSupportedInElementTypes" tokens="[model.label, model.editor]"></localize>
+    <localize key="blockEditor_propertyEditorNotSupported" tokens="[model.label, model.editor]"></localize>
 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
index eacfcde1bf..a667f0d3c6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
@@ -676,7 +676,6 @@
         <key alias="errorMandatoryWithoutTab">%0% yn faes ofynnol</key>
         <key alias="errorRegExp">%0% yn %1% mewn fformat annilys</key>
         <key alias="errorRegExpWithoutTab">%0% mewn fformat annilys</key>
-        <key alias="errorPropertyEditorNotSupportedInElementTypes">Briodwedd '%0%' yn defnyddio'r golygydd '%1%' sydd ddim wedi ei chynnal yn y teipiau elfen.</key>
     </area>
     <area alias="errors">
         <key alias="receivedErrorFromServer">Derbynwyd gwall o'r gweinydd</key>
@@ -701,7 +700,6 @@
         <key alias="tableColMergeLeft">Symudwch y cyrchwr ar ochr chwith y ddwy gell yr ydych eisiau cyfuno</key>
         <key alias="tableSplitNotSplittable">Ni allwch hollti cell sydd heb ei gyfuno.</key>
         <key alias="propertyHasErrors">Mae gan briodwedd hon gwallau</key>
-        <key alias="errorPropertyEditorNotSupportedInElementTypes">Priodwedd '%0%' yn defnyddio'r golygydd '%1%' sydd ddim yn cael ei gefnogi mewn Mathau o Elfen.</key>
         <key alias="xsltErrorHeader">Gwall yn y ffynhonnell XSLT</key>
         <key alias="xsltErrorText">Nid yw'r XSLTwedi'i achub gan ei fod yn cynnwys gwall(au)</key>
         <key alias="missingPropertyEditorErrorMessage">Mae gwall ffurfwedd gyda'r math o ddata sy'n cael ei ddefnyddio ar gyfer y priodwedd yma, gwiriwch y fath o ddata</key>
@@ -2763,6 +2761,7 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang
         <key alias="blockHasChanges">Rydych chi wedi gwneud newidiadau i'r cynnwys hwn. Wyt ti'n siŵr eich bod chi am eu taflu ei fwrdd?</key>
         <key alias="confirmCancelBlockCreationHeadline">Gwaredu cread?</key>
         <key alias="confirmCancelBlockCreationMessage"><![CDATA[Ydych chi'n siŵr eich bod chi'n am ganslo'r cread?]]></key>
+        <key alias="propertyEditorNotSupported">Priodwedd '%0%' yn defnyddio'r golygydd '%1%' sydd ddim yn cael ei gefnogi mewn blociau.</key>
     </area>
     <area alias="contentTemplatesDashboard">
         <key alias="whatHeadline">Beth yw Templedi Gynnwys</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index e8de8e55aa..f2a35c4873 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -624,7 +624,6 @@
     <key alias="tableColMergeLeft">Du skal stå til venstre for de 2 celler du ønsker at samle!</key>
     <key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
     <key alias="propertyHasErrors">Denne egenskab er ugyldig</key>
-    <key alias="errorPropertyEditorNotSupportedInElementTypes">Feltet %0% bruger editor %1% som ikke er supporteret for ElementTyper.</key>
   </area>
   <area alias="general">
     <key alias="about">Om</key>
@@ -1879,6 +1878,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="confirmCancelBlockCreationMessage"><![CDATA[Er du sikker på at du vil annullere oprettelsen.]]></key>
     <key alias="elementTypeDoesNotExistHeadline">Error!</key>
     <key alias="elementTypeDoesNotExistDescription">The ElementType of this block does not exist anymore</key>
+    <key alias="propertyEditorNotSupported">Feltet %0% bruger editor %1% som ikke er supporteret for blokke.</key>
   </area>
     <area alias="contentTemplatesDashboard">
         <key alias="whatHeadline">Hvad er Indholdsskabeloner?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index c6a5ce4821..f6dc5ba8eb 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -636,7 +636,6 @@
     <key alias="errorMandatoryWithoutTab">%0% is a mandatory field</key>
     <key alias="errorRegExp">%0% at %1% is not in a correct format</key>
     <key alias="errorRegExpWithoutTab">%0% is not in a correct format</key>
-    <key alias="errorPropertyEditorNotSupportedInElementTypes">Property '%0%' uses editor '%1%' which is not supported in Element Types.</key>
   </area>
   <area alias="errors">
     <key alias="receivedErrorFromServer">Received an error from the server</key>
@@ -2526,6 +2525,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="confirmCancelBlockCreationMessage"><![CDATA[Are you sure you want to cancel the creation.]]></key>
     <key alias="elementTypeDoesNotExistHeadline">Error!</key>
     <key alias="elementTypeDoesNotExistDescription">The ElementType of this block does not exist anymore</key>
+    <key alias="propertyEditorNotSupported">Property '%0%' uses editor '%1%' which is not supported in blocks.</key>
   </area>
   <area alias="contentTemplatesDashboard">
     <key alias="whatHeadline">What are Content Templates?</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 ad5992a195..cc1bb5843a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -660,7 +660,6 @@
     <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
     <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
     <key alias="propertyHasErrors">This property is invalid</key>
-    <key alias="errorPropertyEditorNotSupportedInElementTypes">Property '%0%' uses editor '%1%' which is not supported in Element Types.</key>
   </area>
   <area alias="general">
     <key alias="options">Options</key>
@@ -2548,6 +2547,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="confirmCancelBlockCreationMessage"><![CDATA[Are you sure you want to cancel the creation.]]></key>
     <key alias="elementTypeDoesNotExistHeadline">Error!</key>
     <key alias="elementTypeDoesNotExistDescription">The ElementType of this block does not exist anymore</key>
+    <key alias="propertyEditorNotSupported">Property '%0%' uses editor '%1%' which is not supported in blocks.</key>
   </area>
   <area alias="contentTemplatesDashboard">
     <key alias="whatHeadline">What are Content Templates?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
index 11049a279c..2a24600a7c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -650,7 +650,6 @@
     <key alias="tableColMergeLeft">Plaats de cursor links van de twee cellen die je wilt samenvoegen</key>
     <key alias="tableSplitNotSplittable">Je kunt een cel die is samengevoegd niet delen</key>
     <key alias="propertyHasErrors">Deze eigenschap is ongeldig</key>
-    <key alias="errorPropertyEditorNotSupportedInElementTypes">Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in Element Types.</key>
   </area>
   <area alias="general">
     <key alias="options">Opties</key>
@@ -2362,6 +2361,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
       <key alias="confirmCancelBlockCreationMessage"><![CDATA[Ben je zeker dat je deze wijzigingen wil verwerpen?]]></key>
       <key alias="elementTypeDoesNotExistHeadline">Fout!</key>
       <key alias="elementTypeDoesNotExistDescription">Het Elementtype van dit blok bestaat niet meer</key>
+      <key alias="propertyEditorNotSupported">Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in blokken.</key>
     </area>
   <area alias="contentTemplatesDashboard">
     <key alias="whatHeadline">Wat zijn Inhoudssjablonen?</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
index fa0f909bfb..67fa7adcc4 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -631,7 +631,6 @@
     <key alias="errorMandatoryWithoutTab">%0% zorunlu bir alandır</key>
     <key alias="errorRegExp">%1% konumunda %0% doğru biçimde değil</key>
     <key alias="errorRegExpWithoutTab">%0% doğru biçimde değil</key>
-    <key alias="errorPropertyEditorNotSupportedInElementTypes">'%0%' özelliği, Öğe Türlerinde desteklenmeyen '%1%' düzenleyicisini kullanıyor.</key>
   </area>
   <area alias="errors">
     <key alias="receivedErrorFromServer">Sunucudan bir hata aldı</key>
@@ -2575,6 +2574,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
     <key alias="confirmCancelBlockCreationMessage"><![CDATA[Oluşturmayı iptal etmek istediğinizden emin misiniz.]]></key>
     <key alias="elementTypeDoesNotExistHeadline">Hata!</key>
     <key alias="elementTypeDoesNotExistDescription">Bu bloğun ElementType'ı artık mevcut değil</key>
+    <key alias="propertyEditorNotSupported">'%0%' özelliği, bloklarda desteklenmeyen '%1%' düzenleyicisini kullanıyor.</key>
   </area>
   <area alias="contentTemplatesDashboard">
     <key alias="whatHeadline">İçerik Şablonları Nedir?</key>

From 1235520325e8cbc4c314a357fddb3f21b1026eff Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Sun, 21 Feb 2021 16:01:49 +0000
Subject: [PATCH 061/202] Fix consistency in translation files for the term
 backoffice, Umbraco and several entity types (#9526)

---
 src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 27 +++---
 src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml |  3 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |  6 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/de.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 91 +++++++++---------
 .../Umbraco/config/lang/en_us.xml             | 93 +++++++++----------
 src/Umbraco.Web.UI/Umbraco/config/lang/es.xml |  5 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml |  5 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/he.xml |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/it.xml |  5 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml |  2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml |  3 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml |  5 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml |  1 -
 src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml |  5 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml |  3 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml |  1 -
 .../Umbraco/config/lang/zh_tw.xml             |  1 -
 20 files changed, 122 insertions(+), 139 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index 2375ebaf6d..61c4abcade 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -373,7 +373,7 @@
   <area alias="dashboard">
     <key alias="browser">Prohlédnout svůj web</key>
     <key alias="dontShowAgain">- Skrýt</key>
-    <key alias="nothinghappens">Jestli se umbraco neotevírá, možná budete muset povolit na tomto webu vyskakovací okna</key>
+    <key alias="nothinghappens">Jestli se Umbraco neotevírá, možná budete muset povolit na tomto webu vyskakovací okna</key>
     <key alias="openinnew">byl otevřený v novém okně</key>
     <key alias="restart">Restart</key>
     <key alias="visit">Navštívit</key>
@@ -837,29 +837,29 @@
     <key alias="defaultUserPassChanged"><![CDATA[<strong>Heslo výchozího uživatele bylo úspěšně změněno od doby instalace!</strong></p><p>Netřeba nic dalšího dělat. Klikněte na <b>Následující</b> pro pokračování.]]></key>
     <key alias="defaultUserPasswordChanged">Heslo je změněno!</key>
     <key alias="greatStart">Mějte skvělý start, sledujte naše uváděcí videa</key>
-    <key alias="licenseText">Kliknutím na tlačítko následující (nebo modifikováním umbracoConfigurationStatus v souboru web.config) přijímáte licenci tohoto software tak, jak je uvedena v poli níže. Upozorňujeme, že tato distribuce Umbraca se skládá ze dvou různých licencí, open source MIT licence pro framework a umbraco freeware licence, která pokrývá UI.</key>
+    <key alias="licenseText">Kliknutím na tlačítko následující (nebo modifikováním umbracoConfigurationStatus v souboru web.config) přijímáte licenci tohoto software tak, jak je uvedena v poli níže. Upozorňujeme, že tato distribuce Umbraca se skládá ze dvou různých licencí, open source MIT licence pro framework a Umbraco freeware licence, která pokrývá UI.</key>
     <key alias="None">Není nainstalováno.</key>
     <key alias="permissionsAffectedFolders">Dotčené soubory a složky</key>
-    <key alias="permissionsAffectedFoldersMoreInfo">Další informace o nastavování oprávnění pro umbraco zde</key>
+    <key alias="permissionsAffectedFoldersMoreInfo">Další informace o nastavování oprávnění pro Umbraco zde</key>
     <key alias="permissionsAffectedFoldersText">Musíte udělit ASP.NET oprávnění měnit následující soubory/složky</key>
     <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Vaše nastavení oprávnění je téměř dokonalé!</strong><br /><br />
-        Můžete provozovat umbraco bez potíží, ale nebudete smět instalovat balíčky, které jsou doporučené pro plné využívání všech možností umbraca.]]></key>
+        Můžete provozovat Umbraco bez potíží, ale nebudete smět instalovat balíčky, které jsou doporučené pro plné využívání všech možností umbraca.]]></key>
     <key alias="permissionsHowtoResolve">Jak to vyřešit</key>
     <key alias="permissionsHowtoResolveLink">Klikněte zde, chcete-li číst textovou verzi</key>
     <key alias="permissionsHowtoResolveText"><![CDATA[Shlédněte naše <strong>výukové video</strong> o nastavovaní oprávnění pro složky umbraca, nebo si přečtěte textovou verzi.]]></key>
     <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Vaše nastavení oprávnění může být problém!</strong>
       <br/><br />
-      Můžete provozovat umbraco bez potíží, ale nebudete smět vytvářet složky a instalovat balíčky, které jsou doporučené pro plné využívání všech možností umbraca.]]></key>
+      Můžete provozovat Umbraco bez potíží, ale nebudete smět vytvářet složky a instalovat balíčky, které jsou doporučené pro plné využívání všech možností umbraca.]]></key>
     <key alias="permissionsNotReady"><![CDATA[<strong>Vaše nastavení oprívnění není připraveno pro umbraco!</strong>
           <br /><br />
-          Abyste mohli umbraco provozovat, budete muset aktualizovat Vaše nastavení oprávnění.]]></key>
+          Abyste mohli Umbraco provozovat, budete muset aktualizovat Vaše nastavení oprávnění.]]></key>
     <key alias="permissionsPerfect"><![CDATA[<strong>Vaše nastavení oprávnění je dokonalé!</strong><br /><br />
-              Jste připraveni provozovat umbraco a instalovat balíčky!]]></key>
+              Jste připraveni provozovat Umbraco a instalovat balíčky!]]></key>
     <key alias="permissionsResolveFolderIssues">Řešení potíží se složkami</key>
     <key alias="permissionsResolveFolderIssuesLink">Následujte tento odkaz pro další informace o potížích s ASP.NET a vytvářením složek.</key>
     <key alias="permissionsSettingUpPermissions">Nastavování oprávnění pro složky</key>
     <key alias="permissionsText"><![CDATA[
-      umbraco potřebuje oprávnění pro zápis/změnu k některým složkám, aby mohlo ukládat soubory jako například obrázky a PDF.
+      Umbraco potřebuje oprávnění pro zápis/změnu k některým složkám, aby mohlo ukládat soubory jako například obrázky a PDF.
       Také ukládá dočasná data (čili mezipaměť) pro zvýšení výkonu Vašeho webu.
     ]]></key>
     <key alias="runwayFromScratch">Chci začít od nuly</key>
@@ -898,7 +898,7 @@
     Abyste získali pomoc od naší oceňované komunity, projděte si dokumentaci, nebo si pusťte některá videa zdarma o tom, jak vytvořit jednoduchý web, jak používat balíčky a rychlý úvod do terminologie umbraca]]></key>
     <key alias="theEndHeader">Umbraco %0% je nainstalováno a připraveno k použití</key>
     <key alias="theEndInstallFailed"><![CDATA[Pro dokončení instalace budete muset ručně změnit <strong>soubor /web.config</strong> a upravit klíč AppSetting <strong>umbracoConfigurationStatus</strong> dole na hodnotu <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[Můžete <strong>ihned začít</strong> kliknutím na tlačítko "Spustit Umbraco" níže. <br />Jestliže <strong>je pro Vás umbraco nové</strong>,
+    <key alias="theEndInstallSuccess"><![CDATA[Můžete <strong>ihned začít</strong> kliknutím na tlačítko "Spustit Umbraco" níže. <br />Jestliže <strong>je pro Vás Umbraco nové</strong>,
     spoustu zdrojů naleznete na naších stránkách "začínáme".]]></key>
     <key alias="theEndOpenUmbraco"><![CDATA[<h3>Spustit Umbraco</h3>
     Chcete-li spravovat Váš web, jednoduše přejděte do administrace umbraca a začněte přidávat obsah, upravovat šablony a stylopisy, nebo přidávat nové funkce]]></key>
@@ -980,7 +980,7 @@
 															Vyžadováno resetování hesla
 														</h1>
 														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Vaše uživatelské jméno pro přihlášení do back-office Umbraco je: <strong>%0%</strong>
+															Vaše uživatelské jméno pro přihlášení do backoffice Umbraco je: <strong>%0%</strong>
 														</p>
 														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
 															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
@@ -1055,7 +1055,7 @@
 
       Mějte hezký den!
 
-      Zdraví umbraco robot
+      Zdraví Umbraco robot
     ]]></key>
     <key alias="mailBodyVariantSummary">Následující jazyky byly změněny %0%</key>
     <key alias="mailBodyHtml"><![CDATA[<p>Ahoj %0%</p>
@@ -1083,7 +1083,7 @@
 		  </div>
 
 		  <p>Mějte hezký den!<br /><br />
-			  Zdraví umbraco robot
+			  Zdraví Umbraco robot
 		  </p>]]></key>
     <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>Byly změněny následující jazyky:</p>
         %0%
@@ -1097,7 +1097,7 @@
     <key alias="createPackage">Vytvořit balíček</key>
     <key alias="chooseLocalPackageText"><![CDATA[
       Vyberte balíček ve svém počítači kliknutím na tlačítko Procházet<br />
-         a výběrem balíčku. Balíčky umbraco mají obvykle přípony ".umb" nebo ".zip".
+         a výběrem balíčku. Balíčky Umbraco mají obvykle přípony ".umb" nebo ".zip".
       ]]></key>
     <key alias="deletewarning">Tím se balíček odstraní</key>
     <key alias="dropHere">Přetáhněte sem pro nahrání</key>
@@ -1328,7 +1328,6 @@
     <key alias="tabs">Záložky</key>
     <key alias="contentTypeEnabled">Nadřazený typ obsahu povolen</key>
     <key alias="contentTypeUses">Tento typ obsahu používá</key>
-    <key alias="asAContentMasterType">jako nadřazený typ obsahu. Záložky z nadřazených typů obsahu nejsou zobrazeny a mohou byt editovány pouze na nadřazených typech obsahu samotných</key>
     <key alias="noPropertiesDefinedOnTab">Na této záložce nejsou definovány žádné vlastnosti. Pro vytvoření nové vlastnosti klikněte na odkaz "přidat novou vlastnost" nahoře.</key>
     <key alias="createMatchingTemplate">Vytvořit odpovídající šablonu</key>
     <key alias="addIcon">Přidat ikonu</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
index a667f0d3c6..0b00cfd423 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
@@ -589,7 +589,7 @@
         <key alias="toolsDescription">Offer i reoli'r mynegai</key>
         <key alias="fields">meysydd</key>
         <key alias="indexCannotRead">Ni ellir darllen yr mynegai a bydd angen ei ailadeiladu</key>
-        <key alias="processIsTakingLonger">Mae'r broses yn cymryd mwy o amser na'r disgwyl, gwiriwch y log umbraco i weld os mae wedi bod unrhyw wall yn ystod y gweithrediad hwn</key>
+        <key alias="processIsTakingLonger">Mae'r broses yn cymryd mwy o amser na'r disgwyl, gwiriwch y log Umbraco i weld os mae wedi bod unrhyw wall yn ystod y gweithrediad hwn</key>
         <key alias="indexCannotRebuild">Ni ellir ailadeiladu'r mynegai hwn oherwydd nad yw wedi'i aseinio</key>
         <key alias="iIndexPopulator">IIndexPopulator</key>
     </area>
@@ -1564,7 +1564,6 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang
         <key alias="tabs">Tabiau</key>
         <key alias="contentTypeEnabled">Math o Gynnwys Meistr wedi'i alluogi</key>
         <key alias="contentTypeUses">Mae'r Math o Gynnwys yma yn defnyddio</key>
-        <key alias="asAContentMasterType">fel Math o Gynnwys Meistr. Nid yw tabiau o Fath o Gynnwys Meistr yn cael eu dangos a gall dim ond eu golygu ar y Math o Gynnwys Meistr ei hunan</key>
         <key alias="noPropertiesDefinedOnTab">Dim priodweddau wedi'u diffinio ar y tab yma. Cliciwch ar y ddolen "ychwanegu priodwedd newydd" ar y topi greu priodwedd newydd.</key>
         <key alias="masterDocumentType">Math o Ddogfen Feistr</key>
         <key alias="createMatchingTemplate">Creu templedi cydweddol</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index f2a35c4873..309b05ccf3 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -949,7 +949,7 @@ Mange hilsner fra Umbraco robotten
     <p>Dette er en automatisk mail for at informere dig om at opgaven <strong>'%1%'</strong>
     er blevet udførtpå siden <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> af brugeren <strong>'%3%'</strong> </p>
     <div style="margin: 8px 0; padding: 8px; display: block;"> <br />
-    <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]></key>
+    <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra Umbraco robotten </p>]]></key>
     <key alias="mailSubject">[%0%] Notificering om %1% udført på %2%</key>
     <key alias="notifications">Notificeringer</key>
   </area>
@@ -1589,7 +1589,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="noLockouts">er ikke blevet låst ude</key>
     <key alias="noPasswordChange">Kodeordet er ikke blevet ændret</key>
     <key alias="confirmNewPassword">Gentag dit nye kodeord</key>
-    <key alias="changePasswordDescription">Du kan ændre dit kodeord, som giver dig adgang til Umbraco Back Office ved at udfylde formularen og klikke på knappen 'Skift dit kodeord'</key>
+    <key alias="changePasswordDescription">Du kan ændre dit kodeord, som giver dig adgang til Umbraco backoffice ved at udfylde formularen og klikke på knappen 'Skift dit kodeord'</key>
     <key alias="contentChannel">Indholdskanal</key>
     <key alias="createAnotherUser">Opret endnu en bruger</key>
     <key alias="createUserHelp">Opret nye brugere for at give dem adgang til Umbraco. Når en ny bruger oprettes, genereres der en adgangskode, som du kan dele med brugeren.</key>
@@ -1856,7 +1856,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="labelLabelTemplate">Label</key>
     <key alias="labelCustomView">Speciel visning</key>
     <key alias="labelCustomViewInfoTitle">Vis speciel visning beskrivelsen</key>
-    <key alias="labelCustomViewDescription">Overskrift hvordan denne block præsenteres i BackOffice interfacet. Vælg en .html fil der indeholder din præsensation.</key>
+    <key alias="labelCustomViewDescription">Overskrift hvordan denne block præsenteres i backoffice interfacet. Vælg en .html fil der indeholder din præsensation.</key>
     <key alias="labelSettingsElementType">Indstillings model</key>
     <key alias="labelEditorSize">Rederings lagets størrelse</key>
     <key alias="addCustomView">Tilføj speciel visning</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
index 4f1c4c977f..b8c115c460 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
@@ -1388,7 +1388,6 @@
     <key alias="tabs">Registerkarten</key>
     <key alias="contentTypeEnabled">Masterdokumenttyp aktiviert</key>
     <key alias="contentTypeUses">Dieser Dokumenttyp verwendet</key>
-    <key alias="asAContentMasterType">als Masterdokumenttyp. Register vom Masterdokumenttyp werden nicht angezeigt und können nur im Masterdokumenttyp selbst bearbeitet werden</key>
     <key alias="noPropertiesDefinedOnTab">Für dieses Register sind keine Eigenschaften definiert. Klicken Sie oben auf "neue Eigenschaft hinzufügen", um eine neue Eigenschaft hinzuzufügen.</key>
     <key alias="createMatchingTemplate">Zugehörige Vorlage anlegen</key>
     <key alias="addIcon">Bildsymbol hinzufügen</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index f6dc5ba8eb..dacb04d597 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -66,7 +66,7 @@
     <key alias="assignDomain">Allow access to assign culture and hostnames</key>
     <key alias="auditTrail">Allow access to view a node's history log</key>
     <key alias="browse">Allow access to view a node</key>
-    <key alias="changeDocType">Allow access to change document type for a node</key>
+    <key alias="changeDocType">Allow access to change Document Type for a node</key>
     <key alias="copy">Allow access to copy a node</key>
     <key alias="create">Allow access to create nodes</key>
     <key alias="delete">Allow access to delete nodes</key>
@@ -190,12 +190,12 @@
     <key alias="historyIncludingVariants">History (all variants)</key>
   </area>
   <area alias="changeDocType">
-    <key alias="changeDocTypeInstruction">To change the document type for the selected content, first select from the list of valid types for this location.</key>
+    <key alias="changeDocTypeInstruction">To change the Document Type for the selected content, first select from the list of valid types for this location.</key>
     <key alias="changeDocTypeInstruction2">Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.</key>
     <key alias="contentRepublished">The content has been re-published.</key>
     <key alias="currentProperty">Current Property</key>
     <key alias="currentType">Current type</key>
-    <key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location.  An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
+    <key alias="docTypeCannotBeChanged">The Document Type cannot be changed, as there are no alternatives valid for this location.  An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
     <key alias="docTypeChanged">Document Type Changed</key>
     <key alias="mapProperties">Map Properties</key>
     <key alias="mapToProperty">Map to Property</key>
@@ -204,7 +204,7 @@
     <key alias="none">none</key>
     <key alias="selectedContent">Content</key>
     <key alias="selectNewDocType">Select New Document Type</key>
-    <key alias="successMessage">The document type of the selected content has been successfully changed to [new type] and the following properties mapped:</key>
+    <key alias="successMessage">The Document Type of the selected content has been successfully changed to [new type] and the following properties mapped:</key>
     <key alias="to">to</key>
     <key alias="validationErrorPropertyWithMoreThanOneMapping">Could not complete property mapping as one or more properties have more than one mapping defined.</key>
     <key alias="validDocTypesNote">Only alternate types valid for the current location are displayed.</key>
@@ -287,10 +287,10 @@
     <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
     <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
     <key alias="nestedContentDeleteAllItems">Are you sure you want to delete all items?</key>
-    <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
-    <key alias="nestedContentAddElementType">Add element type</key>
-    <key alias="nestedContentSelectElementTypeModalTitle">Select element type</key>
-    <key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</key>
+    <key alias="nestedContentNoContentTypes">No Content Types are configured for this property.</key>
+    <key alias="nestedContentAddElementType">Add Element Type</key>
+    <key alias="nestedContentSelectElementTypeModalTitle">Select Element Type</key>
+    <key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the Element Type will be used.</key>
     <key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
     <key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
     <key alias="addTextBox">Add another text box</key>
@@ -358,18 +358,18 @@
   <area alias="create">
     <key alias="chooseNode">Where do you want to create the new %0%</key>
     <key alias="createUnder">Create an item under</key>
-    <key alias="createContentBlueprint">Select the document type you want to make a content template for</key>
+    <key alias="createContentBlueprint">Select the Document Type you want to make a content template for</key>
     <key alias="enterFolderName">Enter a folder name</key>
     <key alias="updateData">Choose a type and a title</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
-    <key alias="noDocumentTypesAtRoot"><![CDATA[There are no document types available for creating content here. You must create these in <strong>Document Types</strong> within the <strong>Settings</strong> section.]]></key>
+    <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed Document Types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
+    <key alias="noDocumentTypesAtRoot"><![CDATA[There are no Document Types available for creating content here. You must create these in <strong>Document Types</strong> within the <strong>Settings</strong> section.]]></key>
     <key alias="noDocumentTypesWithNoSettingsAccess">The selected page in the content tree doesn't allow for any pages to be created below it.</key>
-    <key alias="noDocumentTypesEditPermissions">Edit permissions for this document type</key>
-    <key alias="noDocumentTypesCreateNew">Create a new document type</key>
-    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by changing the <strong>Allow as root</strong> option under <strong>Permissions</strong>.]]></key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
+    <key alias="noDocumentTypesEditPermissions">Edit permissions for this Document Type</key>
+    <key alias="noDocumentTypesCreateNew">Create a new Document Type</key>
+    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[There are no allowed Document Types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by changing the <strong>Allow as root</strong> option under <strong>Permissions</strong>.]]></key>
+    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed Media Types available for creating media here. You must enable these in <strong>Media Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
     <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
-    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
+    <key alias="noMediaTypesEditPermissions">Edit permissions for this Media Types</key>
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
     <key alias="documentTypeWithTemplate">Document Type with Template</key>
     <key alias="documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</key>
@@ -382,7 +382,7 @@
     <key alias="folder">Folder</key>
     <key alias="folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</key>
     <key alias="newFolder">New folder</key>
-    <key alias="newDataType">New data type</key>
+    <key alias="newDataType">New Data Type</key>
     <key alias="newJavascriptFile">New JavaScript file</key>
     <key alias="newEmptyPartialView">New empty partial view</key>
     <key alias="newPartialViewMacro">New partial view macro</key>
@@ -566,7 +566,7 @@
     <key alias="toolsDescription">Tools to manage the index</key>
     <key alias="fields">fields</key>
     <key alias="indexCannotRead">The index cannot be read and will need to be rebuilt</key>
-    <key alias="processIsTakingLonger">The process is taking longer than expected, check the umbraco log to see if there have been any errors during this operation</key>
+    <key alias="processIsTakingLonger">The process is taking longer than expected, check the Umbraco log to see if there have been any errors during this operation</key>
     <key alias="indexCannotRebuild">This index cannot be rebuilt because it has no assigned</key>
     <key alias="iIndexPopulator">IIndexPopulator</key>
   </area>
@@ -597,7 +597,7 @@
   <area alias="editcontenttype">
     <key alias="createListView" version="7.2">Create custom list view</key>
     <key alias="removeListView" version="7.2">Remove custom list view</key>
-    <key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
+    <key alias="aliasAlreadyExists">A Content Type, Media Type or Member Type with this alias already exists</key>
   </area>
   <area alias="renamecontainer">
     <key alias="renamed">Renamed</key>
@@ -617,9 +617,9 @@
     <key alias="rteShowLabel">Show label</key>
     <key alias="rteWidthAndHeight">Width and height</key>
     <key alias="allPropTypes">All property types &amp; property data</key>
-    <key alias="willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="willBeDeleted">using this Data Type will be deleted permanently, please confirm you want to delete these as well</key>
     <key alias="yesDelete">Yes, delete</key>
-    <key alias="andAllRelated">and all property types &amp; property data using this data type</key>
+    <key alias="andAllRelated">and all property types &amp; property data using this Data Type</key>
     <key alias="selectFolder">Select the folder to move</key>
     <key alias="inTheTree">to in the tree structure below</key>
     <key alias="wasMoved">was moved underneath</key>
@@ -908,7 +908,7 @@
     ]]></key>
     <key alias="runwayFromScratch">I want to start from scratch</key>
     <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
+        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own Document Types and templates.
         (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
         You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
       ]]></key>
@@ -922,7 +922,7 @@
     <key alias="runwaySimpleSite">I want to start with a simple website</key>
     <key alias="runwaySimpleSiteText"><![CDATA[
       <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+      "Runway" is a simple website providing some basic Document Types and templates. The installer can set up Runway for you automatically,
         but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
         Runway offers an easy foundation based on best practices to get you started faster than ever.
         If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
@@ -949,7 +949,7 @@ Get help from our award winning community, browse the documentation or watch som
     <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
 you can find plenty of resources on our getting started pages.]]></key>
     <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
-To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
+To manage your website, simply open the Umbraco backoffice and start adding content, updating the templates and stylesheets or add new functionality]]></key>
     <key alias="Unavailable">Connection to database failed.</key>
     <key alias="Version3">Umbraco Version 3</key>
     <key alias="Version4">Umbraco Version 4</key>
@@ -1028,7 +1028,7 @@ To manage your website, simply open the Umbraco back office and start adding con
 															Password reset requested
 														</h1>
 														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
+															Your username to login to the Umbraco backoffice is: <strong>%0%</strong>
 														</p>
 														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
 															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
@@ -1399,7 +1399,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   </area>
   <area alias="settings">
     <key alias="defaulttemplate">Default template</key>
-    <key alias="importDocumentTypeHelp">To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
+    <key alias="importDocumentTypeHelp">To import a Document Type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
     <key alias="newtabname">New Tab Title</key>
     <key alias="nodetype">Node type</key>
     <key alias="objecttype">Type</key>
@@ -1410,7 +1410,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="tabs">Tabs</key>
     <key alias="contentTypeEnabled">Master Content Type enabled</key>
     <key alias="contentTypeUses">This Content Type uses</key>
-    <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
     <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
     <key alias="createMatchingTemplate">Create matching template</key>
     <key alias="addIcon">Add icon</key>
@@ -1496,8 +1495,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="deleteUserSuccess">User %0% was deleted</key>
     <key alias="resendInviteHeader">Invite user</key>
     <key alias="resendInviteSuccess">Invitation has been re-sent to %0%</key>
-    <key alias="documentTypeExportedSuccess">Document type was exported to file</key>
-    <key alias="documentTypeExportedError">An error occurred while exporting the document type</key>
+    <key alias="documentTypeExportedSuccess">Document Type was exported to file</key>
+    <key alias="documentTypeExportedError">An error occurred while exporting the Document Type</key>
   </area>
   <area alias="stylesheet">
     <key alias="addRule">Add style</key>
@@ -1658,10 +1657,10 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="childNodesHeading">Allowed child node types</key>
     <key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type.</key>
     <key alias="chooseChildNode">Choose child node</key>
-    <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
-    <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
-    <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
-    <key alias="compositionRemoveWarning">Removing a composition will delete all the associated property data. Once you save the document type there's no way back.</key>
+    <key alias="compositionsDescription">Inherit tabs and properties from an existing Document Type. New tabs will be added to the current Document Type or merged if a tab with an identical name exists.</key>
+    <key alias="compositionInUse">This Content Type is used in a composition, and therefore cannot be composed itself.</key>
+    <key alias="noAvailableCompositions">There are no Content Types available to use as a composition.</key>
+    <key alias="compositionRemoveWarning">Removing a composition will delete all the associated property data. Once you save the Document Type there's no way back.</key>
     <key alias="availableEditors">Create new</key>
     <key alias="reuse">Use existing</key>
     <key alias="editorSettings">Editor settings</key>
@@ -1672,12 +1671,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="folderToMove">Select the folder to move</key>
     <key alias="folderToCopy">Select the folder to copy</key>
     <key alias="structureBelow">to in the tree structure below</key>
-    <key alias="allDocumentTypes">All Document types</key>
+    <key alias="allDocumentTypes">All Document Types</key>
     <key alias="allDocuments">All Documents</key>
     <key alias="allMediaItems">All media items</key>
-    <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
-    <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
-    <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="usingThisDocument">using this Document Type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMedia">using this Media Type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMember">using this Member Type will be deleted permanently, please confirm you want to delete these as well</key>
     <key alias="andAllDocuments">and all documents using this type</key>
     <key alias="andAllMediaItems">and all media items using this type</key>
     <key alias="andAllMembers">and all members using this type</key>
@@ -1700,11 +1699,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="segmentVariantDescription">Allow editors to create segments of this content.</key>
     <key alias="allowVaryByCulture">Allow varying by culture</key>
     <key alias="allowVaryBySegment">Allow segmentation</key>
-    <key alias="elementType">Element type</key>
-    <key alias="elementHeading">Is an Element type</key>
-    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree.</key>
-    <key alias="elementCannotToggle">A document type cannot be changed to an Element type once it has been used to create one or more content items.</key>
-    <key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
+    <key alias="elementType">Element Type</key>
+    <key alias="elementHeading">Is an Element Type</key>
+    <key alias="elementDescription">An Element Type is meant to be used for instance in Nested Content, and not in the tree.</key>
+    <key alias="elementCannotToggle">A document Type cannot be changed to an Element Type once it has been used to create one or more content items.</key>
+    <key alias="elementDoesNotSupport">This is not applicable for an Element Type</key>
     <key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
     <key alias="displaySettingsHeadline">Appearance</key>
     <key alias="displaySettingsLabelOnTop">Label above (full-width)</key>
@@ -1867,7 +1866,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="noLockouts">hasn't been locked out</key>
     <key alias="noPasswordChange">The password hasn't been changed</key>
     <key alias="confirmNewPassword">Confirm new password</key>
-    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
+    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco backoffice by filling out the form below and click the 'Change Password' button</key>
     <key alias="contentChannel">Content Channel</key>
     <key alias="createAnotherUser">Create another user</key>
     <key alias="createUserHelp">Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user.</key>
@@ -2233,7 +2232,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="created">Created</key>
     <key alias="comment">Comment</key>
     <key alias="name">Name</key>
-    <key alias="noRelations">No relations for this relation type.</key>
+    <key alias="noRelations">No relations for this Relation Type</key>
     <key alias="tabRelationType">Relation Type</key>
     <key alias="tabRelations">Relations</key>
   </area>
@@ -2277,7 +2276,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="newPartialView">Partial View</key>
     <key alias="newPartialViewMacro">Partial View Macro</key>
     <key alias="newMember">Member</key>
-    <key alias="newDataType">Data type</key>
+    <key alias="newDataType">Data Type</key>
     <key alias="redirectDashboardSearchLabel">Search the redirect dashboard</key>
     <key alias="userGroupSearchLabel">Search the user group section</key>
     <key alias="userSearchLabel">Search the users section</key>
@@ -2503,7 +2502,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="labelLabelTemplate">Label</key>
     <key alias="labelCustomView">Custom view</key>
     <key alias="labelCustomViewInfoTitle">Show custom view description</key>
-    <key alias="labelCustomViewDescription">Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation.</key>
+    <key alias="labelCustomViewDescription">Overwrite how this block appears in the backoffice UI. Pick a .html file containing your presentation.</key>
     <key alias="labelSettingsElementType">Settings model</key>
     <key alias="labelEditorSize">Overlay editor size</key>
     <key alias="addCustomView">Add custom view</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 cc1bb5843a..d04b1f96a6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -67,7 +67,7 @@
     <key alias="assignDomain">Allow access to assign culture and hostnames</key>
     <key alias="auditTrail">Allow access to view a node's history log</key>
     <key alias="browse">Allow access to view a node</key>
-    <key alias="changeDocType">Allow access to change document type for a node</key>
+    <key alias="changeDocType">Allow access to change Document Type for a node</key>
     <key alias="copy">Allow access to copy a node</key>
     <key alias="create">Allow access to create nodes</key>
     <key alias="delete">Allow access to delete nodes</key>
@@ -193,12 +193,12 @@
     <key alias="historyIncludingVariants">History (all variants)</key>
   </area>
   <area alias="changeDocType">
-    <key alias="changeDocTypeInstruction">To change the document type for the selected content, first select from the list of valid types for this location.</key>
+    <key alias="changeDocTypeInstruction">To change the Document Type for the selected content, first select from the list of valid types for this location.</key>
     <key alias="changeDocTypeInstruction2">Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.</key>
     <key alias="contentRepublished">The content has been re-published.</key>
     <key alias="currentProperty">Current Property</key>
     <key alias="currentType">Current type</key>
-    <key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location.  An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
+    <key alias="docTypeCannotBeChanged">The Document Type cannot be changed, as there are no alternatives valid for this location.  An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
     <key alias="docTypeChanged">Document Type Changed</key>
     <key alias="mapProperties">Map Properties</key>
     <key alias="mapToProperty">Map to Property</key>
@@ -207,7 +207,7 @@
     <key alias="none">none</key>
     <key alias="selectedContent">Content</key>
     <key alias="selectNewDocType">Select New Document Type</key>
-    <key alias="successMessage">The document type of the selected content has been successfully changed to [new type] and the following properties mapped:</key>
+    <key alias="successMessage">The Document Type of the selected content has been successfully changed to [new type] and the following properties mapped:</key>
     <key alias="to">to</key>
     <key alias="validationErrorPropertyWithMoreThanOneMapping">Could not complete property mapping as one or more properties have more than one mapping defined.</key>
     <key alias="validDocTypesNote">Only alternate types valid for the current location are displayed.</key>
@@ -292,10 +292,10 @@
     <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
     <key alias="nestedContentDeleteAllItems">Are you sure you want to delete all items?</key>
     <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
-    <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
-    <key alias="nestedContentAddElementType">Add element type</key>
-    <key alias="nestedContentSelectElementTypeModalTitle">Select element type</key>
-    <key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</key>
+    <key alias="nestedContentNoContentTypes">No Content Types are configured for this property.</key>
+    <key alias="nestedContentAddElementType">Add Element Type</key>
+    <key alias="nestedContentSelectElementTypeModalTitle">Select Element Type</key>
+    <key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the Element Type will be used.</key>
     <key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
     <key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
     <key alias="addTextBox">Add another text box</key>
@@ -365,18 +365,18 @@
   <area alias="create">
     <key alias="chooseNode">Where do you want to create the new %0%</key>
     <key alias="createUnder">Create an item under</key>
-    <key alias="createContentBlueprint">Select the document type you want to make a content template for</key>
+    <key alias="createContentBlueprint">Select the Document Type you want to make a content template for</key>
     <key alias="enterFolderName">Enter a folder name</key>
     <key alias="updateData">Choose a type and a title</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
-    <key alias="noDocumentTypesAtRoot"><![CDATA[There are no document types available for creating content here. You must create these in <strong>Document Types</strong> within the <strong>Settings</strong> section.]]></key>
+    <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed Document Types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
+    <key alias="noDocumentTypesAtRoot"><![CDATA[There are no Document Types available for creating content here. You must create these in <strong>Document Types</strong> within the <strong>Settings</strong> section.]]></key>
     <key alias="noDocumentTypesWithNoSettingsAccess">The selected page in the content tree doesn't allow for any pages to be created below it.</key>
-    <key alias="noDocumentTypesEditPermissions">Edit permissions for this document type</key>
-    <key alias="noDocumentTypesCreateNew">Create a new document type</key>
-    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by changing the <strong>Allow as root</strong> option under <strong>Permissions</strong>.]]></key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
+    <key alias="noDocumentTypesEditPermissions">Edit permissions for this Document Type</key>
+    <key alias="noDocumentTypesCreateNew">Create a new Document Type</key>
+    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[There are no allowed Document Types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by changing the <strong>Allow as root</strong> option under <strong>Permissions</strong>.]]></key>
+    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed Media Types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
     <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
-    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
+    <key alias="noMediaTypesEditPermissions">Edit permissions for this Media Type</key>
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
     <key alias="documentTypeWithTemplate">Document Type with Template</key>
     <key alias="documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</key>
@@ -389,7 +389,7 @@
     <key alias="folder">Folder</key>
     <key alias="folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</key>
     <key alias="newFolder">New folder</key>
-    <key alias="newDataType">New data type</key>
+    <key alias="newDataType">New Data Type</key>
     <key alias="newJavascriptFile">New JavaScript file</key>
     <key alias="newEmptyPartialView">New empty partial view</key>
     <key alias="newPartialViewMacro">New partial view macro</key>
@@ -572,7 +572,7 @@
     <key alias="toolsDescription">Tools to manage the index</key>
     <key alias="fields">fields</key>
     <key alias="indexCannotRead">The index cannot be read and will need to be rebuilt</key>
-    <key alias="processIsTakingLonger">The process is taking longer than expected, check the umbraco log to see if there have been any errors during this operation</key>
+    <key alias="processIsTakingLonger">The process is taking longer than expected, check the Umbraco log to see if there have been any errors during this operation</key>
     <key alias="indexCannotRebuild">This index cannot be rebuilt because it has no assigned</key>
     <key alias="iIndexPopulator">IIndexPopulator</key>
   </area>
@@ -602,7 +602,7 @@
   <area alias="editcontenttype">
     <key alias="createListView" version="7.2">Create custom list view</key>
     <key alias="removeListView" version="7.2">Remove custom list view</key>
-    <key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
+    <key alias="aliasAlreadyExists">A Content Type, Media Type or Member Type with this alias already exists</key>
   </area>
   <area alias="renamecontainer">
     <key alias="renamed">Renamed</key>
@@ -622,9 +622,9 @@
     <key alias="rteShowLabel">Show label</key>
     <key alias="rteWidthAndHeight">Width and height</key>
     <key alias="allPropTypes">All property types &amp; property data</key>
-    <key alias="willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="willBeDeleted">using this Data Type will be deleted permanently, please confirm you want to delete these as well</key>
     <key alias="yesDelete">Yes, delete</key>
-    <key alias="andAllRelated">and all property types &amp; property data using this data type</key>
+    <key alias="andAllRelated">and all property types &amp; property data using this Data Type</key>
     <key alias="selectFolder">Select the folder to move</key>
     <key alias="inTheTree">to in the tree structure below</key>
     <key alias="wasMoved">was moved underneath</key>
@@ -914,7 +914,7 @@
     ]]></key>
     <key alias="runwayFromScratch">I want to start from scratch</key>
     <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
+        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own Document Types and templates.
         (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
         You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
       ]]></key>
@@ -928,7 +928,7 @@
     <key alias="runwaySimpleSite">I want to start with a simple website</key>
     <key alias="runwaySimpleSiteText"><![CDATA[
       <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+      "Runway" is a simple website providing some basic Document Types and templates. The installer can set up Runway for you automatically,
         but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
         Runway offers an easy foundation based on best practices to get you started faster than ever.
         If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
@@ -955,7 +955,7 @@ Get help from our award winning community, browse the documentation or watch som
     <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
 you can find plenty of resources on our getting started pages.]]></key>
     <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
-To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
+To manage your website, simply open the Umbraco backoffice and start adding content, updating the templates and stylesheets or add new functionality]]></key>
     <key alias="Unavailable">Connection to database failed.</key>
     <key alias="Version3">Umbraco Version 3</key>
     <key alias="Version4">Umbraco Version 4</key>
@@ -1034,7 +1034,7 @@ To manage your website, simply open the Umbraco back office and start adding con
 															Password reset requested
 														</h1>
 														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
+															Your username to login to the Umbraco backoffice is: <strong>%0%</strong>
 														</p>
 														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
 															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
@@ -1402,7 +1402,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   </area>
   <area alias="settings">
     <key alias="defaulttemplate">Default template</key>
-    <key alias="importDocumentTypeHelp">To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
+    <key alias="importDocumentTypeHelp">To import a Document Type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
     <key alias="newtabname">New Tab Title</key>
     <key alias="nodetype">Node type</key>
     <key alias="objecttype">Type</key>
@@ -1413,7 +1413,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="tabs">Tabs</key>
     <key alias="contentTypeEnabled">Master Content Type enabled</key>
     <key alias="contentTypeUses">This Content Type uses</key>
-    <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
     <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
     <key alias="createMatchingTemplate">Create matching template</key>
     <key alias="addIcon">Add icon</key>
@@ -1509,8 +1508,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="resendInviteSuccess">Invitation has been re-sent to %0%</key>
     <key alias="contentReqCulturePublishError">Cannot publish the document since the required '%0%' is not published</key>
     <key alias="contentCultureValidationError">Validation failed for language '%0%'</key>
-    <key alias="documentTypeExportedSuccess">Document type was exported to file</key>
-    <key alias="documentTypeExportedError">An error occurred while exporting the document type</key>
+    <key alias="documentTypeExportedSuccess">Document Type was exported to file</key>
+    <key alias="documentTypeExportedError">An error occurred while exporting the Document Type</key>
     <key alias="scheduleErrReleaseDate1">The release date cannot be in the past</key>
     <key alias="scheduleErrReleaseDate2">Cannot schedule the document for publishing since the required '%0%' is not published</key>
     <key alias="scheduleErrReleaseDate3">Cannot schedule the document for publishing since the required '%0%' has a publish date later than a non mandatory language</key>
@@ -1676,10 +1675,10 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="childNodesHeading">Allowed child node types</key>
     <key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type.</key>
     <key alias="chooseChildNode">Choose child node</key>
-    <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
-    <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
-    <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
-    <key alias="compositionRemoveWarning">Removing a composition will delete all the associated property data. Once you save the document type there's no way back.</key>
+    <key alias="compositionsDescription">Inherit tabs and properties from an existing Document Type. New tabs will be added to the current Document Type or merged if a tab with an identical name exists.</key>
+    <key alias="compositionInUse">This Content Type is used in a composition, and therefore cannot be composed itself.</key>
+    <key alias="noAvailableCompositions">There are no Content Types available to use as a composition.</key>
+    <key alias="compositionRemoveWarning">Removing a composition will delete all the associated property data. Once you save the Document Type there's no way back.</key>
     <key alias="availableEditors">Create new</key>
     <key alias="reuse">Use existing</key>
     <key alias="editorSettings">Editor settings</key>
@@ -1692,12 +1691,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="folderToMove">Select the folder to move</key>
     <key alias="folderToCopy">Select the folder to copy</key>
     <key alias="structureBelow">to in the tree structure below</key>
-    <key alias="allDocumentTypes">All Document types</key>
+    <key alias="allDocumentTypes">All Document Types</key>
     <key alias="allDocuments">All Documents</key>
     <key alias="allMediaItems">All media items</key>
-    <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
-    <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
-    <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="usingThisDocument">using this Document Type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMedia">using this Media Type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMember">using this Member Type will be deleted permanently, please confirm you want to delete these as well</key>
     <key alias="andAllDocuments">and all documents using this type</key>
     <key alias="andAllMediaItems">and all media items using this type</key>
     <key alias="andAllMembers">and all members using this type</key>
@@ -1709,7 +1708,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="showOnMemberProfileDescription">Allow this property value to be displayed on the member profile page</key>
     <key alias="tabHasNoSortOrder">tab has no sort order</key>
     <key alias="compositionUsageHeading">Where is this composition used?</key>
-    <key alias="compositionUsageSpecification">This composition is currently used in the composition of the following content types:</key>
+    <key alias="compositionUsageSpecification">This composition is currently used in the composition of the following Content Types:</key>
     <key alias="variantsHeading">Allow variations</key>
     <key alias="cultureVariantHeading">Allow vary by culture</key>
     <key alias="segmentVariantHeading">Allow segmentation</key>
@@ -1720,11 +1719,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="segmentVariantDescription">Allow editors to create segments of this content.</key>
     <key alias="allowVaryByCulture">Allow varying by culture</key>
     <key alias="allowVaryBySegment">Allow segmentation</key>
-    <key alias="elementType">Element type</key>
-    <key alias="elementHeading">Is an element type</key>
-    <key alias="elementDescription">An element type is meant to be used for instance in Nested Content, and not in the tree.</key>
-    <key alias="elementCannotToggle">A document type cannot be changed to an element type once it has been used to create one or more content items.</key>
-    <key alias="elementDoesNotSupport">This is not applicable for an element type</key>
+    <key alias="elementType">Element Type</key>
+    <key alias="elementHeading">Is an Element Type</key>
+    <key alias="elementDescription">An Element Type is meant to be used for instance in Nested Content, and not in the tree.</key>
+    <key alias="elementCannotToggle">A Document Type cannot be changed to an Element Type once it has been used to create one or more content items.</key>
+    <key alias="elementDoesNotSupport">This is not applicable for an Element Type</key>
     <key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
     <key alias="displaySettingsHeadline">Appearance</key>
     <key alias="displaySettingsLabelOnTop">Label above (full-width)</key>
@@ -1886,7 +1885,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="noLockouts">hasn't been locked out</key>
     <key alias="noPasswordChange">The password hasn't been changed</key>
     <key alias="confirmNewPassword">Confirm new password</key>
-    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
+    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco backoffice by filling out the form below and click the 'Change Password' button</key>
     <key alias="contentChannel">Content Channel</key>
     <key alias="createAnotherUser">Create another user</key>
     <key alias="createUserHelp">Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user.</key>
@@ -2255,7 +2254,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="created">Created</key>
     <key alias="comment">Comment</key>
     <key alias="name">Name</key>
-    <key alias="noRelations">No relations for this relation type.</key>
+    <key alias="noRelations">No relations for this Relation Type</key>
     <key alias="tabRelationType">Relation Type</key>
     <key alias="tabRelations">Relations</key>
   </area>
@@ -2299,7 +2298,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="newPartialView">Partial View</key>
     <key alias="newPartialViewMacro">Partial View Macro</key>
     <key alias="newMember">Member</key>
-    <key alias="newDataType">Data type</key>
+    <key alias="newDataType">Data Type</key>
     <key alias="redirectDashboardSearchLabel">Search the redirect dashboard</key>
     <key alias="userGroupSearchLabel">Search the user group section</key>
     <key alias="userSearchLabel">Search the users section</key>
@@ -2525,7 +2524,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="labelLabelTemplate">Label</key>
     <key alias="labelCustomView">Custom view</key>
     <key alias="labelCustomViewInfoTitle">Show custom view description</key>
-    <key alias="labelCustomViewDescription">Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation.</key>
+    <key alias="labelCustomViewDescription">Overwrite how this block appears in the backoffice UI. Pick a .html file containing your presentation.</key>
     <key alias="labelSettingsElementType">Settings model</key>
     <key alias="labelEditorSize">Overlay editor size</key>
     <key alias="addCustomView">Add custom view</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
index 6d0fc7661a..fb11a8dd37 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -671,7 +671,7 @@
     <key alias="theEndHeader">Umbraco %0% ha sido instalado y está listo para ser usado</key>
     <key alias="theEndInstallFailed"><![CDATA[Para completar la instalación, necesitaras editar de forma manual el <strong>archivo /web.config</strong> y actualizar la clave del AppSetting <strong>UmbracoConfigurationStatus</strong> del final al valor <strong>'%0%'</strong>.]]></key>
     <key alias="theEndInstallSuccess"><![CDATA[Puedes <strong>empezar inmediatamente</strong> pulsando el botón "Lanzar Umbraco" de debajo. <br />Si eres <strong>nuevo con Umbraco</strong>, puedes encontrar cantidad de recursos en nuestras páginas de cómo empezar.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Lanzar Umbraco</h3> Para administrar tu sitio web, simplemente abre el back office de Umbraco y empieza a añadir contenido, a actualizar plantillas y hojas de estilo o a añadir nueva funcionalidad]]></key>
+    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Lanzar Umbraco</h3> Para administrar tu sitio web, simplemente abre el backoffice de Umbraco y empieza a añadir contenido, a actualizar plantillas y hojas de estilo o a añadir nueva funcionalidad]]></key>
     <key alias="Unavailable">No se ha podido establecer la conexión con la base de datos</key>
     <key alias="Version3">Umbraco versión 3</key>
     <key alias="Version4">Umbraco versión 4</key>
@@ -989,7 +989,6 @@
     <key alias="tabs">Pestañas</key>
     <key alias="contentTypeEnabled">Tipo de Contenido Maestro activado</key>
     <key alias="contentTypeUses">Este Tipo de Contenido usa</key>
-    <key alias="asAContentMasterType">como Tipo de Contenido Maestro. Las pestañas para los Tipos de Contenido Maestros no se muestran y solo se pueden modificar desde el Tipo de Contenido Maestro</key>
     <key alias="noPropertiesDefinedOnTab">No existen propiedades para esta pestaña. Haz clic en el enlace "añadir nueva propiedad" para crear una nueva propiedad.</key>
     <key alias="addIcon">Añadir icono</key>
   </area>
@@ -1284,7 +1283,7 @@
 
         Este mail se ha generado automáticamente para informale que %2% has solicitado que el documento '%1%' sea traducido en '%5%'.
 
-        Para editarlo, vaya a la dirección http://%3%/translation/details.aspx?id=%4% o inicia sesión en umbraco y ve a http://%3% para ver las tareas pendientes de traducir.
+        Para editarlo, vaya a la dirección http://%3%/translation/details.aspx?id=%4% o inicia sesión en Umbraco y ve a http://%3% para ver las tareas pendientes de traducir.
 
         Espero que tenga un buen dia.
 
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 88c6458a31..596f51d49e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -981,7 +981,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
 															Une réinitialisation de votre mot de passe a été demandée
 														</h1>
 														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Votre nom d'utilisateur pour vous connecter au back-office Umbraco est : <strong>%0%</strong>
+															Votre nom d'utilisateur pour vous connecter au backoffice Umbraco est : <strong>%0%</strong>
 														</p>
 														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
 															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
@@ -1354,7 +1354,6 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="tabs">Onglets</key>
     <key alias="contentTypeEnabled">Type de contenu de base activé</key>
     <key alias="contentTypeUses">Ce type de contenu utilise</key>
-    <key alias="asAContentMasterType">en tant que type de contenu de base. Les onglets du type de contenu de base ne sont pas affichés et peuvent seulement être modifiés à partir du type de contenu de base lui-même.</key>
     <key alias="noPropertiesDefinedOnTab">Aucune propriété définie dans cet onglet. Cliquez sur le lien "Ajouter une nouvelle propriété" en-haut pour créer une nouvelle propriété.</key>
     <key alias="createMatchingTemplate">Créer le template correspondant</key>
     <key alias="addIcon">Ajouter une icône</key>
@@ -1805,7 +1804,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="noLockouts">n'a pas été bloqué</key>
     <key alias="noPasswordChange">Le mot de passe n'a pas été modifié</key>
     <key alias="confirmNewPassword">Confirmez votre nouveau mot de passe</key>
-    <key alias="changePasswordDescription">Vous pouvez changer votre mot de passe d'accès au Back Office Umbraco en remplissant le formulaire ci-dessous puis en cliquant sur le bouton "Changer le mot de passe"</key>
+    <key alias="changePasswordDescription">Vous pouvez changer votre mot de passe d'accès au backoffice Umbraco en remplissant le formulaire ci-dessous puis en cliquant sur le bouton "Changer le mot de passe"</key>
     <key alias="contentChannel">Canal de contenu</key>
     <key alias="createAnotherUser">Créer un autre utilisateur</key>
     <key alias="createUserHelp">Créer de nouveaux utilisateurs pour leur donner accès à Umbraco. Lors de la création d'un nouvel utilisateur, un mot de passe est généré que vous pouvez partager avec ce dernier.</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
index fcc9cfb8ad..a307dc9e1a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
@@ -449,7 +449,7 @@ Get help from our award winning community, browse the documentation or watch som
     <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
 you can find plenty of resources on our getting started pages.]]></key>
     <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
-To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
+To manage your website, simply open the Umbraco backoffice and start adding content, updating the templates and stylesheets or add new functionality]]></key>
     <key alias="Unavailable">ההתחברות לבסיס הנתונים נכשלה.</key>
     <key alias="Version3">Umbraco גירסה 3</key>
     <key alias="Version4">Umbraco גירסה 4</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
index 812da01703..835e49578b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
@@ -422,7 +422,7 @@ Fatti aiutare dalla nostra community, consulta la documentazione o guarda alcuni
     <key alias="theEndInstallFailed"><![CDATA[Per terminare l'installazione, dovrai modificare manualmente il file <strong>/web.config</strong> e aggiornare la chiave AppSetting <strong>UmbracoConfigurationStatus</strong> impostando il valore <strong>'%0%'</strong>.]]></key>
     <key alias="theEndInstallSuccess"><![CDATA[Puoi <strong>iniziare immediatamente</strong> cliccando sul bottone "Avvia Umbraco". <br />Se sei <strong>nuovo a Umbraco</strong>, si possono trovare un sacco di risorse sulle nostre pagine Getting Started.]]></key>
     <key alias="theEndOpenUmbraco"><![CDATA[<h3>Avvia Umbraco</h3>
-Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e iniziare ad aggiungere i contenuti, aggiornando i modelli e i fogli di stile o aggiungere nuove funzionalità]]></key>
+Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e iniziare ad aggiungere i contenuti, aggiornando i modelli e i fogli di stile o aggiungere nuove funzionalità]]></key>
     <key alias="Unavailable">Connessione al database non riuscita.</key>
     <key alias="Version3">Umbraco Versione 3</key>
     <key alias="Version4">Umbraco Versione 4</key>
@@ -603,7 +603,6 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="users">Utenti</key>
   </area>
   <area alias="settings">
-    <key alias="asAContentMasterType"><![CDATA[come tipo di contenuto master. Le tab del tipo di contenuto master non sono mostrate e possono essere modificate solo direttamente dal tipo di contenuto master.]]></key>
     <key alias="contentTypeEnabled">Tipo di contenuto master abilitato</key>
     <key alias="contentTypeUses">Questo tipo di contenuto usa</key>
     <key alias="defaulttemplate"><![CDATA[Template di base]]></key>
@@ -820,7 +819,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="administrators">Amministratore</key>
     <key alias="categoryField">Campo Categoria</key>
     <key alias="changePassword">Cambia la tua password</key>
-    <key alias="changePasswordDescription"><![CDATA[È possibile modificare la password di accesso al Back Office Umbraco compilando il modulo sottostante e clicca sul pulsante 'Modifica password']]></key>
+    <key alias="changePasswordDescription"><![CDATA[È possibile modificare la password di accesso al backoffice Umbraco compilando il modulo sottostante e clicca sul pulsante 'Modifica password']]></key>
     <key alias="confirmNewPassword">Conferma la nuova password</key>
     <key alias="contentChannel">Contenuto del canale</key>
     <key alias="descriptionField">Campo Descrizione</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
index 80aad2c301..11cc67ec98 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
@@ -804,7 +804,6 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="tabs">タブ</key>
     <key alias="contentTypeEnabled">マスターコンテンツタイプが有効</key>
     <key alias="contentTypeUses">このコンテンツタイプの使用</key>
-    <key alias="asAContentMasterType">マスターコンテンツタイプについては、マスターコンテンツタイプからのタブは表示されず、マスターコンテンツタイプでのみ編集することができます。</key>
     <key alias="noPropertiesDefinedOnTab">このタブにはプロパティが定義されていません、上部のリンクから新しいプロパティを作成してください</key>
     <key alias="addIcon">アイコンの追加</key>
   </area>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
index 02f50e73b2..1f7642036e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
@@ -815,7 +815,7 @@
     <key alias="administrators">관리자</key>
     <key alias="categoryField">카테고리 필드</key>
     <key alias="changePassword">Change Your Password</key>
-    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
+    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco backoffice by filling out the form below and click the 'Change Password' button</key>
     <key alias="contentChannel">컨텐츠 채널</key>
     <key alias="descriptionField">설명 필드</key>
     <key alias="disabled">사용자 비활성화</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index cc0b46f200..d5f22686fe 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -689,7 +689,6 @@ Vennlig hilsen Umbraco roboten
     <key alias="tabs">Arkfaner</key>
     <key alias="contentTypeEnabled">Hovedinnholdstype aktivert</key>
     <key alias="contentTypeUses">Denne dokumenttypen bruker</key>
-    <key alias="asAContentMasterType">som hoveddokumenttype. Arkfaner fra hoveddokumenttyper vises ikke og kan kun endres på hoveddokumenttypen selv.</key>
     <key alias="noPropertiesDefinedOnTab">Ingen egenskaper definert i denne arkfanen. Klikk på "legg til ny egenskap" lenken i toppen for å opprette en ny egenskap.</key>
   </area>
   <area alias="sort">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
index 2a24600a7c..961dcaeb16 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -902,7 +902,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="theEndHeader">Umbraco %0% is geïnstalleerd en klaar voor gebruik.</key>
     <key alias="theEndInstallFailed"><![CDATA[Om de installatie af te sluiten, moet u de handmatig het <strong>/web.config bestand</strong> aanpassen, en de Appsetting key <strong>UmbracoConfigurationStatus</strong> onder in het bestand veranderen naar <strong>'%0%'</strong>.]]></key>
     <key alias="theEndInstallSuccess"><![CDATA[Je kunt <strong>meteen beginnen</strong> door de "Launch Umbraco" knop hieronder te klikken. <br />Als je een <strong>beginnende Umbraco gebruiker</strong> bent, dan kun je you can find veel informatie op onze "getting started" pagina's vinden.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3> Om je website te beheren open je simpelweg de Umbraco back office en begin je inhoud toe te voegen, templates en stylesheets aan te passen of nieuwe functionaliteit toe te voegen]]></key>
+    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3> Om je website te beheren open je simpelweg de Umbraco backoffice en begin je inhoud toe te voegen, templates en stylesheets aan te passen of nieuwe functionaliteit toe te voegen]]></key>
     <key alias="Unavailable">Verbinding met de database mislukt.</key>
     <key alias="Version3">Umbraco versie 3</key>
     <key alias="Version4">Umbraco versie 4</key>
@@ -1229,7 +1229,6 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="tabs">Tabs</key>
     <key alias="contentTypeEnabled">Basis inhoudstype ingeschakeld</key>
     <key alias="contentTypeUses">Dit inhoudstype gebruikt</key>
-    <key alias="asAContentMasterType">als basis inhoudstype. Tabs van basis inhoudstypes worden niet getoond en kunnen alleen worden aangepast op het basis inhoudstype zelf</key>
     <key alias="noPropertiesDefinedOnTab">Geen eigenschappen gedefinieerd op dit tabblad. Klik op de link "voeg een nieuwe eigenschap" aan de bovenkant om een ​​nieuwe eigenschap te creëren.</key>
     <key alias="createMatchingTemplate">Maak een bijpassende sjabloon</key>
     <key alias="addIcon">Icoon toevoegen</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
index 7b3e8f1b04..300b4dff76 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -737,7 +737,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="setPasswordConfirmation">Twoje hasło zostało zmienione</key>
     <key alias="resetCodeExpired">Link, na który kliknąłeś jest niewłaściwy lub wygasł</key>
     <key alias="resetPasswordEmailCopySubject">Umbraco: Resetowanie hasła</key>
-    <key alias="resetPasswordEmailCopyFormat"><![CDATA[<p>Twoja nazwa użytkownika do zalogowania się w Umbraco back-office to: <strong>%0%</strong></p><p>Kliknij <a href="%1%"><strong>tutaj</strong></a>, aby zresetować Twoje hasło lub kopiuj/wklej ten URL w przeglądarce:</p><p><em>%1%</em></p>]]></key>
+    <key alias="resetPasswordEmailCopyFormat"><![CDATA[<p>Twoja nazwa użytkownika do zalogowania się w Umbraco backoffice to: <strong>%0%</strong></p><p>Kliknij <a href="%1%"><strong>tutaj</strong></a>, aby zresetować Twoje hasło lub kopiuj/wklej ten URL w przeglądarce:</p><p><em>%1%</em></p>]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">Panel zarządzania</key>
@@ -981,7 +981,6 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="tabs">Zakładki</key>
     <key alias="contentTypeEnabled">Włączono Główny Typ Treści</key>
     <key alias="contentTypeUses">Ten Typ Treści używa</key>
-    <key alias="asAContentMasterType">jako Główny Typ Treści. Zakładki Głównego Typu Treści nie są wyświetlone i mogą być edytowane jedynie w samym Głównym Typie Treści</key>
     <key alias="noPropertiesDefinedOnTab">Żadne właściwości nie zostały zdefiniowane dla tej zakładki. Kliknij w link "dodaj nową właściwość", który znajduje się na górze strony, aby stworzyć nową właściwość.</key>
     <key alias="addIcon">Dodaj ikonę</key>
   </area>
@@ -1321,7 +1320,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="changePassword">Zmień hasło!</key>
     <key alias="newPassword">Nowe hasło</key>
     <key alias="confirmNewPassword">Potwierdź nowe hasło</key>
-    <key alias="changePasswordDescription">Możesz zmienić swoje hasło w Umbraco Back Office przez wypełnienie formularza poniżej i kliknięcie przycisku "Zmień hasło"</key>
+    <key alias="changePasswordDescription">Możesz zmienić swoje hasło w Umbraco backoffice przez wypełnienie formularza poniżej i kliknięcie przycisku "Zmień hasło"</key>
     <key alias="contentChannel">Kanał zawartości</key>
     <key alias="descriptionField">Opis</key>
     <key alias="disabled">Wyłącz użytkownika</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
index a430b53165..9ad4291c59 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -1327,7 +1327,6 @@
   </area>
   <area alias="settings">
     <key alias="addIcon">Добавить значок</key>
-    <key alias="asAContentMasterType">в качестве родительского типа. Вкладки родительского типа не показаны и могут быть изменены непосредственно в родительском типе</key>
     <key alias="contentTypeEnabled">Родительский тип контента разрешен</key>
     <key alias="contentTypeUses">Данный тип контента использует</key>
     <key alias="defaulttemplate">Шаблон по-умолчанию</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
index 8c282dd571..9c237815bf 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -558,7 +558,7 @@
     <key alias="theEndHeader">Umbraco %0% är installerat och klart för användning</key>
     <key alias="theEndInstallFailed"><![CDATA[För att avsluta installationen måste du manuellt redigera <strong>/web.config</strong> filen och ändra AppSettingsnyckeln <strong>UmbracoConfigurationStatus</strong> på slutet till <strong>%0%</strong>]]></key>
     <key alias="theEndInstallSuccess"><![CDATA[Du kan <strong>börja omedelbart</strong> genom att klicka på "Starta Umbraco"-knappen nedan. <br />Om du är en <strong>ny Umbraco användare</strong>kan du hitta massor av resurser på våra kom igång sidor.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Starta Umbraco</h3> För att administrera din webbplats öppnar du bara Umbraco back office och börjar lägga till innehåll, uppdatera mallar och stilmallar eller lägga till nya funktioner.]]></key>
+    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Starta Umbraco</h3> För att administrera din webbplats öppnar du bara Umbraco backoffice och börjar lägga till innehåll, uppdatera mallar och stilmallar eller lägga till nya funktioner.]]></key>
     <key alias="Unavailable">Anslutningen till databasen misslyckades.</key>
     <key alias="watch">Se</key>
     <key alias="welcomeIntro"><![CDATA[Den här guiden kommer att guida dig genom processen med att konfigurera <strong>Umbraco %0%</strong> antingen för en ny installation eller en uppgradering från version 3.0. <br /><br /> Tryck på <strong>"next"</strong> för att börja.]]></key>
@@ -732,7 +732,6 @@
     <key alias="users">Användare</key>
   </area>
   <area alias="settings">
-    <key alias="asAContentMasterType">som huvudinnehållstyp. Tabbar från huvudinnehållstyper visas inte och kan endast redigeras på själva huvudinnehållstypen.</key>
     <key alias="contentTypeEnabled">Huvudinnehållstyp påslagen</key>
     <key alias="contentTypeUses">Denna huvudinnehållstyp använder</key>
     <key alias="defaulttemplate">Defaultmall</key>
@@ -947,7 +946,7 @@
     <key alias="changePassword">Ändra lösenord</key>
     <key alias="changePhoto">Ändra bild</key>
     <key alias="confirmNewPassword">Bekräfta det nya lösenordet</key>
-    <key alias="changePasswordDescription">Du kan byta ditt lösenord för Umbraco Back Office genom att fylla i nedanstående formulär och klicka på knappen "Ändra lösenord".</key>
+    <key alias="changePasswordDescription">Du kan byta ditt lösenord för Umbraco backoffice genom att fylla i nedanstående formulär och klicka på knappen "Ändra lösenord".</key>
     <key alias="contentChannel">Innehållskanal</key>
     <key alias="createAnotherUser">Skapa en till användare</key>
     <key alias="createUserHelp">Skapa nya användare för att ge dom åtkomst till Umbraco. När en ny användare skapas kommer ett lösenord genereras som du kan dela med användaren.</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
index 67fa7adcc4..82ef1ba628 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -561,7 +561,7 @@
     <key alias="toolsDescription">Dizini yönetmek için araçlar</key>
     <key alias="fields">alanlar</key>
     <key alias="indexCannotRead">Dizin okunamıyor ve yeniden oluşturulması gerekecek</key>
-    <key alias="processIsTakingLonger">İşlem beklenenden uzun sürüyor, bu işlem sırasında herhangi bir hata olup olmadığını görmek için umbraco günlüğünü kontrol edin</key>
+    <key alias="processIsTakingLonger">İşlem beklenenden uzun sürüyor, bu işlem sırasında herhangi bir hata olup olmadığını görmek için Umbraco günlüğünü kontrol edin</key>
     <key alias="indexCannotRebuild">Bu dizin, atanmış olmadığı için yeniden oluşturulamaz</key>
     <key alias="iIndexPopulator">IIndexPopulator</key>
   </area>
@@ -1468,7 +1468,6 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
       <key alias="tabs">Sekmeler</key>
       <key alias="contentTypeEnabled">Ana İçerik Türü etkinleştirildi</key>
       <key alias="contentTypeUses">Bu İçerik Türü kullanır</key>
-      Ana İçerik Türü olarak <key alias="asAContentMasterType">. Ana İçerik Türlerinden sekmeler gösterilmez ve yalnızca Ana İçerik Türünün kendisinde düzenlenebilir</key>
       <key alias="noPropertiesDefinedOnTab">Bu sekmede tanımlanmış özellik yok. Yeni bir mülk oluşturmak için üstteki "yeni mülk ekle" bağlantısını tıklayın.</key>
       <key alias="createMatchingTemplate">Eşleşen şablon oluştur</key>
       <key alias="addIcon">Simge ekle</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
index 6344efe0bc..916bca0dbd 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
@@ -847,7 +847,6 @@
     <key alias="tabs">选项卡</key>
     <key alias="contentTypeEnabled">主控文档类型激活</key>
     <key alias="contentTypeUses">该文档类型使用</key>
-    <key alias="asAContentMasterType">作为主控文档类型. 主控文档类型的标签只能在主控文档类型里修改。</key>
     <key alias="noPropertiesDefinedOnTab">没有字段设置在该标签页</key>
     <key alias="addIcon">添加图标</key>
   </area>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index c912daa56e..23123f9bfa 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -834,7 +834,6 @@
     <key alias="tabs">選項卡</key>
     <key alias="contentTypeEnabled">主控文件類型啟動</key>
     <key alias="contentTypeUses">該文檔類型使用</key>
-    <key alias="asAContentMasterType">作為主控文件類型. 主控文件類型的標籤只能在主控文件類型裡修改。</key>
     <key alias="noPropertiesDefinedOnTab">沒有欄位設置在該標籤頁</key>
     <key alias="addIcon">增加圖示</key>
   </area>

From 40f0fbe9391217900a766929a76ff9f1364f484e Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Sun, 21 Feb 2021 16:03:37 +0000
Subject: [PATCH 062/202] Make abstract FileSystemWrapper class methods virtual
 (#9528)

---
 src/Umbraco.Core/IO/FileSystemWrapper.cs | 38 ++++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/IO/FileSystemWrapper.cs b/src/Umbraco.Core/IO/FileSystemWrapper.cs
index 14d028c16d..3091a645d5 100644
--- a/src/Umbraco.Core/IO/FileSystemWrapper.cs
+++ b/src/Umbraco.Core/IO/FileSystemWrapper.cs
@@ -23,94 +23,94 @@ namespace Umbraco.Core.IO
 
         internal IFileSystem InnerFileSystem { get; set; }
 
-        public IEnumerable<string> GetDirectories(string path)
+        public virtual IEnumerable<string> GetDirectories(string path)
         {
             return InnerFileSystem.GetDirectories(path);
         }
 
-        public void DeleteDirectory(string path)
+        public virtual void DeleteDirectory(string path)
         {
             InnerFileSystem.DeleteDirectory(path);
         }
 
-        public void DeleteDirectory(string path, bool recursive)
+        public virtual void DeleteDirectory(string path, bool recursive)
         {
             InnerFileSystem.DeleteDirectory(path, recursive);
         }
 
-        public bool DirectoryExists(string path)
+        public virtual bool DirectoryExists(string path)
         {
             return InnerFileSystem.DirectoryExists(path);
         }
 
-        public void AddFile(string path, Stream stream)
+        public virtual void AddFile(string path, Stream stream)
         {
             InnerFileSystem.AddFile(path, stream);
         }
 
-        public void AddFile(string path, Stream stream, bool overrideExisting)
+        public virtual void AddFile(string path, Stream stream, bool overrideExisting)
         {
             InnerFileSystem.AddFile(path, stream, overrideExisting);
         }
 
-        public IEnumerable<string> GetFiles(string path)
+        public virtual IEnumerable<string> GetFiles(string path)
         {
             return InnerFileSystem.GetFiles(path);
         }
 
-        public IEnumerable<string> GetFiles(string path, string filter)
+        public virtual IEnumerable<string> GetFiles(string path, string filter)
         {
             return InnerFileSystem.GetFiles(path, filter);
         }
 
-        public Stream OpenFile(string path)
+        public virtual Stream OpenFile(string path)
         {
             return InnerFileSystem.OpenFile(path);
         }
 
-        public void DeleteFile(string path)
+        public virtual void DeleteFile(string path)
         {
             InnerFileSystem.DeleteFile(path);
         }
 
-        public bool FileExists(string path)
+        public virtual bool FileExists(string path)
         {
             return InnerFileSystem.FileExists(path);
         }
 
-        public string GetRelativePath(string fullPathOrUrl)
+        public virtual string GetRelativePath(string fullPathOrUrl)
         {
             return InnerFileSystem.GetRelativePath(fullPathOrUrl);
         }
 
-        public string GetFullPath(string path)
+        public virtual string GetFullPath(string path)
         {
             return InnerFileSystem.GetFullPath(path);
         }
 
-        public string GetUrl(string path)
+        public virtual string GetUrl(string path)
         {
             return InnerFileSystem.GetUrl(path);
         }
 
-        public DateTimeOffset GetLastModified(string path)
+        public virtual DateTimeOffset GetLastModified(string path)
         {
             return InnerFileSystem.GetLastModified(path);
         }
 
-        public DateTimeOffset GetCreated(string path)
+        public virtual DateTimeOffset GetCreated(string path)
         {
             return InnerFileSystem.GetCreated(path);
         }
 
-        public long GetSize(string path)
+        public virtual long GetSize(string path)
         {
             return InnerFileSystem.GetSize(path);
         }
 
-        public bool CanAddPhysical => InnerFileSystem.CanAddPhysical;
+        public virtual bool CanAddPhysical => InnerFileSystem.CanAddPhysical;
 
-        public void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false)
+        public virtual void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false)
         {
             InnerFileSystem.AddFile(path, physicalPath, overrideIfExists, copy);
         }

From 6aaefe160bd09a98a8e35456b52309e13a006f4b Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Feb 2021 17:17:10 +0100
Subject: [PATCH 063/202] Decimal step size validation (#9334)

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
---
 .../src/views/propertyeditors/decimal/decimal.html       | 9 +++++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml            | 6 ++++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml            | 4 ++++
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml         | 1 +
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
index ac2fdabf3d..fb68a67c60 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
@@ -9,10 +9,15 @@
                aria-required="{{model.validation.mandatory}}"
                id="{{model.alias}}"
                val-server="value"
-               fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
+               min="{{model.config.min}}"
+               max="{{model.config.max}}"
+               step="{{model.config.step}}"
+               ng-step="model.config.step"
+               fix-number />
 
-        <span ng-messages="decimalFieldForm.decimalField.$error" show-validation-on-submit >
+        <span ng-messages="decimalFieldForm.decimalField.$error" show-validation-on-submit>
             <span class="help-inline" ng-message="number"><localize key="validation_invalidNumber">Not a number</localize></span>
+            <span class="help-inline" ng-message="step"><localize key="validation_invalidNumberStepSize">Not a valid numeric step size</localize></span>
             <span class="help-inline" ng-message="valServer">{{decimalFieldForm.decimalField.errorMsg}}</span>
         </span>
     </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 309b05ccf3..250b1b4579 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1696,9 +1696,11 @@ Mange hilsner fra Umbraco robotten
     <key alias="itemsSelected">elementer valgt</key>
     <key alias="invalidDate">Ugyldig dato</key>
     <key alias="invalidNumber">Ikke et tal</key>
+    <key alias="invalidNumberStepSize">Ikke en gyldig numerisk trinstørrelse</key>
     <key alias="invalidEmail">Ugyldig e-mail</key>
-    <key alias="invalidNull">Feltet er påkrævet</key>
-    <key alias="invalidEmpty">Feltet er påkrævet</key>
+    <key alias="invalidNull">Værdien kan ikke være tom</key>
+    <key alias="invalidEmpty">Værdien kan ikke være tom</key>
+    <key alias="invalidPattern">Værdien er ugyldig, som ikke matcher det korrekte format</key>
     <key alias="entriesShort"><![CDATA[Minimum %0% element(er), tilføj <strong>%1%</strong> mere.]]></key>
     <key alias="entriesExceed"><![CDATA[Maksimum %0% element(er), <strong>%1%</strong> for mange.]]></key>
   </area>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index dacb04d597..9d6240325d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2072,7 +2072,11 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="itemsSelected">items selected</key>
     <key alias="invalidDate">Invalid date</key>
     <key alias="invalidNumber">Not a number</key>
+    <key alias="invalidNumberStepSize">Not a valid numeric step size</key>
     <key alias="invalidEmail">Invalid email</key>
+    <key alias="invalidNull">Value cannot be null</key>
+    <key alias="invalidEmpty">Value cannot be empty</key>
+    <key alias="invalidPattern">Value is invalid, it does not match the correct pattern</key>
     <key alias="customValidation">Custom validation</key>
     <key alias="entriesShort"><![CDATA[Minimum %0% entries, requires <strong>%1%</strong> more.]]></key>
     <key alias="entriesExceed"><![CDATA[Maximum %0% entries, <strong>%1%</strong> too many.]]></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 d04b1f96a6..622806d933 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2090,6 +2090,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="itemsSelected">items selected</key>
     <key alias="invalidDate">Invalid date</key>
     <key alias="invalidNumber">Not a number</key>
+    <key alias="invalidNumberStepSize">Not a valid numeric step size</key>
     <key alias="invalidEmail">Invalid email</key>
     <key alias="invalidNull">Value cannot be null</key>
     <key alias="invalidEmpty">Value cannot be empty</key>

From d85b6694fe66b1b9f51f6a7c215916f2ac73c6e5 Mon Sep 17 00:00:00 2001
From: Matthew-Wise <6782865+Matthew-Wise@users.noreply.github.com>
Date: Sun, 21 Feb 2021 16:19:48 +0000
Subject: [PATCH 064/202] Make models builder properties virtual to allow
 mocking (#9335)

---
 src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs | 6 +++---
 src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
index e59900bdc4..148d0869d4 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
@@ -246,7 +246,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
             WriteGeneratedCodeAttribute(sb, "\t\t");
             sb.AppendFormat("\t\t[ImplementPropertyType(\"{0}\")]\n", property.Alias);
 
-            sb.Append("\t\tpublic ");
+            sb.Append("\t\tpublic virtual ");
             WriteClrType(sb, property.ClrTypeName);
 
             sb.AppendFormat(" {0} => ",
@@ -307,14 +307,14 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
 
             if (mixinStatic)
             {
-                sb.Append("\t\tpublic ");
+                sb.Append("\t\tpublic virtual ");
                 WriteClrType(sb, property.ClrTypeName);
                 sb.AppendFormat(" {0} => {1}(this);\n",
                     property.ClrName, MixinStaticGetterName(property.ClrName));
             }
             else
             {
-                sb.Append("\t\tpublic ");
+                sb.Append("\t\tpublic virtual ");
                 WriteClrType(sb, property.ClrTypeName);
                 sb.AppendFormat(" {0} => this.Value",
                     property.ClrName);
diff --git a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
index 4f35c57d04..5a64ab1b73 100644
--- a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
@@ -97,7 +97,7 @@ namespace Umbraco.Web.PublishedModels
 
 		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		[ImplementPropertyType(""prop1"")]
-		public string Prop1 => this.Value<string>(""prop1"");
+		public virtual string Prop1 => this.Value<string>(""prop1"");
 	}
 }
 ";
@@ -212,7 +212,7 @@ namespace Umbraco.Web.PublishedModels
 
 		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		[ImplementPropertyType(""foo"")]
-		public global::System.Collections.Generic.IEnumerable<global::Foo> Foo => this.Value<global::System.Collections.Generic.IEnumerable<global::Foo>>(""foo"");
+		public virtual global::System.Collections.Generic.IEnumerable<global::Foo> Foo => this.Value<global::System.Collections.Generic.IEnumerable<global::Foo>>(""foo"");
 	}
 }
 ";

From 6eb260001d3d4045f4c29ef6e26d85d27c1e4ce8 Mon Sep 17 00:00:00 2001
From: mcl-sz <sjouke.zonneveld@znb.nl>
Date: Sun, 21 Feb 2021 17:22:28 +0100
Subject: [PATCH 065/202] Ensure that upload file(s) in the MediaPicker is
 returned (#9367)

The onUploadComplete function returns the last files that are added to a mediafolder. While this works correct by default and in most situations, it doesn't work as expected when a diffrent sorting is used for Media-items. For example, we've added events to sort Media-items automatically by name alphabetically when they are created/uploaded to keep them better organised.
By sorting the $scope.files array by the Id-property, it ensures that the function returns the uploaded files, instead of the last files in the folder.
---
 .../infiniteeditors/mediapicker/mediapicker.controller.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 6f9ce6ee34..fec2e632c5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -327,10 +327,10 @@ angular.module("umbraco")
                 gotoFolder($scope.currentFolder).then(function () {
                     $timeout(function () {
                         if ($scope.multiPicker) {
-                            var images = _.rest($scope.images, $scope.images.length - files.length);
+                            var images = _.rest(_.sortBy($scope.images, 'id'), $scope.images.length - files.length);
                             images.forEach(image => selectMedia(image));
                         } else {
-                            var image = $scope.images[$scope.images.length - 1];
+                            var image = _.sortBy($scope.images, 'id')[$scope.images.length - 1];
                             clickHandler(image);
                         }
                     });

From b8540ca128bf1622ff26eb21d331577776d5a725 Mon Sep 17 00:00:00 2001
From: Chad <chad.d.currie@gmail.com>
Date: Mon, 22 Feb 2021 11:22:49 +1300
Subject: [PATCH 066/202] Improve speed and reduce allocations by implementing
 logger overloads to avoid params [] allocation (#8917)

* Implement logger overloads to avoid params [] allocation

* Implement console logger ILogger

* Call correct signature

* Fix exceptions

* Introduce ILogger2

* fix logger reference

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 .../Composing/ComponentCollection.cs          |   2 +-
 src/Umbraco.Core/Composing/Composers.cs       |   4 +-
 src/Umbraco.Core/Composing/TypeFinder.cs      |   6 +-
 src/Umbraco.Core/Composing/TypeLoader.cs      |  29 +-
 .../Configuration/Grid/GridEditorsConfig.cs   |   2 +-
 src/Umbraco.Core/IO/FileSystems.cs            |   4 +-
 src/Umbraco.Core/IO/MediaFileSystem.cs        |   2 +-
 src/Umbraco.Core/IO/PhysicalFileSystem.cs     |  12 +-
 .../Logging/DebugDiagnosticsLogger.cs         |  60 +++
 src/Umbraco.Core/Logging/DisposableTimer.cs   |  10 +-
 src/Umbraco.Core/Logging/ILogger.cs           |   7 +-
 src/Umbraco.Core/Logging/ILogger2.cs          | 240 ++++++++++
 src/Umbraco.Core/Logging/LogProfiler.cs       |   4 +-
 src/Umbraco.Core/Logging/Logger2Extensions.cs | 442 ++++++++++++++++++
 src/Umbraco.Core/Logging/OwinLogger.cs        |  18 +-
 src/Umbraco.Core/Logging/ProfilingLogger.cs   |  58 +++
 .../Logging/Serilog/SerilogLogger.cs          | 124 +++++
 src/Umbraco.Core/Manifest/ManifestParser.cs   |   2 +-
 src/Umbraco.Core/Manifest/ManifestWatcher.cs  |   2 +-
 .../Migrations/Install/DatabaseBuilder.cs     |  10 +-
 .../Migrations/Install/DatabaseDataCreator.cs |   4 +-
 .../Install/DatabaseSchemaCreator.cs          |  20 +-
 src/Umbraco.Core/Migrations/MigrationPlan.cs  |   8 +-
 .../Upgrade/V_8_0_0/DataTypeMigration.cs      |   6 +-
 .../DataTypes/PreValueMigratorCollection.cs   |   2 +-
 .../DropDownPropertyEditorsMigration.cs       |   2 +-
 .../MergeDateAndDateTimePropertyEditor.cs     |   2 +-
 ...adioAndCheckboxPropertyEditorsMigration.cs |   2 +-
 src/Umbraco.Core/Models/Member.cs             |   4 +-
 .../Packaging/PackageActionRunner.cs          |   4 +-
 .../Packaging/PackageDataInstallation.cs      |  18 +-
 .../Implement/ContentRepositoryBase.cs        |   2 +-
 .../Implement/ContentTypeRepository.cs        |   2 +-
 .../Implement/ContentTypeRepositoryBase.cs    |   6 +-
 .../Persistence/UmbracoDatabase.cs            |   8 +-
 .../Persistence/UmbracoDatabaseFactory.cs     |   2 +-
 .../PropertyEditors/DataValueEditor.cs        |   2 +-
 .../ValueConverters/GridValueConverter.cs     |   2 +-
 .../ImageCropperValueConverter.cs             |   4 +-
 .../ValueConverters/JsonValueConverter.cs     |   2 +-
 src/Umbraco.Core/Runtime/CoreRuntime.cs       |   4 +-
 src/Umbraco.Core/Runtime/MainDom.cs           |   8 +-
 src/Umbraco.Core/Runtime/SqlMainDomLock.cs    |   6 +-
 src/Umbraco.Core/RuntimeState.cs              |   6 +-
 src/Umbraco.Core/Scoping/Scope.cs             |   2 +-
 src/Umbraco.Core/Scoping/ScopeProvider.cs     |   2 +-
 .../Services/Implement/ContentService.cs      |  38 +-
 .../Implement/LocalizedTextService.cs         |   8 +-
 .../LocalizedTextServiceFileSources.cs        |   6 +-
 .../Services/Implement/NotificationService.cs |   2 +-
 .../Sync/DatabaseServerMessenger.cs           |   6 +-
 src/Umbraco.Core/Sync/ServerMessengerBase.cs  |   6 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   2 +
 src/Umbraco.Core/UriExtensions.cs             |   3 +-
 src/Umbraco.Examine/IndexRebuilder.cs         |   2 +-
 src/Umbraco.Examine/UmbracoContentIndex.cs    |   2 +-
 src/Umbraco.Examine/UmbracoExamineIndex.cs    |   2 +-
 .../LoggerAllocationBenchmark.cs              |  58 +++
 .../Umbraco.Tests.Benchmarks.csproj           |   1 +
 .../DictionaryPublishedContent.cs             |   2 +-
 .../LegacyXmlPublishedCache/PreviewContent.cs |   4 +-
 .../PublishedMediaCache.cs                    |   4 +-
 .../LegacyXmlPublishedCache/XmlStore.cs       |  16 +-
 .../XmlStoreFilePersister.cs                  |   6 +-
 .../Services/ContentServicePerformanceTest.cs |   2 +-
 .../TestHelpers/ConsoleLogger.cs              |  57 +++
 .../Cache/DistributedCacheBinder.cs           |   2 +-
 .../ContentAppFactoryCollection.cs            |   2 +-
 .../Editors/AuthenticationController.cs       |   8 +-
 .../Editors/BackOfficeController.cs           |  14 +-
 src/Umbraco.Web/Editors/ContentController.cs  |   2 +-
 .../Editors/ContentControllerBase.cs          |   2 +-
 .../Editors/ContentTypeController.cs          |   6 +-
 .../Editors/DashboardController.cs            |   6 +-
 .../Editors/DictionaryController.cs           |   4 +-
 .../Editors/ExamineManagementController.cs    |   4 +-
 src/Umbraco.Web/Editors/PasswordChanger.cs    |   6 +-
 .../Editors/RelationTypeController.cs         |   4 +-
 src/Umbraco.Web/Editors/TinyMceController.cs  |   2 +-
 .../HealthCheck/HealthCheckController.cs      |   2 +-
 .../HealthCheck/HealthCheckResults.cs         |   8 +-
 .../ImageCropperTemplateExtensions.cs         |   3 +-
 .../Controllers/InstallApiController.cs       |   6 +-
 .../ClientDependencyConfiguration.cs          |   2 +-
 src/Umbraco.Web/Macros/MacroRenderer.cs       |   6 +-
 .../Media/UploadAutoFillProperties.cs         |   2 +-
 .../Mapping/ContentPropertyBasicMapper.cs     |   2 +-
 .../Models/Mapping/DataTypeMapDefinition.cs   |   2 +-
 .../Models/Mapping/MacroMapDefinition.cs      |   2 +-
 src/Umbraco.Web/Mvc/RenderMvcController.cs    |   2 +-
 .../BlockEditorPropertyEditor.cs              |   2 +-
 .../ImageCropperPropertyEditor.cs             |   2 +-
 .../NestedContentPropertyEditor.cs            |   4 +-
 .../RichTextEditorPastedImages.cs             |   2 +-
 .../PropertyEditors/RteEmbedController.cs     |   2 +-
 .../PublishedCache/NuCache/ContentStore.cs    |   6 +-
 .../NuCache/DataSource/DatabaseDataSource.cs  |   4 +-
 .../NuCache/PublishedSnapshotService.cs       |  14 +-
 .../PublishedContentTypeCache.cs              |   4 +-
 .../Routing/ContentFinderByConfigured404.cs   |   2 +-
 .../Routing/ContentFinderByIdPath.cs          |   4 +-
 .../Routing/ContentFinderByRedirectUrl.cs     |   6 +-
 src/Umbraco.Web/Routing/ContentFinderByUrl.cs |   4 +-
 .../Routing/ContentFinderByUrlAlias.cs        |   2 +-
 .../Routing/ContentFinderByUrlAndTemplate.cs  |   8 +-
 src/Umbraco.Web/Routing/DefaultUrlProvider.cs |   2 +-
 .../Routing/NotFoundHandlerHelper.cs          |   2 +-
 src/Umbraco.Web/Routing/PublishedRouter.cs    |  38 +-
 .../Scheduling/BackgroundTaskRunner.cs        |  26 +-
 src/Umbraco.Web/Scheduling/KeepAlive.cs       |   2 +-
 .../Scheduling/ScheduledPublishing.cs         |   2 +-
 src/Umbraco.Web/Scheduling/TempFileCleanup.cs |   4 +-
 src/Umbraco.Web/Search/ExamineComponent.cs    |   2 +-
 src/Umbraco.Web/Security/MembershipHelper.cs  |   2 +-
 .../Providers/UmbracoMembershipProvider.cs    |  16 +-
 src/Umbraco.Web/Templates/HtmlUrlParser.cs    |   2 +-
 .../Trees/ContentTreeControllerBase.cs        |   2 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |   6 +-
 src/Umbraco.Web/UmbracoModule.cs              |   2 +-
 .../FileUploadCleanupFilterAttribute.cs       |  10 +-
 .../WebApi/UnhandledExceptionLogger.cs        |   2 +-
 121 files changed, 1364 insertions(+), 316 deletions(-)
 create mode 100644 src/Umbraco.Core/Logging/ILogger2.cs
 create mode 100644 src/Umbraco.Core/Logging/Logger2Extensions.cs
 create mode 100644 src/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs

diff --git a/src/Umbraco.Core/Composing/ComponentCollection.cs b/src/Umbraco.Core/Composing/ComponentCollection.cs
index 62b240f10f..6501a3a28c 100644
--- a/src/Umbraco.Core/Composing/ComponentCollection.cs
+++ b/src/Umbraco.Core/Composing/ComponentCollection.cs
@@ -51,7 +51,7 @@ namespace Umbraco.Core.Composing
                         }
                         catch (Exception ex)
                         {
-                            _logger.Error<ComponentCollection>(ex, "Error while terminating component {ComponentType}.", componentType.FullName);
+                            _logger.Error<ComponentCollection,string>(ex, "Error while terminating component {ComponentType}.", componentType.FullName);
                         }
                     }
                 }
diff --git a/src/Umbraco.Core/Composing/Composers.cs b/src/Umbraco.Core/Composing/Composers.cs
index b2e6c9d068..1528c6760d 100644
--- a/src/Umbraco.Core/Composing/Composers.cs
+++ b/src/Umbraco.Core/Composing/Composers.cs
@@ -114,7 +114,7 @@ namespace Umbraco.Core.Composing
 
             // bit verbose but should help for troubleshooting
             //var text = "Ordered Composers: " + Environment.NewLine + string.Join(Environment.NewLine, sortedComposerTypes) + Environment.NewLine;
-            _logger.Debug<Composers>("Ordered Composers: {SortedComposerTypes}", sortedComposerTypes);
+            _logger.Debug<Composers,IEnumerable<Type>>("Ordered Composers: {SortedComposerTypes}", sortedComposerTypes);
 
             return sortedComposerTypes;
         }
@@ -205,7 +205,7 @@ namespace Umbraco.Core.Composing
             catch (Exception e)
             {
                 // in case of an error, force-dump everything to log
-                _logger.Info<Composers>("Composer Report:\r\n{ComposerReport}", GetComposersReport(requirements));
+                _logger.Info<Composers,string>("Composer Report:\r\n{ComposerReport}", GetComposersReport(requirements));
                 _logger.Error<Composers>(e, "Failed to sort composers.");
                 throw;
             }
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 394d9480ae..5bf9eb89a9 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -11,7 +11,7 @@ using System.Web.Compilation;
 using System.Web.Hosting;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
-
+using Umbraco.Core.Logging;
 namespace Umbraco.Core.Composing
 {
     /// <summary>
@@ -441,7 +441,7 @@ namespace Umbraco.Core.Composing
                     }
                     catch (TypeLoadException ex)
                     {
-                        Current.Logger.Error(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
+                        Current.Logger.Error<Assembly>(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
                         continue;
                     }
 
@@ -507,7 +507,7 @@ namespace Umbraco.Core.Composing
                     }
                     catch (TypeLoadException ex)
                     {
-                        Current.Logger.Error(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
+                        Current.Logger.Error<Assembly>(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
                         continue;
                     }
 
diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
index 6d0b1a0514..f5c75ff607 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Core/Composing/TypeLoader.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
@@ -477,7 +478,7 @@ namespace Umbraco.Core.Composing
                     if (--attempts == 0)
                         throw;
 
-                    _logger.Debug<TypeLoader>("Attempted to get filestream for file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
+                    _logger.Debug<TypeLoader,string,int,int>("Attempted to get filestream for file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
                     Thread.Sleep(pauseMilliseconds);
                 }
             }
@@ -498,7 +499,7 @@ namespace Umbraco.Core.Composing
                     if (--attempts == 0)
                         throw;
 
-                    _logger.Debug<TypeLoader>("Attempted to delete file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
+                    _logger.Debug<TypeLoader,string,int,int>("Attempted to delete file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
                     Thread.Sleep(pauseMilliseconds);
                 }
             }
@@ -571,7 +572,7 @@ namespace Umbraco.Core.Composing
             if (!typeof(IDiscoverable).IsAssignableFrom(typeof(T)))
             {
                 // warn
-                _logger.Debug<TypeLoader>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} (slow).", typeof(T).FullName);
+                _logger.Debug<TypeLoader,string>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} (slow).", typeof(T).FullName);
 
                 return GetTypesInternal(
                     typeof(T), null,
@@ -589,7 +590,7 @@ namespace Umbraco.Core.Composing
 
             // warn
             if (!cache)
-                _logger.Debug<TypeLoader>("Running a non-cached, filter for discoverable type {TypeName} (slowish).", typeof(T).FullName);
+                _logger.Debug<TypeLoader, string>("Running a non-cached, filter for discoverable type {TypeName} (slowish).", typeof(T).FullName);
 
             // filter the cached discovered types (and maybe cache the result)
             return GetTypesInternal(
@@ -621,7 +622,7 @@ namespace Umbraco.Core.Composing
             // if not IDiscoverable, directly get types
             if (!typeof(IDiscoverable).IsAssignableFrom(typeof(T)))
             {
-                _logger.Debug<TypeLoader>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} / attribute {AttributeName} (slow).", typeof(T).FullName, typeof(TAttribute).FullName);
+                _logger.Debug<TypeLoader, string, string>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} / attribute {AttributeName} (slow).", typeof(T).FullName, typeof(TAttribute).FullName);
 
                 return GetTypesInternal(
                     typeof(T), typeof(TAttribute),
@@ -639,7 +640,7 @@ namespace Umbraco.Core.Composing
 
             // warn
             if (!cache)
-                _logger.Debug<TypeLoader>("Running a non-cached, filter for discoverable type {TypeName}  / attribute {AttributeName} (slowish).", typeof(T).FullName, typeof(TAttribute).FullName);
+                _logger.Debug<TypeLoader, string, string>("Running a non-cached, filter for discoverable type {TypeName}  / attribute {AttributeName} (slowish).", typeof(T).FullName, typeof(TAttribute).FullName);
 
             // filter the cached discovered types (and maybe cache the result)
             return GetTypesInternal(
@@ -669,7 +670,7 @@ namespace Umbraco.Core.Composing
             cache &= specificAssemblies == null;
 
             if (!cache)
-                _logger.Debug<TypeLoader>("Running a full, non-cached, scan for types / attribute {AttributeName} (slow).", typeof(TAttribute).FullName);
+                _logger.Debug<TypeLoader, string>("Running a full, non-cached, scan for types / attribute {AttributeName} (slow).", typeof(TAttribute).FullName);
 
             return GetTypesInternal(
                 typeof (object), typeof (TAttribute),
@@ -725,7 +726,7 @@ namespace Umbraco.Core.Composing
             if (typeList != null)
             {
                 // need to put some logging here to try to figure out why this is happening: http://issues.umbraco.org/issue/U4-3505
-                _logger.Debug<TypeLoader>("Getting {TypeName}: found a cached type list.", GetName(baseType, attributeType));
+                _logger.Debug<TypeLoader, string>("Getting {TypeName}: found a cached type list.", GetName(baseType, attributeType));
                 return typeList.Types;
             }
 
@@ -756,7 +757,7 @@ namespace Umbraco.Core.Composing
                 // so in this instance there will never be a result.
                 if (cacheResult.Exception is CachedTypeNotFoundInFileException || cacheResult.Success == false)
                 {
-                    _logger.Debug<TypeLoader>("Getting {TypeName}: failed to load from cache file, must scan assemblies.", GetName(baseType, attributeType));
+                    _logger.Debug<TypeLoader, string>("Getting {TypeName}: failed to load from cache file, must scan assemblies.", GetName(baseType, attributeType));
                     scan = true;
                 }
                 else
@@ -775,7 +776,7 @@ namespace Umbraco.Core.Composing
                         catch (Exception ex)
                         {
                             // in case of any exception, we have to exit, and revert to scanning
-                            _logger.Error<TypeLoader>(ex, "Getting {TypeName}: failed to load cache file type {CacheType}, reverting to scanning assemblies.", GetName(baseType, attributeType), type);
+                            _logger.Error<TypeLoader,string,string>(ex, "Getting {TypeName}: failed to load cache file type {CacheType}, reverting to scanning assemblies.", GetName(baseType, attributeType), type);
                             scan = true;
                             break;
                         }
@@ -783,7 +784,7 @@ namespace Umbraco.Core.Composing
 
                     if (scan == false)
                     {
-                        _logger.Debug<TypeLoader>("Getting {TypeName}: loaded types from cache file.", GetName(baseType, attributeType));
+                        _logger.Debug<TypeLoader, string>("Getting {TypeName}: loaded types from cache file.", GetName(baseType, attributeType));
                     }
                 }
             }
@@ -791,7 +792,7 @@ namespace Umbraco.Core.Composing
             if (scan)
             {
                 // either we had to scan, or we could not get the types from the cache file - scan now
-                _logger.Debug<TypeLoader>("Getting {TypeName}: " + action + ".", GetName(baseType, attributeType));
+                _logger.Debug<TypeLoader, string>("Getting {TypeName}: " + action + ".", GetName(baseType, attributeType));
 
                 foreach (var t in finder())
                     typeList.Add(t);
@@ -809,11 +810,11 @@ namespace Umbraco.Core.Composing
                         UpdateCache();
                 }
 
-                _logger.Debug<TypeLoader>("Got {TypeName}, caching ({CacheType}).", GetName(baseType, attributeType), added.ToString().ToLowerInvariant());
+                _logger.Debug<TypeLoader, string, string>("Got {TypeName}, caching ({CacheType}).", GetName(baseType, attributeType), added.ToString().ToLowerInvariant());
             }
             else
             {
-                _logger.Debug<TypeLoader>("Got {TypeName}.", GetName(baseType, attributeType));
+                _logger.Debug<TypeLoader, string>("Got {TypeName}.", GetName(baseType, attributeType));
             }
 
             return typeList.Types;
diff --git a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
index d434da8c70..82f9bd2afe 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Core.Configuration.Grid
                         }
                         catch (Exception ex)
                         {
-                            _logger.Error<GridEditorsConfig>(ex, "Could not parse the contents of grid.editors.config.js into a JSON array '{Json}", sourceString);
+                            _logger.Error<GridEditorsConfig,string>(ex, "Could not parse the contents of grid.editors.config.js into a JSON array '{Json}", sourceString);
                         }
                     }
 
diff --git a/src/Umbraco.Core/IO/FileSystems.cs b/src/Umbraco.Core/IO/FileSystems.cs
index 8906752dd1..3b05adb20f 100644
--- a/src/Umbraco.Core/IO/FileSystems.cs
+++ b/src/Umbraco.Core/IO/FileSystems.cs
@@ -225,7 +225,7 @@ namespace Umbraco.Core.IO
 
                 _shadowCurrentId = id;
 
-                _logger.Debug<ShadowFileSystems>("Shadow '{ShadowId}'", _shadowCurrentId);
+                _logger.Debug<ShadowFileSystems, string>("Shadow '{ShadowId}'", _shadowCurrentId);
 
                 foreach (var wrapper in _shadowWrappers)
                     wrapper.Shadow(_shadowCurrentId);
@@ -242,7 +242,7 @@ namespace Umbraco.Core.IO
                 if (id != _shadowCurrentId)
                     throw new InvalidOperationException("Not the current shadow.");
 
-                _logger.Debug<ShadowFileSystems>("UnShadow '{ShadowId}' {Status}", id, completed ? "complete" : "abort");
+                _logger.Debug<ShadowFileSystems, string, string>("UnShadow '{ShadowId}' {Status}", id, completed ? "complete" : "abort");
 
                 var exceptions = new List<Exception>();
                 foreach (var wrapper in _shadowWrappers)
diff --git a/src/Umbraco.Core/IO/MediaFileSystem.cs b/src/Umbraco.Core/IO/MediaFileSystem.cs
index 05c02171ba..6743275be0 100644
--- a/src/Umbraco.Core/IO/MediaFileSystem.cs
+++ b/src/Umbraco.Core/IO/MediaFileSystem.cs
@@ -51,7 +51,7 @@ namespace Umbraco.Core.IO
                 }
                 catch (Exception e)
                 {
-                    _logger.Error<MediaFileSystem>(e, "Failed to delete media file '{File}'.", file);
+                    _logger.Error<MediaFileSystem,string>(e, "Failed to delete media file '{File}'.", file);
                 }
             });
         }
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index a833ba43af..5ebe6817e5 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -74,11 +74,11 @@ namespace Umbraco.Core.IO
             }
             catch (UnauthorizedAccessException ex)
             {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Not authorized to get directories for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem,string>(ex, "Not authorized to get directories for '{Path}'", fullPath);
             }
             catch (DirectoryNotFoundException ex)
             {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Directory not found for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem,string>(ex, "Directory not found for '{Path}'", fullPath);
             }
 
             return Enumerable.Empty<string>();
@@ -110,7 +110,7 @@ namespace Umbraco.Core.IO
             }
             catch (DirectoryNotFoundException ex)
             {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Directory not found for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem,string>(ex, "Directory not found for '{Path}'", fullPath);
             }
         }
 
@@ -190,11 +190,11 @@ namespace Umbraco.Core.IO
             }
             catch (UnauthorizedAccessException ex)
             {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Not authorized to get directories for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem,string>(ex, "Not authorized to get directories for '{Path}'", fullPath);
             }
             catch (DirectoryNotFoundException ex)
             {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Directory not found for '{FullPath}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem, string>(ex, "Directory not found for '{FullPath}'", fullPath);
             }
 
             return Enumerable.Empty<string>();
@@ -227,7 +227,7 @@ namespace Umbraco.Core.IO
             }
             catch (FileNotFoundException ex)
             {
-                Current.Logger.Error<PhysicalFileSystem>(ex.InnerException, "DeleteFile failed with FileNotFoundException for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem, string>(ex.InnerException, "DeleteFile failed with FileNotFoundException for '{Path}'", fullPath);
             }
         }
 
diff --git a/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs b/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
index d1bde55306..8f26f7e75c 100644
--- a/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
+++ b/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
@@ -129,5 +129,65 @@ namespace Umbraco.Core.Logging
         {
             System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
         }
+        /// <inheritdoc/>
+        public void Fatal<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0,
+            T1 propertyValue1, T2 propertyValue2)
+                => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+        /// <inheritdoc/>
+        public void Fatal<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+        /// <inheritdoc/>
+        public void Fatal<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+        /// <inheritdoc/>
+        public void Error<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0,
+            T1 propertyValue1, T2 propertyValue2)
+                => Error(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+        /// <inheritdoc/>
+        public void Error<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Error(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+        /// <inheritdoc/>
+        public void Error<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Error(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+        /// <inheritdoc/>
+        public void Warn<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0,
+            T1 propertyValue1, T2 propertyValue2)
+                => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1,propertyValue2 });
+        /// <inheritdoc/>
+        public void Warn<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+                => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Warn<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+
+        public void Warn<T0>(Type reporting, string message, T0 propertyValue0)
+            => Warn(reporting, message, new object[] { propertyValue0 });
+
+        public void Info<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Info(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Info<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Info(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Info<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Info(reporting, messageTemplate, new object[] { propertyValue0 });
+
+        public void Debug<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Debug(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Debug<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Debug(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Debug<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Debug(reporting, messageTemplate, new object[] { propertyValue0 });
+
+        public void Verbose<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Verbose(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1,propertyValue2 });
+
+        public void Verbose<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Verbose(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Verbose<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Verbose(reporting, messageTemplate, new object[] { propertyValue0 });
     }
 }
diff --git a/src/Umbraco.Core/Logging/DisposableTimer.cs b/src/Umbraco.Core/Logging/DisposableTimer.cs
index ed98e5cfab..63ae3c2792 100644
--- a/src/Umbraco.Core/Logging/DisposableTimer.cs
+++ b/src/Umbraco.Core/Logging/DisposableTimer.cs
@@ -37,10 +37,10 @@ namespace Umbraco.Core.Logging
                 switch (_level)
                 {
                     case LogLevel.Debug:
-                        logger.Debug(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
+                        logger.Debug<string,string>(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
                         break;
                     case LogLevel.Information:
-                        logger.Info(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
+                        logger.Info<string, string>(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
                         break;
                     default:
                         throw new ArgumentOutOfRangeException(nameof(level));
@@ -84,15 +84,15 @@ namespace Umbraco.Core.Logging
             {
                 if (_failed)
                 {
-                    _logger.Error(_loggerType, _failException, "{FailMessage} ({Duration}ms) [Timing {TimingId}]", _failMessage, Stopwatch.ElapsedMilliseconds, _timingId);
+                    _logger.Error<string,long,string>(_loggerType, _failException, "{FailMessage} ({Duration}ms) [Timing {TimingId}]", _failMessage, Stopwatch.ElapsedMilliseconds, _timingId);
                 }
                 else switch (_level)
                 {
                     case LogLevel.Debug:
-                        _logger.Debug(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
+                        _logger.Debug<string,long,string>(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
                         break;
                     case LogLevel.Information:
-                        _logger.Info(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
+                        _logger.Info<string, long, string>(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
                         break;
                     // filtered in the ctor
                     //default:
diff --git a/src/Umbraco.Core/Logging/ILogger.cs b/src/Umbraco.Core/Logging/ILogger.cs
index 4f49d0b3b4..d8272b6aa0 100644
--- a/src/Umbraco.Core/Logging/ILogger.cs
+++ b/src/Umbraco.Core/Logging/ILogger.cs
@@ -52,7 +52,7 @@ namespace Umbraco.Core.Logging
         /// <param name="messageTemplate">A message template.</param>
         /// <param name="propertyValues">Property values.</param>
         void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
-
+       
         /// <summary>
         /// Logs a fatal message.
         /// </summary>
@@ -92,7 +92,7 @@ namespace Umbraco.Core.Logging
         /// <param name="messageTemplate">A message template.</param>
         /// <param name="propertyValues">Property values.</param>
         void Error(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
-
+       
         /// <summary>
         /// Logs an error message.
         /// </summary>
@@ -132,6 +132,7 @@ namespace Umbraco.Core.Logging
         /// <param name="messageTemplate">A message template.</param>
         /// <param name="propertyValues">Property values.</param>
         void Warn(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
+       
 
         /// <summary>
         /// Logs an information message.
@@ -147,6 +148,7 @@ namespace Umbraco.Core.Logging
         /// <param name="messageTemplate">A message template.</param>
         /// <param name="propertyValues">Property values.</param>
         void Info(Type reporting, string messageTemplate, params object[] propertyValues);
+       
 
         /// <summary>
         /// Logs a debugging message.
@@ -177,5 +179,6 @@ namespace Umbraco.Core.Logging
         /// <param name="messageTemplate">A message template.</param>
         /// <param name="propertyValues">Property values.</param>
         void Verbose(Type reporting, string messageTemplate, params object[] propertyValues);
+        
     }
 }
diff --git a/src/Umbraco.Core/Logging/ILogger2.cs b/src/Umbraco.Core/Logging/ILogger2.cs
new file mode 100644
index 0000000000..0db8021f58
--- /dev/null
+++ b/src/Umbraco.Core/Logging/ILogger2.cs
@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Logging
+{
+    public interface ILogger2 : ILogger
+    {
+        /// <summary>
+        /// Logs a fatal message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Fatal<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a fatal message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Fatal<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a fatal message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Fatal<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs an error message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Error<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs an error message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Error<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs an error message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Error<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Warn<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Warn<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Warn<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="message">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Warn<T0>(Type reporting, string message, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a info message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Info<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a info message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Info<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a info message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Info<T0>(Type reporting, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a debug message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Debug<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a debug message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Debug<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a debug message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Debug<T0>(Type reporting, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a verbose message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Verbose<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a verbose message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Verbose<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a verbose message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Verbose<T0>(Type reporting, string messageTemplate, T0 propertyValue0);
+
+
+        /// <summary>
+        /// Logs a error message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Error<T0>(Type reporting, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a error message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Error<T0,T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+
+        /// <summary>
+        /// Logs a error message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Error<T0, T1,T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+
+        /// <summary>
+        /// Logs a warning message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Warn<T, T0, T1>(string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a warning message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Warn<T, T0, T1, T2>(string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Warn<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Warn<T0, T1>(Type reporting,  string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+    }
+}
diff --git a/src/Umbraco.Core/Logging/LogProfiler.cs b/src/Umbraco.Core/Logging/LogProfiler.cs
index 74dae545b4..c0f8d1b525 100644
--- a/src/Umbraco.Core/Logging/LogProfiler.cs
+++ b/src/Umbraco.Core/Logging/LogProfiler.cs
@@ -24,8 +24,8 @@ namespace Umbraco.Core.Logging
         /// <inheritdoc/>
         public IDisposable Step(string name)
         {
-            _logger.Debug<LogProfiler>("Begin: {ProfileName}", name);
-            return new LightDisposableTimer(duration => _logger.Info<LogProfiler>("End {ProfileName} ({ProfileDuration}ms)", name, duration));
+            _logger.Debug<LogProfiler, string>("Begin: {ProfileName}", name);
+            return new LightDisposableTimer(duration => _logger.Info<LogProfiler, string,long>("End {ProfileName} ({ProfileDuration}ms)", name, duration));
         }
 
         /// <inheritdoc/>
diff --git a/src/Umbraco.Core/Logging/Logger2Extensions.cs b/src/Umbraco.Core/Logging/Logger2Extensions.cs
new file mode 100644
index 0000000000..c6c1352055
--- /dev/null
+++ b/src/Umbraco.Core/Logging/Logger2Extensions.cs
@@ -0,0 +1,442 @@
+using System;
+
+namespace Umbraco.Core.Logging
+{
+    public static class Logger2Extensions
+    {
+        public static void Debug<T0, T1, T2>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Debug(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Debug<T0, T1>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Debug(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Debug<T0>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(reporting, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Debug(reporting, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Error<T0, T1, T2>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Error(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Error<T0, T1>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Error(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Error<T0>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(reporting, exception, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Error(reporting, exception, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Fatal<T0, T1, T2>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Fatal(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Fatal(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Fatal<T0, T1>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Fatal(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Fatal(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Fatal<T0>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Fatal(reporting, exception, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Fatal(reporting, exception, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Info<T0, T1, T2>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Info(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Info<T0, T1>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Info(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Info<T0>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(reporting, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Info(reporting, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Verbose<T0, T1, T2>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Verbose(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Verbose(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Verbose<T0, T1>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Verbose(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Verbose(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Verbose<T0>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Verbose(reporting, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Verbose(reporting, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Warn<T0, T1, T2>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(reporting, messageTemplate, exception, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Warn(reporting, messageTemplate, exception, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Warn<T0, T1>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(reporting, messageTemplate, exception, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Warn(reporting, messageTemplate, exception, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Warn<T0>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(reporting, messageTemplate, exception, propertyValue0);
+            }
+            else
+            {
+                logger.Warn(reporting, messageTemplate, exception, propertyValue0);
+            }
+        }
+
+        public static void Warn<T0>(this ILogger logger, Type reporting, string message, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(reporting, message, propertyValue0);
+            }
+            else
+            {
+                logger.Warn(reporting, message, propertyValue0);
+            }
+        }
+
+       //
+        public static void Error<T, T0>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), exception, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Error(typeof(T), exception, messageTemplate, propertyValue0);
+            }
+        }
+        
+        public static void Error<T, T0,T1>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Error(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        
+        public static void Error<T, T0, T1,T2>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Error(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+        public static void Error<T,T0>(this ILogger logger, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Error(typeof(T), messageTemplate, propertyValue0);
+            }
+        }
+        public static void Error<T, T0,T1>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Error(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        public static void Error<T, T0, T1,T2>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Error(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+        public static void Warn<T, T0>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), exception, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Warn(typeof(T), exception, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Warn<T, T0, T1>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Warn(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Warn<T, T0, T1, T2>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Warn(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Warn<T, T0>(this ILogger logger, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Warn(typeof(T), messageTemplate, propertyValue0);
+            }
+        }
+        public static void Warn<T, T0, T1>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Warn(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        public static void Warn<T, T0, T1, T2>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Warn(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+       
+        public static void Info<T, T0>(this ILogger logger, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(typeof(T), messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Info(typeof(T), messageTemplate, propertyValue0);
+            }
+        }
+        public static void Info<T, T0, T1>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Info(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        public static void Info<T, T0, T1, T2>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Info(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+        public static void Debug<T, T0>(this ILogger logger, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(typeof(T), messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Debug(typeof(T), messageTemplate, propertyValue0);
+            }
+        }
+        public static void Debug<T, T0, T1>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Debug(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        public static void Debug<T, T0, T1, T2>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Debug(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Logging/OwinLogger.cs b/src/Umbraco.Core/Logging/OwinLogger.cs
index 5601cb53f2..7fc36e748c 100644
--- a/src/Umbraco.Core/Logging/OwinLogger.cs
+++ b/src/Umbraco.Core/Logging/OwinLogger.cs
@@ -26,34 +26,34 @@ namespace Umbraco.Core.Logging
             switch (eventType)
             {
                 case TraceEventType.Critical:
-                    _logger.Fatal(_type.Value, exception, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Fatal<TraceEventType, int, object>(_type.Value, exception, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Error:
-                    _logger.Error(_type.Value, exception, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Error<TraceEventType,int,object>(_type.Value, exception, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Warning:
                     _logger.Warn(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Information:
-                    _logger.Info(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Info<TraceEventType, int, object>(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Verbose:
-                    _logger.Debug(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Debug<TraceEventType, int, object>(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Start:
-                    _logger.Debug(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Debug<TraceEventType, int, object>(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Stop:
-                    _logger.Debug(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Debug<TraceEventType, int, object>(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Suspend:
-                    _logger.Debug(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Debug<TraceEventType, int, object>(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Resume:
-                    _logger.Debug(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Debug<TraceEventType, int, object>(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 case TraceEventType.Transfer:
-                    _logger.Debug(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
+                    _logger.Debug<TraceEventType, int, object>(_type.Value, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
                     return true;
                 default:
                     throw new ArgumentOutOfRangeException("eventType");
diff --git a/src/Umbraco.Core/Logging/ProfilingLogger.cs b/src/Umbraco.Core/Logging/ProfilingLogger.cs
index d642926147..e49aaa26c6 100644
--- a/src/Umbraco.Core/Logging/ProfilingLogger.cs
+++ b/src/Umbraco.Core/Logging/ProfilingLogger.cs
@@ -127,6 +127,64 @@ namespace Umbraco.Core.Logging
         public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
             => Logger.Verbose(reporting, messageTemplate, propertyValues);
 
+        public void Fatal<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0,
+            T1 propertyValue1, T2 propertyValue2)
+            => Logger.Fatal<T0, T1, T2>(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+
+        public void Fatal<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Logger.Fatal<T0, T1>(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+
+        public void Fatal<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Logger.Fatal<T0>(reporting, exception, messageTemplate, propertyValue0);
+
+        public void Error<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate,
+            T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Logger.Error<T0, T1, T2>(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+
+        public void Error<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Logger.Error<T0, T1>(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+
+        public void Error<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Logger.Error<T0>(reporting, exception, messageTemplate, propertyValue0);
+
+        public void Warn<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Logger.Warn<T0, T1, T2>(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+
+        public void Warn<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Logger.Warn<T0, T1>(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+
+        public void Warn<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Logger.Warn<T0>(reporting, exception, messageTemplate, propertyValue0);
+
+        public void Warn<T0>(Type reporting, string message, T0 propertyValue0) => Logger.Warn(reporting, message, propertyValue0);
+
+        public void Info<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Logger.Info<T0, T1, T2>(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+
+        public void Info<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Logger.Info<T0, T1>(reporting, messageTemplate, propertyValue0, propertyValue1);
+
+        public void Info<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Logger.Info<T0>(reporting, messageTemplate, propertyValue0);
+
+        public void Debug<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Logger.Debug<T0, T1, T2>(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+
+        public void Debug<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Logger.Debug<T0, T1>(reporting, messageTemplate, propertyValue0, propertyValue1);
+
+        public void Debug<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Logger.Debug<T0>(reporting, messageTemplate, propertyValue0);
+
+        public void Verbose<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Logger.Verbose<T0, T1, T2>(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+
+        public void Verbose<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Logger.Verbose<T0, T1>(reporting, messageTemplate, propertyValue0, propertyValue1);
+
+        public void Verbose<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Logger.Verbose<T0>(reporting, messageTemplate, propertyValue0);
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Core/Logging/Serilog/SerilogLogger.cs b/src/Umbraco.Core/Logging/Serilog/SerilogLogger.cs
index a51628030e..0f6121c1ee 100644
--- a/src/Umbraco.Core/Logging/Serilog/SerilogLogger.cs
+++ b/src/Umbraco.Core/Logging/Serilog/SerilogLogger.cs
@@ -118,6 +118,30 @@ namespace Umbraco.Core.Logging.Serilog
             logger.Fatal(exception, messageTemplate, propertyValues);
         }
 
+        /// <inheritdoc/>
+        public void Fatal<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Fatal, exception, ref messageTemplate);
+            logger.Fatal(exception, messageTemplate, propertyValue0);
+        }
+
+        /// <inheritdoc/>
+        public void Fatal<T0,T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Fatal, exception, ref messageTemplate);
+            logger.Fatal(exception, messageTemplate, propertyValue0, propertyValue1);
+        }
+
+        /// <inheritdoc/>
+        public void Fatal<T0, T1,T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Fatal, exception, ref messageTemplate);
+            logger.Fatal(exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+        }
+
         /// <inheritdoc/>
         public void Error(Type reporting, Exception exception, string message)
         {
@@ -154,6 +178,29 @@ namespace Umbraco.Core.Logging.Serilog
             DumpThreadAborts(logger, LogEventLevel.Error, exception, ref messageTemplate);
             logger.Error(exception, messageTemplate, propertyValues);
         }
+        /// <inheritdoc/>
+        public void Error<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Error, exception, ref messageTemplate);
+            logger.Error(exception, messageTemplate, propertyValue0);
+        }
+
+        /// <inheritdoc/>
+        public void Error<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Error, exception, ref messageTemplate);
+            logger.Error(exception, messageTemplate, propertyValue0, propertyValue1);
+        }
+
+        /// <inheritdoc/>
+        public void Error<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Error, exception, ref messageTemplate);
+            logger.Error(exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+        }
 
         private static void DumpThreadAborts(global::Serilog.ILogger logger, LogEventLevel level, Exception exception, ref string messageTemplate)
         {
@@ -224,6 +271,12 @@ namespace Umbraco.Core.Logging.Serilog
             LoggerFor(reporting).Warning(message, propertyValues);
         }
 
+        /// <inheritdoc/>
+        public void Warn<T0>(Type reporting, string message, T0 propertyValue0)
+        {
+            LoggerFor(reporting).Warning(message, propertyValue0);
+        }
+
         /// <inheritdoc/>
         public void Warn(Type reporting, Exception exception, string message)
         {
@@ -235,6 +288,29 @@ namespace Umbraco.Core.Logging.Serilog
         {
             LoggerFor(reporting).Warning(exception, messageTemplate, propertyValues);
         }
+        /// <inheritdoc/>
+        public void Warn<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Warning, exception, ref messageTemplate);
+            logger.Warning(exception, messageTemplate, propertyValue0);
+        }
+
+        /// <inheritdoc/>
+        public void Warn<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Warning, exception, ref messageTemplate);
+            logger.Warning(exception, messageTemplate, propertyValue0, propertyValue1);
+        }
+
+        /// <inheritdoc/>
+        public void Warn<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            var logger = LoggerFor(reporting);
+            DumpThreadAborts(logger, LogEventLevel.Warning, exception, ref messageTemplate);
+            logger.Warning(exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+        }
 
         /// <inheritdoc/>
         public void Info(Type reporting, string message)
@@ -248,6 +324,23 @@ namespace Umbraco.Core.Logging.Serilog
             LoggerFor(reporting).Information(messageTemplate, propertyValues);
         }
 
+
+        /// <inheritdoc/>
+        public void Info<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            LoggerFor(reporting).Information(messageTemplate, propertyValue0);
+        }
+        /// <inheritdoc/>
+        public void Info<T0,T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            LoggerFor(reporting).Information(messageTemplate, propertyValue0, propertyValue1);
+        }
+        /// <inheritdoc/>
+        public void Info<T0,T1,T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            LoggerFor(reporting).Information(messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+        }
+
         /// <inheritdoc/>
         public void Debug(Type reporting, string message)
         {
@@ -259,6 +352,21 @@ namespace Umbraco.Core.Logging.Serilog
         {
             LoggerFor(reporting).Debug(messageTemplate, propertyValues);
         }
+        /// <inheritdoc/>
+        public void Debug<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            LoggerFor(reporting).Debug(messageTemplate, propertyValue0);
+        }
+        /// <inheritdoc/>
+        public void Debug<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            LoggerFor(reporting).Debug(messageTemplate, propertyValue0, propertyValue1);
+        }
+        /// <inheritdoc/>
+        public void Debug<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            LoggerFor(reporting).Debug(messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+        }
 
         /// <inheritdoc/>
         public void Verbose(Type reporting, string message)
@@ -272,6 +380,22 @@ namespace Umbraco.Core.Logging.Serilog
             LoggerFor(reporting).Verbose(messageTemplate, propertyValues);
         }
 
+        /// <inheritdoc/>
+        public void Verbose<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            LoggerFor(reporting).Verbose(messageTemplate, propertyValue0);
+        }
+        /// <inheritdoc/>
+        public void Verbose<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            LoggerFor(reporting).Verbose(messageTemplate, propertyValue0, propertyValue1);
+        }
+        /// <inheritdoc/>
+        public void Verbose<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            LoggerFor(reporting).Verbose(messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+        }
+
         public void Dispose()
         {
             Log.CloseAndFlush();
diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs
index 1ecc738b95..9bbb0875d8 100644
--- a/src/Umbraco.Core/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/ManifestParser.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Core.Manifest
                 }
                 catch (Exception e)
                 {
-                    _logger.Error<ManifestParser>(e, "Failed to parse manifest at '{Path}', ignoring.", path);
+                    _logger.Error<ManifestParser, string>(e, "Failed to parse manifest at '{Path}', ignoring.", path);
                 }
             }
 
diff --git a/src/Umbraco.Core/Manifest/ManifestWatcher.cs b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
index 4c0ddbf822..6c195edb45 100644
--- a/src/Umbraco.Core/Manifest/ManifestWatcher.cs
+++ b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Core.Manifest
                 if (_isRestarting) return;
 
                 _isRestarting = true;
-                _logger.Info<ManifestWatcher>("Manifest has changed, app pool is restarting ({Path})", e.FullPath);
+                _logger.Info<ManifestWatcher, string>("Manifest has changed, app pool is restarting ({Path})", e.FullPath);
                 HttpRuntime.UnloadAppDomain();
                 Dispose(); // uh? if the app restarts then this should be disposed anyways?
             }
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs
index fb9b8af46d..7106ef188e 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs
@@ -332,9 +332,9 @@ namespace Umbraco.Core.Migrations.Install
             }
 
             // save
-            logger.Info<DatabaseBuilder>("Saving connection string to {ConfigFile}.", fileSource);
+            logger.Info<DatabaseBuilder, string>("Saving connection string to {ConfigFile}.", fileSource);
             xml.Save(fileName, SaveOptions.DisableFormatting);
-            logger.Info<DatabaseBuilder>("Saved connection string to {ConfigFile}.", fileSource);
+            logger.Info<DatabaseBuilder, string>("Saved connection string to {ConfigFile}.", fileSource);
         }
 
         private static void AddOrUpdateAttribute(XElement element, string name, string value)
@@ -459,7 +459,7 @@ namespace Umbraco.Core.Migrations.Install
                     message = message + "<p>Installation completed!</p>";
 
                     //now that everything is done, we need to determine the version of SQL server that is executing
-                    _logger.Info<DatabaseBuilder>("Database configuration status: {DbConfigStatus}", message);
+                    _logger.Info<DatabaseBuilder, string>("Database configuration status: {DbConfigStatus}", message);
                     return new Result { Message = message, Success = true, Percentage = "100" };
                 }
 
@@ -508,7 +508,7 @@ namespace Umbraco.Core.Migrations.Install
 
                 //now that everything is done, we need to determine the version of SQL server that is executing
 
-                _logger.Info<DatabaseBuilder>("Database configuration status: {DbConfigStatus}", message);
+                _logger.Info<DatabaseBuilder, string>("Database configuration status: {DbConfigStatus}", message);
 
                 return new Result { Message = message, Success = true, Percentage = "100" };
             }
@@ -539,7 +539,7 @@ namespace Umbraco.Core.Migrations.Install
 
             if (_databaseSchemaValidationResult != null)
             {
-                _logger.Info<DatabaseBuilder>("The database schema validation produced the following summary: {DbSchemaSummary}", _databaseSchemaValidationResult.GetSummary());
+                _logger.Info<DatabaseBuilder, string>("The database schema validation produced the following summary: {DbSchemaSummary}", _databaseSchemaValidationResult.GetSummary());
             }
 
             return new Result
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 9bd26749ad..44de611348 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Core.Migrations.Install
         /// <param name="tableName">Name of the table to create base data for</param>
         public void InitializeBaseData(string tableName)
         {
-            _logger.Info<DatabaseDataCreator>("Creating data in {TableName}", tableName);
+            _logger.Info<DatabaseDataCreator, string>("Creating data in {TableName}", tableName);
 
             if (tableName.Equals(Constants.DatabaseSchema.Tables.Node))
                 CreateNodeData();
@@ -73,7 +73,7 @@ namespace Umbraco.Core.Migrations.Install
             if (tableName.Equals(Constants.DatabaseSchema.Tables.KeyValue))
                 CreateKeyValueData();
 
-            _logger.Info<DatabaseDataCreator>("Done creating table {TableName} data.", tableName);
+            _logger.Info<DatabaseDataCreator, string>("Done creating table {TableName} data.", tableName);
         }
 
         private void CreateNodeData()
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
index e9580da74a..c3756cfaad 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Core.Migrations.Install
                 var tableNameAttribute = table.FirstAttribute<TableNameAttribute>();
                 var tableName = tableNameAttribute == null ? table.Name : tableNameAttribute.Value;
 
-                _logger.Info<DatabaseSchemaCreator>("Uninstall {TableName}", tableName);
+                _logger.Info<DatabaseSchemaCreator, string>("Uninstall {TableName}", tableName);
 
                 try
                 {
@@ -111,7 +111,7 @@ namespace Umbraco.Core.Migrations.Install
                 {
                     //swallow this for now, not sure how best to handle this with diff databases... though this is internal
                     // and only used for unit tests. If this fails its because the table doesn't exist... generally!
-                    _logger.Error<DatabaseSchemaCreator>(ex, "Could not drop table {TableName}", tableName);
+                    _logger.Error<DatabaseSchemaCreator, string>(ex, "Could not drop table {TableName}", tableName);
                 }
             }
         }
@@ -436,7 +436,7 @@ namespace Umbraco.Core.Migrations.Install
             var tableExist = TableExists(tableName);
             if (overwrite && tableExist)
             {
-                _logger.Info<DatabaseSchemaCreator>("Table {TableName} already exists, but will be recreated", tableName);
+                _logger.Info<DatabaseSchemaCreator, string>("Table {TableName} already exists, but will be recreated", tableName);
 
                 DropTable(tableName);
                 tableExist = false;
@@ -445,19 +445,19 @@ namespace Umbraco.Core.Migrations.Install
             if (tableExist)
             {
                 // The table exists and was not recreated/overwritten.
-                _logger.Info<Database>("Table {TableName} already exists - no changes were made", tableName);
+                _logger.Info<Database, string>("Table {TableName} already exists - no changes were made", tableName);
                 return;
             }
 
             //Execute the Create Table sql
             _database.Execute(new Sql(createSql));
-            _logger.Info<DatabaseSchemaCreator>("Create Table {TableName}: \n {Sql}", tableName, createSql);
+            _logger.Info<DatabaseSchemaCreator,string,string>("Create Table {TableName}: \n {Sql}", tableName, createSql);
 
             //If any statements exists for the primary key execute them here
             if (string.IsNullOrEmpty(createPrimaryKeySql) == false)
             {
                 _database.Execute(new Sql(createPrimaryKeySql));
-                _logger.Info<DatabaseSchemaCreator>("Create Primary Key:\n {Sql}", createPrimaryKeySql);
+                _logger.Info<DatabaseSchemaCreator,string>("Create Primary Key:\n {Sql}", createPrimaryKeySql);
             }
 
             if (SqlSyntax.SupportsIdentityInsert() && tableDefinition.Columns.Any(x => x.IsIdentity))
@@ -475,23 +475,23 @@ namespace Umbraco.Core.Migrations.Install
             foreach (var sql in indexSql)
             {
                 _database.Execute(new Sql(sql));
-                _logger.Info<DatabaseSchemaCreator>("Create Index:\n {Sql}", sql);
+                _logger.Info<DatabaseSchemaCreator,string>("Create Index:\n {Sql}", sql);
             }
 
             //Loop through foreignkey statements and execute sql
             foreach (var sql in foreignSql)
             {
                 _database.Execute(new Sql(sql));
-                _logger.Info<DatabaseSchemaCreator>("Create Foreign Key:\n {Sql}", sql);
+                _logger.Info<DatabaseSchemaCreator,string>("Create Foreign Key:\n {Sql}", sql);
             }
 
             if (overwrite)
             {
-                _logger.Info<Database>("Table {TableName} was recreated", tableName);
+                _logger.Info<Database,string>("Table {TableName} was recreated", tableName);
             }
             else
             {
-                _logger.Info<Database>("New table {TableName} was created", tableName);
+                _logger.Info<Database,string>("New table {TableName} was created", tableName);
 
             }
         }
diff --git a/src/Umbraco.Core/Migrations/MigrationPlan.cs b/src/Umbraco.Core/Migrations/MigrationPlan.cs
index 89c3c809e8..088d990221 100644
--- a/src/Umbraco.Core/Migrations/MigrationPlan.cs
+++ b/src/Umbraco.Core/Migrations/MigrationPlan.cs
@@ -294,11 +294,11 @@ namespace Umbraco.Core.Migrations
             if (migrationBuilder == null) throw new ArgumentNullException(nameof(migrationBuilder));
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            logger.Info<MigrationPlan>("Starting '{MigrationName}'...", Name);
+            logger.Info<MigrationPlan, string>("Starting '{MigrationName}'...", Name);
 
             var origState = fromState ?? string.Empty;
 
-            logger.Info<MigrationPlan>("At {OrigState}", string.IsNullOrWhiteSpace(origState) ? "origin": origState);
+            logger.Info<MigrationPlan, string>("At {OrigState}", string.IsNullOrWhiteSpace(origState) ? "origin": origState);
 
             if (!_transitions.TryGetValue(origState, out var transition))
                 ThrowOnUnknownInitialState(origState);
@@ -308,7 +308,7 @@ namespace Umbraco.Core.Migrations
 
             while (transition != null)
             {
-                logger.Info<MigrationPlan>("Execute {MigrationType}", transition.MigrationType.Name);
+                logger.Info<MigrationPlan, string>("Execute {MigrationType}", transition.MigrationType.Name);
 
                 var migration = migrationBuilder.Build(transition.MigrationType, context);
                 migration.Migrate();
@@ -316,7 +316,7 @@ namespace Umbraco.Core.Migrations
                 var nextState = transition.TargetState;
                 origState = nextState;
 
-                logger.Info<MigrationPlan>("At {OrigState}", origState);
+                logger.Info<MigrationPlan, string>("At {OrigState}", origState);
 
                 // throw a raw exception here: this should never happen as the plan has
                 // been validated - this is just a paranoid safety test
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
index 95b272dcb4..b69158e433 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
@@ -94,7 +94,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 {
                     if (!LegacyAliases.Contains(dataType.EditorAlias))
                     {
-                        _logger.Warn<DataTypeMigration>(
+                        _logger.Warn<DataTypeMigration,int,string>(
                             "Skipping validation of configuration for data type {NodeId} : {EditorAlias}."
                             + " Please ensure that the configuration is valid. The site may fail to start and / or load data types and run.",
                             dataType.NodeId, dataType.EditorAlias);
@@ -104,7 +104,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 {
                     if (!LegacyAliases.Contains(newAlias))
                     {
-                        _logger.Warn<DataTypeMigration>("Skipping validation of configuration for data type {NodeId} : {NewEditorAlias} (was: {EditorAlias})"
+                        _logger.Warn<DataTypeMigration,int,string,string>("Skipping validation of configuration for data type {NodeId} : {NewEditorAlias} (was: {EditorAlias})"
                                                         + " because no property editor with that alias was found."
                                                         + " Please ensure that the configuration is valid. The site may fail to start and / or load data types and run.",
                             dataType.NodeId, newAlias, dataType.EditorAlias);
@@ -119,7 +119,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                     }
                     catch (Exception e)
                     {
-                        _logger.Warn<DataTypeMigration>(e, "Failed to validate configuration for data type {NodeId} : {NewEditorAlias} (was: {EditorAlias})."
+                        _logger.Warn<DataTypeMigration,int,string,string>(e, "Failed to validate configuration for data type {NodeId} : {NewEditorAlias} (was: {EditorAlias})."
                                                         + " Please fix the configuration and ensure it is valid. The site may fail to start and / or load data types and run.",
                                                         dataType.NodeId, newAlias, dataType.EditorAlias);
                     }
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs
index 06f5d45deb..2eadb6c045 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes
         public IPreValueMigrator GetMigrator(string editorAlias)
         {
             var migrator = this.FirstOrDefault(x => x.CanMigrate(editorAlias));
-            _logger.Debug(GetType(), "Getting migrator for \"{EditorAlias}\" = {MigratorType}", editorAlias, migrator == null ? "<null>" : migrator.GetType().Name);
+            _logger.Debug<string,string>(GetType(), "Getting migrator for \"{EditorAlias}\" = {MigratorType}", editorAlias, migrator == null ? "<null>" : migrator.GetType().Name);
             return migrator;
         }
     }
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs
index d30719231a..ed2681e6f1 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                     }
                     catch (Exception ex)
                     {
-                        Logger.Error<DropDownPropertyEditorsMigration>(
+                        Logger.Error<DropDownPropertyEditorsMigration, string>(
                             ex, "Invalid configuration: \"{Configuration}\", cannot convert editor.",
                             dataType.Configuration);
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
index 37a83bdd67..d4f483c46e 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error<DropDownPropertyEditorsMigration>(
+                    Logger.Error<DropDownPropertyEditorsMigration, string>(
                         ex,
                         "Invalid property editor configuration detected: \"{Configuration}\", cannot convert editor, values will be cleared",
                         dataType.Configuration);
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs
index e96fa1f7e9..fadc3579f2 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error<DropDownPropertyEditorsMigration>(
+                    Logger.Error<DropDownPropertyEditorsMigration, string>(
                         ex, "Invalid configuration: \"{Configuration}\", cannot convert editor.",
                         dataType.Configuration);
 
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index 49e07a486d..07f43074a7 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -501,7 +501,7 @@ namespace Umbraco.Core.Models
         {
             void DoLog(string logPropertyAlias, string logPropertyName)
             {
-                Current.Logger.Warn<Member>("Trying to access the '{PropertyName}' property on '{MemberType}' " +
+                Current.Logger.Warn<Member,string,Type,string>("Trying to access the '{PropertyName}' property on '{MemberType}' " +
                                             "but the {PropertyAlias} property does not exist on the member type so a default value is returned. " +
                                             "Ensure that you have a property type with alias:  {PropertyAlias} configured on your member type in order to use the '{PropertyName}' property on the model correctly.",
                                                 logPropertyName,
@@ -526,7 +526,7 @@ namespace Umbraco.Core.Models
         {
             void DoLog(string logPropertyAlias, string logPropertyName)
             {
-                Current.Logger.Warn<Member>("An attempt was made to set a value on the property '{PropertyName}' on type '{MemberType}' but the " +
+                Current.Logger.Warn<Member,string,Type,string>("An attempt was made to set a value on the property '{PropertyName}' on type '{MemberType}' but the " +
                                             "property type {PropertyAlias} does not exist on the member type, ensure that this property type exists so that setting this property works correctly.",
                                                 logPropertyName,
                                                 typeof(Member),
diff --git a/src/Umbraco.Core/Packaging/PackageActionRunner.cs b/src/Umbraco.Core/Packaging/PackageActionRunner.cs
index 8434f52f30..41dbc5cf4c 100644
--- a/src/Umbraco.Core/Packaging/PackageActionRunner.cs
+++ b/src/Umbraco.Core/Packaging/PackageActionRunner.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Packaging
                 catch (Exception ex)
                 {
                     e.Add($"{ipa.Alias()} - {ex.Message}");
-                    _logger.Error<PackageActionRunner>(ex, "Error loading package action '{PackageActionAlias}' for package {PackageName}", ipa.Alias(), packageName);
+                    _logger.Error<PackageActionRunner, string, string>(ex, "Error loading package action '{PackageActionAlias}' for package {PackageName}", ipa.Alias(), packageName);
                 }
             }
 
@@ -56,7 +56,7 @@ namespace Umbraco.Core.Packaging
                 catch (Exception ex)
                 {
                     e.Add($"{ipa.Alias()} - {ex.Message}");
-                    _logger.Error<PackageActionRunner>(ex, "Error undoing package action '{PackageActionAlias}' for package {PackageName}", ipa.Alias(), packageName);
+                    _logger.Error<PackageActionRunner, string, string>(ex, "Error undoing package action '{PackageActionAlias}' for package {PackageName}", ipa.Alias(), packageName);
                 }
             }
             errors = e;
diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 6262f99c56..016b349282 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -564,7 +564,7 @@ namespace Umbraco.Core.Packaging
                         var tryCreateFolder = _contentTypeService.CreateContainer(-1, rootFolder);
                         if (tryCreateFolder == false)
                         {
-                            _logger.Error<PackagingService>(tryCreateFolder.Exception, "Could not create folder: {FolderName}", rootFolder);
+                            _logger.Error<PackagingService, string>(tryCreateFolder.Exception, "Could not create folder: {FolderName}", rootFolder);
                             throw tryCreateFolder.Exception;
                         }
                         var rootFolderId = tryCreateFolder.Result.Entity.Id;
@@ -598,7 +598,7 @@ namespace Umbraco.Core.Packaging
             var tryCreateFolder = _contentTypeService.CreateContainer(current.Id, folderName);
             if (tryCreateFolder == false)
             {
-                _logger.Error<PackagingService>(tryCreateFolder.Exception, "Could not create folder: {FolderName}", folderName);
+                _logger.Error<PackagingService, string>(tryCreateFolder.Exception, "Could not create folder: {FolderName}", folderName);
                 throw tryCreateFolder.Exception;
             }
             return _contentTypeService.GetContainer(tryCreateFolder.Result.Entity.Id);
@@ -713,7 +713,7 @@ namespace Umbraco.Core.Packaging
                     }
                     else
                     {
-                        _logger.Warn<PackagingService>("Packager: Error handling allowed templates. Template with alias '{TemplateAlias}' could not be found.", alias);
+                        _logger.Warn<PackagingService,string>("Packager: Error handling allowed templates. Template with alias '{TemplateAlias}' could not be found.", alias);
                     }
                 }
 
@@ -729,7 +729,7 @@ namespace Umbraco.Core.Packaging
                 }
                 else
                 {
-                    _logger.Warn<PackagingService>("Packager: Error handling default template. Default template with alias '{DefaultTemplateAlias}' could not be found.", defaultTemplateElement.Value);
+                    _logger.Warn<PackagingService,string>("Packager: Error handling default template. Default template with alias '{DefaultTemplateAlias}' could not be found.", defaultTemplateElement.Value);
                 }
             }
         }
@@ -801,7 +801,7 @@ namespace Umbraco.Core.Packaging
                 if (dataTypeDefinition == null)
                 {
                     // TODO: We should expose this to the UI during install!
-                    _logger.Warn<PackagingService>("Packager: Error handling creation of PropertyType '{PropertyType}'. Could not find DataTypeDefintion with unique id '{DataTypeDefinitionId}' nor one referencing the DataType with a property editor alias (or legacy control id) '{PropertyEditorAlias}'. Did the package creator forget to package up custom datatypes? This property will be converted to a label/readonly editor if one exists.",
+                    _logger.Warn<PackagingService, string, Guid, string>("Packager: Error handling creation of PropertyType '{PropertyType}'. Could not find DataTypeDefintion with unique id '{DataTypeDefinitionId}' nor one referencing the DataType with a property editor alias (or legacy control id) '{PropertyEditorAlias}'. Did the package creator forget to package up custom datatypes? This property will be converted to a label/readonly editor if one exists.",
                         property.Element("Name").Value, dataTypeDefinitionId, property.Element("Type").Value.Trim());
 
                     //convert to a label!
@@ -863,7 +863,7 @@ namespace Umbraco.Core.Packaging
                 var allowedChild = importedContentTypes.ContainsKey(alias) ? importedContentTypes[alias] : _contentTypeService.Get(alias);
                 if (allowedChild == null)
                 {
-                    _logger.Warn<PackagingService>(
+                    _logger.Warn<PackagingService, string, string>(
                         "Packager: Error handling DocumentType structure. DocumentType with alias '{DoctypeAlias}' could not be found and was not added to the structure for '{DoctypeStructureAlias}'.",
                         alias, contentType.Alias);
                     continue;
@@ -984,7 +984,7 @@ namespace Umbraco.Core.Packaging
                         var tryCreateFolder = _dataTypeService.CreateContainer(-1, rootFolder);
                         if (tryCreateFolder == false)
                         {
-                            _logger.Error<PackagingService>(tryCreateFolder.Exception, "Could not create folder: {FolderName}", rootFolder);
+                            _logger.Error<PackagingService, string>(tryCreateFolder.Exception, "Could not create folder: {FolderName}", rootFolder);
                             throw tryCreateFolder.Exception;
                         }
                         current = _dataTypeService.GetContainer(tryCreateFolder.Result.Entity.Id);
@@ -1017,7 +1017,7 @@ namespace Umbraco.Core.Packaging
             var tryCreateFolder = _dataTypeService.CreateContainer(current.Id, folderName);
             if (tryCreateFolder == false)
             {
-                _logger.Error<PackagingService>(tryCreateFolder.Exception, "Could not create folder: {FolderName}", folderName);
+                _logger.Error<PackagingService, string>(tryCreateFolder.Exception, "Could not create folder: {FolderName}", folderName);
                 throw tryCreateFolder.Exception;
             }
             return _dataTypeService.GetContainer(tryCreateFolder.Result.Entity.Id);
@@ -1322,7 +1322,7 @@ namespace Umbraco.Core.Packaging
                 else if (string.IsNullOrEmpty((string)elementCopy.Element("Master")) == false &&
                          templateElements.Any(x => (string)x.Element("Alias") == (string)elementCopy.Element("Master")) == false)
                 {
-                    _logger.Info<PackageDataInstallation>(
+                    _logger.Info<PackageDataInstallation, string, string>(
                         "Template '{TemplateAlias}' has an invalid Master '{TemplateMaster}', so the reference has been ignored.",
                         (string)elementCopy.Element("Alias"),
                         (string)elementCopy.Element("Master"));
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index a78a073554..ddac0ee3d6 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -701,7 +701,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 {
                     if (ContentRepositoryBase.ThrowOnWarning)
                         throw new InvalidOperationException($"The query returned multiple property sets for content {temp.Id}, {temp.ContentType.Name}");
-                    Logger.Warn<ContentRepositoryBase<TId, TEntity, TRepository>>("The query returned multiple property sets for content {ContentId}, {ContentTypeName}", temp.Id, temp.ContentType.Name);
+                    Logger.Warn<ContentRepositoryBase<TId, TEntity, TRepository>, int, string>("The query returned multiple property sets for content {ContentId}, {ContentTypeName}", temp.Id, temp.ContentType.Name);
                 }
 
                 result[temp.VersionId] = new PropertyCollection(properties);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
index 483f2393af..6571a847a9 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
@@ -228,7 +228,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (string.IsNullOrWhiteSpace(entity.Alias))
             {
                 var ex = new Exception($"ContentType '{entity.Name}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.");
-                Logger.Error<ContentTypeRepository>("ContentType '{EntityName}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.", entity.Name);
+                Logger.Error<ContentTypeRepository,string>("ContentType '{EntityName}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.", entity.Name);
                 throw ex;
             }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index ed0c288691..a061337127 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -1203,7 +1203,7 @@ AND umbracoNode.id <> @id",
             {
                 var ex = new InvalidOperationException($"Property Type '{pt.Name}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.");
 
-                Logger.Error<ContentTypeRepositoryBase<TEntity>>("Property Type '{PropertyTypeName}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.",
+                Logger.Error<ContentTypeRepositoryBase<TEntity>, string>("Property Type '{PropertyTypeName}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.",
                     pt.Name);
 
                 throw ex;
@@ -1216,7 +1216,7 @@ AND umbracoNode.id <> @id",
             {
                 var ex = new InvalidOperationException($"{typeof(TEntity).Name} '{entity.Name}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.");
 
-                Logger.Error<ContentTypeRepositoryBase<TEntity>>("{EntityTypeName} '{EntityName}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.",
+                Logger.Error<ContentTypeRepositoryBase<TEntity>, string, string>("{EntityTypeName} '{EntityName}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.",
                     typeof(TEntity).Name,
                     entity.Name);
 
@@ -1248,7 +1248,7 @@ AND umbracoNode.id <> @id",
                 }
                 else
                 {
-                    Logger.Warn<ContentTypeRepositoryBase<TEntity>>("Could not assign a data type for the property type {PropertyTypeAlias} since no data type was found with a property editor {PropertyEditorAlias}", propertyType.Alias, propertyType.PropertyEditorAlias);
+                    Logger.Warn<ContentTypeRepositoryBase<TEntity>, string, string>("Could not assign a data type for the property type {PropertyTypeAlias} since no data type was found with a property editor {PropertyEditorAlias}", propertyType.Alias, propertyType.PropertyEditorAlias);
                 }
             }
         }
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
index a95d95ea08..5e6192eb5c 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
@@ -203,10 +203,10 @@ namespace Umbraco.Core.Persistence
 
         protected override void OnException(Exception ex)
         {
-            _logger.Error<UmbracoDatabase>(ex, "Exception ({InstanceId}).", InstanceId);
-            _logger.Debug<UmbracoDatabase>("At:\r\n{StackTrace}", Environment.StackTrace);
+            _logger.Error<UmbracoDatabase, string>(ex, "Exception ({InstanceId}).", InstanceId);
+            _logger.Debug<UmbracoDatabase, string>("At:\r\n{StackTrace}", Environment.StackTrace);
             if (EnableSqlTrace == false)
-                _logger.Debug<UmbracoDatabase>("Sql:\r\n{Sql}", CommandToString(LastSQL, LastArgs));
+                _logger.Debug<UmbracoDatabase, string>("Sql:\r\n{Sql}", CommandToString(LastSQL, LastArgs));
             base.OnException(ex);
         }
 
@@ -219,7 +219,7 @@ namespace Umbraco.Core.Persistence
                 cmd.CommandTimeout = cmd.Connection.ConnectionTimeout;
 
             if (EnableSqlTrace)
-                _logger.Debug<UmbracoDatabase>("SQL Trace:\r\n{Sql}", CommandToString(cmd).Replace("{", "{{").Replace("}", "}}")); // TODO: these escapes should be builtin
+                _logger.Debug<UmbracoDatabase, string>("SQL Trace:\r\n{Sql}", CommandToString(cmd).Replace("{", "{{").Replace("}", "}}")); // TODO: these escapes should be builtin
 
 #if DEBUG_DATABASES
             // detects whether the command is already in use (eg still has an open reader...)
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
index baab8c486e..b113769a1a 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
@@ -162,7 +162,7 @@ namespace Umbraco.Core.Persistence
                 // else leave unchanged
             }
 
-            _logger.Debug<UmbracoDatabaseFactory>("SqlServer {SqlServerVersion}, DatabaseType is {DatabaseType} ({Source}).",
+            _logger.Debug<UmbracoDatabaseFactory, SqlServerSyntaxProvider.VersionName, DatabaseType, string>("SqlServer {SqlServerVersion}, DatabaseType is {DatabaseType} ({Source}).",
                 versionName, _databaseType, fromSettings ? "settings" : "detected");
         }
 
diff --git a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
index eebe5f5722..fbcd5ec440 100644
--- a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
@@ -219,7 +219,7 @@ namespace Umbraco.Core.PropertyEditors
             var result = TryConvertValueToCrlType(editorValue.Value);
             if (result.Success == false)
             {
-                Current.Logger.Warn<DataValueEditor>("The value {EditorValue} cannot be converted to the type {StorageTypeValue}", editorValue.Value, ValueTypes.ToStorageType(ValueType));
+                Current.Logger.Warn<DataValueEditor,object,ValueStorageType>("The value {EditorValue} cannot be converted to the type {StorageTypeValue}", editorValue.Value, ValueTypes.ToStorageType(ValueType));
                 return null;
             }
             return result.Result;
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
index b3685457ec..fdb0a8c842 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                 }
                 catch (Exception ex)
                 {
-                    Current.Logger.Error<GridValueConverter>(ex, "Could not parse the string '{JsonString}' to a json object", sourceString);
+                    Current.Logger.Error<GridValueConverter, string>(ex, "Could not parse the string '{JsonString}' to a json object", sourceString);
                 }
             }
 
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
index 29e501f993..f8ef82076e 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
@@ -44,8 +44,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             }
             catch (Exception ex)
             {
-                // cannot deserialize, assume it may be a raw image URL
-                Current.Logger.Error<ImageCropperValueConverter>(ex, "Could not deserialize string '{JsonString}' into an image cropper value.", sourceString);
+                // cannot deserialize, assume it may be a raw image url
+                Current.Logger.Error<ImageCropperValueConverter, string>(ex, "Could not deserialize string '{JsonString}' into an image cropper value.", sourceString);
                 value = new ImageCropperValue { Src = sourceString };
             }
 
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs
index 12e6238705..270c8c3b0b 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/JsonValueConverter.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                 }
                 catch (Exception ex)
                 {
-                    Current.Logger.Error<JsonValueConverter>(ex, "Could not parse the string '{JsonString}' to a json object", sourceString);
+                    Current.Logger.Error<JsonValueConverter, string>(ex, "Could not parse the string '{JsonString}' to a json object", sourceString);
                 }
             }
 
diff --git a/src/Umbraco.Core/Runtime/CoreRuntime.cs b/src/Umbraco.Core/Runtime/CoreRuntime.cs
index 60e7851251..25bb5d3151 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntime.cs
@@ -98,7 +98,7 @@ namespace Umbraco.Core.Runtime
                     HostingEnvironment.ApplicationID,
                     HostingEnvironment.ApplicationPhysicalPath,
                     NetworkHelper.MachineName);
-                logger.Debug<CoreRuntime>("Runtime: {Runtime}", GetType().FullName);
+                logger.Debug<CoreRuntime, string>("Runtime: {Runtime}", GetType().FullName);
 
                 // application environment
                 ConfigureUnhandledException();
@@ -359,7 +359,7 @@ namespace Umbraco.Core.Runtime
                 {
                     _state.DetermineRuntimeLevel(databaseFactory);
 
-                    profilingLogger.Debug<CoreRuntime>("Runtime level: {RuntimeLevel} - {RuntimeLevelReason}", _state.Level, _state.Reason);
+                    profilingLogger.Debug<CoreRuntime,RuntimeLevel,RuntimeLevelReason>("Runtime level: {RuntimeLevel} - {RuntimeLevelReason}", _state.Level, _state.Reason);
 
                     if (_state.Level == RuntimeLevel.Upgrade)
                     {
diff --git a/src/Umbraco.Core/Runtime/MainDom.cs b/src/Umbraco.Core/Runtime/MainDom.cs
index 71842905dd..d930841289 100644
--- a/src/Umbraco.Core/Runtime/MainDom.cs
+++ b/src/Umbraco.Core/Runtime/MainDom.cs
@@ -101,14 +101,14 @@ namespace Umbraco.Core.Runtime
 
             lock (_locko)
             {
-                _logger.Debug<MainDom>("Signaled ({Signaled}) ({SignalSource})", _signaled ? "again" : "first", source);
+                _logger.Debug<MainDom, string, string>("Signaled ({Signaled}) ({SignalSource})", _signaled ? "again" : "first", source);
                 if (_signaled) return;
                 if (_isMainDom == false) return; // probably not needed
                 _signaled = true;
 
                 try
                 {
-                    _logger.Info<MainDom>("Stopping ({SignalSource})", source);
+                    _logger.Info<MainDom, string>("Stopping ({SignalSource})", source);
                     foreach (var callback in _callbacks.OrderBy(x => x.Key).Select(x => x.Value))
                     {
                         try
@@ -122,14 +122,14 @@ namespace Umbraco.Core.Runtime
                         }
                     }
                         
-                    _logger.Debug<MainDom>("Stopped ({SignalSource})", source);
+                    _logger.Debug<MainDom, string>("Stopped ({SignalSource})", source);
                 }
                 finally
                 {
                     // in any case...
                     _isMainDom = false;
                     _mainDomLock.Dispose();
-                    _logger.Info<MainDom>("Released ({SignalSource})", source);
+                    _logger.Info<MainDom, string>("Released ({SignalSource})", source);
                 }
 
             }
diff --git a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
index f58b279a8d..d98d62cb20 100644
--- a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Core.Runtime
                     // if we've inserted, then there was no MainDom so we can instantly acquire
 
                     InsertLockRecord(_lockId, db); // so update with our appdomain id
-                    _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
+                    _logger.Debug<SqlMainDomLock, string>("Acquired with ID {LockId}", _lockId);
                     return true;
                 }
 
@@ -300,7 +300,7 @@ namespace Umbraco.Core.Runtime
 
                     // so now we update the row with our appdomain id
                     InsertLockRecord(_lockId, db);
-                    _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
+                    _logger.Debug<SqlMainDomLock, string>("Acquired with ID {LockId}", _lockId);
                     return true;
                 }
                 else if (mainDomRows.Count == 1 && !mainDomRows[0].Value.StartsWith(tempId))
@@ -359,7 +359,7 @@ namespace Umbraco.Core.Runtime
 
                 // so now we update the row with our appdomain id
                 InsertLockRecord(_lockId, db);
-                _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
+                _logger.Debug<SqlMainDomLock, string>("Acquired with ID {LockId}", _lockId);
                 return true;
             }
             catch (Exception ex)
diff --git a/src/Umbraco.Core/RuntimeState.cs b/src/Umbraco.Core/RuntimeState.cs
index c7a1a18d44..bfc125e44f 100644
--- a/src/Umbraco.Core/RuntimeState.cs
+++ b/src/Umbraco.Core/RuntimeState.cs
@@ -144,13 +144,13 @@ namespace Umbraco.Core
             {
                 // there *is* a local version, but it does not match the code version
                 // need to upgrade
-                _logger.Debug<RuntimeState>("Local version '{LocalVersion}' < code version '{CodeVersion}', need to upgrade Umbraco.", localVersion, codeVersion);
+                _logger.Debug<RuntimeState, SemVersion, SemVersion>("Local version '{LocalVersion}' < code version '{CodeVersion}', need to upgrade Umbraco.", localVersion, codeVersion);
                 Level = RuntimeLevel.Upgrade;
                 Reason = RuntimeLevelReason.UpgradeOldVersion;
             }
             else if (localVersion > codeVersion)
             {
-                _logger.Warn<RuntimeState>("Local version '{LocalVersion}' > code version '{CodeVersion}', downgrading is not supported.", localVersion, codeVersion);
+                _logger.Warn<RuntimeState, SemVersion, SemVersion>("Local version '{LocalVersion}' > code version '{CodeVersion}', downgrading is not supported.", localVersion, codeVersion);
 
                 // in fact, this is bad enough that we want to throw
                 Reason = RuntimeLevelReason.BootFailedCannotDowngrade;
@@ -290,7 +290,7 @@ namespace Umbraco.Core
             CurrentMigrationState = KeyValueService.GetValue(database, stateValueKey);
             FinalMigrationState = upgrader.Plan.FinalState;
 
-            _logger.Debug<RuntimeState>("Final upgrade state is {FinalMigrationState}, database contains {DatabaseState}", FinalMigrationState, CurrentMigrationState ?? "<null>");
+            _logger.Debug<RuntimeState, string, string>("Final upgrade state is {FinalMigrationState}, database contains {DatabaseState}", FinalMigrationState, CurrentMigrationState ?? "<null>");
 
             return CurrentMigrationState != FinalMigrationState;
         }
diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 24ef92278c..f69d62e649 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -311,7 +311,7 @@ namespace Umbraco.Core.Scoping
             if (completed.HasValue == false || completed.Value == false)
             {
                 if (LogUncompletedScopes)
-                    _logger.Debug<Scope>("Uncompleted Child Scope at\r\n {StackTrace}", Environment.StackTrace);
+                    _logger.Debug<Scope, string>("Uncompleted Child Scope at\r\n {StackTrace}", Environment.StackTrace);
 
                 _completed = false;
             }
diff --git a/src/Umbraco.Core/Scoping/ScopeProvider.cs b/src/Umbraco.Core/Scoping/ScopeProvider.cs
index 3c0fa94327..bf4e27bdb6 100644
--- a/src/Umbraco.Core/Scoping/ScopeProvider.cs
+++ b/src/Umbraco.Core/Scoping/ScopeProvider.cs
@@ -117,7 +117,7 @@ namespace Umbraco.Core.Scoping
                 }
 
                 // hard to inject into a static method :(
-                Current.Logger.Warn<ScopeProvider>("Missed {TypeName} Object {ObjectKey}", typeof(T).Name, objectKey.ToString("N").Substring(0, 8));
+                Current.Logger.Warn<ScopeProvider, string, string>("Missed {TypeName} Object {ObjectKey}", typeof(T).Name, objectKey.ToString("N").Substring(0, 8));
 #if DEBUG_SCOPES
                 //Current.Logger.Debug<ScopeProvider>("At:\r\n" + Head(Environment.StackTrace, 24));
 #endif
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 8b1af5ca31..e5363d0e2b 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1415,7 +1415,7 @@ namespace Umbraco.Core.Services.Implement
 
                         var result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs.Value, d.WriterId);
                         if (result.Success == false)
-                            Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
+                            Logger.Error<ContentService,int,PublishResultType>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
                         results.Add(result);
 
                     }
@@ -1425,7 +1425,7 @@ namespace Umbraco.Core.Services.Implement
                         d.ContentSchedule.Clear(ContentScheduleAction.Expire, date);
                         var result = Unpublish(d, userId: d.WriterId);
                         if (result.Success == false)
-                            Logger.Error<ContentService>(null, "Failed to unpublish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
+                            Logger.Error<ContentService, int, PublishResultType>(null, "Failed to unpublish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
                         results.Add(result);
                     }
                 }
@@ -1479,7 +1479,7 @@ namespace Umbraco.Core.Services.Implement
                             var impact = CultureImpact.Explicit(culture, IsDefaultCulture(allLangs.Value, culture));
                             var tryPublish = d.PublishCulture(impact) && _propertyValidationService.Value.IsPropertyDataValid(d, out invalidProperties, impact);
                             if (invalidProperties != null && invalidProperties.Length > 0)
-                                Logger.Warn<ContentService>("Scheduled publishing will fail for document {DocumentId} and culture {Culture} because of invalid properties {InvalidProperties}",
+                                Logger.Warn<ContentService, int, string, string>("Scheduled publishing will fail for document {DocumentId} and culture {Culture} because of invalid properties {InvalidProperties}",
                                     d.Id, culture, string.Join(",", invalidProperties.Select(x => x.Alias)));
 
                             publishing &= tryPublish; //set the culture to be published
@@ -1496,7 +1496,7 @@ namespace Umbraco.Core.Services.Implement
                             result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs.Value, d.WriterId);
 
                         if (result.Success == false)
-                            Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
+                            Logger.Error<ContentService, int, PublishResultType>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
 
                         results.Add(result);
                     }
@@ -1510,7 +1510,7 @@ namespace Umbraco.Core.Services.Implement
                             : SaveAndPublish(d, userId: d.WriterId);
 
                         if (result.Success == false)
-                            Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
+                            Logger.Error<ContentService, int, PublishResultType>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
 
                         results.Add(result);
                     }
@@ -2640,7 +2640,7 @@ namespace Umbraco.Core.Services.Implement
             // raise Publishing event
             if (scope.Events.DispatchCancelable(Publishing, this, savingEventArgs.ToContentPublishingEventArgs()))
             {
-                Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "publishing was cancelled");
+                Logger.Info<ContentService, string, int, string>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "publishing was cancelled");
                 return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, content);
             }
 
@@ -2692,7 +2692,7 @@ namespace Umbraco.Core.Services.Implement
             // either because it is 'publishing' or because it already has a published version
             if (content.PublishedState != PublishedState.Publishing && content.PublishedVersionId == 0)
             {
-                Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document does not have published values");
+                Logger.Info<ContentService, string, int, string>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document does not have published values");
                 return new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
             }
 
@@ -2705,20 +2705,20 @@ namespace Umbraco.Core.Services.Implement
                 {
                     case ContentStatus.Expired:
                         if (!variesByCulture)
-                            Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document has expired");
+                            Logger.Info<ContentService, string, int, string>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document has expired");
                         else
                             Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) culture {Culture} cannot be published: {Reason}", content.Name, content.Id, culture, "document culture has expired");
                         return new PublishResult(!variesByCulture ? PublishResultType.FailedPublishHasExpired : PublishResultType.FailedPublishCultureHasExpired, evtMsgs, content);
 
                     case ContentStatus.AwaitingRelease:
                         if (!variesByCulture)
-                            Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document is awaiting release");
+                            Logger.Info<ContentService, string, int, string>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document is awaiting release");
                         else
                             Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) culture {Culture} cannot be published: {Reason}", content.Name, content.Id, culture, "document is culture awaiting release");
                         return new PublishResult(!variesByCulture ? PublishResultType.FailedPublishAwaitingRelease : PublishResultType.FailedPublishCultureAwaitingRelease, evtMsgs, content);
 
                     case ContentStatus.Trashed:
-                        Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document is trashed");
+                        Logger.Info<ContentService, string, int, string>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "document is trashed");
                         return new PublishResult(PublishResultType.FailedPublishIsTrashed, evtMsgs, content);
                 }
             }
@@ -2731,7 +2731,7 @@ namespace Umbraco.Core.Services.Implement
                 var pathIsOk = content.ParentId == Constants.System.Root || IsPathPublished(GetParent(content));
                 if (!pathIsOk)
                 {
-                    Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "parent is not published");
+                    Logger.Info<ContentService, string, int, string>("Document {ContentName} (id={ContentId}) cannot be published: {Reason}", content.Name, content.Id, "parent is not published");
                     return new PublishResult(PublishResultType.FailedPublishPathNotPublished, evtMsgs, content);
                 }
             }
@@ -2768,11 +2768,11 @@ namespace Umbraco.Core.Services.Implement
                     return new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
 
                 if (culturesUnpublishing.Count > 0)
-                    Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cultures: {Cultures} have been unpublished.",
+                    Logger.Info<ContentService, string, int, string>("Document {ContentName} (id={ContentId}) cultures: {Cultures} have been unpublished.",
                         content.Name, content.Id, string.Join(",", culturesUnpublishing));
 
                 if (culturesPublishing.Count > 0)
-                    Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cultures: {Cultures} have been published.",
+                    Logger.Info<ContentService, string, int, string>("Document {ContentName} (id={ContentId}) cultures: {Cultures} have been published.",
                         content.Name, content.Id, string.Join(",", culturesPublishing));
 
                 if (culturesUnpublishing.Count > 0 && culturesPublishing.Count > 0)
@@ -2784,7 +2784,7 @@ namespace Umbraco.Core.Services.Implement
                 return new PublishResult(PublishResultType.SuccessPublishCulture, evtMsgs, content);
             }
 
-            Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) has been published.", content.Name, content.Id);
+            Logger.Info<ContentService, string, int>("Document {ContentName} (id={ContentId}) has been published.", content.Name, content.Id);
             return new PublishResult(evtMsgs, content);
         }
 
@@ -2800,7 +2800,7 @@ namespace Umbraco.Core.Services.Implement
             // raise Unpublishing event
             if (scope.Events.DispatchCancelable(Unpublishing, this, new PublishEventArgs<IContent>(content, evtMsgs)))
             {
-                Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) cannot be unpublished: unpublishing was cancelled.", content.Name, content.Id);
+                Logger.Info<ContentService, string, int>("Document {ContentName} (id={ContentId}) cannot be unpublished: unpublishing was cancelled.", content.Name, content.Id);
                 return new PublishResult(PublishResultType.FailedUnpublishCancelledByEvent, evtMsgs, content);
             }
 
@@ -2832,12 +2832,12 @@ namespace Umbraco.Core.Services.Implement
             foreach (var p in pastReleases)
                 content.ContentSchedule.Remove(p);
             if (pastReleases.Count > 0)
-                Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) had its release date removed, because it was unpublished.", content.Name, content.Id);
+                Logger.Info<ContentService, string, int>("Document {ContentName} (id={ContentId}) had its release date removed, because it was unpublished.", content.Name, content.Id);
 
             // change state to unpublishing
             content.PublishedState = PublishedState.Unpublishing;
 
-            Logger.Info<ContentService>("Document {ContentName} (id={ContentId}) has been unpublished.", content.Name, content.Id);
+            Logger.Info<ContentService, string, int>("Document {ContentName} (id={ContentId}) has been unpublished.", content.Name, content.Id);
             return attempt;
         }
 
@@ -3169,7 +3169,7 @@ namespace Umbraco.Core.Services.Implement
                 if (rollbackSaveResult.Success == false)
                 {
                     //Log the error/warning
-                    Logger.Error<ContentService>("User '{UserId}' was unable to rollback content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                    Logger.Error<ContentService,int,int,int>("User '{UserId}' was unable to rollback content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
                 }
                 else
                 {
@@ -3178,7 +3178,7 @@ namespace Umbraco.Core.Services.Implement
                     scope.Events.Dispatch(RolledBack, this, rollbackEventArgs);
 
                     //Logging & Audit message
-                    Logger.Info<ContentService>("User '{UserId}' rolled back content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                    Logger.Info<ContentService,int,int,int>("User '{UserId}' rolled back content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
                     Audit(AuditType.RollBack, userId, id, $"Content '{content.Name}' was rolled back to version '{versionId}'");
                 }
 
diff --git a/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs b/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs
index 4f5121def7..8f58de53bd 100644
--- a/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs
+++ b/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs
@@ -104,7 +104,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 if (xmlSource.ContainsKey(culture) == false)
                 {
-                    _logger.Warn<LocalizedTextService>("The culture specified {Culture} was not found in any configured sources for this service", culture);
+                    _logger.Warn<LocalizedTextService, CultureInfo>("The culture specified {Culture} was not found in any configured sources for this service", culture);
                     return result;
                 }
 
@@ -124,7 +124,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 if (_dictionarySource.ContainsKey(culture) == false)
                 {
-                    _logger.Warn<LocalizedTextService>("The culture specified {Culture} was not found in any configured sources for this service", culture);
+                    _logger.Warn<LocalizedTextService,CultureInfo>("The culture specified {Culture} was not found in any configured sources for this service", culture);
                     return result;
                 }
 
@@ -207,7 +207,7 @@ namespace Umbraco.Core.Services.Implement
         {
             if (_dictionarySource.ContainsKey(culture) == false)
             {
-                _logger.Warn<LocalizedTextService>("The culture specified {Culture} was not found in any configured sources for this service", culture);
+                _logger.Warn<LocalizedTextService,CultureInfo>("The culture specified {Culture} was not found in any configured sources for this service", culture);
                 return "[" + key + "]";
             }
 
@@ -245,7 +245,7 @@ namespace Umbraco.Core.Services.Implement
         {
             if (xmlSource.ContainsKey(culture) == false)
             {
-                _logger.Warn<LocalizedTextService>("The culture specified {Culture} was not found in any configured sources for this service", culture);
+                _logger.Warn<LocalizedTextService,CultureInfo>("The culture specified {Culture} was not found in any configured sources for this service", culture);
                 return "[" + key + "]";
             }
 
diff --git a/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs b/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
index 86913071fd..e25fbed509 100644
--- a/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
+++ b/src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
@@ -88,7 +88,7 @@ namespace Umbraco.Core.Services.Implement
                                         }
                                         catch (CultureNotFoundException)
                                         {
-                                            Current.Logger.Warn<LocalizedTextServiceFileSources>("The culture {CultureValue} found in the file {CultureFile} is not a valid culture", cultureVal, fileInfo.FullName);
+                                            Current.Logger.Warn<LocalizedTextServiceFileSources, string, string>("The culture {CultureValue} found in the file {CultureFile} is not a valid culture", cultureVal, fileInfo.FullName);
                                             //If the culture in the file is invalid, we'll just hope the file name is a valid culture below, otherwise
                                             // an exception will be thrown.
                                         }
@@ -125,7 +125,7 @@ namespace Umbraco.Core.Services.Implement
 
             if (fileSourceFolder.Exists == false)
             {
-                Current.Logger.Warn<LocalizedTextServiceFileSources>("The folder does not exist: {FileSourceFolder}, therefore no sources will be discovered", fileSourceFolder.FullName);
+                Current.Logger.Warn<LocalizedTextServiceFileSources, string>("The folder does not exist: {FileSourceFolder}, therefore no sources will be discovered", fileSourceFolder.FullName);
             }
             else
             {
@@ -203,7 +203,7 @@ namespace Umbraco.Core.Services.Implement
                         }
                         catch (Exception ex)
                         {
-                            _logger.Error<LocalizedTextServiceFileSources>(ex, "Could not load file into XML {File}", supplementaryFile.File.FullName);
+                            _logger.Error<LocalizedTextServiceFileSources,string>(ex, "Could not load file into XML {File}", supplementaryFile.File.FullName);
                             continue;
                         }
 
diff --git a/src/Umbraco.Core/Services/Implement/NotificationService.cs b/src/Umbraco.Core/Services/Implement/NotificationService.cs
index 3c5f91e932..b6e42520f0 100644
--- a/src/Umbraco.Core/Services/Implement/NotificationService.cs
+++ b/src/Umbraco.Core/Services/Implement/NotificationService.cs
@@ -517,7 +517,7 @@ namespace Umbraco.Core.Services.Implement
                             try
                             {
                                 if (Sendmail != null) Sendmail(s, request.Mail, _logger); else s.Send(request.Mail);
-                                _logger.Debug<NotificationService>("Notification '{Action}' sent to {Username} ({Email})", request.Action, request.UserName, request.Email);
+                                _logger.Debug<NotificationService, string, string, string>("Notification '{Action}' sent to {Username} ({Email})", request.Action, request.UserName, request.Email);
                             }
                             catch (Exception ex)
                             {
diff --git a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
index 7442169b44..49b0d23862 100644
--- a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
+++ b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
@@ -192,7 +192,7 @@ namespace Umbraco.Core.Sync
                     if (count > Options.MaxProcessingInstructionCount)
                     {
                         //too many instructions, proceed to cold boot
-                        Logger.Warn<DatabaseServerMessenger>(
+                        Logger.Warn<DatabaseServerMessenger,int,int>(
                             "The instruction count ({InstructionCount}) exceeds the specified MaxProcessingInstructionCount ({MaxProcessingInstructionCount})."
                             + " The server will skip existing instructions, rebuild its caches and indexes entirely, adjust its last synced Id"
                             + " to the latest found in the database and maintain cache updates based on that Id.",
@@ -352,7 +352,7 @@ namespace Umbraco.Core.Sync
                 }
                 catch (JsonException ex)
                 {
-                    Logger.Error<DatabaseServerMessenger>(ex, "Failed to deserialize instructions ({DtoId}: '{DtoInstructions}').",
+                    Logger.Error<DatabaseServerMessenger,int, string>(ex, "Failed to deserialize instructions ({DtoId}: '{DtoInstructions}').",
                         dto.Id,
                         dto.Instructions);
 
@@ -410,7 +410,7 @@ namespace Umbraco.Core.Sync
             //}
             catch (Exception ex)
             {
-                    Logger.Error<DatabaseServerMessenger>(
+                    Logger.Error<DatabaseServerMessenger,int, string> (
                         ex,
                         "DISTRIBUTED CACHE IS NOT UPDATED. Failed to execute instructions ({DtoId}: '{DtoInstructions}'). Instruction is being skipped/ignored",
                         dto.Id,
diff --git a/src/Umbraco.Core/Sync/ServerMessengerBase.cs b/src/Umbraco.Core/Sync/ServerMessengerBase.cs
index bbf00c3a6b..1b13b49434 100644
--- a/src/Umbraco.Core/Sync/ServerMessengerBase.cs
+++ b/src/Umbraco.Core/Sync/ServerMessengerBase.cs
@@ -157,7 +157,7 @@ namespace Umbraco.Core.Sync
         {
             if (refresher == null) throw new ArgumentNullException(nameof(refresher));
 
-            Current.Logger.Debug<ServerMessengerBase>("Invoking refresher {RefresherType} on local server for message type RefreshByPayload", refresher.GetType());
+            Current.Logger.Debug<ServerMessengerBase,Type>("Invoking refresher {RefresherType} on local server for message type RefreshByPayload", refresher.GetType());
 
             var payloadRefresher = refresher as IPayloadCacheRefresher<TPayload>;
             if (payloadRefresher == null)
@@ -179,7 +179,7 @@ namespace Umbraco.Core.Sync
         {
             if (refresher == null) throw new ArgumentNullException(nameof(refresher));
 
-            Current.Logger.Debug<ServerMessengerBase>("Invoking refresher {RefresherType} on local server for message type {MessageType}", refresher.GetType(), messageType);
+            Current.Logger.Debug<ServerMessengerBase,Type,MessageType>("Invoking refresher {RefresherType} on local server for message type {MessageType}", refresher.GetType(), messageType);
 
             switch (messageType)
             {
@@ -240,7 +240,7 @@ namespace Umbraco.Core.Sync
         {
             if (refresher == null) throw new ArgumentNullException(nameof(refresher));
 
-            Current.Logger.Debug<ServerMessengerBase>("Invoking refresher {RefresherType} on local server for message type {MessageType}", refresher.GetType(), messageType);
+            Current.Logger.Debug<ServerMessengerBase,Type,MessageType>("Invoking refresher {RefresherType} on local server for message type {MessageType}", refresher.GetType(), messageType);
 
             var typedRefresher = refresher as ICacheRefresher<T>;
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 569fdb4638..1cbf8a7b3f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -131,6 +131,8 @@
     <Compile Include="Constants-CharArrays.cs" />
     <Compile Include="Collections\EventClearingObservableCollection.cs" />
     <Compile Include="Constants-SqlTemplates.cs" />
+    <Compile Include="Logging\ILogger2.cs" />
+    <Compile Include="Logging\Logger2Extensions.cs" />
     <Compile Include="Exceptions\UnattendedInstallException.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index 60d9cd6ead..96e24e89db 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core
 {
@@ -154,7 +155,7 @@ namespace Umbraco.Core
             }
             catch (ArgumentException)
             {
-                Current.Logger.Debug(typeof(UriExtensions), "Failed to determine if request was client side (invalid chars in path \"{Path}\"?)", url.LocalPath);
+                Current.Logger.Debug<string>(typeof(UriExtensions), "Failed to determine if request was client side (invalid chars in path \"{Path}\"?)", url.LocalPath);
                 return false;
             }
         }
diff --git a/src/Umbraco.Examine/IndexRebuilder.cs b/src/Umbraco.Examine/IndexRebuilder.cs
index b14ff25c57..1f953c8cbd 100644
--- a/src/Umbraco.Examine/IndexRebuilder.cs
+++ b/src/Umbraco.Examine/IndexRebuilder.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Examine
                 }
                 catch (Exception e)
                 {
-                    _logger.Error<IndexRebuilder>(e, "Index populating failed for populator {Populator}", populator.GetType());                    
+                    _logger.Error<IndexRebuilder,Type>(e, "Index populating failed for populator {Populator}", populator.GetType());                    
                 }
             }
         }
diff --git a/src/Umbraco.Examine/UmbracoContentIndex.cs b/src/Umbraco.Examine/UmbracoContentIndex.cs
index 88033b1407..2da35201b2 100644
--- a/src/Umbraco.Examine/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine/UmbracoContentIndex.cs
@@ -133,7 +133,7 @@ namespace Umbraco.Examine
                 var filtered = c.NativeQuery(rawQuery);
                 var results = filtered.Execute();
 
-                ProfilingLogger.Debug(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, results.TotalItemCount);
+                ProfilingLogger.Debug<string,long>(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, results.TotalItemCount);
 
                 //need to queue a delete item for each one found
                 QueueIndexOperation(results.Select(r => new IndexOperation(new ValueSet(r.Id), IndexOperationType.Delete)));
diff --git a/src/Umbraco.Examine/UmbracoExamineIndex.cs b/src/Umbraco.Examine/UmbracoExamineIndex.cs
index e1dd77b994..cc97178e5c 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndex.cs
@@ -159,7 +159,7 @@ namespace Umbraco.Examine
         /// </summary>
         protected override void AddDocument(Document doc, ValueSet valueSet, IndexWriter writer)
         {
-            ProfilingLogger.Debug(GetType(),
+            ProfilingLogger.Debug<string,string,string>(GetType(),
                 "Write lucene doc id:{DocumentId}, category:{DocumentCategory}, type:{DocumentItemType}",
                 valueSet.Id,
                 valueSet.Category,
diff --git a/src/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs b/src/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs
new file mode 100644
index 0000000000..818eeec7f1
--- /dev/null
+++ b/src/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs
@@ -0,0 +1,58 @@
+using BenchmarkDotNet.Attributes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Logging;
+using Umbraco.Tests.Benchmarks.Config;
+
+namespace Umbraco.Tests.Benchmarks
+{
+    [QuickRunWithMemoryDiagnoserConfig]
+    public class LoggerAllocationBenchmark
+    {
+        private string rawQuery = "";
+        private int totalItemCount;
+        [Benchmark(Baseline = true)]
+        public void Baseline()
+        {
+            for (int i = 0; i < 1000; i++)
+            {
+                OriginalDebugSignature(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, totalItemCount);
+            }
+            
+        }
+
+        [Benchmark()]
+        public void NewOverload2()
+        {
+            for (int i = 0; i < 1000; i++)
+            {
+                NewDebugSignature(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, totalItemCount);
+            }
+        }
+        public void OriginalDebugSignature(Type reporting, string messageTemplate, params object[] propertyValues)
+        {
+
+        }
+
+        public void NewDebugSignature<T1,T2>(Type reporting, string messageTemplate, T1 param1, T2 param2)
+        {
+
+        }
+
+        //        BenchmarkDotNet=v0.11.3, OS=Windows 10.0.18362
+        //Intel Core i5-8265U CPU 1.60GHz(Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+        // [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4180.0
+        //  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4180.0
+
+        //IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
+        //WarmupCount=3
+
+        //       Method |      Mean |     Error |    StdDev | Ratio | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
+        //------------- |----------:|----------:|----------:|------:|------------:|------------:|------------:|--------------------:|
+        //     Baseline | 14.599 us | 1.0882 us | 0.0596 us |  1.00 |     10.0420 |           - |           - |             32048 B |
+        // NewOverload2 |  1.775 us | 0.4056 us | 0.0222 us |  0.12 |           - |           - |           - |                   - |
+    }
+}
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 58b45aa743..e349354dd8 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -55,6 +55,7 @@
     <Compile Include="EnumeratorBenchmarks.cs" />
     <Compile Include="JsonSerializerSettingsBenchmarks.cs" />
     <Compile Include="LinqCastBenchmarks.cs" />
+    <Compile Include="LoggerAllocationBenchmark.cs" />
     <Compile Include="ModelToSqlExpressionHelperBenchmarks.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
index db8dc38d6d..d13bda9703 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
@@ -109,7 +109,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
                 else
                 {
                     // this is a property that does not correspond to anything, ignore and log
-                    Current.Logger.Warn<PublishedMediaCache>("Dropping property '{PropertyKey}' because it does not belong to the content type.", i.Key);
+                    Current.Logger.Warn<PublishedMediaCache,string>("Dropping property '{PropertyKey}' because it does not belong to the content type.", i.Key);
                 }
             }
         }
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
index 84b6f2b91c..4bedfc9416 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
                 }
                 catch (Exception ex)
                 {
-                    Current.Logger.Error<PreviewContent>(ex, "Could not load preview set {PreviewSet} for user {UserId}.", _previewSet, _userId);
+                    Current.Logger.Error<PreviewContent,Guid,int>(ex, "Could not load preview set {PreviewSet} for user {UserId}.", _previewSet, _userId);
 
                     ClearPreviewSet();
 
@@ -146,7 +146,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             }
             catch (Exception ex)
             {
-                Current.Logger.Error<PreviewContent>(ex, "Couldn't delete preview set {FileName} for user {UserId}", file.Name, userId);
+                Current.Logger.Error<PreviewContent, string,int>(ex, "Couldn't delete preview set {FileName} for user {UserId}", file.Name, userId);
             }
         }
 
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
index 56033e6b0a..2b4ae40550 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
@@ -338,7 +338,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
             var miss = Interlocked.CompareExchange(ref _examineIndexMiss, 0, 0); // volatile read
             if (miss < ExamineIndexMissMax && Interlocked.Increment(ref _examineIndexMiss) == ExamineIndexMissMax)
-                Current.Logger.Warn<PublishedMediaCache>("Failed ({ExamineIndexMissMax} times) to retrieve medias from Examine index and had to load"
+                Current.Logger.Warn<PublishedMediaCache,int>("Failed ({ExamineIndexMissMax} times) to retrieve medias from Examine index and had to load"
                     + " them from DB. This may indicate that the Examine index is corrupted.", ExamineIndexMissMax);
 
             return ConvertFromIMedia(media);
@@ -356,7 +356,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
                     : ConvertFromXPathNavigator(media.Current);
             }
 
-            Current.Logger.Warn<PublishedMediaCache>("Could not retrieve media {MediaId} from Examine index or from legacy library.GetMedia method", id);
+            Current.Logger.Warn<PublishedMediaCache,int>("Could not retrieve media {MediaId} from Examine index or from legacy library.GetMedia method", id);
 
             return null;
         }
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
index 803b86aec5..a7e1f8598e 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
@@ -702,7 +702,7 @@ AND (umbracoNode.id=@id)";
                 // if something goes wrong remove the file
                 DeleteXmlFile();
 
-                Current.Logger.Error<XmlStore>(ex, "Failed to save Xml to file '{FileName}'.", _xmlFileName);
+                Current.Logger.Error<XmlStore, string>(ex, "Failed to save Xml to file '{FileName}'.", _xmlFileName);
             }
         }
 
@@ -742,7 +742,7 @@ AND (umbracoNode.id=@id)";
                 // if something goes wrong remove the file
                 DeleteXmlFile();
 
-                Current.Logger.Error<XmlStore>(ex, "Failed to save Xml to file '{FileName}'.", _xmlFileName);
+                Current.Logger.Error<XmlStore, string>(ex, "Failed to save Xml to file '{FileName}'.", _xmlFileName);
             }
         }
 
@@ -799,7 +799,7 @@ AND (umbracoNode.id=@id)";
             }
             catch (Exception ex)
             {
-                Current.Logger.Error<XmlStore>(ex, "Failed to load Xml from file '{FileName}'.", _xmlFileName);
+                Current.Logger.Error<XmlStore, string>(ex, "Failed to load Xml from file '{FileName}'.", _xmlFileName);
                 try
                 {
                     DeleteXmlFile();
@@ -1039,7 +1039,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
             {
                 foreach (var payload in payloads)
                 {
-                    Current.Logger.Debug<XmlStore>("Notified {ChangeTypes} for content {ContentId}", payload.ChangeTypes, payload.Id);
+                    Current.Logger.Debug<XmlStore,TreeChangeTypes,int>("Notified {ChangeTypes} for content {ContentId}", payload.ChangeTypes, payload.Id);
 
                     if (payload.ChangeTypes.HasType(TreeChangeTypes.RefreshAll))
                     {
@@ -1072,7 +1072,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
                     if (content == null || content.Published == false || content.Trashed)
                     {
                         // no published version
-                        Current.Logger.Debug<XmlStore>("Notified, content {ContentId} has no published version.", payload.Id);
+                        Current.Logger.Debug<XmlStore,int>("Notified, content {ContentId} has no published version.", payload.Id);
 
                         if (current != null)
                         {
@@ -1111,7 +1111,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
                             if (dtos.MoveNext() == false)
                             {
                                 // gone fishing, remove (possible race condition)
-                                Current.Logger.Debug<XmlStore>("Notified, content {ContentId} gone fishing.", payload.Id);
+                                Current.Logger.Debug<XmlStore,int>("Notified, content {ContentId} gone fishing.", payload.Id);
 
                                 if (current != null)
                                 {
@@ -1225,7 +1225,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
                 .ToArray();
 
             foreach (var payload in payloads)
-                Current.Logger.Debug<XmlStore>("Notified {ChangeTypes} for content type {ContentTypeId}", payload.ChangeTypes, payload.Id);
+                Current.Logger.Debug<XmlStore,ContentTypeChangeTypes,int>("Notified {ChangeTypes} for content type {ContentTypeId}", payload.ChangeTypes, payload.Id);
 
             if (ids.Length > 0) // must have refreshes, not only removes
                 RefreshContentTypes(ids);
@@ -1244,7 +1244,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
                 _contentTypeCache.ClearDataType(payload.Id);
 
             foreach (var payload in payloads)
-                Current.Logger.Debug<XmlStore>("Notified {RemovedStatus} for data type {payload.Id}",
+                Current.Logger.Debug<XmlStore, string,int>("Notified {RemovedStatus} for data type {payload.Id}",
                     payload.Removed ? "Removed" : "Refreshed",
                     payload.Id);
 
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
index 56c09b18ac..09dc0e17ef 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
             if (touched == false) return;
 
-            _logger.Debug<XmlStoreFilePersister>("Created, save in {WaitMilliseconds}ms.", WaitMilliseconds);
+            _logger.Debug<XmlStoreFilePersister,int>("Created, save in {WaitMilliseconds}ms.", WaitMilliseconds);
             _initialTouch = DateTime.Now;
             _timer = new Timer(_ => TimerRelease());
             _timer.Change(WaitMilliseconds, 0);
@@ -106,7 +106,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
                 else if (_timer == null) // we don't have a timer yet
                 {
-                    _logger.Debug<XmlStoreFilePersister>("Touched, was idle, start and save in {WaitMilliseconds}ms.", WaitMilliseconds);
+                    _logger.Debug<XmlStoreFilePersister,int>("Touched, was idle, start and save in {WaitMilliseconds}ms.", WaitMilliseconds);
                     _initialTouch = DateTime.Now;
                     _timer = new Timer(_ => TimerRelease());
                     _timer.Change(WaitMilliseconds, 0);
@@ -119,7 +119,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
                     if (DateTime.Now - _initialTouch < TimeSpan.FromMilliseconds(MaxWaitMilliseconds))
                     {
-                        _logger.Debug<XmlStoreFilePersister>("Touched, was waiting, can delay, save in {WaitMilliseconds}ms.", WaitMilliseconds);
+                        _logger.Debug<XmlStoreFilePersister,int>("Touched, was waiting, can delay, save in {WaitMilliseconds}ms.", WaitMilliseconds);
                         _timer.Change(WaitMilliseconds, 0);
                     }
                     else
diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
index 9f4304ebee..a3955f11aa 100644
--- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
+++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
@@ -128,7 +128,7 @@ namespace Umbraco.Tests.Services
                     total.AddRange(ServiceContext.ContentService.GetPagedDescendants(content.Id, 0, int.MaxValue, out var _));
                 }
                 TestProfiler.Disable();
-                Current.Logger.Info<ContentServicePerformanceTest>("Returned {Total} items", total.Count);
+                Current.Logger.Info<ContentServicePerformanceTest,int>("Returned {Total} items", total.Count);
             }
         }
 
diff --git a/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs b/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
index a3e36db363..f571f876b7 100644
--- a/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
+++ b/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
@@ -115,5 +115,62 @@ namespace Umbraco.Tests.TestHelpers
         {
             Console.WriteLine("VERBOSE {0} - {1}", reporting.Name, MessageTemplates.Render(messageTemplate, propertyValues));
         }
+
+        public void Fatal<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Fatal<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Fatal<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+
+        public void Error<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+         => Error(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Error<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        => Error(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Error<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        => Error(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+
+        public void Warn<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Warn<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Warn<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+
+        public void Warn<T0>(Type reporting, string message, T0 propertyValue0)
+        => Warn(reporting, message, new object[] { propertyValue0 });
+
+        public void Info<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        => Info(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Info<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        => Info(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Info<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+        => Info(reporting, messageTemplate, new object[] { propertyValue0 });
+
+        public void Debug<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        => Debug(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Debug<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        => Debug(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Debug<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+        => Debug(reporting, messageTemplate, new object[] { propertyValue0 });
+
+        public void Verbose<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        => Verbose(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Verbose<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        => Verbose(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Verbose<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+        => Verbose(reporting, messageTemplate, new object[] { propertyValue0 });
     }
 }
diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
index 5f8d77f3b2..3ee24a23bf 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Web.Cache
                     {
                         // TODO: should this be fatal (ie, an exception)?
                         var name = e.Sender.GetType().Name + "_" + e.EventName;
-                        _logger.Warn<DistributedCacheBinder>("Dropping event {EventName} because no corresponding handler was found.", name);
+                        _logger.Warn<DistributedCacheBinder, string>("Dropping event {EventName} because no corresponding handler was found.", name);
                         continue;
                     }
 
diff --git a/src/Umbraco.Web/ContentApps/ContentAppFactoryCollection.cs b/src/Umbraco.Web/ContentApps/ContentAppFactoryCollection.cs
index 07987aea3e..da587f672a 100644
--- a/src/Umbraco.Web/ContentApps/ContentAppFactoryCollection.cs
+++ b/src/Umbraco.Web/ContentApps/ContentAppFactoryCollection.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Web.ContentApps
                 // dying is not user-friendly, so let's write to log instead, and wish people read logs...
 
                 //throw new InvalidOperationException($"Duplicate content app aliases found: {string.Join(",", dups)}");
-                _logger.Warn<ContentAppFactoryCollection>("Duplicate content app aliases found: {DuplicateAliases}", string.Join(",", dups));
+                _logger.Warn<ContentAppFactoryCollection, string>("Duplicate content app aliases found: {DuplicateAliases}", string.Join(",", dups));
             }
 
             return apps;
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index e2ab829427..c354dd25ef 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -433,19 +433,19 @@ namespace Umbraco.Web.Editors
                 var lockedOut = await UserManager.IsLockedOutAsync(model.UserId);
                 if (lockedOut)
                 {
-                    Logger.Info<AuthenticationController>("User {UserId} is currently locked out, unlocking and resetting AccessFailedCount", model.UserId);
+                    Logger.Info<AuthenticationController,int>("User {UserId} is currently locked out, unlocking and resetting AccessFailedCount", model.UserId);
 
                     //// var user = await UserManager.FindByIdAsync(model.UserId);
                     var unlockResult = await UserManager.SetLockoutEndDateAsync(model.UserId, DateTimeOffset.Now);
                     if (unlockResult.Succeeded == false)
                     {
-                        Logger.Warn<AuthenticationController>("Could not unlock for user {UserId} - error {UnlockError}", model.UserId, unlockResult.Errors.First());
+                        Logger.Warn<AuthenticationController, int, string>("Could not unlock for user {UserId} - error {UnlockError}", model.UserId, unlockResult.Errors.First());
                     }
 
                     var resetAccessFailedCountResult = await UserManager.ResetAccessFailedCountAsync(model.UserId);
                     if (resetAccessFailedCountResult.Succeeded == false)
                     {
-                        Logger.Warn<AuthenticationController>("Could not reset access failed count {UserId} - error {UnlockError}", model.UserId, unlockResult.Errors.First());
+                        Logger.Warn<AuthenticationController,int, string>("Could not reset access failed count {UserId} - error {UnlockError}", model.UserId, unlockResult.Errors.First());
                     }
                 }
 
@@ -499,7 +499,7 @@ namespace Umbraco.Web.Editors
                 Core.Constants.Security.BackOfficeAuthenticationType,
                 Core.Constants.Security.BackOfficeExternalAuthenticationType);
 
-            Logger.Info<AuthenticationController>("User {UserName} from IP address {RemoteIpAddress} has logged out", User.Identity == null ? "UNKNOWN" : User.Identity.Name, owinContext.Request.RemoteIpAddress);
+            Logger.Info<AuthenticationController, string, string>("User {UserName} from IP address {RemoteIpAddress} has logged out", User.Identity == null ? "UNKNOWN" : User.Identity.Name, owinContext.Request.RemoteIpAddress);
 
             if (UserManager != null)
             {
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index ff618ba0a6..bf3c9d083b 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -129,7 +129,7 @@ namespace Umbraco.Web.Editors
 
             if (parts.Length != 2)
             {
-                Logger.Warn<BackOfficeController>("VerifyUser endpoint reached with invalid token: {Invite}", invite);
+                Logger.Warn<BackOfficeController, string>("VerifyUser endpoint reached with invalid token: {Invite}", invite);
                 return RedirectToAction("Default");
             }
 
@@ -138,7 +138,7 @@ namespace Umbraco.Web.Editors
             var decoded = token.FromUrlBase64();
             if (decoded.IsNullOrWhiteSpace())
             {
-                Logger.Warn<BackOfficeController>("VerifyUser endpoint reached with invalid token: {Invite}", invite);
+                Logger.Warn<BackOfficeController, string>("VerifyUser endpoint reached with invalid token: {Invite}", invite);
                 return RedirectToAction("Default");
             }
 
@@ -146,14 +146,14 @@ namespace Umbraco.Web.Editors
             int intId;
             if (int.TryParse(id, out intId) == false)
             {
-                Logger.Warn<BackOfficeController>("VerifyUser endpoint reached with invalid token: {Invite}", invite);
+                Logger.Warn<BackOfficeController, string>("VerifyUser endpoint reached with invalid token: {Invite}", invite);
                 return RedirectToAction("Default");
             }
 
             var identityUser = await UserManager.FindByIdAsync(intId);
             if (identityUser == null)
             {
-                Logger.Warn<BackOfficeController>("VerifyUser endpoint reached with non existing user: {UserId}", id);
+                Logger.Warn<BackOfficeController, string>("VerifyUser endpoint reached with non existing user: {UserId}", id);
                 return RedirectToAction("Default");
             }
 
@@ -161,7 +161,7 @@ namespace Umbraco.Web.Editors
 
             if (result.Succeeded == false)
             {
-                Logger.Warn<BackOfficeController>("Could not verify email, Error: {Errors}, Token: {Invite}", string.Join(",", result.Errors), invite);
+                Logger.Warn<BackOfficeController, string, string>("Could not verify email, Error: {Errors}, Token: {Invite}", string.Join(",", result.Errors), invite);
                 return new RedirectResult(Url.Action("Default") + "#/login/false?invite=3");
             }
 
@@ -434,7 +434,7 @@ namespace Umbraco.Web.Editors
             var authType = OwinContext.Authentication.GetExternalAuthenticationTypes().FirstOrDefault(x => x.AuthenticationType == loginInfo.Login.LoginProvider);
             if (authType == null)
             {
-                Logger.Warn<BackOfficeController>("Could not find external authentication provider registered: {LoginProvider}", loginInfo.Login.LoginProvider);
+                Logger.Warn<BackOfficeController, string>("Could not find external authentication provider registered: {LoginProvider}", loginInfo.Login.LoginProvider);
             }
             else
             {
@@ -451,7 +451,7 @@ namespace Umbraco.Web.Editors
                     shouldSignIn = autoLinkOptions.OnExternalLogin(user, loginInfo);
                     if (shouldSignIn == false)
                     {
-                        Logger.Warn<BackOfficeController>("The AutoLinkOptions of the external authentication provider '{LoginProvider}' have refused the login based on the OnExternalLogin method. Affected user id: '{UserId}'", loginInfo.Login.LoginProvider, user.Id);
+                        Logger.Warn<BackOfficeController, string,int>("The AutoLinkOptions of the external authentication provider '{LoginProvider}' have refused the login based on the OnExternalLogin method. Affected user id: '{UserId}'", loginInfo.Login.LoginProvider, user.Id);
                     }
                 }
 
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 7093edf23d..edc5077558 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1978,7 +1978,7 @@ namespace Umbraco.Web.Editors
                 if (template == null)
                 {
                     //ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
-                    Logger.Warn<ContentController>("No template exists with the specified alias: {TemplateAlias}", contentSave.TemplateAlias);
+                    Logger.Warn<ContentController, string>("No template exists with the specified alias: {TemplateAlias}", contentSave.TemplateAlias);
                 }
                 else if (template.Id != contentSave.PersistedContent.TemplateId)
                 {
diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs
index 893c9f5941..d94ab8058f 100644
--- a/src/Umbraco.Web/Editors/ContentControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Web.Editors
                 // get the property editor
                 if (propertyDto.PropertyEditor == null)
                 {
-                    Logger.Warn<ContentController>("No property editor found for property {PropertyAlias}", propertyDto.Alias);
+                    Logger.Warn<ContentController, string>("No property editor found for property {PropertyAlias}", propertyDto.Alias);
                     continue;
                 }
 
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 5074a14782..a72e27b903 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -359,7 +359,7 @@ namespace Umbraco.Web.Editors
                 var tryCreateTemplate = Services.FileService.CreateTemplateForContentType(contentTypeAlias, contentTypeName);
                 if (tryCreateTemplate == false)
                 {
-                    Logger.Warn<ContentTypeController>("Could not create a template for Content Type: \"{ContentTypeAlias}\", status: {Status}",
+                    Logger.Warn<ContentTypeController, string, OperationResultType>("Could not create a template for Content Type: \"{ContentTypeAlias}\", status: {Status}",
                         contentTypeAlias, tryCreateTemplate.Result.Result);
                 }
 
@@ -544,7 +544,7 @@ namespace Umbraco.Web.Editors
             }
             catch (Exception ex)
             {
-                Logger.Error<ContentTypeController>(ex, "Error cleaning up temporary udt file in App_Data: {File}", filePath);
+                Logger.Error<ContentTypeController, string>(ex, "Error cleaning up temporary udt file in App_Data: {File}", filePath);
             }
 
             return Request.CreateResponse(HttpStatusCode.OK);
@@ -591,7 +591,7 @@ namespace Umbraco.Web.Editors
             }
             catch (Exception ex)
             {
-                Logger.Error<ContentTypeController>(ex, "Error uploading udt file to App_Data: {File}", destFileName);
+                Logger.Error<ContentTypeController, string>(ex, "Error uploading udt file to App_Data: {File}", destFileName);
             }
 
             if (ext.InvariantEquals("udt"))
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index eef0b5df93..da620eb5ac 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -76,7 +76,7 @@ namespace Umbraco.Web.Editors
                 }
                 catch (HttpRequestException ex)
                 {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard content from {Url}", url);
+                    Logger.Error<DashboardController, string>(ex.InnerException ?? ex, "Error getting dashboard content from {Url}", url);
 
                     //it's still new JObject() - we return it like this to avoid error codes which triggers UI warnings
                     AppCaches.RuntimeCache.InsertCacheItem<JObject>(key, () => result, new TimeSpan(0, 5, 0));
@@ -114,7 +114,7 @@ namespace Umbraco.Web.Editors
                 }
                 catch (HttpRequestException ex)
                 {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting dashboard CSS from {Url}", url);
+                    Logger.Error<DashboardController, string>(ex.InnerException ?? ex, "Error getting dashboard CSS from {Url}", url);
 
                     //it's still string.Empty - we return it like this to avoid error codes which triggers UI warnings
                     AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 5, 0));
@@ -178,7 +178,7 @@ namespace Umbraco.Web.Editors
                 }
                 catch (HttpRequestException ex)
                 {
-                    Logger.Error<DashboardController>(ex.InnerException ?? ex, "Error getting remote dashboard data from {UrlPrefix}{Url}", urlPrefix, url);
+                    Logger.Error<DashboardController, string, string>(ex.InnerException ?? ex, "Error getting remote dashboard data from {UrlPrefix}{Url}", urlPrefix, url);
 
                     //it's still string.Empty - we return it like this to avoid error codes which triggers UI warnings
                     AppCaches.RuntimeCache.InsertCacheItem<string>(key, () => result, new TimeSpan(0, 5, 0));
diff --git a/src/Umbraco.Web/Editors/DictionaryController.cs b/src/Umbraco.Web/Editors/DictionaryController.cs
index f3246276b1..fcc2e2af02 100644
--- a/src/Umbraco.Web/Editors/DictionaryController.cs
+++ b/src/Umbraco.Web/Editors/DictionaryController.cs
@@ -124,7 +124,7 @@ namespace Umbraco.Web.Editors
             }
             catch (Exception ex)
             {
-                Logger.Error(GetType(), ex, "Error creating dictionary with {Name} under {ParentId}", key, parentId);
+                Logger.Error<string,int>(GetType(), ex, "Error creating dictionary with {Name} under {ParentId}", key, parentId);
                 return Request.CreateNotificationValidationErrorResponse("Error creating dictionary item");
             }
         }
@@ -254,7 +254,7 @@ namespace Umbraco.Web.Editors
             }
             catch (Exception ex)
             {
-                Logger.Error(GetType(), ex, "Error saving dictionary with {Name} under {ParentId}", dictionary.Name, dictionary.ParentId);
+                Logger.Error<string,Guid>(GetType(), ex, "Error saving dictionary with {Name} under {ParentId}", dictionary.Name, dictionary.ParentId);
                 throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse("Something went wrong saving dictionary"));
             }
         }
diff --git a/src/Umbraco.Web/Editors/ExamineManagementController.cs b/src/Umbraco.Web/Editors/ExamineManagementController.cs
index cf1dfd5d5d..49599bc8b9 100644
--- a/src/Umbraco.Web/Editors/ExamineManagementController.cs
+++ b/src/Umbraco.Web/Editors/ExamineManagementController.cs
@@ -131,7 +131,7 @@ namespace Umbraco.Web.Editors
             if (!validate.IsSuccessStatusCode)
                 return validate;
 
-            _logger.Info<ExamineManagementController>("Rebuilding index '{IndexName}'", indexName);
+            _logger.Info<ExamineManagementController, string>("Rebuilding index '{IndexName}'", indexName);
 
             //remove it in case there's a handler there already
             index.IndexOperationComplete -= Indexer_IndexOperationComplete;
@@ -253,7 +253,7 @@ namespace Umbraco.Web.Editors
         {
             var indexer = (IIndex)sender;
 
-            _logger.Debug<ExamineManagementController>("Logging operation completed for index {IndexName}", indexer.Name);
+            _logger.Debug<ExamineManagementController, string>("Logging operation completed for index {IndexName}", indexer.Name);
 
             //ensure it's not listening anymore
             indexer.IndexOperationComplete -= Indexer_IndexOperationComplete;
diff --git a/src/Umbraco.Web/Editors/PasswordChanger.cs b/src/Umbraco.Web/Editors/PasswordChanger.cs
index 2698a68b40..816325fe56 100644
--- a/src/Umbraco.Web/Editors/PasswordChanger.cs
+++ b/src/Umbraco.Web/Editors/PasswordChanger.cs
@@ -95,7 +95,7 @@ namespace Umbraco.Web.Editors
                 if (resetResult.Succeeded == false)
                 {
                     var errors = string.Join(". ", resetResult.Errors);
-                    _logger.Warn<PasswordChanger>("Could not reset user password {PasswordErrors}", errors);
+                    _logger.Warn<PasswordChanger, string>("Could not reset user password {PasswordErrors}", errors);
                     return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult(errors, new[] { "resetPassword" }) });
                 }
 
@@ -136,7 +136,7 @@ namespace Umbraco.Web.Editors
             {
                 //no, fail with error messages for "password"
                 var errors = string.Join(". ", changeResult.Errors);
-                _logger.Warn<PasswordChanger>("Could not change user password {PasswordErrors}", errors);
+                _logger.Warn<PasswordChanger, string>("Could not change user password {PasswordErrors}", errors);
                 return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult(errors, new[] { "password" }) });
             }
             return Attempt.Succeed(new PasswordChangedModel());
@@ -197,7 +197,7 @@ namespace Umbraco.Web.Editors
                         }
                         catch (Exception ex)
                         {
-                            _logger.Warn<PasswordChanger>("Could not change member password", ex);
+                            _logger.Warn<PasswordChanger>(ex,"Could not change member password");
                             return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not change password, error: " + ex.Message + " (see log for full details)", new[] { "value" }) });
                         }
                     }
diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs
index 3e45600be9..e56d856933 100644
--- a/src/Umbraco.Web/Editors/RelationTypeController.cs
+++ b/src/Umbraco.Web/Editors/RelationTypeController.cs
@@ -155,7 +155,7 @@ namespace Umbraco.Web.Editors
             }
             catch (Exception ex)
             {
-                Logger.Error(GetType(), ex, "Error creating relation type with {Name}", relationType.Name);
+                Logger.Error<string>(GetType(), ex, "Error creating relation type with {Name}", relationType.Name);
                 return Request.CreateNotificationValidationErrorResponse("Error creating relation type.");
             }
         }
@@ -186,7 +186,7 @@ namespace Umbraco.Web.Editors
             }
             catch (Exception ex)
             {
-                Logger.Error(GetType(), ex, "Error saving relation type with {Id}", relationType.Id);
+                Logger.Error<object>(GetType(), ex, "Error saving relation type with {Id}", relationType.Id);
                 throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse("Something went wrong when saving the relation type"));
             }
         }
diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index 1d292c64fd..1ceb4f0a1f 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Web.Editors
             catch (Exception ex)
             {
                 // IOException, PathTooLong, DirectoryNotFound, UnathorizedAccess
-                Logger.Error<TinyMceController>(ex, "Error when trying to move {CurrentFilePath} to {NewFilePath}", currentFile, newFilePath);
+                Logger.Error<TinyMceController, string, string>(ex, "Error when trying to move {CurrentFilePath} to {NewFilePath}", currentFile, newFilePath);
                 return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, $"Error when trying to move {currentFile} to {newFilePath}", ex);
             }
 
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckController.cs b/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
index 2f72b946de..770b41c323 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Web.HealthCheck
             }
             catch (Exception ex)
             {
-                _logger.Error<HealthCheckController>(ex, "Exception in health check: {HealthCheckName}", check.Name);
+                _logger.Error<HealthCheckController, string>(ex, "Exception in health check: {HealthCheckName}", check.Name);
                 throw;
             }
         }
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
index 61028699f0..9f58e04f79 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Web.HealthCheck
                     }
                     catch (Exception ex)
                     {
-                        Logger.Error<HealthCheckResults>(ex, "Error running scheduled health check: {HealthCheckName}", t.Name);
+                        Logger.Error<HealthCheckResults, string>(ex, "Error running scheduled health check: {HealthCheckName}", t.Name);
                         var message = $"Health check failed with exception: {ex.Message}. See logs for details.";
                         return new List<HealthCheckStatus>
                         {
@@ -62,16 +62,16 @@ namespace Umbraco.Web.HealthCheck
                 var checkIsSuccess = result.Value.All(x => x.ResultType == StatusResultType.Success);
                 if (checkIsSuccess)
                 {
-                    Logger.Info<HealthCheckResults>("Checks for '{HealthCheckName}' all completed successfully.", checkName);
+                    Logger.Info<HealthCheckResults, string>("Checks for '{HealthCheckName}' all completed successfully.", checkName);
                 }
                 else
                 {
-                    Logger.Warn<HealthCheckResults>("Checks for '{HealthCheckName}' completed with errors.", checkName);
+                    Logger.Warn<HealthCheckResults, string>("Checks for '{HealthCheckName}' completed with errors.", checkName);
                 }
 
                 foreach (var checkResult in checkResults)
                 {
-                    Logger.Info<HealthCheckResults>("Result for {HealthCheckName}: {HealthCheckResult}, Message: '{HealthCheckMessage}'", checkName, checkResult.ResultType, checkResult.Message);
+                    Logger.Info<HealthCheckResults, string, StatusResultType, string>("Result for {HealthCheckName}: {HealthCheckResult}, Message: '{HealthCheckMessage}'", checkName, checkResult.ResultType, checkResult.Message);
                 }
             }
         }
diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
index 78b55a8930..dad2f9e3f3 100644
--- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
+++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Web.Models;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Web
 {
@@ -270,7 +271,7 @@ namespace Umbraco.Web
                 }
                 catch (Exception ex)
                 {
-                    Current.Logger.Error(typeof(ImageCropperTemplateExtensions), ex, "Could not parse the json string: {Json}", json);
+                    Current.Logger.Error<string>(typeof(ImageCropperTemplateExtensions), ex, "Could not parse the json string: {Json}", json);
                 }
             }
 
diff --git a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
index d151df46f7..924bd3ff99 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
@@ -120,7 +120,7 @@ namespace Umbraco.Web.Install.Controllers
                 catch (Exception ex)
                 {
 
-                    _logger.Error<InstallApiController>(ex, "An error occurred during installation step {Step}", step.Name);
+                    _logger.Error<InstallApiController, string>(ex, "An error occurred during installation step {Step}", step.Name);
 
                     if (ex is TargetInvocationException && ex.InnerException != null)
                     {
@@ -210,7 +210,7 @@ namespace Umbraco.Web.Install.Controllers
             }
             catch (Exception ex)
             {
-                _logger.Error<InstallApiController>(ex, "Checking if step requires execution ({Step}) failed.", step.Name);
+                _logger.Error<InstallApiController, string>(ex, "Checking if step requires execution ({Step}) failed.", step.Name);
                 throw;
             }
         }
@@ -232,7 +232,7 @@ namespace Umbraco.Web.Install.Controllers
                 }
                 catch (Exception ex)
                 {
-                    _logger.Error<InstallApiController>(ex, "Installation step {Step} failed.", step.Name);
+                    _logger.Error<InstallApiController, string>(ex, "Installation step {Step} failed.", step.Name);
                     throw;
                 }
             }
diff --git a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
index 2bf069b06d..019c7e29a6 100644
--- a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
+++ b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
@@ -79,7 +79,7 @@ namespace Umbraco.Web.JavaScript
                     versionAttribute.SetValue(newVersion);
                     clientDependencyConfigXml.Save(_fileName, SaveOptions.DisableFormatting);
 
-                    _logger.Info<ClientDependencyConfiguration>("Updated version number from {OldVersion} to {NewVersion}", oldVersion, newVersion);
+                    _logger.Info<ClientDependencyConfiguration, string, string>("Updated version number from {OldVersion} to {NewVersion}", oldVersion, newVersion);
                     return true;
                 }
             }
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 54ce640855..e6c94ef3cf 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -89,7 +89,7 @@ namespace Umbraco.Web.Macros
 
             if (macroContent == null) return null;
 
-            _plogger.Debug<MacroRenderer>("Macro content loaded from cache '{MacroCacheId}'", model.CacheIdentifier);
+            _plogger.Debug<MacroRenderer, string>("Macro content loaded from cache '{MacroCacheId}'", model.CacheIdentifier);
 
             // ensure that the source has not changed
             // note: does not handle dependencies, and never has
@@ -149,7 +149,7 @@ namespace Umbraco.Web.Macros
                 priority: CacheItemPriority.NotRemovable
                 );
 
-            _plogger.Debug<MacroRenderer>("Macro content saved to cache '{MacroCacheId}'", model.CacheIdentifier);
+            _plogger.Debug<MacroRenderer, string>("Macro content saved to cache '{MacroCacheId}'", model.CacheIdentifier);
         }
 
         // gets the macro source file name
@@ -284,7 +284,7 @@ namespace Umbraco.Web.Macros
             }
             catch (Exception e)
             {
-                _plogger.Warn<MacroRenderer>(e, "Failed {MsgIn}", msgIn);
+                _plogger.Warn<MacroRenderer, string>(e, "Failed {MsgIn}", msgIn);
 
                 var macroErrorEventArgs = new MacroErrorEventArgs
                 {
diff --git a/src/Umbraco.Web/Media/UploadAutoFillProperties.cs b/src/Umbraco.Web/Media/UploadAutoFillProperties.cs
index 60de03b450..4e0201ad99 100644
--- a/src/Umbraco.Web/Media/UploadAutoFillProperties.cs
+++ b/src/Umbraco.Web/Media/UploadAutoFillProperties.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Web.Media
                 }
                 catch (Exception ex)
                 {
-                    _logger.Error(typeof(UploadAutoFillProperties), ex, "Could not populate upload auto-fill properties for file '{File}'.", filepath);
+                    _logger.Error<string>(typeof(UploadAutoFillProperties), ex, "Could not populate upload auto-fill properties for file '{File}'.", filepath);
                     ResetProperties(content, autoFillConfig, culture, segment);
                 }
             }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
index 2e035430df..bcfeb5e330 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Web.Models.Mapping
             var editor = _propertyEditors[property.PropertyType.PropertyEditorAlias];
             if (editor == null)
             {
-                _logger.Error<ContentPropertyBasicMapper<TDestination>>(
+                _logger.Error<ContentPropertyBasicMapper<TDestination>, string>(
                     new NullReferenceException("The property editor with alias " + property.PropertyType.PropertyEditorAlias + " does not exist"),
                     "No property editor '{PropertyEditorAlias}' found, converting to a Label",
                     property.PropertyType.PropertyEditorAlias);
diff --git a/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs
index 6b5797e05b..817d99c0fd 100644
--- a/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/DataTypeMapDefinition.cs
@@ -173,7 +173,7 @@ namespace Umbraco.Web.Models.Mapping
                 else
                 {
                     // weird - just leave the field without a value - but warn
-                    _logger.Warn<DataTypeMapDefinition>("Could not find a value for configuration field '{ConfigField}'", field.Key);
+                    _logger.Warn<DataTypeMapDefinition, string>("Could not find a value for configuration field '{ConfigField}'", field.Key);
                 }
             }
         }
diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs
index e654fc16a1..216e1e100e 100644
--- a/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MacroMapDefinition.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Web.Models.Mapping
             {
                 //we'll just map this to a text box
                 paramEditor = _parameterEditors[Constants.PropertyEditors.Aliases.TextBox];
-                _logger.Warn<MacroMapDefinition>("Could not resolve a parameter editor with alias {PropertyEditorAlias}, a textbox will be rendered in it's place", source.EditorAlias);
+                _logger.Warn<MacroMapDefinition, string>("Could not resolve a parameter editor with alias {PropertyEditorAlias}, a textbox will be rendered in it's place", source.EditorAlias);
             }
 
             target.View = paramEditor.GetValueEditor().View;
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index 64c9ad52c4..7c0345c300 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -68,7 +68,7 @@ namespace Umbraco.Web.Mvc
             var result = ViewEngines.Engines.FindView(ControllerContext, template, null);
             if (result.View != null) return true;
 
-            Logger.Warn<RenderMvcController>("No physical template file was found for template {Template}", template);
+            Logger.Warn<RenderMvcController, string>("No physical template file was found for template {Template}", template);
             return false;
         }
 
diff --git a/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
index 8c4ebf49c3..9a3ec99fd4 100644
--- a/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
@@ -148,7 +148,7 @@ namespace Umbraco.Web.PropertyEditors
                         {
                             // deal with weird situations by ignoring them (no comment)
                             row.PropertyValues.Remove(prop.Key);
-                            _logger.Warn<BlockEditorPropertyValueEditor>(
+                            _logger.Warn<BlockEditorPropertyValueEditor,string,Guid,string>(
                                 "ToEditor removed property value {PropertyKey} in row {RowId} for property type {PropertyTypeAlias}",
                                 prop.Key, row.Key, property.PropertyType.Alias);
                             continue;
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
index b0e5bf30bd..e66af480f8 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -91,7 +91,7 @@ namespace Umbraco.Web.PropertyEditors
             catch (Exception ex)
             {
                 if (writeLog)
-                    Logger.Error<ImageCropperPropertyEditor>(ex, "Could not parse image cropper value '{Json}'", value);
+                    Logger.Error<ImageCropperPropertyEditor, string>(ex, "Could not parse image cropper value '{Json}'", value);
                 return null;
             }
         }
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
index ca3c5a2a04..1047c4317d 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
@@ -126,7 +126,7 @@ namespace Umbraco.Web.PropertyEditors
                         {
                             // deal with weird situations by ignoring them (no comment)
                             row.RawPropertyValues.Remove(prop.Key);
-                            _logger.Warn<NestedContentPropertyValueEditor>(
+                            _logger.Warn<NestedContentPropertyValueEditor, string, Guid, string>(
                                 ex,
                                 "ConvertDbToString removed property value {PropertyKey} in row {RowId} for property type {PropertyTypeAlias}",
                                 prop.Key, row.Id, propertyType.Alias);
@@ -195,7 +195,7 @@ namespace Umbraco.Web.PropertyEditors
                         {
                             // deal with weird situations by ignoring them (no comment)
                             row.RawPropertyValues.Remove(prop.Key);
-                            _logger.Warn<NestedContentPropertyValueEditor>(
+                            _logger.Warn<NestedContentPropertyValueEditor, string, Guid, string>(
                                 ex,
                                 "ToEditor removed property value {PropertyKey} in row {RowId} for property type {PropertyTypeAlias}",
                                 prop.Key, row.Id, property.PropertyType.Alias);
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs b/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
index 5a3334685c..c21e2dae20 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Web.PropertyEditors
                     }
                     catch (Exception ex)
                     {
-                        _logger.Error(typeof(HtmlImageSourceParser), ex, "Could not delete temp file or folder {FileName}", absoluteTempImagePath);
+                        _logger.Error<string>(typeof(HtmlImageSourceParser), ex, "Could not delete temp file or folder {FileName}", absoluteTempImagePath);
                     }
                 }
             }
diff --git a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
index ca3bd36374..9c9cd929bf 100644
--- a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
+++ b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
@@ -60,7 +60,7 @@ namespace Umbraco.Web.PropertyEditors
             }
             catch(Exception ex)
             {
-                Logger.Error<RteEmbedController>(ex, "Error embedding URL {Url} - width: {Width} height: {Height}", url, width, height);
+                Logger.Error<RteEmbedController, string,int,int>(ex, "Error embedding url {Url} - width: {Width} height: {Height}", url, width, height);
                 result.OEmbedStatus = OEmbedStatus.Error;
             }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index f25e7fa1c3..1de53e9c6e 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -598,7 +598,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 throw new ArgumentException("Kit content cannot have children.", nameof(kit));
             // ReSharper restore LocalizableElement
 
-            _logger.Debug<ContentStore>("Set content ID: {KitNodeId}", kit.Node.Id);
+            _logger.Debug<ContentStore,int>("Set content ID: {KitNodeId}", kit.Node.Id);
 
             // get existing
             _contentNodes.TryGetValue(kit.Node.Id, out var link);
@@ -863,7 +863,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             if (link?.Value == null) return false;
 
             var content = link.Value;
-            _logger.Debug<ContentStore>("Clear content ID: {ContentId}", content.Id);
+            _logger.Debug<ContentStore,int>("Clear content ID: {ContentId}", content.Id);
 
             // clear the entire branch
             ClearBranchLocked(content);
@@ -1670,7 +1670,7 @@ 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, string>("Dispose snapshot ({Snapshot})", _genRef?.GenObj.Count.ToString() ?? "live");
 #endif
                 _gen = -1;
                 if (_genRef != null)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
index f9ad0ac715..8079363548 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
@@ -209,7 +209,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 {
                     if (Debugger.IsAttached)
                         throw new InvalidOperationException("Missing cmsContentNu edited content for node " + dto.Id + ", consider rebuilding.");
-                    Current.Logger.Warn<DatabaseDataSource>("Missing cmsContentNu edited content for node {NodeId}, consider rebuilding.", dto.Id);
+                    Current.Logger.Warn<DatabaseDataSource,int>("Missing cmsContentNu edited content for node {NodeId}, consider rebuilding.", dto.Id);
                 }
                 else
                 {
@@ -236,7 +236,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 {
                     if (Debugger.IsAttached)
                         throw new InvalidOperationException("Missing cmsContentNu published content for node " + dto.Id + ", consider rebuilding.");
-                    Current.Logger.Warn<DatabaseDataSource>("Missing cmsContentNu published content for node {NodeId}, consider rebuilding.", dto.Id);
+                    Current.Logger.Warn<DatabaseDataSource,int>("Missing cmsContentNu published content for node {NodeId}, consider rebuilding.", dto.Id);
                 }
                 else
                 {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index a39e26e2b1..15e45cfa71 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -131,9 +131,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     // stores need to be populated, happens in OnResolutionFrozen which uses _localDbExists to
                     // figure out whether it can read the databases or it should populate them from sql
 
-                    _logger.Info<PublishedSnapshotService>("Creating the content store, localContentDbExists? {LocalContentDbExists}", _localContentDbExists);
+                    _logger.Info<PublishedSnapshotService,bool>("Creating the content store, localContentDbExists? {LocalContentDbExists}", _localContentDbExists);
                     _contentStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger, _localContentDb);
-                    _logger.Info<PublishedSnapshotService>("Creating the media store, localMediaDbExists? {LocalMediaDbExists}", _localMediaDbExists);
+                    _logger.Info<PublishedSnapshotService,bool>("Creating the media store, localMediaDbExists? {LocalMediaDbExists}", _localMediaDbExists);
                     _mediaStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger, _localMediaDb);
                 }
                 else
@@ -182,7 +182,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _localContentDb = BTree.GetTree(localContentDbPath, _localContentDbExists);
             _localMediaDb = BTree.GetTree(localMediaDbPath, _localMediaDbExists);
 
-            _logger.Info<PublishedSnapshotService>("Registered with MainDom, localContentDbExists? {LocalContentDbExists}, localMediaDbExists? {LocalMediaDbExists}", _localContentDbExists, _localMediaDbExists);
+            _logger.Info<PublishedSnapshotService,bool,bool>("Registered with MainDom, localContentDbExists? {LocalContentDbExists}, localMediaDbExists? {LocalMediaDbExists}", _localContentDbExists, _localMediaDbExists);
         }
 
         /// <summary>
@@ -690,7 +690,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             foreach (var payload in payloads)
             {
-                _logger.Debug<PublishedSnapshotService>("Notified {ChangeTypes} for content {ContentId}", payload.ChangeTypes, payload.Id);
+                _logger.Debug<PublishedSnapshotService,TreeChangeTypes,int>("Notified {ChangeTypes} for content {ContentId}", payload.ChangeTypes, payload.Id);
 
                 if (payload.ChangeTypes.HasType(TreeChangeTypes.RefreshAll))
                 {
@@ -783,7 +783,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             foreach (var payload in payloads)
             {
-                _logger.Debug<PublishedSnapshotService>("Notified {ChangeTypes} for media {MediaId}", payload.ChangeTypes, payload.Id);
+                _logger.Debug<PublishedSnapshotService,TreeChangeTypes,int>("Notified {ChangeTypes} for media {MediaId}", payload.ChangeTypes, payload.Id);
 
                 if (payload.ChangeTypes.HasType(TreeChangeTypes.RefreshAll))
                 {
@@ -854,7 +854,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return;
 
             foreach (var payload in payloads)
-                _logger.Debug<PublishedSnapshotService>("Notified {ChangeTypes} for {ItemType} {ItemId}", payload.ChangeTypes, payload.ItemType, payload.Id);
+                _logger.Debug<PublishedSnapshotService, ContentTypeChangeTypes, string,int>("Notified {ChangeTypes} for {ItemType} {ItemId}", payload.ChangeTypes, payload.ItemType, payload.Id);
 
             Notify<IContentType>(_contentStore, payloads, RefreshContentTypesLocked);
             Notify<IMediaType>(_mediaStore, payloads, RefreshMediaTypesLocked);
@@ -938,7 +938,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var idsA = payloads.Select(x => x.Id).ToArray();
 
             foreach (var payload in payloads)
-                _logger.Debug<PublishedSnapshotService>("Notified {RemovedStatus} for data type {DataTypeId}",
+                _logger.Debug<PublishedSnapshotService, string,int>("Notified {RemovedStatus} for data type {DataTypeId}",
                     payload.Removed ? "Removed" : "Refreshed",
                     payload.Id);
 
diff --git a/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs b/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs
index 8eb50b0588..0f6e9af6bd 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Web.PublishedCache
         /// <param name="id">An identifier.</param>
         public void ClearContentType(int id)
         {
-            _logger.Debug<PublishedContentTypeCache>("Clear content type w/id {ContentTypeId}", id);
+            _logger.Debug<PublishedContentTypeCache,int>("Clear content type w/id {ContentTypeId}", id);
 
             try
             {
@@ -107,7 +107,7 @@ namespace Umbraco.Web.PublishedCache
         /// <param name="id">A data type identifier.</param>
         public void ClearDataType(int id)
         {
-            _logger.Debug<PublishedContentTypeCache>("Clear data type w/id {DataTypeId}.", id);
+            _logger.Debug<PublishedContentTypeCache,int>("Clear data type w/id {DataTypeId}.", id);
 
             // there is no recursion to handle here because a PublishedContentType contains *all* its
             // properties ie both its own properties and those that were inherited (it's based upon an
diff --git a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
index eae198bb59..5255da6521 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Web.Routing
 
             if (error404.HasValue)
             {
-                _logger.Debug<ContentFinderByConfigured404>("Got id={ErrorNodeId}.", error404.Value);
+                _logger.Debug<ContentFinderByConfigured404,int>("Got id={ErrorNodeId}.", error404.Value);
 
                 content = frequest.UmbracoContext.Content.GetById(error404.Value);
 
diff --git a/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs b/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
index b339198928..8cc52054f3 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
@@ -49,7 +49,7 @@ namespace Umbraco.Web.Routing
 
                 if (nodeId > 0)
                 {
-                    _logger.Debug<ContentFinderByIdPath>("Id={NodeId}", nodeId);
+                    _logger.Debug<ContentFinderByIdPath,int>("Id={NodeId}", nodeId);
                     node = frequest.UmbracoContext.Content.GetById(nodeId);
 
                     if (node != null)
@@ -62,7 +62,7 @@ namespace Umbraco.Web.Routing
                         }
 
                         frequest.PublishedContent = node;
-                        _logger.Debug<ContentFinderByIdPath>("Found node with id={PublishedContentId}", frequest.PublishedContent.Id);
+                        _logger.Debug<ContentFinderByIdPath,int>("Found node with id={PublishedContentId}", frequest.PublishedContent.Id);
                     }
                     else
                     {
diff --git a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
index 6c1195d222..265d6ff3a4 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Web.Routing
 
             if (redirectUrl == null)
             {
-                _logger.Debug<ContentFinderByRedirectUrl>("No match for route: {Route}", route);
+                _logger.Debug<ContentFinderByRedirectUrl, string>("No match for route: {Route}", route);
                 return false;
             }
 
@@ -50,14 +50,14 @@ namespace Umbraco.Web.Routing
             var url = content == null ? "#" : content.Url(redirectUrl.Culture);
             if (url.StartsWith("#"))
             {
-                _logger.Debug<ContentFinderByRedirectUrl>("Route {Route} matches content {ContentId} which has no URL.", route, redirectUrl.ContentId);
+                _logger.Debug<ContentFinderByRedirectUrl, string, int>("Route {Route} matches content {ContentId} which has no URL.", route, redirectUrl.ContentId);
                 return false;
             }
 
             // Appending any querystring from the incoming request to the redirect URL
             url = string.IsNullOrEmpty(frequest.Uri.Query) ? url : url + frequest.Uri.Query;
 
-            _logger.Debug<ContentFinderByRedirectUrl>("Route {Route} matches content {ContentId} with URL '{Url}', redirecting.", route, content.Id, url);
+            _logger.Debug<ContentFinderByRedirectUrl, string, int, string>("Route {Route} matches content {ContentId} with url '{Url}', redirecting.", route, content.Id, url);
             frequest.SetRedirectPermanent(url);
 
 
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
index 074193417a..571dfddd2e 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
@@ -46,13 +46,13 @@ namespace Umbraco.Web.Routing
         {
             if (docreq == null) throw new System.ArgumentNullException(nameof(docreq));
 
-            Logger.Debug<ContentFinderByUrl>("Test route {Route}", route);
+            Logger.Debug<ContentFinderByUrl, string>("Test route {Route}", route);
 
             var node = docreq.UmbracoContext.Content.GetByRoute(docreq.UmbracoContext.InPreviewMode, route, culture: docreq.Culture?.Name);
             if (node != null)
             {
                 docreq.PublishedContent = node;
-                Logger.Debug<ContentFinderByUrl>("Got content, id={NodeId}", node.Id);
+                Logger.Debug<ContentFinderByUrl,int>("Got content, id={NodeId}", node.Id);
             }
             else
             {
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
index 0ee5f3d42d..9f470b83ac 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Routing
                 if (node != null)
                 {
                     frequest.PublishedContent = node;
-                    Logger.Debug<ContentFinderByUrlAlias>("Path '{UriAbsolutePath}' is an alias for id={PublishedContentId}", frequest.Uri.AbsolutePath, frequest.PublishedContent.Id);
+                    Logger.Debug<ContentFinderByUrlAlias, string, int>("Path '{UriAbsolutePath}' is an alias for id={PublishedContentId}", frequest.Uri.AbsolutePath, frequest.PublishedContent.Id);
                 }
             }
 
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
index a02ebbb2a8..bb5cea063a 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
@@ -56,11 +56,11 @@ namespace Umbraco.Web.Routing
 
             if (template == null)
             {
-                Logger.Debug<ContentFinderByUrlAndTemplate>("Not a valid template: '{TemplateAlias}'", templateAlias);
+                Logger.Debug<ContentFinderByUrlAndTemplate, string>("Not a valid template: '{TemplateAlias}'", templateAlias);
                 return false;
             }
 
-            Logger.Debug<ContentFinderByUrlAndTemplate>("Valid template: '{TemplateAlias}'", templateAlias);
+            Logger.Debug<ContentFinderByUrlAndTemplate, string>("Valid template: '{TemplateAlias}'", templateAlias);
 
             // look for node corresponding to the rest of the route
             var route = frequest.HasDomain ? (frequest.Domain.ContentId + path) : path;
@@ -68,14 +68,14 @@ namespace Umbraco.Web.Routing
 
             if (node == null)
             {
-                Logger.Debug<ContentFinderByUrlAndTemplate>("Not a valid route to node: '{Route}'", route);
+                Logger.Debug<ContentFinderByUrlAndTemplate, string>("Not a valid route to node: '{Route}'", route);
                 return false;
             }
 
             // IsAllowedTemplate deals both with DisableAlternativeTemplates and ValidateAlternativeTemplates settings
             if (!node.IsAllowedTemplate(template.Id))
             {
-                Logger.Warn<ContentFinderByUrlAndTemplate>("Alternative template '{TemplateAlias}' is not allowed on node {NodeId}.", template.Alias, node.Id);
+                Logger.Warn<ContentFinderByUrlAndTemplate, string,int>("Alternative template '{TemplateAlias}' is not allowed on node {NodeId}.", template.Alias, node.Id);
                 frequest.PublishedContent = null; // clear
                 return false;
             }
diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
index f26f05c36c..fdd76a9160 100644
--- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Routing
         {
             if (string.IsNullOrWhiteSpace(route))
             {
-                _logger.Debug<DefaultUrlProvider>("Couldn't find any page with nodeId={NodeId}. This is most likely caused by the page not being published.", id);
+                _logger.Debug<DefaultUrlProvider,int>("Couldn't find any page with nodeId={NodeId}. This is most likely caused by the page not being published.", id);
                 return null;
             }
 
diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
index 9fefeeb843..f2494696cf 100644
--- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
+++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
@@ -107,7 +107,7 @@ namespace Umbraco.Web.Routing
                 }
                 catch (Exception ex)
                 {
-                    Current.Logger.Error<NotFoundHandlerHelper>(ex, "Could not parse xpath expression: {ContentXPath}", errorPage.ContentXPath);
+                    Current.Logger.Error<NotFoundHandlerHelper,string>(ex, "Could not parse xpath expression: {ContentXPath}", errorPage.ContentXPath);
                     return null;
                 }
             }
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 676b973271..a02fd5872a 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -253,7 +253,7 @@ namespace Umbraco.Web.Routing
 
             // note - we are not handling schemes nor ports here.
 
-            _logger.Debug<PublishedRouter>("{TracePrefix}Uri={RequestUri}", tracePrefix, request.Uri);
+            _logger.Debug<PublishedRouter, string, Uri>("{TracePrefix}Uri={RequestUri}", tracePrefix, request.Uri);
 
             var domainsCache = request.UmbracoContext.PublishedSnapshot.Domains;
             var domains = domainsCache.GetAll(includeWildcards: false).ToList();
@@ -305,12 +305,12 @@ namespace Umbraco.Web.Routing
             else
             {
                 // not matching any existing domain
-                _logger.Debug<PublishedRouter>("{TracePrefix}Matches no domain", tracePrefix);
+                _logger.Debug<PublishedRouter, string>("{TracePrefix}Matches no domain", tracePrefix);
 
                 request.Culture = defaultCulture == null ? CultureInfo.CurrentUICulture : new CultureInfo(defaultCulture);
             }
 
-            _logger.Debug<PublishedRouter>("{TracePrefix}Culture={CultureName}", tracePrefix, request.Culture.Name);
+            _logger.Debug<PublishedRouter, string, string>("{TracePrefix}Culture={CultureName}", tracePrefix, request.Culture.Name);
 
             return request.Domain != null;
         }
@@ -326,7 +326,7 @@ namespace Umbraco.Web.Routing
                 return;
 
             var nodePath = request.PublishedContent.Path;
-            _logger.Debug<PublishedRouter>("{TracePrefix}Path={NodePath}", tracePrefix, nodePath);
+            _logger.Debug<PublishedRouter, string, string>("{TracePrefix}Path={NodePath}", tracePrefix, nodePath);
             var rootNodeId = request.HasDomain ? request.Domain.ContentId : (int?)null;
             var domain = DomainUtilities.FindWildcardDomainInPath(request.UmbracoContext.PublishedSnapshot.Domains.GetAll(true), nodePath, rootNodeId);
 
@@ -334,11 +334,11 @@ namespace Umbraco.Web.Routing
             if (domain != null)
             {
                 request.Culture = domain.Culture;
-                _logger.Debug<PublishedRouter>("{TracePrefix}Got domain on node {DomainContentId}, set culture to {CultureName}", tracePrefix, domain.ContentId, request.Culture.Name);
+                _logger.Debug<PublishedRouter, string, int, string>("{TracePrefix}Got domain on node {DomainContentId}, set culture to {CultureName}", tracePrefix, domain.ContentId, request.Culture.Name);
             }
             else
             {
-                _logger.Debug<PublishedRouter>("{TracePrefix}No match.", tracePrefix);
+                _logger.Debug<PublishedRouter, string>("{TracePrefix}No match.", tracePrefix);
             }
         }
 
@@ -380,7 +380,7 @@ namespace Umbraco.Web.Routing
         /// <returns>A value indicating whether a document and template were found.</returns>
         private void FindPublishedContentAndTemplate(PublishedRequest request)
         {
-            _logger.Debug<PublishedRouter>("FindPublishedContentAndTemplate: Path={UriAbsolutePath}", request.Uri.AbsolutePath);
+            _logger.Debug<PublishedRouter, string>("FindPublishedContentAndTemplate: Path={UriAbsolutePath}", request.Uri.AbsolutePath);
 
             // run the document finders
             FindPublishedContent(request);
@@ -423,7 +423,7 @@ namespace Umbraco.Web.Routing
                 //iterate but return on first one that finds it
                 var found = _contentFinders.Any(finder =>
                 {
-                    _logger.Debug<PublishedRouter>("Finder {ContentFinderType}", finder.GetType().FullName);
+                    _logger.Debug<PublishedRouter, string>("Finder {ContentFinderType}", finder.GetType().FullName);
                     return finder.TryFindContent(request);
                 });
 
@@ -457,7 +457,7 @@ namespace Umbraco.Web.Routing
             const int maxLoop = 8;
             do
             {
-                _logger.Debug<PublishedRouter>("HandlePublishedContent: Loop {LoopCounter}", i);
+                _logger.Debug<PublishedRouter,int>("HandlePublishedContent: Loop {LoopCounter}", i);
 
                 // handle not found
                 if (request.HasPublishedContent == false)
@@ -543,13 +543,13 @@ namespace Umbraco.Web.Routing
             if (valid == false)
             {
                 // bad redirect - log and display the current page (legacy behavior)
-                _logger.Debug<PublishedRouter>("FollowInternalRedirects: Failed to redirect to id={InternalRedirectId}: value is not an int nor a GuidUdi.",
+                _logger.Debug<PublishedRouter, object>("FollowInternalRedirects: Failed to redirect to id={InternalRedirectId}: value is not an int nor a GuidUdi.",
                     request.PublishedContent.GetProperty(Constants.Conventions.Content.InternalRedirectId).GetSourceValue());
             }
 
             if (internalRedirectNode == null)
             {
-                _logger.Debug<PublishedRouter>("FollowInternalRedirects: Failed to redirect to id={InternalRedirectId}: no such published document.",
+                _logger.Debug<PublishedRouter,object>("FollowInternalRedirects: Failed to redirect to id={InternalRedirectId}: no such published document.",
                     request.PublishedContent.GetProperty(Constants.Conventions.Content.InternalRedirectId).GetSourceValue());
             }
             else if (internalRedirectId == request.PublishedContent.Id)
@@ -561,7 +561,7 @@ namespace Umbraco.Web.Routing
             {
                 request.SetInternalRedirectPublishedContent(internalRedirectNode); // don't use .PublishedContent here
                 redirect = true;
-                _logger.Debug<PublishedRouter>("FollowInternalRedirects: Redirecting to id={InternalRedirectId}", internalRedirectId);
+                _logger.Debug<PublishedRouter,int>("FollowInternalRedirects: Redirecting to id={InternalRedirectId}", internalRedirectId);
             }
 
             return redirect;
@@ -701,7 +701,7 @@ namespace Umbraco.Web.Routing
 
                 if (request.HasTemplate)
                     _logger.Debug<PublishedRouter>("FindTemplate: Has a template already, but also an alternative template.");
-                _logger.Debug<PublishedRouter>("FindTemplate: Look for alternative template alias={AltTemplate}", altTemplate);
+                _logger.Debug<PublishedRouter, string>("FindTemplate: Look for alternative template alias={AltTemplate}", altTemplate);
 
                 // IsAllowedTemplate deals both with DisableAlternativeTemplates and ValidateAlternativeTemplates settings
                 if (request.PublishedContent.IsAllowedTemplate(altTemplate))
@@ -712,16 +712,16 @@ namespace Umbraco.Web.Routing
                     if (template != null)
                     {
                         request.TemplateModel = template;
-                        _logger.Debug<PublishedRouter>("FindTemplate: Got alternative template id={TemplateId} alias={TemplateAlias}", template.Id, template.Alias);
+                        _logger.Debug<PublishedRouter, int, string>("FindTemplate: Got alternative template id={TemplateId} alias={TemplateAlias}", template.Id, template.Alias);
                     }
                     else
                     {
-                        _logger.Debug<PublishedRouter>("FindTemplate: The alternative template with alias={AltTemplate} does not exist, ignoring.", altTemplate);
+                        _logger.Debug<PublishedRouter, string>("FindTemplate: The alternative template with alias={AltTemplate} does not exist, ignoring.", altTemplate);
                     }
                 }
                 else
                 {
-                    _logger.Warn<PublishedRouter>("FindTemplate: Alternative template {TemplateAlias} is not allowed on node {NodeId}, ignoring.", altTemplate, request.PublishedContent.Id);
+                    _logger.Warn<PublishedRouter, string,int>("FindTemplate: Alternative template {TemplateAlias} is not allowed on node {NodeId}, ignoring.", altTemplate, request.PublishedContent.Id);
 
                     // no allowed, back to default
                     var templateId = request.PublishedContent.TemplateId;
@@ -744,7 +744,7 @@ namespace Umbraco.Web.Routing
             }
             else
             {
-                _logger.Debug<PublishedRouter>("FindTemplate: Running with template id={TemplateId} alias={TemplateAlias}", request.TemplateModel.Id, request.TemplateModel.Alias);
+                _logger.Debug<PublishedRouter, int, string>("FindTemplate: Running with template id={TemplateId} alias={TemplateAlias}", request.TemplateModel.Id, request.TemplateModel.Alias);
             }
         }
 
@@ -756,7 +756,7 @@ namespace Umbraco.Web.Routing
                 return null;
             }
 
-            _logger.Debug<PublishedRouter>("GetTemplateModel: Get template id={TemplateId}", templateId);
+            _logger.Debug<PublishedRouter, int?>("GetTemplateModel: Get template id={TemplateId}", templateId);
 
             if (templateId == null)
                 throw new InvalidOperationException("The template is not set, the page cannot render.");
@@ -764,7 +764,7 @@ namespace Umbraco.Web.Routing
             var template = _services.FileService.GetTemplate(templateId.Value);
             if (template == null)
                 throw new InvalidOperationException("The template with Id " + templateId + " does not exist, the page cannot render.");
-            _logger.Debug<PublishedRouter>("GetTemplateModel: Got template id={TemplateId} alias={TemplateAlias}", template.Id, template.Alias);
+            _logger.Debug<PublishedRouter, int, string>("GetTemplateModel: Got template id={TemplateId} alias={TemplateAlias}", template.Id, template.Alias);
             return template;
         }
 
diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
index 81bb45e270..a126592ffc 100644
--- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
+++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
@@ -239,7 +239,7 @@ namespace Umbraco.Web.Scheduling
                     throw new InvalidOperationException("The task runner has completed.");
 
                 // add task
-                _logger.Debug<BackgroundTaskRunner>("{LogPrefix} Task Added {TaskType}", _logPrefix , task.GetType().FullName);
+                _logger.Debug<BackgroundTaskRunner, string, string>("{LogPrefix} Task Added {TaskType}", _logPrefix , task.GetType().FullName);
                 _tasks.Post(task);
 
                 // start
@@ -259,12 +259,12 @@ namespace Umbraco.Web.Scheduling
             {
                 if (_completed)
                 {
-                    _logger.Debug<BackgroundTaskRunner>("{LogPrefix} Task cannot be added {TaskType}, the task runner has already shutdown", _logPrefix, task.GetType().FullName);
+                    _logger.Debug<BackgroundTaskRunner, string, string>("{LogPrefix} Task cannot be added {TaskType}, the task runner has already shutdown", _logPrefix, task.GetType().FullName);
                     return false;
                 }
 
                 // add task
-                _logger.Debug<BackgroundTaskRunner>("{LogPrefix} Task added {TaskType}", _logPrefix, task.GetType().FullName);
+                _logger.Debug<BackgroundTaskRunner, string, string>("{LogPrefix} Task added {TaskType}", _logPrefix, task.GetType().FullName);
                 _tasks.Post(task);
 
                 // start
@@ -321,7 +321,7 @@ namespace Umbraco.Web.Scheduling
             _shutdownToken = _shutdownTokenSource.Token;
             _runningTask = Task.Run(async () => await Pump().ConfigureAwait(false), _shutdownToken);
 
-            _logger.Debug<BackgroundTaskRunner>("{LogPrefix} Starting", _logPrefix);
+            _logger.Debug<BackgroundTaskRunner, string>("{LogPrefix} Starting", _logPrefix);
         }
 
         /// <summary>
@@ -342,7 +342,7 @@ namespace Umbraco.Web.Scheduling
             var hasTasks = TaskCount > 0;
 
             if (!force && hasTasks)
-                _logger.Info<BackgroundTaskRunner>("{LogPrefix} Waiting for tasks to complete", _logPrefix);
+                _logger.Info<BackgroundTaskRunner, string>("{LogPrefix} Waiting for tasks to complete", _logPrefix);
 
             // complete the queue
             // will stop waiting on the queue or on a latch
@@ -408,7 +408,7 @@ namespace Umbraco.Web.Scheduling
                         }
                         catch (Exception ex)
                         {
-                            _logger.Error<BackgroundTaskRunner>(ex, "{LogPrefix} Task runner exception", _logPrefix);
+                            _logger.Error<BackgroundTaskRunner, string>(ex, "{LogPrefix} Task runner exception", _logPrefix);
                         }
                     }
                 }
@@ -440,7 +440,7 @@ namespace Umbraco.Web.Scheduling
                     if (_shutdownToken.IsCancellationRequested == false && TaskCount > 0) continue;
 
                     // if we really have nothing to do, stop
-                    _logger.Debug<BackgroundTaskRunner>("{LogPrefix} Stopping", _logPrefix);
+                    _logger.Debug<BackgroundTaskRunner, string>("{LogPrefix} Stopping", _logPrefix);
 
                     if (_options.PreserveRunningTask == false)
                         _runningTask = null;
@@ -567,7 +567,7 @@ namespace Umbraco.Web.Scheduling
             catch (Exception ex)
             {
 
-                _logger.Error<BackgroundTaskRunner>(ex, "{LogPrefix} Task has failed", _logPrefix);
+                _logger.Error<BackgroundTaskRunner, string>(ex, "{LogPrefix} Task has failed", _logPrefix);
             }
         }
 
@@ -601,7 +601,7 @@ namespace Umbraco.Web.Scheduling
 
         private void OnEvent<TArgs>(TypedEventHandler<BackgroundTaskRunner<T>, TArgs> handler, string name, TArgs e)
         {
-            _logger.Debug<BackgroundTaskRunner>("{LogPrefix} OnEvent {EventName}", _logPrefix, name);
+            _logger.Debug<BackgroundTaskRunner, string, string>("{LogPrefix} OnEvent {EventName}", _logPrefix, name);
 
             if (handler == null) return;
 
@@ -611,7 +611,7 @@ namespace Umbraco.Web.Scheduling
             }
             catch (Exception ex)
             {
-                _logger.Error<BackgroundTaskRunner>(ex, "{LogPrefix} {Name} exception occurred", _logPrefix, name);
+                _logger.Error<BackgroundTaskRunner, string, string>(ex, "{LogPrefix} {Name} exception occurred", _logPrefix, name);
             }
         }
 
@@ -698,7 +698,7 @@ namespace Umbraco.Web.Scheduling
                 if (_terminating == false)
                 {
                     _terminating = true;
-                    _logger.Info<BackgroundTaskRunner>("{LogPrefix} Terminating {Immediate}", _logPrefix, immediate ? immediate.ToString() : string.Empty);
+                    _logger.Info<BackgroundTaskRunner, string, string>("{LogPrefix} Terminating {Immediate}", _logPrefix, immediate ? immediate.ToString() : string.Empty);
                     onTerminating = true;
                 }
             }
@@ -791,7 +791,7 @@ namespace Umbraco.Web.Scheduling
         /// </remarks>
         private void StopImmediate()
         {
-            _logger.Info<BackgroundTaskRunner>("{LogPrefix} Canceling tasks", _logPrefix);
+            _logger.Info<BackgroundTaskRunner, string>("{LogPrefix} Canceling tasks", _logPrefix);
             try
             {
                 Shutdown(true, true); // cancel all tasks, wait for the current one to end
@@ -825,7 +825,7 @@ namespace Umbraco.Web.Scheduling
                 terminatedSource = _terminatedSource;
             }
 
-            _logger.Info<BackgroundTaskRunner>("{LogPrefix} Tasks {TaskStatus}, terminated",
+            _logger.Info<BackgroundTaskRunner, string, string>("{LogPrefix} Tasks {TaskStatus}, terminated",
                 _logPrefix,
                 immediate ? "cancelled" : "completed");
 
diff --git a/src/Umbraco.Web/Scheduling/KeepAlive.cs b/src/Umbraco.Web/Scheduling/KeepAlive.cs
index 2dcf9a24a7..5ee10e4c2a 100644
--- a/src/Umbraco.Web/Scheduling/KeepAlive.cs
+++ b/src/Umbraco.Web/Scheduling/KeepAlive.cs
@@ -70,7 +70,7 @@ namespace Umbraco.Web.Scheduling
                 }
                 catch (Exception ex)
                 {
-                    _logger.Error<KeepAlive>(ex, "Keep alive failed (at '{keepAlivePingUrl}').", keepAlivePingUrl);
+                    _logger.Error<KeepAlive, string>(ex, "Keep alive failed (at '{keepAlivePingUrl}').", keepAlivePingUrl);
                 }
             }
 
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index 97afe25e22..b7ec7ffc0e 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Web.Scheduling
                     // run
                     var result = _contentService.PerformScheduledPublish(DateTime.Now);
                     foreach (var grouped in result.GroupBy(x => x.Result))
-                        _logger.Info<ScheduledPublishing>("Scheduled publishing result: '{StatusCount}' items with status {Status}", grouped.Count(), grouped.Key);
+                        _logger.Info<ScheduledPublishing,int,PublishResultType>("Scheduled publishing result: '{StatusCount}' items with status {Status}", grouped.Count(), grouped.Key);
                 }
                 finally
                 {
diff --git a/src/Umbraco.Web/Scheduling/TempFileCleanup.cs b/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
index d2a254dfd6..05f96f0e75 100644
--- a/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
+++ b/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Web.Scheduling
             dir.Refresh(); //in case it's changed during runtime
             if (!dir.Exists)
             {
-                _logger.Debug<TempFileCleanup>("The cleanup folder doesn't exist {Folder}", dir.FullName);
+                _logger.Debug<TempFileCleanup, string>("The cleanup folder doesn't exist {Folder}", dir.FullName);
                 return;
             }
 
@@ -66,7 +66,7 @@ namespace Umbraco.Web.Scheduling
                     }
                     catch (Exception ex)
                     {
-                        _logger.Error<TempFileCleanup>(ex, "Could not delete temp file {FileName}", file.FullName);
+                        _logger.Error<TempFileCleanup, string>(ex, "Could not delete temp file {FileName}", file.FullName);
                     }
                 }
             }
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index eb6b81ba16..16cc8c210a 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -107,7 +107,7 @@ namespace Umbraco.Web.Search
 
             var registeredIndexers = _examineManager.Indexes.OfType<IUmbracoIndex>().Count(x => x.EnableDefaultEventHandler);
 
-            _logger.Info<ExamineComponent>("Adding examine event handlers for {RegisteredIndexers} index providers.", registeredIndexers);
+            _logger.Info<ExamineComponent,int>("Adding examine event handlers for {RegisteredIndexers} index providers.", registeredIndexers);
 
             // don't bind event handlers if we're not suppose to listen
             if (registeredIndexers == 0)
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index e655b87767..49ed6f6f99 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -315,7 +315,7 @@ namespace Umbraco.Web.Security
             if (member == null)
             {
                 //this should not happen
-                Current.Logger.Warn<MembershipHelper>("The member validated but then no member was returned with the username {Username}", username);
+                Current.Logger.Warn<MembershipHelper, string>("The member validated but then no member was returned with the username {Username}", username);
                 return false;
             }
             //Log them in
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index bf9ee654c4..dd10e576e0 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -149,7 +149,7 @@ namespace Umbraco.Web.Security.Providers
             if (MemberService.Exists(username))
             {
                 status = MembershipCreateStatus.DuplicateUserName;
-                Current.Logger.Warn<UmbracoMembershipProvider<T, TEntity>>("Cannot create member as username already exists: {Username}", username);
+                Current.Logger.Warn<UmbracoMembershipProvider<T, TEntity>, string>("Cannot create member as username already exists: {Username}", username);
                 return null;
             }
 
@@ -157,7 +157,7 @@ namespace Umbraco.Web.Security.Providers
             if (MemberService.GetByEmail(email) != null && RequiresUniqueEmail)
             {
                 status = MembershipCreateStatus.DuplicateEmail;
-                Current.Logger.Warn<UmbracoMembershipProvider<T, TEntity>>("Cannot create member as a member with the same email address exists: {Email}", email);
+                Current.Logger.Warn<UmbracoMembershipProvider<T, TEntity>, string>("Cannot create member as a member with the same email address exists: {Email}", email);
                 return null;
             }
 
@@ -525,7 +525,7 @@ namespace Umbraco.Web.Security.Providers
 
             if (member == null)
             {
-                Current.Logger.Info<UmbracoMembershipProviderBase>("Login attempt failed for username {Username} from IP address {IpAddress}, the user does not exist", username, GetCurrentRequestIpAddress());
+                Current.Logger.Info<UmbracoMembershipProviderBase, string, string>("Login attempt failed for username {Username} from IP address {IpAddress}, the user does not exist", username, GetCurrentRequestIpAddress());
 
                 return new ValidateUserResult
                 {
@@ -535,7 +535,7 @@ namespace Umbraco.Web.Security.Providers
 
             if (member.IsApproved == false)
             {
-                Current.Logger.Info<UmbracoMembershipProviderBase>("Login attempt failed for username {Username} from IP address {IpAddress}, the user is not approved", username, GetCurrentRequestIpAddress());
+                Current.Logger.Info<UmbracoMembershipProviderBase, string, string>("Login attempt failed for username {Username} from IP address {IpAddress}, the user is not approved", username, GetCurrentRequestIpAddress());
 
                 return new ValidateUserResult
                 {
@@ -545,7 +545,7 @@ namespace Umbraco.Web.Security.Providers
             }
             if (member.IsLockedOut)
             {
-                Current.Logger.Info<UmbracoMembershipProviderBase>("Login attempt failed for username {Username} from IP address {IpAddress}, the user is locked", username, GetCurrentRequestIpAddress());
+                Current.Logger.Info<UmbracoMembershipProviderBase, string, string>("Login attempt failed for username {Username} from IP address {IpAddress}, the user is locked", username, GetCurrentRequestIpAddress());
 
                 return new ValidateUserResult
                 {
@@ -571,11 +571,11 @@ namespace Umbraco.Web.Security.Providers
                     member.IsLockedOut = true;
                     member.LastLockoutDate = DateTime.Now;
 
-                    Current.Logger.Info<UmbracoMembershipProviderBase>("Login attempt failed for username {Username} from IP address {IpAddress}, the user is now locked out, max invalid password attempts exceeded", username, GetCurrentRequestIpAddress());
+                    Current.Logger.Info<UmbracoMembershipProviderBase, string, string>("Login attempt failed for username {Username} from IP address {IpAddress}, the user is now locked out, max invalid password attempts exceeded", username, GetCurrentRequestIpAddress());
                 }
                 else
                 {
-                    Current.Logger.Info<UmbracoMembershipProviderBase>("Login attempt failed for username {Username} from IP address {IpAddress}", username, GetCurrentRequestIpAddress());
+                    Current.Logger.Info<UmbracoMembershipProviderBase, string, string>("Login attempt failed for username {Username} from IP address {IpAddress}", username, GetCurrentRequestIpAddress());
                 }
 
                 requiresFullSave = true;
@@ -591,7 +591,7 @@ namespace Umbraco.Web.Security.Providers
 
                 member.LastLoginDate = DateTime.Now;
 
-                Current.Logger.Info<UmbracoMembershipProviderBase>("Login attempt succeeded for username {Username} from IP address {IpAddress}", username, GetCurrentRequestIpAddress());
+                Current.Logger.Info<UmbracoMembershipProviderBase, string, string>("Login attempt succeeded for username {Username} from IP address {IpAddress}", username, GetCurrentRequestIpAddress());
             }
 
             // don't raise events for this! It just sets the member dates, if we do raise events this will
diff --git a/src/Umbraco.Web/Templates/HtmlUrlParser.cs b/src/Umbraco.Web/Templates/HtmlUrlParser.cs
index 0692b75fa7..721e8c04f4 100644
--- a/src/Umbraco.Web/Templates/HtmlUrlParser.cs
+++ b/src/Umbraco.Web/Templates/HtmlUrlParser.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Web.Templates
             {
                 // find all relative URLs (ie. URLs that contain ~)
                 var tags = ResolveUrlPattern.Matches(text);
-                _logger.Debug(typeof(IOHelper), "After regex: {Duration} matched: {TagsCount}", timer.Stopwatch.ElapsedMilliseconds, tags.Count);
+                _logger.Debug<long,int>(typeof(IOHelper), "After regex: {Duration} matched: {TagsCount}", timer.Stopwatch.ElapsedMilliseconds, tags.Count);
                 foreach (Match tag in tags)
                 {
                     var url = "";
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 57c7027598..ea78ef7aa0 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -175,7 +175,7 @@ namespace Umbraco.Web.Trees
                 // TODO: in the future we could return a validation statement so we can have some UI to notify the user they don't have access
                 if (ignoreUserStartNodes == false && HasPathAccess(id, queryStrings) == false)
                 {
-                    Logger.Warn<ContentTreeControllerBase>("User {Username} does not have access to node with id {Id}", Security.CurrentUser.Username, id);
+                    Logger.Warn<ContentTreeControllerBase, string, string>("User {Username} does not have access to node with id {Id}", Security.CurrentUser.Username, id);
                     return nodes;
                 }
 
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 32a949e972..c9a4e18dd6 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Web
                     BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.GetField,
                     null, runtime, null);
 
-                Current.Logger.Info<UmbracoApplicationBase>("Application shutdown. Details: {ShutdownReason}\r\n\r\n_shutDownMessage={ShutdownMessage}\r\n\r\n_shutDownStack={ShutdownStack}",
+                Current.Logger.Info<UmbracoApplicationBase,ApplicationShutdownReason, string, string>("Application shutdown. Details: {ShutdownReason}\r\n\r\n_shutDownMessage={ShutdownMessage}\r\n\r\n_shutDownStack={ShutdownStack}",
                     HostingEnvironment.ShutdownReason,
                     shutDownMessage,
                     shutDownStack);
@@ -140,7 +140,7 @@ namespace Umbraco.Web
             catch (Exception)
             {
                 //if for some reason that fails, then log the normal output
-                Current.Logger.Info<UmbracoApplicationBase>("Application shutdown. Reason: {ShutdownReason}", HostingEnvironment.ShutdownReason);
+                Current.Logger.Info<UmbracoApplicationBase,ApplicationShutdownReason>("Application shutdown. Reason: {ShutdownReason}", HostingEnvironment.ShutdownReason);
             }
 
             Current.Logger.DisposeIfDisposable();
@@ -195,7 +195,7 @@ namespace Umbraco.Web
             }
             catch (Exception ex)
             {
-                Current.Logger.Error<UmbracoApplicationBase>(ex, "Error in {Name} handler.", name);
+                Current.Logger.Error<UmbracoApplicationBase, string>(ex, "Error in {Name} handler.", name);
                 throw;
             }
         }
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index 2ec4141f5a..bfa5361a8a 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Web
             var end = false;
             var response = context.Response;
 
-            logger.Debug<UmbracoModule>("Response status: Redirect={Redirect}, Is404={Is404}, StatusCode={ResponseStatusCode}",
+            logger.Debug<UmbracoModule, string, string, int>("Response status: Redirect={Redirect}, Is404={Is404}, StatusCode={ResponseStatusCode}",
                 pcr.IsRedirect ? (pcr.IsRedirectPermanent ? "permanent" : "redirect") : "none",
                 pcr.Is404 ? "true" : "false",
                 pcr.ResponseStatusCode);
diff --git a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
index 1646c8a426..a5c0c2bc17 100644
--- a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.WebApi.Filters
                             }
                             catch (System.Exception ex)
                             {
-                                Current.Logger.Error<FileUploadCleanupFilterAttribute>(ex, "Could not delete temp file {FileName}", f.TempFilePath);
+                                Current.Logger.Error<FileUploadCleanupFilterAttribute, string>(ex, "Could not delete temp file {FileName}", f.TempFilePath);
                             }
                         }
                     }
@@ -111,7 +111,7 @@ namespace Umbraco.Web.WebApi.Filters
                                         tempFolders.Add(dir);
                                     }
 
-                                    Current.Logger.Debug<FileUploadCleanupFilterAttribute>("Removing temp file {FileName}", f.TempFilePath);
+                                    Current.Logger.Debug<FileUploadCleanupFilterAttribute, string>("Removing temp file {FileName}", f.TempFilePath);
 
                                     try
                                     {
@@ -119,7 +119,7 @@ namespace Umbraco.Web.WebApi.Filters
                                     }
                                     catch (System.Exception ex)
                                     {
-                                        Current.Logger.Error<FileUploadCleanupFilterAttribute>(ex, "Could not delete temp file {FileName}", f.TempFilePath);
+                                        Current.Logger.Error<FileUploadCleanupFilterAttribute, string>(ex, "Could not delete temp file {FileName}", f.TempFilePath);
                                     }
 
                                     //clear out the temp path so it's not returned in the response
@@ -138,12 +138,12 @@ namespace Umbraco.Web.WebApi.Filters
                     }
                     else
                     {
-                        Current.Logger.Warn<FileUploadCleanupFilterAttribute>("The actionExecutedContext.Request.Content.Value is not IHaveUploadedFiles, it is {ObjectType}", objectContent.Value.GetType());
+                        Current.Logger.Warn<FileUploadCleanupFilterAttribute,Type>("The actionExecutedContext.Request.Content.Value is not IHaveUploadedFiles, it is {ObjectType}", objectContent.Value.GetType());
                     }
                 }
                 else
                 {
-                    Current.Logger.Warn<FileUploadCleanupFilterAttribute>("The actionExecutedContext.Request.Content is not ObjectContent, it is {RequestObjectType}", actionExecutedContext.Request.Content.GetType());
+                    Current.Logger.Warn<FileUploadCleanupFilterAttribute,Type>("The actionExecutedContext.Request.Content is not ObjectContent, it is {RequestObjectType}", actionExecutedContext.Request.Content.GetType());
                 }
             }
         }
diff --git a/src/Umbraco.Web/WebApi/UnhandledExceptionLogger.cs b/src/Umbraco.Web/WebApi/UnhandledExceptionLogger.cs
index 1dd43f5b2a..983c377e80 100644
--- a/src/Umbraco.Web/WebApi/UnhandledExceptionLogger.cs
+++ b/src/Umbraco.Web/WebApi/UnhandledExceptionLogger.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.WebApi
                 var requestUrl = context.ExceptionContext?.ControllerContext?.Request?.RequestUri?.AbsoluteUri;
                 var controllerType = context.ExceptionContext?.ActionContext?.ControllerContext?.Controller?.GetType();
 
-                _logger.Error(controllerType, context.Exception, "Unhandled controller exception occurred for request '{RequestUrl}'", requestUrl);
+                _logger.Error<string>(controllerType, context.Exception, "Unhandled controller exception occurred for request '{RequestUrl}'", requestUrl);
             }
         }
 

From a6e1c2e90170dc796a2ed5f601b59f7d1a94a9a9 Mon Sep 17 00:00:00 2001
From: Chad <chad.d.currie@gmail.com>
Date: Mon, 22 Feb 2021 21:53:53 +1300
Subject: [PATCH 067/202] Fixes #9615 - Upgrade to Htmlsanitizer v5 (#9856)

---
 build/NuSpecs/UmbracoCms.Web.nuspec           |  1 +
 src/Umbraco.Core/Constants-SvgSanitizer.cs    | 23 +++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  9 ++++++++
 src/Umbraco.Web/Services/IconService.cs       | 22 ++++++++----------
 src/Umbraco.Web/Umbraco.Web.csproj            |  7 ++++--
 6 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 src/Umbraco.Core/Constants-SvgSanitizer.cs

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index e0ffd57aff..fc31551d6c 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -42,6 +42,7 @@
                 <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
                 <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
+                <dependency id="HtmlSanitizer" version="[5.0.376,5.999999)" />
 
             </group>
 
diff --git a/src/Umbraco.Core/Constants-SvgSanitizer.cs b/src/Umbraco.Core/Constants-SvgSanitizer.cs
new file mode 100644
index 0000000000..c92b9f56c7
--- /dev/null
+++ b/src/Umbraco.Core/Constants-SvgSanitizer.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Defines the alias identifiers for Umbraco's core application sections.
+        /// </summary>
+        public static class SvgSanitizer
+        {
+            /// <summary>
+            /// Allowlist for SVG attributes.
+            /// </summary>
+            public static readonly IList<string> Attributes = new [] { "accent-height", "accumulate", "additive", "alignment-baseline", "allowReorder", "alphabetic", "amplitude", "arabic-form", "ascent", "attributeName", "attributeType", "autoReverse", "azimuth", "baseFrequency", "baseline-shift", "baseProfile", "bbox", "begin", "bias", "by", "calcMode", "cap-height", "class", "clip", "clipPathUnits", "clip-path", "clip-rule", "color", "color-interpolation", "color-interpolation-filters", "color-profile", "color-rendering", "contentScriptType", "contentStyleType", "cursor", "cx", "cy", "d", "decelerate", "descent", "diffuseConstant", "direction", "display", "divisor", "dominant-baseline", "dur", "dx", "dy", "edgeMode", "elevation", "enable-background", "end", "exponent", "externalResourcesRequired", "Section", "fill", "fill-opacity", "fill-rule", "filter", "filterRes", "filterUnits", "flood-color", "flood-opacity", "font-family", "font-size", "font-size-adjust", "font-stretch", "font-style", "font-variant", "font-weight", "format", "from", "fr", "fx", "fy", "g1", "g2", "glyph-name", "glyph-orientation-horizontal", "glyph-orientation-vertical", "glyphRef", "gradientTransform", "gradientUnits", "hanging", "height", "href", "hreflang", "horiz-adv-x", "horiz-origin-x", "ISection", "id", "ideographic", "image-rendering", "in", "in2", "intercept", "k", "k1", "k2", "k3", "k4", "kernelMatrix", "kernelUnitLength", "kerning", "keyPoints", "keySplines", "keyTimes", "lang", "lengthAdjust", "letter-spacing", "lighting-color", "limitingConeAngle", "local", "MSection", "marker-end", "marker-mid", "marker-start", "markerHeight", "markerUnits", "markerWidth", "mask", "maskContentUnits", "maskUnits", "mathematical", "max", "media", "method", "min", "mode", "NSection", "name", "numOctaves", "offset", "opacity", "operator", "order", "orient", "orientation", "origin", "overflow", "overline-position", "overline-thickness", "panose-1", "paint-order", "path", "pathLength", "patternContentUnits", "patternTransform", "patternUnits", "ping", "pointer-events", "points", "pointsAtX", "pointsAtY", "pointsAtZ", "preserveAlpha", "preserveAspectRatio", "primitiveUnits", "r", "radius", "referrerPolicy", "refX", "refY", "rel", "rendering-intent", "repeatCount", "repeatDur", "requiredExtensions", "requiredFeatures", "restart", "result", "rotate", "rx", "ry", "scale", "seed", "shape-rendering", "slope", "spacing", "specularConstant", "specularExponent", "speed", "spreadMethod", "startOffset", "stdDeviation", "stemh", "stemv", "stitchTiles", "stop-color", "stop-opacity", "strikethrough-position", "strikethrough-thickness", "string", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "surfaceScale", "systemLanguage", "tabindex", "tableValues", "target", "targetX", "targetY", "text-anchor", "text-decoration", "text-rendering", "textLength", "to", "transform", "type", "u1", "u2", "underline-position", "underline-thickness", "unicode", "unicode-bidi", "unicode-range", "units-per-em", "v-alphabetic", "v-hanging", "v-ideographic", "v-mathematical", "values", "vector-effect", "version", "vert-adv-y", "vert-origin-x", "vert-origin-y", "viewBox", "viewTarget", "visibility", "width", "widths", "word-spacing", "writing-mode", "x", "x-height", "x1", "x2", "xChannelSelector", "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show", "xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "y", "y1", "y2", "yChannelSelector", "z", "zoomAndPan" };
+
+            /// <summary>
+            /// Allowlist for SVG tabs.
+            /// </summary>
+            public static readonly IList<string> Tags = new [] { "a", "altGlyph", "altGlyphDef", "altGlyphItem", "animate", "animateColor", "animateMotion", "animateTransform", "circle", "clipPath", "color-profile", "cursor", "defs", "desc", "discard", "ellipse", "feBlend", "feColorMatrix", "feComponentTransfer", "feComposite", "feConvolveMatrix", "feDiffuseLighting", "feDisplacementMap", "feDistantLight", "feDropShadow", "feFlood", "feFuncA", "feFuncB", "feFuncG", "feFuncR", "feGaussianBlur", "feImage", "feMerge", "feMergeNode", "feMorphology", "feOffset", "fePointLight", "feSpecularLighting", "feSpotLight", "feTile", "feTurbulence", "filter", "font", "font-face", "font-face-format", "font-face-name", "font-face-src", "font-face-uri", "foreignObject", "g", "glyph", "glyphRef", "hatch", "hatchpath", "hkern", "image", "line", "linearGradient", "marker", "mask", "mesh", "meshgradient", "meshpatch", "meshrow", "metadata", "missing-glyph", "mpath", "path", "pattern", "polygon", "polyline", "radialGradient", "rect", "set", "solidcolor", "stop", "svg", "switch", "symbol", "text", "textPath", "title", "tref", "tspan", "unknown", "use", "view", "vkern" };
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1cbf8a7b3f..8f4877f7f6 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -259,6 +259,7 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
+    <Compile Include="Constants-SvgSanitizer.cs" />
     <Compile Include="Exceptions\PanicException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index ac7e34d5cb..b15641b503 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -40,6 +40,7 @@ using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models;
+using Ganss.XSS;
 
 namespace Umbraco.Web.Runtime
 {
@@ -139,6 +140,14 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<ISectionService, SectionService>();
             composition.RegisterUnique<IDashboardService, DashboardService>();
             composition.RegisterUnique<IIconService, IconService>();
+            composition.Register<IHtmlSanitizer>(_ =>
+            {
+                var sanitizer = new HtmlSanitizer();
+                sanitizer.AllowedAttributes.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Attributes);
+                sanitizer.AllowedCssProperties.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Attributes);
+                sanitizer.AllowedTags.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Tags);
+                return sanitizer;
+            },Lifetime.Singleton);
 
             composition.RegisterUnique<IExamineManager>(factory => ExamineManager.Instance);
 
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index a74fa909e0..175650fd12 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Ganss.XSS;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
@@ -12,31 +13,24 @@ namespace Umbraco.Web.Services
     public class IconService : IIconService
     {
         private readonly IGlobalSettings _globalSettings;
+        private readonly IHtmlSanitizer _htmlSanitizer;
 
-        public IconService(IGlobalSettings globalSettings)
+        public IconService(IGlobalSettings globalSettings, IHtmlSanitizer htmlSanitizer)
         {
             _globalSettings = globalSettings;
+            _htmlSanitizer = htmlSanitizer;
         }
 
 
         /// <inheritdoc />
         public IList<IconModel> GetAllIcons()
         {
-            var icons = new List<IconModel>();
             var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
             var iconNames = directory.GetFiles("*.svg");
 
-            iconNames.OrderBy(f => f.Name).ToList().ForEach(iconInfo =>
-            {
-                var icon = GetIcon(iconInfo);
+            return iconNames.OrderBy(f => f.Name)
+                .Select(iconInfo => GetIcon(iconInfo)).WhereNotNull().ToList();
 
-                if (icon != null)
-                {
-                    icons.Add(icon);
-                }
-            });
-
-            return icons;
         }
 
         /// <inheritdoc />
@@ -70,10 +64,12 @@ namespace Umbraco.Web.Services
             try
             {
                 var svgContent = System.IO.File.ReadAllText(iconPath);
+                var sanitizedString = _htmlSanitizer.Sanitize(svgContent);
+
                 var svg = new IconModel
                 {
                     Name = iconName,
-                    SvgString = svgContent
+                    SvgString = sanitizedString
                 };
 
                 return svg;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c3aa0433c5..b85b81bb9e 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -65,6 +65,9 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.1.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
+    <PackageReference Include="HtmlSanitizer">
+      <Version>5.0.376</Version>
+    </PackageReference>
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>
@@ -1295,7 +1298,7 @@
     </PropertyGroup>
     <ItemGroup>
       <!-- we want to exclude all facade references ?! -->
-      <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http'" />
+      <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http' and '%(ReferencePath.FileName)' != 'System.Text.Encoding.CodePages'" />
     </ItemGroup>
     <Delete Files="$(TargetDir)$(TargetName).XmlSerializers.dll" ContinueOnError="true" />
     <!--
@@ -1305,4 +1308,4 @@
       <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
     </SGen>
   </Target>
-</Project>
\ No newline at end of file
+</Project>

From 388e0283bc2b493a8c285f45d0bdbbea088fef20 Mon Sep 17 00:00:00 2001
From: Chad <chad.d.currie@gmail.com>
Date: Mon, 22 Feb 2021 21:53:53 +1300
Subject: [PATCH 068/202] Fixes #9615 - Upgrade to Htmlsanitizer v5 (#9856)

(cherry picked from commit a6e1c2e90170dc796a2ed5f601b59f7d1a94a9a9)
---
 build/NuSpecs/UmbracoCms.Web.nuspec           |  1 +
 src/Umbraco.Core/Constants-SvgSanitizer.cs    | 23 +++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  9 ++++++++
 src/Umbraco.Web/Services/IconService.cs       | 22 ++++++++----------
 src/Umbraco.Web/Umbraco.Web.csproj            |  7 ++++--
 6 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 src/Umbraco.Core/Constants-SvgSanitizer.cs

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index e0ffd57aff..fc31551d6c 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -42,6 +42,7 @@
                 <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
                 <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
+                <dependency id="HtmlSanitizer" version="[5.0.376,5.999999)" />
 
             </group>
 
diff --git a/src/Umbraco.Core/Constants-SvgSanitizer.cs b/src/Umbraco.Core/Constants-SvgSanitizer.cs
new file mode 100644
index 0000000000..c92b9f56c7
--- /dev/null
+++ b/src/Umbraco.Core/Constants-SvgSanitizer.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Defines the alias identifiers for Umbraco's core application sections.
+        /// </summary>
+        public static class SvgSanitizer
+        {
+            /// <summary>
+            /// Allowlist for SVG attributes.
+            /// </summary>
+            public static readonly IList<string> Attributes = new [] { "accent-height", "accumulate", "additive", "alignment-baseline", "allowReorder", "alphabetic", "amplitude", "arabic-form", "ascent", "attributeName", "attributeType", "autoReverse", "azimuth", "baseFrequency", "baseline-shift", "baseProfile", "bbox", "begin", "bias", "by", "calcMode", "cap-height", "class", "clip", "clipPathUnits", "clip-path", "clip-rule", "color", "color-interpolation", "color-interpolation-filters", "color-profile", "color-rendering", "contentScriptType", "contentStyleType", "cursor", "cx", "cy", "d", "decelerate", "descent", "diffuseConstant", "direction", "display", "divisor", "dominant-baseline", "dur", "dx", "dy", "edgeMode", "elevation", "enable-background", "end", "exponent", "externalResourcesRequired", "Section", "fill", "fill-opacity", "fill-rule", "filter", "filterRes", "filterUnits", "flood-color", "flood-opacity", "font-family", "font-size", "font-size-adjust", "font-stretch", "font-style", "font-variant", "font-weight", "format", "from", "fr", "fx", "fy", "g1", "g2", "glyph-name", "glyph-orientation-horizontal", "glyph-orientation-vertical", "glyphRef", "gradientTransform", "gradientUnits", "hanging", "height", "href", "hreflang", "horiz-adv-x", "horiz-origin-x", "ISection", "id", "ideographic", "image-rendering", "in", "in2", "intercept", "k", "k1", "k2", "k3", "k4", "kernelMatrix", "kernelUnitLength", "kerning", "keyPoints", "keySplines", "keyTimes", "lang", "lengthAdjust", "letter-spacing", "lighting-color", "limitingConeAngle", "local", "MSection", "marker-end", "marker-mid", "marker-start", "markerHeight", "markerUnits", "markerWidth", "mask", "maskContentUnits", "maskUnits", "mathematical", "max", "media", "method", "min", "mode", "NSection", "name", "numOctaves", "offset", "opacity", "operator", "order", "orient", "orientation", "origin", "overflow", "overline-position", "overline-thickness", "panose-1", "paint-order", "path", "pathLength", "patternContentUnits", "patternTransform", "patternUnits", "ping", "pointer-events", "points", "pointsAtX", "pointsAtY", "pointsAtZ", "preserveAlpha", "preserveAspectRatio", "primitiveUnits", "r", "radius", "referrerPolicy", "refX", "refY", "rel", "rendering-intent", "repeatCount", "repeatDur", "requiredExtensions", "requiredFeatures", "restart", "result", "rotate", "rx", "ry", "scale", "seed", "shape-rendering", "slope", "spacing", "specularConstant", "specularExponent", "speed", "spreadMethod", "startOffset", "stdDeviation", "stemh", "stemv", "stitchTiles", "stop-color", "stop-opacity", "strikethrough-position", "strikethrough-thickness", "string", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "surfaceScale", "systemLanguage", "tabindex", "tableValues", "target", "targetX", "targetY", "text-anchor", "text-decoration", "text-rendering", "textLength", "to", "transform", "type", "u1", "u2", "underline-position", "underline-thickness", "unicode", "unicode-bidi", "unicode-range", "units-per-em", "v-alphabetic", "v-hanging", "v-ideographic", "v-mathematical", "values", "vector-effect", "version", "vert-adv-y", "vert-origin-x", "vert-origin-y", "viewBox", "viewTarget", "visibility", "width", "widths", "word-spacing", "writing-mode", "x", "x-height", "x1", "x2", "xChannelSelector", "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show", "xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "y", "y1", "y2", "yChannelSelector", "z", "zoomAndPan" };
+
+            /// <summary>
+            /// Allowlist for SVG tabs.
+            /// </summary>
+            public static readonly IList<string> Tags = new [] { "a", "altGlyph", "altGlyphDef", "altGlyphItem", "animate", "animateColor", "animateMotion", "animateTransform", "circle", "clipPath", "color-profile", "cursor", "defs", "desc", "discard", "ellipse", "feBlend", "feColorMatrix", "feComponentTransfer", "feComposite", "feConvolveMatrix", "feDiffuseLighting", "feDisplacementMap", "feDistantLight", "feDropShadow", "feFlood", "feFuncA", "feFuncB", "feFuncG", "feFuncR", "feGaussianBlur", "feImage", "feMerge", "feMergeNode", "feMorphology", "feOffset", "fePointLight", "feSpecularLighting", "feSpotLight", "feTile", "feTurbulence", "filter", "font", "font-face", "font-face-format", "font-face-name", "font-face-src", "font-face-uri", "foreignObject", "g", "glyph", "glyphRef", "hatch", "hatchpath", "hkern", "image", "line", "linearGradient", "marker", "mask", "mesh", "meshgradient", "meshpatch", "meshrow", "metadata", "missing-glyph", "mpath", "path", "pattern", "polygon", "polyline", "radialGradient", "rect", "set", "solidcolor", "stop", "svg", "switch", "symbol", "text", "textPath", "title", "tref", "tspan", "unknown", "use", "view", "vkern" };
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b98ad64f7a..832b8a5801 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -256,6 +256,7 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
+    <Compile Include="Constants-SvgSanitizer.cs" />
     <Compile Include="Exceptions\PanicException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index ac7e34d5cb..b15641b503 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -40,6 +40,7 @@ using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models;
+using Ganss.XSS;
 
 namespace Umbraco.Web.Runtime
 {
@@ -139,6 +140,14 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<ISectionService, SectionService>();
             composition.RegisterUnique<IDashboardService, DashboardService>();
             composition.RegisterUnique<IIconService, IconService>();
+            composition.Register<IHtmlSanitizer>(_ =>
+            {
+                var sanitizer = new HtmlSanitizer();
+                sanitizer.AllowedAttributes.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Attributes);
+                sanitizer.AllowedCssProperties.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Attributes);
+                sanitizer.AllowedTags.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Tags);
+                return sanitizer;
+            },Lifetime.Singleton);
 
             composition.RegisterUnique<IExamineManager>(factory => ExamineManager.Instance);
 
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index a74fa909e0..175650fd12 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Ganss.XSS;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
@@ -12,31 +13,24 @@ namespace Umbraco.Web.Services
     public class IconService : IIconService
     {
         private readonly IGlobalSettings _globalSettings;
+        private readonly IHtmlSanitizer _htmlSanitizer;
 
-        public IconService(IGlobalSettings globalSettings)
+        public IconService(IGlobalSettings globalSettings, IHtmlSanitizer htmlSanitizer)
         {
             _globalSettings = globalSettings;
+            _htmlSanitizer = htmlSanitizer;
         }
 
 
         /// <inheritdoc />
         public IList<IconModel> GetAllIcons()
         {
-            var icons = new List<IconModel>();
             var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
             var iconNames = directory.GetFiles("*.svg");
 
-            iconNames.OrderBy(f => f.Name).ToList().ForEach(iconInfo =>
-            {
-                var icon = GetIcon(iconInfo);
+            return iconNames.OrderBy(f => f.Name)
+                .Select(iconInfo => GetIcon(iconInfo)).WhereNotNull().ToList();
 
-                if (icon != null)
-                {
-                    icons.Add(icon);
-                }
-            });
-
-            return icons;
         }
 
         /// <inheritdoc />
@@ -70,10 +64,12 @@ namespace Umbraco.Web.Services
             try
             {
                 var svgContent = System.IO.File.ReadAllText(iconPath);
+                var sanitizedString = _htmlSanitizer.Sanitize(svgContent);
+
                 var svg = new IconModel
                 {
                     Name = iconName,
-                    SvgString = svgContent
+                    SvgString = sanitizedString
                 };
 
                 return svg;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 80c8d19a58..ca29e69991 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -65,6 +65,9 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.1.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
+    <PackageReference Include="HtmlSanitizer">
+      <Version>5.0.376</Version>
+    </PackageReference>
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>
@@ -1293,7 +1296,7 @@
     </PropertyGroup>
     <ItemGroup>
       <!-- we want to exclude all facade references ?! -->
-      <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http'" />
+      <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http' and '%(ReferencePath.FileName)' != 'System.Text.Encoding.CodePages'" />
     </ItemGroup>
     <Delete Files="$(TargetDir)$(TargetName).XmlSerializers.dll" ContinueOnError="true" />
     <!--
@@ -1303,4 +1306,4 @@
       <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
     </SGen>
   </Target>
-</Project>
\ No newline at end of file
+</Project>

From 2cedf435a97982b2e78c45602451060238194dc8 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 22 Feb 2021 16:41:19 +0100
Subject: [PATCH 069/202] Fix error where the SQL for setting the timeout was
 missing a crucial space.

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

diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index 372b6837bc..a038d06121 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -281,7 +281,7 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
 
         private static void ObtainWriteLock(IDatabase db, TimeSpan timeout, int lockId)
         {
-            db.Execute("SET LOCK_TIMEOUT" + timeout.TotalMilliseconds + ";");
+            db.Execute("SET LOCK_TIMEOUT " + timeout.TotalMilliseconds + ";");
             var i = db.Execute(
                 @"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id",
                 new {id = lockId});

From 5ee98919bc9efd94849b71712d45ee68f36e8a82 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 22 Feb 2021 17:22:04 +0100
Subject: [PATCH 070/202] Fix test where selector wasn't specific enough

---
 .../cypress/integration/Content/content.ts                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index 22f1f883d0..1a40e8451f 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -574,7 +574,7 @@ context('Content', () => {
 
         // Create content with content picker
         cy.get('.umb-tree-root-link').rightclick();
-        cy.get('.-opens-dialog > .umb-action-link').click();
+        cy.get('[data-element="action-create"]').click();
         cy.get('[data-element="action-create-' + pickerDocTypeAlias + '"] > .umb-action-link').click();
         // Fill out content
         cy.umbracoEditorHeaderName('ContentPickerContent');

From e3dc017d7ec39861bd65d7cb6580e243c01e59af Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 23 Feb 2021 10:41:00 +1100
Subject: [PATCH 071/202] Keep custom claims that are flowed from autolinking

When auto linking with callbacks such as OnExternalLogin, custom claims can be added to the user which are flowed to the auth ticket/identity.
However, when the security stamp validator executes, the identity is re-created manually without any knowledge of those custom claims so
they are lost. This ensures that those custom claims flow through to the re-generated identity during the security stamp validation phase.
---
 .../Security/AppBuilderExtensions.cs          | 23 ++++++++++---
 .../BackOfficeClaimsIdentityFactory.cs        | 12 +++----
 .../Security/ClaimsIdentityExtensions.cs      | 34 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 4 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 src/Umbraco.Web/Security/ClaimsIdentityExtensions.cs

diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 8f33f10eea..ca92de49eb 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -169,11 +169,24 @@ namespace Umbraco.Web.Security
                 // Enables the application to validate the security stamp when the user
                 // logs in. This is a security feature which is used when you
                 // change a password or add an external login to your account.
-                OnValidateIdentity = SecurityStampValidator
-                    .OnValidateIdentity<BackOfficeUserManager, BackOfficeIdentityUser, int>(
-                        TimeSpan.FromMinutes(30),
-                        (manager, user) => manager.GenerateUserIdentityAsync(user),
-                        identity => identity.GetUserId<int>()),
+                OnValidateIdentity = context =>
+                {
+                    var identity = context.Identity;
+
+                    return SecurityStampValidator
+                        .OnValidateIdentity<BackOfficeUserManager, BackOfficeIdentityUser, int>(
+                        TimeSpan.FromMinutes(3),
+                        async (manager, user) =>
+                        {
+                            var regenerated = await manager.GenerateUserIdentityAsync(user);
+
+                            // Keep any custom claims from the original identity
+                            regenerated.MergeClaimsFromBackOfficeIdentity(identity);
+
+                            return regenerated;
+                        },
+                        identity => identity.GetUserId<int>())(context);
+                }
 
             };
 
diff --git a/src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs b/src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
index d61d2ea711..2883ae8faf 100644
--- a/src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
+++ b/src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
@@ -27,12 +27,6 @@ namespace Umbraco.Web.Security
         {
             var baseIdentity = await base.CreateAsync(manager, user, authenticationType);
 
-            // now we can flow any custom claims that the actual user has currently assigned which could be done in the OnExternalLogin callback
-            foreach (var claim in user.Claims)
-            {
-                baseIdentity.AddClaim(new Claim(claim.ClaimType, claim.ClaimValue));
-            }
-
             var umbracoIdentity = new UmbracoBackOfficeIdentity(baseIdentity,
                 user.Id,
                 user.UserName,
@@ -40,12 +34,16 @@ namespace Umbraco.Web.Security
                 user.CalculatedContentStartNodeIds,
                 user.CalculatedMediaStartNodeIds,
                 user.Culture,
-                //NOTE - there is no session id assigned here, this is just creating the identity, a session id will be generated when the cookie is written
+                // NOTE - there is no session id assigned here, this is just creating the identity, a session id will be generated when the cookie is written
                 Guid.NewGuid().ToString(),
                 user.SecurityStamp,
                 user.AllowedSections,
                 user.Roles.Select(x => x.RoleId).ToArray());
 
+            // now we can flow any custom claims that the actual user has currently
+            // assigned which could be done in the OnExternalLogin callback
+            umbracoIdentity.MergeClaimsFromBackOfficeIdentity(user);
+
             return umbracoIdentity;
         }
     }
diff --git a/src/Umbraco.Web/Security/ClaimsIdentityExtensions.cs b/src/Umbraco.Web/Security/ClaimsIdentityExtensions.cs
new file mode 100644
index 0000000000..aa8549462d
--- /dev/null
+++ b/src/Umbraco.Web/Security/ClaimsIdentityExtensions.cs
@@ -0,0 +1,34 @@
+using System.Linq;
+using System.Security.Claims;
+using Umbraco.Core.Models.Identity;
+using Constants = Umbraco.Core.Constants;
+
+namespace Umbraco.Web.Security
+{
+    internal static class ClaimsIdentityExtensions
+    {
+        // Ignore these Claims when merging, these claims are dynamically added whenever the ticket
+        // is re-issued and we don't want to merge old values of these.
+        private static readonly string[] IgnoredClaims = new[] { ClaimTypes.CookiePath, Constants.Security.SessionIdClaimType };
+
+        internal static void MergeClaimsFromBackOfficeIdentity(this ClaimsIdentity destination, ClaimsIdentity source)
+        {
+            foreach (var claim in source.Claims
+                .Where(claim => !IgnoredClaims.Contains(claim.Type))
+                .Where(claim => !destination.HasClaim(claim.Type, claim.Value)))
+            {
+                destination.AddClaim(new Claim(claim.Type, claim.Value));
+            }
+        }
+
+        internal static void MergeClaimsFromBackOfficeIdentity(this ClaimsIdentity destination, BackOfficeIdentityUser source)
+        {
+            foreach (var claim in source.Claims
+                .Where(claim => !IgnoredClaims.Contains(claim.ClaimType))
+                .Where(claim => !destination.HasClaim(claim.ClaimType, claim.ClaimValue)))
+            {
+                destination.AddClaim(new Claim(claim.ClaimType, claim.ClaimValue));
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 16068b66f0..8717ca6a13 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -288,6 +288,7 @@
     <Compile Include="Security\BackOfficeExternalLoginProviderErrorMiddlware.cs" />
     <Compile Include="Security\BackOfficeExternalLoginProviderErrors.cs" />
     <Compile Include="Security\BackOfficeExternalLoginProviderOptions.cs" />
+    <Compile Include="Security\ClaimsIdentityExtensions.cs" />
     <Compile Include="Security\SignOutAuditEventArgs.cs" />
     <Compile Include="Security\UserInviteEventArgs.cs" />
     <Compile Include="Services\DashboardService.cs" />

From 27d94f1ca661af03a4ff6dfe63abcd4e5d856227 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 23 Feb 2021 11:25:27 +1100
Subject: [PATCH 072/202] removes testing timeout so it stays as it was

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

diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index ca92de49eb..a8dd84ef54 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -175,7 +175,7 @@ namespace Umbraco.Web.Security
 
                     return SecurityStampValidator
                         .OnValidateIdentity<BackOfficeUserManager, BackOfficeIdentityUser, int>(
-                        TimeSpan.FromMinutes(3),
+                        TimeSpan.FromMinutes(30),
                         async (manager, user) =>
                         {
                             var regenerated = await manager.GenerateUserIdentityAsync(user);

From 2bb8b02233c837ab098f1a52d1a22b131343d7db Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 23 Feb 2021 11:28:42 +1100
Subject: [PATCH 073/202] adds notes

---
 src/Umbraco.Web/Security/AppBuilderExtensions.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index a8dd84ef54..23afc36f93 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -171,10 +171,17 @@ namespace Umbraco.Web.Security
                 // change a password or add an external login to your account.
                 OnValidateIdentity = context =>
                 {
+                    // capture the current ticket for the request
                     var identity = context.Identity;
 
                     return SecurityStampValidator
                         .OnValidateIdentity<BackOfficeUserManager, BackOfficeIdentityUser, int>(
+                        // This will re-verify the security stamp at a throttled 30 mins
+                        // (the standard/default set in aspnet identity).
+                        // This ensures that if the security stamp has changed - i.e. passwords,
+                        // external logins, or other security profile data changed behind the
+                        // scenes while being logged in, that they are logged out and have
+                        // to re-verify their identity.
                         TimeSpan.FromMinutes(30),
                         async (manager, user) =>
                         {

From 82545e3185986cdaefcdd58f711065a8c427107d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 24 Feb 2021 16:55:00 +1100
Subject: [PATCH 074/202] Fixes the Sql server SET LOCK_TIMEOUT call which was
 missing a space.

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

diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index 372b6837bc..a038d06121 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -281,7 +281,7 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
 
         private static void ObtainWriteLock(IDatabase db, TimeSpan timeout, int lockId)
         {
-            db.Execute("SET LOCK_TIMEOUT" + timeout.TotalMilliseconds + ";");
+            db.Execute("SET LOCK_TIMEOUT " + timeout.TotalMilliseconds + ";");
             var i = db.Execute(
                 @"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id",
                 new {id = lockId});

From b019bc0ccfb169c1e304096ef70e03b15f594289 Mon Sep 17 00:00:00 2001
From: Aaron Sadler <aaron@aaronsadler.co.uk>
Date: Wed, 24 Feb 2021 21:15:08 +0000
Subject: [PATCH 075/202] Fix for Grid placeholder breaking out of container

---
 src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less | 1 +
 1 file changed, 1 insertion(+)

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 3b084c9905..281284a5ca 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
@@ -401,6 +401,7 @@
     text-align: center;
     text-align: -moz-center;
     width: 100%;
+    box-sizing: border-box;
 }
 
 .umb-grid .umb-editor-placeholder i {

From 6b3202e37b05d466ff5b260b93fead75f80bee16 Mon Sep 17 00:00:00 2001
From: patrickdemooij9 <patrickdemooij98@hotmail.com>
Date: Wed, 24 Feb 2021 23:16:40 +0100
Subject: [PATCH 076/202] 9841: Don't focus on nested content node at page load
 (#9863)

Tested and can confirm that this fixes the focus issue.
---
 .../nestedcontent/nestedcontent.controller.js    | 16 ++++++++--------
 .../nestedcontent.propertyeditor.html            |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index f262647a0d..e1238313cc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -105,12 +105,13 @@
         localizationService.localizeMany(["grid_addElement", "content_createEmpty", "actions_copy"]).then(function (data) {
             labels.grid_addElement = data[0];
             labels.content_createEmpty = data[1];
-            labels.copy_icon_title = data[2]
+            labels.copy_icon_title = data[2];
         });
 
-        function setCurrentNode(node) {
+        function setCurrentNode(node, focusNode) {
             updateModel();
             vm.currentNode = node;
+            vm.focusOnNode = focusNode;
         }
 
         var copyAllEntries = function () {
@@ -180,7 +181,7 @@
 
             var newNode = createNode(scaffold, null);
 
-            setCurrentNode(newNode);
+            setCurrentNode(newNode, true);
             setDirty();
             validate();
         };
@@ -202,7 +203,6 @@
             });
 
             const dialog = {
-                view: "itempicker",
                 orderBy: "$index",
                 view: "itempicker",
                 event: $event,
@@ -277,9 +277,9 @@
 
         vm.editNode = function (idx) {
             if (vm.currentNode && vm.currentNode.key === vm.nodes[idx].key) {
-                setCurrentNode(null);
+                setCurrentNode(null, false);
             } else {
-                setCurrentNode(vm.nodes[idx]);
+                setCurrentNode(vm.nodes[idx], true);
             }
         };
 
@@ -500,7 +500,7 @@
             setDirty();
             //updateModel();// done by setting current node...
 
-            setCurrentNode(newNode);
+            setCurrentNode(newNode, true);
         }
 
         function checkAbilityToPasteContent() {
@@ -592,7 +592,7 @@
 
                 // If there is only one item, set it as current node
                 if (vm.singleMode || (vm.nodes.length === 1 && vm.maxItems === 1)) {
-                    setCurrentNode(vm.nodes[0]);
+                    setCurrentNode(vm.nodes[0], false);
                 }
 
                 validate();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html
index f853387612..aaebb5d07e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html
@@ -16,7 +16,7 @@
                         <div class="umb-nested-content__header-bar"
                              ng-click="vm.editNode($index)"
                              ng-hide="vm.singleMode"
-                             umb-auto-focus="{{vm.currentNode.key === node.key ? 'true' : 'false'}}">
+                             umb-auto-focus="{{vm.focusOnNode && vm.currentNode.key === node.key ? 'true' : 'false'}}">
 
                             <div class="umb-nested-content__heading"><i ng-if="vm.showIcons" class="icon umb-nested-content__item-icon" ng-class="vm.getIcon($index)"></i><span class="umb-nested-content__item-name" ng-class="{'--has-icon': vm.showIcons}" ng-bind="vm.getName($index)"></span></div>
 

From c0842c7216593f776eb69a9e65f2f8548977db63 Mon Sep 17 00:00:00 2001
From: Patrick de Mooij <patrickdemooij98@hotmail.com>
Date: Tue, 23 Feb 2021 19:04:42 +0100
Subject: [PATCH 077/202] Don't show configuration header if there is none

---
 .../datatypesettings/datatypesettings.html       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
index 428905020b..77cfc705a3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
@@ -36,13 +36,15 @@
                             </div>
                         </div>
                     </div>
-                    
-                    <h5><localize key="contentTypeEditor_configuration"></localize></h5>
-                    
-                    <umb-property property="preValue" ng-repeat="preValue in vm.dataType.preValues">
-                        <umb-property-editor model="preValue" is-pre-value="true"></umb-property-editor>
-                    </umb-property>
-                        
+
+                    <div ng-if="vm.dataType.preValues.length > 0">
+                        <h5><localize key="contentTypeEditor_configuration"></localize></h5>
+
+                        <umb-property property="preValue" ng-repeat="preValue in vm.dataType.preValues">
+                            <umb-property-editor model="preValue" is-pre-value="true"></umb-property-editor>
+                        </umb-property>
+                    </div>
+
                 </umb-box-content>
             </umb-box>
         </umb-editor-container>

From 3e081f1039c2f184a439fae80bfbf59a8140b7fa Mon Sep 17 00:00:00 2001
From: Anders Bjerner <abjerner@skybrud.dk>
Date: Mon, 22 Feb 2021 19:37:10 +0100
Subject: [PATCH 078/202] Minor adjustments to ngdocs in editor.service.js

---
 .../src/common/services/editor.service.js     | 165 ++++++++++--------
 1 file changed, 92 insertions(+), 73 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 326123f797..b0a2465f42 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -187,7 +187,7 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Method to return all open editors
+         * Method to return all open editors.
          */
         function getEditors() {
             return editors;
@@ -199,7 +199,7 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Method to return the number of open editors
+         * Method to return the number of open editors.
          */
         function getNumberOfEditors() {
             return editors.length;
@@ -250,8 +250,8 @@ When building a custom infinite editor view you can use the same components as a
          * Method to open a new editor in infinite editing.
          *
          * @param {object} editor rendering options.
-         * @param {string} editor.view Path to view.
-         * @param {string} editor.size Sets the size of the editor ("small" || "medium"). If nothing is set it will use full width.
+         * @param {string} editor.view URL to view.
+         * @param {string} editor.size Sets the size of the editor (`small` or `medium`). If nothing is set it will use full width.
          */
         function open(editor) {
 
@@ -286,7 +286,7 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Method to close the latest opened editor
+         * Method to close the latest opened editor.
          */
         function close() {
 
@@ -321,7 +321,7 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Method to close all open editors
+         * Method to close all open editors.
          */
         function closeAll() {
 
@@ -342,6 +342,7 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a content editor in infinite editing, the submit callback returns the updated content item.
+         *
          * @param {object} editor rendering options.
          * @param {string} editor.id The id of the content item.
          * @param {boolean} editor.create Create new content item.
@@ -351,7 +352,6 @@ When building a custom infinite editor view you can use the same components as a
          * @param {string} editor.documentTypeAlias If editor.create is true, provide document type alias for the creation of the content item.
          * @param {boolean} editor.allowSaveAndClose If editor is being used in infinite editing allows the editor to close when the save action is performed.
          * @param {boolean} editor.allowPublishAndClose If editor is being used in infinite editing allows the editor to close when the publish action is performed.
-         * 
          * @returns {object} editor object
          */
         function contentEditor(editor) {
@@ -395,7 +395,6 @@ When building a custom infinite editor view you can use the same components as a
          * @param {boolean} editor.multiPicker Pick one or multiple items.
          * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
          * @param {function} editor.close Callback function when the close button is clicked.
-         *
          * @returns {object} editor object
          */
         function contentTypePicker(editor) {
@@ -418,7 +417,6 @@ When building a custom infinite editor view you can use the same components as a
          * @param {boolean} editor.multiPicker Pick one or multiple items.
          * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
          * @param {function} editor.close Callback function when the close button is clicked.
-         *
          * @returns {object} editor object.
          */
         function mediaTypePicker(editor) {
@@ -458,13 +456,14 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a copy editor in infinite editing, the submit callback returns an array of selected items.
+         *
+         * @param {object} editor rendering options.
          * @param {string} editor.section The node entity type.
          * @param {string} editor.currentNode The current node id.
-         * @param {function} editor.submit Saves, submits, and closes the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
-
         function copy(editor) {
             editor.view = "views/common/infiniteeditors/copy/copy.html";
             if (!editor.size) editor.size = "small";
@@ -478,13 +477,14 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a move editor in infinite editing.
+         *
+         * @param {object} editor rendering options.
          * @param {string} editor.section The node entity type.
          * @param {string} editor.currentNode The current node id.
-         * @param {function} editor.submit Saves, submits, and closes the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
-
         function move(editor) {
             editor.view = "views/common/infiniteeditors/move/move.html";
             if (!editor.size) editor.size = "small";
@@ -498,11 +498,12 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens an embed editor in infinite editing.
-         * @param {function} editor.submit Saves, submits, and closes the editor.
-         * @param {function} editor.close Closes the editor.
+         *
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
-
         function embed(editor) {
             editor.view = "views/common/infiniteeditors/embed/embed.html";
             if (!editor.size) editor.size = "small";
@@ -516,12 +517,13 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a rollback editor in infinite editing.
+         *
+         * @param {object} editor rendering options.
          * @param {string} editor.node The node to rollback.
-         * @param {function} editor.submit Saves, submits, and closes the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
-
         function rollback(editor) {
             editor.view = "views/common/infiniteeditors/rollback/rollback.html";
             if (!editor.size) editor.size = "medium";
@@ -535,11 +537,12 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens an embed editor in infinite editing.
+         *
          * @param {object} editor rendering options.
          * @param {string} editor.icon The icon class.
          * @param {string} editor.color The color class.
-         * @param {function} editor.submit Saves, submits, and closes the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function linkPicker(editor) {
@@ -555,11 +558,12 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a media editor in infinite editing, the submit callback returns the updated media item.
+         *
          * @param {object} editor rendering options.
          * @param {string} editor.id The id of the media item.
          * @param {boolean} editor.create Create new media item.
-         * @param {function} editor.submit Saves, submits, and closes the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function mediaEditor(editor) {
@@ -574,6 +578,7 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a media picker in infinite editing, the submit callback returns an array of selected media items.
+         *
          * @param {object} editor rendering options.
          * @param {number} editor.startNodeId Set the startnode of the picker (optional).
          * @param {boolean} editor.multiPicker Pick one or multiple items.
@@ -581,8 +586,8 @@ When building a custom infinite editor view you can use the same components as a
          * @param {boolean} editor.disableFolderSelect Disable folder selection.
          * @param {boolean} editor.disableFocalPoint Disable focal point editor for selected media.
          * @param {array} editor.updatedMediaNodes A list of ids for media items that have been updated through the media picker.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function mediaPicker(editor) {
@@ -599,10 +604,11 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the media crop details editor in infinite editing, the submit callback returns the updated media object.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
-         * @returns {object} editor object
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
+         * @returns {object} editor object.
          */
         function mediaCropDetails(editor) {
             editor.view = "views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html";
@@ -616,11 +622,12 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens an icon picker in infinite editing, the submit callback returns the selected icon.
+         *
          * @param {object} editor rendering options.
-         * @param {string} editor.icon The CSS class representing the icon - eg. "icon-autofill".
-         * @param {string} editor.color The CSS class representing the color - eg. "color-red".
-         * @param {callback} editor.submit Submits the editor.
-         * @param {callback} editor.close Closes the editor.
+         * @param {string} editor.icon The CSS class representing the icon - eg. `icon-autofill.
+         * @param {string} editor.color The CSS class representing the color - eg. color-red.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function iconPicker(editor) {
@@ -636,14 +643,15 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the document type editor in infinite editing, the submit callback returns the alias of the saved document type.
+         *
          * @param {object} editor rendering options.
          * @param {number} editor.id Indicates the ID of the document type to be edited. Alternatively the ID may be set to `-1` in combination with `create` being set to `true` to open the document type editor for creating a new document type.
          * @param {boolean} editor.create Set to `true` to open the document type editor for creating a new document type.
          * @param {boolean} editor.noTemplate If `true` and in combination with `create` being set to `true`, the document type editor will not create a corresponding template by default. This is similar to selecting the "Document Type without a template" in the Create dialog.
          * @param {boolean} editor.isElement If `true` and in combination with `create` being set to `true`, the "Is an Element type" option will be selected by default in the document type editor.
          * @param {boolean} editor.allowVaryByCulture If `true` and in combination with `create`, the "Allow varying by culture" option will be selected by default in the document type editor.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function documentTypeEditor(editor) {
@@ -658,10 +666,11 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the media type editor in infinite editing, the submit callback returns the saved media type.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
-         * @returns {object} editor object
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
+         * @returns {object} editor object.
          */
         function mediaTypeEditor(editor) {
             editor.view = "views/mediatypes/edit.html";
@@ -675,9 +684,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the member type editor in infinite editing, the submit callback returns the saved member type.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function memberTypeEditor(editor) {
@@ -692,9 +702,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the query builder in infinite editing, the submit callback returns the generated query.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function queryBuilder(editor) {
@@ -709,12 +720,13 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the query builder in infinite editing, the submit callback returns the generted query.
+         *
          * @param {object} editor rendering options.
          * @param {string} options.section tree section to display.
          * @param {string} options.treeAlias specific tree to display.
          * @param {boolean} options.multiPicker should the tree pick one or multiple items before returning.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function treePicker(editor) {
@@ -730,9 +742,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the an editor to set node permissions.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function nodePermissions(editor) {
@@ -748,9 +761,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Open an editor to insert code snippets into the code editor.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function insertCodeSnippet(editor) {
@@ -766,6 +780,7 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the user group picker in infinite editing, the submit callback returns an array of the selected user groups.
+         *
          * @param {object} editor rendering options.
          * @param {function} editor.submit Submits the editor.
          * @param {function} editor.close Closes the editor.
@@ -783,10 +798,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the user group picker in infinite editing, the submit callback returns the saved user group
+         * Opens the user group picker in infinite editing, the submit callback returns the saved user group.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function userGroupEditor(editor) {
@@ -801,10 +817,11 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the template editor in infinite editing, the submit callback returns the saved template.
+         *
          * @param {object} editor rendering options.
          * @param {string} editor.id The template id.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function templateEditor(editor) {
@@ -819,9 +836,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the section picker in infinite editing, the submit callback returns an array of the selected sections.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function sectionPicker(editor) {
@@ -837,9 +855,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the insert field editor in infinite editing, the submit callback returns the code snippet.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function insertField(editor) {
@@ -855,9 +874,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the template sections editor in infinite editing, the submit callback returns the type to insert.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function templateSections(editor) {
@@ -873,9 +893,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the section picker in infinite editing, the submit callback returns an array of the selected users.
+         *
          * @param {object} editor rendering options.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function userPicker(editor) {
@@ -896,8 +917,8 @@ When building a custom infinite editor view you can use the same components as a
          * @param {array} editor.availableItems Array of available items.
          * @param {array} editor.selectedItems Array of selected items. When passed in the selected items will be filtered from the available items.
          * @param {boolean} editor.filter Set to false to hide the filter.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function itemPicker(editor) {
@@ -914,8 +935,9 @@ When building a custom infinite editor view you can use the same components as a
          * @description
          * Opens a macro picker in infinite editing, the submit callback returns an array of the selected items.
          *
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function macroPicker(editor) {
@@ -934,8 +956,8 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @param {object} editor rendering options.
          * @param {object} editor.multiPicker Pick one or multiple items.
-         * @param {function} editor.submit Submits the editor.
-         * @param {function} editor.close Closes the editor.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          * @returns {object} editor object.
          */
         function memberGroupPicker(editor) {
@@ -956,7 +978,6 @@ When building a custom infinite editor view you can use the same components as a
         * @param {boolean} editor.multiPicker Pick one or multiple items.
         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
         * @param {function} editor.close Callback function when the close button is clicked.
-        * 
         * @returns {object} editor object.
         */
         function memberPicker(editor) {
@@ -974,13 +995,13 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a member editor in infinite editing, the submit callback returns the updated member.
+         *
          * @param {object} editor rendering options.
          * @param {string} editor.id The id (GUID) of the member.
          * @param {boolean} editor.create Create new member.
          * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
          * @param {function} editor.close Callback function when the close button is clicked.
-         * @param {string} editor.doctype If editor.create is true, provide member type for the creation of the member.
-         * 
+         * @param {string} editor.doctype If `editor.create` is `true`, provide member type for the creation of the member.
          * @returns {object} editor object.
          */
         function memberEditor(editor) {
@@ -998,7 +1019,6 @@ When building a custom infinite editor view you can use the same components as a
          * @description
          * Internal method to keep track of keyboard shortcuts registered
          * to each editor so they can be rebound when an editor closes.
-         *
          */
         function unbindKeyboardShortcuts() {
             const shortcuts = Utilities.copy(keyboardService.keyboardEvent);
@@ -1018,7 +1038,6 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Internal method to rebind keyboard shortcuts for the editor in focus.
-         *
          */
         function rebindKeyboardShortcuts() {
             // find the shortcuts from the previous editor

From 3139eb310ea2fb17619081a5883c946bb5a37495 Mon Sep 17 00:00:00 2001
From: Patrick de Mooij <patrickdemooij98@hotmail.com>
Date: Tue, 23 Feb 2021 12:57:29 +0100
Subject: [PATCH 079/202] 9842: Fix for defaultConfig not working without
 prevalues

---
 .../Manifest/DataEditorConverter.cs           | 23 ++++++++++++-------
 .../Manifest/ManifestParserTests.cs           |  2 ++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Manifest/DataEditorConverter.cs b/src/Umbraco.Core/Manifest/DataEditorConverter.cs
index 86982e17f2..efa9347edb 100644
--- a/src/Umbraco.Core/Manifest/DataEditorConverter.cs
+++ b/src/Umbraco.Core/Manifest/DataEditorConverter.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Core.Manifest
                 PrepareForPropertyEditor(jobject, dataEditor);
             else
                 PrepareForParameterEditor(jobject, dataEditor);
- 
+
             base.Deserialize(jobject, target, serializer);
         }
 
@@ -86,26 +86,33 @@ namespace Umbraco.Core.Manifest
             if (jobject["editor"]["validation"] is JObject validation)
                 jobject["editor"]["validation"] = RewriteValidators(validation);
 
-            if (jobject["prevalues"] is JObject config)
+            var prevalues = jobject["prevalues"] as JObject;
+            var defaultConfig = jobject["defaultConfig"] as JObject;
+            if (prevalues != null || defaultConfig != null)
             {
                 // explicitly assign a configuration editor of type ConfigurationEditor
                 // (else the deserializer will try to read it before setting it)
                 // (and besides it's an interface)
                 target.ExplicitConfigurationEditor = new ConfigurationEditor();
 
-                // see note about validators, above - same applies to field validators
-                if (config["fields"] is JArray jarray)
+                var config = new JObject();
+                if (prevalues != null)
                 {
-                    foreach (var field in jarray)
+                    config = prevalues;
+                    // see note about validators, above - same applies to field validators
+                    if (config["fields"] is JArray jarray)
                     {
-                        if (field["validation"] is JObject fvalidation)
-                            field["validation"] = RewriteValidators(fvalidation);
+                        foreach (var field in jarray)
+                        {
+                            if (field["validation"] is JObject fvalidation)
+                                field["validation"] = RewriteValidators(fvalidation);
+                        }
                     }
                 }
 
                 // in the manifest, default configuration is at editor level
                 // move it down to configuration editor level so it can be deserialized properly
-                if (jobject["defaultConfig"] is JObject defaultConfig)
+                if (defaultConfig != null)
                 {
                     config["defaultConfig"] = defaultConfig;
                     jobject.Remove("defaultConfig");
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index 1c90f68d62..6b140e3757 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -187,6 +187,8 @@ javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2
 
             var editor = manifest.PropertyEditors[1];
             Assert.IsTrue((editor.Type & EditorType.MacroParameter) > 0);
+            Assert.IsNotEmpty(editor.DefaultConfiguration);
+            Assert.AreEqual("some default val", editor.DefaultConfiguration["key1"]);
 
             editor = manifest.PropertyEditors[0];
             Assert.AreEqual("Test.Test1", editor.Alias);

From 187db95368f7c87126a83d8603465c6e65cd4c0c Mon Sep 17 00:00:00 2001
From: Patrick de Mooij <patrickdemooij98@hotmail.com>
Date: Mon, 22 Feb 2021 08:38:51 +0100
Subject: [PATCH 080/202] 9826: Make sure to set mculture after switching
 sections

---
 src/Umbraco.Web.UI.Client/src/navigation.controller.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
index a383c2d44a..9f5a6e46c6 100644
--- a/src/Umbraco.Web.UI.Client/src/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
@@ -325,6 +325,9 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             var queryParams = {};
             if ($scope.selectedLanguage && $scope.selectedLanguage.culture) {
                 queryParams["culture"] = $scope.selectedLanguage.culture;
+                if (!mainCulture) {
+                    $location.search("mculture", $scope.selectedLanguage.culture);
+                }
             }
             var queryString = $.param(queryParams); //create the query string from the params object
         }

From 7bb18f1cc3aa1385c39aa58e14f5c2ff4ab26136 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 24 Feb 2021 16:55:00 +1100
Subject: [PATCH 081/202] Fixes the Sql server SET LOCK_TIMEOUT call which was
 missing a space.

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

diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index 372b6837bc..a038d06121 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -281,7 +281,7 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
 
         private static void ObtainWriteLock(IDatabase db, TimeSpan timeout, int lockId)
         {
-            db.Execute("SET LOCK_TIMEOUT" + timeout.TotalMilliseconds + ";");
+            db.Execute("SET LOCK_TIMEOUT " + timeout.TotalMilliseconds + ";");
             var i = db.Execute(
                 @"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id",
                 new {id = lockId});

From e848e396af66fba35571d2b768bb698dec8e4534 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 1 Mar 2021 13:20:58 +0100
Subject: [PATCH 082/202] Don't auto focus on the third menu item

---
 src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index f9e2402dc6..e370c30581 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -23,7 +23,7 @@
                     </button>
                 </li>
                 <li data-element="action-documentTypeWithIsElementTypeChecked" class="umb-action">
-                    <button type="button" ng-click="createElement()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
+                    <button type="button" ng-click="createElement()" class="umb-action-link umb-outline btn-reset">
                         <i class="large icon icon-science" aria-hidden="true"></i>
                         <span class="menu-label">
                             <localize key="create_elementType">Element Type</localize>

From 8004c8dfd30af20189618424bb7cd4bf7c4824b8 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 24 Feb 2021 08:17:49 +0100
Subject: [PATCH 083/202] Merge pull request #9441 from
 umbraco/v8/bugfix/explicit-scope-examine

Ensure there's explicit scopes used for all service access in the Examine indexing logic

(cherry picked from commit 3e7f912fcdb9bd7a874370839fad6797dcf16c55)
---
 .../Services/Implement/PublicAccessService.cs |  6 +-
 .../ContentValueSetValidator.cs               | 47 ++++++++---
 .../UmbracoContentValueSetValidatorTests.cs   | 81 +++++++++++++++----
 src/Umbraco.Web/Search/ExamineComponent.cs    | 67 +++++++++------
 4 files changed, 145 insertions(+), 56 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/PublicAccessService.cs b/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
index ab9ea64292..06570da725 100644
--- a/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
+++ b/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
@@ -62,12 +62,10 @@ namespace Umbraco.Core.Services.Implement
             //start with the deepest id
             ids.Reverse();
 
-            using (var scope = ScopeProvider.CreateScope())
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
                 //This will retrieve from cache!
-                var entries = _publicAccessRepository.GetMany().ToArray();
-
-                scope.Complete();
+                var entries = _publicAccessRepository.GetMany().ToList();
                 foreach (var id in ids)
                 {
                     var found = entries.FirstOrDefault(x => x.ProtectedNodeId == id);
diff --git a/src/Umbraco.Examine/ContentValueSetValidator.cs b/src/Umbraco.Examine/ContentValueSetValidator.cs
index 9555566c53..f702e8197d 100644
--- a/src/Umbraco.Examine/ContentValueSetValidator.cs
+++ b/src/Umbraco.Examine/ContentValueSetValidator.cs
@@ -4,7 +4,9 @@ using System.Linq;
 using Examine;
 using Examine.LuceneEngine.Providers;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 
 namespace Umbraco.Examine
@@ -15,9 +17,9 @@ namespace Umbraco.Examine
     public class ContentValueSetValidator : ValueSetValidator, IContentValueSetValidator
     {
         private readonly IPublicAccessService _publicAccessService;
-
+        private readonly IScopeProvider _scopeProvider;
         private const string PathKey = "path";
-        private static readonly IEnumerable<string> ValidCategories = new[] {IndexTypes.Content, IndexTypes.Media};
+        private static readonly IEnumerable<string> ValidCategories = new[] { IndexTypes.Content, IndexTypes.Media };
         protected override IEnumerable<string> ValidIndexCategories => ValidCategories;
 
         public bool PublishedValuesOnly { get; }
@@ -53,25 +55,38 @@ namespace Umbraco.Examine
 
         public bool ValidateProtectedContent(string path, string category)
         {
-            if (category == IndexTypes.Content
-                && !SupportProtectedContent
-                //if the service is null we can't look this up so we'll return false
-                && (_publicAccessService == null || _publicAccessService.IsProtected(path)))
+            if (category == IndexTypes.Content && !SupportProtectedContent)
             {
-                return false;
+                //if the service is null we can't look this up so we'll return false
+                if (_publicAccessService == null || _scopeProvider == null)
+                {
+                    return false;
+                }
+
+                // explicit scope since we may be in a background thread
+                using (_scopeProvider.CreateScope(autoComplete: true))
+                {
+                    if (_publicAccessService.IsProtected(path))
+                    {
+                        return false;
+                    }
+                }
             }
 
             return true;
         }
 
+        // used for tests
         public ContentValueSetValidator(bool publishedValuesOnly, int? parentId = null,
             IEnumerable<string> includeItemTypes = null, IEnumerable<string> excludeItemTypes = null)
-            : this(publishedValuesOnly, true, null, parentId, includeItemTypes, excludeItemTypes)
+            : this(publishedValuesOnly, true, null, null, parentId, includeItemTypes, excludeItemTypes)
         {
         }
 
         public ContentValueSetValidator(bool publishedValuesOnly, bool supportProtectedContent,
-            IPublicAccessService publicAccessService, int? parentId = null,
+            IPublicAccessService publicAccessService,
+            IScopeProvider scopeProvider,
+            int? parentId = null,
             IEnumerable<string> includeItemTypes = null, IEnumerable<string> excludeItemTypes = null)
             : base(includeItemTypes, excludeItemTypes, null, null)
         {
@@ -79,6 +94,16 @@ namespace Umbraco.Examine
             SupportProtectedContent = supportProtectedContent;
             ParentId = parentId;
             _publicAccessService = publicAccessService;
+            _scopeProvider = scopeProvider;
+        }
+
+        [Obsolete("Use the ctor with all parameters instead")]
+        public ContentValueSetValidator(bool publishedValuesOnly, bool supportProtectedContent,
+            IPublicAccessService publicAccessService, int? parentId = null,
+            IEnumerable<string> includeItemTypes = null, IEnumerable<string> excludeItemTypes = null)
+            : this(publishedValuesOnly, supportProtectedContent, publicAccessService, Current.ScopeProvider,
+                  parentId, includeItemTypes, excludeItemTypes)
+        {
         }
 
         public override ValueSetValidationResult Validate(ValueSet valueSet)
@@ -103,7 +128,7 @@ namespace Umbraco.Examine
                     && variesByCulture.Count > 0 && variesByCulture[0].Equals("y"))
                 {
                     //so this valueset is for a content that varies by culture, now check for non-published cultures and remove those values
-                    foreach(var publishField in valueSet.Values.Where(x => x.Key.StartsWith($"{UmbracoExamineIndex.PublishedFieldName}_")).ToList())
+                    foreach (var publishField in valueSet.Values.Where(x => x.Key.StartsWith($"{UmbracoExamineIndex.PublishedFieldName}_")).ToList())
                     {
                         if (publishField.Value.Count <= 0 || !publishField.Value[0].Equals("y"))
                         {
@@ -134,7 +159,7 @@ namespace Umbraco.Examine
                 || !ValidateProtectedContent(path, valueSet.Category))
                 return ValueSetValidationResult.Filtered;
 
-            return isFiltered ? ValueSetValidationResult.Filtered: ValueSetValidationResult.Valid;
+            return isFiltered ? ValueSetValidationResult.Filtered : ValueSetValidationResult.Valid;
         }
     }
 }
diff --git a/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs b/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
index 8bdb0c71c7..330529a5db 100644
--- a/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/UmbracoContentValueSetValidatorTests.cs
@@ -8,6 +8,7 @@ using Umbraco.Core;
 using Umbraco.Core.Models;
 using System;
 using System.Linq;
+using Umbraco.Core.Scoping;
 
 namespace Umbraco.Tests.UmbracoExamine
 {
@@ -17,10 +18,14 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Invalid_Category()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationResult.Valid, result);            
+            Assert.AreEqual(ValueSetValidationResult.Valid, result);
 
             result = validator.Validate(ValueSet.FromObject("777", IndexTypes.Media, new { hello = "world", path = "-1,555" }));
             Assert.AreEqual(ValueSetValidationResult.Valid, result);
@@ -33,7 +38,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Must_Have_Path()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world" }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
@@ -45,7 +54,12 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Parent_Id()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>(), 555);
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>(),
+                555);
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
             Assert.AreEqual(ValueSetValidationResult.Filtered, result);
@@ -63,7 +77,9 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Inclusion_Field_List()
         {
-            var validator = new ValueSetValidator(null, null,
+            var validator = new ValueSetValidator(
+                null,
+                null,
                 new[] { "hello", "world" },
                 null);
 
@@ -79,7 +95,9 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Exclusion_Field_List()
         {
-            var validator = new ValueSetValidator(null, null,
+            var validator = new ValueSetValidator(
+                null,
+                null,
                 null,
                 new[] { "hello", "world" });
 
@@ -95,7 +113,9 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Inclusion_Exclusion_Field_List()
         {
-            var validator = new ValueSetValidator(null, null,
+            var validator = new ValueSetValidator(
+                null,
+                null,
                 new[] { "hello", "world" },
                 new[] { "world" });
 
@@ -111,7 +131,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Inclusion_Type_List()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>(),
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>(),
                 includeItemTypes: new List<string> { "include-content" });
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555" }));
@@ -127,7 +151,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Exclusion_Type_List()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>(),
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>(),
                 excludeItemTypes: new List<string> { "exclude-content" });
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555" }));
@@ -143,7 +171,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Inclusion_Exclusion_Type_List()
         {
-            var validator = new ContentValueSetValidator(false, true, Mock.Of<IPublicAccessService>(),
+            var validator = new ContentValueSetValidator(
+                false,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>(),
                 includeItemTypes: new List<string> { "include-content", "exclude-content" },
                 excludeItemTypes: new List<string> { "exclude-content" });
 
@@ -163,7 +195,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Recycle_Bin_Content()
         {
-            var validator = new ContentValueSetValidator(true, false, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                true,
+                false,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,-20,555" }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
@@ -187,7 +223,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Recycle_Bin_Media()
         {
-            var validator = new ContentValueSetValidator(true, false, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                true,
+                false,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Media, new { hello = "world", path = "-1,-21,555" }));
             Assert.AreEqual(ValueSetValidationResult.Filtered, result);
@@ -203,7 +243,11 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Published_Only()
         {
-            var validator = new ContentValueSetValidator(true, true, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(
+                true,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
             Assert.AreEqual(ValueSetValidationResult.Failed, result);
@@ -230,7 +274,10 @@ namespace Umbraco.Tests.UmbracoExamine
         [Test]
         public void Published_Only_With_Variants()
         {
-            var validator = new ContentValueSetValidator(true, true, Mock.Of<IPublicAccessService>());
+            var validator = new ContentValueSetValidator(true,
+                true,
+                Mock.Of<IPublicAccessService>(),
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(new ValueSet("555", IndexTypes.Content,
                 new Dictionary<string, object>
@@ -288,7 +335,11 @@ namespace Umbraco.Tests.UmbracoExamine
                 .Returns(Attempt.Succeed(new PublicAccessEntry(Guid.NewGuid(), 555, 444, 333, Enumerable.Empty<PublicAccessRule>())));
             publicAccessService.Setup(x => x.IsProtected("-1,777"))
                 .Returns(Attempt.Fail<PublicAccessEntry>());
-            var validator = new ContentValueSetValidator(false, false, publicAccessService.Object);
+            var validator = new ContentValueSetValidator(
+                false,
+                false,
+                publicAccessService.Object,
+                Mock.Of<IScopeProvider>());
 
             var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
             Assert.AreEqual(ValueSetValidationResult.Filtered, result);
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index c9d7b7cf56..bb3f30d4cf 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -629,22 +629,27 @@ namespace Umbraco.Web.Search
                 // perform the ValueSet lookup on a background thread
                 examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    // for content we have a different builder for published vs unpublished
-                    // we don't want to build more value sets than is needed so we'll lazily build 2 one for published one for non-published
-                    var builders = new Dictionary<bool, Lazy<List<ValueSet>>>
+                    // Background thread, wrap the whole thing in an explicit scope since we know
+                    // DB services are used within this logic.
+                    using (examineComponent._scopeProvider.CreateScope(autoComplete: true))
                     {
-                        [true] = new Lazy<List<ValueSet>>(() => examineComponent._publishedContentValueSetBuilder.GetValueSets(content).ToList()),
-                        [false] = new Lazy<List<ValueSet>>(() => examineComponent._contentValueSetBuilder.GetValueSets(content).ToList())
-                    };
+                        // for content we have a different builder for published vs unpublished
+                        // we don't want to build more value sets than is needed so we'll lazily build 2 one for published one for non-published
+                        var builders = new Dictionary<bool, Lazy<List<ValueSet>>>
+                        {
+                            [true] = new Lazy<List<ValueSet>>(() => examineComponent._publishedContentValueSetBuilder.GetValueSets(content).ToList()),
+                            [false] = new Lazy<List<ValueSet>>(() => examineComponent._contentValueSetBuilder.GetValueSets(content).ToList())
+                        };
 
-                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                        //filter the indexers
-                        .Where(x => isPublished || !x.PublishedValuesOnly)
-                        .Where(x => x.EnableDefaultEventHandler))
-                    {
-                        var valueSet = builders[index.PublishedValuesOnly].Value;
-                        index.IndexItems(valueSet);
-                    }
+                        foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                            //filter the indexers
+                            .Where(x => isPublished || !x.PublishedValuesOnly)
+                            .Where(x => x.EnableDefaultEventHandler))
+                        {
+                            var valueSet = builders[index.PublishedValuesOnly].Value;
+                            index.IndexItems(valueSet);
+                        }
+                    }   
                 }));
             }
         }
@@ -675,14 +680,19 @@ namespace Umbraco.Web.Search
                 // perform the ValueSet lookup on a background thread
                 examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    var valueSet = examineComponent._mediaValueSetBuilder.GetValueSets(media).ToList();
-
-                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                        //filter the indexers
-                        .Where(x => isPublished || !x.PublishedValuesOnly)
-                        .Where(x => x.EnableDefaultEventHandler))
+                    // Background thread, wrap the whole thing in an explicit scope since we know
+                    // DB services are used within this logic.
+                    using (examineComponent._scopeProvider.CreateScope(autoComplete: true))
                     {
-                        index.IndexItems(valueSet);
+                        var valueSet = examineComponent._mediaValueSetBuilder.GetValueSets(media).ToList();
+
+                        foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                            //filter the indexers
+                            .Where(x => isPublished || !x.PublishedValuesOnly)
+                            .Where(x => x.EnableDefaultEventHandler))
+                        {
+                            index.IndexItems(valueSet);
+                        }
                     }
                 })); 
             }
@@ -712,12 +722,17 @@ namespace Umbraco.Web.Search
                 // perform the ValueSet lookup on a background thread
                 examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    var valueSet = examineComponent._memberValueSetBuilder.GetValueSets(member).ToList();
-                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                        //filter the indexers
-                        .Where(x => x.EnableDefaultEventHandler))
+                    // Background thread, wrap the whole thing in an explicit scope since we know
+                    // DB services are used within this logic.
+                    using (examineComponent._scopeProvider.CreateScope(autoComplete: true))
                     {
-                        index.IndexItems(valueSet);
+                        var valueSet = examineComponent._memberValueSetBuilder.GetValueSets(member).ToList();
+                        foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                            //filter the indexers
+                            .Where(x => x.EnableDefaultEventHandler))
+                        {
+                            index.IndexItems(valueSet);
+                        }
                     }
                 }));
             }

From 400b436d986d0924914e8bd3235f6497177c1b43 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Mon, 1 Mar 2021 14:45:02 +0100
Subject: [PATCH 084/202] Fir stab/POC

This still need ALOT of work, but is just an attempt to get my head around things.
---
 src/Umbraco.Core/Scoping/Scope.cs           | 181 +++++++++++++++++++-
 src/Umbraco.Tests/Persistence/LocksTests.cs |  93 +++++++++-
 2 files changed, 266 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 24ef92278c..efbfe2ded1 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
@@ -34,6 +35,15 @@ namespace Umbraco.Core.Scoping
         private ICompletable _fscope;
         private IEventDispatcher _eventDispatcher;
 
+        // ReadLocks and WriteLocks owned by the entire chain, managed by the outermost scope
+        public Dictionary<int, int> ReadLocks;
+        public Dictionary<int, int> WriteLocks;
+
+        // ReadLocks and WriteLocks requested by this specific scope, required to be able to decrement
+        // Using HashSets works well assume that you're only gonna request a lock once pr. scope
+        private HashSet<int> _readLocks;
+        private HashSet<int> _writelocks;
+
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
             ILogger logger, FileSystems fileSystems, Scope parent, ScopeContext scopeContext, bool detachable,
@@ -58,6 +68,11 @@ namespace Umbraco.Core.Scoping
 
             Detachable = detachable;
 
+            ReadLocks = new Dictionary<int, int>();
+            WriteLocks = new Dictionary<int, int>();
+            _readLocks = new HashSet<int>();
+            _writelocks = new HashSet<int>();
+
 #if DEBUG_SCOPES
             _scopeProvider.RegisterScope(this);
             Console.WriteLine("create " + InstanceId.ToString("N").Substring(0, 8));
@@ -348,6 +363,17 @@ namespace Umbraco.Core.Scoping
 #endif
             }
 
+            // Decrement the lock counters
+            foreach (var readLockId in _readLocks)
+            {
+                DecrementReadLock(readLockId);
+            }
+
+            foreach (var writeLockId in _writelocks)
+            {
+                DecrementWriteLock(writeLockId);
+            }
+
             var parent = ParentScope;
             _scopeProvider.AmbientScope = parent; // might be null = this is how scopes are removed from context objects
 
@@ -486,32 +512,179 @@ namespace Umbraco.Core.Scoping
         private static bool LogUncompletedScopes => (_logUncompletedScopes
             ?? (_logUncompletedScopes = Current.Configs.CoreDebug().LogUncompletedScopes)).Value;
 
+        /// <summary>
+        /// Decrements the count of the ReadLocks with a specific ID we currently hold
+        /// </summary>
+        /// <param name="lockId">Lock ID to decrement</param>
+        public void DecrementReadLock(int lockId)
+        {
+            if (ParentScope != null)
+            {
+                ParentScope.DecrementReadLock(lockId);
+            }
+            else
+            {
+                ReadLocks[lockId] -= 1;
+            }
+        }
+
+        /// <summary>
+        /// Decrements the count of the WriteLocks with a specific ID we currently hold
+        /// </summary>
+        /// <param name="lockId">Lock ID to decrement</param>
+        public void DecrementWriteLock(int lockId)
+        {
+            if (ParentScope != null)
+            {
+                ParentScope.DecrementWriteLock(lockId);
+            }
+            else
+            {
+                WriteLocks[lockId] -= 1;
+            }
+        }
+
         /// <inheritdoc />
-        public void ReadLock(params int[] lockIds) => Database.SqlContext.SqlSyntax.ReadLock(Database, lockIds);
+        public void ReadLock(params int[] lockIds)
+        {
+            if (ParentScope != null)
+            {
+                foreach (var id in lockIds)
+                {
+                    // We need to keep track of what lockIds we have requests to be able to decrement them.
+                    // We have to do this out of the recursion to not add the ids to all scopes.
+                    _readLocks.Add(id);
+                }
+            }
+            // Delegate acquiring the lock to the parent.
+            ReadLockInner(lockIds);
+        }
+
+        internal void ReadLockInner(params int[] lockIds)
+        {
+            if (ParentScope != null)
+            {
+                // Delegate acquiring the lock to the parent.
+                ParentScope.ReadLockInner(lockIds);
+                return;
+            }
+
+            foreach (var lockId in lockIds)
+            {
+                // Only acquire the lock if we haven't done so yet.
+                if (!ReadLocks.ContainsKey(lockId))
+                {
+                    Database.SqlContext.SqlSyntax.ReadLock(Database, lockId);
+                    ReadLocks[lockId] = 0;
+                }
+
+                // Increment the amount of locks we have of the specific ID after we've acquired it.
+                ReadLocks[lockId] += 1;
+            }
+        }
 
         /// <inheritdoc />
         public void ReadLock(TimeSpan timeout, int lockId)
         {
+            if (ParentScope != null)
+            {
+                _readLocks.Add(lockId);
+            }
+
+            ReadLockInner(timeout, lockId);
+        }
+
+        internal void ReadLockInner(TimeSpan timeout, int lockId)
+        {
+            if (ParentScope != null)
+            {
+                ParentScope.ReadLockInner(timeout, lockId);
+                return;
+            }
+
             var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
             if (syntax2 == null)
             {
                 throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
             }
-            syntax2.ReadLock(Database, timeout, lockId);
+
+            if (!ReadLocks.ContainsKey(lockId))
+            {
+                syntax2.ReadLock(Database, timeout, lockId);
+                ReadLocks[lockId] = 0;
+            }
+
+            ReadLocks[lockId] += 1;
         }
 
         /// <inheritdoc />
-        public void WriteLock(params int[] lockIds) => Database.SqlContext.SqlSyntax.WriteLock(Database, lockIds);
+        public void WriteLock(params int[] lockIds)
+        {
+            // For some reason adding ids to the writelocks set of the outer most parent scope causes issues...
+            if (ParentScope != null)
+            {
+                foreach (var lockId in lockIds)
+                {
+                    _writelocks.Add(lockId);
+                }
+            }
+            WriteLockInner(lockIds);
+        }
+
+        internal void WriteLockInner(int[] lockIds)
+        {
+            // If we have a parent we just delegate lock creation to parent.
+            if (ParentScope != null)
+            {
+                ParentScope.WriteLockInner(lockIds);
+                return;
+            }
+
+            // Only acquire lock if we haven't yet (WriteLocks not containing the key)
+            foreach (var lockId in lockIds)
+            {
+                if (!WriteLocks.ContainsKey(lockId))
+                {
+                    Database.SqlContext.SqlSyntax.WriteLock(Database, lockId);
+                    WriteLocks[lockId] = 0;
+                }
+
+                // Increment count of the lock by 1.
+                WriteLocks[lockId] += 1;
+            }
+        }
 
         /// <inheritdoc />
         public void WriteLock(TimeSpan timeout, int lockId)
         {
+            if (ParentScope != null)
+            {
+                _writelocks.Add(lockId);
+            }
+            WriteLockInner(timeout, lockId);
+        }
+
+        internal void WriteLockInner(TimeSpan timeout, int lockId)
+        {
+            if (ParentScope != null)
+            {
+                ParentScope.WriteLockInner(timeout, lockId);
+                return;
+            }
+
             var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
             if (syntax2 == null)
             {
                 throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
             }
-            syntax2.WriteLock(Database, timeout, lockId);
+
+            if (!WriteLocks.ContainsKey(lockId))
+            {
+                syntax2.WriteLock(Database, timeout, lockId);
+                WriteLocks[lockId] = 0;
+            }
+
+            WriteLocks[lockId] += 1;
         }
     }
 }
diff --git a/src/Umbraco.Tests/Persistence/LocksTests.cs b/src/Umbraco.Tests/Persistence/LocksTests.cs
index 1c651b9040..27a2947dbe 100644
--- a/src/Umbraco.Tests/Persistence/LocksTests.cs
+++ b/src/Umbraco.Tests/Persistence/LocksTests.cs
@@ -280,7 +280,7 @@ namespace Umbraco.Tests.Persistence
 
         [Test]
         public void Throws_When_Lock_Timeout_Is_Exceeded()
-        {   
+        {
             var t1 = Task.Run(() =>
             {
                 using (var scope = ScopeProvider.CreateScope())
@@ -288,7 +288,7 @@ namespace Umbraco.Tests.Persistence
                     var realScope = (Scope)scope;
 
                     Console.WriteLine("Write lock A");
-                    // This will acquire right away 
+                    // This will acquire right away
                     realScope.WriteLock(TimeSpan.FromMilliseconds(2000), Constants.Locks.ContentTree);
                     Thread.Sleep(6000); // Wait longer than the Read Lock B timeout
                     scope.Complete();
@@ -349,7 +349,7 @@ namespace Umbraco.Tests.Persistence
                     var realScope = (Scope)scope;
 
                     Console.WriteLine("Write lock A");
-                    // This will acquire right away 
+                    // This will acquire right away
                     realScope.WriteLock(TimeSpan.FromMilliseconds(2000), Constants.Locks.ContentTree);
                     Thread.Sleep(4000); // Wait less than the Read Lock B timeout
                     scope.Complete();
@@ -377,7 +377,7 @@ namespace Umbraco.Tests.Persistence
                     scope.Complete();
                     Interlocked.Increment(ref locksCompleted);
                     Console.WriteLine("Finished Read lock B");
-                }                
+                }
             });
 
             var t3 = Task.Run(() =>
@@ -424,6 +424,91 @@ namespace Umbraco.Tests.Persistence
             }
         }
 
+        [Test]
+        public void Nested_Scopes_WriteLocks_Count_Correctly()
+        {
+            using (var scope = ScopeProvider.CreateScope())
+            {
+                var parentScope = (Scope) scope;
+                scope.WriteLock(Constants.Locks.ContentTree);
+                scope.WriteLock(Constants.Locks.ContentTypes);
+
+                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+
+                using (var childScope1 = ScopeProvider.CreateScope())
+                {
+                    childScope1.WriteLock(Constants.Locks.ContentTree);
+                    childScope1.WriteLock(Constants.Locks.ContentTypes);
+                    childScope1.WriteLock(Constants.Locks.Languages);
+
+                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope1 after locks acquired: {nameof(Constants.Locks.Languages)}");
+
+                    using (var childScope2 = ScopeProvider.CreateScope())
+                    {
+                        childScope2.WriteLock(Constants.Locks.ContentTree);
+                        childScope2.WriteLock(Constants.Locks.MediaTypes);
+
+                        Assert.AreEqual(3, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                        Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope2 after locks acquired: {nameof(Constants.Locks.Languages)}");
+                        Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
+                    }
+                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.Languages)}");
+                    Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.MediaTypes)}");
+                }
+                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
+                Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
+                Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
+            }
+        }
+
+        [Test]
+        public void Nested_Scopes_ReadLocks_Count_Correctly()
+        {
+            using (var scope = ScopeProvider.CreateScope())
+            {
+                var parentScope = (Scope) scope;
+                scope.ReadLock(Constants.Locks.ContentTree);
+                scope.ReadLock(Constants.Locks.ContentTypes);
+                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+
+                using (var childScope1 = ScopeProvider.CreateScope())
+                {
+                    childScope1.ReadLock(Constants.Locks.ContentTree);
+                    childScope1.ReadLock(Constants.Locks.ContentTypes);
+                    childScope1.ReadLock(Constants.Locks.Languages);
+                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope1 after locks acquired: {nameof(Constants.Locks.Languages)}");
+
+                    using (var childScope2 = ScopeProvider.CreateScope())
+                    {
+                        childScope2.ReadLock(Constants.Locks.ContentTree);
+                        childScope2.ReadLock(Constants.Locks.MediaTypes);
+                        Assert.AreEqual(3, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                        Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope2 after locks acquired: {nameof(Constants.Locks.Languages)}");
+                        Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
+                    }
+                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.Languages)}");
+                    Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.MediaTypes)}");
+                }
+                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
+                Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
+                Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
+            }
+        }
+
         private void NoDeadLockTestThread(int id, EventWaitHandle myEv, WaitHandle otherEv, ref Exception exception)
         {
             using (var scope = ScopeProvider.CreateScope())

From 52b670973d562b86a89665dd4b1b23fba8ec3900 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Tue, 2 Mar 2021 11:23:26 +1100
Subject: [PATCH 085/202] The Value() method for IPublishedContent was not
 working with the defaultValue parameter (#9888)

* The Value() method for IPublishedContent was not working with the defaultValue parameter

* Update src/Umbraco.Web/PublishedContentExtensions.cs

* Update src/Umbraco.Web/PublishedPropertyExtension.cs

* Update src/Umbraco.Web/PublishedPropertyExtension.cs

* Update src/Umbraco.Web/PublishedPropertyExtension.cs
---
 src/Umbraco.Web/PublishedContentExtensions.cs |  4 ++--
 src/Umbraco.Web/PublishedPropertyExtension.cs | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index f4c11977dc..8aa3b69fb4 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -173,8 +173,8 @@ namespace Umbraco.Web
                 return value;
 
             // else... if we have a property, at least let the converter return its own
-            // vision of 'no value' (could be an empty enumerable) - otherwise, default
-            return property == null ? default : property.Value<T>(culture, segment);
+            // vision of 'no value' (could be an empty enumerable) - otherwise, defaultValue
+            return property == null ? defaultValue : property.Value<T>(culture, segment, defaultValue: defaultValue);
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedPropertyExtension.cs b/src/Umbraco.Web/PublishedPropertyExtension.cs
index b431f24828..0c3aa57cc2 100644
--- a/src/Umbraco.Web/PublishedPropertyExtension.cs
+++ b/src/Umbraco.Web/PublishedPropertyExtension.cs
@@ -41,24 +41,31 @@ namespace Umbraco.Web
                 var valueConverted = value.TryConvertTo<T>();
                 if (valueConverted) return valueConverted.Result;
 
-                // cannot cast nor convert the value, nothing we can return but 'default'
+                // cannot cast nor convert the value, nothing we can return but 'defaultValue'
                 // note: we don't want to fallback in that case - would make little sense
-                return default;
+                return defaultValue;
             }
 
             // we don't have a value, try fallback
             if (PublishedValueFallback.TryGetValue(property, culture, segment, fallback, defaultValue, out var fallbackValue))
+            {
                 return fallbackValue;
+            }
 
             // we don't have a value - neither direct nor fallback
             // give a chance to the converter to return something (eg empty enumerable)
             var noValue = property.GetValue(culture, segment);
+            if (noValue == null)
+            {
+                return defaultValue;
+            }
             if (noValue is T noValueAsT) return noValueAsT;
+
             var noValueConverted = noValue.TryConvertTo<T>();
             if (noValueConverted) return noValueConverted.Result;
 
-            // cannot cast noValue nor convert it, nothing we can return but 'default'
-            return default;
+            // cannot cast noValue nor convert it, nothing we can return but 'defaultValue'
+            return defaultValue;
         }
 
         #endregion

From 65f2c5ee705d24964db3267af91aefda4f3cba37 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 2 Mar 2021 08:48:09 +0100
Subject: [PATCH 086/202] Bit of cleaning in Scope

---
 src/Umbraco.Core/Scoping/Scope.cs | 48 +++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index efbfe2ded1..e79fc4ad19 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -40,9 +40,9 @@ namespace Umbraco.Core.Scoping
         public Dictionary<int, int> WriteLocks;
 
         // ReadLocks and WriteLocks requested by this specific scope, required to be able to decrement
-        // Using HashSets works well assume that you're only gonna request a lock once pr. scope
-        private HashSet<int> _readLocks;
-        private HashSet<int> _writelocks;
+        // Using Lists just in case someone for some reason requests the same lock twice in the same scope.
+        private List<int> _readLocks;
+        private List<int> _writelocks;
 
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
@@ -70,8 +70,8 @@ namespace Umbraco.Core.Scoping
 
             ReadLocks = new Dictionary<int, int>();
             WriteLocks = new Dictionary<int, int>();
-            _readLocks = new HashSet<int>();
-            _writelocks = new HashSet<int>();
+            _readLocks = new List<int>();
+            _writelocks = new List<int>();
 
 #if DEBUG_SCOPES
             _scopeProvider.RegisterScope(this);
@@ -518,14 +518,14 @@ namespace Umbraco.Core.Scoping
         /// <param name="lockId">Lock ID to decrement</param>
         public void DecrementReadLock(int lockId)
         {
+            // If we aren't the outermost scope, pass it on to the parent.
             if (ParentScope != null)
             {
                 ParentScope.DecrementReadLock(lockId);
+                return;
             }
-            else
-            {
-                ReadLocks[lockId] -= 1;
-            }
+
+            ReadLocks[lockId] -= 1;
         }
 
         /// <summary>
@@ -534,14 +534,14 @@ namespace Umbraco.Core.Scoping
         /// <param name="lockId">Lock ID to decrement</param>
         public void DecrementWriteLock(int lockId)
         {
+            // If we aren't the outermost scope, pass it on to the parent.
             if (ParentScope != null)
             {
                 ParentScope.DecrementWriteLock(lockId);
+                return;
             }
-            else
-            {
-                WriteLocks[lockId] -= 1;
-            }
+
+            WriteLocks[lockId] -= 1;
         }
 
         /// <inheritdoc />
@@ -551,15 +551,18 @@ namespace Umbraco.Core.Scoping
             {
                 foreach (var id in lockIds)
                 {
-                    // We need to keep track of what lockIds we have requests to be able to decrement them.
+                    // We need to keep track of what lockIds we have requested locks for to be able to decrement them.
                     // We have to do this out of the recursion to not add the ids to all scopes.
                     _readLocks.Add(id);
                 }
             }
-            // Delegate acquiring the lock to the parent.
             ReadLockInner(lockIds);
         }
 
+        /// <summary>
+        /// Handles acquiring read locks, will delegate it to the parent if there are any.
+        /// </summary>
+        /// <param name="lockIds">Array of lock object identifiers.</param>
         internal void ReadLockInner(params int[] lockIds)
         {
             if (ParentScope != null)
@@ -569,6 +572,7 @@ namespace Umbraco.Core.Scoping
                 return;
             }
 
+            // If we are the parent, then handle the lock request.
             foreach (var lockId in lockIds)
             {
                 // Only acquire the lock if we haven't done so yet.
@@ -594,6 +598,11 @@ namespace Umbraco.Core.Scoping
             ReadLockInner(timeout, lockId);
         }
 
+        /// <summary>
+        /// Handles acquiring a read lock with a specified timeout, will delegate it to the parent if there are any.
+        /// </summary>
+        /// <param name="timeout">The database timeout in milliseconds.</param>
+        /// <param name="lockId">The lock object identifier.</param>
         internal void ReadLockInner(TimeSpan timeout, int lockId)
         {
             if (ParentScope != null)
@@ -631,6 +640,10 @@ namespace Umbraco.Core.Scoping
             WriteLockInner(lockIds);
         }
 
+        /// <summary>
+        /// Handles acquiring write locks, will delegate it to the parent if there are any.
+        /// </summary>
+        /// <param name="lockIds">Array of lock object identifiers.</param>
         internal void WriteLockInner(int[] lockIds)
         {
             // If we have a parent we just delegate lock creation to parent.
@@ -664,6 +677,11 @@ namespace Umbraco.Core.Scoping
             WriteLockInner(timeout, lockId);
         }
 
+        /// <summary>
+        /// Handles acquiring a write lock with a specified timeout, will delegate it to the parent if there are any.
+        /// </summary>
+        /// <param name="timeout">The database timeout in milliseconds.</param>
+        /// <param name="lockId">The lock object identifier.</param>
         internal void WriteLockInner(TimeSpan timeout, int lockId)
         {
             if (ParentScope != null)

From e75edbcaf0469b7696629817a796a2eed61e2c42 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 2 Mar 2021 10:53:10 +0100
Subject: [PATCH 087/202] Add more tests.

---
 src/Umbraco.Tests/Persistence/LocksTests.cs |  86 ------
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs | 280 ++++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj      |   1 +
 3 files changed, 281 insertions(+), 86 deletions(-)
 create mode 100644 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs

diff --git a/src/Umbraco.Tests/Persistence/LocksTests.cs b/src/Umbraco.Tests/Persistence/LocksTests.cs
index 27a2947dbe..8872329284 100644
--- a/src/Umbraco.Tests/Persistence/LocksTests.cs
+++ b/src/Umbraco.Tests/Persistence/LocksTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Data.SqlServerCe;
 using System.Linq;
 using System.Threading;
@@ -424,91 +423,6 @@ namespace Umbraco.Tests.Persistence
             }
         }
 
-        [Test]
-        public void Nested_Scopes_WriteLocks_Count_Correctly()
-        {
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                var parentScope = (Scope) scope;
-                scope.WriteLock(Constants.Locks.ContentTree);
-                scope.WriteLock(Constants.Locks.ContentTypes);
-
-                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-
-                using (var childScope1 = ScopeProvider.CreateScope())
-                {
-                    childScope1.WriteLock(Constants.Locks.ContentTree);
-                    childScope1.WriteLock(Constants.Locks.ContentTypes);
-                    childScope1.WriteLock(Constants.Locks.Languages);
-
-                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope1 after locks acquired: {nameof(Constants.Locks.Languages)}");
-
-                    using (var childScope2 = ScopeProvider.CreateScope())
-                    {
-                        childScope2.WriteLock(Constants.Locks.ContentTree);
-                        childScope2.WriteLock(Constants.Locks.MediaTypes);
-
-                        Assert.AreEqual(3, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                        Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-                        Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope2 after locks acquired: {nameof(Constants.Locks.Languages)}");
-                        Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
-                    }
-                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.MediaTypes)}");
-                }
-                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
-                Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
-            }
-        }
-
-        [Test]
-        public void Nested_Scopes_ReadLocks_Count_Correctly()
-        {
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                var parentScope = (Scope) scope;
-                scope.ReadLock(Constants.Locks.ContentTree);
-                scope.ReadLock(Constants.Locks.ContentTypes);
-                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-
-                using (var childScope1 = ScopeProvider.CreateScope())
-                {
-                    childScope1.ReadLock(Constants.Locks.ContentTree);
-                    childScope1.ReadLock(Constants.Locks.ContentTypes);
-                    childScope1.ReadLock(Constants.Locks.Languages);
-                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope1 after locks acquired: {nameof(Constants.Locks.Languages)}");
-
-                    using (var childScope2 = ScopeProvider.CreateScope())
-                    {
-                        childScope2.ReadLock(Constants.Locks.ContentTree);
-                        childScope2.ReadLock(Constants.Locks.MediaTypes);
-                        Assert.AreEqual(3, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                        Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-                        Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope2 after locks acquired: {nameof(Constants.Locks.Languages)}");
-                        Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
-                    }
-                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.MediaTypes)}");
-                }
-                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
-                Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
-            }
-        }
-
         private void NoDeadLockTestThread(int id, EventWaitHandle myEv, WaitHandle otherEv, ref Exception exception)
         {
             using (var scope = ScopeProvider.CreateScope())
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
new file mode 100644
index 0000000000..34d1843dc4
--- /dev/null
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -0,0 +1,280 @@
+using System;
+using Moq;
+using NPoco;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Scoping;
+
+namespace Umbraco.Tests.Scoping
+{
+    [TestFixture]
+    public class ScopeUnitTests
+    {
+        /// <summary>
+        /// Creates a ScopeProvider with mocked internals.
+        /// </summary>
+        /// <param name="syntaxProviderMock">The mock of the ISqlSyntaxProvider2, used to count method calls.</param>
+        /// <returns></returns>
+        private ScopeProvider GetScopeProvider(out Mock<ISqlSyntaxProvider2> syntaxProviderMock)
+        {
+            var logger = Mock.Of<ILogger>();
+            var fac = Mock.Of<IFactory>();
+            var fileSystem = new FileSystems(fac, logger);
+            var databaseFactory = new Mock<IUmbracoDatabaseFactory>();
+            var database = new Mock<IUmbracoDatabase>();
+            var sqlContext = new Mock<ISqlContext>();
+            syntaxProviderMock = new Mock<ISqlSyntaxProvider2>();
+
+            // Setup mock of database factory to return mock of database.
+            databaseFactory.Setup(x => x.CreateDatabase()).Returns(database.Object);
+
+            // Setup mock of database to return mock of sql SqlContext
+            database.Setup(x => x.SqlContext).Returns(sqlContext.Object);
+
+            // Setup mock of ISqlContext to return syntaxProviderMock
+            sqlContext.Setup(x => x.SqlSyntax).Returns(syntaxProviderMock.Object);
+
+            return new ScopeProvider(databaseFactory.Object, fileSystem, logger);
+        }
+
+        [Test]
+        public void WriteLock_Acquired_Only_Once_Per_Key()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var outerScope = scopeProvider.CreateScope())
+            {
+                outerScope.WriteLock(Constants.Locks.Domains);
+                outerScope.WriteLock(Constants.Locks.Languages);
+
+                using (var innerScope1 = scopeProvider.CreateScope())
+                {
+                    innerScope1.WriteLock(Constants.Locks.Domains);
+                    innerScope1.WriteLock(Constants.Locks.Languages);
+
+                    using (var innerScope2 = scopeProvider.CreateScope())
+                    {
+                        innerScope2.WriteLock(Constants.Locks.Domains);
+                        innerScope2.WriteLock(Constants.Locks.Languages);
+                        innerScope2.Complete();
+                    }
+                    innerScope1.Complete();
+                }
+                outerScope.Complete();
+            }
+
+            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.Domains), Times.Once);
+            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
+        }
+
+        [Test]
+        public void WriteLock_With_Timeout_Acquired_Only_Once_Per_Key(){
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+            var timeout = TimeSpan.FromMilliseconds(10000);
+
+            using (var outerScope = scopeProvider.CreateScope())
+            {
+                var realScope = (Scope) outerScope;
+                realScope.WriteLock(timeout, Constants.Locks.Domains);
+                realScope.WriteLock(timeout, Constants.Locks.Languages);
+
+                using (var innerScope1 = scopeProvider.CreateScope())
+                {
+                    var realInnerScope1 = (Scope) outerScope;
+                    realInnerScope1.WriteLock(timeout, Constants.Locks.Domains);
+                    realInnerScope1.WriteLock(timeout, Constants.Locks.Languages);
+
+                    using (var innerScope2 = scopeProvider.CreateScope())
+                    {
+                        var realInnerScope2 = (Scope) innerScope2;
+                        realInnerScope2.WriteLock(timeout, Constants.Locks.Domains);
+                        realInnerScope2.WriteLock(timeout, Constants.Locks.Languages);
+                        innerScope2.Complete();
+                    }
+                    innerScope1.Complete();
+                }
+
+                outerScope.Complete();
+            }
+
+            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), timeout, Constants.Locks.Domains), Times.Once);
+            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), timeout, Constants.Locks.Languages), Times.Once);
+        }
+
+        [Test]
+        public void ReadLock_Acquired_Only_Once_Per_Key()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var outerScope = scopeProvider.CreateScope())
+            {
+                outerScope.ReadLock(Constants.Locks.Domains);
+                outerScope.ReadLock(Constants.Locks.Languages);
+
+                using (var innerScope1 = scopeProvider.CreateScope())
+                {
+                    innerScope1.ReadLock(Constants.Locks.Domains);
+                    innerScope1.ReadLock(Constants.Locks.Languages);
+
+                    using (var innerScope2 = scopeProvider.CreateScope())
+                    {
+                        innerScope2.ReadLock(Constants.Locks.Domains);
+                        innerScope2.ReadLock(Constants.Locks.Languages);
+
+                        innerScope2.Complete();
+                    }
+
+                    innerScope1.Complete();
+                }
+
+                outerScope.Complete();
+            }
+
+            syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), Constants.Locks.Domains), Times.Once);
+            syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
+        }
+
+        [Test]
+        public void ReadLock_With_Timeout_Acquired_Only_Once_Per_Key()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+            var timeOut = TimeSpan.FromMilliseconds(10000);
+
+            using (var outerScope = scopeProvider.CreateScope())
+            {
+                var realOuterScope = (Scope) outerScope;
+                realOuterScope.ReadLock(timeOut, Constants.Locks.Domains);
+                realOuterScope.ReadLock(timeOut, Constants.Locks.Languages);
+
+                using (var innerScope1 = scopeProvider.CreateScope())
+                {
+                    var realInnerScope1 = (Scope) innerScope1;
+                    realInnerScope1.ReadLock(timeOut, Constants.Locks.Domains);
+                    realInnerScope1.ReadLock(timeOut, Constants.Locks.Languages);
+
+                    using (var innerScope2 = scopeProvider.CreateScope())
+                    {
+                        var realInnerScope2 = (Scope) innerScope2;
+                        realInnerScope2.ReadLock(timeOut, Constants.Locks.Domains);
+                        realInnerScope2.ReadLock(timeOut, Constants.Locks.Languages);
+
+                        innerScope2.Complete();
+                    }
+
+                    innerScope1.Complete();
+                }
+
+                outerScope.Complete();
+            }
+
+            syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), timeOut, Constants.Locks.Domains), Times.Once);
+            syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), timeOut, Constants.Locks.Languages), Times.Once);
+        }
+
+        [Test]
+        public void Nested_Scopes_WriteLocks_Count_Correctly()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var outerScope = scopeProvider.CreateScope())
+            {
+                var parentScope = (Scope) outerScope;
+                outerScope.WriteLock(Constants.Locks.ContentTree);
+                outerScope.WriteLock(Constants.Locks.ContentTypes);
+
+                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+
+                using (var innerScope1 = scopeProvider.CreateScope())
+                {
+                    innerScope1.WriteLock(Constants.Locks.ContentTree);
+                    innerScope1.WriteLock(Constants.Locks.ContentTypes);
+                    innerScope1.WriteLock(Constants.Locks.Languages);
+
+                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope1 after locks acquired: {nameof(Constants.Locks.Languages)}");
+
+                    using (var innerScope2 = scopeProvider.CreateScope())
+                    {
+                        innerScope2.WriteLock(Constants.Locks.ContentTree);
+                        innerScope2.WriteLock(Constants.Locks.MediaTypes);
+
+                        Assert.AreEqual(3, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                        Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope2 after locks acquired: {nameof(Constants.Locks.Languages)}");
+                        Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
+
+                        innerScope2.Complete();
+                    }
+                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.Languages)}");
+                    Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.MediaTypes)}");
+
+                    innerScope1.Complete();
+                }
+                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
+                Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
+                Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
+
+                outerScope.Complete();
+            }
+        }
+
+        [Test]
+        public void Nested_Scopes_ReadLocks_Count_Correctly()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var outerScope = scopeProvider.CreateScope())
+            {
+                var parentScope = (Scope) outerScope;
+                outerScope.ReadLock(Constants.Locks.ContentTree);
+                outerScope.ReadLock(Constants.Locks.ContentTypes);
+                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+
+                using (var innserScope1 = scopeProvider.CreateScope())
+                {
+                    innserScope1.ReadLock(Constants.Locks.ContentTree);
+                    innserScope1.ReadLock(Constants.Locks.ContentTypes);
+                    innserScope1.ReadLock(Constants.Locks.Languages);
+                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope1 after locks acquired: {nameof(Constants.Locks.Languages)}");
+
+                    using (var innerScope2 = scopeProvider.CreateScope())
+                    {
+                        innerScope2.ReadLock(Constants.Locks.ContentTree);
+                        innerScope2.ReadLock(Constants.Locks.MediaTypes);
+                        Assert.AreEqual(3, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                        Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope2 after locks acquired: {nameof(Constants.Locks.Languages)}");
+                        Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
+
+                        innerScope2.Complete();
+                    }
+                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.Languages)}");
+                    Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.MediaTypes)}");
+
+                    innserScope1.Complete();
+                }
+                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
+                Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
+                Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
+
+                outerScope.Complete();
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 97604df0c6..3059119dd4 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -161,6 +161,7 @@
     <Compile Include="Routing\RoutableDocumentFilterTests.cs" />
     <Compile Include="Runtimes\StandaloneTests.cs" />
     <Compile Include="Routing\GetContentUrlsTests.cs" />
+    <Compile Include="Scoping\ScopeUnitTests.cs" />
     <Compile Include="Services\AmbiguousEventTests.cs" />
     <Compile Include="Services\ContentServiceEventTests.cs" />
     <Compile Include="Services\ContentServicePublishBranchTests.cs" />

From 8c99a8e8a7952d80603515ba24f31fe9b8410815 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 2 Mar 2021 12:55:18 +0100
Subject: [PATCH 088/202] Combine the two lock inner methods into one

And add a couple of more unit tests
---
 src/Umbraco.Core/Scoping/Scope.cs           | 210 +++++++++++---------
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs |  58 ++++++
 2 files changed, 169 insertions(+), 99 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index e79fc4ad19..f04d827209 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -513,9 +513,9 @@ namespace Umbraco.Core.Scoping
             ?? (_logUncompletedScopes = Current.Configs.CoreDebug().LogUncompletedScopes)).Value;
 
         /// <summary>
-        /// Decrements the count of the ReadLocks with a specific ID we currently hold
+        /// Decrements the count of the ReadLocks with a specific lock object identifier we currently hold
         /// </summary>
-        /// <param name="lockId">Lock ID to decrement</param>
+        /// <param name="lockId">Lock object identifier to decrement</param>
         public void DecrementReadLock(int lockId)
         {
             // If we aren't the outermost scope, pass it on to the parent.
@@ -529,9 +529,9 @@ namespace Umbraco.Core.Scoping
         }
 
         /// <summary>
-        /// Decrements the count of the WriteLocks with a specific ID we currently hold
+        /// Decrements the count of the WriteLocks with a specific lock object identifier we currently hold.
         /// </summary>
-        /// <param name="lockId">Lock ID to decrement</param>
+        /// <param name="lockId">Lock object identifier to decrement.</param>
         public void DecrementWriteLock(int lockId)
         {
             // If we aren't the outermost scope, pass it on to the parent.
@@ -556,35 +556,7 @@ namespace Umbraco.Core.Scoping
                     _readLocks.Add(id);
                 }
             }
-            ReadLockInner(lockIds);
-        }
-
-        /// <summary>
-        /// Handles acquiring read locks, will delegate it to the parent if there are any.
-        /// </summary>
-        /// <param name="lockIds">Array of lock object identifiers.</param>
-        internal void ReadLockInner(params int[] lockIds)
-        {
-            if (ParentScope != null)
-            {
-                // Delegate acquiring the lock to the parent.
-                ParentScope.ReadLockInner(lockIds);
-                return;
-            }
-
-            // If we are the parent, then handle the lock request.
-            foreach (var lockId in lockIds)
-            {
-                // Only acquire the lock if we haven't done so yet.
-                if (!ReadLocks.ContainsKey(lockId))
-                {
-                    Database.SqlContext.SqlSyntax.ReadLock(Database, lockId);
-                    ReadLocks[lockId] = 0;
-                }
-
-                // Increment the amount of locks we have of the specific ID after we've acquired it.
-                ReadLocks[lockId] += 1;
-            }
+            ReadLockInner(null, lockIds);
         }
 
         /// <inheritdoc />
@@ -598,38 +570,9 @@ namespace Umbraco.Core.Scoping
             ReadLockInner(timeout, lockId);
         }
 
-        /// <summary>
-        /// Handles acquiring a read lock with a specified timeout, will delegate it to the parent if there are any.
-        /// </summary>
-        /// <param name="timeout">The database timeout in milliseconds.</param>
-        /// <param name="lockId">The lock object identifier.</param>
-        internal void ReadLockInner(TimeSpan timeout, int lockId)
-        {
-            if (ParentScope != null)
-            {
-                ParentScope.ReadLockInner(timeout, lockId);
-                return;
-            }
-
-            var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
-            if (syntax2 == null)
-            {
-                throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
-            }
-
-            if (!ReadLocks.ContainsKey(lockId))
-            {
-                syntax2.ReadLock(Database, timeout, lockId);
-                ReadLocks[lockId] = 0;
-            }
-
-            ReadLocks[lockId] += 1;
-        }
-
         /// <inheritdoc />
         public void WriteLock(params int[] lockIds)
         {
-            // For some reason adding ids to the writelocks set of the outer most parent scope causes issues...
             if (ParentScope != null)
             {
                 foreach (var lockId in lockIds)
@@ -637,34 +580,7 @@ namespace Umbraco.Core.Scoping
                     _writelocks.Add(lockId);
                 }
             }
-            WriteLockInner(lockIds);
-        }
-
-        /// <summary>
-        /// Handles acquiring write locks, will delegate it to the parent if there are any.
-        /// </summary>
-        /// <param name="lockIds">Array of lock object identifiers.</param>
-        internal void WriteLockInner(int[] lockIds)
-        {
-            // If we have a parent we just delegate lock creation to parent.
-            if (ParentScope != null)
-            {
-                ParentScope.WriteLockInner(lockIds);
-                return;
-            }
-
-            // Only acquire lock if we haven't yet (WriteLocks not containing the key)
-            foreach (var lockId in lockIds)
-            {
-                if (!WriteLocks.ContainsKey(lockId))
-                {
-                    Database.SqlContext.SqlSyntax.WriteLock(Database, lockId);
-                    WriteLocks[lockId] = 0;
-                }
-
-                // Increment count of the lock by 1.
-                WriteLocks[lockId] += 1;
-            }
+            WriteLockInner(null, lockIds);
         }
 
         /// <inheritdoc />
@@ -678,31 +594,127 @@ namespace Umbraco.Core.Scoping
         }
 
         /// <summary>
-        /// Handles acquiring a write lock with a specified timeout, will delegate it to the parent if there are any.
+        /// Handles acquiring a read lock, will delegate it to the parent if there are any.
         /// </summary>
-        /// <param name="timeout">The database timeout in milliseconds.</param>
-        /// <param name="lockId">The lock object identifier.</param>
-        internal void WriteLockInner(TimeSpan timeout, int lockId)
+        /// <param name="timeout">Optional database timeout in milliseconds.</param>
+        /// <param name="lockIds">Array of lock object identifiers.</param>
+        internal void ReadLockInner(TimeSpan? timeout = null, params int[] lockIds)
         {
             if (ParentScope != null)
             {
-                ParentScope.WriteLockInner(timeout, lockId);
+                // Delegate acquiring the lock to the parent if any.
+                ParentScope.ReadLockInner(timeout, lockIds);
                 return;
             }
 
+            // If we are the parent, then handle the lock request.
+            foreach (var lockId in lockIds)
+            {
+                // Only acquire the lock if we haven't done so yet.
+                if (!ReadLocks.ContainsKey(lockId))
+                {
+                    if (timeout is null)
+                    {
+                        // We want a lock with a custom timeout
+                        ObtainReadLock(lockId);
+                    }
+                    else
+                    {
+                        // We just want an ordinary lock.
+                        ObtainTimoutReadLock(lockId, timeout.Value);
+                    }
+                    // Add the lockId as a key to the dict.
+                    ReadLocks[lockId] = 0;
+                }
+
+                ReadLocks[lockId] += 1;
+            }
+        }
+
+        /// <summary>
+        /// Handles acquiring a write lock with a specified timeout, will delegate it to the parent if there are any.
+        /// </summary>
+        /// <param name="timeout">Optional database timeout in milliseconds.</param>
+        /// <param name="lockIds">Array of lock object identifiers.</param>
+        internal void WriteLockInner(TimeSpan? timeout = null, params int[] lockIds)
+        {
+            if (ParentScope != null)
+            {
+                // If we have a parent we delegate lock creation to parent.
+                ParentScope.WriteLockInner(timeout, lockIds);
+                return;
+            }
+
+            foreach (var lockId in lockIds)
+            {
+                // Only acquire lock if we haven't yet (WriteLocks not containing the key)
+                if (!WriteLocks.ContainsKey(lockId))
+                {
+                    if (timeout is null)
+                    {
+                        ObtainWriteLock(lockId);
+                    }
+                    else
+                    {
+                        ObtainTimeoutWriteLock(lockId, timeout.Value);
+                    }
+                    // Add the lockId as a key to the dict.
+                    WriteLocks[lockId] = 0;
+                }
+
+                // Increment count of the lock by 1.
+                WriteLocks[lockId] += 1;
+            }
+        }
+
+        /// <summary>
+        /// Obtains an ordinary read lock.
+        /// </summary>
+        /// <param name="lockId">Lock object identifier to lock.</param>
+        private void ObtainReadLock(int lockId)
+        {
+            Database.SqlContext.SqlSyntax.ReadLock(Database, lockId);
+        }
+
+        /// <summary>
+        /// Obtains a read lock with a custom timeout.
+        /// </summary>
+        /// <param name="lockId">Lock object identifier to lock.</param>
+        /// <param name="timeout">TimeSpan specifying the timout period.</param>
+        private void ObtainTimoutReadLock(int lockId, TimeSpan timeout)
+        {
             var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
             if (syntax2 == null)
             {
                 throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
             }
 
-            if (!WriteLocks.ContainsKey(lockId))
+            syntax2.ReadLock(Database, timeout, lockId);
+        }
+
+        /// <summary>
+        /// Obtains an ordinary write lock.
+        /// </summary>
+        /// <param name="lockId">Lock object identifier to lock.</param>
+        private void ObtainWriteLock(int lockId)
+        {
+            Database.SqlContext.SqlSyntax.WriteLock(Database, lockId);
+        }
+
+        /// <summary>
+        /// Obtains a write lock with a custom timeout.
+        /// </summary>
+        /// <param name="lockId">Lock object identifier to lock.</param>
+        /// <param name="timeout">TimeSpan specifying the timout period.</param>
+        private void ObtainTimeoutWriteLock(int lockId, TimeSpan timeout)
+        {
+            var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
+            if (syntax2 == null)
             {
-                syntax2.WriteLock(Database, timeout, lockId);
-                WriteLocks[lockId] = 0;
+                throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
             }
 
-            WriteLocks[lockId] += 1;
+            syntax2.WriteLock(Database, timeout, lockId);
         }
     }
 }
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index 34d1843dc4..32bd7e2afe 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -176,6 +176,64 @@ namespace Umbraco.Tests.Scoping
             syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), timeOut, Constants.Locks.Languages), Times.Once);
         }
 
+        [Test]
+        public void WriteLocks_Count_correctly_If_Lock_Requested_Twice_In_Scope()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var outerscope = scopeProvider.CreateScope())
+            {
+                var realOuterScope = (Scope) outerscope;
+                outerscope.WriteLock(Constants.Locks.ContentTree);
+                outerscope.WriteLock(Constants.Locks.ContentTree);
+                Assert.AreEqual(2, realOuterScope.WriteLocks[Constants.Locks.ContentTree]);
+
+                using (var innerScope = scopeProvider.CreateScope())
+                {
+                    innerScope.WriteLock(Constants.Locks.ContentTree);
+                    innerScope.WriteLock(Constants.Locks.ContentTree);
+                    Assert.AreEqual(4, realOuterScope.WriteLocks[Constants.Locks.ContentTree]);
+
+                    innerScope.WriteLock(Constants.Locks.Languages);
+                    innerScope.WriteLock(Constants.Locks.Languages);
+                    Assert.AreEqual(2, realOuterScope.WriteLocks[Constants.Locks.Languages]);
+                    innerScope.Complete();
+                }
+                Assert.AreEqual(0, realOuterScope.WriteLocks[Constants.Locks.Languages]);
+                Assert.AreEqual(2, realOuterScope.WriteLocks[Constants.Locks.ContentTree]);
+                outerscope.Complete();
+            }
+        }
+
+        [Test]
+        public void ReadLocks_Count_correctly_If_Lock_Requested_Twice_In_Scope()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var outerscope = scopeProvider.CreateScope())
+            {
+                var realOuterScope = (Scope) outerscope;
+                outerscope.ReadLock(Constants.Locks.ContentTree);
+                outerscope.ReadLock(Constants.Locks.ContentTree);
+                Assert.AreEqual(2, realOuterScope.ReadLocks[Constants.Locks.ContentTree]);
+
+                using (var innerScope = scopeProvider.CreateScope())
+                {
+                    innerScope.ReadLock(Constants.Locks.ContentTree);
+                    innerScope.ReadLock(Constants.Locks.ContentTree);
+                    Assert.AreEqual(4, realOuterScope.ReadLocks[Constants.Locks.ContentTree]);
+
+                    innerScope.ReadLock(Constants.Locks.Languages);
+                    innerScope.ReadLock(Constants.Locks.Languages);
+                    Assert.AreEqual(2, realOuterScope.ReadLocks[Constants.Locks.Languages]);
+                    innerScope.Complete();
+                }
+                Assert.AreEqual(0, realOuterScope.ReadLocks[Constants.Locks.Languages]);
+                Assert.AreEqual(2, realOuterScope.ReadLocks[Constants.Locks.ContentTree]);
+                outerscope.Complete();
+            }
+        }
+
         [Test]
         public void Nested_Scopes_WriteLocks_Count_Correctly()
         {

From c01fab97b82761619aa3b62322fa8df05b6b7397 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 2 Mar 2021 13:43:34 +0100
Subject: [PATCH 089/202] Count requested locks in child scopes with the
 existing dictionaries.

This way we don't have to have a two dictionaries AND two lists.
---
 src/Umbraco.Core/Scoping/Scope.cs | 118 ++++++++++++++++++------------
 1 file changed, 72 insertions(+), 46 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index f04d827209..bab40a7adf 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -35,15 +35,11 @@ namespace Umbraco.Core.Scoping
         private ICompletable _fscope;
         private IEventDispatcher _eventDispatcher;
 
-        // ReadLocks and WriteLocks owned by the entire chain, managed by the outermost scope
+        // ReadLocks and WriteLocks if we're the outer most scope it's those owned by the entire chain
+        // If we're a child scope it's those that we have requested.
         public Dictionary<int, int> ReadLocks;
         public Dictionary<int, int> WriteLocks;
 
-        // ReadLocks and WriteLocks requested by this specific scope, required to be able to decrement
-        // Using Lists just in case someone for some reason requests the same lock twice in the same scope.
-        private List<int> _readLocks;
-        private List<int> _writelocks;
-
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
             ILogger logger, FileSystems fileSystems, Scope parent, ScopeContext scopeContext, bool detachable,
@@ -70,8 +66,6 @@ namespace Umbraco.Core.Scoping
 
             ReadLocks = new Dictionary<int, int>();
             WriteLocks = new Dictionary<int, int>();
-            _readLocks = new List<int>();
-            _writelocks = new List<int>();
 
 #if DEBUG_SCOPES
             _scopeProvider.RegisterScope(this);
@@ -363,15 +357,18 @@ namespace Umbraco.Core.Scoping
 #endif
             }
 
-            // Decrement the lock counters
-            foreach (var readLockId in _readLocks)
+            // Decrement the lock counters on the parent if any.
+            if (ParentScope != null)
             {
-                DecrementReadLock(readLockId);
-            }
+                foreach (var readLockPair in ReadLocks)
+                {
+                    DecrementReadLock(readLockPair.Key, readLockPair.Value);
+                }
 
-            foreach (var writeLockId in _writelocks)
-            {
-                DecrementWriteLock(writeLockId);
+                foreach (var writeLockPair in WriteLocks)
+                {
+                    DecrementWriteLock(writeLockPair.Key, writeLockPair.Value);
+                }
             }
 
             var parent = ParentScope;
@@ -516,80 +513,109 @@ namespace Umbraco.Core.Scoping
         /// Decrements the count of the ReadLocks with a specific lock object identifier we currently hold
         /// </summary>
         /// <param name="lockId">Lock object identifier to decrement</param>
-        public void DecrementReadLock(int lockId)
+        /// <param name="amountToDecrement">Amount to decrement the lock count with</param>
+        public void DecrementReadLock(int lockId, int amountToDecrement)
         {
             // If we aren't the outermost scope, pass it on to the parent.
             if (ParentScope != null)
             {
-                ParentScope.DecrementReadLock(lockId);
+                ParentScope.DecrementReadLock(lockId, amountToDecrement);
                 return;
             }
 
-            ReadLocks[lockId] -= 1;
+            ReadLocks[lockId] -= amountToDecrement;
         }
 
         /// <summary>
         /// Decrements the count of the WriteLocks with a specific lock object identifier we currently hold.
         /// </summary>
         /// <param name="lockId">Lock object identifier to decrement.</param>
-        public void DecrementWriteLock(int lockId)
+        /// <param name="amountToDecrement">Amount to decrement the lock count with</param>
+        public void DecrementWriteLock(int lockId, int amountToDecrement)
         {
             // If we aren't the outermost scope, pass it on to the parent.
             if (ParentScope != null)
             {
-                ParentScope.DecrementWriteLock(lockId);
+                ParentScope.DecrementWriteLock(lockId, amountToDecrement);
                 return;
             }
 
-            WriteLocks[lockId] -= 1;
+            WriteLocks[lockId] -= amountToDecrement;
+        }
+
+        /// <summary>
+        /// Increment the count of the read locks we've requested
+        /// </summary>
+        /// <remarks>
+        /// This should only be done on child scopes since it's then used to decrement the count later.
+        /// </remarks>
+        /// <param name="lockIds"></param>
+        private void IncrementRequestedReadLock(params int[] lockIds)
+        {
+            // We need to keep track of what lockIds we have requested locks for to be able to decrement them.
+            if (ParentScope != null)
+            {
+                foreach (var lockId in lockIds)
+                {
+                    if (!ReadLocks.ContainsKey(lockId))
+                    {
+                        ReadLocks[lockId] = 0;
+                    }
+
+                    ReadLocks[lockId] += 1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Increment the count of the write locks we've requested
+        /// </summary>
+        /// <remarks>
+        /// This should only be done on child scopes since it's then used to decrement the count later.
+        /// </remarks>
+        /// <param name="lockIds"></param>
+        private void IncrementRequestedWriteLock(params int[] lockIds)
+        {
+            // We need to keep track of what lockIds we have requested locks for to be able to decrement them.
+            if (ParentScope != null)
+            {
+                foreach (var lockId in lockIds)
+                {
+                    if (!WriteLocks.ContainsKey(lockId))
+                    {
+                        WriteLocks[lockId] = 0;
+                    }
+
+                    WriteLocks[lockId] += 1;
+                }
+            }
         }
 
         /// <inheritdoc />
         public void ReadLock(params int[] lockIds)
         {
-            if (ParentScope != null)
-            {
-                foreach (var id in lockIds)
-                {
-                    // We need to keep track of what lockIds we have requested locks for to be able to decrement them.
-                    // We have to do this out of the recursion to not add the ids to all scopes.
-                    _readLocks.Add(id);
-                }
-            }
+            IncrementRequestedReadLock(lockIds);
             ReadLockInner(null, lockIds);
         }
 
         /// <inheritdoc />
         public void ReadLock(TimeSpan timeout, int lockId)
         {
-            if (ParentScope != null)
-            {
-                _readLocks.Add(lockId);
-            }
-
+            IncrementRequestedReadLock(lockId);
             ReadLockInner(timeout, lockId);
         }
 
         /// <inheritdoc />
         public void WriteLock(params int[] lockIds)
         {
-            if (ParentScope != null)
-            {
-                foreach (var lockId in lockIds)
-                {
-                    _writelocks.Add(lockId);
-                }
-            }
+            IncrementRequestedWriteLock(lockIds);
             WriteLockInner(null, lockIds);
         }
 
         /// <inheritdoc />
         public void WriteLock(TimeSpan timeout, int lockId)
         {
-            if (ParentScope != null)
-            {
-                _writelocks.Add(lockId);
-            }
+            IncrementRequestedWriteLock(lockId);
             WriteLockInner(timeout, lockId);
         }
 

From f0723870962b70f81c76d8029e4c30def2ba3f59 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 3 Mar 2021 08:55:14 +0100
Subject: [PATCH 090/202] Wrap access to dictionaries in locks and make
 dictionaries internal readonly

---
 src/Umbraco.Core/Scoping/Scope.cs | 113 ++++++++++++++++++------------
 1 file changed, 70 insertions(+), 43 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index bab40a7adf..f1827d7d83 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -35,10 +35,12 @@ namespace Umbraco.Core.Scoping
         private ICompletable _fscope;
         private IEventDispatcher _eventDispatcher;
 
+        private object _dictionaryLocker;
+
         // ReadLocks and WriteLocks if we're the outer most scope it's those owned by the entire chain
         // If we're a child scope it's those that we have requested.
-        public Dictionary<int, int> ReadLocks;
-        public Dictionary<int, int> WriteLocks;
+        internal readonly Dictionary<int, int> ReadLocks;
+        internal readonly Dictionary<int, int> WriteLocks;
 
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
@@ -64,6 +66,7 @@ namespace Umbraco.Core.Scoping
 
             Detachable = detachable;
 
+            _dictionaryLocker = new object();
             ReadLocks = new Dictionary<int, int>();
             WriteLocks = new Dictionary<int, int>();
 
@@ -360,14 +363,20 @@ namespace Umbraco.Core.Scoping
             // Decrement the lock counters on the parent if any.
             if (ParentScope != null)
             {
-                foreach (var readLockPair in ReadLocks)
+                lock (_dictionaryLocker)
                 {
-                    DecrementReadLock(readLockPair.Key, readLockPair.Value);
+                    foreach (var readLockPair in ReadLocks)
+                    {
+                        DecrementReadLock(readLockPair.Key, readLockPair.Value);
+                    }
                 }
 
-                foreach (var writeLockPair in WriteLocks)
+                lock (_dictionaryLocker)
                 {
-                    DecrementWriteLock(writeLockPair.Key, writeLockPair.Value);
+                    foreach (var writeLockPair in WriteLocks)
+                    {
+                        DecrementWriteLock(writeLockPair.Key, writeLockPair.Value);
+                    }
                 }
             }
 
@@ -523,7 +532,10 @@ namespace Umbraco.Core.Scoping
                 return;
             }
 
-            ReadLocks[lockId] -= amountToDecrement;
+            lock (_dictionaryLocker)
+            {
+                ReadLocks[lockId] -= amountToDecrement;
+            }
         }
 
         /// <summary>
@@ -540,7 +552,10 @@ namespace Umbraco.Core.Scoping
                 return;
             }
 
-            WriteLocks[lockId] -= amountToDecrement;
+            lock (_dictionaryLocker)
+            {
+                WriteLocks[lockId] -= amountToDecrement;
+            }
         }
 
         /// <summary>
@@ -557,12 +572,15 @@ namespace Umbraco.Core.Scoping
             {
                 foreach (var lockId in lockIds)
                 {
-                    if (!ReadLocks.ContainsKey(lockId))
+                    lock (_dictionaryLocker)
                     {
-                        ReadLocks[lockId] = 0;
-                    }
+                        if (!ReadLocks.ContainsKey(lockId))
+                        {
+                            ReadLocks[lockId] = 0;
+                        }
 
-                    ReadLocks[lockId] += 1;
+                        ReadLocks[lockId] += 1;
+                    }
                 }
             }
         }
@@ -581,12 +599,15 @@ namespace Umbraco.Core.Scoping
             {
                 foreach (var lockId in lockIds)
                 {
-                    if (!WriteLocks.ContainsKey(lockId))
+                    lock (_dictionaryLocker)
                     {
-                        WriteLocks[lockId] = 0;
-                    }
+                        if (!WriteLocks.ContainsKey(lockId))
+                        {
+                            WriteLocks[lockId] = 0;
+                        }
 
-                    WriteLocks[lockId] += 1;
+                        WriteLocks[lockId] += 1;
+                    }
                 }
             }
         }
@@ -636,24 +657,27 @@ namespace Umbraco.Core.Scoping
             // If we are the parent, then handle the lock request.
             foreach (var lockId in lockIds)
             {
-                // Only acquire the lock if we haven't done so yet.
-                if (!ReadLocks.ContainsKey(lockId))
+                lock (_dictionaryLocker)
                 {
-                    if (timeout is null)
+                    // Only acquire the lock if we haven't done so yet.
+                    if (!ReadLocks.ContainsKey(lockId))
                     {
-                        // We want a lock with a custom timeout
-                        ObtainReadLock(lockId);
+                        if (timeout is null)
+                        {
+                            // We want a lock with a custom timeout
+                            ObtainReadLock(lockId);
+                        }
+                        else
+                        {
+                            // We just want an ordinary lock.
+                            ObtainTimoutReadLock(lockId, timeout.Value);
+                        }
+                        // Add the lockId as a key to the dict.
+                        ReadLocks[lockId] = 0;
                     }
-                    else
-                    {
-                        // We just want an ordinary lock.
-                        ObtainTimoutReadLock(lockId, timeout.Value);
-                    }
-                    // Add the lockId as a key to the dict.
-                    ReadLocks[lockId] = 0;
-                }
 
-                ReadLocks[lockId] += 1;
+                    ReadLocks[lockId] += 1;
+                }
             }
         }
 
@@ -673,23 +697,26 @@ namespace Umbraco.Core.Scoping
 
             foreach (var lockId in lockIds)
             {
-                // Only acquire lock if we haven't yet (WriteLocks not containing the key)
-                if (!WriteLocks.ContainsKey(lockId))
+                lock (_dictionaryLocker)
                 {
-                    if (timeout is null)
+                    // Only acquire lock if we haven't yet (WriteLocks not containing the key)
+                    if (!WriteLocks.ContainsKey(lockId))
                     {
-                        ObtainWriteLock(lockId);
+                        if (timeout is null)
+                        {
+                            ObtainWriteLock(lockId);
+                        }
+                        else
+                        {
+                            ObtainTimeoutWriteLock(lockId, timeout.Value);
+                        }
+                        // Add the lockId as a key to the dict.
+                        WriteLocks[lockId] = 0;
                     }
-                    else
-                    {
-                        ObtainTimeoutWriteLock(lockId, timeout.Value);
-                    }
-                    // Add the lockId as a key to the dict.
-                    WriteLocks[lockId] = 0;
-                }
 
-                // Increment count of the lock by 1.
-                WriteLocks[lockId] += 1;
+                    // Increment count of the lock by 1.
+                    WriteLocks[lockId] += 1;
+                }
             }
         }
 

From 1bac97e0b042ed3096cc49dcdc37cdde74f00fee Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 3 Mar 2021 15:00:45 +0100
Subject: [PATCH 091/202] Bugfix: Members not locked out after failed login
 attempts (#9921)

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Added test that shows the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Fixed test that shows the error. Caches needs to be active, otherwise it do not show the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
More fix of test that shows the error. Caches needs to be active, otherwise it do not show the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Fix issue by raise event and thereby update caches.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
---
 .../MembersMembershipProviderTests.cs         | 114 ++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 .../Providers/UmbracoMembershipProvider.cs    |  18 ++-
 3 files changed, 128 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Tests/Membership/MembersMembershipProviderTests.cs

diff --git a/src/Umbraco.Tests/Membership/MembersMembershipProviderTests.cs b/src/Umbraco.Tests/Membership/MembersMembershipProviderTests.cs
new file mode 100644
index 0000000000..fd87330971
--- /dev/null
+++ b/src/Umbraco.Tests/Membership/MembersMembershipProviderTests.cs
@@ -0,0 +1,114 @@
+using System.Collections.Specialized;
+using System.Web.Security;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Core.Sync;
+using Umbraco.Tests.Integration;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Tests.Testing;
+using Umbraco.Web;
+using Umbraco.Web.Cache;
+using Umbraco.Web.Security.Providers;
+
+namespace Umbraco.Tests.Membership
+{
+    [TestFixture]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
+    public class MembersMembershipProviderTests : TestWithDatabaseBase
+    {
+        private MembersMembershipProvider MembersMembershipProvider { get; set; }
+        private IDistributedCacheBinder DistributedCacheBinder { get; set; }
+
+        public IMemberService MemberService => Current.Factory.GetInstance<IMemberService>();
+        public IMemberTypeService MemberTypeService => Current.Factory.GetInstance<IMemberTypeService>();
+        public ILogger Logger => Current.Factory.GetInstance<ILogger>();
+
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            MembersMembershipProvider = new MembersMembershipProvider(MemberService, MemberTypeService);
+
+            MembersMembershipProvider.Initialize("test", new NameValueCollection { { "passwordFormat", MembershipPasswordFormat.Clear.ToString() } });
+
+            DistributedCacheBinder = new DistributedCacheBinder(new DistributedCache(), Mock.Of<IUmbracoContextFactory>(), Logger);
+            DistributedCacheBinder.BindEvents(true);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            DistributedCacheBinder?.UnbindEvents();
+            DistributedCacheBinder = null;
+        }
+
+        protected override void Compose()
+        {
+            base.Compose();
+
+            // the cache refresher component needs to trigger to refresh caches
+            // but then, it requires a lot of plumbing ;(
+            // FIXME: and we cannot inject a DistributedCache yet
+            // so doing all this mess
+            Composition.RegisterUnique<IServerMessenger, ContentEventsTests.LocalServerMessenger>();
+            Composition.RegisterUnique(f => Mock.Of<IServerRegistrar>());
+            Composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
+                .Add(() => Composition.TypeLoader.GetCacheRefreshers());
+        }
+
+        protected override AppCaches GetAppCaches()
+        {
+            // this is what's created core web runtime
+            return new AppCaches(
+                new DeepCloneAppCache(new ObjectCacheAppCache()),
+                NoAppCache.Instance,
+                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
+        }
+
+        /// <summary>
+        /// MembersMembershipProvider.ValidateUser is expected to increase the number of failed attempts and also read that same number.
+        /// </summary>
+        /// <remarks>
+        /// This test requires the caching to be enabled, as it already is correct in the database.
+        /// Shows the error described here: https://github.com/umbraco/Umbraco-CMS/issues/9861
+        /// </remarks>
+        [Test]
+        public void ValidateUser__must_lock_out_users_after_max_attempts_of_wrong_password()
+        {
+            // Arrange
+            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
+            ServiceContext.MemberTypeService.Save(memberType);
+            var member = MockedMember.CreateSimpleMember(memberType, "test", "test@test.com",  "password","test");
+            ServiceContext.MemberService.Save(member);
+
+            var wrongPassword = "wrongPassword";
+            var numberOfFailedAttempts = MembersMembershipProvider.MaxInvalidPasswordAttempts+2;
+
+            // Act
+            var memberBefore = ServiceContext.MemberService.GetById(member.Id);
+            for (int i = 0; i < numberOfFailedAttempts; i++)
+            {
+                MembersMembershipProvider.ValidateUser(member.Username, wrongPassword);
+            }
+            var memberAfter = ServiceContext.MemberService.GetById(member.Id);
+
+            // Assert
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual(0 , memberBefore.FailedPasswordAttempts, "Expected 0 failed password attempts before");
+                Assert.IsFalse(memberBefore.IsLockedOut, "Expected the member NOT to be locked out before");
+
+                Assert.AreEqual(MembersMembershipProvider.MaxInvalidPasswordAttempts, memberAfter.FailedPasswordAttempts, "Expected exactly the max possible failed password attempts after");
+                Assert.IsTrue(memberAfter.IsLockedOut, "Expected the member to be locked out after");
+            });
+
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 97604df0c6..f86098997a 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -132,6 +132,7 @@
     <Compile Include="Logging\LogviewerTests.cs" />
     <Compile Include="Manifest\ManifestContentAppTests.cs" />
     <Compile Include="Mapping\MappingTests.cs" />
+    <Compile Include="Membership\MembersMembershipProviderTests.cs" />
     <Compile Include="Migrations\MigrationPlanTests.cs" />
     <Compile Include="Migrations\MigrationTests.cs" />
     <Compile Include="ModelsBuilder\BuilderTests.cs" />
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index bf9ee654c4..ad53949c28 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -3,7 +3,6 @@ using System.Collections.Specialized;
 using System.Configuration.Provider;
 using System.Linq;
 using System.Text;
-using System.Web;
 using System.Web.Configuration;
 using System.Web.Security;
 using Umbraco.Core;
@@ -14,7 +13,6 @@ using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
-using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Web.Security.Providers
 {
@@ -357,7 +355,7 @@ namespace Umbraco.Web.Security.Providers
                     member.LastLoginDate = now;
                     member.UpdateDate = now;
                 }
-                    
+
             }
 
             return ConvertToMembershipUser(member);
@@ -604,11 +602,21 @@ namespace Umbraco.Web.Security.Providers
             {
                 // when upgrading from 7.2 to 7.3 trying to save will throw
                 if (UmbracoVersion.Current >= new Version(7, 3, 0, 0))
-                    MemberService.Save(member, false);
+                {
+                    // We need to raise event to ensure caches are updated. (e.g. the cache that uses username as key).
+                    // Even that this is a heavy operation, because indexes are updates, we consider that okay, as it
+                    // is still cheap to do a successful login.
+                    MemberService.Save(member, true);
+                }
+
             }
             else
             {
-                // set the last login date without full save (fast, no locks)
+                // set the last login date without full save (fast, no locks).
+                // We do not update caches. This is to the best of our knowledge okay, as this info are only stored
+                // because it is required by the membership provider.
+                // If we one day have to revisit this, we will most likely need to spilt the events in membership info
+                // saved and umbraco info saved.  We don't want to update indexes etc when it is just membership info that is saved
                 MemberService.SetLastLogin(member.Username, member.LastLoginDate);
             }
 

From 0b5bace2f77f39d822c3aeb1e54eed834b0b2ad1 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 3 Mar 2021 15:00:45 +0100
Subject: [PATCH 092/202] Bugfix: Members not locked out after failed login
 attempts (#9921)

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Added test that shows the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Fixed test that shows the error. Caches needs to be active, otherwise it do not show the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
More fix of test that shows the error. Caches needs to be active, otherwise it do not show the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Fix issue by raise event and thereby update caches.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
(cherry picked from commit 1bac97e0b042ed3096cc49dcdc37cdde74f00fee)
---
 .../MembersMembershipProviderTests.cs         | 114 ++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 .../Providers/UmbracoMembershipProvider.cs    |  18 ++-
 3 files changed, 128 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Tests/Membership/MembersMembershipProviderTests.cs

diff --git a/src/Umbraco.Tests/Membership/MembersMembershipProviderTests.cs b/src/Umbraco.Tests/Membership/MembersMembershipProviderTests.cs
new file mode 100644
index 0000000000..fd87330971
--- /dev/null
+++ b/src/Umbraco.Tests/Membership/MembersMembershipProviderTests.cs
@@ -0,0 +1,114 @@
+using System.Collections.Specialized;
+using System.Web.Security;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Core.Sync;
+using Umbraco.Tests.Integration;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Tests.Testing;
+using Umbraco.Web;
+using Umbraco.Web.Cache;
+using Umbraco.Web.Security.Providers;
+
+namespace Umbraco.Tests.Membership
+{
+    [TestFixture]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
+    public class MembersMembershipProviderTests : TestWithDatabaseBase
+    {
+        private MembersMembershipProvider MembersMembershipProvider { get; set; }
+        private IDistributedCacheBinder DistributedCacheBinder { get; set; }
+
+        public IMemberService MemberService => Current.Factory.GetInstance<IMemberService>();
+        public IMemberTypeService MemberTypeService => Current.Factory.GetInstance<IMemberTypeService>();
+        public ILogger Logger => Current.Factory.GetInstance<ILogger>();
+
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            MembersMembershipProvider = new MembersMembershipProvider(MemberService, MemberTypeService);
+
+            MembersMembershipProvider.Initialize("test", new NameValueCollection { { "passwordFormat", MembershipPasswordFormat.Clear.ToString() } });
+
+            DistributedCacheBinder = new DistributedCacheBinder(new DistributedCache(), Mock.Of<IUmbracoContextFactory>(), Logger);
+            DistributedCacheBinder.BindEvents(true);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            DistributedCacheBinder?.UnbindEvents();
+            DistributedCacheBinder = null;
+        }
+
+        protected override void Compose()
+        {
+            base.Compose();
+
+            // the cache refresher component needs to trigger to refresh caches
+            // but then, it requires a lot of plumbing ;(
+            // FIXME: and we cannot inject a DistributedCache yet
+            // so doing all this mess
+            Composition.RegisterUnique<IServerMessenger, ContentEventsTests.LocalServerMessenger>();
+            Composition.RegisterUnique(f => Mock.Of<IServerRegistrar>());
+            Composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
+                .Add(() => Composition.TypeLoader.GetCacheRefreshers());
+        }
+
+        protected override AppCaches GetAppCaches()
+        {
+            // this is what's created core web runtime
+            return new AppCaches(
+                new DeepCloneAppCache(new ObjectCacheAppCache()),
+                NoAppCache.Instance,
+                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
+        }
+
+        /// <summary>
+        /// MembersMembershipProvider.ValidateUser is expected to increase the number of failed attempts and also read that same number.
+        /// </summary>
+        /// <remarks>
+        /// This test requires the caching to be enabled, as it already is correct in the database.
+        /// Shows the error described here: https://github.com/umbraco/Umbraco-CMS/issues/9861
+        /// </remarks>
+        [Test]
+        public void ValidateUser__must_lock_out_users_after_max_attempts_of_wrong_password()
+        {
+            // Arrange
+            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
+            ServiceContext.MemberTypeService.Save(memberType);
+            var member = MockedMember.CreateSimpleMember(memberType, "test", "test@test.com",  "password","test");
+            ServiceContext.MemberService.Save(member);
+
+            var wrongPassword = "wrongPassword";
+            var numberOfFailedAttempts = MembersMembershipProvider.MaxInvalidPasswordAttempts+2;
+
+            // Act
+            var memberBefore = ServiceContext.MemberService.GetById(member.Id);
+            for (int i = 0; i < numberOfFailedAttempts; i++)
+            {
+                MembersMembershipProvider.ValidateUser(member.Username, wrongPassword);
+            }
+            var memberAfter = ServiceContext.MemberService.GetById(member.Id);
+
+            // Assert
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual(0 , memberBefore.FailedPasswordAttempts, "Expected 0 failed password attempts before");
+                Assert.IsFalse(memberBefore.IsLockedOut, "Expected the member NOT to be locked out before");
+
+                Assert.AreEqual(MembersMembershipProvider.MaxInvalidPasswordAttempts, memberAfter.FailedPasswordAttempts, "Expected exactly the max possible failed password attempts after");
+                Assert.IsTrue(memberAfter.IsLockedOut, "Expected the member to be locked out after");
+            });
+
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index e6f273301f..8d44c03602 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -132,6 +132,7 @@
     <Compile Include="Logging\LogviewerTests.cs" />
     <Compile Include="Manifest\ManifestContentAppTests.cs" />
     <Compile Include="Mapping\MappingTests.cs" />
+    <Compile Include="Membership\MembersMembershipProviderTests.cs" />
     <Compile Include="Migrations\MigrationPlanTests.cs" />
     <Compile Include="Migrations\MigrationTests.cs" />
     <Compile Include="ModelsBuilder\BuilderTests.cs" />
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index bf9ee654c4..ad53949c28 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -3,7 +3,6 @@ using System.Collections.Specialized;
 using System.Configuration.Provider;
 using System.Linq;
 using System.Text;
-using System.Web;
 using System.Web.Configuration;
 using System.Web.Security;
 using Umbraco.Core;
@@ -14,7 +13,6 @@ using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
-using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Web.Security.Providers
 {
@@ -357,7 +355,7 @@ namespace Umbraco.Web.Security.Providers
                     member.LastLoginDate = now;
                     member.UpdateDate = now;
                 }
-                    
+
             }
 
             return ConvertToMembershipUser(member);
@@ -604,11 +602,21 @@ namespace Umbraco.Web.Security.Providers
             {
                 // when upgrading from 7.2 to 7.3 trying to save will throw
                 if (UmbracoVersion.Current >= new Version(7, 3, 0, 0))
-                    MemberService.Save(member, false);
+                {
+                    // We need to raise event to ensure caches are updated. (e.g. the cache that uses username as key).
+                    // Even that this is a heavy operation, because indexes are updates, we consider that okay, as it
+                    // is still cheap to do a successful login.
+                    MemberService.Save(member, true);
+                }
+
             }
             else
             {
-                // set the last login date without full save (fast, no locks)
+                // set the last login date without full save (fast, no locks).
+                // We do not update caches. This is to the best of our knowledge okay, as this info are only stored
+                // because it is required by the membership provider.
+                // If we one day have to revisit this, we will most likely need to spilt the events in membership info
+                // saved and umbraco info saved.  We don't want to update indexes etc when it is just membership info that is saved
                 MemberService.SetLastLogin(member.Username, member.LastLoginDate);
             }
 

From 475f7e6c3b8a71234151db2265a53885b710f616 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 4 Mar 2021 09:40:23 +0100
Subject: [PATCH 093/202] Bump version to 8.12.0

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

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index cab7b9a12b..c064920d34 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -19,4 +19,4 @@ using System.Resources;
 
 // these are FYI and changed automatically
 [assembly: AssemblyFileVersion("8.12.0")]
-[assembly: AssemblyInformationalVersion("8.12.0-rc")]
+[assembly: AssemblyInformationalVersion("8.12.0")]

From 4f823093f36fa05625d0b7b15609e949ec8d77ef Mon Sep 17 00:00:00 2001
From: patrickdemooij9 <patrickdemooij98@hotmail.com>
Date: Sat, 6 Mar 2021 23:35:41 +0100
Subject: [PATCH 094/202] 9940: Make sure that ordering is correct (#9944)

* 9940: Make sure that ordering is correct

* 9940: Removed unnecessary ordering

* replace i with umb-icon directive

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 .../src/views/dictionary/list.html               | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
index de7beae0cc..84c138c180 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
@@ -32,19 +32,21 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="item in vm.items | orderBy:'displayName' track by item.id" style="cursor: pointer;">
+                    <tr ng-repeat="item in vm.items track by item.id" style="cursor: pointer;">
                         <th>
                             <button type="button" ng-style="item.style" class="btn-reset bold" ng-click="vm.clickItem(item.id)">{{item.name}}</button>
                         </th>
-                        <td ng-repeat="column in item.translations">
+                        <td ng-repeat="column in item.translations | orderBy:'displayName'">
                             <button type="button" class="btn-reset" ng-click="vm.clickItem(item.id)">
-                                <i ng-if="column.hasTranslation" class="icon-check color-green" aria-hidden="true"></i>
-                                <span ng-if="column.hasTranslation" class="sr-only"><localize key="visuallyHiddenTexts_hasTranslation"></localize></span>
-                                <i ng-if="!column.hasTranslation" class="icon-alert color-red" aria-hidden="true"></i>
-                                <span ng-if="!column.hasTranslation" class="sr-only"><localize key="visuallyHiddenTexts_noTranslation"></localize></span>
+                                <umb-icon icon="{{ column.hasTranslation ? 'icon-check' : 'icon-alert' }}" 
+                                    class="{{ column.hasTranslation ? 'color-green' : 'color-red' }}"></umb-icon>
+                                <span class="sr-only">
+                                    <localize ng-if="column.hasTranslation" key="visuallyHiddenTexts_hasTranslation"></localize>
+                                    <localize ng-if="!column.hasTranslation" key="visuallyHiddenTexts_noTranslation"></localize>
+                                </span>
                             </button>
                         </td>
-                    </tr>
+                    </tr> 
                 </tbody>
             </table>
 

From 678434a561e3907ae5c1b16590da3627cfed1a3b Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Thu, 15 Oct 2020 00:00:33 +0200
Subject: [PATCH 095/202] Remove orderBy filter for languages/variants

---
 .../src/views/components/application/umb-navigation.html        | 2 +-
 src/Umbraco.Web.UI.Client/src/views/languages/overview.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
index 86e905183c..bb4b025410 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
@@ -23,7 +23,7 @@
                         class="umb-language-picker__dropdown-item"
                         ng-class="{'umb-language-picker__dropdown-item--current': language.active}"
                         ng-click="selectLanguage(language)"
-                        ng-repeat="language in languages | orderBy:'name'"
+                        ng-repeat="language in languages"
                     >
                     <span class="sr-only">
                         <localize key="visuallyHiddenTexts_switchLanguage">Switch language to</localize>
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
index 95cb7c535f..9a11691e09 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
@@ -36,7 +36,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="language in vm.languages | orderBy:'name' track by language.id" ng-click="vm.editLanguage(language)" style="cursor: pointer;">
+                    <tr ng-repeat="language in vm.languages track by language.id" ng-click="vm.editLanguage(language)" style="cursor: pointer;">
                         <td>
                            <umb-icon icon="icon-globe" class="language-icon"></umb-icon>
                             <span>{{ language.name }}</span>

From b770bdb93e3d18b6fc946b1c08248b1d6cda48f4 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Sat, 6 Mar 2021 23:39:48 +0000
Subject: [PATCH 096/202] Make properties full width in small infinite editors
 (#9812)

* Make properties in small infinite editors full width

* bump specificity

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 .../src/less/components/editor/umb-editor.less        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index 19d6a1306e..274f74bbac 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -34,6 +34,17 @@
     &--level0 {
         transform: none;
     }
+
+    &--small .umb-property {
+        .control-header {
+            float: none;
+            width: 100%;
+        }
+
+        .controls {
+            margin-left: 0;
+        }
+    }
 }
 
 // use a loop to build the editor levels

From af658100486d54fcbe9a404759cf0054af091eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 8 Mar 2021 09:44:33 +0100
Subject: [PATCH 097/202] no need to prevent or stop propagation on this.
 (#9933)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
---
 .../directives/components/upload/umbfileupload.directive.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
index 3581aed9e0..60882a372f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
@@ -20,11 +20,7 @@ function umbFileUpload() {
                 el.val('');
             });
 
-            el.on('drag dragstart dragend dragover dragenter dragleave drop', function (e) {
-                e.preventDefault();
-                e.stopPropagation();
-            })
-            .on('dragover dragenter', function () {
+            el.on('dragover dragenter', function () {
                 scope.$emit("isDragover", { value: true });
             })
             .on('dragleave dragend drop', function () {

From cef1a73a2e97243f695b4ee9a8ab4d7cd6e3328a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 8 Mar 2021 09:44:33 +0100
Subject: [PATCH 098/202] no need to prevent or stop propagation on this.
 (#9933)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit af658100486d54fcbe9a404759cf0054af091eb4)
---
 .../directives/components/upload/umbfileupload.directive.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
index 3581aed9e0..60882a372f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
@@ -20,11 +20,7 @@ function umbFileUpload() {
                 el.val('');
             });
 
-            el.on('drag dragstart dragend dragover dragenter dragleave drop', function (e) {
-                e.preventDefault();
-                e.stopPropagation();
-            })
-            .on('dragover dragenter', function () {
+            el.on('dragover dragenter', function () {
                 scope.$emit("isDragover", { value: true });
             })
             .on('dragleave dragend drop', function () {

From 008827f785df3a6ce1c150ceebb9fc826fc0d739 Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Mon, 8 Mar 2021 12:23:03 +0100
Subject: [PATCH 099/202] Should allow grid editors to use hash based settings
 (#9837)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Should allow grid editors to use hash based settings

* Swap to using vm in grid config controller, as well as showing button when there's map settings

* Included keys for styles in empty state check for grid settings

* converted the code into more AngularJS performant code

* Remove rogue change to grid.editors.config

* use watchCollection instead

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
---
 .../grid/dialogs/config.controller.js         | 20 ++++++++++++++++++-
 .../propertyeditors/grid/dialogs/config.html  |  8 ++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
index 30c89d5f2e..7330d69b2f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
@@ -16,7 +16,25 @@ function ConfigController($scope) {
             $scope.model.close();
         }
     }
-    
+
+    vm.showEmptyState = false;
+    vm.showConfig = false;
+    vm.showStyles = false;
+
+    $scope.$watchCollection('model.config', onWatch);
+    $scope.$watchCollection('model.styles', onWatch);
+
+    function onWatch() {
+
+        vm.showConfig = $scope.model.config &&
+            ($scope.model.config.length > 0 || Object.keys($scope.model.config).length > 0);
+        vm.showStyles = $scope.model.styles &&
+            ($scope.model.styles.length > 0 || Object.keys($scope.model.styles).length > 0);
+
+        vm.showEmptyState = vm.showConfig === false && vm.showStyles === false;
+
+    }
+
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.ConfigController", ConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
index a7cabd1636..88585b76fa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
@@ -13,11 +13,11 @@
         <umb-editor-container>
             <ng-form name="gridItemConfigEditor" val-form-manager>
 
-                <umb-empty-state position="center" ng-if="model.config.length === 0 && model.styles.length === 0">
+                <umb-empty-state position="center" ng-if="vm.showEmptyState">
                     <localize key="grid_noConfiguration">No further configuration available</localize>
                 </umb-empty-state>
 
-                <umb-box ng-if="model.config && model.config.length > 0">
+                <umb-box ng-if="vm.showConfig">
                     <umb-box-header title-key="grid_settings"></umb-box-header>
                     <umb-box-content>
                         <div>
@@ -29,7 +29,7 @@
                     </umb-box-content>
                 </umb-box>
 
-                <umb-box ng-if="model.styles && model.styles.length > 0">
+                <umb-box ng-if="vm.showStyles">
                     <umb-box-header title-key="grid_styles"></umb-box-header>
                     <umb-box-content>
                         <div>
@@ -52,7 +52,7 @@
                             shortcut="esc"
                             action="vm.close()">
                 </umb-button>
-                <umb-button ng-if="(model.config && model.config.length > 0) || (model.styles && model.styles.length > 0)"
+                <umb-button ng-if="vm.showConfig || vm.showStyles"
                             type="button"
                             button-style="success"
                             label-key="general_submit"

From fc447bb1013b71a2edd7dd031652afea0033db9a Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Mon, 8 Mar 2021 12:23:03 +0100
Subject: [PATCH 100/202] Should allow grid editors to use hash based settings
 (#9837)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Should allow grid editors to use hash based settings

* Swap to using vm in grid config controller, as well as showing button when there's map settings

* Included keys for styles in empty state check for grid settings

* converted the code into more AngularJS performant code

* Remove rogue change to grid.editors.config

* use watchCollection instead

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 008827f785df3a6ce1c150ceebb9fc826fc0d739)
---
 .../grid/dialogs/config.controller.js         | 20 ++++++++++++++++++-
 .../propertyeditors/grid/dialogs/config.html  |  8 ++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
index 30c89d5f2e..7330d69b2f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
@@ -16,7 +16,25 @@ function ConfigController($scope) {
             $scope.model.close();
         }
     }
-    
+
+    vm.showEmptyState = false;
+    vm.showConfig = false;
+    vm.showStyles = false;
+
+    $scope.$watchCollection('model.config', onWatch);
+    $scope.$watchCollection('model.styles', onWatch);
+
+    function onWatch() {
+
+        vm.showConfig = $scope.model.config &&
+            ($scope.model.config.length > 0 || Object.keys($scope.model.config).length > 0);
+        vm.showStyles = $scope.model.styles &&
+            ($scope.model.styles.length > 0 || Object.keys($scope.model.styles).length > 0);
+
+        vm.showEmptyState = vm.showConfig === false && vm.showStyles === false;
+
+    }
+
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.ConfigController", ConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
index a7cabd1636..88585b76fa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
@@ -13,11 +13,11 @@
         <umb-editor-container>
             <ng-form name="gridItemConfigEditor" val-form-manager>
 
-                <umb-empty-state position="center" ng-if="model.config.length === 0 && model.styles.length === 0">
+                <umb-empty-state position="center" ng-if="vm.showEmptyState">
                     <localize key="grid_noConfiguration">No further configuration available</localize>
                 </umb-empty-state>
 
-                <umb-box ng-if="model.config && model.config.length > 0">
+                <umb-box ng-if="vm.showConfig">
                     <umb-box-header title-key="grid_settings"></umb-box-header>
                     <umb-box-content>
                         <div>
@@ -29,7 +29,7 @@
                     </umb-box-content>
                 </umb-box>
 
-                <umb-box ng-if="model.styles && model.styles.length > 0">
+                <umb-box ng-if="vm.showStyles">
                     <umb-box-header title-key="grid_styles"></umb-box-header>
                     <umb-box-content>
                         <div>
@@ -52,7 +52,7 @@
                             shortcut="esc"
                             action="vm.close()">
                 </umb-button>
-                <umb-button ng-if="(model.config && model.config.length > 0) || (model.styles && model.styles.length > 0)"
+                <umb-button ng-if="vm.showConfig || vm.showStyles"
                             type="button"
                             button-style="success"
                             label-key="general_submit"

From 745014a4c3990b07e5dedb99f681174eddbb6172 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 8 Mar 2021 13:26:52 +0100
Subject: [PATCH 101/202] User manager related updates (#9935)

* Only allow not-admins to assign groups they have themselves

* Only admins is allowed to change password of other admins

* Fixed issue with deep clone of UserGroup. The Allowed sections was not cloned. This resulted in the allowed sections of the object stored in cache was updated, everytime we changed the allowed sections on an object cloned from the cache. Even if we did not save it.

* Only Admins are allowed to add sections to a user group, that they don't have access to themselves

* Align backend code with UI. User managers that is are not admin, can only assign the same groups new users, that they have themselves.

* Make existingGroupAliases and empty array when creating a new user

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
---
 .../Models/Membership/UserGroup.cs            | 18 ++++-
 src/Umbraco.Tests/Models/UserGroupTests.cs    | 80 +++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 .../UserEditorAuthorizationHelperTests.cs     | 31 +++++++
 src/Umbraco.Web.UI.Client/package-lock.json   | 40 +++++-----
 .../UserGroupEditorAuthorizationHelper.cs     | 11 +--
 .../Filters/UserGroupValidateAttribute.cs     |  6 +-
 src/Umbraco.Web/Editors/PasswordChanger.cs    |  8 +-
 .../Editors/UserEditorAuthorizationHelper.cs  | 14 +++-
 .../Editors/UserGroupsController.cs           |  6 +-
 10 files changed, 177 insertions(+), 38 deletions(-)
 create mode 100644 src/Umbraco.Tests/Models/UserGroupTests.cs

diff --git a/src/Umbraco.Core/Models/Membership/UserGroup.cs b/src/Umbraco.Core/Models/Membership/UserGroup.cs
index 31421f990d..eb797d6621 100644
--- a/src/Umbraco.Core/Models/Membership/UserGroup.cs
+++ b/src/Umbraco.Core/Models/Membership/UserGroup.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Models.Membership
         private string _icon;
         private string _name;
         private IEnumerable<string> _permissions;
-        private readonly List<string> _sectionCollection;
+        private List<string> _sectionCollection;
 
         //Custom comparer for enumerable
         private static readonly DelegateEqualityComparer<IEnumerable<string>> StringEnumerableComparer =
@@ -101,7 +101,10 @@ namespace Umbraco.Core.Models.Membership
             set => SetPropertyValueAndDetectChanges(value, ref _permissions, nameof(Permissions), StringEnumerableComparer);
         }
 
-        public IEnumerable<string> AllowedSections => _sectionCollection;
+        public IEnumerable<string> AllowedSections
+        {
+            get => _sectionCollection;
+        }
 
         public void RemoveAllowedSection(string sectionAlias)
         {
@@ -121,5 +124,16 @@ namespace Umbraco.Core.Models.Membership
         }
 
         public int UserCount { get; }
+
+        protected override void PerformDeepClone(object clone)
+        {
+
+            base.PerformDeepClone(clone);
+
+            var clonedEntity = (UserGroup)clone;
+
+            //manually clone the start node props
+            clonedEntity._sectionCollection = new List<string>(_sectionCollection);
+        }
     }
 }
diff --git a/src/Umbraco.Tests/Models/UserGroupTests.cs b/src/Umbraco.Tests/Models/UserGroupTests.cs
new file mode 100644
index 0000000000..3cd1bfcb5d
--- /dev/null
+++ b/src/Umbraco.Tests/Models/UserGroupTests.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Serialization;
+using Umbraco.Tests.TestHelpers;
+
+namespace Umbraco.Tests.Models
+{
+    [TestFixture]
+    public class UserGroupTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            Current.Reset();
+            Current.UnlockConfigs();
+            Current.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
+            Current.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
+        }
+
+        [Test]
+
+        public void Can_Deep_Clone()
+        {
+            var item = Build();
+
+            var clone = (UserGroup)item.DeepClone();
+
+            Assert.AreNotSame(clone, item);
+            Assert.AreEqual(clone, item);
+
+            Assert.AreEqual(clone.AllowedSections.Count(), item.AllowedSections.Count());
+            Assert.AreNotSame(clone.AllowedSections, item.AllowedSections);
+
+            //Verify normal properties with reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
+            }
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var ss = new SerializationService(new JsonNetSerializer());
+
+            var item = Build();
+
+            var result = ss.ToStream(item);
+            var json = result.ResultStream.ToJsonString();
+            Debug.Print(json);
+        }
+
+        private UserGroup Build()
+        {
+            var item = new UserGroup()
+            {
+                Id = 3,
+                Key = Guid.NewGuid(),
+                UpdateDate = DateTime.Now,
+                CreateDate = DateTime.Now,
+                Name = "Test",
+                Alias = "alias",
+                Icon = "icon",
+                Permissions = new []{"a", "b", "c"},
+                DeleteDate = null,
+                StartContentId = null,
+                StartMediaId = null,
+            };
+            item.AddAllowedSection("A");
+            item.AddAllowedSection("B");
+
+            return item;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f86098997a..27fcebd41d 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -145,6 +145,7 @@
     <Compile Include="Models\PathValidationTests.cs" />
     <Compile Include="Models\PropertyTests.cs" />
     <Compile Include="Models\RangeTests.cs" />
+    <Compile Include="Models\UserGroupTests.cs" />
     <Compile Include="Models\VariationTests.cs" />
     <Compile Include="Persistence\Mappers\MapperTestBase.cs" />
     <Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />
diff --git a/src/Umbraco.Tests/Web/Controllers/UserEditorAuthorizationHelperTests.cs b/src/Umbraco.Tests/Web/Controllers/UserEditorAuthorizationHelperTests.cs
index 4478b59085..f531bf4e09 100644
--- a/src/Umbraco.Tests/Web/Controllers/UserEditorAuthorizationHelperTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UserEditorAuthorizationHelperTests.cs
@@ -116,6 +116,37 @@ namespace Umbraco.Tests.Web.Controllers
             Assert.IsTrue(result.Success);
         }
 
+        [Test]
+        [TestCase(Constants.Security.AdminGroupAlias, Constants.Security.AdminGroupAlias, ExpectedResult = true)]
+        [TestCase(Constants.Security.AdminGroupAlias, "SomethingElse", ExpectedResult = true)]
+        [TestCase(Constants.Security.EditorGroupAlias, Constants.Security.AdminGroupAlias, ExpectedResult = false)]
+        [TestCase(Constants.Security.EditorGroupAlias, "SomethingElse", ExpectedResult = false)]
+        [TestCase(Constants.Security.EditorGroupAlias, Constants.Security.EditorGroupAlias, ExpectedResult = true)]
+        public bool Can_only_add_user_groups_you_are_part_of_yourself_unless_you_are_admin(string groupAlias, string groupToAdd)
+        {
+            var currentUser = Mock.Of<IUser>(user => user.Groups == new[]
+            {
+                new ReadOnlyUserGroup(1, "CurrentUser", "icon-user", null, null, groupAlias, new string[0], new string[0])
+            });
+            IUser savingUser = null; // This means it is a new created user
+
+            var contentService = new Mock<IContentService>();
+            var mediaService = new Mock<IMediaService>();
+            var userService = new Mock<IUserService>();
+            var entityService = new Mock<IEntityService>();
+
+            var authHelper = new UserEditorAuthorizationHelper(
+                contentService.Object,
+                mediaService.Object,
+                userService.Object,
+                entityService.Object,
+                AppCaches.Disabled);
+
+            var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] { groupToAdd });
+
+            return result.Success;
+        }
+
         [Test]
         public void Can_Add_Another_Content_Start_Node_On_User_With_Access()
         {
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 1b28cfb029..4245cf3b23 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -2681,7 +2681,7 @@
     "cli-color": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz",
-      "integrity": "sha1-fRBzj0hSaCT4/n2lGFfLD1cv4B8=",
+      "integrity": "sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==",
       "dev": true,
       "requires": {
         "ansi-regex": "^2.1.1",
@@ -2915,7 +2915,7 @@
         "color": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
-          "integrity": "sha1-2SC0Mo1TSjrIKV1o971LpsQnvpo=",
+          "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
           "dev": true,
           "requires": {
             "color-convert": "^1.9.1",
@@ -3813,7 +3813,7 @@
     "diagnostics": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
-      "integrity": "sha1-yrasM99wydmnJ0kK5DrJladpsio=",
+      "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
       "dev": true,
       "requires": {
         "colorspace": "1.1.x",
@@ -3908,7 +3908,7 @@
     "domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha1-iAUJfpM9ZehVRvcm1g9euItE+AM=",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
       "requires": {
         "domelementtype": "1"
@@ -4177,7 +4177,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4219,7 +4219,7 @@
     "env-variable": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz",
-      "integrity": "sha1-kT3YML7xHpagOcA41BMGBOujf4g=",
+      "integrity": "sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==",
       "dev": true
     },
     "errno": {
@@ -4354,7 +4354,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
           "optional": true
         }
@@ -7236,7 +7236,7 @@
         "readable-stream": {
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -7251,7 +7251,7 @@
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -8466,7 +8466,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "to-regex-range": {
@@ -8533,7 +8533,7 @@
     "kuler": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
-      "integrity": "sha1-73x4TzbJ+24W3TFQ0VJneysCKKY=",
+      "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
       "dev": true,
       "requires": {
         "colornames": "^1.1.1"
@@ -9105,7 +9105,7 @@
     "memoizee": {
       "version": "0.4.14",
       "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-      "integrity": "sha1-B6APIEaZ+alcLZ53IYJxx81hDVc=",
+      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
       "dev": true,
       "requires": {
         "d": "1",
@@ -9232,7 +9232,7 @@
     "minimize": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/minimize/-/minimize-2.2.0.tgz",
-      "integrity": "sha1-ixZ28wBR2FmNdDZGvRJpCwdNpMM=",
+      "integrity": "sha512-IxR2XMbw9pXCxApkdD9BTcH2U4XlXhbeySUrv71rmMS9XDA8BVXEsIuFu24LtwCfBgfbL7Fuh8/ZzkO5DaTLlQ==",
       "dev": true,
       "requires": {
         "argh": "^0.1.4",
@@ -9257,7 +9257,7 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -9435,9 +9435,9 @@
       "dev": true
     },
     "nouislider": {
-      "version": "14.6.2",
-      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.6.2.tgz",
-      "integrity": "sha512-/lJeqJBghNAZS3P2VYrHzm1RM6YJPvvC/1wNpGaHBRX+05wpzUDafrW/ohAYp4kjKhRH8+BJ0vkorCHiMmgTMQ=="
+      "version": "14.6.3",
+      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.6.3.tgz",
+      "integrity": "sha512-/3tAqsWY2JYW9vd7bC14bFRA1P9A+pRHOtKmoMsyfnB0fQcd1UFx2pdY1Ey5wAUzTnXTesmYaEo/ecLVETijIQ=="
     },
     "now-and-later": {
       "version": "2.0.1",
@@ -14764,7 +14764,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -15356,7 +15356,7 @@
     "text-hex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-      "integrity": "sha1-adycGxdEbueakr9biEu0uRJ1BvU=",
+      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
       "dev": true
     },
     "text-table": {
@@ -15448,7 +15448,7 @@
     "timers-ext": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha1-b1ethXjgej+5+R2Th9ZWR1VeJcY=",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
       "dev": true,
       "requires": {
         "es5-ext": "~0.10.46",
diff --git a/src/Umbraco.Web/Editors/Filters/UserGroupEditorAuthorizationHelper.cs b/src/Umbraco.Web/Editors/Filters/UserGroupEditorAuthorizationHelper.cs
index ea403758d0..ad3dae5e06 100644
--- a/src/Umbraco.Web/Editors/Filters/UserGroupEditorAuthorizationHelper.cs
+++ b/src/Umbraco.Web/Editors/Filters/UserGroupEditorAuthorizationHelper.cs
@@ -76,18 +76,15 @@ namespace Umbraco.Web.Editors.Filters
         /// <summary>
         /// Authorize that the user is not adding a section to the group that they don't have access to
         /// </summary>
-        /// <param name="currentUser"></param>
-        /// <param name="currentAllowedSections"></param>
-        /// <param name="proposedAllowedSections"></param>
-        /// <returns></returns>
-        public Attempt<string> AuthorizeSectionChanges(IUser currentUser,
-            IEnumerable<string> currentAllowedSections,
+        public Attempt<string> AuthorizeSectionChanges(
+            IUser currentUser,
+            IEnumerable<string> existingSections,
             IEnumerable<string> proposedAllowedSections)
         {
             if (currentUser.IsAdmin())
                 return Attempt<string>.Succeed();
 
-            var sectionsAdded = currentAllowedSections.Except(proposedAllowedSections).ToArray();
+            var sectionsAdded = proposedAllowedSections.Except(existingSections).ToArray();
             var sectionAccessMissing = sectionsAdded.Except(currentUser.AllowedSections).ToArray();
             return sectionAccessMissing.Length > 0
                 ? Attempt.Fail("Current user doesn't have access to add these sections " + string.Join(", ", sectionAccessMissing))
diff --git a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
index 78cd8e6a4d..a2647d2ee9 100644
--- a/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
@@ -58,13 +58,9 @@ namespace Umbraco.Web.Editors.Filters
                         return;
                     }
 
-                    //map the model to the persisted instance
-                    Mapper.Map(userGroupSave, persisted);
                     break;
                 case ContentSaveAction.SaveNew:
-                    //create the persisted model from mapping the saved model
-                    persisted = Mapper.Map<IUserGroup>(userGroupSave);
-                    ((UserGroup)persisted).ResetIdentity();
+                    persisted = new UserGroup();
                     break;
                 default:
                     actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.NotFound, new ArgumentOutOfRangeException());
diff --git a/src/Umbraco.Web/Editors/PasswordChanger.cs b/src/Umbraco.Web/Editors/PasswordChanger.cs
index 2698a68b40..404ce27e39 100644
--- a/src/Umbraco.Web/Editors/PasswordChanger.cs
+++ b/src/Umbraco.Web/Editors/PasswordChanger.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Http.ModelBinding;
@@ -84,6 +85,11 @@ namespace Umbraco.Web.Editors
                     return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("The current user is not authorized", new[] { "resetPassword" }) });
                 }
 
+                if (!currentUser.IsAdmin() && savingUser.IsAdmin())
+                {
+                    return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("The current user cannot change the password for the specified user", new[] { "resetPassword" }) });
+                }
+
                 //ok, we should be able to reset it
                 var resetToken = await userMgr.GeneratePasswordResetTokenAsync(savingUser.Id);
                 var newPass = passwordModel.NewPassword.IsNullOrWhiteSpace()
@@ -246,7 +252,7 @@ namespace Umbraco.Web.Editors
                 return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Cannot set an empty password", new[] { "value" }) });
             }
 
-            //without being able to retrieve the original password, 
+            //without being able to retrieve the original password,
             //we cannot arbitrarily change the password without knowing the old one and no old password was supplied - need to return an error
             if (passwordModel.OldPassword.IsNullOrWhiteSpace() && membershipProvider.EnablePasswordRetrieval == false)
             {
diff --git a/src/Umbraco.Web/Editors/UserEditorAuthorizationHelper.cs b/src/Umbraco.Web/Editors/UserEditorAuthorizationHelper.cs
index f666b6d5a3..bd031c0527 100644
--- a/src/Umbraco.Web/Editors/UserEditorAuthorizationHelper.cs
+++ b/src/Umbraco.Web/Editors/UserEditorAuthorizationHelper.cs
@@ -78,6 +78,18 @@ namespace Umbraco.Web.Editors
             if (userGroupAliases != null)
             {
                 var savingGroupAliases = userGroupAliases.ToArray();
+                var existingGroupAliases = savingUser == null
+                ? new string[0]
+                : savingUser.Groups.Select(x => x.Alias).ToArray();
+
+                var addedGroupAliases = savingGroupAliases.Except(existingGroupAliases);
+
+                // As we know the current user is not admin, it is only allowed to use groups that the user do have themselves.
+                var savingGroupAliasesNotAllowed = addedGroupAliases.Except(currentUser.Groups.Select(x=>x.Alias)).ToArray();
+                if (savingGroupAliasesNotAllowed.Any())
+                {
+                    return Attempt.Fail("Cannot assign the group(s) '" + string.Join(", ", savingGroupAliasesNotAllowed) + "', the current user is not part of them or admin");
+                }
 
                 //only validate any groups that have changed.
                 //a non-admin user can remove groups and add groups that they have access to
@@ -93,9 +105,7 @@ namespace Umbraco.Web.Editors
                 if (userGroupsChanged)
                 {
                     // d) A user cannot assign a group to another user that they do not belong to
-
                     var currentUserGroups = currentUser.Groups.Select(x => x.Alias).ToArray();
-
                     foreach (var group in newGroups)
                     {
                         if (currentUserGroups.Contains(group) == false)
diff --git a/src/Umbraco.Web/Editors/UserGroupsController.cs b/src/Umbraco.Web/Editors/UserGroupsController.cs
index 77f7a305af..c8620b35fe 100644
--- a/src/Umbraco.Web/Editors/UserGroupsController.cs
+++ b/src/Umbraco.Web/Editors/UserGroupsController.cs
@@ -39,7 +39,8 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.Unauthorized, isAuthorized.Result));
 
             //if sections were added we need to check that the current user has access to that section
-            isAuthorized = authHelper.AuthorizeSectionChanges(Security.CurrentUser,
+            isAuthorized = authHelper.AuthorizeSectionChanges(
+                Security.CurrentUser,
                 userGroupSave.PersistedUserGroup.AllowedSections,
                 userGroupSave.Sections);
             if (isAuthorized == false)
@@ -57,6 +58,9 @@ namespace Umbraco.Web.Editors
             //need to ensure current user is in a group if not an admin to avoid a 401
             EnsureNonAdminUserIsInSavedUserGroup(userGroupSave);
 
+            //map the model to the persisted instance
+            Mapper.Map(userGroupSave, userGroupSave.PersistedUserGroup);
+
             //save the group
             Services.UserService.Save(userGroupSave.PersistedUserGroup, userGroupSave.Users.ToArray());
 

From 6898fd2784393f1d6523cd9f1156aff404893a3b Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 9 Mar 2021 08:19:40 +0100
Subject: [PATCH 102/202] Only lock once when decrementing

---
 src/Umbraco.Core/Scoping/Scope.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index f1827d7d83..0b10086154 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -369,10 +369,7 @@ namespace Umbraco.Core.Scoping
                     {
                         DecrementReadLock(readLockPair.Key, readLockPair.Value);
                     }
-                }
 
-                lock (_dictionaryLocker)
-                {
                     foreach (var writeLockPair in WriteLocks)
                     {
                         DecrementWriteLock(writeLockPair.Key, writeLockPair.Value);

From b554aa9484af83f3c17322d14c010142b13c3796 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 9 Mar 2021 08:22:16 +0100
Subject: [PATCH 103/202] Apply suggestions from code review

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Core/Scoping/Scope.cs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 0b10086154..819bc515ed 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -571,12 +571,14 @@ namespace Umbraco.Core.Scoping
                 {
                     lock (_dictionaryLocker)
                     {
-                        if (!ReadLocks.ContainsKey(lockId))
+                        if (ReadLocks.ContainsKey(lockId))
                         {
-                            ReadLocks[lockId] = 0;
+                            ReadLocks[lockId] += 1;
+                        }
+                        else
+                        {
+                            ReadLocks[lockId] = 1;
                         }
-
-                        ReadLocks[lockId] += 1;
                     }
                 }
             }
@@ -598,12 +600,14 @@ namespace Umbraco.Core.Scoping
                 {
                     lock (_dictionaryLocker)
                     {
-                        if (!WriteLocks.ContainsKey(lockId))
+                        if (WriteLocks.ContainsKey(lockId))
                         {
-                            WriteLocks[lockId] = 0;
+                            WriteLocks[lockId] = 1;
+                        }
+                        else
+                        {
+                            WriteLocks[lockId] += 1;
                         }
-
-                        WriteLocks[lockId] += 1;
                     }
                 }
             }

From adf504c20ce9fcf73ab014e6a314230153798fea Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 9 Mar 2021 09:33:34 +0100
Subject: [PATCH 104/202] Fix IncrementRequestedWriteLock

---
 src/Umbraco.Core/Scoping/Scope.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 819bc515ed..7015cee5eb 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -602,11 +602,11 @@ namespace Umbraco.Core.Scoping
                     {
                         if (WriteLocks.ContainsKey(lockId))
                         {
-                            WriteLocks[lockId] = 1;
+                            WriteLocks[lockId] += 1;
                         }
                         else
                         {
-                            WriteLocks[lockId] += 1;
+                            WriteLocks[lockId] = 1;
                         }
                     }
                 }

From 8e01ac30d60f0a5c7340a44c411815bf75c14c50 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 9 Mar 2021 12:58:10 +0100
Subject: [PATCH 105/202] Cache the SVG icons serverside to boost performance
 (#9200)

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 src/Umbraco.Core/IO/SystemDirectories.cs      |   2 +
 src/Umbraco.Core/Services/IIconService.cs     |  14 +-
 .../components/umbicon.directive.js           |   3 +-
 .../src/common/services/iconhelper.service.js | 128 ++++++++----------
 .../Umbraco/Views/Default.cshtml              |   6 -
 .../Editors/BackOfficeController.cs           |  47 ++-----
 src/Umbraco.Web/Editors/BackOfficeModel.cs    |  15 +-
 .../Editors/BackOfficePreviewModel.cs         |  17 +--
 .../Editors/BackOfficeServerVariables.cs      |   9 +-
 src/Umbraco.Web/Editors/IconController.cs     |  24 +++-
 src/Umbraco.Web/Editors/PreviewController.cs  |  24 +---
 src/Umbraco.Web/Services/IconService.cs       |  87 ++++++++++--
 12 files changed, 186 insertions(+), 190 deletions(-)

diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs
index 485fd7f965..9d09bf2f0d 100644
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -25,6 +25,8 @@ namespace Umbraco.Core.IO
 
         public static string AppPlugins => "~/App_Plugins";
 
+        public static string AppPluginIcons => "/Backoffice/Icons";
+
         public static string MvcViews => "~/Views";
 
         public static string PartialViews => MvcViews + "/Partials/";
diff --git a/src/Umbraco.Core/Services/IIconService.cs b/src/Umbraco.Core/Services/IIconService.cs
index 963edb22a5..1e1ae38002 100644
--- a/src/Umbraco.Core/Services/IIconService.cs
+++ b/src/Umbraco.Core/Services/IIconService.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services
@@ -6,7 +8,7 @@ namespace Umbraco.Core.Services
     public interface IIconService
     {
         /// <summary>
-        /// Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
+        /// Gets the svg string for the icon name found at the global icons path
         /// </summary>
         /// <param name="iconName"></param>
         /// <returns></returns>
@@ -15,7 +17,15 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Gets a list of all svg icons found at at the global icons path.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>A list of <see cref="IconModel"/></returns>
+        [Obsolete("This method should not be used - use GetIcons instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         IList<IconModel> GetAllIcons();
+
+        /// <summary>
+        /// Gets a list of all svg icons found at at the global icons path.
+        /// </summary>
+        /// <returns></returns>
+        IReadOnlyDictionary<string, string> GetIcons();
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
index 87d976f6d9..73a9617aee 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
@@ -75,9 +75,8 @@ Icon with additional attribute. It can be treated like any other dom element
 
                     iconHelper.getIcon(icon)
                         .then(data => {
-                            if (data !== null && data.svgString !== undefined) {
+                            if (data && data.svgString) {
                                 // Watch source SVG string
-                                //icon.svgString.$$unwrapTrustedValue();
                                 scope.svgString = data.svgString;
                             }
                         });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
index f26763bd14..f3f5deb695 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
@@ -3,9 +3,9 @@
 * @name umbraco.services.iconHelper
 * @description A helper service for dealing with icons, mostly dealing with legacy tree icons
 **/
-function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
+function iconHelper($http, $q, $sce, $timeout) {
 
-    var converter = [
+    const converter = [
         { oldIcon: ".sprNew", newIcon: "add" },
         { oldIcon: ".sprDelete", newIcon: "remove" },
         { oldIcon: ".sprMove", newIcon: "enter" },
@@ -85,15 +85,61 @@ function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
         { oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" }
     ];
 
-    var collectedIcons;
+    let collectedIcons;
 
-    var imageConverter = [
-            {oldImage: "contour.png", newIcon: "icon-umb-contour"}
-            ];
+    let imageConverter = [
+        {oldImage: "contour.png", newIcon: "icon-umb-contour"}
+    ];
 
-    var iconCache = [];
-    var liveRequests = [];
-    var allIconsRequested = false;
+    const iconCache = [];
+    const promiseQueue = [];
+    let resourceLoadStatus = "none";
+
+    /**
+     * This is the same approach as use for loading the localized text json 
+     * We don't want multiple requests for the icon collection, so need to track
+     * the current request state, and resolve the queued requests once the icons arrive
+     * Subsequent requests are returned immediately as the icons are cached into 
+     */
+    function init() {       
+        const deferred = $q.defer();
+
+        if (resourceLoadStatus === "loaded") {
+            deferred.resolve(iconCache);
+            return deferred.promise;
+        }
+
+        if (resourceLoadStatus === "loading") {
+            promiseQueue.push(deferred);
+            return deferred.promise;
+        }
+
+        resourceLoadStatus = "loading";
+
+        $http({ method: "GET", url: Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl + 'GetIcons' })
+            .then(function (response) {
+                resourceLoadStatus = "loaded";
+
+                for (const [key, value] of Object.entries(response.data.Data)) {
+                    iconCache.push({name: key, svgString: $sce.trustAsHtml(value)})
+                }
+
+                deferred.resolve(iconCache);
+
+                //ensure all other queued promises are resolved
+                for (let p in promiseQueue) {
+                    promiseQueue[p].resolve(iconCache);
+                }
+            }, function (err) {
+                deferred.reject("Something broke");
+                //ensure all other queued promises are resolved
+                for (let p in promiseQueue) {
+                    promiseQueue[p].reject("Something broke");
+                }
+            });
+
+        return deferred.promise;    
+    }
 
     return {
 
@@ -187,67 +233,12 @@ function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
 
         /** Gets a single IconModel */
         getIcon: function(iconName) {
-            return $q((resolve, reject) => {
-                var icon = this._getIconFromCache(iconName);
-
-                 if(icon !== undefined) {
-                    resolve(icon);
-                } else {
-                    var iconRequestPath = Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl +  'GetIcon?iconName=' + iconName;
-
-                     // If the current icon is being requested, wait a bit so that we don't have to make another http request and can instead get the icon from the cache.
-                    // This is a bit rough and ready and could probably be improved used an event based system
-                    if(liveRequests.indexOf(iconRequestPath) >= 0) {
-                        setTimeout(() => {
-                            resolve(this.getIcon(iconName));
-                        }, 10);
-                    } else {
-                        liveRequests.push(iconRequestPath);
-                        // TODO - fix bug where Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl is undefinied when help icon
-                        umbRequestHelper.resourcePromise(
-                            $http.get(iconRequestPath)
-                            ,'Failed to retrieve icon: ' + iconName)
-                        .then(icon => {
-                            if(icon) {
-                                var trustedIcon = this.defineIcon(icon.Name, icon.SvgString);
-
-                                liveRequests = _.filter(liveRequests, iconRequestPath);
-
-                                resolve(trustedIcon);
-                            }
-                        })
-                        .catch(err => {
-                            console.warn(err);
-                        });
-                    };
-
-                 }
-            });
+            return init().then(icons => icons.find(i => i.name === iconName));
         },
 
         /** Gets all the available icons in the backoffice icon folder and returns them as an array of IconModels */
          getAllIcons: function() {
-            return $q((resolve, reject) => {
-                if(allIconsRequested === false) {
-                    allIconsRequested = true;
-
-                     umbRequestHelper.resourcePromise(
-                        $http.get(Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl + 'GetAllIcons')
-                        ,'Failed to retrieve icons')
-                    .then(icons => {
-                        icons.forEach(icon => {
-                            this.defineIcon(icon.Name, icon.SvgString);
-                        });
-
-                        resolve(iconCache);
-                    })
-                    .catch(err => {
-                        console.warn(err);
-                    });;
-                } else {
-                    resolve(iconCache);
-                }
-            });
+            return init().then(icons => icons);
         },
 
         /** LEGACY - Return a list of icons from icon fonts, optionally filter them */
@@ -312,9 +303,8 @@ function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
         },
 
          /** Returns the cached icon or undefined */
-        _getIconFromCache: function(iconName) {
-            return _.find(iconCache, {name: iconName});
-        }
+        _getIconFromCache: iconName => iconCache.find(icon => icon.name === iconName)
+        
     };
 }
 angular.module('umbraco.services').factory('iconHelper', iconHelper);
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index eefd182aff..5166815a1c 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -121,12 +121,6 @@
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
             @Html.AngularValueTinyMceAssets()
 
-            app.run(["iconHelper", function (iconHelper) {
-                @* We inject icons to the icon helper(service), since icons can only be loaded if user is authorized. By injecting these to the service they will not be requested as they will become cached. *@
-                iconHelper.defineIcon("icon-check", '@Html.Raw(Model.IconCheckData)');
-                iconHelper.defineIcon("icon-delete", '@Html.Raw(Model.IconDeleteData)');
-            }]);
-
             //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 bf3c9d083b..157a6e4735 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -1,4 +1,8 @@
-using System;
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin.Security;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -6,24 +10,19 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 using System.Web.UI;
-using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.Owin;
-using Microsoft.Owin.Security;
-using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models.Identity;
-using Umbraco.Web.Models;
-using Umbraco.Web.Mvc;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 using Umbraco.Web.JavaScript;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
 using Umbraco.Web.Security;
-using Umbraco.Web.Services;
 using Constants = Umbraco.Core.Constants;
 using JArray = Newtonsoft.Json.Linq.JArray;
 
@@ -40,11 +39,9 @@ namespace Umbraco.Web.Editors
         private readonly ManifestParser _manifestParser;
         private readonly UmbracoFeatures _features;
         private readonly IRuntimeState _runtimeState;
-        private readonly IIconService _iconService;
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
         private BackOfficeSignInManager _signInManager;
 
-        [Obsolete("Use the constructor that injects IIconService.")]
         public BackOfficeController(
             ManifestParser manifestParser,
             UmbracoFeatures features,
@@ -55,37 +52,11 @@ namespace Umbraco.Web.Editors
             IProfilingLogger profilingLogger,
             IRuntimeState runtimeState,
             UmbracoHelper umbracoHelper)
-            : this(manifestParser,
-                features,
-                globalSettings,
-                umbracoContextAccessor,
-                services,
-                appCaches,
-                profilingLogger,
-                runtimeState,
-                umbracoHelper,
-                Current.IconService)
-        {
-
-        }
-
-        public BackOfficeController(
-            ManifestParser manifestParser,
-            UmbracoFeatures features,
-            IGlobalSettings globalSettings,
-            IUmbracoContextAccessor umbracoContextAccessor,
-            ServiceContext services,
-            AppCaches appCaches,
-            IProfilingLogger profilingLogger,
-            IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
-            IIconService iconService)
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
         {
             _manifestParser = manifestParser;
             _features = features;
             _runtimeState = runtimeState;
-            _iconService = iconService;
         }
 
         protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
@@ -100,7 +71,7 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         public async Task<ActionResult> Default()
         {
-            var backofficeModel = new BackOfficeModel(_features, GlobalSettings, _iconService);
+            var backofficeModel = new BackOfficeModel(_features, GlobalSettings);
             return await RenderDefaultOrProcessExternalLoginAsync(
                 () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", backofficeModel),
                 () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", backofficeModel));
@@ -186,7 +157,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _iconService)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs
index cbdafd2e94..d0d2e324f3 100644
--- a/src/Umbraco.Web/Editors/BackOfficeModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs
@@ -1,32 +1,19 @@
 using System;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 
 namespace Umbraco.Web.Editors
 {
-
     public class BackOfficeModel
     {
 
-
-        [Obsolete("Use the overload that injects IIconService.")]
-        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings) : this(features, globalSettings, Current.IconService)
-        {
-
-        }
-        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IIconService iconService)
+        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings)
         {
             Features = features;
             GlobalSettings = globalSettings;
-            IconCheckData = iconService.GetIcon("icon-check")?.SvgString;
-            IconDeleteData = iconService.GetIcon("icon-delete")?.SvgString;
         }
 
         public UmbracoFeatures Features { get; }
         public IGlobalSettings GlobalSettings { get; }
-        public string IconCheckData { get; }
-        public string IconDeleteData { get; }
     }
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index cc7356b687..6ace8e7198 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 
 namespace Umbraco.Web.Editors
@@ -13,21 +10,11 @@ namespace Umbraco.Web.Editors
         private readonly UmbracoFeatures _features;
         public IEnumerable<ILanguage> Languages { get; }
 
-        [Obsolete("Use the overload that injects IIconService.")]
         public BackOfficePreviewModel(
             UmbracoFeatures features,
             IGlobalSettings globalSettings,
             IEnumerable<ILanguage> languages)
-            : this(features, globalSettings, languages, Current.IconService)
-        {
-        }
-
-        public BackOfficePreviewModel(
-            UmbracoFeatures features,
-            IGlobalSettings globalSettings,
-            IEnumerable<ILanguage> languages,
-            IIconService iconService)
-            : base(features, globalSettings, iconService)
+            : base(features, globalSettings)
         {
             _features = features;
             Languages = languages;
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index dd4dd67681..42b5186c03 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -1,4 +1,6 @@
-using System;
+using ClientDependency.Core.Config;
+using Microsoft.Owin;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
@@ -7,15 +9,10 @@ using System.Runtime.Serialization;
 using System.Web;
 using System.Web.Configuration;
 using System.Web.Mvc;
-using ClientDependency.Core.Config;
-using Microsoft.Owin;
-using Microsoft.Owin.Security;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
-using Umbraco.Web.Controllers;
 using Umbraco.Web.Features;
 using Umbraco.Web.HealthCheck;
 using Umbraco.Web.Models.ContentEditing;
diff --git a/src/Umbraco.Web/Editors/IconController.cs b/src/Umbraco.Web/Editors/IconController.cs
index 87303a4e62..2aac92088d 100644
--- a/src/Umbraco.Web/Editors/IconController.cs
+++ b/src/Umbraco.Web/Editors/IconController.cs
@@ -1,13 +1,20 @@
-using System.Collections.Generic;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.Editors
 {
     [PluginController("UmbracoApi")]
-    public class IconController : UmbracoAuthorizedApiController
+    [IsBackOffice]
+    [UmbracoWebApiRequireHttps]
+    [UnhandedExceptionLoggerConfiguration]
+    [EnableDetailedErrors]
+    public class IconController : UmbracoApiController
     {
         private readonly IIconService _iconService;
 
@@ -30,9 +37,22 @@ namespace Umbraco.Web.Editors
         /// Gets a list of all svg icons found at at the global icons path.
         /// </summary>
         /// <returns></returns>
+        [Obsolete("This method should not be used - use GetIcons instead")]
         public IList<IconModel> GetAllIcons()
         {
             return _iconService.GetAllIcons();
         }
+
+        /// <summary>
+        /// Gets a list of all svg icons found at at the global icons path.
+        /// </summary>
+        /// <returns></returns>
+        public JsonNetResult GetIcons()
+        {
+            return new JsonNetResult(JsonNetResult.DefaultJsonSerializerSettings) {
+                Data = _iconService.GetIcons(),
+                Formatting = Formatting.None
+            };
+        }
     }
 }
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index f00805d2dc..e2770b14ba 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -9,10 +9,8 @@ using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 using Umbraco.Web.JavaScript;
-using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.Services;
 using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Editors
@@ -25,39 +23,19 @@ namespace Umbraco.Web.Editors
         private readonly IPublishedSnapshotService _publishedSnapshotService;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly ILocalizationService _localizationService;
-        private readonly IIconService _iconService;
 
-        [Obsolete("Use the constructor that injects IIconService.")]
         public PreviewController(
             UmbracoFeatures features,
             IGlobalSettings globalSettings,
             IPublishedSnapshotService publishedSnapshotService,
             IUmbracoContextAccessor umbracoContextAccessor,
             ILocalizationService localizationService)
-            :this(features,
-                globalSettings,
-                publishedSnapshotService,
-                umbracoContextAccessor,
-                localizationService,
-                Current.IconService)
-        {
-
-        }
-
-        public PreviewController(
-            UmbracoFeatures features,
-            IGlobalSettings globalSettings,
-            IPublishedSnapshotService publishedSnapshotService,
-            IUmbracoContextAccessor umbracoContextAccessor,
-            ILocalizationService localizationService,
-            IIconService iconService)
         {
             _features = features;
             _globalSettings = globalSettings;
             _publishedSnapshotService = publishedSnapshotService;
             _umbracoContextAccessor = umbracoContextAccessor;
             _localizationService = localizationService;
-            _iconService = iconService;
         }
 
         [UmbracoAuthorize(redirectToUmbracoLogin: true)]
@@ -74,7 +52,7 @@ namespace Umbraco.Web.Editors
                 availableLanguages = availableLanguages.Where(language => content.Cultures.ContainsKey(language.IsoCode));
             }
 
-            var model = new BackOfficePreviewModel(_features, _globalSettings, availableLanguages, _iconService);
+            var model = new BackOfficePreviewModel(_features, _globalSettings, availableLanguages);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index 175650fd12..15e673e6ba 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -1,8 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Ganss.XSS;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
@@ -14,31 +16,43 @@ namespace Umbraco.Web.Services
     {
         private readonly IGlobalSettings _globalSettings;
         private readonly IHtmlSanitizer _htmlSanitizer;
+        private readonly IAppPolicyCache _cache;
 
-        public IconService(IGlobalSettings globalSettings, IHtmlSanitizer htmlSanitizer)
+        public IconService(IGlobalSettings globalSettings, IHtmlSanitizer htmlSanitizer, AppCaches appCaches)
         {
             _globalSettings = globalSettings;
             _htmlSanitizer = htmlSanitizer;
+            _cache = appCaches.RuntimeCache;
         }
 
-
         /// <inheritdoc />
-        public IList<IconModel> GetAllIcons()
-        {
-            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
-            var iconNames = directory.GetFiles("*.svg");
+        public IReadOnlyDictionary<string, string> GetIcons() => GetIconDictionary();
 
-            return iconNames.OrderBy(f => f.Name)
-                .Select(iconInfo => GetIcon(iconInfo)).WhereNotNull().ToList();
-
-        }
+        /// <inheritdoc />
+        public IList<IconModel> GetAllIcons() =>
+            GetIconDictionary()
+                .Select(x => new IconModel { Name = x.Key, SvgString = x.Value })
+                .ToList();
 
         /// <inheritdoc />
         public IconModel GetIcon(string iconName)
         {
-            return string.IsNullOrWhiteSpace(iconName)
-                ? null
-                : CreateIconModel(iconName.StripFileExtension(), IOHelper.MapPath($"{_globalSettings.IconsPath}/{iconName}.svg"));
+            if (iconName.IsNullOrWhiteSpace())
+            {
+                return null;
+            }
+
+            var allIconModels = GetIconDictionary();
+            if (allIconModels.ContainsKey(iconName))
+            {
+                return new IconModel
+                {
+                    Name = iconName,
+                    SvgString = allIconModels[iconName]
+                };
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -79,5 +93,52 @@ namespace Umbraco.Web.Services
                 return null;
             }
         }
+
+        private IEnumerable<FileInfo> GetAllIconsFiles()
+        {
+            var icons = new HashSet<FileInfo>(new CaseInsensitiveFileInfoComparer());
+
+            // add icons from plugins
+            var appPluginsDirectoryPath = IOHelper.MapPath(SystemDirectories.AppPlugins);
+            if (Directory.Exists(appPluginsDirectoryPath))
+            {
+                var appPlugins = new DirectoryInfo(appPluginsDirectoryPath);
+
+                // iterate sub directories of app plugins
+                foreach (var dir in appPlugins.EnumerateDirectories())
+                {
+                    var iconPath = IOHelper.MapPath($"{SystemDirectories.AppPlugins}/{dir.Name}{SystemDirectories.AppPluginIcons}");
+                    if (Directory.Exists(iconPath))
+                    {
+                        var dirIcons = new DirectoryInfo(iconPath).EnumerateFiles("*.svg", SearchOption.TopDirectoryOnly);
+                        icons.UnionWith(dirIcons);
+                    }
+                }
+            }
+
+            // add icons from IconsPath if not already added from plugins
+            var coreIconsDirectory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
+            var coreIcons = coreIconsDirectory.GetFiles("*.svg");
+
+            icons.UnionWith(coreIcons);
+
+            return icons;
+        }
+
+        private class CaseInsensitiveFileInfoComparer : IEqualityComparer<FileInfo>
+        {
+            public bool Equals(FileInfo one, FileInfo two) => StringComparer.InvariantCultureIgnoreCase.Equals(one.Name, two.Name);
+
+            public int GetHashCode(FileInfo item) => StringComparer.InvariantCultureIgnoreCase.GetHashCode(item.Name);
+        }
+
+        private IReadOnlyDictionary<string, string> GetIconDictionary() => _cache.GetCacheItem(
+            $"{typeof(IconService).FullName}.{nameof(GetIconDictionary)}",
+            () => GetAllIconsFiles()
+                .Select(GetIcon)
+                .Where(i => i != null)
+                .GroupBy(i => i.Name, StringComparer.OrdinalIgnoreCase)
+                .ToDictionary(g => g.Key, g => g.First().SvgString, StringComparer.OrdinalIgnoreCase)
+        );
     }
 }

From 16573446dbb3814a5e62fbd731b294de8e801176 Mon Sep 17 00:00:00 2001
From: Chad <chad.d.currie@gmail.com>
Date: Mon, 22 Feb 2021 21:53:53 +1300
Subject: [PATCH 106/202] Fixes #9615 - Upgrade to Htmlsanitizer v5 (#9856)

---
 build/NuSpecs/UmbracoCms.Web.nuspec           | 2 +-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs | 9 +++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            | 5 +++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 82d15d2b95..ac787f64e3 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -42,7 +42,7 @@
                 <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
                 <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
-                <dependency id="HtmlSanitizer" version="[4.0.217,4.999999)" />
+                <dependency id="HtmlSanitizer" version="[5.0.376,5.999999)" />
 
             </group>
 
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 112910930e..97e2cc1b15 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -40,6 +40,7 @@ using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models;
+using Ganss.XSS;
 
 namespace Umbraco.Web.Runtime
 {
@@ -139,6 +140,14 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<ISectionService, SectionService>();
             composition.RegisterUnique<IDashboardService, DashboardService>();
             composition.RegisterUnique<IIconService, IconService>();
+            composition.Register<IHtmlSanitizer>(_ =>
+            {
+                var sanitizer = new HtmlSanitizer();
+                sanitizer.AllowedAttributes.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Attributes);
+                sanitizer.AllowedCssProperties.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Attributes);
+                sanitizer.AllowedTags.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Tags);
+                return sanitizer;
+            },Lifetime.Singleton);
 
             composition.RegisterUnique<IExamineManager>(factory => ExamineManager.Instance);
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c3eba87d6f..1a6c9a49a2 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -67,6 +67,7 @@
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
     <PackageReference Include="HtmlSanitizer">
       <Version>4.0.217</Version>
+      <Version>5.0.376</Version>
     </PackageReference>
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
@@ -1286,7 +1287,7 @@
     </PropertyGroup>
     <ItemGroup>
       <!-- we want to exclude all facade references ?! -->
-      <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http'" />
+      <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http' and '%(ReferencePath.FileName)' != 'System.Text.Encoding.CodePages'" />
     </ItemGroup>
     <Delete Files="$(TargetDir)$(TargetName).XmlSerializers.dll" ContinueOnError="true" />
     <!--
@@ -1296,4 +1297,4 @@
       <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
     </SGen>
   </Target>
-</Project>
\ No newline at end of file
+</Project>

From b7553e311ad04c11faf1d0a54633703b3f0e2916 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 9 Mar 2021 12:58:10 +0100
Subject: [PATCH 107/202] Cache the SVG icons serverside to boost performance
 (#9200)

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
(cherry picked from commit 8e01ac30d60f0a5c7340a44c411815bf75c14c50)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Services/IconService.cs
---
 src/Umbraco.Core/IO/SystemDirectories.cs      |   2 +
 src/Umbraco.Core/Services/IIconService.cs     |  14 +-
 .../components/umbicon.directive.js           |   3 +-
 .../src/common/services/iconhelper.service.js | 128 ++++++++----------
 .../Umbraco/Views/Default.cshtml              |   6 -
 .../Editors/BackOfficeController.cs           |  47 ++-----
 src/Umbraco.Web/Editors/BackOfficeModel.cs    |  15 +-
 .../Editors/BackOfficePreviewModel.cs         |  17 +--
 .../Editors/BackOfficeServerVariables.cs      |   8 +-
 src/Umbraco.Web/Editors/IconController.cs     |  24 +++-
 src/Umbraco.Web/Editors/PreviewController.cs  |  24 +---
 src/Umbraco.Web/Services/IconService.cs       | 105 ++++++++++----
 12 files changed, 189 insertions(+), 204 deletions(-)

diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs
index 485fd7f965..9d09bf2f0d 100644
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -25,6 +25,8 @@ namespace Umbraco.Core.IO
 
         public static string AppPlugins => "~/App_Plugins";
 
+        public static string AppPluginIcons => "/Backoffice/Icons";
+
         public static string MvcViews => "~/Views";
 
         public static string PartialViews => MvcViews + "/Partials/";
diff --git a/src/Umbraco.Core/Services/IIconService.cs b/src/Umbraco.Core/Services/IIconService.cs
index 963edb22a5..1e1ae38002 100644
--- a/src/Umbraco.Core/Services/IIconService.cs
+++ b/src/Umbraco.Core/Services/IIconService.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services
@@ -6,7 +8,7 @@ namespace Umbraco.Core.Services
     public interface IIconService
     {
         /// <summary>
-        /// Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
+        /// Gets the svg string for the icon name found at the global icons path
         /// </summary>
         /// <param name="iconName"></param>
         /// <returns></returns>
@@ -15,7 +17,15 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Gets a list of all svg icons found at at the global icons path.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>A list of <see cref="IconModel"/></returns>
+        [Obsolete("This method should not be used - use GetIcons instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         IList<IconModel> GetAllIcons();
+
+        /// <summary>
+        /// Gets a list of all svg icons found at at the global icons path.
+        /// </summary>
+        /// <returns></returns>
+        IReadOnlyDictionary<string, string> GetIcons();
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
index 87d976f6d9..73a9617aee 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
@@ -75,9 +75,8 @@ Icon with additional attribute. It can be treated like any other dom element
 
                     iconHelper.getIcon(icon)
                         .then(data => {
-                            if (data !== null && data.svgString !== undefined) {
+                            if (data && data.svgString) {
                                 // Watch source SVG string
-                                //icon.svgString.$$unwrapTrustedValue();
                                 scope.svgString = data.svgString;
                             }
                         });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
index f26763bd14..f3f5deb695 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
@@ -3,9 +3,9 @@
 * @name umbraco.services.iconHelper
 * @description A helper service for dealing with icons, mostly dealing with legacy tree icons
 **/
-function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
+function iconHelper($http, $q, $sce, $timeout) {
 
-    var converter = [
+    const converter = [
         { oldIcon: ".sprNew", newIcon: "add" },
         { oldIcon: ".sprDelete", newIcon: "remove" },
         { oldIcon: ".sprMove", newIcon: "enter" },
@@ -85,15 +85,61 @@ function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
         { oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" }
     ];
 
-    var collectedIcons;
+    let collectedIcons;
 
-    var imageConverter = [
-            {oldImage: "contour.png", newIcon: "icon-umb-contour"}
-            ];
+    let imageConverter = [
+        {oldImage: "contour.png", newIcon: "icon-umb-contour"}
+    ];
 
-    var iconCache = [];
-    var liveRequests = [];
-    var allIconsRequested = false;
+    const iconCache = [];
+    const promiseQueue = [];
+    let resourceLoadStatus = "none";
+
+    /**
+     * This is the same approach as use for loading the localized text json 
+     * We don't want multiple requests for the icon collection, so need to track
+     * the current request state, and resolve the queued requests once the icons arrive
+     * Subsequent requests are returned immediately as the icons are cached into 
+     */
+    function init() {       
+        const deferred = $q.defer();
+
+        if (resourceLoadStatus === "loaded") {
+            deferred.resolve(iconCache);
+            return deferred.promise;
+        }
+
+        if (resourceLoadStatus === "loading") {
+            promiseQueue.push(deferred);
+            return deferred.promise;
+        }
+
+        resourceLoadStatus = "loading";
+
+        $http({ method: "GET", url: Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl + 'GetIcons' })
+            .then(function (response) {
+                resourceLoadStatus = "loaded";
+
+                for (const [key, value] of Object.entries(response.data.Data)) {
+                    iconCache.push({name: key, svgString: $sce.trustAsHtml(value)})
+                }
+
+                deferred.resolve(iconCache);
+
+                //ensure all other queued promises are resolved
+                for (let p in promiseQueue) {
+                    promiseQueue[p].resolve(iconCache);
+                }
+            }, function (err) {
+                deferred.reject("Something broke");
+                //ensure all other queued promises are resolved
+                for (let p in promiseQueue) {
+                    promiseQueue[p].reject("Something broke");
+                }
+            });
+
+        return deferred.promise;    
+    }
 
     return {
 
@@ -187,67 +233,12 @@ function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
 
         /** Gets a single IconModel */
         getIcon: function(iconName) {
-            return $q((resolve, reject) => {
-                var icon = this._getIconFromCache(iconName);
-
-                 if(icon !== undefined) {
-                    resolve(icon);
-                } else {
-                    var iconRequestPath = Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl +  'GetIcon?iconName=' + iconName;
-
-                     // If the current icon is being requested, wait a bit so that we don't have to make another http request and can instead get the icon from the cache.
-                    // This is a bit rough and ready and could probably be improved used an event based system
-                    if(liveRequests.indexOf(iconRequestPath) >= 0) {
-                        setTimeout(() => {
-                            resolve(this.getIcon(iconName));
-                        }, 10);
-                    } else {
-                        liveRequests.push(iconRequestPath);
-                        // TODO - fix bug where Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl is undefinied when help icon
-                        umbRequestHelper.resourcePromise(
-                            $http.get(iconRequestPath)
-                            ,'Failed to retrieve icon: ' + iconName)
-                        .then(icon => {
-                            if(icon) {
-                                var trustedIcon = this.defineIcon(icon.Name, icon.SvgString);
-
-                                liveRequests = _.filter(liveRequests, iconRequestPath);
-
-                                resolve(trustedIcon);
-                            }
-                        })
-                        .catch(err => {
-                            console.warn(err);
-                        });
-                    };
-
-                 }
-            });
+            return init().then(icons => icons.find(i => i.name === iconName));
         },
 
         /** Gets all the available icons in the backoffice icon folder and returns them as an array of IconModels */
          getAllIcons: function() {
-            return $q((resolve, reject) => {
-                if(allIconsRequested === false) {
-                    allIconsRequested = true;
-
-                     umbRequestHelper.resourcePromise(
-                        $http.get(Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl + 'GetAllIcons')
-                        ,'Failed to retrieve icons')
-                    .then(icons => {
-                        icons.forEach(icon => {
-                            this.defineIcon(icon.Name, icon.SvgString);
-                        });
-
-                        resolve(iconCache);
-                    })
-                    .catch(err => {
-                        console.warn(err);
-                    });;
-                } else {
-                    resolve(iconCache);
-                }
-            });
+            return init().then(icons => icons);
         },
 
         /** LEGACY - Return a list of icons from icon fonts, optionally filter them */
@@ -312,9 +303,8 @@ function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
         },
 
          /** Returns the cached icon or undefined */
-        _getIconFromCache: function(iconName) {
-            return _.find(iconCache, {name: iconName});
-        }
+        _getIconFromCache: iconName => iconCache.find(icon => icon.name === iconName)
+        
     };
 }
 angular.module('umbraco.services').factory('iconHelper', iconHelper);
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 666f7a64f5..eca1deda10 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -120,12 +120,6 @@
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
             @Html.AngularValueTinyMceAssets()
 
-            app.run(["iconHelper", function (iconHelper) {
-                @* We inject icons to the icon helper(service), since icons can only be loaded if user is authorized. By injecting these to the service they will not be requested as they will become cached. *@
-                iconHelper.defineIcon("icon-check", '@Html.Raw(Model.IconCheckData)');
-                iconHelper.defineIcon("icon-delete", '@Html.Raw(Model.IconDeleteData)');
-            }]);
-
             //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 cd5a3a50b6..6889695e54 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -1,4 +1,8 @@
-using System;
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin.Security;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -7,24 +11,19 @@ using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.UI;
-using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.Owin;
-using Microsoft.Owin.Security;
-using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models.Identity;
-using Umbraco.Web.Models;
-using Umbraco.Web.Mvc;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 using Umbraco.Web.JavaScript;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
 using Umbraco.Web.Security;
-using Umbraco.Web.Services;
 using Constants = Umbraco.Core.Constants;
 using JArray = Newtonsoft.Json.Linq.JArray;
 
@@ -41,11 +40,9 @@ namespace Umbraco.Web.Editors
         private readonly ManifestParser _manifestParser;
         private readonly UmbracoFeatures _features;
         private readonly IRuntimeState _runtimeState;
-        private readonly IIconService _iconService;
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
         private BackOfficeSignInManager _signInManager;
 
-        [Obsolete("Use the constructor that injects IIconService.")]
         public BackOfficeController(
             ManifestParser manifestParser,
             UmbracoFeatures features,
@@ -56,37 +53,11 @@ namespace Umbraco.Web.Editors
             IProfilingLogger profilingLogger,
             IRuntimeState runtimeState,
             UmbracoHelper umbracoHelper)
-            : this(manifestParser,
-                features,
-                globalSettings,
-                umbracoContextAccessor,
-                services,
-                appCaches,
-                profilingLogger,
-                runtimeState,
-                umbracoHelper,
-                Current.IconService)
-        {
-
-        }
-
-        public BackOfficeController(
-            ManifestParser manifestParser,
-            UmbracoFeatures features,
-            IGlobalSettings globalSettings,
-            IUmbracoContextAccessor umbracoContextAccessor,
-            ServiceContext services,
-            AppCaches appCaches,
-            IProfilingLogger profilingLogger,
-            IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
-            IIconService iconService)
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
         {
             _manifestParser = manifestParser;
             _features = features;
             _runtimeState = runtimeState;
-            _iconService = iconService;
         }
 
         protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
@@ -101,7 +72,7 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         public async Task<ActionResult> Default()
         {
-            var backofficeModel = new BackOfficeModel(_features, GlobalSettings, _iconService);
+            var backofficeModel = new BackOfficeModel(_features, GlobalSettings);
             return await RenderDefaultOrProcessExternalLoginAsync(
                 () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", backofficeModel),
                 () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", backofficeModel));
@@ -187,7 +158,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _iconService)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs
index cbdafd2e94..d0d2e324f3 100644
--- a/src/Umbraco.Web/Editors/BackOfficeModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs
@@ -1,32 +1,19 @@
 using System;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 
 namespace Umbraco.Web.Editors
 {
-
     public class BackOfficeModel
     {
 
-
-        [Obsolete("Use the overload that injects IIconService.")]
-        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings) : this(features, globalSettings, Current.IconService)
-        {
-
-        }
-        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IIconService iconService)
+        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings)
         {
             Features = features;
             GlobalSettings = globalSettings;
-            IconCheckData = iconService.GetIcon("icon-check")?.SvgString;
-            IconDeleteData = iconService.GetIcon("icon-delete")?.SvgString;
         }
 
         public UmbracoFeatures Features { get; }
         public IGlobalSettings GlobalSettings { get; }
-        public string IconCheckData { get; }
-        public string IconDeleteData { get; }
     }
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index cc7356b687..6ace8e7198 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 
 namespace Umbraco.Web.Editors
@@ -13,21 +10,11 @@ namespace Umbraco.Web.Editors
         private readonly UmbracoFeatures _features;
         public IEnumerable<ILanguage> Languages { get; }
 
-        [Obsolete("Use the overload that injects IIconService.")]
         public BackOfficePreviewModel(
             UmbracoFeatures features,
             IGlobalSettings globalSettings,
             IEnumerable<ILanguage> languages)
-            : this(features, globalSettings, languages, Current.IconService)
-        {
-        }
-
-        public BackOfficePreviewModel(
-            UmbracoFeatures features,
-            IGlobalSettings globalSettings,
-            IEnumerable<ILanguage> languages,
-            IIconService iconService)
-            : base(features, globalSettings, iconService)
+            : base(features, globalSettings)
         {
             _features = features;
             Languages = languages;
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 60d3a6f779..a995aa7110 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -1,4 +1,6 @@
-using System;
+using ClientDependency.Core.Config;
+using Microsoft.Owin;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
@@ -7,15 +9,11 @@ using System.Runtime.Serialization;
 using System.Web;
 using System.Web.Configuration;
 using System.Web.Mvc;
-using ClientDependency.Core.Config;
-using Microsoft.Owin;
 using Microsoft.Owin.Security;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
-using Umbraco.Web.Controllers;
 using Umbraco.Web.Features;
 using Umbraco.Web.HealthCheck;
 using Umbraco.Web.Models.ContentEditing;
diff --git a/src/Umbraco.Web/Editors/IconController.cs b/src/Umbraco.Web/Editors/IconController.cs
index 87303a4e62..c26389f239 100644
--- a/src/Umbraco.Web/Editors/IconController.cs
+++ b/src/Umbraco.Web/Editors/IconController.cs
@@ -1,13 +1,20 @@
-using System.Collections.Generic;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.Editors
 {
     [PluginController("UmbracoApi")]
-    public class IconController : UmbracoAuthorizedApiController
+    [IsBackOffice]
+    [UmbracoWebApiRequireHttps]
+    [UnhandedExceptionLoggerConfiguration]
+    [EnableDetailedErrors]
+    public class IconController : UmbracoApiController
     {
         private readonly IIconService _iconService;
 
@@ -30,9 +37,22 @@ namespace Umbraco.Web.Editors
         /// Gets a list of all svg icons found at at the global icons path.
         /// </summary>
         /// <returns></returns>
+        [Obsolete("This method should not be used - use GetIcons instead")]
         public IList<IconModel> GetAllIcons()
         {
             return _iconService.GetAllIcons();
         }
+
+        /// <summary>
+        /// Gets a list of all svg icons found at at the global icons path.
+        /// </summary>
+        /// <returns></returns>
+        public JsonNetResult GetIcons()
+        {
+            return new JsonNetResult() {
+                Data = _iconService.GetIcons(),
+                Formatting = Formatting.None
+            };
+        }
     }
 }
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index f148655acd..8cff55305e 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -9,10 +9,8 @@ using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 using Umbraco.Web.JavaScript;
-using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.Services;
 using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Editors
@@ -25,39 +23,19 @@ namespace Umbraco.Web.Editors
         private readonly IPublishedSnapshotService _publishedSnapshotService;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly ILocalizationService _localizationService;
-        private readonly IIconService _iconService;
 
-        [Obsolete("Use the constructor that injects IIconService.")]
         public PreviewController(
             UmbracoFeatures features,
             IGlobalSettings globalSettings,
             IPublishedSnapshotService publishedSnapshotService,
             IUmbracoContextAccessor umbracoContextAccessor,
             ILocalizationService localizationService)
-            :this(features,
-                globalSettings,
-                publishedSnapshotService,
-                umbracoContextAccessor,
-                localizationService,
-                Current.IconService)
-        {
-
-        }
-
-        public PreviewController(
-            UmbracoFeatures features,
-            IGlobalSettings globalSettings,
-            IPublishedSnapshotService publishedSnapshotService,
-            IUmbracoContextAccessor umbracoContextAccessor,
-            ILocalizationService localizationService,
-            IIconService iconService)
         {
             _features = features;
             _globalSettings = globalSettings;
             _publishedSnapshotService = publishedSnapshotService;
             _umbracoContextAccessor = umbracoContextAccessor;
             _localizationService = localizationService;
-            _iconService = iconService;
         }
 
         [UmbracoAuthorize(redirectToUmbracoLogin: true)]
@@ -66,7 +44,7 @@ namespace Umbraco.Web.Editors
         {
             var availableLanguages = _localizationService.GetAllLanguages();
 
-            var model = new BackOfficePreviewModel(_features, _globalSettings, availableLanguages, _iconService);
+            var model = new BackOfficePreviewModel(_features, _globalSettings, availableLanguages);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index 206af296f9..15e673e6ba 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -1,8 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Ganss.XSS;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
@@ -13,39 +15,44 @@ namespace Umbraco.Web.Services
     public class IconService : IIconService
     {
         private readonly IGlobalSettings _globalSettings;
+        private readonly IHtmlSanitizer _htmlSanitizer;
+        private readonly IAppPolicyCache _cache;
 
-        public IconService(IGlobalSettings globalSettings)
+        public IconService(IGlobalSettings globalSettings, IHtmlSanitizer htmlSanitizer, AppCaches appCaches)
         {
             _globalSettings = globalSettings;
+            _htmlSanitizer = htmlSanitizer;
+            _cache = appCaches.RuntimeCache;
         }
 
-
         /// <inheritdoc />
-        public IList<IconModel> GetAllIcons()
-        {
-            var icons = new List<IconModel>();
-            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
-            var iconNames = directory.GetFiles("*.svg");
+        public IReadOnlyDictionary<string, string> GetIcons() => GetIconDictionary();
 
-            iconNames.OrderBy(f => f.Name).ToList().ForEach(iconInfo =>
-            {
-                var icon = GetIcon(iconInfo);
-
-                if (icon != null)
-                {
-                    icons.Add(icon);
-                }
-            });
-
-            return icons;
-        }
+        /// <inheritdoc />
+        public IList<IconModel> GetAllIcons() =>
+            GetIconDictionary()
+                .Select(x => new IconModel { Name = x.Key, SvgString = x.Value })
+                .ToList();
 
         /// <inheritdoc />
         public IconModel GetIcon(string iconName)
         {
-            return string.IsNullOrWhiteSpace(iconName)
-                ? null
-                : CreateIconModel(iconName.StripFileExtension(), IOHelper.MapPath($"{_globalSettings.IconsPath}/{iconName}.svg"));
+            if (iconName.IsNullOrWhiteSpace())
+            {
+                return null;
+            }
+
+            var allIconModels = GetIconDictionary();
+            if (allIconModels.ContainsKey(iconName))
+            {
+                return new IconModel
+                {
+                    Name = iconName,
+                    SvgString = allIconModels[iconName]
+                };
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -68,15 +75,10 @@ namespace Umbraco.Web.Services
         /// <returns></returns>
         private IconModel CreateIconModel(string iconName, string iconPath)
         {
-            var sanitizer = new HtmlSanitizer();
-            sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
-            sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
-            sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
-
             try
             {
                 var svgContent = System.IO.File.ReadAllText(iconPath);
-                var sanitizedString = sanitizer.Sanitize(svgContent);
+                var sanitizedString = _htmlSanitizer.Sanitize(svgContent);
 
                 var svg = new IconModel
                 {
@@ -91,5 +93,52 @@ namespace Umbraco.Web.Services
                 return null;
             }
         }
+
+        private IEnumerable<FileInfo> GetAllIconsFiles()
+        {
+            var icons = new HashSet<FileInfo>(new CaseInsensitiveFileInfoComparer());
+
+            // add icons from plugins
+            var appPluginsDirectoryPath = IOHelper.MapPath(SystemDirectories.AppPlugins);
+            if (Directory.Exists(appPluginsDirectoryPath))
+            {
+                var appPlugins = new DirectoryInfo(appPluginsDirectoryPath);
+
+                // iterate sub directories of app plugins
+                foreach (var dir in appPlugins.EnumerateDirectories())
+                {
+                    var iconPath = IOHelper.MapPath($"{SystemDirectories.AppPlugins}/{dir.Name}{SystemDirectories.AppPluginIcons}");
+                    if (Directory.Exists(iconPath))
+                    {
+                        var dirIcons = new DirectoryInfo(iconPath).EnumerateFiles("*.svg", SearchOption.TopDirectoryOnly);
+                        icons.UnionWith(dirIcons);
+                    }
+                }
+            }
+
+            // add icons from IconsPath if not already added from plugins
+            var coreIconsDirectory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
+            var coreIcons = coreIconsDirectory.GetFiles("*.svg");
+
+            icons.UnionWith(coreIcons);
+
+            return icons;
+        }
+
+        private class CaseInsensitiveFileInfoComparer : IEqualityComparer<FileInfo>
+        {
+            public bool Equals(FileInfo one, FileInfo two) => StringComparer.InvariantCultureIgnoreCase.Equals(one.Name, two.Name);
+
+            public int GetHashCode(FileInfo item) => StringComparer.InvariantCultureIgnoreCase.GetHashCode(item.Name);
+        }
+
+        private IReadOnlyDictionary<string, string> GetIconDictionary() => _cache.GetCacheItem(
+            $"{typeof(IconService).FullName}.{nameof(GetIconDictionary)}",
+            () => GetAllIconsFiles()
+                .Select(GetIcon)
+                .Where(i => i != null)
+                .GroupBy(i => i.Name, StringComparer.OrdinalIgnoreCase)
+                .ToDictionary(g => g.Key, g => g.First().SvgString, StringComparer.OrdinalIgnoreCase)
+        );
     }
 }

From 41283aead9689aef05cb11841930af4f7f847ece Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 9 Mar 2021 14:54:13 +0100
Subject: [PATCH 108/202] Fix wrong version reference

---
 src/Umbraco.Web/Umbraco.Web.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 1a6c9a49a2..405502d24c 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -66,7 +66,6 @@
     <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
     <PackageReference Include="HtmlSanitizer">
-      <Version>4.0.217</Version>
       <Version>5.0.376</Version>
     </PackageReference>
     <PackageReference Include="ImageProcessor">

From 21bee005186f21ded03d4fa8aafcdbe800e25856 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 11 Mar 2021 14:38:19 +0100
Subject: [PATCH 109/202] Bump version to 8.6.8

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index b5fb5fdd77..232fd90a8e 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.6.7")]
-[assembly: AssemblyInformationalVersion("8.6.7")]
+[assembly: AssemblyFileVersion("8.6.8")]
+[assembly: AssemblyInformationalVersion("8.6.8")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index bb36aeb8c2..6618d996ab 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8670</DevelopmentServerPort>
+          <DevelopmentServerPort>8680</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8670</IISUrl>
+          <IISUrl>http://localhost:8680</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 498a5e0c661847eecdc130b19d8f8cecce103bec Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu, 11 Mar 2021 15:52:14 +0100
Subject: [PATCH 110/202] Initial rework of Lock dictionaries

---
 src/Umbraco.Core/Scoping/Scope.cs | 258 ++++++++++++++++--------------
 1 file changed, 134 insertions(+), 124 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 7015cee5eb..91a229ef79 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
@@ -39,8 +40,8 @@ namespace Umbraco.Core.Scoping
 
         // ReadLocks and WriteLocks if we're the outer most scope it's those owned by the entire chain
         // If we're a child scope it's those that we have requested.
-        internal readonly Dictionary<int, int> ReadLocks;
-        internal readonly Dictionary<int, int> WriteLocks;
+        internal readonly Dictionary<Guid, Dictionary<int, int>> ReadLocks;
+        internal readonly Dictionary<Guid, Dictionary<int, int>> WriteLocks;
 
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
@@ -67,8 +68,8 @@ namespace Umbraco.Core.Scoping
             Detachable = detachable;
 
             _dictionaryLocker = new object();
-            ReadLocks = new Dictionary<int, int>();
-            WriteLocks = new Dictionary<int, int>();
+            ReadLocks = new Dictionary<Guid, Dictionary<int, int>>();
+            WriteLocks = new Dictionary<Guid, Dictionary<int, int>>();
 
 #if DEBUG_SCOPES
             _scopeProvider.RegisterScope(this);
@@ -361,18 +362,17 @@ namespace Umbraco.Core.Scoping
             }
 
             // Decrement the lock counters on the parent if any.
-            if (ParentScope != null)
+            lock (_dictionaryLocker)
             {
-                lock (_dictionaryLocker)
-                {
-                    foreach (var readLockPair in ReadLocks)
-                    {
-                        DecrementReadLock(readLockPair.Key, readLockPair.Value);
-                    }
+                ClearReadLocks(InstanceId);
+                ClearWriteLocks(InstanceId);
 
-                    foreach (var writeLockPair in WriteLocks)
+                if (ParentScope is null)
+                {
+                    // We're the parent scope, make sure that locks of all scopes has been cleared
+                    if (ReadLocks.Count != 0 || WriteLocks.Count != 0)
                     {
-                        DecrementWriteLock(writeLockPair.Key, writeLockPair.Value);
+                        throw new Exception($"All scopes has not been disposed from parent scope {InstanceId}");
                     }
                 }
             }
@@ -515,130 +515,122 @@ namespace Umbraco.Core.Scoping
         private static bool LogUncompletedScopes => (_logUncompletedScopes
             ?? (_logUncompletedScopes = Current.Configs.CoreDebug().LogUncompletedScopes)).Value;
 
-        /// <summary>
-        /// Decrements the count of the ReadLocks with a specific lock object identifier we currently hold
-        /// </summary>
-        /// <param name="lockId">Lock object identifier to decrement</param>
-        /// <param name="amountToDecrement">Amount to decrement the lock count with</param>
-        public void DecrementReadLock(int lockId, int amountToDecrement)
+        private void IncrementWriteLock(int lockId, Guid instanceId)
         {
-            // If we aren't the outermost scope, pass it on to the parent.
-            if (ParentScope != null)
+            if (ParentScope is null)
             {
-                ParentScope.DecrementReadLock(lockId, amountToDecrement);
-                return;
+                WriteLocks[instanceId][lockId]++;
             }
-
-            lock (_dictionaryLocker)
+            else
             {
-                ReadLocks[lockId] -= amountToDecrement;
+                ParentScope.IncrementWriteLock(lockId, instanceId);
             }
         }
 
-        /// <summary>
-        /// Decrements the count of the WriteLocks with a specific lock object identifier we currently hold.
-        /// </summary>
-        /// <param name="lockId">Lock object identifier to decrement.</param>
-        /// <param name="amountToDecrement">Amount to decrement the lock count with</param>
-        public void DecrementWriteLock(int lockId, int amountToDecrement)
+        private void DecrementWriteLock(int lockId, Guid instanceId)
         {
-            // If we aren't the outermost scope, pass it on to the parent.
-            if (ParentScope != null)
+            if (ParentScope is null)
             {
-                ParentScope.DecrementWriteLock(lockId, amountToDecrement);
-                return;
+                WriteLocks[instanceId][lockId]--;
             }
-
-            lock (_dictionaryLocker)
+            else
             {
-                WriteLocks[lockId] -= amountToDecrement;
+                ParentScope.DecrementWriteLock(lockId, instanceId);
             }
         }
 
-        /// <summary>
-        /// Increment the count of the read locks we've requested
-        /// </summary>
-        /// <remarks>
-        /// This should only be done on child scopes since it's then used to decrement the count later.
-        /// </remarks>
-        /// <param name="lockIds"></param>
-        private void IncrementRequestedReadLock(params int[] lockIds)
+        private void IncrementReadLock(int lockId, Guid instanceId)
         {
-            // We need to keep track of what lockIds we have requested locks for to be able to decrement them.
-            if (ParentScope != null)
+            if (ParentScope is null)
             {
-                foreach (var lockId in lockIds)
-                {
-                    lock (_dictionaryLocker)
-                    {
-                        if (ReadLocks.ContainsKey(lockId))
-                        {
-                            ReadLocks[lockId] += 1;
-                        }
-                        else
-                        {
-                            ReadLocks[lockId] = 1;
-                        }
-                    }
-                }
+                ReadLocks[instanceId][lockId]++;
+            }
+            else
+            {
+                ParentScope.IncrementReadLock(lockId, instanceId);
             }
         }
 
-        /// <summary>
-        /// Increment the count of the write locks we've requested
-        /// </summary>
-        /// <remarks>
-        /// This should only be done on child scopes since it's then used to decrement the count later.
-        /// </remarks>
-        /// <param name="lockIds"></param>
-        private void IncrementRequestedWriteLock(params int[] lockIds)
+        private void DecrementReadLock(int lockId, Guid instanceId)
+        {
+            if (ParentScope is null)
+            {
+                ReadLocks[instanceId][lockId]--;
+            }
+            else
+            {
+                ParentScope.DecrementReadLock(lockId, instanceId);
+            }
+        }
+
+        private void ClearReadLocks(Guid instanceId)
         {
-            // We need to keep track of what lockIds we have requested locks for to be able to decrement them.
             if (ParentScope != null)
             {
-                foreach (var lockId in lockIds)
-                {
-                    lock (_dictionaryLocker)
-                    {
-                        if (WriteLocks.ContainsKey(lockId))
-                        {
-                            WriteLocks[lockId] += 1;
-                        }
-                        else
-                        {
-                            WriteLocks[lockId] = 1;
-                        }
-                    }
-                }
+                ParentScope.ClearReadLocks(instanceId);
+            }
+            else
+            {
+                ReadLocks.Remove(instanceId);
+            }
+        }
+
+        private void ClearWriteLocks(Guid instanceID)
+        {
+            if (ParentScope != null)
+            {
+                ParentScope.ClearWriteLocks(instanceID);
+            }
+            else
+            {
+                WriteLocks.Remove(instanceID);
             }
         }
 
         /// <inheritdoc />
         public void ReadLock(params int[] lockIds)
         {
-            IncrementRequestedReadLock(lockIds);
-            ReadLockInner(null, lockIds);
+            ReadLockInner(InstanceId, null, lockIds);
         }
 
         /// <inheritdoc />
         public void ReadLock(TimeSpan timeout, int lockId)
         {
-            IncrementRequestedReadLock(lockId);
-            ReadLockInner(timeout, lockId);
+            ReadLockInner(InstanceId, timeout, lockId);
         }
 
         /// <inheritdoc />
         public void WriteLock(params int[] lockIds)
         {
-            IncrementRequestedWriteLock(lockIds);
-            WriteLockInner(null, lockIds);
+            WriteLockInner(InstanceId, null, lockIds);
         }
 
         /// <inheritdoc />
         public void WriteLock(TimeSpan timeout, int lockId)
         {
-            IncrementRequestedWriteLock(lockId);
-            WriteLockInner(timeout, lockId);
+            WriteLockInner(InstanceId, timeout, lockId);
+        }
+
+        /// <summary>
+        /// Determine if a read lock with the specified ID has already been obtained.
+        /// </summary>
+        /// <param name="lockId">Id to test.</param>
+        /// <returns>True if no scopes has obtained a read lock with the specific ID yet.</returns>
+        private bool HasReadLock(int lockId)
+        {
+            // Check if there is any dictionary<int,int> with a key equal to lockId
+            // And check that the value associated with that key is greater than 0, if not it could be because a lock was requested but it failed.
+            return  ReadLocks.Values.Where(x => x.ContainsKey(lockId)).Any(x => x[lockId] > 0);
+        }
+
+        /// <summary>
+        /// Determine if a write lock with the specified ID has already been obtained.
+        /// </summary>
+        /// <param name="lockId">Id to test</param>
+        /// <returns>>True if no scopes has obtained a write lock with the specific ID yet.</returns>
+        private bool HasWriteLock(int lockId)
+        {
+            return WriteLocks.Values.Where(x => x.ContainsKey(lockId)).Any(x => x[lockId] > 0);
         }
 
         /// <summary>
@@ -646,38 +638,49 @@ namespace Umbraco.Core.Scoping
         /// </summary>
         /// <param name="timeout">Optional database timeout in milliseconds.</param>
         /// <param name="lockIds">Array of lock object identifiers.</param>
-        internal void ReadLockInner(TimeSpan? timeout = null, params int[] lockIds)
+        private void ReadLockInner(Guid instanceId, TimeSpan? timeout = null, params int[] lockIds)
         {
             if (ParentScope != null)
             {
                 // Delegate acquiring the lock to the parent if any.
-                ParentScope.ReadLockInner(timeout, lockIds);
+                ParentScope.ReadLockInner(instanceId, timeout, lockIds);
                 return;
             }
 
-            // If we are the parent, then handle the lock request.
-            foreach (var lockId in lockIds)
+            lock (_dictionaryLocker)
             {
-                lock (_dictionaryLocker)
+                // If we are the parent, then handle the lock request.
+                foreach (var lockId in lockIds)
                 {
                     // Only acquire the lock if we haven't done so yet.
-                    if (!ReadLocks.ContainsKey(lockId))
+                    if (!HasReadLock(lockId))
                     {
-                        if (timeout is null)
+                        IncrementReadLock(lockId, instanceId);
+                        try
                         {
-                            // We want a lock with a custom timeout
-                            ObtainReadLock(lockId);
+                            if (timeout is null)
+                            {
+                                // We just want an ordinary lock.
+                                ObtainReadLock(lockId);
+                            }
+                            else
+                            {
+                                // We want a lock with a custom timeout
+                                ObtainTimoutReadLock(lockId, timeout.Value);
+                            }
                         }
-                        else
+                        catch
                         {
-                            // We just want an ordinary lock.
-                            ObtainTimoutReadLock(lockId, timeout.Value);
+                            // Something went wrong and we didn't get the lock, decrement the count and throw.
+                            DecrementReadLock(lockId, instanceId);
+                            throw;
                         }
-                        // Add the lockId as a key to the dict.
-                        ReadLocks[lockId] = 0;
                     }
-
-                    ReadLocks[lockId] += 1;
+                    else
+                    {
+                        // We already have a lock, but need to update the readlock dictionary for debugging purposes.
+                        IncrementReadLock(lockId, instanceId);
+                    }
                 }
             }
         }
@@ -687,36 +690,43 @@ namespace Umbraco.Core.Scoping
         /// </summary>
         /// <param name="timeout">Optional database timeout in milliseconds.</param>
         /// <param name="lockIds">Array of lock object identifiers.</param>
-        internal void WriteLockInner(TimeSpan? timeout = null, params int[] lockIds)
+        internal void WriteLockInner(Guid instanceId, TimeSpan? timeout = null, params int[] lockIds)
         {
             if (ParentScope != null)
             {
                 // If we have a parent we delegate lock creation to parent.
-                ParentScope.WriteLockInner(timeout, lockIds);
+                ParentScope.WriteLockInner(instanceId, timeout, lockIds);
                 return;
             }
 
-            foreach (var lockId in lockIds)
+            lock (_dictionaryLocker)
             {
-                lock (_dictionaryLocker)
+                foreach (var lockId in lockIds)
                 {
                     // Only acquire lock if we haven't yet (WriteLocks not containing the key)
-                    if (!WriteLocks.ContainsKey(lockId))
+                    if (!HasWriteLock(lockId))
                     {
-                        if (timeout is null)
+                        IncrementWriteLock(lockId, instanceId);
+                        try
                         {
-                            ObtainWriteLock(lockId);
+                            if (timeout is null)
+                            {
+                                ObtainWriteLock(lockId);
+                            }
+                            else
+                            {
+                                ObtainTimeoutWriteLock(lockId, timeout.Value);
+                            }
                         }
-                        else
+                        catch
                         {
-                            ObtainTimeoutWriteLock(lockId, timeout.Value);
+                            DecrementWriteLock(lockId, instanceId);
                         }
-                        // Add the lockId as a key to the dict.
-                        WriteLocks[lockId] = 0;
                     }
-
-                    // Increment count of the lock by 1.
-                    WriteLocks[lockId] += 1;
+                    else
+                    {
+                        DecrementWriteLock(lockId, instanceId);
+                    }
                 }
             }
         }

From 85e6a1149efa3a44c587b4c7dd56f8898cedfad9 Mon Sep 17 00:00:00 2001
From: Justin Shearer <justin.shearer@gmail.com>
Date: Fri, 12 Mar 2021 00:18:32 -0800
Subject: [PATCH 111/202] =?UTF-8?q?[Issue=205277-146]=20accessibility=20-?=
 =?UTF-8?q?=20Close=20'X'=20icon=20next=20to=20language=20drop=E2=80=A6=20?=
 =?UTF-8?q?(#9264)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Issue 5277-146] accessibility - Close 'X' icon next to language drop down is identified as "link" - screen reader

* add new loacalization key
---
 .../src/views/components/editor/umb-editor-content-header.html | 3 ++-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                  | 1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml               | 1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml                  | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 6978672e99..aa2d363c84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -95,7 +95,8 @@
 
         <div ng-if="splitViewOpen">
             <button type="button" class="btn-reset umb-editor-header__close-split-view" ng-click="closeSplitView()">
-                <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
+                <umb-icon icon="icon-delete" class="icon-delete" aria-hidden="true"></umb-icon>
+                <span class="sr-only"><localize key="general_closepane">Close Pane</localize></span>
             </button>
         </div>
 
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 9d6240325d..a0748a7079 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -672,6 +672,7 @@
     <key alias="clear">Clear</key>
     <key alias="close">Close</key>
     <key alias="closewindow">Close Window</key>
+    <key alias="closepane">Close Pane</key>
     <key alias="comment">Comment</key>
     <key alias="confirm">Confirm</key>
     <key alias="constrain">Constrain</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 622806d933..0b92c69dcc 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -680,6 +680,7 @@
     <key alias="clear">Clear</key>
     <key alias="close">Close</key>
     <key alias="closewindow">Close Window</key>
+    <key alias="closepane">Close Pane</key>
     <key alias="comment">Comment</key>
     <key alias="confirm">Confirm</key>
     <key alias="constrain">Constrain</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 596f51d49e..1549ed7c27 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -636,6 +636,7 @@
     <key alias="choose">Choisir</key>
     <key alias="close">Fermer</key>
     <key alias="closewindow">Fermer la fenêtre</key>
+    <key alias="closepane">Fermer le panel</key>
     <key alias="comment">Commenter</key>
     <key alias="confirm">Confirmer</key>
     <key alias="constrain">Conserver</key>

From da5351dfcf23daad69fcd73eb74811456ffc34c0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 12 Mar 2021 09:23:32 +0100
Subject: [PATCH 112/202] =?UTF-8?q?Fix=20issue=20with=20SqlMainDomLock=20t?=
 =?UTF-8?q?hat=20cannot=20use=20implicit=20lock=20timeouts=20=E2=80=A6=20(?=
 =?UTF-8?q?#9973)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Configuration/GlobalSettings.cs           | 40 +++++++++++--------
 src/Umbraco.Core/Runtime/SqlMainDomLock.cs    | 15 ++++---
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index b7dce21285..ba5baf9e87 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -409,26 +409,34 @@ namespace Umbraco.Core.Configuration
             {
                 if (_sqlWriteLockTimeOut != default) return _sqlWriteLockTimeOut;
 
-                var timeOut = 5000; // 5 seconds
-                var appSettingSqlWriteLockTimeOut = ConfigurationManager.AppSettings[Constants.AppSettings.SqlWriteLockTimeOut];
-                if(int.TryParse(appSettingSqlWriteLockTimeOut, out var configuredTimeOut))
-                {
-                    // Only apply this setting if it's not excessively high or low
-                    const int minimumTimeOut = 100;
-                    const int maximumTimeOut = 20000;
-                    if (configuredTimeOut >= minimumTimeOut && configuredTimeOut <= maximumTimeOut) // between 0.1 and 20 seconds
-                    {
-                        timeOut = configuredTimeOut;
-                    }
-                    else
-                    {
-                      Current.Logger.Warn<GlobalSettings>($"The `{Constants.AppSettings.SqlWriteLockTimeOut}` setting in web.config is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms, defaulting back to {timeOut}");
-                    }
-                }
+                var timeOut = GetSqlWriteLockTimeoutFromConfigFile(Current.Logger);
 
                 _sqlWriteLockTimeOut = timeOut;
                 return _sqlWriteLockTimeOut;
             }
         }
+
+        internal static int GetSqlWriteLockTimeoutFromConfigFile(ILogger logger)
+        {
+            var timeOut = 5000; // 5 seconds
+            var appSettingSqlWriteLockTimeOut = ConfigurationManager.AppSettings[Constants.AppSettings.SqlWriteLockTimeOut];
+            if (int.TryParse(appSettingSqlWriteLockTimeOut, out var configuredTimeOut))
+            {
+                // Only apply this setting if it's not excessively high or low
+                const int minimumTimeOut = 100;
+                const int maximumTimeOut = 20000;
+                if (configuredTimeOut >= minimumTimeOut && configuredTimeOut <= maximumTimeOut) // between 0.1 and 20 seconds
+                {
+                    timeOut = configuredTimeOut;
+                }
+                else
+                {
+                    logger.Warn<GlobalSettings>(
+                        $"The `{Constants.AppSettings.SqlWriteLockTimeOut}` setting in web.config is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms, defaulting back to {timeOut}");
+                }
+            }
+
+            return timeOut;
+        }
     }
 }
diff --git a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
index f58b279a8d..6a82486c43 100644
--- a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
@@ -1,5 +1,6 @@
 using NPoco;
 using System;
+using System.Configuration;
 using System.Data;
 using System.Data.SqlClient;
 using System.Diagnostics;
@@ -7,6 +8,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
@@ -18,6 +20,7 @@ namespace Umbraco.Core.Runtime
 {
     internal class SqlMainDomLock : IMainDomLock
     {
+        private readonly TimeSpan _lockTimeout;
         private string _lockId;
         private const string MainDomKeyPrefix = "Umbraco.Core.Runtime.SqlMainDom";
         private const string UpdatedSuffix = "_updated";
@@ -40,6 +43,8 @@ namespace Umbraco.Core.Runtime
                Constants.System.UmbracoConnectionName,
                _logger,
                new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())));
+
+            _lockTimeout = TimeSpan.FromMilliseconds(GlobalSettings.GetSqlWriteLockTimeoutFromConfigFile(logger));
         }
 
         public async Task<bool> AcquireLockAsync(int millisecondsTimeout)
@@ -198,7 +203,7 @@ namespace Umbraco.Core.Runtime
 
                         db.BeginTransaction(IsolationLevel.ReadCommitted);
                         // get a read lock
-                        _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
+                        _sqlServerSyntax.ReadLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                         if (!IsMainDomValue(_lockId, db))
                         {
@@ -284,7 +289,7 @@ namespace Umbraco.Core.Runtime
             {
                 transaction = db.GetTransaction(IsolationLevel.ReadCommitted);
                 // get a read lock
-                _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
+                _sqlServerSyntax.ReadLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                 // the row
                 var mainDomRows = db.Fetch<KeyValueDto>("SELECT * FROM umbracoKeyValue WHERE [key] = @key", new { key = MainDomKey });
@@ -296,7 +301,7 @@ namespace Umbraco.Core.Runtime
                     // which indicates that we
                     // can acquire it and it has shutdown.
 
-                    _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+                    _sqlServerSyntax.WriteLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                     // so now we update the row with our appdomain id
                     InsertLockRecord(_lockId, db);
@@ -355,7 +360,7 @@ namespace Umbraco.Core.Runtime
             {
                 transaction = db.GetTransaction(IsolationLevel.ReadCommitted);
 
-                _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+                _sqlServerSyntax.WriteLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                 // so now we update the row with our appdomain id
                 InsertLockRecord(_lockId, db);
@@ -438,7 +443,7 @@ namespace Umbraco.Core.Runtime
                                 db.BeginTransaction(IsolationLevel.ReadCommitted);
 
                                 // get a write lock
-                                _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+                                _sqlServerSyntax.WriteLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                                 // When we are disposed, it means we have released the MainDom lock
                                 // and called all MainDom release callbacks, in this case

From 83719f3505d80abafcf200797f51b7f78fd2fdbc Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 12 Mar 2021 09:23:32 +0100
Subject: [PATCH 113/202] =?UTF-8?q?Fix=20issue=20with=20SqlMainDomLock=20t?=
 =?UTF-8?q?hat=20cannot=20use=20implicit=20lock=20timeouts=20=E2=80=A6=20(?=
 =?UTF-8?q?#9973)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit da5351dfcf23daad69fcd73eb74811456ffc34c0)
---
 .../Configuration/GlobalSettings.cs           | 40 +++++++++++--------
 src/Umbraco.Core/Runtime/SqlMainDomLock.cs    | 15 ++++---
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index b7dce21285..ba5baf9e87 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -409,26 +409,34 @@ namespace Umbraco.Core.Configuration
             {
                 if (_sqlWriteLockTimeOut != default) return _sqlWriteLockTimeOut;
 
-                var timeOut = 5000; // 5 seconds
-                var appSettingSqlWriteLockTimeOut = ConfigurationManager.AppSettings[Constants.AppSettings.SqlWriteLockTimeOut];
-                if(int.TryParse(appSettingSqlWriteLockTimeOut, out var configuredTimeOut))
-                {
-                    // Only apply this setting if it's not excessively high or low
-                    const int minimumTimeOut = 100;
-                    const int maximumTimeOut = 20000;
-                    if (configuredTimeOut >= minimumTimeOut && configuredTimeOut <= maximumTimeOut) // between 0.1 and 20 seconds
-                    {
-                        timeOut = configuredTimeOut;
-                    }
-                    else
-                    {
-                      Current.Logger.Warn<GlobalSettings>($"The `{Constants.AppSettings.SqlWriteLockTimeOut}` setting in web.config is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms, defaulting back to {timeOut}");
-                    }
-                }
+                var timeOut = GetSqlWriteLockTimeoutFromConfigFile(Current.Logger);
 
                 _sqlWriteLockTimeOut = timeOut;
                 return _sqlWriteLockTimeOut;
             }
         }
+
+        internal static int GetSqlWriteLockTimeoutFromConfigFile(ILogger logger)
+        {
+            var timeOut = 5000; // 5 seconds
+            var appSettingSqlWriteLockTimeOut = ConfigurationManager.AppSettings[Constants.AppSettings.SqlWriteLockTimeOut];
+            if (int.TryParse(appSettingSqlWriteLockTimeOut, out var configuredTimeOut))
+            {
+                // Only apply this setting if it's not excessively high or low
+                const int minimumTimeOut = 100;
+                const int maximumTimeOut = 20000;
+                if (configuredTimeOut >= minimumTimeOut && configuredTimeOut <= maximumTimeOut) // between 0.1 and 20 seconds
+                {
+                    timeOut = configuredTimeOut;
+                }
+                else
+                {
+                    logger.Warn<GlobalSettings>(
+                        $"The `{Constants.AppSettings.SqlWriteLockTimeOut}` setting in web.config is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms, defaulting back to {timeOut}");
+                }
+            }
+
+            return timeOut;
+        }
     }
 }
diff --git a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
index f58b279a8d..6a82486c43 100644
--- a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
@@ -1,5 +1,6 @@
 using NPoco;
 using System;
+using System.Configuration;
 using System.Data;
 using System.Data.SqlClient;
 using System.Diagnostics;
@@ -7,6 +8,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
@@ -18,6 +20,7 @@ namespace Umbraco.Core.Runtime
 {
     internal class SqlMainDomLock : IMainDomLock
     {
+        private readonly TimeSpan _lockTimeout;
         private string _lockId;
         private const string MainDomKeyPrefix = "Umbraco.Core.Runtime.SqlMainDom";
         private const string UpdatedSuffix = "_updated";
@@ -40,6 +43,8 @@ namespace Umbraco.Core.Runtime
                Constants.System.UmbracoConnectionName,
                _logger,
                new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())));
+
+            _lockTimeout = TimeSpan.FromMilliseconds(GlobalSettings.GetSqlWriteLockTimeoutFromConfigFile(logger));
         }
 
         public async Task<bool> AcquireLockAsync(int millisecondsTimeout)
@@ -198,7 +203,7 @@ namespace Umbraco.Core.Runtime
 
                         db.BeginTransaction(IsolationLevel.ReadCommitted);
                         // get a read lock
-                        _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
+                        _sqlServerSyntax.ReadLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                         if (!IsMainDomValue(_lockId, db))
                         {
@@ -284,7 +289,7 @@ namespace Umbraco.Core.Runtime
             {
                 transaction = db.GetTransaction(IsolationLevel.ReadCommitted);
                 // get a read lock
-                _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
+                _sqlServerSyntax.ReadLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                 // the row
                 var mainDomRows = db.Fetch<KeyValueDto>("SELECT * FROM umbracoKeyValue WHERE [key] = @key", new { key = MainDomKey });
@@ -296,7 +301,7 @@ namespace Umbraco.Core.Runtime
                     // which indicates that we
                     // can acquire it and it has shutdown.
 
-                    _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+                    _sqlServerSyntax.WriteLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                     // so now we update the row with our appdomain id
                     InsertLockRecord(_lockId, db);
@@ -355,7 +360,7 @@ namespace Umbraco.Core.Runtime
             {
                 transaction = db.GetTransaction(IsolationLevel.ReadCommitted);
 
-                _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+                _sqlServerSyntax.WriteLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                 // so now we update the row with our appdomain id
                 InsertLockRecord(_lockId, db);
@@ -438,7 +443,7 @@ namespace Umbraco.Core.Runtime
                                 db.BeginTransaction(IsolationLevel.ReadCommitted);
 
                                 // get a write lock
-                                _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+                                _sqlServerSyntax.WriteLock(db, _lockTimeout, Constants.Locks.MainDom);
 
                                 // When we are disposed, it means we have released the MainDom lock
                                 // and called all MainDom release callbacks, in this case

From 5c7e4f8ddebedac951ca68f27156be0eae8852bb Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 12 Mar 2021 13:10:17 +0100
Subject: [PATCH 114/202] Adjust unit tests and apply fixes to scope

---
 src/Umbraco.Core/Scoping/Scope.cs           |  45 ++++++-
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs | 134 ++++++++++++--------
 2 files changed, 122 insertions(+), 57 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 91a229ef79..d9846779eb 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -519,7 +519,26 @@ namespace Umbraco.Core.Scoping
         {
             if (ParentScope is null)
             {
-                WriteLocks[instanceId][lockId]++;
+                // Try and get the dict associated with the scope id.
+                var locksDictFound = WriteLocks.TryGetValue(instanceId, out var locksDict);
+                if (locksDictFound)
+                {
+                    var lockFound = locksDict.TryGetValue(lockId, out var value);
+                    if (lockFound)
+                    {
+                        WriteLocks[instanceId][lockId] = value+1;
+                    }
+                    else
+                    {
+                        WriteLocks[instanceId][lockId] = 1;
+                    }
+                }
+                else
+                {
+                    // The scope hasn't requested a lock yet, so we have to create a dict for it.
+                    WriteLocks[instanceId] = new Dictionary<int, int>();
+                    WriteLocks[instanceId][lockId] = 1;
+                }
             }
             else
             {
@@ -543,7 +562,25 @@ namespace Umbraco.Core.Scoping
         {
             if (ParentScope is null)
             {
-                ReadLocks[instanceId][lockId]++;
+                var locksDictFound = ReadLocks.TryGetValue(instanceId, out var locksDict);
+                if (locksDictFound)
+                {
+                    var lockFound = locksDict.TryGetValue(lockId, out var value);
+                    if (lockFound)
+                    {
+                        ReadLocks[instanceId][lockId] = value + 1;
+                    }
+                    else
+                    {
+                        ReadLocks[instanceId][lockId] = 1;
+                    }
+                }
+                else
+                {
+                    // The scope hasn't requested a lock yet, so we have to create a dict for it.
+                    ReadLocks[instanceId] = new Dictionary<int, int>();
+                    ReadLocks[instanceId][lockId] = 1;
+                }
             }
             else
             {
@@ -721,11 +758,13 @@ namespace Umbraco.Core.Scoping
                         catch
                         {
                             DecrementWriteLock(lockId, instanceId);
+                            throw;
                         }
                     }
                     else
                     {
-                        DecrementWriteLock(lockId, instanceId);
+                        // We already have a lock, so just increment the count for debugging purposes
+                        IncrementWriteLock(lockId, instanceId);
                     }
                 }
             }
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index 32bd7e2afe..c222769abb 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -180,27 +180,30 @@ namespace Umbraco.Tests.Scoping
         public void WriteLocks_Count_correctly_If_Lock_Requested_Twice_In_Scope()
         {
             var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+            Guid innerscopeId;
 
             using (var outerscope = scopeProvider.CreateScope())
             {
                 var realOuterScope = (Scope) outerscope;
                 outerscope.WriteLock(Constants.Locks.ContentTree);
                 outerscope.WriteLock(Constants.Locks.ContentTree);
-                Assert.AreEqual(2, realOuterScope.WriteLocks[Constants.Locks.ContentTree]);
+                Assert.AreEqual(2, realOuterScope.WriteLocks[outerscope.InstanceId][Constants.Locks.ContentTree]);
 
                 using (var innerScope = scopeProvider.CreateScope())
                 {
+                    innerscopeId = innerScope.InstanceId;
                     innerScope.WriteLock(Constants.Locks.ContentTree);
                     innerScope.WriteLock(Constants.Locks.ContentTree);
-                    Assert.AreEqual(4, realOuterScope.WriteLocks[Constants.Locks.ContentTree]);
+                    Assert.AreEqual(2, realOuterScope.WriteLocks[outerscope.InstanceId][Constants.Locks.ContentTree]);
+                    Assert.AreEqual(2, realOuterScope.WriteLocks[innerscopeId][Constants.Locks.ContentTree]);
 
                     innerScope.WriteLock(Constants.Locks.Languages);
                     innerScope.WriteLock(Constants.Locks.Languages);
-                    Assert.AreEqual(2, realOuterScope.WriteLocks[Constants.Locks.Languages]);
+                    Assert.AreEqual(2, realOuterScope.WriteLocks[innerScope.InstanceId][Constants.Locks.Languages]);
                     innerScope.Complete();
                 }
-                Assert.AreEqual(0, realOuterScope.WriteLocks[Constants.Locks.Languages]);
-                Assert.AreEqual(2, realOuterScope.WriteLocks[Constants.Locks.ContentTree]);
+                Assert.IsFalse(realOuterScope.WriteLocks.ContainsKey(innerscopeId));
+                Assert.AreEqual(2, realOuterScope.WriteLocks[realOuterScope.InstanceId][Constants.Locks.ContentTree]);
                 outerscope.Complete();
             }
         }
@@ -209,27 +212,30 @@ namespace Umbraco.Tests.Scoping
         public void ReadLocks_Count_correctly_If_Lock_Requested_Twice_In_Scope()
         {
             var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+            Guid innerscopeId;
 
             using (var outerscope = scopeProvider.CreateScope())
             {
                 var realOuterScope = (Scope) outerscope;
                 outerscope.ReadLock(Constants.Locks.ContentTree);
                 outerscope.ReadLock(Constants.Locks.ContentTree);
-                Assert.AreEqual(2, realOuterScope.ReadLocks[Constants.Locks.ContentTree]);
+                Assert.AreEqual(2, realOuterScope.ReadLocks[outerscope.InstanceId][Constants.Locks.ContentTree]);
 
                 using (var innerScope = scopeProvider.CreateScope())
                 {
+                    innerscopeId = innerScope.InstanceId;
                     innerScope.ReadLock(Constants.Locks.ContentTree);
                     innerScope.ReadLock(Constants.Locks.ContentTree);
-                    Assert.AreEqual(4, realOuterScope.ReadLocks[Constants.Locks.ContentTree]);
+                    Assert.AreEqual(2, realOuterScope.ReadLocks[outerscope.InstanceId][Constants.Locks.ContentTree]);
+                    Assert.AreEqual(2, realOuterScope.ReadLocks[innerScope.InstanceId][Constants.Locks.ContentTree]);
 
                     innerScope.ReadLock(Constants.Locks.Languages);
                     innerScope.ReadLock(Constants.Locks.Languages);
-                    Assert.AreEqual(2, realOuterScope.ReadLocks[Constants.Locks.Languages]);
+                    Assert.AreEqual(2, realOuterScope.ReadLocks[innerScope.InstanceId][Constants.Locks.Languages]);
                     innerScope.Complete();
                 }
-                Assert.AreEqual(0, realOuterScope.ReadLocks[Constants.Locks.Languages]);
-                Assert.AreEqual(2, realOuterScope.ReadLocks[Constants.Locks.ContentTree]);
+                Assert.IsFalse(realOuterScope.ReadLocks.ContainsKey(innerscopeId));
+                Assert.AreEqual(2, realOuterScope.ReadLocks[outerscope.InstanceId][Constants.Locks.ContentTree]);
                 outerscope.Complete();
             }
         }
@@ -238,51 +244,60 @@ namespace Umbraco.Tests.Scoping
         public void Nested_Scopes_WriteLocks_Count_Correctly()
         {
             var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+            Guid innerScope1Id, innerScope2Id;
 
-            using (var outerScope = scopeProvider.CreateScope())
+            using (var parentScope = scopeProvider.CreateScope())
             {
-                var parentScope = (Scope) outerScope;
-                outerScope.WriteLock(Constants.Locks.ContentTree);
-                outerScope.WriteLock(Constants.Locks.ContentTypes);
+                var realParentScope = (Scope) parentScope;
+                parentScope.WriteLock(Constants.Locks.ContentTree);
+                parentScope.WriteLock(Constants.Locks.ContentTypes);
 
-                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
 
                 using (var innerScope1 = scopeProvider.CreateScope())
                 {
+                    innerScope1Id = innerScope1.InstanceId;
                     innerScope1.WriteLock(Constants.Locks.ContentTree);
                     innerScope1.WriteLock(Constants.Locks.ContentTypes);
                     innerScope1.WriteLock(Constants.Locks.Languages);
 
-                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope1 after locks acquired: {nameof(Constants.Locks.Languages)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope1, parent instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, parent instance, after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.Languages], $"innerScope1, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.Languages)}");
 
                     using (var innerScope2 = scopeProvider.CreateScope())
                     {
+                        innerScope2Id = innerScope2.InstanceId;
                         innerScope2.WriteLock(Constants.Locks.ContentTree);
                         innerScope2.WriteLock(Constants.Locks.MediaTypes);
 
-                        Assert.AreEqual(3, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                        Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-                        Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope2 after locks acquired: {nameof(Constants.Locks.Languages)}");
-                        Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
+                        Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope2, parent instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope2, parent instance, after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                        Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope2, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope2, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                        Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.Languages], $"innerScope2, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.Languages)}");
+                        Assert.AreEqual(1, realParentScope.WriteLocks[innerScope2.InstanceId][Constants.Locks.ContentTree], $"innerScope2, innerScope2 instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(1, realParentScope.WriteLocks[innerScope2.InstanceId][Constants.Locks.MediaTypes], $"innerScope2, innerScope2 instance, after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
 
                         innerScope2.Complete();
                     }
-                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTree], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(2, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.Languages], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.MediaTypes)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope2, parent instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope2, parent instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope2, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope2, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.Languages], $"innerScope2, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.Languages)}");
+                    Assert.IsFalse(realParentScope.WriteLocks.ContainsKey(innerScope2Id));
 
                     innerScope1.Complete();
                 }
-                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, parentScope.WriteLocks[Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
-                Assert.AreEqual(0, parentScope.WriteLocks[Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
+                Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed {nameof(Constants.Locks.ContentTypes)}");
+                Assert.IsFalse(realParentScope.WriteLocks.ContainsKey(innerScope1Id));
 
-                outerScope.Complete();
+                parentScope.Complete();
             }
         }
 
@@ -290,48 +305,59 @@ namespace Umbraco.Tests.Scoping
         public void Nested_Scopes_ReadLocks_Count_Correctly()
         {
             var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+            Guid innerScope1Id, innerScope2Id;
 
-            using (var outerScope = scopeProvider.CreateScope())
+            using (var parentScope = scopeProvider.CreateScope())
             {
-                var parentScope = (Scope) outerScope;
-                outerScope.ReadLock(Constants.Locks.ContentTree);
-                outerScope.ReadLock(Constants.Locks.ContentTypes);
-                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                var realParentScope = (Scope) parentScope;
+                parentScope.ReadLock(Constants.Locks.ContentTree);
+                parentScope.ReadLock(Constants.Locks.ContentTypes);
+                Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
 
                 using (var innserScope1 = scopeProvider.CreateScope())
                 {
+                    innerScope1Id = innserScope1.InstanceId;
                     innserScope1.ReadLock(Constants.Locks.ContentTree);
                     innserScope1.ReadLock(Constants.Locks.ContentTypes);
                     innserScope1.ReadLock(Constants.Locks.Languages);
-                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope1 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope1 after locks acquired: {nameof(Constants.Locks.Languages)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope1, parent instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, parent instance, after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.Languages], $"innerScope1, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.Languages)}");
 
                     using (var innerScope2 = scopeProvider.CreateScope())
                     {
+                        innerScope2Id = innerScope2.InstanceId;
                         innerScope2.ReadLock(Constants.Locks.ContentTree);
                         innerScope2.ReadLock(Constants.Locks.MediaTypes);
-                        Assert.AreEqual(3, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTree)}");
-                        Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
-                        Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope2 after locks acquired: {nameof(Constants.Locks.Languages)}");
-                        Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"childScope2 after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
+                        Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope2, parent instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope2, parent instance, after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                        Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope2, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope2, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.ContentTypes)}");
+                        Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.Languages], $"innerScope2, innerScope1 instance, after locks acquired: {nameof(Constants.Locks.Languages)}");
+                        Assert.AreEqual(1, realParentScope.ReadLocks[innerScope2.InstanceId][Constants.Locks.ContentTree], $"innerScope2, innerScope2 instance, after locks acquired: {nameof(Constants.Locks.ContentTree)}");
+                        Assert.AreEqual(1, realParentScope.ReadLocks[innerScope2.InstanceId][Constants.Locks.MediaTypes], $"innerScope2, innerScope2 instance, after locks acquired: {nameof(Constants.Locks.MediaTypes)}");
 
                         innerScope2.Complete();
                     }
-                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTree], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(2, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.Languages], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"childScope1 after inner scope disposed: {nameof(Constants.Locks.MediaTypes)}");
+
+                    Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope1, parent instance, after innerScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, parent instance, after innerScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.Languages], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.Languages)}");
+                    Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope2Id));
 
                     innserScope1.Complete();
                 }
-                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, parentScope.ReadLocks[Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
-                Assert.AreEqual(0, parentScope.ReadLocks[Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
 
-                outerScope.Complete();
+                Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after innerScope1 disposed: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after innerScope1 disposed: {nameof(Constants.Locks.ContentTypes)}");
+                Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope1Id));
+
+                parentScope.Complete();
             }
         }
     }

From ea816e8110f1c20a7e910774ba688683780e9ed7 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 12 Mar 2021 13:30:25 +0100
Subject: [PATCH 115/202] Add more unit tests, showing current issue

---
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs | 82 +++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index c222769abb..3e5ff127a3 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -72,6 +72,31 @@ namespace Umbraco.Tests.Scoping
             syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
         }
 
+        [Test]
+        public void WriteLock_Acquired_Only_Once_When_InnerScope_Disposed()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var outerScope = scopeProvider.CreateScope())
+            {
+                outerScope.WriteLock(Constants.Locks.Languages);
+
+                using (var innerScope = scopeProvider.CreateScope())
+                {
+                    innerScope.WriteLock(Constants.Locks.Languages);
+                    innerScope.WriteLock(Constants.Locks.ContentTree);
+                    innerScope.Complete();
+                }
+
+                outerScope.WriteLock(Constants.Locks.ContentTree);
+                outerScope.Complete();
+            }
+
+            // Since we request the ReadLock after the innerScope has been dispose, the key has been removed from the dictionary, and we fetch it again.
+            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
+            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.ContentTree), Times.Once);
+        }
+
         [Test]
         public void WriteLock_With_Timeout_Acquired_Only_Once_Per_Key(){
             var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
@@ -176,6 +201,31 @@ namespace Umbraco.Tests.Scoping
             syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), timeOut, Constants.Locks.Languages), Times.Once);
         }
 
+        [Test]
+        public void ReadLock_Acquired_Only_Once_When_InnerScope_Disposed()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var outerScope = scopeProvider.CreateScope())
+            {
+                outerScope.ReadLock(Constants.Locks.Languages);
+
+                using (var innerScope = scopeProvider.CreateScope())
+                {
+                    innerScope.ReadLock(Constants.Locks.Languages);
+                    innerScope.ReadLock(Constants.Locks.ContentTree);
+                    innerScope.Complete();
+                }
+
+                outerScope.ReadLock(Constants.Locks.ContentTree);
+                outerScope.Complete();
+            }
+
+            // Since we request the ReadLock after the innerScope has been dispose, the key has been removed from the dictionary, and we fetch it again.
+            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
+            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.ContentTree), Times.Once);
+        }
+
         [Test]
         public void WriteLocks_Count_correctly_If_Lock_Requested_Twice_In_Scope()
         {
@@ -360,5 +410,37 @@ namespace Umbraco.Tests.Scoping
                 parentScope.Complete();
             }
         }
+
+        [Test]
+        public void WriteLock_Doesnt_Increment_On_Error()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+            syntaxProviderMock.Setup(x => x.WriteLock(It.IsAny<IDatabase>(), It.IsAny<int[]>())).Throws(new Exception("Boom"));
+
+            using (var scope = scopeProvider.CreateScope())
+            {
+                var realScope = (Scope) scope;
+
+                Assert.Throws<Exception>(() => scope.WriteLock(Constants.Locks.Languages));
+                Assert.AreEqual(0, realScope.WriteLocks[scope.InstanceId][Constants.Locks.Languages]);
+                scope.Complete();
+            }
+        }
+
+        [Test]
+        public void ReadLock_Doesnt_Increment_On_Error()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+            syntaxProviderMock.Setup(x => x.ReadLock(It.IsAny<IDatabase>(), It.IsAny<int[]>())).Throws(new Exception("Boom"));
+
+            using (var scope = scopeProvider.CreateScope())
+            {
+                var realScope = (Scope) scope;
+
+                Assert.Throws<Exception>(() => scope.ReadLock(Constants.Locks.Languages));
+                Assert.AreEqual(0, realScope.ReadLocks[scope.InstanceId][Constants.Locks.Languages]);
+                scope.Complete();
+            }
+        }
     }
 }

From 5ee0f310c9184c819ba0e3c095784ab9c93c3631 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Fri, 16 Oct 2020 16:06:10 +0100
Subject: [PATCH 116/202] Counting Umbraco.ModelsBuilder and
 ModelsBuilder.Umbraco namespaces as external providers

---
 .../Compose/ModelsBuilderComposer.cs          | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index 45c4de5d2a..01010cca66 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Reflection;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -20,14 +21,11 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
     {
         public void Compose(Composition composition)
         {
-            var isLegacyModelsBuilderInstalled = IsLegacyModelsBuilderInstalled();
-
-
             composition.Configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig());
 
-            if (isLegacyModelsBuilderInstalled)
+            if (IsExternalModelsBuilderInstalled() == true)
             {
-                ComposeForLegacyModelsBuilder(composition);
+                ComposeForExternalModelsBuilder(composition);
                 return;
             }
 
@@ -45,22 +43,35 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
                 ComposeForDefaultModelsFactory(composition);
         }
 
-        private static bool IsLegacyModelsBuilderInstalled()
+        private static bool IsExternalModelsBuilderInstalled()
         {
-            Assembly legacyMbAssembly = null;
+            var assemblyNames = new[]
+            {
+                "Umbraco.ModelsBuider",
+                "ModelsBuilder.Umbraco"
+            };
+
             try
             {
-                legacyMbAssembly = Assembly.Load("Umbraco.ModelsBuilder");
+                foreach (var name in assemblyNames)
+                {
+                    var assembly = Assembly.Load(name);
+
+                    if (assembly != null)
+                    {
+                        return true;
+                    }
+                }
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 //swallow exception, DLL must not be there
             }
 
-            return legacyMbAssembly != null;
+            return false;
         }
 
-        private void ComposeForLegacyModelsBuilder(Composition composition)
+        private void ComposeForExternalModelsBuilder(Composition composition)
         {
             composition.Logger.Info<ModelsBuilderComposer>("ModelsBuilder.Embedded is disabled, the external ModelsBuilder was detected.");
             composition.Components().Append<DisabledModelsBuilderComponent>();

From b7c1ad22981840f71fbc2516db4038d94a940ef3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 10 Mar 2021 15:05:57 +1100
Subject: [PATCH 117/202] Fix dead lock with TypeLoader

---
 src/Umbraco.Core/Composing/TypeLoader.cs | 117 ++++++++++++++++-------
 1 file changed, 82 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
index f5c75ff607..bee6436cd6 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Core/Composing/TypeLoader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -45,7 +45,7 @@ namespace Umbraco.Core.Composing
         private IEnumerable<Assembly> _assemblies;
         private bool _reportedChange;
         private readonly string _localTempPath;
-        private string _fileBasePath;
+        private readonly Lazy<string> _fileBasePath;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TypeLoader"/> class.
@@ -70,6 +70,8 @@ namespace Umbraco.Core.Composing
             _localTempPath = localTempPath;
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
+            _fileBasePath = new Lazy<string>(GetFileBasePath);
+
             if (detectChanges)
             {
                 //first check if the cached hash is string.Empty, if it is then we need
@@ -160,7 +162,8 @@ namespace Umbraco.Core.Composing
                     return _cachedAssembliesHash;
 
                 var typesHashFilePath = GetTypesHashFilePath();
-                if (!File.Exists(typesHashFilePath)) return string.Empty;
+                if (!File.Exists(typesHashFilePath))
+                    return string.Empty;
 
                 var hash = File.ReadAllText(typesHashFilePath, Encoding.UTF8);
 
@@ -339,7 +342,9 @@ namespace Umbraco.Core.Composing
 
             var typesListFilePath = GetTypesListFilePath();
             if (File.Exists(typesListFilePath) == false)
+            {
                 return cache;
+            }
 
             using (var stream = GetFileStream(typesListFilePath, FileMode.Open, FileAccess.Read, FileShare.Read, ListFileOpenReadTimeout))
             using (var reader = new StreamReader(stream))
@@ -347,11 +352,21 @@ namespace Umbraco.Core.Composing
                 while (true)
                 {
                     var baseType = reader.ReadLine();
-                    if (baseType == null) return cache; // exit
-                    if (baseType.StartsWith("<")) break; // old xml
+                    if (baseType == null)
+                    {
+                        return cache; // exit
+                    }
+
+                    if (baseType.StartsWith("<"))
+                    {
+                        break; // old xml
+                    }
 
                     var attributeType = reader.ReadLine();
-                    if (attributeType == null) break;
+                    if (attributeType == null)
+                    {
+                        break;
+                    }
 
                     var types = new List<string>();
                     while (true)
@@ -370,7 +385,10 @@ namespace Umbraco.Core.Composing
                         types.Add(type);
                     }
 
-                    if (types == null) break;
+                    if (types == null)
+                    {
+                        break;
+                    }
                 }
             }
 
@@ -379,28 +397,31 @@ namespace Umbraco.Core.Composing
         }
 
         // internal for tests
-        internal string GetTypesListFilePath() => GetFileBasePath() + ".list";
+        internal string GetTypesListFilePath() => _fileBasePath.Value + ".list";
 
-        private string GetTypesHashFilePath() => GetFileBasePath() + ".hash";
+        private string GetTypesHashFilePath() => _fileBasePath.Value + ".hash";
 
+        /// <summary>
+        /// Used to produce the Lazy value of _fileBasePath
+        /// </summary>
+        /// <returns></returns>
         private string GetFileBasePath()
         {
-            lock (_locko)
+            var fileBasePath = Path.Combine(_localTempPath, "TypesCache", "umbraco-types." + NetworkHelper.FileSafeMachineName);
+
+            // ensure that the folder exists
+            var directory = Path.GetDirectoryName(fileBasePath);
+            if (directory == null)
             {
-                if (_fileBasePath != null)
-                    return _fileBasePath;
-
-                _fileBasePath = Path.Combine(_localTempPath, "TypesCache", "umbraco-types." + NetworkHelper.FileSafeMachineName);
-
-                // ensure that the folder exists
-                var directory = Path.GetDirectoryName(_fileBasePath);
-                if (directory == null)
-                    throw new InvalidOperationException($"Could not determine folder for path \"{_fileBasePath}\".");
-                if (Directory.Exists(directory) == false)
-                    Directory.CreateDirectory(directory);
-
-                return _fileBasePath;
+                throw new InvalidOperationException($"Could not determine folder for path \"{fileBasePath}\".");
             }
+
+            if (Directory.Exists(directory) == false)
+            {
+                Directory.CreateDirectory(directory);
+            }
+
+            return fileBasePath;
         }
 
         // internal for tests
@@ -416,7 +437,10 @@ namespace Umbraco.Core.Composing
                     writer.WriteLine(typeList.BaseType == null ? string.Empty : typeList.BaseType.FullName);
                     writer.WriteLine(typeList.AttributeType == null ? string.Empty : typeList.AttributeType.FullName);
                     foreach (var type in typeList.Types)
+                    {
                         writer.WriteLine(type.AssemblyQualifiedName);
+                    }
+
                     writer.WriteLine();
                 }
             }
@@ -434,16 +458,22 @@ namespace Umbraco.Core.Composing
                         WriteCache();
                     }
                     catch { /* bah - just don't die */ }
-                    if (!_timing) _timer = null;
+                    if (!_timing)
+                        _timer = null;
                 }
             }
 
             lock (_timerLock)
             {
                 if (_timer == null)
+                {
                     _timer = new Timer(TimerRelease, null, ListFileWriteThrottle, Timeout.Infinite);
+                }
                 else
+                {
                     _timer.Change(ListFileWriteThrottle, Timeout.Infinite);
+                }
+
                 _timing = true;
             }
         }
@@ -476,7 +506,9 @@ namespace Umbraco.Core.Composing
                 catch
                 {
                     if (--attempts == 0)
+                    {
                         throw;
+                    }
 
                     _logger.Debug<TypeLoader,string,int,int>("Attempted to get filestream for file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
                     Thread.Sleep(pauseMilliseconds);
@@ -543,7 +575,8 @@ namespace Umbraco.Core.Composing
         /// <exception cref="ArgumentNullException">attributeTypes</exception>
         public IEnumerable<Attribute> GetAssemblyAttributes(params Type[] attributeTypes)
         {
-            if (attributeTypes == null) throw new ArgumentNullException(nameof(attributeTypes));
+            if (attributeTypes == null)
+                throw new ArgumentNullException(nameof(attributeTypes));
 
             return AssembliesToScan.SelectMany(a => attributeTypes.SelectMany(at => a.GetCustomAttributes(at))).ToList();
         }
@@ -563,7 +596,9 @@ namespace Umbraco.Core.Composing
         public IEnumerable<Type> GetTypes<T>(bool cache = true, IEnumerable<Assembly> specificAssemblies = null)
         {
             if (_logger == null)
+            {
                 throw new InvalidOperationException("Cannot get types from a test/blank type loader.");
+            }
 
             // do not cache anything from specific assemblies
             cache &= specificAssemblies == null;
@@ -583,7 +618,7 @@ namespace Umbraco.Core.Composing
 
             // get IDiscoverable and always cache
             var discovered = GetTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                 "scanning assemblies",
                 true);
@@ -594,9 +629,9 @@ namespace Umbraco.Core.Composing
 
             // filter the cached discovered types (and maybe cache the result)
             return GetTypesInternal(
-                typeof (T), null,
+                typeof(T), null,
                 () => discovered
-                    .Where(x => typeof (T).IsAssignableFrom(x)),
+                    .Where(x => typeof(T).IsAssignableFrom(x)),
                 "filtering IDiscoverable",
                 cache);
         }
@@ -614,7 +649,9 @@ namespace Umbraco.Core.Composing
             where TAttribute : Attribute
         {
             if (_logger == null)
+            {
                 throw new InvalidOperationException("Cannot get types from a test/blank type loader.");
+            }
 
             // do not cache anything from specific assemblies
             cache &= specificAssemblies == null;
@@ -633,7 +670,7 @@ namespace Umbraco.Core.Composing
 
             // get IDiscoverable and always cache
             var discovered = GetTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                 "scanning assemblies",
                 true);
@@ -644,7 +681,7 @@ namespace Umbraco.Core.Composing
 
             // filter the cached discovered types (and maybe cache the result)
             return GetTypesInternal(
-                typeof (T), typeof (TAttribute),
+                typeof(T), typeof(TAttribute),
                 () => discovered
                     .Where(x => typeof(T).IsAssignableFrom(x))
                     .Where(x => x.GetCustomAttributes<TAttribute>(false).Any()),
@@ -664,7 +701,9 @@ namespace Umbraco.Core.Composing
             where TAttribute : Attribute
         {
             if (_logger == null)
+            {
                 throw new InvalidOperationException("Cannot get types from a test/blank type loader.");
+            }
 
             // do not cache anything from specific assemblies
             cache &= specificAssemblies == null;
@@ -673,7 +712,7 @@ namespace Umbraco.Core.Composing
                 _logger.Debug<TypeLoader, string>("Running a full, non-cached, scan for types / attribute {AttributeName} (slow).", typeof(TAttribute).FullName);
 
             return GetTypesInternal(
-                typeof (object), typeof (TAttribute),
+                typeof(object), typeof(TAttribute),
                 () => TypeFinder.FindClassesWithAttribute<TAttribute>(specificAssemblies ?? AssembliesToScan),
                 "scanning assemblies",
                 cache);
@@ -693,12 +732,14 @@ namespace Umbraco.Core.Composing
             var name = GetName(baseType, attributeType);
 
             lock (_locko)
-            using (_logger.DebugDuration<TypeLoader>(
+            {
+                using (_logger.DebugDuration<TypeLoader>(
                 "Getting " + name,
                 "Got " + name)) // cannot contain typesFound.Count as it's evaluated before the find
-            {
-                // get within a lock & timer
-                return GetTypesInternalLocked(baseType, attributeType, finder, action, cache);
+                {
+                    // get within a lock & timer
+                    return GetTypesInternalLocked(baseType, attributeType, finder, action, cache);
+                }
             }
         }
 
@@ -720,7 +761,9 @@ namespace Umbraco.Core.Composing
             var listKey = new CompositeTypeTypeKey(baseType ?? tobject, attributeType ?? tobject);
             TypeList typeList = null;
             if (cache)
+            {
                 _types.TryGetValue(listKey, out typeList); // else null
+            }
 
             // if caching and found, return
             if (typeList != null)
@@ -795,7 +838,9 @@ namespace Umbraco.Core.Composing
                 _logger.Debug<TypeLoader, string>("Getting {TypeName}: " + action + ".", GetName(baseType, attributeType));
 
                 foreach (var t in finder())
+                {
                     typeList.Add(t);
+                }
             }
 
             // if we are to cache the results, do so
@@ -807,7 +852,9 @@ namespace Umbraco.Core.Composing
                     _types[listKey] = typeList;
                     //if we are scanning then update the cache file
                     if (scan)
+                    {
                         UpdateCache();
+                    }
                 }
 
                 _logger.Debug<TypeLoader, string, string>("Got {TypeName}, caching ({CacheType}).", GetName(baseType, attributeType), added.ToString().ToLowerInvariant());

From cee33e863ef29fc81c69bf18f9e75421beac87d3 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Mon, 15 Mar 2021 08:38:23 +0100
Subject: [PATCH 118/202] Fix errors shown in unit tests

---
 src/Umbraco.Core/Scoping/Scope.cs           | 87 ++++++++++-----------
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs | 44 +++++++----
 2 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index d9846779eb..3cff2da020 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -362,20 +362,18 @@ namespace Umbraco.Core.Scoping
             }
 
             // Decrement the lock counters on the parent if any.
-            lock (_dictionaryLocker)
-            {
-                ClearReadLocks(InstanceId);
-                ClearWriteLocks(InstanceId);
-
-                if (ParentScope is null)
-                {
-                    // We're the parent scope, make sure that locks of all scopes has been cleared
-                    if (ReadLocks.Count != 0 || WriteLocks.Count != 0)
-                    {
-                        throw new Exception($"All scopes has not been disposed from parent scope {InstanceId}");
-                    }
-                }
-            }
+            // Lock on parent
+            ClearReadLocks(InstanceId);
+            ClearWriteLocks(InstanceId);
+            // if (ParentScope is null)
+            // {
+            //     // We're the parent scope, make sure that locks of all scopes has been cleared
+            //     // Since we're only reading we don't have to be in a lock
+            //     if (ReadLocks.Count != 0 || WriteLocks.Count != 0)
+            //     {
+            //         throw new Exception($"All scopes has not been disposed from parent scope {InstanceId}");
+            //     }
+            // }
 
             var parent = ParentScope;
             _scopeProvider.AmbientScope = parent; // might be null = this is how scopes are removed from context objects
@@ -546,18 +544,6 @@ namespace Umbraco.Core.Scoping
             }
         }
 
-        private void DecrementWriteLock(int lockId, Guid instanceId)
-        {
-            if (ParentScope is null)
-            {
-                WriteLocks[instanceId][lockId]--;
-            }
-            else
-            {
-                ParentScope.DecrementWriteLock(lockId, instanceId);
-            }
-        }
-
         private void IncrementReadLock(int lockId, Guid instanceId)
         {
             if (ParentScope is null)
@@ -588,18 +574,6 @@ namespace Umbraco.Core.Scoping
             }
         }
 
-        private void DecrementReadLock(int lockId, Guid instanceId)
-        {
-            if (ParentScope is null)
-            {
-                ReadLocks[instanceId][lockId]--;
-            }
-            else
-            {
-                ParentScope.DecrementReadLock(lockId, instanceId);
-            }
-        }
-
         private void ClearReadLocks(Guid instanceId)
         {
             if (ParentScope != null)
@@ -608,7 +582,17 @@ namespace Umbraco.Core.Scoping
             }
             else
             {
-                ReadLocks.Remove(instanceId);
+                lock (_dictionaryLocker)
+                {
+                    // Rest all values to 0 since the scope has been disposed
+                    if (ReadLocks.ContainsKey(instanceId))
+                    {
+                        foreach (var key in ReadLocks[instanceId].Keys.ToList())
+                        {
+                            ReadLocks[instanceId][key] = 0;
+                        }
+                    }
+                }
             }
         }
 
@@ -620,7 +604,17 @@ namespace Umbraco.Core.Scoping
             }
             else
             {
-                WriteLocks.Remove(instanceID);
+                lock (_dictionaryLocker)
+                {
+                    if (WriteLocks.ContainsKey(instanceID))
+                    {
+                        foreach (var key in WriteLocks[instanceID].Keys.ToList())
+                        {
+                            WriteLocks[instanceID][key] = 0;
+                        }
+                    }
+                }
+
             }
         }
 
@@ -657,7 +651,7 @@ namespace Umbraco.Core.Scoping
         {
             // Check if there is any dictionary<int,int> with a key equal to lockId
             // And check that the value associated with that key is greater than 0, if not it could be because a lock was requested but it failed.
-            return  ReadLocks.Values.Where(x => x.ContainsKey(lockId)).Any(x => x[lockId] > 0);
+            return  ReadLocks.Values.Any(x => x.ContainsKey(lockId));
         }
 
         /// <summary>
@@ -667,7 +661,7 @@ namespace Umbraco.Core.Scoping
         /// <returns>>True if no scopes has obtained a write lock with the specific ID yet.</returns>
         private bool HasWriteLock(int lockId)
         {
-            return WriteLocks.Values.Where(x => x.ContainsKey(lockId)).Any(x => x[lockId] > 0);
+            return WriteLocks.Values.Any(x => x.ContainsKey(lockId));
         }
 
         /// <summary>
@@ -708,8 +702,9 @@ namespace Umbraco.Core.Scoping
                         }
                         catch
                         {
-                            // Something went wrong and we didn't get the lock, decrement the count and throw.
-                            DecrementReadLock(lockId, instanceId);
+                            // Something went wrong and we didn't get the lock
+                            // Since we at this point have determined that we haven't got any key of LockID, it's safe to completely remove it instead of decrementing.
+                            ReadLocks[instanceId].Remove(lockId);
                             throw;
                         }
                     }
@@ -757,7 +752,9 @@ namespace Umbraco.Core.Scoping
                         }
                         catch
                         {
-                            DecrementWriteLock(lockId, instanceId);
+                            // Something went wrong and we didn't get the lock
+                            // Since we at this point have determined that we haven't got any key of LockID, it's safe to completely remove it instead of decrementing.
+                            WriteLocks[instanceId].Remove(lockId);
                             throw;
                         }
                     }
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index 3e5ff127a3..157bfec662 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -222,8 +222,8 @@ namespace Umbraco.Tests.Scoping
             }
 
             // Since we request the ReadLock after the innerScope has been dispose, the key has been removed from the dictionary, and we fetch it again.
-            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
-            syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.ContentTree), Times.Once);
+            syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
+            syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), Constants.Locks.ContentTree), Times.Once);
         }
 
         [Test]
@@ -252,8 +252,9 @@ namespace Umbraco.Tests.Scoping
                     Assert.AreEqual(2, realOuterScope.WriteLocks[innerScope.InstanceId][Constants.Locks.Languages]);
                     innerScope.Complete();
                 }
-                Assert.IsFalse(realOuterScope.WriteLocks.ContainsKey(innerscopeId));
                 Assert.AreEqual(2, realOuterScope.WriteLocks[realOuterScope.InstanceId][Constants.Locks.ContentTree]);
+                Assert.AreEqual(0, realOuterScope.WriteLocks[innerscopeId][Constants.Locks.Languages]);
+                Assert.AreEqual(0, realOuterScope.WriteLocks[innerscopeId][Constants.Locks.ContentTree]);
                 outerscope.Complete();
             }
         }
@@ -284,8 +285,11 @@ namespace Umbraco.Tests.Scoping
                     Assert.AreEqual(2, realOuterScope.ReadLocks[innerScope.InstanceId][Constants.Locks.Languages]);
                     innerScope.Complete();
                 }
-                Assert.IsFalse(realOuterScope.ReadLocks.ContainsKey(innerscopeId));
                 Assert.AreEqual(2, realOuterScope.ReadLocks[outerscope.InstanceId][Constants.Locks.ContentTree]);
+                Assert.AreEqual(0, realOuterScope.ReadLocks[innerscopeId][Constants.Locks.Languages]);
+                Assert.AreEqual(0, realOuterScope.ReadLocks[innerscopeId][Constants.Locks.ContentTree]);
+
+
                 outerscope.Complete();
             }
         }
@@ -334,18 +338,23 @@ namespace Umbraco.Tests.Scoping
 
                         innerScope2.Complete();
                     }
-                    Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope2, parent instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope2, parent instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope2, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope2, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
-                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.Languages], $"innerScope2, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.IsFalse(realParentScope.WriteLocks.ContainsKey(innerScope2Id));
+                    Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope1, parent instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, parent instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
+                    Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.Languages], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.Languages)}");
+                    Assert.AreEqual(0, realParentScope.WriteLocks[innerScope2Id][Constants.Locks.ContentTree], $"innerScope1, innerScope2 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
+                    Assert.AreEqual(0, realParentScope.WriteLocks[innerScope2Id][Constants.Locks.MediaTypes], $"innerScope1, innerScope2 instance, after innserScope2 disposed: {nameof(Constants.Locks.MediaTypes)}");
 
                     innerScope1.Complete();
                 }
                 Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed {nameof(Constants.Locks.ContentTypes)}");
-                Assert.IsFalse(realParentScope.WriteLocks.ContainsKey(innerScope1Id));
+                Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
+                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope2Id][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope2Id][Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
+                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope1Id][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
+                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope1Id][Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
+                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope1Id][Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
 
                 parentScope.Complete();
             }
@@ -398,14 +407,17 @@ namespace Umbraco.Tests.Scoping
                     Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
                     Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
                     Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.Languages], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope2Id));
+                    Assert.AreEqual(0, realParentScope.ReadLocks[innerScope2Id][Constants.Locks.ContentTree]);
+                    Assert.AreEqual(0, realParentScope.ReadLocks[innerScope2Id][Constants.Locks.MediaTypes]);
 
                     innserScope1.Complete();
                 }
 
                 Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after innerScope1 disposed: {nameof(Constants.Locks.ContentTree)}");
                 Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after innerScope1 disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope1Id));
+                Assert.AreEqual(0, realParentScope.ReadLocks[innerScope1Id][Constants.Locks.ContentTree]);
+                Assert.AreEqual(0, realParentScope.ReadLocks[innerScope1Id][Constants.Locks.ContentTypes]);
+                Assert.AreEqual(0, realParentScope.ReadLocks[innerScope1Id][Constants.Locks.Languages]);
 
                 parentScope.Complete();
             }
@@ -422,7 +434,7 @@ namespace Umbraco.Tests.Scoping
                 var realScope = (Scope) scope;
 
                 Assert.Throws<Exception>(() => scope.WriteLock(Constants.Locks.Languages));
-                Assert.AreEqual(0, realScope.WriteLocks[scope.InstanceId][Constants.Locks.Languages]);
+                Assert.IsFalse(realScope.WriteLocks[scope.InstanceId].ContainsKey(Constants.Locks.Languages));
                 scope.Complete();
             }
         }
@@ -438,7 +450,7 @@ namespace Umbraco.Tests.Scoping
                 var realScope = (Scope) scope;
 
                 Assert.Throws<Exception>(() => scope.ReadLock(Constants.Locks.Languages));
-                Assert.AreEqual(0, realScope.ReadLocks[scope.InstanceId][Constants.Locks.Languages]);
+                Assert.IsFalse(realScope.ReadLocks[scope.InstanceId].ContainsKey(Constants.Locks.Languages));
                 scope.Complete();
             }
         }

From ef59829489395c5de0e4db310e562702708c79ed Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Mon, 15 Mar 2021 08:54:52 +0100
Subject: [PATCH 119/202] Throw error if all scopes hasn't been disposed

---
 src/Umbraco.Core/Scoping/Scope.cs           | 19 +++++------
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs | 35 +++++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 3cff2da020..38941086d8 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -365,15 +365,16 @@ namespace Umbraco.Core.Scoping
             // Lock on parent
             ClearReadLocks(InstanceId);
             ClearWriteLocks(InstanceId);
-            // if (ParentScope is null)
-            // {
-            //     // We're the parent scope, make sure that locks of all scopes has been cleared
-            //     // Since we're only reading we don't have to be in a lock
-            //     if (ReadLocks.Count != 0 || WriteLocks.Count != 0)
-            //     {
-            //         throw new Exception($"All scopes has not been disposed from parent scope {InstanceId}");
-            //     }
-            // }
+            if (ParentScope is null)
+            {
+                // We're the parent scope, make sure that locks of all scopes has been cleared
+                // Since we're only reading we don't have to be in a lock
+                if (ReadLocks.Values.Any(x => x.Values.Any(value => value != 0))
+                    || WriteLocks.Values.Any(x => x.Values.Any(value => value != 0)))
+                {
+                    throw new Exception($"All scopes has not been disposed from parent scope {InstanceId}");
+                }
+            }
 
             var parent = ParentScope;
             _scopeProvider.AmbientScope = parent; // might be null = this is how scopes are removed from context objects
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index 157bfec662..0cc05bb5d5 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Moq;
 using NPoco;
 using NUnit.Framework;
@@ -454,5 +455,39 @@ namespace Umbraco.Tests.Scoping
                 scope.Complete();
             }
         }
+
+        [Test]
+        public void Scope_Throws_If_ReadLocks_Not_Cleared()
+        {
+            var scopeprovider = GetScopeProvider(out var syntaxProviderMock);
+            var scope = (Scope) scopeprovider.CreateScope();
+
+            var readDict = new Dictionary<int, int>();
+            readDict[Constants.Locks.Languages] = 1;
+            scope.ReadLocks[Guid.NewGuid()] = readDict;
+
+            Assert.Throws<Exception>(() => scope.Dispose());
+
+            // We have to clear so we can properly dispose the scope, otherwise it'll mess with other tests.
+            scope.ReadLocks.Clear();
+            scope.Dispose();
+        }
+
+        [Test]
+        public void Scope_Throws_If_WriteLocks_Not_Cleared()
+        {
+            var scopeprovider = GetScopeProvider(out var syntaxProviderMock);
+            var scope = (Scope) scopeprovider.CreateScope();
+
+            var writeDict = new Dictionary<int, int>();
+            writeDict[Constants.Locks.Languages] = 1;
+            scope.WriteLocks[Guid.NewGuid()] = writeDict;
+
+            Assert.Throws<Exception>(() => scope.Dispose());
+
+            // We have to clear so we can properly dispose the scope, otherwise it'll mess with other tests.
+            scope.WriteLocks.Clear();
+            scope.Dispose();
+        }
     }
 }

From 92fd9ff6853debe5e2c9f4f38c8af0e0379ea99c Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Mon, 15 Mar 2021 11:31:23 +0100
Subject: [PATCH 120/202] Clean

---
 src/Umbraco.Core/Scoping/Scope.cs           | 94 ++++++++++-----------
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs |  4 +-
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 38941086d8..4298bec93b 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -362,7 +362,6 @@ namespace Umbraco.Core.Scoping
             }
 
             // Decrement the lock counters on the parent if any.
-            // Lock on parent
             ClearReadLocks(InstanceId);
             ClearWriteLocks(InstanceId);
             if (ParentScope is null)
@@ -372,7 +371,7 @@ namespace Umbraco.Core.Scoping
                 if (ReadLocks.Values.Any(x => x.Values.Any(value => value != 0))
                     || WriteLocks.Values.Any(x => x.Values.Any(value => value != 0)))
                 {
-                    throw new Exception($"All scopes has not been disposed from parent scope {InstanceId}");
+                    throw new InvalidOperationException($"All scopes has not been disposed from parent scope: {InstanceId}");
                 }
             }
 
@@ -514,67 +513,61 @@ namespace Umbraco.Core.Scoping
         private static bool LogUncompletedScopes => (_logUncompletedScopes
             ?? (_logUncompletedScopes = Current.Configs.CoreDebug().LogUncompletedScopes)).Value;
 
+        /// <summary>
+        /// Increment the counter in WriteLocks for a specific scope instance and lock identifier.
+        /// </summary>
+        /// <remarks>
+        /// This will not lock on the lock object, ensure that you lock on _dictionaryLocker before calling this method.
+        /// </remarks>
+        /// <param name="lockId">Lock ID to increment.</param>
+        /// <param name="instanceId">Instance ID of the scope requesting the lock.</param>
         private void IncrementWriteLock(int lockId, Guid instanceId)
         {
-            if (ParentScope is null)
+            // Since we've already checked that we're the parent in the WriteLockInner method, we don't need to check again.
+            // Try and get the dict associated with the scope id.
+            var locksDictFound = WriteLocks.TryGetValue(instanceId, out var locksDict);
+            if (locksDictFound)
             {
-                // Try and get the dict associated with the scope id.
-                var locksDictFound = WriteLocks.TryGetValue(instanceId, out var locksDict);
-                if (locksDictFound)
-                {
-                    var lockFound = locksDict.TryGetValue(lockId, out var value);
-                    if (lockFound)
-                    {
-                        WriteLocks[instanceId][lockId] = value+1;
-                    }
-                    else
-                    {
-                        WriteLocks[instanceId][lockId] = 1;
-                    }
-                }
-                else
-                {
-                    // The scope hasn't requested a lock yet, so we have to create a dict for it.
-                    WriteLocks[instanceId] = new Dictionary<int, int>();
-                    WriteLocks[instanceId][lockId] = 1;
-                }
+                locksDict.TryGetValue(lockId, out var value);
+                WriteLocks[instanceId][lockId] = value + 1;
             }
             else
             {
-                ParentScope.IncrementWriteLock(lockId, instanceId);
+                // The scope hasn't requested a lock yet, so we have to create a dict for it.
+                WriteLocks[instanceId] = new Dictionary<int, int>();
+                WriteLocks[instanceId][lockId] = 1;
             }
         }
 
+        /// <summary>
+        /// Increment the counter in ReadLocks for a specific scope instance and lock identifier.
+        /// </summary>
+        /// <remarks>
+        /// This will not lock on the lock object, ensure that you lock on _dictionaryLocker before calling this method.
+        /// </remarks>
+        /// <param name="lockId">Lock ID to increment.</param>
+        /// <param name="instanceId">Instance ID of the scope requesting the lock.</param>
         private void IncrementReadLock(int lockId, Guid instanceId)
         {
-            if (ParentScope is null)
+            // Since we've already checked that we're the parent in the WriteLockInner method, we don't need to check again.
+            var locksDictFound = ReadLocks.TryGetValue(instanceId, out var locksDict);
+            if (locksDictFound)
             {
-                var locksDictFound = ReadLocks.TryGetValue(instanceId, out var locksDict);
-                if (locksDictFound)
-                {
-                    var lockFound = locksDict.TryGetValue(lockId, out var value);
-                    if (lockFound)
-                    {
-                        ReadLocks[instanceId][lockId] = value + 1;
-                    }
-                    else
-                    {
-                        ReadLocks[instanceId][lockId] = 1;
-                    }
-                }
-                else
-                {
-                    // The scope hasn't requested a lock yet, so we have to create a dict for it.
-                    ReadLocks[instanceId] = new Dictionary<int, int>();
-                    ReadLocks[instanceId][lockId] = 1;
-                }
+                locksDict.TryGetValue(lockId, out var value);
+                ReadLocks[instanceId][lockId] = value + 1;
             }
             else
             {
-                ParentScope.IncrementReadLock(lockId, instanceId);
+                // The scope hasn't requested a lock yet, so we have to create a dict for it.
+                ReadLocks[instanceId] = new Dictionary<int, int>();
+                ReadLocks[instanceId][lockId] = 1;
             }
         }
 
+        /// <summary>
+        /// Resets all read lock counters for a given scope instance to 0, signalling that the lock is no longer in use.
+        /// </summary>
+        /// <param name="instanceId">Instance ID of the scope to clear of lock counters.</param>
         private void ClearReadLocks(Guid instanceId)
         {
             if (ParentScope != null)
@@ -585,7 +578,7 @@ namespace Umbraco.Core.Scoping
             {
                 lock (_dictionaryLocker)
                 {
-                    // Rest all values to 0 since the scope has been disposed
+                    // Reset all values to 0 since the scope is being disposed
                     if (ReadLocks.ContainsKey(instanceId))
                     {
                         foreach (var key in ReadLocks[instanceId].Keys.ToList())
@@ -597,6 +590,10 @@ namespace Umbraco.Core.Scoping
             }
         }
 
+        /// <summary>
+        /// Resets all write lock counters for a given scope instance to 0, signalling that the lock is no longer in use.
+        /// </summary>
+        /// <param name="instanceID">Instance ID of the scope to clear of lock counters.</param>
         private void ClearWriteLocks(Guid instanceID)
         {
             if (ParentScope != null)
@@ -607,6 +604,7 @@ namespace Umbraco.Core.Scoping
             {
                 lock (_dictionaryLocker)
                 {
+                    // Reset all values to 0 since the scope is being disposed
                     if (WriteLocks.ContainsKey(instanceID))
                     {
                         foreach (var key in WriteLocks[instanceID].Keys.ToList())
@@ -652,7 +650,7 @@ namespace Umbraco.Core.Scoping
         {
             // Check if there is any dictionary<int,int> with a key equal to lockId
             // And check that the value associated with that key is greater than 0, if not it could be because a lock was requested but it failed.
-            return  ReadLocks.Values.Any(x => x.ContainsKey(lockId));
+            return ReadLocks.Values.Any(x => x.ContainsKey(lockId));
         }
 
         /// <summary>
@@ -705,6 +703,7 @@ namespace Umbraco.Core.Scoping
                         {
                             // Something went wrong and we didn't get the lock
                             // Since we at this point have determined that we haven't got any key of LockID, it's safe to completely remove it instead of decrementing.
+                            // It needs to be completely removed, because that's how we determine to acquire a lock.
                             ReadLocks[instanceId].Remove(lockId);
                             throw;
                         }
@@ -755,6 +754,7 @@ namespace Umbraco.Core.Scoping
                         {
                             // Something went wrong and we didn't get the lock
                             // Since we at this point have determined that we haven't got any key of LockID, it's safe to completely remove it instead of decrementing.
+                            // It needs to be completely removed, because that's how we determine to acquire a lock.
                             WriteLocks[instanceId].Remove(lockId);
                             throw;
                         }
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index 0cc05bb5d5..789cbeff88 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -466,7 +466,7 @@ namespace Umbraco.Tests.Scoping
             readDict[Constants.Locks.Languages] = 1;
             scope.ReadLocks[Guid.NewGuid()] = readDict;
 
-            Assert.Throws<Exception>(() => scope.Dispose());
+            Assert.Throws<InvalidOperationException>(() => scope.Dispose());
 
             // We have to clear so we can properly dispose the scope, otherwise it'll mess with other tests.
             scope.ReadLocks.Clear();
@@ -483,7 +483,7 @@ namespace Umbraco.Tests.Scoping
             writeDict[Constants.Locks.Languages] = 1;
             scope.WriteLocks[Guid.NewGuid()] = writeDict;
 
-            Assert.Throws<Exception>(() => scope.Dispose());
+            Assert.Throws<InvalidOperationException>(() => scope.Dispose());
 
             // We have to clear so we can properly dispose the scope, otherwise it'll mess with other tests.
             scope.WriteLocks.Clear();

From d0f047e729dd28503e322cc6f3d93f5d24e88523 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Mon, 15 Mar 2021 22:56:38 +1100
Subject: [PATCH 121/202] Fixes and Updates for DB Scope and Ambient Context
 leaks (#9953)

* Adds some scope tests (ported back from netcore) and provides a much better error message, ensure execution context is not flowed to child tasks that shouldn't leak any current ambient context

* updates comment

* Ensure SqlMainDomLock suppresses execution context too

* Since we're awaiting a task in a library method, ConfigureAwait(false)

* missing null check

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
---
 src/Umbraco.Core/Runtime/SqlMainDomLock.cs    |  75 ++++++------
 src/Umbraco.Core/Scoping/Scope.cs             |   4 +-
 src/Umbraco.Core/Scoping/ScopeProvider.cs     |   4 +
 src/Umbraco.Examine/UmbracoExamineIndex.cs    |  21 +++-
 src/Umbraco.Tests/Scoping/ScopeTests.cs       | 114 ++++++++++++++++++
 .../Services/ThreadSafetyServiceTest.cs       |  22 ++--
 .../Scheduling/BackgroundTaskRunner.cs        |  19 ++-
 7 files changed, 207 insertions(+), 52 deletions(-)

diff --git a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
index 6a82486c43..144746936d 100644
--- a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
@@ -126,7 +126,7 @@ namespace Umbraco.Core.Runtime
             }
 
 
-            return await WaitForExistingAsync(tempId, millisecondsTimeout);
+            return await WaitForExistingAsync(tempId, millisecondsTimeout).ConfigureAwait(false);
         }
 
         public Task ListenAsync()
@@ -139,13 +139,15 @@ namespace Umbraco.Core.Runtime
 
             // Create a long running task (dedicated thread)
             // to poll to check if we are still the MainDom registered in the DB
-            return Task.Factory.StartNew(
-                ListeningLoop,
-                _cancellationTokenSource.Token,
-                TaskCreationOptions.LongRunning,
-                // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
-                TaskScheduler.Default);
-
+            using (ExecutionContext.SuppressFlow())
+            {
+                return Task.Factory.StartNew(
+                    ListeningLoop,
+                    _cancellationTokenSource.Token,
+                    TaskCreationOptions.LongRunning,
+                    // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                    TaskScheduler.Default);
+            }
         }
 
         /// <summary>
@@ -226,10 +228,10 @@ namespace Umbraco.Core.Runtime
                         }
                     }
                     finally
-                    {
-                        db?.CompleteTransaction();
-                        db?.Dispose();
-                    }
+                        {
+                            db?.CompleteTransaction();
+                            db?.Dispose();
+                        }
                 }
 
             }
@@ -245,37 +247,40 @@ namespace Umbraco.Core.Runtime
         {
             var updatedTempId = tempId + UpdatedSuffix;
 
-            return Task.Run(() =>
+            using (ExecutionContext.SuppressFlow())
             {
-                try
+                return Task.Run(() =>
                 {
-                    using var db = _dbFactory.CreateDatabase();
-
-                    var watch = new Stopwatch();
-                    watch.Start();
-                    while (true)
+                    try
                     {
-                        // poll very often, we need to take over as fast as we can
-                        // local testing shows the actual query to be executed from client/server is approx 300ms but would change depending on environment/IO
-                        Thread.Sleep(1000);
+                        using var db = _dbFactory.CreateDatabase();
 
-                        var acquired = TryAcquire(db, tempId, updatedTempId);
-                        if (acquired.HasValue)
-                            return acquired.Value;
-
-                        if (watch.ElapsedMilliseconds >= millisecondsTimeout)
+                        var watch = new Stopwatch();
+                        watch.Start();
+                        while (true)
                         {
-                            return AcquireWhenMaxWaitTimeElapsed(db);
+                            // poll very often, we need to take over as fast as we can
+                            // local testing shows the actual query to be executed from client/server is approx 300ms but would change depending on environment/IO
+                            Thread.Sleep(1000);
+
+                            var acquired = TryAcquire(db, tempId, updatedTempId);
+                            if (acquired.HasValue)
+                                return acquired.Value;
+
+                            if (watch.ElapsedMilliseconds >= millisecondsTimeout)
+                            {
+                                return AcquireWhenMaxWaitTimeElapsed(db);
+                            }
                         }
                     }
-                }
-                catch (Exception ex)
-                {
-                    _logger.Error<SqlMainDomLock>(ex, "An error occurred trying to acquire and waiting for existing SqlMainDomLock to shutdown");
-                    return false;
-                }
+                    catch (Exception ex)
+                    {
+                        _logger.Error<SqlMainDomLock>(ex, "An error occurred trying to acquire and waiting for existing SqlMainDomLock to shutdown");
+                        return false;
+                    }
 
-            }, _cancellationTokenSource.Token);
+                }, _cancellationTokenSource.Token);
+            }
         }
 
         private bool? TryAcquire(IUmbracoDatabase db, string tempId, string updatedTempId)
diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 7015cee5eb..af2d634e03 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -345,6 +345,8 @@ namespace Umbraco.Core.Scoping
 
             if (this != _scopeProvider.AmbientScope)
             {
+                var failedMessage = $"The {nameof(Scope)} {this.InstanceId} being disposed is not the Ambient {nameof(Scope)} {(_scopeProvider.AmbientScope?.InstanceId.ToString() ?? "NULL")}. This typically indicates that a child {nameof(Scope)} was not disposed, or flowed to a child thread that was not awaited, or concurrent threads are accessing the same {nameof(Scope)} (Ambient context) which is not supported. If using Task.Run (or similar) as a fire and forget tasks or to run threads in parallel you must suppress execution context flow with ExecutionContext.SuppressFlow() and ExecutionContext.RestoreFlow().";
+
 #if DEBUG_SCOPES
                 var ambient = _scopeProvider.AmbientScope;
                 _logger.Debug<Scope>("Dispose error (" + (ambient == null ? "no" : "other") + " ambient)");
@@ -356,7 +358,7 @@ namespace Umbraco.Core.Scoping
                     + "- ambient ctor ->\r\n" + ambientInfos.CtorStack + "\r\n"
                     + "- dispose ctor ->\r\n" + disposeInfos.CtorStack + "\r\n");
 #else
-                throw new InvalidOperationException("Not the ambient scope.");
+                throw new InvalidOperationException(failedMessage);
 #endif
             }
 
diff --git a/src/Umbraco.Core/Scoping/ScopeProvider.cs b/src/Umbraco.Core/Scoping/ScopeProvider.cs
index 3c0fa94327..dc92623860 100644
--- a/src/Umbraco.Core/Scoping/ScopeProvider.cs
+++ b/src/Umbraco.Core/Scoping/ScopeProvider.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.Runtime.Remoting.Messaging;
 using System.Web;
@@ -240,6 +241,9 @@ namespace Umbraco.Core.Scoping
                 var value = GetHttpContextObject<ScopeContext>(ContextItemKey, false);
                 return value ?? GetCallContextObject<ScopeContext>(ContextItemKey);
             }
+
+            [Obsolete("This setter is not used and will be removed in future versions")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
             set
             {
                 // clear both
diff --git a/src/Umbraco.Examine/UmbracoExamineIndex.cs b/src/Umbraco.Examine/UmbracoExamineIndex.cs
index e1dd77b994..30d0079f7e 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndex.cs
@@ -24,8 +24,8 @@ namespace Umbraco.Examine
         // note
         // wrapping all operations that end up calling base.SafelyProcessQueueItems in a safe call
         // context because they will fork a thread/task/whatever which should *not* capture our
-        // call context (and the database it can contain)! ideally we should be able to override
-        // SafelyProcessQueueItems but that's not possible in the current version of Examine.
+        // call context (and the database it can contain)!
+        // TODO: FIX Examine to not flow the ExecutionContext so callers don't need to worry about this!
 
         /// <summary>
         /// Used to store the path of a content object
@@ -99,6 +99,9 @@ namespace Umbraco.Examine
         {
             if (CanInitialize())
             {
+                // Use SafeCallContext to prevent the current CallContext flow to child
+                // tasks executed in the base class so we don't leak Scopes.
+                // TODO: See notes at the top of this class
                 using (new SafeCallContext())
                 {
                     base.PerformDeleteFromIndex(itemIds, onComplete);
@@ -106,6 +109,20 @@ namespace Umbraco.Examine
             }
         }
 
+        protected override void PerformIndexItems(IEnumerable<ValueSet> values, Action<IndexOperationEventArgs> onComplete)
+        {
+            if (CanInitialize())
+            {
+                // Use SafeCallContext to prevent the current CallContext flow to child
+                // tasks executed in the base class so we don't leak Scopes.
+                // TODO: See notes at the top of this class
+                using (new SafeCallContext())
+                {
+                    base.PerformIndexItems(values, onComplete);
+                }
+            }
+        }
+
         /// <summary>
         /// Returns true if the Umbraco application is in a state that we can initialize the examine indexes
         /// </summary>
diff --git a/src/Umbraco.Tests/Scoping/ScopeTests.cs b/src/Umbraco.Tests/Scoping/ScopeTests.cs
index 6c5e9a74b5..7d8984baad 100644
--- a/src/Umbraco.Tests/Scoping/ScopeTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeTests.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Runtime.Remoting.Messaging;
 using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Persistence;
@@ -24,6 +25,119 @@ namespace Umbraco.Tests.Scoping
             Assert.IsNull(ScopeProvider.AmbientScope); // gone
         }
 
+        [Test]
+        public void GivenUncompletedScopeOnChildThread_WhenTheParentCompletes_TheTransactionIsRolledBack()
+        {
+            ScopeProvider scopeProvider = ScopeProvider;
+
+            Assert.IsNull(ScopeProvider.AmbientScope);
+            IScope mainScope = scopeProvider.CreateScope();
+
+            var t = Task.Run(() =>
+            {
+                IScope nested = scopeProvider.CreateScope();
+                Thread.Sleep(2000);
+                nested.Dispose();
+            });
+
+            Thread.Sleep(1000); // mimic some long running operation that is shorter than the other thread
+            mainScope.Complete();
+            Assert.Throws<InvalidOperationException>(() => mainScope.Dispose());
+
+            Task.WaitAll(t);
+        }
+
+        [Test]
+        public void GivenNonDisposedChildScope_WhenTheParentDisposes_ThenInvalidOperationExceptionThrows()
+        {
+            // this all runs in the same execution context so the AmbientScope reference isn't a copy
+
+            ScopeProvider scopeProvider = ScopeProvider;
+
+            Assert.IsNull(ScopeProvider.AmbientScope);
+            IScope mainScope = scopeProvider.CreateScope();
+
+            IScope nested = scopeProvider.CreateScope(); // not disposing
+
+            InvalidOperationException ex = Assert.Throws<InvalidOperationException>(() => mainScope.Dispose());
+            Console.WriteLine(ex);
+        }
+
+        [Test]
+        public void GivenChildThread_WhenParentDisposedBeforeChild_ParentScopeThrows()
+        {           
+            // The ambient context is NOT thread safe, even though it has locks, etc...
+            // This all just goes to show that concurrent threads with scopes is a no-go.
+            var childWait = new ManualResetEventSlim(false);
+            var parentWait = new ManualResetEventSlim(false);
+
+            ScopeProvider scopeProvider = ScopeProvider;
+
+            Assert.IsNull(ScopeProvider.AmbientScope);
+            IScope mainScope = scopeProvider.CreateScope();
+
+            var t = Task.Run(() =>
+            {
+                Console.WriteLine("Child Task start: " + scopeProvider.AmbientScope.InstanceId);                
+                // This will evict the parent from the ScopeProvider.StaticCallContextObjects
+                // and replace it with the child
+                IScope nested = scopeProvider.CreateScope();
+                childWait.Set();
+                Console.WriteLine("Child Task scope created: " + scopeProvider.AmbientScope.InstanceId);
+                parentWait.Wait(); // wait for the parent thread
+                Console.WriteLine("Child Task before dispose: " + scopeProvider.AmbientScope.InstanceId);
+                // This will evict the child from the ScopeProvider.StaticCallContextObjects
+                // and replace it with the parent
+                nested.Dispose();
+                Console.WriteLine("Child Task after dispose: " + scopeProvider.AmbientScope.InstanceId);
+            });
+            
+            childWait.Wait(); // wait for the child to start and create the scope
+            // This is a confusing thing (this is not the case in netcore), this is NULL because the
+            // parent thread's scope ID was evicted from the ScopeProvider.StaticCallContextObjects
+            // so now the ambient context is null because the GUID in the CallContext doesn't match
+            // the GUID in the ScopeProvider.StaticCallContextObjects.
+            Assert.IsNull(scopeProvider.AmbientScope);
+            // now dispose the main without waiting for the child thread to join
+            // This will throw because at this stage a child scope has been created which means
+            // it is the Ambient (top) scope but here we're trying to dispose the non top scope.
+            Assert.Throws<InvalidOperationException>(() => mainScope.Dispose());
+            parentWait.Set();      // tell child thread to proceed
+            Task.WaitAll(t);        // wait for the child to dispose
+            mainScope.Dispose();    // now it's ok
+            Console.WriteLine("Parent Task disposed: " + scopeProvider.AmbientScope?.InstanceId);
+        }
+
+        [Test]
+        public void GivenChildThread_WhenChildDisposedBeforeParent_OK()
+        {
+            ScopeProvider scopeProvider = ScopeProvider;
+
+            Assert.IsNull(ScopeProvider.AmbientScope);
+            IScope mainScope = scopeProvider.CreateScope();
+
+            // Task.Run will flow the execution context unless ExecutionContext.SuppressFlow() is explicitly called.
+            // This is what occurs in normal async behavior since it is expected to await (and join) the main thread,
+            // but if Task.Run is used as a fire and forget thread without being done correctly then the Scope will
+            // flow to that thread.
+            var t = Task.Run(() =>
+            {
+                Console.WriteLine("Child Task start: " + scopeProvider.AmbientScope.InstanceId);
+                IScope nested = scopeProvider.CreateScope();                
+                Console.WriteLine("Child Task before dispose: " + scopeProvider.AmbientScope.InstanceId);
+                nested.Dispose();
+                Console.WriteLine("Child Task after disposed: " + scopeProvider.AmbientScope.InstanceId);
+            });
+
+            Console.WriteLine("Parent Task waiting: " + scopeProvider.AmbientScope?.InstanceId);
+            Task.WaitAll(t);
+            Console.WriteLine("Parent Task disposing: " + scopeProvider.AmbientScope.InstanceId);
+            mainScope.Dispose();
+            Console.WriteLine("Parent Task disposed: " + scopeProvider.AmbientScope?.InstanceId);
+
+            Assert.Pass();
+        }
+
         [Test]
         public void SimpleCreateScope()
         {
diff --git a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
index 33ee2f737a..5c58b35b6d 100644
--- a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
+++ b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
@@ -104,7 +104,7 @@ namespace Umbraco.Tests.Services
             var threads = new List<Thread>();
             var exceptions = new List<Exception>();
 
-            Debug.WriteLine("Starting...");
+            Console.WriteLine("Starting...");
 
             var done = TraceLocks();
 
@@ -114,12 +114,12 @@ namespace Umbraco.Tests.Services
                 {
                     try
                     {
-                        Debug.WriteLine("[{0}] Running...", Thread.CurrentThread.ManagedThreadId);
+                        Console.WriteLine("[{0}] Running...", Thread.CurrentThread.ManagedThreadId);
 
                         var name1 = "test-" + Guid.NewGuid();
                         var content1 = contentService.Create(name1, -1, "umbTextpage");
 
-                        Debug.WriteLine("[{0}] Saving content #1.", Thread.CurrentThread.ManagedThreadId);
+                        Console.WriteLine("[{0}] Saving content #1.", Thread.CurrentThread.ManagedThreadId);
                         Save(contentService, content1);
 
                         Thread.Sleep(100); //quick pause for maximum overlap!
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.Services
                         var name2 = "test-" + Guid.NewGuid();
                         var content2 = contentService.Create(name2, -1, "umbTextpage");
 
-                        Debug.WriteLine("[{0}] Saving content #2.", Thread.CurrentThread.ManagedThreadId);
+                        Console.WriteLine("[{0}] Saving content #2.", Thread.CurrentThread.ManagedThreadId);
                         Save(contentService, content2);
                     }
                     catch (Exception e)
@@ -139,16 +139,16 @@ namespace Umbraco.Tests.Services
             }
 
             // start all threads
-            Debug.WriteLine("Starting threads");
+            Console.WriteLine("Starting threads");
             threads.ForEach(x => x.Start());
 
             // wait for all to complete
-            Debug.WriteLine("Joining threads");
+            Console.WriteLine("Joining threads");
             threads.ForEach(x => x.Join());
 
             done.Set();
 
-            Debug.WriteLine("Checking exceptions");
+            Console.WriteLine("Checking exceptions");
             if (exceptions.Count == 0)
             {
                 //now look up all items, there should be 40!
@@ -172,7 +172,7 @@ namespace Umbraco.Tests.Services
             var threads = new List<Thread>();
             var exceptions = new List<Exception>();
 
-            Debug.WriteLine("Starting...");
+            Console.WriteLine("Starting...");
 
             var done = TraceLocks();
 
@@ -182,18 +182,18 @@ namespace Umbraco.Tests.Services
                 {
                     try
                     {
-                        Debug.WriteLine("[{0}] Running...", Thread.CurrentThread.ManagedThreadId);
+                        Console.WriteLine("[{0}] Running...", Thread.CurrentThread.ManagedThreadId);
 
                         var name1 = "test-" + Guid.NewGuid();
                         var media1 = mediaService.CreateMedia(name1, -1, Constants.Conventions.MediaTypes.Folder);
-                        Debug.WriteLine("[{0}] Saving media #1.", Thread.CurrentThread.ManagedThreadId);
+                        Console.WriteLine("[{0}] Saving media #1.", Thread.CurrentThread.ManagedThreadId);
                         Save(mediaService, media1);
 
                         Thread.Sleep(100); //quick pause for maximum overlap!
 
                         var name2 = "test-" + Guid.NewGuid();
                         var media2 = mediaService.CreateMedia(name2, -1, Constants.Conventions.MediaTypes.Folder);
-                        Debug.WriteLine("[{0}] Saving media #2.", Thread.CurrentThread.ManagedThreadId);
+                        Console.WriteLine("[{0}] Saving media #2.", Thread.CurrentThread.ManagedThreadId);
                         Save(mediaService, media2);
                     }
                     catch (Exception e)
diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
index 81bb45e270..10ce4d6943 100644
--- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
+++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
@@ -319,7 +319,10 @@ namespace Umbraco.Web.Scheduling
             // create a new token source since this is a new process
             _shutdownTokenSource = new CancellationTokenSource();
             _shutdownToken = _shutdownTokenSource.Token;
-            _runningTask = Task.Run(async () => await Pump().ConfigureAwait(false), _shutdownToken);
+            using (ExecutionContext.SuppressFlow())
+            {
+                _runningTask = Task.Run(async () => await Pump().ConfigureAwait(false), _shutdownToken);
+            }   
 
             _logger.Debug<BackgroundTaskRunner>("{LogPrefix} Starting", _logPrefix);
         }
@@ -544,10 +547,14 @@ namespace Umbraco.Web.Scheduling
                     try
                     {
                         if (bgTask.IsAsync)
+                        {
                             // configure await = false since we don't care about the context, we're on a background thread.
                             await bgTask.RunAsync(token).ConfigureAwait(false);
+                        }
                         else
+                        {
                             bgTask.Run();
+                        }
                     }
                     finally // ensure we disposed - unless latched again ie wants to re-run
                     {
@@ -710,14 +717,20 @@ namespace Umbraco.Web.Scheduling
             // with a single aspnet thread during shutdown and we don't want to delay other calls to IRegisteredObject.Stop.
             if (!immediate)
             {
-                return Task.Run(StopInitial, CancellationToken.None);
+                using (ExecutionContext.SuppressFlow())
+                {
+                    return Task.Run(StopInitial, CancellationToken.None);
+                }   
             }
             else
             {
                 lock (_locker)
                 {
                     if (_terminated) return Task.CompletedTask;
-                    return Task.Run(StopImmediate, CancellationToken.None);
+                    using (ExecutionContext.SuppressFlow())
+                    {
+                        return Task.Run(StopImmediate, CancellationToken.None);
+                    }
                 }
             }
         }

From 653bf52a1ceba4c27f9740958c4628cca6008815 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Mon, 15 Mar 2021 23:49:37 +1100
Subject: [PATCH 122/202] Adds additional error checking and reporting to
 MainDom/SqlMainDomLock (#9954)

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
---
 src/Umbraco.Core/Runtime/MainDom.cs        |  9 ++++++++-
 src/Umbraco.Core/Runtime/SqlMainDomLock.cs | 22 ++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Runtime/MainDom.cs b/src/Umbraco.Core/Runtime/MainDom.cs
index 71842905dd..08f7bbd641 100644
--- a/src/Umbraco.Core/Runtime/MainDom.cs
+++ b/src/Umbraco.Core/Runtime/MainDom.cs
@@ -179,7 +179,14 @@ namespace Umbraco.Core.Runtime
                 _listenTask = _mainDomLock.ListenAsync();
                 _listenCompleteTask = _listenTask.ContinueWith(t =>
                 {
-                    _logger.Debug<MainDom>("Listening task completed with {TaskStatus}", _listenTask.Status);
+                    if (_listenTask.Exception != null)
+                    {
+                        _logger.Warn<MainDom>("Listening task completed with {TaskStatus}, Exception: {Exception}", _listenTask.Status, _listenTask.Exception);
+                    }
+                    else
+                    {
+                        _logger.Debug<MainDom>("Listening task completed with {TaskStatus}", _listenTask.Status);
+                    }
 
                     OnSignal("signal");
                 }, TaskScheduler.Default); // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
diff --git a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
index 144746936d..9d9684321e 100644
--- a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
@@ -86,7 +86,7 @@ namespace Umbraco.Core.Runtime
                     // wait to get a write lock
                     _sqlServerSyntax.WriteLock(db, TimeSpan.FromMilliseconds(millisecondsTimeout), Constants.Locks.MainDom);
                 }
-                catch(SqlException ex)
+                catch (SqlException ex)
                 {
                     if (IsLockTimeoutException(ex))
                     {
@@ -228,12 +228,30 @@ namespace Umbraco.Core.Runtime
                         }
                     }
                     finally
+                    {
+                        // Even if any of the above fail like BeginTransaction, or even a query after the
+                        // Transaction is started, the calls below will not throw. I've tried all sorts of
+                        // combinations to see if I can make this throw but I can't. In any case, we'll be
+                        // extra safe and try/catch/log
+                        try
                         {
                             db?.CompleteTransaction();
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Error<SqlMainDomLock>(ex, "Unexpected error completing transaction.");
+                        }
+
+                        try
+                        {
                             db?.Dispose();
                         }
+                        catch (Exception ex)
+                        {
+                            _logger.Error<SqlMainDomLock>(ex, "Unexpected error completing disposing.");
+                        }
+                    }
                 }
-
             }
         }
 

From f7c032af65cac83182782c758a3ab79c86b92e70 Mon Sep 17 00:00:00 2001
From: patrickdemooij9 <patrickdemooij98@hotmail.com>
Date: Tue, 16 Mar 2021 00:28:51 +0100
Subject: [PATCH 123/202] Add copy logic to Media Picker (#9957)

* Add copy logic to Media Picker

* Add action for copy all

* Fix for selectable media item
---
 .../src/common/services/clipboard.service.js  |  43 ++-
 .../mediapicker/mediapicker.controller.js     |  76 ++++-
 .../mediapicker/mediapicker.html              | 268 ++++++++++--------
 .../mediapicker/mediapicker.controller.js     |  42 ++-
 .../mediapicker/mediapicker.html              |   3 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |   1 +
 .../Umbraco/config/lang/en_us.xml             |   1 +
 7 files changed, 288 insertions(+), 146 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 83fd3d08c2..167c134e62 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -16,6 +16,7 @@ function clipboardService($window, notificationsService, eventsService, localSto
     const TYPES = {};
     TYPES.ELEMENT_TYPE = "elementType";
     TYPES.BLOCK = "block";
+    TYPES.IMAGE = "image";
     TYPES.RAW = "raw";
 
     var clearPropertyResolvers = {};
@@ -284,7 +285,7 @@ function clipboardService($window, notificationsService, eventsService, localSto
     *
     * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
     * @param {string} alias A string defining the alias of the data to store, example: 'product'
-    * @param {object} entry A object containing the properties to be saved, this could be the object of a ElementType, ContentNode, ...
+    * @param {object} data A object containing the properties to be saved, this could be the object of a ElementType, ContentNode, ...
     * @param {string} displayLabel (optional) A string swetting the label to display when showing paste entries.
     * @param {string} displayIcon (optional) A string setting the icon to display when showing paste entries.
     * @param {string} uniqueKey (optional) A string prodiving an identifier for this entry, existing entries with this key will be removed to ensure that you only have the latest copy of this data.
@@ -318,6 +319,46 @@ function clipboardService($window, notificationsService, eventsService, localSto
 
     };
 
+    /**
+    * @ngdoc method
+    * @name umbraco.services.clipboardService#copy
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
+    * @param {string} alias A string defining the alias of the data to store, example: 'product'
+    * @param {object[]} data An array of objects containing the properties to be saved, this could be the object of a ElementType, ContentNode, ...
+    *
+    * @description
+    * Saves multiple JS-object to the clipboard.
+    */
+    service.copyMultiple = function (type, alias, data, firstLevelClearupMethod) {
+
+        var storage = retriveStorage();
+
+        data.forEach(item => {
+            var displayLabel = item.displayLabel || item.name;
+            var displayIcon = item.displayIcon || iconHelper.convertFromLegacyIcon(item.icon);
+            var uniqueKey = item.uniqueKey || item.key || console.error("missing unique key for this content");
+
+            // remove previous copies of this entry:
+            storage.entries = storage.entries.filter(
+                (entry) => {
+                    return entry.unique !== uniqueKey;
+                }
+            );
+
+            var entry = { unique: uniqueKey, type: type, alias: alias, data: prepareEntryForStorage(type, item, firstLevelClearupMethod), label: displayLabel, icon: displayIcon, date: Date.now() };
+            storage.entries.push(entry);
+        });
+
+        if (saveStorage(storage) === true) {
+            notificationsService.success("Clipboard", "Copied to clipboard.");
+        } else {
+            notificationsService.error("Clipboard", "Couldnt copy this data to clipboard.");
+        }
+
+    };
+
 
     /**
     * @ngdoc method
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index fec2e632c5..700bfa5715 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
-        function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService, umbSessionStorage, notificationsService) {
+        function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService, umbSessionStorage, notificationsService, clipboardService) {
 
             var vm = this;
 
@@ -19,6 +19,8 @@ angular.module("umbraco")
             vm.enterSubmitFolder = enterSubmitFolder;
             vm.focalPointChanged = focalPointChanged;
             vm.changePagination = changePagination;
+            vm.onNavigationChanged = onNavigationChanged;
+            vm.clickClearClipboard = clickClearClipboard;
 
             vm.clickHandler = clickHandler;
             vm.clickItemName = clickItemName;
@@ -27,6 +29,9 @@ angular.module("umbraco")
             vm.selectLayout = selectLayout;
             vm.showMediaList = false;
 
+            vm.navigation = [];
+            vm.clipboardImages = [];
+
             var dialogOptions = $scope.model;
 
             $scope.disableFolderSelect = (dialogOptions.disableFolderSelect && dialogOptions.disableFolderSelect !== "0") ? true : false;
@@ -100,15 +105,43 @@ angular.module("umbraco")
 
             function setTitle() {
                 if (!$scope.model.title) {
-                    localizationService.localize("defaultdialogs_selectMedia")
+                    localizationService.localizeMany(["defaultdialogs_selectMedia", "defaultdialogs_tabClipboard"])
                         .then(function (data) {
-                            $scope.model.title = data;
+                            $scope.model.title = data[0];
+
+
+                            vm.navigation = [{
+                                "alias": "empty",
+                                "name": data[0],
+                                "icon": "icon-umb-media",
+                                "active": true,
+                                "view": ""
+                            },
+                            {
+                                "alias": "clipboard",
+                                "name": data[1],
+                                "icon": "icon-paste-in",
+                                "view": "",
+                                "disabled": vm.clipboardImages.length === 0
+                            }];
+
+                            vm.activeTab = vm.navigation[0];
                         });
                 }
             }
 
             function onInit() {
 
+                clipboardService.retriveEntriesOfType(clipboardService.TYPES.IMAGE, ["Media"]).forEach(item => {
+                    var media = item.data.media;
+                    if ((($scope.disableFolderSelect || $scope.onlyImages) && media.isFolder) ||
+                        ($scope.onlyFolders && !media.isFolder)) {
+                        return;
+                    }
+                    setDefaultData(media);
+                    vm.clipboardImages.push(media);
+                });
+
                 setTitle();
 
                 userService.getCurrentUser().then(function (userData) {
@@ -149,7 +182,7 @@ angular.module("umbraco")
                             .then(function (node) {
                                 $scope.target = node;
                                 // Moving directly to existing node's folder
-                                gotoFolder({ id: node.parentId }).then(function() {
+                                gotoFolder({ id: node.parentId }).then(function () {
                                     selectMedia(node);
                                     $scope.target.url = mediaHelper.resolveFileFromEntity(node);
                                     $scope.target.thumbnail = mediaHelper.resolveFileFromEntity(node, true);
@@ -169,10 +202,10 @@ angular.module("umbraco")
 
             function upload(v) {
                 var fileSelect = $(".umb-file-dropzone .file-select");
-                if (fileSelect.length === 0){
+                if (fileSelect.length === 0) {
                     localizationService.localize('media_uploadNotAllowed').then(function (message) { notificationsService.warning(message); });
                 }
-                else{
+                else {
                     fileSelect.trigger("click");
                 }
             }
@@ -395,6 +428,19 @@ angular.module("umbraco")
                 });
             };
 
+            function onNavigationChanged(tab) {
+                vm.activeTab.active = false;
+                vm.activeTab = tab;
+                vm.activeTab.active = true;
+            };
+
+            function clickClearClipboard() {
+                vm.onNavigationChanged(vm.navigation[0]);
+                vm.navigation[1].disabled = true;
+                vm.clipboardImages = [];
+                clipboardService.clearEntriesOfType(clipboardService.TYPES.IMAGE, ["Media"]);
+            };
+
             var debounceSearchMedia = _.debounce(function () {
                 $scope.$apply(function () {
                     if (vm.searchOptions.filter) {
@@ -504,13 +550,7 @@ angular.module("umbraco")
                     var allowedTypes = dialogOptions.filter ? dialogOptions.filter.split(",") : null;
 
                     for (var i = 0; i < data.length; i++) {
-                        if (data[i].metaData.MediaPath !== null) {
-                            data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
-                            data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
-                        }
-                        if (data[i].metaData.UpdateDate !== null){
-                            data[i].updateDate = data[i].metaData.UpdateDate;
-                        }
+                        setDefaultData(data[i]);
                         data[i].filtered = allowedTypes && allowedTypes.indexOf(data[i].metaData.ContentTypeAlias) < 0;
                     }
 
@@ -523,6 +563,16 @@ angular.module("umbraco")
                 });
             }
 
+            function setDefaultData(item) {
+                if (item.metaData.MediaPath !== null) {
+                    item.thumbnail = mediaHelper.resolveFileFromEntity(item, true);
+                    item.image = mediaHelper.resolveFileFromEntity(item, false);
+                }
+                if (item.metaData.UpdateDate !== null) {
+                    item.updateDate = item.metaData.UpdateDate;
+                }
+            }
+
             function preSelectMedia() {
                 for (var folderIndex = 0; folderIndex < $scope.images.length; folderIndex++) {
                     var folderImage = $scope.images[folderIndex];
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index df0c8e3cef..9fd31de537 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -3,6 +3,8 @@
 
         <umb-editor-header
             name="model.title"
+            navigation="vm.navigation"
+            on-select-navigation-item="vm.onNavigationChanged(item)"
             name-locked="true"
             hide-alias="true"
             hide-icon="true"
@@ -11,145 +13,161 @@
 
         <umb-editor-container>
 
-            <form id="fileupload" method="POST" enctype="multipart/form-data" umb-image-upload="options">
+            <div ng-if="vm.activeTab.alias === 'empty'">
+                <form id="fileupload" method="POST" enctype="multipart/form-data" umb-image-upload="options">
 
-                <div on-drag-leave="vm.dragLeave()" on-drag-end="vm.dragLeave()" on-drag-enter="vm.dragEnter()">
+                    <div on-drag-leave="vm.dragLeave()" on-drag-end="vm.dragLeave()" on-drag-enter="vm.dragEnter()">
 
-                    <div class="umb-control-group">
+                        <div class="umb-control-group">
 
-                        <div class="umb-mediapicker-upload">
-                            <div class="form-search">
-                                <umb-search-filter
-                                    input-id="datatype-search"
-                                    model="vm.searchOptions.filter"
-                                    label-key="placeholders_search"
-                                    text="Type to search"
-                                    on-change="vm.changeSearch()"
-                                    css-class="w-100"
-                                    auto-focus="true">
-                                </umb-search-filter>
+                            <div class="umb-mediapicker-upload">
+                                <div class="form-search">
+                                    <umb-search-filter input-id="datatype-search"
+                                                       model="vm.searchOptions.filter"
+                                                       label-key="placeholders_search"
+                                                       text="Type to search"
+                                                       on-change="vm.changeSearch()"
+                                                       css-class="w-100"
+                                                       auto-focus="true">
+                                    </umb-search-filter>
 
-                                <div class="form-search__toggle">
-                                    <umb-checkbox model="filterOptions.excludeSubFolders"
-                                                  on-change="vm.toggle()"
-                                                  text="Include subfolders in search"
-                                                  label-key="general_excludeFromSubFolders">
-                                    </umb-checkbox>
+                                    <div class="form-search__toggle">
+                                        <umb-checkbox model="filterOptions.excludeSubFolders"
+                                                      on-change="vm.toggle()"
+                                                      text="Include subfolders in search"
+                                                      label-key="general_excludeFromSubFolders">
+                                        </umb-checkbox>
+                                    </div>
+                                </div>
+
+                                <div class="upload-button">
+                                    <umb-button type="button"
+                                                label-key="general_upload"
+                                                action="vm.upload()"
+                                                disabled="lockedFolder"
+                                                button-style="action">
+                                    </umb-button>
                                 </div>
                             </div>
-
-                            <div class="upload-button">
-                                <umb-button type="button"
-                                            label-key="general_upload"
-                                            action="vm.upload()"
-                                            disabled="lockedFolder"
-                                            button-style="action">
-                                </umb-button>
+                        </div>
+                        <div class="row umb-control-group" ng-show="vm.searchOptions.filter && images.length > 0 && !vm.loading && !activeDrag">
+                            <div style="margin-left:auto;text-align:right">
+                                <umb-layout-selector ng-show="vm.layout.layouts"
+                                                     layouts="vm.layout.layouts"
+                                                     active-layout="vm.layout.activeLayout"
+                                                     on-layout-select="vm.selectLayout(layout)">
+                                </umb-layout-selector>
                             </div>
                         </div>
-                    </div>
-                    <div class="row umb-control-group" ng-show="vm.searchOptions.filter && images.length > 0 && !vm.loading && !activeDrag">
-                        <div style="margin-left:auto;text-align:right" >
-                            <umb-layout-selector ng-show="vm.layout.layouts"
-                                                 layouts="vm.layout.layouts"
-                                                 active-layout="vm.layout.activeLayout"
-                                                 on-layout-select="vm.selectLayout(layout)">
-                            </umb-layout-selector>
-                        </div>
-                    </div>
-                    <div class="row umb-control-group" ng-show="!vm.searchOptions.filter">
-                        <div class="pull-right">
-                            <umb-layout-selector ng-show="vm.layout.layouts"
-                                                 layouts="vm.layout.layouts"
-                                                 active-layout="vm.layout.activeLayout"
-                                                 on-layout-select="vm.selectLayout(layout)">
-                            </umb-layout-selector>
+                        <div class="row umb-control-group" ng-show="!vm.searchOptions.filter">
+                            <div class="pull-right">
+                                <umb-layout-selector ng-show="vm.layout.layouts"
+                                                     layouts="vm.layout.layouts"
+                                                     active-layout="vm.layout.activeLayout"
+                                                     on-layout-select="vm.selectLayout(layout)">
+                                </umb-layout-selector>
+                            </div>
+
+                            <ul class="umb-breadcrumbs">
+                                <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
+                                    <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder()" ng-class="{'--current':path.length === 0}">
+                                        <localize key="treeHeaders_media">Media</localize>
+                                    </button>
+                                    <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
+                                </li>
+                                <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
+                                    <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder(item)" ng-class="{'--current':$last}">{{item.name}}</button>
+                                    <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
+                                </li>
+                                <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
+                                    <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-hide="model.showFolderInput" ng-click="model.showFolderInput = true">
+                                        <i class="icon icon-add small" aria-hidden="true"></i>
+                                        <span class="sr-only">
+                                            <localize key="visuallyHiddenTexts_createNewFolder">Create new folder</localize>
+                                        </span>
+                                    </button>
+
+                                    <input type="text"
+                                           class="umb-breadcrumbs__add-ancestor"
+                                           ng-show="model.showFolderInput"
+                                           ng-model="model.newFolderName"
+                                           ng-keydown="enterSubmitFolder($event)"
+                                           ng-blur="vm.submitFolder()"
+                                           focus-when="{{model.showFolderInput}}" />
+                                </li>
+                            </ul>
+                            <umb-loader ng-if="model.creatingFolder"></umb-loader>
                         </div>
 
-                        <ul class="umb-breadcrumbs">
-                            <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
-                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder()" ng-class="{'--current':path.length === 0}">
-                                    <localize key="treeHeaders_media">Media</localize>
-                                </button>
-                                <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
-                            </li>
-                            <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
-                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder(item)" ng-class="{'--current':$last}">{{item.name}}</button>
-                                <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
-                            </li>
-                            <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
-                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-hide="model.showFolderInput" ng-click="model.showFolderInput = true">
-                                    <i class="icon icon-add small" aria-hidden="true"></i>
-                                    <span class="sr-only">
-                                        <localize key="visuallyHiddenTexts_createNewFolder">Create new folder</localize>
-                                    </span>
-                                </button>
+                        <umb-file-dropzone ng-if="vm.acceptedMediatypes.length > 0 && !vm.loading && !lockedFolder"
+                                           accepted-mediatypes="vm.acceptedMediatypes"
+                                           parent-id="{{currentFolder.id}}"
+                                           files-uploaded="vm.onUploadComplete"
+                                           files-queued="vm.onFilesQueue"
+                                           accept="{{vm.acceptedFileTypes}}"
+                                           max-file-size="{{vm.maxFileSize}}"
+                                           hide-dropzone="{{ !activeDrag && (images.length > 0 || vm.searchOptions.filter !== '') }}"
+                                           compact="{{ images.length > 0 }}">
+                        </umb-file-dropzone>
+
+                        <umb-media-grid ng-if="!vm.loading"
+                                        items="images"
+                                        on-click="vm.clickHandler"
+                                        on-click-name="vm.clickItemName"
+                                        item-max-width="150"
+                                        item-max-height="150"
+                                        item-min-width="100"
+                                        item-min-height="100"
+                                        disable-folder-select={{disableFolderSelect}}
+                                        only-images={{onlyImages}}
+                                        only-folders={{onlyFolders}}
+                                        include-sub-folders={{!filterOptions.excludeSubFolders}}
+                                        current-folder-id="{{currentFolder.id}}"
+                                        show-media-list=vm.showMediaList>
+                        </umb-media-grid>
+
+
+                        <umb-load-indicator ng-if="vm.loading">
+                        </umb-load-indicator>
+
+                        <div class="flex justify-center">
+                            <umb-pagination ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
+                                            page-number="vm.searchOptions.pageNumber"
+                                            total-pages="vm.searchOptions.totalPages"
+                                            on-change="vm.changePagination(pageNumber)">
+                            </umb-pagination>
+                        </div>
+
+                        <umb-empty-state ng-if="vm.searchOptions.filter && images.length === 0 && !vm.loading && !activeDrag" position="center">
+                            <localize key="general_searchNoResult"></localize>
+                        </umb-empty-state>
 
-                                <input type="text"
-                                       class="umb-breadcrumbs__add-ancestor"
-                                       ng-show="model.showFolderInput"
-                                       ng-model="model.newFolderName"
-                                       ng-keydown="enterSubmitFolder($event)"
-                                       ng-blur="vm.submitFolder()"
-                                focus-when="{{model.showFolderInput}}" />
-                            </li>
-                        </ul>
-                        <umb-loader ng-if="model.creatingFolder"></umb-loader>
                     </div>
-
-                    <umb-file-dropzone
-                                       ng-if="vm.acceptedMediatypes.length > 0 && !vm.loading && !lockedFolder"
-                                       accepted-mediatypes="vm.acceptedMediatypes"
-                                       parent-id="{{currentFolder.id}}"
-                                       files-uploaded="vm.onUploadComplete"
-                                       files-queued="vm.onFilesQueue"
-                                       accept="{{vm.acceptedFileTypes}}"
-                                       max-file-size="{{vm.maxFileSize}}"
-                                       hide-dropzone="{{ !activeDrag && (images.length > 0 || vm.searchOptions.filter !== '') }}"
-                                       compact="{{ images.length > 0 }}">
-                    </umb-file-dropzone>
-
-                    <umb-media-grid
-                                    ng-if="!vm.loading"
-                                    items="images"
-                                    on-click="vm.clickHandler"
-                                    on-click-name="vm.clickItemName"
-                                    item-max-width="150"
-                                    item-max-height="150"
-                                    item-min-width="100"
-                                    item-min-height="100"
-                                    disable-folder-select={{disableFolderSelect}}
-                                    only-images={{onlyImages}}
-                                    only-folders={{onlyFolders}}
-                                    include-sub-folders={{!filterOptions.excludeSubFolders}}
-                                    current-folder-id="{{currentFolder.id}}"
-                                    show-media-list=vm.showMediaList>
-                    </umb-media-grid>
-
-
-                    <umb-load-indicator
-                                        ng-if="vm.loading">
-                    </umb-load-indicator>
-
-                    <div class="flex justify-center">
-                        <umb-pagination
-                                        ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
-                                        page-number="vm.searchOptions.pageNumber"
-                                        total-pages="vm.searchOptions.totalPages"
-                                        on-change="vm.changePagination(pageNumber)">
-                        </umb-pagination>
-                    </div>
-
-                    <umb-empty-state ng-if="vm.searchOptions.filter && images.length === 0 && !vm.loading && !activeDrag" position="center">
-                        <localize key="general_searchNoResult"></localize>
-                    </umb-empty-state>
-
+                </form>
+            </div>
+            <div ng-if="vm.activeTab.alias === 'clipboard'">
+                <div style="margin-bottom:20px; text-align: right;">
+                    <umb-button type="button"
+                                icon="icon-trash"
+                                button-style="link"
+                                label-key="clipboard_labelForClearClipboard"
+                                action="vm.clickClearClipboard()">
+                    </umb-button>
                 </div>
 
-
-
-            </form>
-
+                <umb-media-grid ng-if="!vm.loading"
+                                items="vm.clipboardImages"
+                                on-click="vm.clickHandler"
+                                item-max-width="150"
+                                item-max-height="150"
+                                item-min-width="100"
+                                item-min-height="100"
+                                disable-folder-select={{disableFolderSelect}}
+                                only-images={{onlyImages}}
+                                only-folders={{onlyFolders}}
+                                show-media-list=vm.showMediaList>
+                </umb-media-grid>
+            </div>
 
         </umb-editor-container>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index f3a57224e2..b47dd2f470 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper, overlayService) {
+    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper, overlayService, clipboardService) {
 
         var vm = this;
 
@@ -10,6 +10,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
         vm.add = add;
         vm.remove = remove;
+        vm.copyItem = copyItem;
         vm.editItem = editItem;
         vm.showAdd = showAdd;
 
@@ -53,7 +54,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                         // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
                         // compares and be completely sure it works.
                         var found = medias.find(m => m.udi.toString() === id.toString() || m.id.toString() === id.toString());
-                        
+
                         var mediaItem = found ||
                         {
                             name: vm.labels.deletedItem,
@@ -94,6 +95,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         function sync() {
             $scope.model.value = $scope.ids.join();
             removeAllEntriesAction.isDisabled = $scope.ids.length === 0;
+            copyAllEntriesAction.isDisabled = removeAllEntriesAction.isDisabled;
         }
 
         function setDirty() {
@@ -127,7 +129,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             ];
 
             localizationService.localizeMany(labelKeys)
-                .then(function(data) {
+                .then(function (data) {
                     vm.labels.deletedItem = data[0];
                     vm.labels.trashed = data[1];
 
@@ -141,7 +143,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                             else {
                                 $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
                                 $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                            }  
+                            }
                         }
 
                         // only allow users to add and edit media if they have access to the media section
@@ -161,6 +163,23 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             setDirty();
         }
 
+        function copyAllEntries() {
+            clipboardService.copyMultiple(clipboardService.TYPES.IMAGE,
+                "Media",
+                $scope.mediaItems.map(item => {
+                    return { "media": item, "key": item.udi }
+                }), clearNodeForCopy);
+        }
+
+        function copyItem(item) {
+            clipboardService.copy(clipboardService.TYPES.IMAGE, "Media", { "media": item }, null, null, item.udi, clearNodeForCopy);
+        }
+
+        function clearNodeForCopy(item) {
+            delete item.media.selected;
+            delete item.media.selectable;
+        }
+
         function editItem(item) {
             var mediaEditor = {
                 id: item.id,
@@ -260,6 +279,14 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             });
         }
 
+        var copyAllEntriesAction = {
+            labelKey: 'clipboard_labelForCopyAllEntries',
+            labelTokens: ['Media'],
+            icon: "documents",
+            method: copyAllEntries,
+            isDisabled: true
+        }
+
         var removeAllEntriesAction = {
             labelKey: 'clipboard_labelForRemoveAllEntries',
             labelTokens: [],
@@ -267,9 +294,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             method: removeAllEntries,
             isDisabled: true
         };
-        
+
         if (multiPicker === true) {
             var propertyActions = [
+                copyAllEntriesAction,
                 removeAllEntriesAction
             ];
 
@@ -287,12 +315,12 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             cancel: ".unsortable",
             update: function () {
                 setDirty();
-                $timeout(function() {
+                $timeout(function () {
                     // TODO: Instead of doing this with a timeout would be better to use a watch like we do in the
                     // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
                     // watch do all the rest.
                     $scope.ids = $scope.mediaItems.map(media => $scope.model.config.idType === "udi" ? media.udi : media.id);
-                    
+
                     sync();
                 });
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index c09d7c7613..1090c4a1f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -37,6 +37,9 @@
                 </umb-file-icon>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
+                    <button type="button" aria-label="Copy media" ng-if="!media.trashed" class="umb-sortable-thumbnails__action btn-reset" data-element="action-copy" ng-click="vm.copyItem(media)">
+                        <i class="icon icon-documents" aria-hidden="true"></i>
+                    </button>
                     <button type="button" aria-label="Edit media" ng-if="allowEditMedia && !media.trashed" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
                         <i class="icon icon-edit" aria-hidden="true"></i>
                     </button>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index a0748a7079..72e7d55a50 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -528,6 +528,7 @@
     <key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
     <key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
     <key alias="yesRemove">Yes, remove</key>
+    <key alias="tabClipboard">Clipboard</key>
   </area>
   <area alias="dictionary">
     <key alias="noItems">There are no dictionary items.</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 0b92c69dcc..b858c61eb0 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -534,6 +534,7 @@
     <key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
     <key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
     <key alias="yesRemove">Yes, remove</key>
+    <key alias="tabClipboard">Clipboard</key>
   </area>
   <area alias="dictionary">
     <key alias="noItems">There are no dictionary items.</key>

From 68c4ce200847fb4d63fafa2da51991776546a62a Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 16 Mar 2021 14:18:17 +0100
Subject: [PATCH 124/202] Wrap calls to map in scopes

---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs     | 40 ++++++++++++++-----
 src/Umbraco.Tests/Mapping/MappingTests.cs     | 37 +++++++++++++----
 .../Testing/TestingTests/MockTests.cs         | 18 ++++++++-
 3 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index e62825101c..fe58479335 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Mapping
 {
@@ -42,12 +43,17 @@ namespace Umbraco.Core.Mapping
         private readonly ConcurrentDictionary<Type, Dictionary<Type, Action<object, object, MapperContext>>> _maps
             = new ConcurrentDictionary<Type, Dictionary<Type, Action<object, object, MapperContext>>>();
 
+        private readonly IScopeProvider _scopeProvider;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UmbracoMapper"/> class.
         /// </summary>
         /// <param name="profiles"></param>
-        public UmbracoMapper(MapDefinitionCollection profiles)
+        /// <param name="scopeProvider"></param>
+        public UmbracoMapper(MapDefinitionCollection profiles, IScopeProvider scopeProvider)
         {
+            _scopeProvider = scopeProvider;
+
             foreach (var profile in profiles)
                 profile.DefineMaps(this);
         }
@@ -203,7 +209,10 @@ namespace Umbraco.Core.Mapping
             if (ctor != null && map != null)
             {
                 var target = ctor(source, context);
-                map(source, target, context);
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    map(source, target, context);
+                }
                 return (TTarget)target;
             }
 
@@ -248,11 +257,14 @@ namespace Umbraco.Core.Mapping
         {
             var targetList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(targetGenericArg));
 
-            foreach (var sourceItem in source)
+            using (var scope = _scopeProvider.CreateScope())
             {
-                var targetItem = ctor(sourceItem, context);
-                map(sourceItem, targetItem, context);
-                targetList.Add(targetItem);
+                foreach (var sourceItem in source)
+                {
+                    var targetItem = ctor(sourceItem, context);
+                    map(sourceItem, targetItem, context);
+                    targetList.Add(targetItem);
+                }
             }
 
             object target = targetList;
@@ -292,8 +304,15 @@ namespace Umbraco.Core.Mapping
         public TTarget Map<TSource, TTarget>(TSource source, TTarget target, Action<MapperContext> f)
         {
             var context = new MapperContext(this);
-            f(context);
-            return Map(source, target, context);
+
+            TTarget targetInstance;
+            using (var scope = _scopeProvider.CreateScope())
+            {
+                f(context);
+                targetInstance = Map(source, target, context);
+            }
+
+            return targetInstance;
         }
 
         /// <summary>
@@ -315,7 +334,10 @@ namespace Umbraco.Core.Mapping
             // if there is a direct map, map
             if (map != null)
             {
-                map(source, target, context);
+                using (var scope = _scopeProvider.CreateScope())
+                {
+                    map(source, target, context);
+                }
                 return target;
             }
 
diff --git a/src/Umbraco.Tests/Mapping/MappingTests.cs b/src/Umbraco.Tests/Mapping/MappingTests.cs
index e6a382692c..35f64cac62 100644
--- a/src/Umbraco.Tests/Mapping/MappingTests.cs
+++ b/src/Umbraco.Tests/Mapping/MappingTests.cs
@@ -1,17 +1,40 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Threading;
+using Moq;
 using NUnit.Framework;
+using Umbraco.Core.Events;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
+using Umbraco.Core.Scoping;
 using Umbraco.Web.Models.ContentEditing;
+using PropertyCollection = Umbraco.Core.Models.PropertyCollection;
 
 namespace Umbraco.Tests.Mapping
 {
     [TestFixture]
     public class MappingTests
     {
+        private IScopeProvider _scopeProvider;
+
+        [SetUp]
+        public void MockScopeProvider()
+        {
+            var scopeMock = new Mock<IScopeProvider>();
+            scopeMock.Setup(x => x.CreateScope(
+                    It.IsAny<IsolationLevel>(),
+                    It.IsAny<RepositoryCacheMode>(),
+                    It.IsAny<IEventDispatcher>(),
+                    It.IsAny<bool?>(),
+                    It.IsAny<bool>(),
+                    It.IsAny<bool>()))
+                .Returns(Mock.Of<IScope>);
+
+            _scopeProvider = scopeMock.Object;
+        }
+
         [Test]
         public void SimpleMap()
         {
@@ -19,7 +42,7 @@ namespace Umbraco.Tests.Mapping
             {
                 new MapperDefinition1(),
             });
-            var mapper = new UmbracoMapper(definitions);
+            var mapper = new UmbracoMapper(definitions, _scopeProvider);
 
             var thing1 = new Thing1 { Value = "value" };
             var thing2 = mapper.Map<Thing1, Thing2>(thing1);
@@ -44,7 +67,7 @@ namespace Umbraco.Tests.Mapping
             {
                 new MapperDefinition1(),
             });
-            var mapper = new UmbracoMapper(definitions);
+            var mapper = new UmbracoMapper(definitions, _scopeProvider);
 
             var thing1A = new Thing1 { Value = "valueA" };
             var thing1B = new Thing1 { Value = "valueB" };
@@ -78,7 +101,7 @@ namespace Umbraco.Tests.Mapping
             {
                 new MapperDefinition1(),
             });
-            var mapper = new UmbracoMapper(definitions);
+            var mapper = new UmbracoMapper(definitions, _scopeProvider);
 
             var thing3 = new Thing3 { Value = "value" };
             var thing2 = mapper.Map<Thing3, Thing2>(thing3);
@@ -103,7 +126,7 @@ namespace Umbraco.Tests.Mapping
             {
                 new MapperDefinition2(),
             });
-            var mapper = new UmbracoMapper(definitions);
+            var mapper = new UmbracoMapper(definitions, _scopeProvider);
 
             // can map a PropertyCollection
             var source = new PropertyCollection();
@@ -119,7 +142,7 @@ namespace Umbraco.Tests.Mapping
                 new MapperDefinition1(),
                 new MapperDefinition3(),
             });
-            var mapper = new UmbracoMapper(definitions);
+            var mapper = new UmbracoMapper(definitions, _scopeProvider);
 
             // the mapper currently has a map from Thing1 to Thing2
             // because Thing3 inherits from Thing1, it will map a Thing3 instance,
@@ -179,7 +202,7 @@ namespace Umbraco.Tests.Mapping
             {
                 new MapperDefinition4(),
             });
-            var mapper = new UmbracoMapper(definitions);
+            var mapper = new UmbracoMapper(definitions, _scopeProvider);
 
             var thing5 = new Thing5()
             {
@@ -203,7 +226,7 @@ namespace Umbraco.Tests.Mapping
             {
                 new MapperDefinition5(),
             });
-            var mapper = new UmbracoMapper(definitions);
+            var mapper = new UmbracoMapper(definitions, _scopeProvider);
 
             var thing7 = new Thing7();
 
diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
index f53b0bfff0..7eacccc8d5 100644
--- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
+++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Data;
 using System.Globalization;
 using System.Linq;
 using System.Web.Security;
@@ -9,11 +10,13 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Dictionary;
+using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
@@ -98,10 +101,21 @@ namespace Umbraco.Tests.Testing.TestingTests
         {
             var umbracoContext = TestObjects.GetUmbracoContextMock();
 
+            var scopeProvider = new Mock<IScopeProvider>();
+            scopeProvider
+                .Setup(x => x.CreateScope(
+                    It.IsAny<IsolationLevel>(),
+                    It.IsAny<RepositoryCacheMode>(),
+                    It.IsAny<IEventDispatcher>(),
+                    It.IsAny<bool?>(),
+                    It.IsAny<bool>(),
+                    It.IsAny<bool>()))
+                .Returns(Mock.Of<IScope>);
+
             var membershipHelper = new MembershipHelper(umbracoContext.HttpContext, Mock.Of<IPublishedMemberCache>(), Mock.Of<MembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IUserService>(), Mock.Of<IPublicAccessService>(), Mock.Of<AppCaches>(), Mock.Of<ILogger>());
             var umbracoHelper = new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(), Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>(), membershipHelper);
-            var umbracoMapper = new UmbracoMapper(new MapDefinitionCollection(new[] { Mock.Of<IMapDefinition>() }));
-            
+            var umbracoMapper = new UmbracoMapper(new MapDefinitionCollection(new[] { Mock.Of<IMapDefinition>() }), scopeProvider.Object);
+
             // ReSharper disable once UnusedVariable
             var umbracoApiController = new FakeUmbracoApiController(Mock.Of<IGlobalSettings>(), Mock.Of<IUmbracoContextAccessor>(), Mock.Of<ISqlContext>(), ServiceContext.CreatePartial(), AppCaches.NoCache, Mock.Of<IProfilingLogger>(), Mock.Of<IRuntimeState>(), umbracoHelper, umbracoMapper);
 

From 637e85ebbb50284e87fe91174dd8be4369a9be77 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 16 Mar 2021 14:23:09 +0100
Subject: [PATCH 125/202] Autocomplete scopes

---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index fe58479335..5800410e16 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -209,7 +209,7 @@ namespace Umbraco.Core.Mapping
             if (ctor != null && map != null)
             {
                 var target = ctor(source, context);
-                using (var scope = _scopeProvider.CreateScope())
+                using (var scope = _scopeProvider.CreateScope(autoComplete: true))
                 {
                     map(source, target, context);
                 }
@@ -257,7 +257,7 @@ namespace Umbraco.Core.Mapping
         {
             var targetList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(targetGenericArg));
 
-            using (var scope = _scopeProvider.CreateScope())
+            using (var scope = _scopeProvider.CreateScope(autoComplete: true))
             {
                 foreach (var sourceItem in source)
                 {
@@ -306,7 +306,7 @@ namespace Umbraco.Core.Mapping
             var context = new MapperContext(this);
 
             TTarget targetInstance;
-            using (var scope = _scopeProvider.CreateScope())
+            using (var scope = _scopeProvider.CreateScope(autoComplete: true))
             {
                 f(context);
                 targetInstance = Map(source, target, context);
@@ -334,7 +334,7 @@ namespace Umbraco.Core.Mapping
             // if there is a direct map, map
             if (map != null)
             {
-                using (var scope = _scopeProvider.CreateScope())
+                using (var scope = _scopeProvider.CreateScope(autoComplete: true))
                 {
                     map(source, target, context);
                 }

From 1570d49d05d862c0991524e5082138f3fce27a2a Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 16 Mar 2021 20:39:48 +0100
Subject: [PATCH 126/202] Remove unnecessary aria-hidden attribute from
 <umb-icon>

---
 .../src/views/components/editor/umb-editor-content-header.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index aa2d363c84..6e33633512 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -95,7 +95,7 @@
 
         <div ng-if="splitViewOpen">
             <button type="button" class="btn-reset umb-editor-header__close-split-view" ng-click="closeSplitView()">
-                <umb-icon icon="icon-delete" class="icon-delete" aria-hidden="true"></umb-icon>
+                <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
                 <span class="sr-only"><localize key="general_closepane">Close Pane</localize></span>
             </button>
         </div>

From aa6d046efef825f4ab41ef778a8f21f9a4712f1e Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 17 Mar 2021 09:43:36 +0100
Subject: [PATCH 127/202] Remove scope from method that calls another method
 that has a scope

---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index 5800410e16..ab96214063 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -305,14 +305,8 @@ namespace Umbraco.Core.Mapping
         {
             var context = new MapperContext(this);
 
-            TTarget targetInstance;
-            using (var scope = _scopeProvider.CreateScope(autoComplete: true))
-            {
-                f(context);
-                targetInstance = Map(source, target, context);
-            }
-
-            return targetInstance;
+            f(context);
+            return Map(source, target, context);;
         }
 
         /// <summary>

From cf4c163131719e2a852a08119517bcbf1c924f85 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 17 Mar 2021 09:58:17 +0100
Subject: [PATCH 128/202] Fixes #9993 - Cannot save empty image in Grid

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

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 862837381a..f9eacd9e73 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -202,8 +202,8 @@ namespace Umbraco.Web.PropertyEditors
                     _richTextPropertyValueEditor.GetReferences(x.Value)))
                     yield return umbracoEntityReference;
 
-                foreach (var umbracoEntityReference in mediaValues.SelectMany(x =>
-                    _mediaPickerPropertyValueEditor.GetReferences(x.Value["udi"])))
+                foreach (var umbracoEntityReference in mediaValues.Where(x => x.Value.HasValues)
+                    .SelectMany(x => _mediaPickerPropertyValueEditor.GetReferences(x.Value["udi"])))
                     yield return umbracoEntityReference;
             }
         }

From 3b83b7409ee2af1c21ec90507dae3d35a19a7a50 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 17 Mar 2021 10:08:08 +0100
Subject: [PATCH 129/202] Clean

---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index ab96214063..bd2f916524 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -304,9 +304,8 @@ namespace Umbraco.Core.Mapping
         public TTarget Map<TSource, TTarget>(TSource source, TTarget target, Action<MapperContext> f)
         {
             var context = new MapperContext(this);
-
             f(context);
-            return Map(source, target, context);;
+            return Map(source, target, context);
         }
 
         /// <summary>

From 156c1c94161171f9592923f20de4e142c845469a Mon Sep 17 00:00:00 2001
From: Michael Latouche <michael@crossingpaths.be>
Date: Wed, 17 Mar 2021 10:29:31 +0100
Subject: [PATCH 130/202] Revert "The Value() method for IPublishedContent was
 not working with the defaultValue parameter" (#9989)

---
 src/Umbraco.Web/PublishedContentExtensions.cs |  6 ++--
 src/Umbraco.Web/PublishedPropertyExtension.cs | 35 +++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 8aa3b69fb4..d6b8f837d2 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -173,8 +173,8 @@ namespace Umbraco.Web
                 return value;
 
             // else... if we have a property, at least let the converter return its own
-            // vision of 'no value' (could be an empty enumerable) - otherwise, defaultValue
-            return property == null ? defaultValue : property.Value<T>(culture, segment, defaultValue: defaultValue);
+            // vision of 'no value' (could be an empty enumerable) - otherwise, default
+            return property == null ? default : property.Value<T>(culture, segment, fallback, defaultValue);
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedPropertyExtension.cs b/src/Umbraco.Web/PublishedPropertyExtension.cs
index 0c3aa57cc2..6e8647db47 100644
--- a/src/Umbraco.Web/PublishedPropertyExtension.cs
+++ b/src/Umbraco.Web/PublishedPropertyExtension.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
@@ -37,13 +36,20 @@ namespace Umbraco.Web
                 // we have a value
                 // try to cast or convert it
                 var value =  property.GetValue(culture, segment);
-                if (value is T valueAsT) return valueAsT;
-                var valueConverted = value.TryConvertTo<T>();
-                if (valueConverted) return valueConverted.Result;
+                if (value is T valueAsT)
+                {
+                    return valueAsT;
+                }
 
-                // cannot cast nor convert the value, nothing we can return but 'defaultValue'
+                var valueConverted = value.TryConvertTo<T>();
+                if (valueConverted)
+                {
+                    return valueConverted.Result;
+                }
+
+                // cannot cast nor convert the value, nothing we can return but 'default'
                 // note: we don't want to fallback in that case - would make little sense
-                return defaultValue;
+                return default;
             }
 
             // we don't have a value, try fallback
@@ -57,15 +63,22 @@ namespace Umbraco.Web
             var noValue = property.GetValue(culture, segment);
             if (noValue == null)
             {
-                return defaultValue;
+                return default;
+            }
+
+            if (noValue is T noValueAsT)
+            {
+                return noValueAsT;
             }
-            if (noValue is T noValueAsT) return noValueAsT;
 
             var noValueConverted = noValue.TryConvertTo<T>();
-            if (noValueConverted) return noValueConverted.Result;
+            if (noValueConverted)
+            {
+                return noValueConverted.Result;
+            }
 
-            // cannot cast noValue nor convert it, nothing we can return but 'defaultValue'
-            return defaultValue;
+            // cannot cast noValue nor convert it, nothing we can return but 'default'
+            return default;
         }
 
         #endregion

From 54a4a76efb37c3e1c1e2799ebd3a0807ba9b1dd4 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 17 Mar 2021 11:10:34 +0100
Subject: [PATCH 131/202] Use a hashset to keep track of acquired locks

This simplifies disposing/checking for locks greatly.
---
 src/Umbraco.Core/Scoping/Scope.cs           | 53 +++++++--------------
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs | 24 ++++------
 2 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index f6ec36125d..880db57a2b 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -37,6 +37,8 @@ namespace Umbraco.Core.Scoping
         private IEventDispatcher _eventDispatcher;
 
         private object _dictionaryLocker;
+        private readonly HashSet<int> _readLocks;
+        private readonly HashSet<int> _writeLocks;
 
         // ReadLocks and WriteLocks if we're the outer most scope it's those owned by the entire chain
         // If we're a child scope it's those that we have requested.
@@ -68,8 +70,10 @@ namespace Umbraco.Core.Scoping
             Detachable = detachable;
 
             _dictionaryLocker = new object();
-            ReadLocks = new Dictionary<Guid, Dictionary<int, int>>();
             WriteLocks = new Dictionary<Guid, Dictionary<int, int>>();
+            ReadLocks = new Dictionary<Guid, Dictionary<int, int>>();
+            _writeLocks = new HashSet<int>();
+            _readLocks = new HashSet<int>();
 
 #if DEBUG_SCOPES
             _scopeProvider.RegisterScope(this);
@@ -370,8 +374,7 @@ namespace Umbraco.Core.Scoping
             {
                 // We're the parent scope, make sure that locks of all scopes has been cleared
                 // Since we're only reading we don't have to be in a lock
-                if (ReadLocks.Values.Any(x => x.Values.Any(value => value != 0))
-                    || WriteLocks.Values.Any(x => x.Values.Any(value => value != 0)))
+                if (ReadLocks.Any() || WriteLocks.Any())
                 {
                     throw new InvalidOperationException($"All scopes has not been disposed from parent scope: {InstanceId}");
                 }
@@ -580,13 +583,10 @@ namespace Umbraco.Core.Scoping
             {
                 lock (_dictionaryLocker)
                 {
-                    // Reset all values to 0 since the scope is being disposed
+                    // Remove the scope from the dictionary because it's getting disposed.
                     if (ReadLocks.ContainsKey(instanceId))
                     {
-                        foreach (var key in ReadLocks[instanceId].Keys.ToList())
-                        {
-                            ReadLocks[instanceId][key] = 0;
-                        }
+                        ReadLocks.Remove(instanceId);
                     }
                 }
             }
@@ -606,13 +606,10 @@ namespace Umbraco.Core.Scoping
             {
                 lock (_dictionaryLocker)
                 {
-                    // Reset all values to 0 since the scope is being disposed
+                    // Remove the scope from the dictionary because it's getting disposed.
                     if (WriteLocks.ContainsKey(instanceID))
                     {
-                        foreach (var key in WriteLocks[instanceID].Keys.ToList())
-                        {
-                            WriteLocks[instanceID][key] = 0;
-                        }
+                        WriteLocks.Remove(instanceID);
                     }
                 }
 
@@ -643,28 +640,6 @@ namespace Umbraco.Core.Scoping
             WriteLockInner(InstanceId, timeout, lockId);
         }
 
-        /// <summary>
-        /// Determine if a read lock with the specified ID has already been obtained.
-        /// </summary>
-        /// <param name="lockId">Id to test.</param>
-        /// <returns>True if no scopes has obtained a read lock with the specific ID yet.</returns>
-        private bool HasReadLock(int lockId)
-        {
-            // Check if there is any dictionary<int,int> with a key equal to lockId
-            // And check that the value associated with that key is greater than 0, if not it could be because a lock was requested but it failed.
-            return ReadLocks.Values.Any(x => x.ContainsKey(lockId));
-        }
-
-        /// <summary>
-        /// Determine if a write lock with the specified ID has already been obtained.
-        /// </summary>
-        /// <param name="lockId">Id to test</param>
-        /// <returns>>True if no scopes has obtained a write lock with the specific ID yet.</returns>
-        private bool HasWriteLock(int lockId)
-        {
-            return WriteLocks.Values.Any(x => x.ContainsKey(lockId));
-        }
-
         /// <summary>
         /// Handles acquiring a read lock, will delegate it to the parent if there are any.
         /// </summary>
@@ -685,9 +660,10 @@ namespace Umbraco.Core.Scoping
                 foreach (var lockId in lockIds)
                 {
                     // Only acquire the lock if we haven't done so yet.
-                    if (!HasReadLock(lockId))
+                    if (!_readLocks.Contains(lockId))
                     {
                         IncrementReadLock(lockId, instanceId);
+                        _readLocks.Add(lockId);
                         try
                         {
                             if (timeout is null)
@@ -707,6 +683,7 @@ namespace Umbraco.Core.Scoping
                             // Since we at this point have determined that we haven't got any key of LockID, it's safe to completely remove it instead of decrementing.
                             // It needs to be completely removed, because that's how we determine to acquire a lock.
                             ReadLocks[instanceId].Remove(lockId);
+                            _readLocks.Remove(lockId);
                             throw;
                         }
                     }
@@ -738,9 +715,10 @@ namespace Umbraco.Core.Scoping
                 foreach (var lockId in lockIds)
                 {
                     // Only acquire lock if we haven't yet (WriteLocks not containing the key)
-                    if (!HasWriteLock(lockId))
+                    if (!_writeLocks.Contains(lockId))
                     {
                         IncrementWriteLock(lockId, instanceId);
+                        _writeLocks.Add(lockId);
                         try
                         {
                             if (timeout is null)
@@ -758,6 +736,7 @@ namespace Umbraco.Core.Scoping
                             // Since we at this point have determined that we haven't got any key of LockID, it's safe to completely remove it instead of decrementing.
                             // It needs to be completely removed, because that's how we determine to acquire a lock.
                             WriteLocks[instanceId].Remove(lockId);
+                            _writeLocks.Remove(lockId);
                             throw;
                         }
                     }
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index 789cbeff88..2a4f72f9a1 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -254,8 +254,7 @@ namespace Umbraco.Tests.Scoping
                     innerScope.Complete();
                 }
                 Assert.AreEqual(2, realOuterScope.WriteLocks[realOuterScope.InstanceId][Constants.Locks.ContentTree]);
-                Assert.AreEqual(0, realOuterScope.WriteLocks[innerscopeId][Constants.Locks.Languages]);
-                Assert.AreEqual(0, realOuterScope.WriteLocks[innerscopeId][Constants.Locks.ContentTree]);
+                Assert.IsFalse(realOuterScope.WriteLocks.ContainsKey(innerscopeId));
                 outerscope.Complete();
             }
         }
@@ -287,8 +286,7 @@ namespace Umbraco.Tests.Scoping
                     innerScope.Complete();
                 }
                 Assert.AreEqual(2, realOuterScope.ReadLocks[outerscope.InstanceId][Constants.Locks.ContentTree]);
-                Assert.AreEqual(0, realOuterScope.ReadLocks[innerscopeId][Constants.Locks.Languages]);
-                Assert.AreEqual(0, realOuterScope.ReadLocks[innerscopeId][Constants.Locks.ContentTree]);
+                Assert.IsFalse(realOuterScope.ReadLocks.ContainsKey(innerscopeId));
 
 
                 outerscope.Complete();
@@ -344,18 +342,14 @@ namespace Umbraco.Tests.Scoping
                     Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
                     Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
                     Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.Languages], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.AreEqual(0, realParentScope.WriteLocks[innerScope2Id][Constants.Locks.ContentTree], $"innerScope1, innerScope2 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
-                    Assert.AreEqual(0, realParentScope.WriteLocks[innerScope2Id][Constants.Locks.MediaTypes], $"innerScope1, innerScope2 instance, after innserScope2 disposed: {nameof(Constants.Locks.MediaTypes)}");
+                    Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope2Id));
 
                     innerScope1.Complete();
                 }
                 Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
                 Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope2Id][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope2Id][Constants.Locks.MediaTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.MediaTypes)}");
-                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope1Id][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
-                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope1Id][Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.AreEqual(0, realParentScope.WriteLocks[innerScope1Id][Constants.Locks.Languages], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.Languages)}");
+                Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope2Id));
+                Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope1Id));
 
                 parentScope.Complete();
             }
@@ -408,17 +402,15 @@ namespace Umbraco.Tests.Scoping
                     Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
                     Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
                     Assert.AreEqual(1, realParentScope.ReadLocks[innserScope1.InstanceId][Constants.Locks.Languages], $"innerScope1, innerScope1 instance, after innerScope2 disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.AreEqual(0, realParentScope.ReadLocks[innerScope2Id][Constants.Locks.ContentTree]);
-                    Assert.AreEqual(0, realParentScope.ReadLocks[innerScope2Id][Constants.Locks.MediaTypes]);
+                    Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope2Id));
 
                     innserScope1.Complete();
                 }
 
                 Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after innerScope1 disposed: {nameof(Constants.Locks.ContentTree)}");
                 Assert.AreEqual(1, realParentScope.ReadLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after innerScope1 disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.AreEqual(0, realParentScope.ReadLocks[innerScope1Id][Constants.Locks.ContentTree]);
-                Assert.AreEqual(0, realParentScope.ReadLocks[innerScope1Id][Constants.Locks.ContentTypes]);
-                Assert.AreEqual(0, realParentScope.ReadLocks[innerScope1Id][Constants.Locks.Languages]);
+                Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope2Id));
+                Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope1Id));
 
                 parentScope.Complete();
             }

From e2019777fbfc1f9221d040cb9f0b82c57f8552b9 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Wed, 17 Mar 2021 21:54:38 +1000
Subject: [PATCH 132/202] Add images in grid - fixes 9982 (#9987)

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
---
 .../grid/editors/media.controller.js          | 40 ++++++++-----------
 1 file changed, 16 insertions(+), 24 deletions(-)

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 716ca405c1..94ea4b8604 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,9 +1,9 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
-    function ($scope, userService, editorService, localizationService) {        
-        
-        $scope.thumbnailUrl = getThumbnailUrl();        
-        
+    function ($scope, userService, editorService, localizationService) {
+
+        $scope.thumbnailUrl = getThumbnailUrl();
+
         if (!$scope.model.config.startNodeId) {
             if ($scope.model.config.ignoreUserStartNodes === true) {
                 $scope.model.config.startNodeId = -1;
@@ -29,16 +29,16 @@ angular.module("umbraco")
                 onlyImages: true,
                 dataTypeKey: $scope.model.dataTypeKey,
                 submit: model => {
-                    updateControlValue(model.selection[0]);                    
+                    updateControlValue(model.selection[0]);
                     editorService.close();
                 },
-                close: () => editorService.close()                
+                close: () => editorService.close()
             };
 
             editorService.mediaPicker(mediaPicker);
         };
 
-        $scope.editImage = function() {               
+        $scope.editImage = function() {
 
             const mediaCropDetailsConfig = {
                 size: 'small',
@@ -47,17 +47,17 @@ angular.module("umbraco")
                     updateControlValue(model.target);
                     editorService.close();
                 },
-                close: () => editorService.close()                
+                close: () => editorService.close()
             };
 
             localizationService.localize('defaultdialogs_editSelectedMedia').then(value => {
                 mediaCropDetailsConfig.title = value;
                 editorService.mediaCropDetails(mediaCropDetailsConfig);
-            });        
+            });
         }
-        
+
         /**
-         * 
+         *
          */
         function getThumbnailUrl() {
 
@@ -94,19 +94,15 @@ angular.module("umbraco")
 
                 return url;
             }
-            
+
             return null;
         }
 
         /**
-         * 
-         * @param {object} selectedImage 
+         *
+         * @param {object} selectedImage
          */
         function updateControlValue(selectedImage) {
-
-            const doGetThumbnail = $scope.control.value.focalPoint !== selectedImage.focalPoint 
-                || $scope.control.value.image !== selectedImage.image;
-
             // we could apply selectedImage directly to $scope.control.value,
             // but this allows excluding fields in future if needed
             $scope.control.value = {
@@ -118,10 +114,6 @@ angular.module("umbraco")
                 caption: selectedImage.caption,
                 altText: selectedImage.altText
             };
-
-
-            if (doGetThumbnail) {
-                $scope.thumbnailUrl = getThumbnailUrl();
-            }
-        }       
+            $scope.thumbnailUrl = getThumbnailUrl();
+        }
     });

From 9bd1b06eaf4638f61795fa9dcb791f2c20670d8e Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 17 Mar 2021 13:09:45 +0100
Subject: [PATCH 133/202] Only create the dicts and hashset when a lock is
 requested

---
 src/Umbraco.Core/Scoping/Scope.cs           | 33 ++++++---
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs | 74 ++++++++++++++++-----
 2 files changed, 81 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 880db57a2b..0a3051855a 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -37,13 +37,13 @@ namespace Umbraco.Core.Scoping
         private IEventDispatcher _eventDispatcher;
 
         private object _dictionaryLocker;
-        private readonly HashSet<int> _readLocks;
-        private readonly HashSet<int> _writeLocks;
+        private HashSet<int> _readLocks;
+        private HashSet<int> _writeLocks;
 
         // ReadLocks and WriteLocks if we're the outer most scope it's those owned by the entire chain
         // If we're a child scope it's those that we have requested.
-        internal readonly Dictionary<Guid, Dictionary<int, int>> ReadLocks;
-        internal readonly Dictionary<Guid, Dictionary<int, int>> WriteLocks;
+        internal Dictionary<Guid, Dictionary<int, int>> ReadLocks { get; private set; }
+        internal Dictionary<Guid, Dictionary<int, int>> WriteLocks { get; private set; }
 
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
@@ -70,10 +70,6 @@ namespace Umbraco.Core.Scoping
             Detachable = detachable;
 
             _dictionaryLocker = new object();
-            WriteLocks = new Dictionary<Guid, Dictionary<int, int>>();
-            ReadLocks = new Dictionary<Guid, Dictionary<int, int>>();
-            _writeLocks = new HashSet<int>();
-            _readLocks = new HashSet<int>();
 
 #if DEBUG_SCOPES
             _scopeProvider.RegisterScope(this);
@@ -374,7 +370,7 @@ namespace Umbraco.Core.Scoping
             {
                 // We're the parent scope, make sure that locks of all scopes has been cleared
                 // Since we're only reading we don't have to be in a lock
-                if (ReadLocks.Any() || WriteLocks.Any())
+                if (ReadLocks is not null && ReadLocks.Any() || WriteLocks is not null && WriteLocks.Any())
                 {
                     throw new InvalidOperationException($"All scopes has not been disposed from parent scope: {InstanceId}");
                 }
@@ -529,6 +525,9 @@ namespace Umbraco.Core.Scoping
         private void IncrementWriteLock(int lockId, Guid instanceId)
         {
             // Since we've already checked that we're the parent in the WriteLockInner method, we don't need to check again.
+            // If it's the very first time a lock has been requested the WriteLocks dict hasn't been instantiated yet.
+            WriteLocks ??= new Dictionary<Guid, Dictionary<int, int>>();
+
             // Try and get the dict associated with the scope id.
             var locksDictFound = WriteLocks.TryGetValue(instanceId, out var locksDict);
             if (locksDictFound)
@@ -555,6 +554,9 @@ namespace Umbraco.Core.Scoping
         private void IncrementReadLock(int lockId, Guid instanceId)
         {
             // Since we've already checked that we're the parent in the WriteLockInner method, we don't need to check again.
+            // If it's the very first time a lock has been requested the ReadLocks dict hasn't been instantiated yet.
+            ReadLocks ??= new Dictionary<Guid, Dictionary<int, int>>();
+
             var locksDictFound = ReadLocks.TryGetValue(instanceId, out var locksDict);
             if (locksDictFound)
             {
@@ -581,6 +583,12 @@ namespace Umbraco.Core.Scoping
             }
             else
             {
+                if (ReadLocks is null)
+                {
+                    // If ReadLocks is null, no locks has been requested and we don't have to do anything.
+                    return;
+                }
+
                 lock (_dictionaryLocker)
                 {
                     // Remove the scope from the dictionary because it's getting disposed.
@@ -604,6 +612,11 @@ namespace Umbraco.Core.Scoping
             }
             else
             {
+                if (WriteLocks is null)
+                {
+                    return;
+                }
+
                 lock (_dictionaryLocker)
                 {
                     // Remove the scope from the dictionary because it's getting disposed.
@@ -656,6 +669,7 @@ namespace Umbraco.Core.Scoping
 
             lock (_dictionaryLocker)
             {
+                _readLocks ??= new HashSet<int>();
                 // If we are the parent, then handle the lock request.
                 foreach (var lockId in lockIds)
                 {
@@ -712,6 +726,7 @@ namespace Umbraco.Core.Scoping
 
             lock (_dictionaryLocker)
             {
+                _writeLocks ??= new HashSet<int>();
                 foreach (var lockId in lockIds)
                 {
                     // Only acquire lock if we haven't yet (WriteLocks not containing the key)
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index 2a4f72f9a1..579c0cc7cf 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -342,14 +342,14 @@ namespace Umbraco.Tests.Scoping
                     Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
                     Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
                     Assert.AreEqual(1, realParentScope.WriteLocks[innerScope1.InstanceId][Constants.Locks.Languages], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.Languages)}");
-                    Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope2Id));
+                    Assert.IsFalse(realParentScope.WriteLocks.ContainsKey(innerScope2Id));
 
                     innerScope1.Complete();
                 }
                 Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
                 Assert.AreEqual(1, realParentScope.WriteLocks[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
-                Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope2Id));
-                Assert.IsFalse(realParentScope.ReadLocks.ContainsKey(innerScope1Id));
+                Assert.IsFalse(realParentScope.WriteLocks.ContainsKey(innerScope2Id));
+                Assert.IsFalse(realParentScope.WriteLocks.ContainsKey(innerScope1Id));
 
                 parentScope.Complete();
             }
@@ -454,15 +454,23 @@ namespace Umbraco.Tests.Scoping
             var scopeprovider = GetScopeProvider(out var syntaxProviderMock);
             var scope = (Scope) scopeprovider.CreateScope();
 
-            var readDict = new Dictionary<int, int>();
-            readDict[Constants.Locks.Languages] = 1;
-            scope.ReadLocks[Guid.NewGuid()] = readDict;
+            try
+            {
+                // Request a lock to create the ReadLocks dict.
+                scope.ReadLock(Constants.Locks.Domains);
 
-            Assert.Throws<InvalidOperationException>(() => scope.Dispose());
+                var readDict = new Dictionary<int, int>();
+                readDict[Constants.Locks.Languages] = 1;
+                scope.ReadLocks[Guid.NewGuid()] = readDict;
 
-            // We have to clear so we can properly dispose the scope, otherwise it'll mess with other tests.
-            scope.ReadLocks.Clear();
-            scope.Dispose();
+                Assert.Throws<InvalidOperationException>(() => scope.Dispose());
+            }
+            finally
+            {
+                // We have to clear so we can properly dispose the scope, otherwise it'll mess with other tests.
+                scope.ReadLocks?.Clear();
+                scope.Dispose();
+            }
         }
 
         [Test]
@@ -471,15 +479,47 @@ namespace Umbraco.Tests.Scoping
             var scopeprovider = GetScopeProvider(out var syntaxProviderMock);
             var scope = (Scope) scopeprovider.CreateScope();
 
-            var writeDict = new Dictionary<int, int>();
-            writeDict[Constants.Locks.Languages] = 1;
-            scope.WriteLocks[Guid.NewGuid()] = writeDict;
+            try
+            {
+                // Request a lock to create the ReadLocks dict.
+                scope.WriteLock(Constants.Locks.Domains);
 
-            Assert.Throws<InvalidOperationException>(() => scope.Dispose());
+                var writeDict = new Dictionary<int, int>();
+                writeDict[Constants.Locks.Languages] = 1;
+                scope.WriteLocks[Guid.NewGuid()] = writeDict;
 
-            // We have to clear so we can properly dispose the scope, otherwise it'll mess with other tests.
-            scope.WriteLocks.Clear();
-            scope.Dispose();
+                Assert.Throws<InvalidOperationException>(() => scope.Dispose());
+            }
+            finally
+            {
+                // We have to clear so we can properly dispose the scope, otherwise it'll mess with other tests.
+                scope.WriteLocks?.Clear();
+                scope.Dispose();
+            }
+        }
+
+        [Test]
+        public void WriteLocks_Not_Created_Until_First_Lock()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var scope = scopeProvider.CreateScope())
+            {
+                var realScope = (Scope) scope;
+                Assert.IsNull(realScope.WriteLocks);
+            }
+        }
+
+        [Test]
+        public void ReadLocks_Not_Created_Until_First_Lock()
+        {
+            var scopeProvider = GetScopeProvider(out var syntaxProviderMock);
+
+            using (var scope = scopeProvider.CreateScope())
+            {
+                var realScope = (Scope) scope;
+                Assert.IsNull(realScope.ReadLocks);
+            }
         }
     }
 }

From c504e3ab7e77ea720611cf04b5cae176269a301a Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 17 Mar 2021 13:40:14 +0100
Subject: [PATCH 134/202] Clean

---
 src/Umbraco.Core/Scoping/Scope.cs | 55 ++++++++++---------------------
 1 file changed, 18 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 0a3051855a..3729bf333e 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -39,9 +39,6 @@ namespace Umbraco.Core.Scoping
         private object _dictionaryLocker;
         private HashSet<int> _readLocks;
         private HashSet<int> _writeLocks;
-
-        // ReadLocks and WriteLocks if we're the outer most scope it's those owned by the entire chain
-        // If we're a child scope it's those that we have requested.
         internal Dictionary<Guid, Dictionary<int, int>> ReadLocks { get; private set; }
         internal Dictionary<Guid, Dictionary<int, int>> WriteLocks { get; private set; }
 
@@ -577,25 +574,16 @@ namespace Umbraco.Core.Scoping
         /// <param name="instanceId">Instance ID of the scope to clear of lock counters.</param>
         private void ClearReadLocks(Guid instanceId)
         {
-            if (ParentScope != null)
+            if (ParentScope is not null)
             {
                 ParentScope.ClearReadLocks(instanceId);
             }
             else
             {
-                if (ReadLocks is null)
-                {
-                    // If ReadLocks is null, no locks has been requested and we don't have to do anything.
-                    return;
-                }
-
                 lock (_dictionaryLocker)
                 {
                     // Remove the scope from the dictionary because it's getting disposed.
-                    if (ReadLocks.ContainsKey(instanceId))
-                    {
-                        ReadLocks.Remove(instanceId);
-                    }
+                    ReadLocks?.Remove(instanceId);
                 }
             }
         }
@@ -606,26 +594,17 @@ namespace Umbraco.Core.Scoping
         /// <param name="instanceID">Instance ID of the scope to clear of lock counters.</param>
         private void ClearWriteLocks(Guid instanceID)
         {
-            if (ParentScope != null)
+            if (ParentScope is not null)
             {
                 ParentScope.ClearWriteLocks(instanceID);
             }
             else
             {
-                if (WriteLocks is null)
-                {
-                    return;
-                }
-
                 lock (_dictionaryLocker)
                 {
                     // Remove the scope from the dictionary because it's getting disposed.
-                    if (WriteLocks.ContainsKey(instanceID))
-                    {
-                        WriteLocks.Remove(instanceID);
-                    }
+                    WriteLocks?.Remove(instanceID);
                 }
-
             }
         }
 
@@ -656,11 +635,12 @@ namespace Umbraco.Core.Scoping
         /// <summary>
         /// Handles acquiring a read lock, will delegate it to the parent if there are any.
         /// </summary>
+        /// <param name="instanceId">Instance ID of the requesting scope.</param>
         /// <param name="timeout">Optional database timeout in milliseconds.</param>
         /// <param name="lockIds">Array of lock object identifiers.</param>
         private void ReadLockInner(Guid instanceId, TimeSpan? timeout = null, params int[] lockIds)
         {
-            if (ParentScope != null)
+            if (ParentScope is not null)
             {
                 // Delegate acquiring the lock to the parent if any.
                 ParentScope.ReadLockInner(instanceId, timeout, lockIds);
@@ -670,7 +650,7 @@ namespace Umbraco.Core.Scoping
             lock (_dictionaryLocker)
             {
                 _readLocks ??= new HashSet<int>();
-                // If we are the parent, then handle the lock request.
+                // We are the parent handle the lock request.
                 foreach (var lockId in lockIds)
                 {
                     // Only acquire the lock if we haven't done so yet.
@@ -694,16 +674,16 @@ namespace Umbraco.Core.Scoping
                         catch
                         {
                             // Something went wrong and we didn't get the lock
-                            // Since we at this point have determined that we haven't got any key of LockID, it's safe to completely remove it instead of decrementing.
-                            // It needs to be completely removed, because that's how we determine to acquire a lock.
+                            // Since we at this point have determined that we haven't got any lock with an ID of LockID, it's safe to completely remove it instead of decrementing.
                             ReadLocks[instanceId].Remove(lockId);
+                            // It needs to be removed from the HashSet as well, because that's how we determine to acquire a lock.
                             _readLocks.Remove(lockId);
                             throw;
                         }
                     }
                     else
                     {
-                        // We already have a lock, but need to update the readlock dictionary for debugging purposes.
+                        // We already have a lock, but need to update the ReadLock dictionary for debugging purposes.
                         IncrementReadLock(lockId, instanceId);
                     }
                 }
@@ -713,11 +693,12 @@ namespace Umbraco.Core.Scoping
         /// <summary>
         /// Handles acquiring a write lock with a specified timeout, will delegate it to the parent if there are any.
         /// </summary>
+        /// <param name="instanceId">Instance ID of the requesting scope.</param>
         /// <param name="timeout">Optional database timeout in milliseconds.</param>
         /// <param name="lockIds">Array of lock object identifiers.</param>
-        internal void WriteLockInner(Guid instanceId, TimeSpan? timeout = null, params int[] lockIds)
+        private void WriteLockInner(Guid instanceId, TimeSpan? timeout = null, params int[] lockIds)
         {
-            if (ParentScope != null)
+            if (ParentScope is not null)
             {
                 // If we have a parent we delegate lock creation to parent.
                 ParentScope.WriteLockInner(instanceId, timeout, lockIds);
@@ -729,7 +710,7 @@ namespace Umbraco.Core.Scoping
                 _writeLocks ??= new HashSet<int>();
                 foreach (var lockId in lockIds)
                 {
-                    // Only acquire lock if we haven't yet (WriteLocks not containing the key)
+                    // Only acquire lock if we haven't yet
                     if (!_writeLocks.Contains(lockId))
                     {
                         IncrementWriteLock(lockId, instanceId);
@@ -748,9 +729,9 @@ namespace Umbraco.Core.Scoping
                         catch
                         {
                             // Something went wrong and we didn't get the lock
-                            // Since we at this point have determined that we haven't got any key of LockID, it's safe to completely remove it instead of decrementing.
-                            // It needs to be completely removed, because that's how we determine to acquire a lock.
+                            // Since we at this point have determined that we haven't got any lock with an ID of LockID, it's safe to completely remove it instead of decrementing.
                             WriteLocks[instanceId].Remove(lockId);
+                            // It needs to be removed from the HashSet as well, because that's how we determine to acquire a lock.
                             _writeLocks.Remove(lockId);
                             throw;
                         }
@@ -781,7 +762,7 @@ namespace Umbraco.Core.Scoping
         private void ObtainTimoutReadLock(int lockId, TimeSpan timeout)
         {
             var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
-            if (syntax2 == null)
+            if (syntax2 is null)
             {
                 throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
             }
@@ -806,7 +787,7 @@ namespace Umbraco.Core.Scoping
         private void ObtainTimeoutWriteLock(int lockId, TimeSpan timeout)
         {
             var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
-            if (syntax2 == null)
+            if (syntax2 is null)
             {
                 throw new InvalidOperationException($"{Database.SqlContext.SqlSyntax.GetType()} is not of type {typeof(ISqlSyntaxProvider2)}");
             }

From ab16a408a8b852287952f8d655243b665988f1b8 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 17 Mar 2021 14:04:48 +0100
Subject: [PATCH 135/202] Adds a config for configuring the access rules on the
 content dashboard - by default it granted for all user groups

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  1 +
 .../config/content.dashboard.access.config.js | 22 ++++++++++++++++
 .../Dashboards/ContentDashboard.cs            | 26 ++++++++++++++-----
 3 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Web.UI/config/content.dashboard.access.config.js

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index eb6649a7c4..7fb27deb7e 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -148,6 +148,7 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Content Include="Config\content.dashboard.access.config.js" />
     <Content Include="Config\grid.editors.config.js" />
     <Content Include="Config\Lang\cs-CZ.user.xml" />
     <Content Include="Config\Lang\da-DK.user.xml" />
diff --git a/src/Umbraco.Web.UI/config/content.dashboard.access.config.js b/src/Umbraco.Web.UI/config/content.dashboard.access.config.js
new file mode 100644
index 0000000000..93c727d85a
--- /dev/null
+++ b/src/Umbraco.Web.UI/config/content.dashboard.access.config.js
@@ -0,0 +1,22 @@
+[
+    {
+        "Type": "grant",
+        "Value": "admin"
+    },
+    {
+        "Type": "grant",
+        "Value": "editor"
+    },
+    {
+        "Type": "grant",
+        "Value": "sensitiveData"
+    },
+    {
+        "Type": "grant",
+        "Value": "translator"
+    },
+    {
+        "Type": "grant",
+        "Value": "writer"
+    }
+]
diff --git a/src/Umbraco.Web/Dashboards/ContentDashboard.cs b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
index 0cd96f738c..3dbc0cb693 100644
--- a/src/Umbraco.Web/Dashboards/ContentDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
@@ -1,6 +1,9 @@
-using Umbraco.Core;
+using System.IO;
+using Newtonsoft.Json;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
+using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Dashboards
 {
@@ -9,7 +12,7 @@ namespace Umbraco.Web.Dashboards
     {
         public string Alias => "contentIntro";
 
-        public string[] Sections => new [] { "content" };
+        public string[] Sections => new[] { "content" };
 
         public string View => "views/dashboard/default/startupdashboardintro.html";
 
@@ -17,11 +20,22 @@ namespace Umbraco.Web.Dashboards
         {
             get
             {
-                var rules = new IAccessRule[]
+                IAccessRule[] rules;
+                var dashboardConfig = Path.Combine(IOHelper.MapPath(SystemDirectories.Config), "content.dashboard.access.config.js");
+
+                if (File.Exists(dashboardConfig))
                 {
-                    new AccessRule {Type = AccessRuleType.Deny, Value = Constants.Security.TranslatorGroupAlias},
-                    new AccessRule {Type = AccessRuleType.Grant, Value = Constants.Security.AdminGroupAlias}
-                };
+                    var rawJson = File.ReadAllText(dashboardConfig);
+                    rules = JsonConvert.DeserializeObject<AccessRule[]>(rawJson);
+                }
+                else
+                {
+                    rules = new IAccessRule[]
+                    {
+                        new AccessRule {Type = AccessRuleType.Deny, Value = Constants.Security.TranslatorGroupAlias},
+                        new AccessRule {Type = AccessRuleType.Grant, Value = Constants.Security.AdminGroupAlias}
+                    };
+                }
                 return rules;
             }
         }

From 3393ac8d0369c097e306d419201fb299c939a560 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 17 Mar 2021 14:05:47 +0100
Subject: [PATCH 136/202] Adds additional params indicating whether user is
 admin

---
 src/Umbraco.Web/Editors/DashboardController.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index eef0b5df93..c7ce4e1220 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -17,6 +17,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Core.Dashboards;
+using Umbraco.Core.Models;
 using Umbraco.Web.Services;
 
 namespace Umbraco.Web.Editors
@@ -52,8 +53,9 @@ namespace Umbraco.Web.Editors
             var allowedSections = string.Join(",", user.AllowedSections);
             var language = user.Language;
             var version = UmbracoVersion.SemanticVersion.ToSemanticString();
+            var isAdmin = user.IsAdmin();
 
-            var url = string.Format(baseUrl + "{0}?section={0}&allowed={1}&lang={2}&version={3}", section, allowedSections, language, version);
+            var url = string.Format(baseUrl + "{0}?section={0}&allowed={1}&lang={2}&version={3}&admin={4}", section, allowedSections, language, version, isAdmin);
             var key = "umbraco-dynamic-dashboard-" + language + allowedSections.Replace(",", "-") + section;
 
             var content = AppCaches.RuntimeCache.GetCacheItem<JObject>(key);

From e7a1db5604d4dd750a7093cfbdfa0b223ad026f9 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Wed, 17 Mar 2021 21:54:38 +1000
Subject: [PATCH 137/202] Add images in grid - fixes 9982 (#9987)

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
(cherry picked from commit e2019777fbfc1f9221d040cb9f0b82c57f8552b9)
---
 .../grid/editors/media.controller.js          | 40 ++++++++-----------
 1 file changed, 16 insertions(+), 24 deletions(-)

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 716ca405c1..94ea4b8604 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,9 +1,9 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
-    function ($scope, userService, editorService, localizationService) {        
-        
-        $scope.thumbnailUrl = getThumbnailUrl();        
-        
+    function ($scope, userService, editorService, localizationService) {
+
+        $scope.thumbnailUrl = getThumbnailUrl();
+
         if (!$scope.model.config.startNodeId) {
             if ($scope.model.config.ignoreUserStartNodes === true) {
                 $scope.model.config.startNodeId = -1;
@@ -29,16 +29,16 @@ angular.module("umbraco")
                 onlyImages: true,
                 dataTypeKey: $scope.model.dataTypeKey,
                 submit: model => {
-                    updateControlValue(model.selection[0]);                    
+                    updateControlValue(model.selection[0]);
                     editorService.close();
                 },
-                close: () => editorService.close()                
+                close: () => editorService.close()
             };
 
             editorService.mediaPicker(mediaPicker);
         };
 
-        $scope.editImage = function() {               
+        $scope.editImage = function() {
 
             const mediaCropDetailsConfig = {
                 size: 'small',
@@ -47,17 +47,17 @@ angular.module("umbraco")
                     updateControlValue(model.target);
                     editorService.close();
                 },
-                close: () => editorService.close()                
+                close: () => editorService.close()
             };
 
             localizationService.localize('defaultdialogs_editSelectedMedia').then(value => {
                 mediaCropDetailsConfig.title = value;
                 editorService.mediaCropDetails(mediaCropDetailsConfig);
-            });        
+            });
         }
-        
+
         /**
-         * 
+         *
          */
         function getThumbnailUrl() {
 
@@ -94,19 +94,15 @@ angular.module("umbraco")
 
                 return url;
             }
-            
+
             return null;
         }
 
         /**
-         * 
-         * @param {object} selectedImage 
+         *
+         * @param {object} selectedImage
          */
         function updateControlValue(selectedImage) {
-
-            const doGetThumbnail = $scope.control.value.focalPoint !== selectedImage.focalPoint 
-                || $scope.control.value.image !== selectedImage.image;
-
             // we could apply selectedImage directly to $scope.control.value,
             // but this allows excluding fields in future if needed
             $scope.control.value = {
@@ -118,10 +114,6 @@ angular.module("umbraco")
                 caption: selectedImage.caption,
                 altText: selectedImage.altText
             };
-
-
-            if (doGetThumbnail) {
-                $scope.thumbnailUrl = getThumbnailUrl();
-            }
-        }       
+            $scope.thumbnailUrl = getThumbnailUrl();
+        }
     });

From 548435dcc3f1f23df7f83dcc77fdfc87963ea355 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 17 Mar 2021 17:40:47 +0100
Subject: [PATCH 138/202] Bump version to 8.12.2

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index e92eefdf52..4162f47da6 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.12.1")]
-[assembly: AssemblyInformationalVersion("8.12.1")]
+[assembly: AssemblyFileVersion("8.12.2")]
+[assembly: AssemblyInformationalVersion("8.12.2")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index eb6649a7c4..2ad23e1b73 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -347,9 +347,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8121</DevelopmentServerPort>
+          <DevelopmentServerPort>8122</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8121</IISUrl>
+          <IISUrl>http://localhost:8122</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 3004e00b4f6955982ff456d3ccc10b2dcee7245c Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Mon, 15 Mar 2021 10:32:32 +0100
Subject: [PATCH 139/202] #9964 Removed unneeded check for HttpContext

---
 src/Umbraco.Core/IO/IOHelper.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index 8661f73fb1..69ce50de9c 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -81,6 +81,7 @@ namespace Umbraco.Core.IO
         public static string MapPath(string path, bool useHttpContext)
         {
             if (path == null) throw new ArgumentNullException("path");
+
             useHttpContext = useHttpContext && IsHosted;
 
             // Check if the path is already mapped
@@ -89,10 +90,8 @@ namespace Umbraco.Core.IO
             {
                 return path;
             }
-            // Check that we even have an HttpContext! otherwise things will fail anyways
-            // http://umbraco.codeplex.com/workitem/30946
 
-            if (useHttpContext && HttpContext.Current != null)
+            if (useHttpContext)
             {
                 //string retval;
                 if (String.IsNullOrEmpty(path) == false && (path.StartsWith("~") || path.StartsWith(SystemDirectories.Root)))

From 2b9eaeee8a387f99edddebea55bda1795ab19fe7 Mon Sep 17 00:00:00 2001
From: Jeavon Leopold <jeavon@crumpled-dog.com>
Date: Tue, 9 Mar 2021 13:16:54 +0000
Subject: [PATCH 140/202] Fix for #9950 - HttpsCheck will now retry using the
 login background image if inital request returns 301/302. Excessvie Headers
 check will now check the root url instead of the backoffice

---
 .../Checks/Security/ExcessiveHeadersCheck.cs  |  4 ++--
 .../HealthCheck/Checks/Security/HttpsCheck.cs | 21 ++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
index fd76b9d486..33cf89b2e4 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
@@ -49,7 +49,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Security
         {
             var message = string.Empty;
             var success = false;
-            var url = _runtime.ApplicationUrl;
+            var url = _runtime.ApplicationUrl.GetLeftPart(UriPartial.Authority);
 
             // Access the site home page and check for the headers
             var request = WebRequest.Create(url);
@@ -69,7 +69,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Security
             }
             catch (Exception ex)
             {
-                message = _textService.Localize("healthcheck/httpsCheckInvalidUrl", new[] { url.ToString(), ex.Message });
+                message = _textService.Localize("healthcheck/healthCheckInvalidUrl", new[] { url.ToString(), ex.Message });
             }
 
             var actions = new List<HealthCheckAction>();
diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
index 98f8a83c1d..83fafb79f8 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
-using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Services;
 using Umbraco.Web.HealthCheck.Checks.Config;
@@ -21,14 +21,16 @@ namespace Umbraco.Web.HealthCheck.Checks.Security
         private readonly ILocalizedTextService _textService;
         private readonly IRuntimeState _runtime;
         private readonly IGlobalSettings _globalSettings;
+        private readonly IContentSection _contentSection;
 
         private const string FixHttpsSettingAction = "fixHttpsSetting";
 
-        public HttpsCheck(ILocalizedTextService textService, IRuntimeState runtime, IGlobalSettings globalSettings)
+        public HttpsCheck(ILocalizedTextService textService, IRuntimeState runtime, IGlobalSettings globalSettings, IContentSection contentSection)
         {
             _textService = textService;
             _runtime = runtime;
             _globalSettings = globalSettings;
+            _contentSection = contentSection;
         }
 
         /// <summary>
@@ -65,12 +67,25 @@ namespace Umbraco.Web.HealthCheck.Checks.Security
             // Attempt to access the site over HTTPS to see if it HTTPS is supported
             // and a valid certificate has been configured
             var url = _runtime.ApplicationUrl.ToString().Replace("http:", "https:");
+
             var request = (HttpWebRequest) WebRequest.Create(url);
-            request.Method = "HEAD";
+            request.AllowAutoRedirect = false;
 
             try
             {
+
                 var response = (HttpWebResponse)request.GetResponse();
+
+                // Check for 301/302 as a external login provider such as UmbracoID might be in use
+                if (response.StatusCode == HttpStatusCode.Moved || response.StatusCode == HttpStatusCode.Redirect)
+                {
+                    // Reset request to use the static login background image
+                    var absoluteLoginBackgroundImage = $"{url}/{_contentSection.LoginBackgroundImage}";
+                    
+                    request = (HttpWebRequest)WebRequest.Create(absoluteLoginBackgroundImage);
+                    response = (HttpWebResponse)request.GetResponse();
+                }
+
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
                     // Got a valid response, check now for if certificate expiring within 14 days

From e17bf386a48df8fffa9e57f5360675e661f8eaac Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 18 Mar 2021 09:28:58 +0100
Subject: [PATCH 141/202] Merge pull request #9994 from umbraco/v8/bugfix/9993

Fixes #9993 - Cannot save empty image in Grid

(cherry picked from commit 0ecc933921f2dea9a2a16d6f395b44a039663ec6)
---
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 862837381a..f9eacd9e73 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -202,8 +202,8 @@ namespace Umbraco.Web.PropertyEditors
                     _richTextPropertyValueEditor.GetReferences(x.Value)))
                     yield return umbracoEntityReference;
 
-                foreach (var umbracoEntityReference in mediaValues.SelectMany(x =>
-                    _mediaPickerPropertyValueEditor.GetReferences(x.Value["udi"])))
+                foreach (var umbracoEntityReference in mediaValues.Where(x => x.Value.HasValues)
+                    .SelectMany(x => _mediaPickerPropertyValueEditor.GetReferences(x.Value["udi"])))
                     yield return umbracoEntityReference;
             }
         }

From 8f50bdbef48751649edac7c0c8cf314e0e80d1d4 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu, 18 Mar 2021 11:24:14 +0100
Subject: [PATCH 142/202] Apply suggestions from review

---
 src/Umbraco.Core/Scoping/Scope.cs           | 231 ++++++++------------
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs |   3 +-
 2 files changed, 94 insertions(+), 140 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 3729bf333e..04e1934bcc 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Text;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
@@ -39,8 +40,8 @@ namespace Umbraco.Core.Scoping
         private object _dictionaryLocker;
         private HashSet<int> _readLocks;
         private HashSet<int> _writeLocks;
-        internal Dictionary<Guid, Dictionary<int, int>> ReadLocks { get; private set; }
-        internal Dictionary<Guid, Dictionary<int, int>> WriteLocks { get; private set; }
+        internal Dictionary<Guid, Dictionary<int, int>> ReadLocks;
+        internal Dictionary<Guid, Dictionary<int, int>> WriteLocks;
 
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
@@ -361,15 +362,45 @@ namespace Umbraco.Core.Scoping
             }
 
             // Decrement the lock counters on the parent if any.
-            ClearReadLocks(InstanceId);
-            ClearWriteLocks(InstanceId);
+            ClearLocks(InstanceId);
             if (ParentScope is null)
             {
                 // We're the parent scope, make sure that locks of all scopes has been cleared
                 // Since we're only reading we don't have to be in a lock
                 if (ReadLocks is not null && ReadLocks.Any() || WriteLocks is not null && WriteLocks.Any())
                 {
-                    throw new InvalidOperationException($"All scopes has not been disposed from parent scope: {InstanceId}");
+                    // Dump the dicts into a message for the locks.
+                    StringBuilder builder = new StringBuilder();
+                    builder.AppendLine($"Lock counters aren't empty, suggesting a scope hasn't been properly disposed, parent id: {InstanceId}");
+                    if (ReadLocks is not null && ReadLocks.Any())
+                    {
+                        builder.AppendLine("Remaining ReadLocks:");
+                        foreach (var locksValues in ReadLocks)
+                        {
+                            builder.AppendLine($"Scope {locksValues.Key}:");
+                            foreach (var lockCounter in locksValues.Value)
+                            {
+                                builder.AppendLine($"\tLock ID: {lockCounter.Key} - times requested: {lockCounter.Value}");
+                            }
+                        }
+                    }
+
+                    if (WriteLocks is not null && WriteLocks.Any())
+                    {
+                        builder.AppendLine("Remaining WriteLocks:");
+                        foreach (var locksValues in WriteLocks)
+                        {
+                            builder.AppendLine($"Scope {locksValues.Key}:");
+                            foreach (var lockCounter in locksValues.Value)
+                            {
+                                builder.AppendLine($"\tLock ID: {lockCounter.Key}, amount requested: {lockCounter.Value}");
+                            }
+                        }
+                    }
+
+                    var exception = new InvalidOperationException($"All scopes has not been disposed from parent scope: {InstanceId}");
+                    _logger.Error<Scope>(exception, builder.ToString());
+                    throw exception;
                 }
             }
 
@@ -512,125 +543,64 @@ namespace Umbraco.Core.Scoping
             ?? (_logUncompletedScopes = Current.Configs.CoreDebug().LogUncompletedScopes)).Value;
 
         /// <summary>
-        /// Increment the counter in WriteLocks for a specific scope instance and lock identifier.
+        /// Increment the counter of a locks dictionary, either ReadLocks or WriteLocks,
+        /// for a specific scope instance and lock identifier. Must be called within a lock.
         /// </summary>
-        /// <remarks>
-        /// This will not lock on the lock object, ensure that you lock on _dictionaryLocker before calling this method.
-        /// </remarks>
         /// <param name="lockId">Lock ID to increment.</param>
         /// <param name="instanceId">Instance ID of the scope requesting the lock.</param>
-        private void IncrementWriteLock(int lockId, Guid instanceId)
+        /// <param name="locks">Reference to the dictionary to increment on</param>
+        private void IncrementLock(int lockId, Guid instanceId, ref Dictionary<Guid, Dictionary<int, int>> locks)
         {
             // Since we've already checked that we're the parent in the WriteLockInner method, we don't need to check again.
             // If it's the very first time a lock has been requested the WriteLocks dict hasn't been instantiated yet.
-            WriteLocks ??= new Dictionary<Guid, Dictionary<int, int>>();
+            locks ??= new Dictionary<Guid, Dictionary<int, int>>();
 
             // Try and get the dict associated with the scope id.
-            var locksDictFound = WriteLocks.TryGetValue(instanceId, out var locksDict);
+            var locksDictFound = locks.TryGetValue(instanceId, out var locksDict);
             if (locksDictFound)
             {
                 locksDict.TryGetValue(lockId, out var value);
-                WriteLocks[instanceId][lockId] = value + 1;
+                locksDict[lockId] = value + 1;
             }
             else
             {
                 // The scope hasn't requested a lock yet, so we have to create a dict for it.
-                WriteLocks[instanceId] = new Dictionary<int, int>();
-                WriteLocks[instanceId][lockId] = 1;
+                locks.Add(instanceId, new Dictionary<int, int>());
+                locks[instanceId][lockId] = 1;
             }
         }
 
         /// <summary>
-        /// Increment the counter in ReadLocks for a specific scope instance and lock identifier.
+        /// Clears all lock counters for a given scope instance, signalling that the scope has been disposed.
         /// </summary>
-        /// <remarks>
-        /// This will not lock on the lock object, ensure that you lock on _dictionaryLocker before calling this method.
-        /// </remarks>
-        /// <param name="lockId">Lock ID to increment.</param>
-        /// <param name="instanceId">Instance ID of the scope requesting the lock.</param>
-        private void IncrementReadLock(int lockId, Guid instanceId)
-        {
-            // Since we've already checked that we're the parent in the WriteLockInner method, we don't need to check again.
-            // If it's the very first time a lock has been requested the ReadLocks dict hasn't been instantiated yet.
-            ReadLocks ??= new Dictionary<Guid, Dictionary<int, int>>();
-
-            var locksDictFound = ReadLocks.TryGetValue(instanceId, out var locksDict);
-            if (locksDictFound)
-            {
-                locksDict.TryGetValue(lockId, out var value);
-                ReadLocks[instanceId][lockId] = value + 1;
-            }
-            else
-            {
-                // The scope hasn't requested a lock yet, so we have to create a dict for it.
-                ReadLocks[instanceId] = new Dictionary<int, int>();
-                ReadLocks[instanceId][lockId] = 1;
-            }
-        }
-
-        /// <summary>
-        /// Resets all read lock counters for a given scope instance to 0, signalling that the lock is no longer in use.
-        /// </summary>
-        /// <param name="instanceId">Instance ID of the scope to clear of lock counters.</param>
-        private void ClearReadLocks(Guid instanceId)
+        /// <param name="instanceId">Instance ID of the scope to clear.</param>
+        private void ClearLocks(Guid instanceId)
         {
             if (ParentScope is not null)
             {
-                ParentScope.ClearReadLocks(instanceId);
+                ParentScope.ClearLocks(instanceId);
             }
             else
             {
                 lock (_dictionaryLocker)
                 {
-                    // Remove the scope from the dictionary because it's getting disposed.
                     ReadLocks?.Remove(instanceId);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Resets all write lock counters for a given scope instance to 0, signalling that the lock is no longer in use.
-        /// </summary>
-        /// <param name="instanceID">Instance ID of the scope to clear of lock counters.</param>
-        private void ClearWriteLocks(Guid instanceID)
-        {
-            if (ParentScope is not null)
-            {
-                ParentScope.ClearWriteLocks(instanceID);
-            }
-            else
-            {
-                lock (_dictionaryLocker)
-                {
-                    // Remove the scope from the dictionary because it's getting disposed.
-                    WriteLocks?.Remove(instanceID);
+                    WriteLocks?.Remove(instanceId);
                 }
             }
         }
 
         /// <inheritdoc />
-        public void ReadLock(params int[] lockIds)
-        {
-            ReadLockInner(InstanceId, null, lockIds);
-        }
+        public void ReadLock(params int[] lockIds) => ReadLockInner(InstanceId, null, lockIds);
 
         /// <inheritdoc />
-        public void ReadLock(TimeSpan timeout, int lockId)
-        {
-            ReadLockInner(InstanceId, timeout, lockId);
-        }
+        public void ReadLock(TimeSpan timeout, int lockId) => ReadLockInner(InstanceId, timeout, lockId);
 
         /// <inheritdoc />
-        public void WriteLock(params int[] lockIds)
-        {
-            WriteLockInner(InstanceId, null, lockIds);
-        }
+        public void WriteLock(params int[] lockIds) => WriteLockInner(InstanceId, null, lockIds);
 
         /// <inheritdoc />
-        public void WriteLock(TimeSpan timeout, int lockId)
-        {
-            WriteLockInner(InstanceId, timeout, lockId);
-        }
+        public void WriteLock(TimeSpan timeout, int lockId) => WriteLockInner(InstanceId, timeout, lockId);
 
         /// <summary>
         /// Handles acquiring a read lock, will delegate it to the parent if there are any.
@@ -642,51 +612,13 @@ namespace Umbraco.Core.Scoping
         {
             if (ParentScope is not null)
             {
-                // Delegate acquiring the lock to the parent if any.
+                // If we have a parent we delegate lock creation to parent.
                 ParentScope.ReadLockInner(instanceId, timeout, lockIds);
-                return;
             }
-
-            lock (_dictionaryLocker)
+            else
             {
-                _readLocks ??= new HashSet<int>();
-                // We are the parent handle the lock request.
-                foreach (var lockId in lockIds)
-                {
-                    // Only acquire the lock if we haven't done so yet.
-                    if (!_readLocks.Contains(lockId))
-                    {
-                        IncrementReadLock(lockId, instanceId);
-                        _readLocks.Add(lockId);
-                        try
-                        {
-                            if (timeout is null)
-                            {
-                                // We just want an ordinary lock.
-                                ObtainReadLock(lockId);
-                            }
-                            else
-                            {
-                                // We want a lock with a custom timeout
-                                ObtainTimoutReadLock(lockId, timeout.Value);
-                            }
-                        }
-                        catch
-                        {
-                            // Something went wrong and we didn't get the lock
-                            // Since we at this point have determined that we haven't got any lock with an ID of LockID, it's safe to completely remove it instead of decrementing.
-                            ReadLocks[instanceId].Remove(lockId);
-                            // It needs to be removed from the HashSet as well, because that's how we determine to acquire a lock.
-                            _readLocks.Remove(lockId);
-                            throw;
-                        }
-                    }
-                    else
-                    {
-                        // We already have a lock, but need to update the ReadLock dictionary for debugging purposes.
-                        IncrementReadLock(lockId, instanceId);
-                    }
-                }
+                // We are the outermost scope, handle the lock request.
+                LockInner(instanceId, ref ReadLocks, ref _readLocks, ObtainReadLock, ObtainTimeoutReadLock, timeout, lockIds);
             }
         }
 
@@ -702,44 +634,65 @@ namespace Umbraco.Core.Scoping
             {
                 // If we have a parent we delegate lock creation to parent.
                 ParentScope.WriteLockInner(instanceId, timeout, lockIds);
-                return;
             }
+            else
+            {
+                // We are the outermost scope, handle the lock request.
+                LockInner(instanceId, ref WriteLocks, ref _writeLocks, ObtainWriteLock, ObtainTimeoutWriteLock, timeout, lockIds);
+            }
+        }
 
+        /// <summary>
+        /// Handles acquiring a lock, this should only be called from the outermost scope.
+        /// </summary>
+        /// <param name="instanceId">Instance ID of the scope requesting the lock.</param>
+        /// <param name="locks">Reference to the applicable locks dictionary (ReadLocks or WriteLocks).</param>
+        /// <param name="locksSet">Reference to the applicable locks hashset (_readLocks or _writeLocks).</param>
+        /// <param name="obtainLock">Delegate used to request the lock from the database without a timeout.</param>
+        /// <param name="obtainLockTimeout">Delegate used to request the lock from the database with a timeout.</param>
+        /// <param name="timeout">Optional timeout parameter to specify a timeout.</param>
+        /// <param name="lockIds">Lock identifiers to lock on.</param>
+        private void LockInner(Guid instanceId, ref Dictionary<Guid, Dictionary<int, int>> locks, ref HashSet<int> locksSet,
+            Action<int> obtainLock, Action<int, TimeSpan> obtainLockTimeout, TimeSpan? timeout = null,
+            params int[] lockIds)
+        {
             lock (_dictionaryLocker)
             {
-                _writeLocks ??= new HashSet<int>();
+                locksSet ??= new HashSet<int>();
                 foreach (var lockId in lockIds)
                 {
-                    // Only acquire lock if we haven't yet
-                    if (!_writeLocks.Contains(lockId))
+                    // Only acquire the lock if we haven't done so yet.
+                    if (!locksSet.Contains(lockId))
                     {
-                        IncrementWriteLock(lockId, instanceId);
-                        _writeLocks.Add(lockId);
+                        IncrementLock(lockId, instanceId, ref locks);
+                        locksSet.Add(lockId);
                         try
                         {
                             if (timeout is null)
                             {
-                                ObtainWriteLock(lockId);
+                                // We just want an ordinary lock.
+                                obtainLock(lockId);
                             }
                             else
                             {
-                                ObtainTimeoutWriteLock(lockId, timeout.Value);
+                                // We want a lock with a custom timeout
+                                obtainLockTimeout(lockId, timeout.Value);
                             }
                         }
                         catch
                         {
                             // Something went wrong and we didn't get the lock
                             // Since we at this point have determined that we haven't got any lock with an ID of LockID, it's safe to completely remove it instead of decrementing.
-                            WriteLocks[instanceId].Remove(lockId);
+                            locks[instanceId].Remove(lockId);
                             // It needs to be removed from the HashSet as well, because that's how we determine to acquire a lock.
-                            _writeLocks.Remove(lockId);
+                            locksSet.Remove(lockId);
                             throw;
                         }
                     }
                     else
                     {
-                        // We already have a lock, so just increment the count for debugging purposes
-                        IncrementWriteLock(lockId, instanceId);
+                        // We already have a lock, but need to update the dictionary for debugging purposes.
+                        IncrementLock(lockId, instanceId, ref locks);
                     }
                 }
             }
@@ -759,7 +712,7 @@ namespace Umbraco.Core.Scoping
         /// </summary>
         /// <param name="lockId">Lock object identifier to lock.</param>
         /// <param name="timeout">TimeSpan specifying the timout period.</param>
-        private void ObtainTimoutReadLock(int lockId, TimeSpan timeout)
+        private void ObtainTimeoutReadLock(int lockId, TimeSpan timeout)
         {
             var syntax2 = Database.SqlContext.SqlSyntax as ISqlSyntaxProvider2;
             if (syntax2 is null)
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index 579c0cc7cf..cb0a1c1bea 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Scoping;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Scoping
 {
@@ -481,7 +482,7 @@ namespace Umbraco.Tests.Scoping
 
             try
             {
-                // Request a lock to create the ReadLocks dict.
+                // Request a lock to create the WriteLocks dict.
                 scope.WriteLock(Constants.Locks.Domains);
 
                 var writeDict = new Dictionary<int, int>();

From 45de0a101eaa2b8f16e21a765f32928c7cb968be Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 18 Mar 2021 13:01:46 +0100
Subject: [PATCH 143/202] Fixes #9983 - Getting kicked, if document type has a
 Umbraco.UserPicker property (#10002)

* Fixes #9983

Temporary fix for this issue. using the entityservice like before.

* Needed to remove the call to usersResource here as well for displaying the picked items

* Don't need usersResource for now
---
 .../userpicker/userpicker.controller.js       | 16 +++-------
 .../userpicker/userpicker.controller.js       | 29 +++++++++++--------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
index a7021b2867..33d526c3cf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
@@ -1,8 +1,8 @@
 (function () {
     "use strict";
 
-    function UserPickerController($scope, usersResource, localizationService, eventsService) {
-        
+    function UserPickerController($scope, entityResource, localizationService, eventsService) {
+
         var vm = this;
 
         vm.users = [];
@@ -102,17 +102,9 @@
             vm.loading = true;
 
             // Get users
-            usersResource.getPagedResults(vm.usersOptions).then(function (users) {
-
-                vm.users = users.items;
-
-                vm.usersOptions.pageNumber = users.pageNumber;
-                vm.usersOptions.pageSize = users.pageSize;
-                vm.usersOptions.totalItems = users.totalItems;
-                vm.usersOptions.totalPages = users.totalPages;
-
+            entityResource.getAll("User").then(function (data) {
+                vm.users = data;
                 preSelect($scope.model.selection, vm.users);
-
                 vm.loading = false;
             });
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
index f2055fea3a..217a9c8421 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
@@ -1,4 +1,4 @@
-function userPickerController($scope, usersResource , iconHelper, editorService, overlayService){
+function userPickerController($scope, iconHelper, editorService, overlayService, entityResource) {
 
     function trim(str, chr) {
         var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
@@ -92,17 +92,22 @@ function userPickerController($scope, usersResource , iconHelper, editorService,
         unsubscribe();
     });
 
-    //load user data
-    var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
-
-    // entityResource.getByIds doesn't support "User" and we would like to show avatars in umb-user-preview as well.
-    usersResource.getUsers(modelIds).then(function (data) {
-        _.each(data, function (item, i) {
-            // set default icon if it's missing
-            item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user";
-            $scope.renderModel.push({ name: item.name, id: item.id, udi: item.udi, icon: item.icon, avatars: item.avatars });
-        });
-    });
+    //load user data - split to an array of ints (map)
+    const modelIds = $scope.model.value ? $scope.model.value.split(',').map(x => +x) : [];
+    if(modelIds.length !== 0) {
+        entityResource.getAll("User").then(function (users) {
+            const filteredUsers = users.filter(user => modelIds.indexOf(user.id) !== -1);
+            filteredUsers.forEach(item => {
+                    $scope.renderModel.push({
+                        name: item.name,
+                        id: item.id,
+                        udi: item.udi,
+                        icon: item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user",
+                        avatars: item.avatars
+                    });
+                });
+            });
+    }
 }
 
 

From 73439d4cbab197fa9292761c04c50b08db8663ae Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 18 Mar 2021 13:01:46 +0100
Subject: [PATCH 144/202] Fixes #9983 - Getting kicked, if document type has a
 Umbraco.UserPicker property (#10002)

* Fixes #9983

Temporary fix for this issue. using the entityservice like before.

* Needed to remove the call to usersResource here as well for displaying the picked items

* Don't need usersResource for now

(cherry picked from commit 45de0a101eaa2b8f16e21a765f32928c7cb968be)
---
 .../userpicker/userpicker.controller.js       | 16 +++-------
 .../userpicker/userpicker.controller.js       | 29 +++++++++++--------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
index a7021b2867..33d526c3cf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
@@ -1,8 +1,8 @@
 (function () {
     "use strict";
 
-    function UserPickerController($scope, usersResource, localizationService, eventsService) {
-        
+    function UserPickerController($scope, entityResource, localizationService, eventsService) {
+
         var vm = this;
 
         vm.users = [];
@@ -102,17 +102,9 @@
             vm.loading = true;
 
             // Get users
-            usersResource.getPagedResults(vm.usersOptions).then(function (users) {
-
-                vm.users = users.items;
-
-                vm.usersOptions.pageNumber = users.pageNumber;
-                vm.usersOptions.pageSize = users.pageSize;
-                vm.usersOptions.totalItems = users.totalItems;
-                vm.usersOptions.totalPages = users.totalPages;
-
+            entityResource.getAll("User").then(function (data) {
+                vm.users = data;
                 preSelect($scope.model.selection, vm.users);
-
                 vm.loading = false;
             });
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
index f2055fea3a..217a9c8421 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
@@ -1,4 +1,4 @@
-function userPickerController($scope, usersResource , iconHelper, editorService, overlayService){
+function userPickerController($scope, iconHelper, editorService, overlayService, entityResource) {
 
     function trim(str, chr) {
         var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
@@ -92,17 +92,22 @@ function userPickerController($scope, usersResource , iconHelper, editorService,
         unsubscribe();
     });
 
-    //load user data
-    var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
-
-    // entityResource.getByIds doesn't support "User" and we would like to show avatars in umb-user-preview as well.
-    usersResource.getUsers(modelIds).then(function (data) {
-        _.each(data, function (item, i) {
-            // set default icon if it's missing
-            item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user";
-            $scope.renderModel.push({ name: item.name, id: item.id, udi: item.udi, icon: item.icon, avatars: item.avatars });
-        });
-    });
+    //load user data - split to an array of ints (map)
+    const modelIds = $scope.model.value ? $scope.model.value.split(',').map(x => +x) : [];
+    if(modelIds.length !== 0) {
+        entityResource.getAll("User").then(function (users) {
+            const filteredUsers = users.filter(user => modelIds.indexOf(user.id) !== -1);
+            filteredUsers.forEach(item => {
+                    $scope.renderModel.push({
+                        name: item.name,
+                        id: item.id,
+                        udi: item.udi,
+                        icon: item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user",
+                        avatars: item.avatars
+                    });
+                });
+            });
+    }
 }
 
 

From 7f1d5fe7cc4615846f2df555246bb58e8cd023c8 Mon Sep 17 00:00:00 2001
From: Benjamin Carleski <benjamin@proworks.com>
Date: Thu, 18 Mar 2021 15:04:03 -0700
Subject: [PATCH 145/202] 8539: Allow alias in image cropper (#9266)

Co-authored-by: Owain Williams <owaingdwilliams@gmail.com>
---
 src/Umbraco.Core/StringExtensions.cs          | 41 ++++++++++++++++++-
 .../services/umbrequesthelper.service.js      |  4 +-
 .../Binders/ContentModelBinderHelper.cs       |  9 +++-
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index 80ef81f36d..0e16c2c852 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core
     ///</summary>
     public static class StringExtensions
     {
-
+        private const char DefaultEscapedStringEscapeChar = '\\';
         private static readonly char[] ToCSharpHexDigitLower = "0123456789abcdef".ToCharArray();
         private static readonly char[] ToCSharpEscapeChars;
 
@@ -1490,5 +1490,44 @@ namespace Umbraco.Core
         /// </summary>
         public static string NullOrWhiteSpaceAsNull(this string text)
             => string.IsNullOrWhiteSpace(text) ? null : text;
+
+        /// <summary>
+        /// Splits a string with an escape character that allows for the split character to exist in a string
+        /// </summary>
+        /// <param name="value">The string to split</param>
+        /// <param name="splitChar">The character to split on</param>
+        /// <param name="escapeChar">The character which can be used to escape the character to split on</param>
+        /// <returns>The string split into substrings delimited by the split character</returns>
+        public static IEnumerable<string> EscapedSplit(this string value, char splitChar, char escapeChar = DefaultEscapedStringEscapeChar)
+        {
+            if (value == null) yield break;
+
+            var sb = new StringBuilder(value.Length);
+            var escaped = false;
+
+            foreach (var chr in value.ToCharArray())
+            {
+                if (escaped)
+                {
+                    escaped = false;
+                    sb.Append(chr);
+                }
+                else if (chr == splitChar)
+                {
+                    yield return sb.ToString();
+                    sb.Clear();
+                }
+                else if (chr == escapeChar)
+                {
+                    escaped = true;
+                }
+                else
+                {
+                    sb.Append(chr);
+                }
+            }
+
+            yield return sb.ToString();
+        }
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index 0a4009264d..2b5447cdf6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -252,10 +252,10 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                         //each item has a property alias and the file object, we'll ensure that the alias is suffixed to the key
                         // so we know which property it belongs to on the server side
                         var file = args.files[f];
-                        var fileKey = "file_" + file.alias + "_" + (file.culture ? file.culture : "") + "_" + (file.segment ? file.segment : "");
+                        var fileKey = "file_" + (file.alias || '').replace(/_/g, '\\_') + "_" + (file.culture ? file.culture.replace(/_/g, '\\_') : "") + "_" + (file.segment ? file.segment.replace(/_/g, '\\_') : "");
 
                         if (Utilities.isArray(file.metaData) && file.metaData.length > 0) {
-                            fileKey += ("_" + file.metaData.join("_"));
+                            fileKey += ("_" + _.map(file.metaData, x => ('' + x).replace(/_/g, '\\_')).join("_"));
                         }
                         formData.append(fileKey, file.file);
                     }
diff --git a/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs b/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
index e0d39b5f65..75060d059a 100644
--- a/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
+++ b/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
@@ -1,5 +1,9 @@
-using System.Net;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
 using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Web.Http;
 using System.Web.Http.Controllers;
 using Umbraco.Core;
@@ -17,6 +21,8 @@ namespace Umbraco.Web.Editors.Binders
     /// </summary>
     internal static class ContentModelBinderHelper
     {
+        private const char _escapeChar = '\\';
+
         public static TModelSave BindModelFromMultipartRequest<TModelSave>(HttpActionContext actionContext, ModelBindingContext bindingContext)
             where TModelSave : IHaveUploadedFiles
         {
@@ -30,6 +36,7 @@ namespace Umbraco.Web.Editors.Binders
                 //The name that has been assigned in JS has 2 or more parts. The second part indicates the property id
                 // for which the file belongs, the remaining parts are just metadata that can be used by the property editor.
                 var parts = file.Headers.ContentDisposition.Name.Trim(Constants.CharArrays.DoubleQuote).Split(Constants.CharArrays.Underscore);
+
                 if (parts.Length < 2)
                 {
                     var response = actionContext.Request.CreateResponse(HttpStatusCode.BadRequest);

From 95f42487d4f4675cfebadc37d468b3f4b5496047 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 19 Mar 2021 08:37:23 +0100
Subject: [PATCH 146/202] Wrap dumping dictionaries in a method.

---
 src/Umbraco.Core/Scoping/Scope.cs | 54 +++++++++++++++----------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 04e1934bcc..8075d9b165 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Text;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
@@ -367,38 +366,15 @@ namespace Umbraco.Core.Scoping
             {
                 // We're the parent scope, make sure that locks of all scopes has been cleared
                 // Since we're only reading we don't have to be in a lock
-                if (ReadLocks is not null && ReadLocks.Any() || WriteLocks is not null && WriteLocks.Any())
+                if (ReadLocks?.Count > 0 || WriteLocks?.Count > 0)
                 {
                     // Dump the dicts into a message for the locks.
                     StringBuilder builder = new StringBuilder();
                     builder.AppendLine($"Lock counters aren't empty, suggesting a scope hasn't been properly disposed, parent id: {InstanceId}");
-                    if (ReadLocks is not null && ReadLocks.Any())
-                    {
-                        builder.AppendLine("Remaining ReadLocks:");
-                        foreach (var locksValues in ReadLocks)
-                        {
-                            builder.AppendLine($"Scope {locksValues.Key}:");
-                            foreach (var lockCounter in locksValues.Value)
-                            {
-                                builder.AppendLine($"\tLock ID: {lockCounter.Key} - times requested: {lockCounter.Value}");
-                            }
-                        }
-                    }
+                    WriteLockDictionaryToString(ReadLocks, builder, "read locks");
+                    WriteLockDictionaryToString(WriteLocks, builder, "write locks");
 
-                    if (WriteLocks is not null && WriteLocks.Any())
-                    {
-                        builder.AppendLine("Remaining WriteLocks:");
-                        foreach (var locksValues in WriteLocks)
-                        {
-                            builder.AppendLine($"Scope {locksValues.Key}:");
-                            foreach (var lockCounter in locksValues.Value)
-                            {
-                                builder.AppendLine($"\tLock ID: {lockCounter.Key}, amount requested: {lockCounter.Value}");
-                            }
-                        }
-                    }
-
-                    var exception = new InvalidOperationException($"All scopes has not been disposed from parent scope: {InstanceId}");
+                    var exception = new InvalidOperationException($"All scopes has not been disposed from parent scope: {InstanceId}, see log for more details.");
                     _logger.Error<Scope>(exception, builder.ToString());
                     throw exception;
                 }
@@ -423,6 +399,28 @@ namespace Umbraco.Core.Scoping
             GC.SuppressFinalize(this);
         }
 
+        /// <summary>
+        /// Writes a locks dictionary to a <see cref="StringBuilder"/> for logging purposes.
+        /// </summary>
+        /// <param name="dict">Lock dictionary to report on.</param>
+        /// <param name="builder">String builder to write to.</param>
+        /// <param name="dictName">The name to report the dictionary as.</param>
+        private void WriteLockDictionaryToString(Dictionary<Guid, Dictionary<int, int>> dict, StringBuilder builder, string dictName)
+        {
+            if (dict?.Count > 0)
+            {
+                builder.AppendLine($"Remaining {dictName}:");
+                foreach (var instance in dict)
+                {
+                    builder.AppendLine($"Scope {instance.Key}");
+                    foreach (var lockCounter in instance.Value)
+                    {
+                        builder.AppendLine($"\tLock ID: {lockCounter.Key} - times requested: {lockCounter.Value}");
+                    }
+                }
+            }
+        }
+
         private void DisposeLastScope()
         {
             // figure out completed

From 507c821f66877f521ffc52ff079d9c7eb48f54da Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Fri, 19 Mar 2021 13:19:39 +0100
Subject: [PATCH 147/202] Create method for generating log message

And remove forgotten comments.
---
 src/Umbraco.Core/Scoping/Scope.cs           | 22 ++++++++++++++-------
 src/Umbraco.Tests/Scoping/ScopeUnitTests.cs |  2 --
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 8075d9b165..3a11e0661e 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -368,14 +368,8 @@ namespace Umbraco.Core.Scoping
                 // Since we're only reading we don't have to be in a lock
                 if (ReadLocks?.Count > 0 || WriteLocks?.Count > 0)
                 {
-                    // Dump the dicts into a message for the locks.
-                    StringBuilder builder = new StringBuilder();
-                    builder.AppendLine($"Lock counters aren't empty, suggesting a scope hasn't been properly disposed, parent id: {InstanceId}");
-                    WriteLockDictionaryToString(ReadLocks, builder, "read locks");
-                    WriteLockDictionaryToString(WriteLocks, builder, "write locks");
-
                     var exception = new InvalidOperationException($"All scopes has not been disposed from parent scope: {InstanceId}, see log for more details.");
-                    _logger.Error<Scope>(exception, builder.ToString());
+                    _logger.Error<Scope>(exception, GenerateUnclearedScopesLogMessage());
                     throw exception;
                 }
             }
@@ -399,6 +393,20 @@ namespace Umbraco.Core.Scoping
             GC.SuppressFinalize(this);
         }
 
+        /// <summary>
+        /// Generates a log message with all scopes that hasn't cleared their locks, including how many, and what locks they have requested.
+        /// </summary>
+        /// <returns>Log message.</returns>
+        private string GenerateUnclearedScopesLogMessage()
+        {
+            // Dump the dicts into a message for the locks.
+            StringBuilder builder = new StringBuilder();
+            builder.AppendLine($"Lock counters aren't empty, suggesting a scope hasn't been properly disposed, parent id: {InstanceId}");
+            WriteLockDictionaryToString(ReadLocks, builder, "read locks");
+            WriteLockDictionaryToString(WriteLocks, builder, "write locks");
+            return builder.ToString();
+        }
+
         /// <summary>
         /// Writes a locks dictionary to a <see cref="StringBuilder"/> for logging purposes.
         /// </summary>
diff --git a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
index cb0a1c1bea..038376f71c 100644
--- a/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeUnitTests.cs
@@ -94,7 +94,6 @@ namespace Umbraco.Tests.Scoping
                 outerScope.Complete();
             }
 
-            // Since we request the ReadLock after the innerScope has been dispose, the key has been removed from the dictionary, and we fetch it again.
             syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
             syntaxProviderMock.Verify(x => x.WriteLock(It.IsAny<IDatabase>(), Constants.Locks.ContentTree), Times.Once);
         }
@@ -223,7 +222,6 @@ namespace Umbraco.Tests.Scoping
                 outerScope.Complete();
             }
 
-            // Since we request the ReadLock after the innerScope has been dispose, the key has been removed from the dictionary, and we fetch it again.
             syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), Constants.Locks.Languages), Times.Once);
             syntaxProviderMock.Verify(x => x.ReadLock(It.IsAny<IDatabase>(), Constants.Locks.ContentTree), Times.Once);
         }

From 691c5d38a2edfb052ba9ceaeee1d3016de41f26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20L=C3=B6fgren?= <jesper.lofgren@sappa.se>
Date: Fri, 19 Mar 2021 12:27:27 +0100
Subject: [PATCH 148/202] Fix swedish translation for somethingElse.

---
 src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
index 9c237815bf..a9625a9741 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -136,7 +136,7 @@
     <key alias="select">Välj</key>
     <key alias="saveAndPreview">Förhandsgranska</key>
     <key alias="showPageDisabled">Förhandsgranskning är avstängt på grund av att det inte finns någon mall tilldelad</key>
-    <key alias="somethingElse">Ångra</key>
+    <key alias="somethingElse">Gör något annat</key>
     <key alias="styleChoose">Välj stil</key>
     <key alias="styleShow">Visa stil</key>
     <key alias="tableInsert">Infoga tabell</key>

From 046d6351d2e6e3ab74aabaf74e21bfe7b1c2775d Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Mar 2021 03:09:20 +0100
Subject: [PATCH 149/202] Copy member type (#10020)

* Add copy dialog for member type

* Implement copy action for member type

* Create specific localization for content type, media type and member type

* Handle "foldersonly" querystring

* Add button type attribute

* Add a few missing changes of anchor to button element
---
 .../common/resources/contenttype.resource.js  |  8 ++-
 .../common/resources/mediatype.resource.js    |  4 +-
 .../common/resources/membertype.resource.js   | 25 +++++++-
 .../src/views/documenttypes/copy.html         |  2 +-
 .../src/views/documenttypes/export.html       |  4 +-
 .../documenttypes/importdocumenttype.html     |  6 +-
 .../src/views/documenttypes/move.html         |  2 +-
 .../src/views/mediatypes/copy.html            |  2 +-
 .../src/views/mediatypes/move.html            |  2 +-
 .../src/views/membertypes/copy.controller.js  | 61 +++++++++++++++++++
 .../src/views/membertypes/copy.html           | 53 ++++++++++++++++
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 11 ++++
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 11 ++++
 .../Umbraco/config/lang/en_us.xml             | 11 ++++
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml | 11 ++++
 .../Editors/MemberTypeController.cs           | 12 ++++
 .../MemberTypeAndGroupTreeControllerBase.cs   | 12 +++-
 .../Trees/MemberTypeTreeController.cs         |  1 +
 18 files changed, 221 insertions(+), 17 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/membertypes/copy.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/membertypes/copy.html

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
index 6acf702546..a3a5b1946d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
@@ -432,13 +432,15 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 throw "args.id cannot be null";
             }
 
+            var promise = localizationService.localize("contentType_moveFailed");
+
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostMove"),
                     {
                         parentId: args.parentId,
                         id: args.id
                     }, { responseType: 'text' }),
-                'Failed to move content');
+                promise);
         },
 
         /**
@@ -475,13 +477,15 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 throw "args.id cannot be null";
             }
 
+            var promise = localizationService.localize("contentType_copyFailed");
+
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCopy"),
                     {
                         parentId: args.parentId,
                         id: args.id
                     }, { responseType: 'text' }),
-                'Failed to copy content');
+                promise);
         },
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
index d194ae2c73..e3fab86067 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
@@ -208,7 +208,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter, locali
                 throw "args.id cannot be null";
             }
 
-            var promise = localizationService.localize("media_moveFailed");
+            var promise = localizationService.localize("mediaType_moveFailed");
 
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("mediaTypeApiBaseUrl", "PostMove"),
@@ -230,7 +230,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter, locali
                 throw "args.id cannot be null";
             }
 
-            var promise = localizationService.localize("media_copyFailed");
+            var promise = localizationService.localize("mediaType_copyFailed");
 
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("mediaTypeApiBaseUrl", "PostCopy"),
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
index 2314fa6d6c..bf02d9618e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
@@ -3,7 +3,7 @@
     * @name umbraco.resources.memberTypeResource
     * @description Loads in data for member types
     **/
-function memberTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
+function memberTypeResource($q, $http, umbRequestHelper, umbDataFormatter, localizationService) {
 
     return {
 
@@ -102,8 +102,29 @@ function memberTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
             return umbRequestHelper.resourcePromise(
                  $http.post(umbRequestHelper.getApiUrl("memberTypeApiBaseUrl", "PostSave"), saveModel),
                 'Failed to save data for member type id ' + contentType.id);
-        }
+        },
 
+        copy: function (args) {
+            if (!args) {
+                throw "args cannot be null";
+            }
+            if (!args.parentId) {
+                throw "args.parentId cannot be null";
+            }
+            if (!args.id) {
+                throw "args.id cannot be null";
+            }
+
+            var promise = localizationService.localize("memberType_copyFailed");
+
+            return umbRequestHelper.resourcePromise(
+                $http.post(umbRequestHelper.getApiUrl("memberTypeApiBaseUrl", "PostCopy"),
+                    {
+                        parentId: args.parentId,
+                        id: args.id
+                    }, { responseType: 'text' }),
+                promise);
+        }
     };
 }
 angular.module('umbraco.resources').factory('memberTypeResource', memberTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
index 8b81462ad5..824527be34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
@@ -20,7 +20,7 @@
                 <div class="alert alert-success">
                     <strong>{{source.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
                 </div>
-                <button class="btn btn-primary" ng-click="close()">Ok</button>
+                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
             </div>
 
             <div ng-hide="success">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html
index 0b9feb3fb6..b9aa4d9d3a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html
@@ -1,8 +1,8 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DocumentTypes.ExportController">
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a class="btn btn-link" ng-click="cancel()">
+        <button type="button" class="btn btn-link" ng-click="cancel()">
             <localize key="general_cancel">Cancel</localize>
-        </a>
+        </button>
         <button class="btn btn-primary" ng-click="export()">
             <localize key="actions_export">Export</localize>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
index 8f84a0cceb..9ddc0b7c93 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
@@ -21,15 +21,13 @@
 
             <localize key="general_or">or</localize>
 
-            <a class="btn-link" ng-click="close()">
+            <button type="button" class="btn-link" ng-click="close()">
                 <localize key="cancel">Cancel</localize>
-            </a>
+            </button>
         </form>        
 
         <div ng-if="importDoctype.file.$error.pattern">Please choose a .udt file to import</div>
         
-
-        
     </div>
     <div ng-if="vm.state === 'confirm'">
         <strong>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
index fe0bde7f1f..b623b6131d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
@@ -20,7 +20,7 @@
                 <div class="alert alert-success">
                     <strong>{{source.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
                 </div>
-                <button class="btn btn-primary" ng-click="close()">Ok</button>
+                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
             </div>
 
             <div ng-hide="success">
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
index 9c21f623b5..58968c9dfa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
@@ -20,7 +20,7 @@
                 <div class="alert alert-success">
                     <strong>{{source.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
                 </div>
-                <button class="btn btn-primary" ng-click="close()">Ok</button>
+                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
             </div>
 
             <div ng-hide="success">
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
index 5225a41a0d..6bb1b6fa10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
@@ -20,7 +20,7 @@
                 <div class="alert alert-success">
                     <strong>{{source.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
                 </div>
-                <button class="btn btn-primary" ng-click="close()">Ok</button>
+                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
             </div>
 
             <div ng-hide="success">
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/copy.controller.js
new file mode 100644
index 0000000000..aa94b4bd04
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/copy.controller.js
@@ -0,0 +1,61 @@
+angular.module("umbraco")
+    .controller("Umbraco.Editors.MemberTypes.CopyController",
+    function ($scope, memberTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
+
+        $scope.dialogTreeApi = {};
+        $scope.source = _.clone($scope.currentNode);
+
+        function nodeSelectHandler(args) {
+            args.event.preventDefault();
+            args.event.stopPropagation();
+
+            if ($scope.target) {
+                //un-select if there's a current one selected
+                $scope.target.selected = false;
+            }
+
+            $scope.target = args.node;
+            $scope.target.selected = true;
+        }
+
+        $scope.copy = function () {
+
+            $scope.busy = true;
+            $scope.error = false;
+
+            memberTypeResource.copy({ parentId: $scope.target.id, id: $scope.source.id })
+                .then(function (path) {
+                    $scope.error = false;
+                    $scope.success = true;
+                    $scope.busy = false;
+
+                    //get the currently edited node (if any)
+                    var activeNode = appState.getTreeState("selectedNode");
+
+                    //we need to do a double sync here: first sync to the copied content - but don't activate the node,
+                    //then sync to the currenlty edited content (note: this might not be the content that was copied!!)
+
+                    navigationService.syncTree({ tree: "memberTypes", path: path, forceReload: true, activate: false }).then(function (args) {
+                        if (activeNode) {
+                            var activeNodePath = treeService.getPath(activeNode).join();
+                            //sync to this node now - depending on what was copied this might already be synced but might not be
+                            navigationService.syncTree({ tree: "memberTypes", path: activeNodePath, forceReload: false, activate: true });
+                        }
+                    });
+
+                }, function (err) {
+                    $scope.success = false;
+                    $scope.error = err;
+                    $scope.busy = false;
+                });
+        };
+
+        $scope.onTreeInit = function () {
+            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
+        };
+
+        $scope.close = function() {
+            navigationService.hideDialog();
+        };
+        
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/copy.html
new file mode 100644
index 0000000000..fb7c6b5584
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/copy.html
@@ -0,0 +1,53 @@
+<div class="umb-dialog" ng-controller="Umbraco.Editors.MemberTypes.CopyController">
+
+    <div class="umb-dialog-body">
+        <div class="umb-pane">
+
+            <p class="abstract" ng-hide="success">
+                <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
+            </p>
+
+            <umb-loader ng-show="busy"></umb-loader>
+
+            <div ng-show="error">
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
+            </div>
+
+            <div ng-show="success">
+                <div class="alert alert-success">
+                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
+                </div>
+                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
+            </div>
+
+            <div ng-hide="success">
+
+                <div>
+                    <umb-tree section="settings"
+                              treealias="memberTypes"
+                              customtreeparams="foldersonly=1"
+                              hideheader="false"
+                              hideoptions="true"
+                              isdialog="true"
+                              api="dialogTreeApi"
+                              on-init="onTreeInit()"
+                              enablecheckboxes="true">
+                    </umb-tree>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
+        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
+            <localize key="general_cancel">Cancel</localize>
+        </button>
+        <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
+            <localize key="actions_copy">Copy</localize>
+        </button>
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 250b1b4579..e3ad71c918 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -336,6 +336,17 @@
     <key alias="allMembers">Alle medlemmer</key>
     <key alias="memberGroupNoProperties">Medlemgrupper har ingen yderligere egenskaber til redigering.</key>
   </area>
+  <area alias="contentType">
+     <key alias="copyFailed">Kopiering af indholdstypen fejlede</key>
+     <key alias="moveFailed">Flytning af indholdstypen fejlede</key>
+  </area>
+  <area alias="mediaType">
+     <key alias="copyFailed">Kopiering af medietypen fejlede</key>
+     <key alias="moveFailed">Flytning af medietypen fejlede</key>
+  </area>
+  <area alias="memberType">
+     <key alias="copyFailed">Kopiering af medlemstypen fejlede</key>
+  </area>
   <area alias="create">
     <key alias="chooseNode">Hvor ønsker du at oprette den nye %0%</key>
     <key alias="createUnder">Opret under</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 72e7d55a50..2639fbded6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -355,6 +355,17 @@
     <key alias="allMembers">All Members</key>
     <key alias="memberGroupNoProperties">Member groups have no additional properties for editing.</key>
   </area>
+  <area alias="contentType">
+     <key alias="copyFailed">Failed to copy content type</key>
+     <key alias="moveFailed">Failed to move content type</key>
+  </area>
+  <area alias="mediaType">
+     <key alias="copyFailed">Failed to copy media type</key>
+     <key alias="moveFailed">Failed to move media type</key>
+  </area>
+  <area alias="memberType">
+     <key alias="copyFailed">Failed to copy member type</key>
+  </area>
   <area alias="create">
     <key alias="chooseNode">Where do you want to create the new %0%</key>
     <key alias="createUnder">Create an item under</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 b858c61eb0..2435c9db45 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -362,6 +362,17 @@
     <key alias="allMembers">All Members</key>
     <key alias="memberGroupNoProperties">Member groups have no additional properties for editing.</key>
   </area>
+  <area alias="contentType">
+     <key alias="copyFailed">Failed to copy content type</key>
+     <key alias="moveFailed">Failed to move content type</key>
+  </area>
+  <area alias="mediaType">
+     <key alias="copyFailed">Failed to copy media type</key>
+     <key alias="moveFailed">Failed to move media type</key>
+  </area>
+  <area alias="memberType">
+     <key alias="copyFailed">Failed to copy member type</key>
+  </area>
   <area alias="create">
     <key alias="chooseNode">Where do you want to create the new %0%</key>
     <key alias="createUnder">Create an item under</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 1549ed7c27..d682652782 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -336,6 +336,17 @@
     <key alias="allMembers">Tous les membres</key>
     <key alias="memberGroupNoProperties">Les groupes de membres n'ont pas de propriétés supplémentaires modifiables.</key>
   </area>
+  <area alias="contentType">
+    <key alias="copyFailed">Echec de la copie du type de contenu</key>
+    <key alias="moveFailed">Echec du déplacement du type de contenu</key>
+  </area>
+  <area alias="mediaType">
+    <key alias="copyFailed">Echec de la copie du type de media</key>
+    <key alias="moveFailed">Echec du déplacement du type de media</key>
+  </area>
+  <area alias="memberType">
+    <key alias="copyFailed">Echec de la copie du type de membre</key>
+  </area>
   <area alias="create">
     <key alias="chooseNode">Où voulez-vous créer le nouveau %0%</key>
     <key alias="createUnder">Créer un élément sous</key>
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index 4bfea76eda..2e665350e7 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -237,6 +237,18 @@ namespace Umbraco.Web.Editors
             return display;
         }
 
+        /// <summary>
+        /// Copy the member type
+        /// </summary>
+        /// <param name="copy"></param>
+        /// <returns></returns>
+        public HttpResponseMessage PostCopy(MoveOrCopy copy)
+        {
+            return PerformCopy(
+                copy,
+                getContentType: i => Services.MemberTypeService.Get(i),
+                doCopy: (type, i) => Services.MemberTypeService.Copy(type, i));
+        }
 
     }
 }
diff --git a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
index 5e71266bca..61b9b3e063 100644
--- a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
@@ -13,6 +13,10 @@ namespace Umbraco.Web.Trees
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
             var nodes = new TreeNodeCollection();
+
+            // if the request is for folders only then just return
+            if (queryStrings["foldersonly"].IsNullOrWhiteSpace() == false && queryStrings["foldersonly"] == "1") return nodes;
+
             nodes.AddRange(GetTreeNodesFromService(id, queryStrings));
             return nodes;
         }
@@ -30,7 +34,13 @@ namespace Umbraco.Web.Trees
             }
             else
             {
-                //delete member type/group
+                var memberType = Services.MemberTypeService.Get(int.Parse(id));
+                if (memberType != null)
+                {
+                    menu.Items.Add<ActionCopy>(Services.TextService, opensDialog: true);
+                }
+
+                // delete member type/group
                 menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
             }
 
diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
index 5db9088f20..85f61d5fed 100644
--- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
@@ -29,6 +29,7 @@ namespace Umbraco.Web.Trees
             root.HasChildren = Services.MemberTypeService.GetAll().Any();
             return root;
         }
+
         protected override IEnumerable<TreeNode> GetTreeNodesFromService(string id, FormDataCollection queryStrings)
         {
             return Services.MemberTypeService.GetAll()

From fe8cd239d2f4c528c1a8a3cf4c50e90bb43cacfc Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Fri, 19 Mar 2021 16:57:40 +0100
Subject: [PATCH 150/202] Null check on scope and options to ensure backward
 compatibility

---
 .../src/common/services/listviewhelper.service.js             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
index 14643dc9cd..f9ebba00ea 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
@@ -572,13 +572,15 @@
         * Method for opening an item in a list view for editing.
         *
         * @param {Object} item The item to edit
+        * @param {Object} scope The scope with options
         */
         function editItem(item, scope) {
+
             if (!item.editPath) {
                 return;
             }
 
-            if (scope.options.useInfiniteEditor)
+            if (scope && scope.options && scope.options.useInfiniteEditor)
             {
                 var editorModel = {
                     id: item.id,

From f8f202963782c7d6fd0d7feea5904b1ec2713919 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Tue, 23 Mar 2021 08:53:21 +1100
Subject: [PATCH 151/202] Improve performance, readability and handling of
 FollowInternalRedirects (#9889)

* Improve performance, readability and handling of FollowInternalRedirects

* Logger didn't like string param

Passing string param to _logger.Debug<PublishedRouter, int> wasn't happy. Changed to pass existing internalRedirectAsInt variable.

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 src/Umbraco.Web/Routing/PublishedRouter.cs | 62 ++++++++++------------
 1 file changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index a02fd5872a..ebf935dcf8 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -427,7 +427,7 @@ namespace Umbraco.Web.Routing
                     return finder.TryFindContent(request);
                 });
 
-                _profilingLogger.Debug<PublishedRouter>(
+                _logger.Debug<PublishedRouter>(
                     "Found? {Found} Content: {PublishedContentId}, Template: {TemplateAlias}, Domain: {Domain}, Culture: {Culture}, Is404: {Is404}, StatusCode: {StatusCode}",
                     found,
                     request.HasPublishedContent ? request.PublishedContent.Id : "NULL",
@@ -516,55 +516,47 @@ namespace Umbraco.Web.Routing
 
             // don't try to find a redirect if the property doesn't exist
             if (request.PublishedContent.HasProperty(Constants.Conventions.Content.InternalRedirectId) == false)
+            {
                 return false;
+            }
+
+            var internalRedirectId = request.PublishedContent.Value(Constants.Conventions.Content.InternalRedirectId)?.ToString();
+
+            if (internalRedirectId == null)
+            {
+                // no value stored, just return, no need to log
+                return false;
+            }
+
+            if (int.TryParse(internalRedirectId, out var internalRedirectIdAsInt) && internalRedirectIdAsInt == request.PublishedContent.Id)
+            {
+                // redirect to self
+                _logger.Debug<PublishedRouter>("FollowInternalRedirects: Redirecting to self, ignore");
+                return false;
+            }
 
-            var redirect = false;
-            var valid = false;
             IPublishedContent internalRedirectNode = null;
-            var internalRedirectId = request.PublishedContent.Value(Constants.Conventions.Content.InternalRedirectId, defaultValue: -1);
-
-            if (internalRedirectId > 0)
+            if (internalRedirectIdAsInt > 0)
             {
                 // try and get the redirect node from a legacy integer ID
-                valid = true;
-                internalRedirectNode = request.UmbracoContext.Content.GetById(internalRedirectId);
+                internalRedirectNode = request.UmbracoContext.Content.GetById(internalRedirectIdAsInt);
             }
-            else
+            else if (GuidUdi.TryParse(internalRedirectId, out var internalRedirectIdAsUdi))
             {
-                var udiInternalRedirectId = request.PublishedContent.Value<GuidUdi>(Constants.Conventions.Content.InternalRedirectId);
-                if (udiInternalRedirectId != null)
-                {
-                    // try and get the redirect node from a UDI Guid
-                    valid = true;
-                    internalRedirectNode = request.UmbracoContext.Content.GetById(udiInternalRedirectId.Guid);
-                }
-            }
-
-            if (valid == false)
-            {
-                // bad redirect - log and display the current page (legacy behavior)
-                _logger.Debug<PublishedRouter, object>("FollowInternalRedirects: Failed to redirect to id={InternalRedirectId}: value is not an int nor a GuidUdi.",
-                    request.PublishedContent.GetProperty(Constants.Conventions.Content.InternalRedirectId).GetSourceValue());
+                // try and get the redirect node from a UDI Guid
+                internalRedirectNode = request.UmbracoContext.Content.GetById(internalRedirectIdAsUdi.Guid);
             }
 
             if (internalRedirectNode == null)
             {
                 _logger.Debug<PublishedRouter,object>("FollowInternalRedirects: Failed to redirect to id={InternalRedirectId}: no such published document.",
                     request.PublishedContent.GetProperty(Constants.Conventions.Content.InternalRedirectId).GetSourceValue());
-            }
-            else if (internalRedirectId == request.PublishedContent.Id)
-            {
-                // redirect to self
-                _logger.Debug<PublishedRouter>("FollowInternalRedirects: Redirecting to self, ignore");
-            }
-            else
-            {
-                request.SetInternalRedirectPublishedContent(internalRedirectNode); // don't use .PublishedContent here
-                redirect = true;
-                _logger.Debug<PublishedRouter,int>("FollowInternalRedirects: Redirecting to id={InternalRedirectId}", internalRedirectId);
+                return false;
             }
 
-            return redirect;
+            request.SetInternalRedirectPublishedContent(internalRedirectNode); // don't use .PublishedContent here
+            _logger.Debug<PublishedRouter,int>("FollowInternalRedirects: Redirecting to id={InternalRedirectId}", internalRedirectIdAsInt);
+            return true;
         }
 
         /// <summary>

From 3d05bd691735705f151bae2feee17cb59914ac57 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 22 Mar 2021 20:41:10 +0100
Subject: [PATCH 152/202] Update casing of listview layout name

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

diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
index de538793a5..2ea7b9e44e 100644
--- a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Web.PropertyEditors
             Layouts = new[]
             {
                 new Layout { Name = "List", Icon = "icon-list", IsSystem = 1, Selected = true, Path = "views/propertyeditors/listview/layouts/list/list.html" },
-                new Layout { Name = "grid", Icon = "icon-thumbnails-small", IsSystem = 1, Selected = true, Path = "views/propertyeditors/listview/layouts/grid/grid.html" }
+                new Layout { Name = "Grid", Icon = "icon-thumbnails-small", IsSystem = 1, Selected = true, Path = "views/propertyeditors/listview/layouts/grid/grid.html" }
             };
 
             IncludeProperties = new []

From 88611f30b530f527e4b5276fe9ba2379d631ed60 Mon Sep 17 00:00:00 2001
From: Michael Latouche <michael@crossingpaths.be>
Date: Mon, 22 Mar 2021 23:07:50 +0100
Subject: [PATCH 153/202] 9097 add contextual password helper (#9256)

* update back-office forms

* Display tip on reset password page as well

* add directive for password tip

* integrate directove in login screen

* forgot the ng-keyup :-)

* adapt tooltip directive to potential different Members and Users password settings

* remove watcher

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
---
 .../application/umblogin.directive.js         |  6 +-
 .../application/umbpasswordtip.directive.js   | 71 +++++++++++++++++++
 .../users/changepassword.directive.js         |  9 +++
 .../components/application/umb-login.html     |  3 +-
 .../components/users/change-password.html     |  4 +-
 .../changepassword.controller.js              |  3 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  2 +
 .../Umbraco/config/lang/en_us.xml             |  2 +
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml |  2 +
 .../Editors/BackOfficeServerVariables.cs      |  6 +-
 10 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbpasswordtip.directive.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
index 36eeb173d6..ea8b5e8173 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
@@ -16,7 +16,7 @@
     function UmbLoginController($scope, $location, currentUserResource, formHelper,
         mediaHelper, umbRequestHelper, Upload, localizationService,
         userService, externalLoginInfo, externalLoginInfoService,
-        resetPasswordCodeInfo, $timeout, authResource, $q, $route) {
+        resetPasswordCodeInfo, authResource, $q) {
 
         const vm = this;
 
@@ -72,6 +72,7 @@
         vm.loginSubmit = loginSubmit;
         vm.requestPasswordResetSubmit = requestPasswordResetSubmit;
         vm.setPasswordSubmit = setPasswordSubmit;
+        vm.newPasswordKeyUp = newPasswordKeyUp;
         vm.labels = {};
         localizationService.localizeMany([
             vm.usernameIsEmail ? "general_email" : "general_username",
@@ -362,6 +363,9 @@
             });
         }
 
+        function newPasswordKeyUp(event) {
+            vm.passwordVal = event.target.value;
+        }
 
         ////
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbpasswordtip.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbpasswordtip.directive.js
new file mode 100644
index 0000000000..86e1d3d32f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbpasswordtip.directive.js
@@ -0,0 +1,71 @@
+(function () {
+    'use strict';
+
+    angular
+        .module('umbraco.directives')
+        .component('umbPasswordTip', {
+            controller: UmbPasswordTipController,
+            controllerAs: 'vm',
+            template:
+                '<span class="help-inline" style="display: block;" ng-if="vm.passwordTip" ng-bind-html="vm.passwordTip">{{vm.passwordTip}}</span>',
+            bindings: {
+                passwordVal: "<",
+                minPwdLength: "<",
+                minPwdNonAlphaNum: "<"
+            }
+        });
+
+    function UmbPasswordTipController(localizationService) {
+
+        let defaultMinPwdLength = Umbraco.Sys.ServerVariables.umbracoSettings.minimumPasswordLength;
+        let defaultMinPwdNonAlphaNum = Umbraco.Sys.ServerVariables.umbracoSettings.minimumPasswordNonAlphaNum;
+
+        var vm = this;
+        vm.$onInit = onInit;
+        vm.$onChanges = onChanges;
+
+        function onInit() {
+            if (vm.minPwdLength === undefined) {
+                vm.minPwdLength = defaultMinPwdLength;
+            }
+
+            if (vm.minPwdNonAlphaNum === undefined) {
+                vm.minPwdNonAlphaNum = defaultMinPwdNonAlphaNum;
+            }
+
+            if (vm.minPwdNonAlphaNum > 0) {
+                localizationService.localize('user_newPasswordFormatNonAlphaTip', [vm.minPwdNonAlphaNum]).then(data => {
+                    vm.passwordNonAlphaTip = data;
+                    updatePasswordTip(0);
+                });
+            } else {
+                vm.passwordNonAlphaTip = '';
+                updatePasswordTip(0);
+            }
+        }
+
+        function onChanges(simpleChanges) {
+            if (simpleChanges.passwordVal) {
+                if (simpleChanges.passwordVal.currentValue) {
+                    updatePasswordTip(simpleChanges.passwordVal.currentValue.length);
+                } else {
+                    updatePasswordTip(0);
+                }
+            }
+        }
+
+        const updatePasswordTip = passwordLength => {
+            const remainingLength = vm.minPwdLength - passwordLength;
+            if (remainingLength > 0) {
+                localizationService.localize('user_newPasswordFormatLengthTip', [remainingLength]).then(data => {
+                    vm.passwordTip = data;
+                    if (vm.passwordNonAlphaTip) {
+                        vm.passwordTip += `<br/>${vm.passwordNonAlphaTip}`;
+                    }
+                });
+            } else {
+                vm.passwordTip = vm.passwordNonAlphaTip;
+            }
+        }
+    }
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
index 8cbdabbf75..a9961a7579 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
@@ -11,6 +11,7 @@
         vm.cancelChange = cancelChange;
         vm.showOldPass = showOldPass;
         vm.showCancelBtn = showCancelBtn;
+        vm.newPasswordKeyUp = newPasswordKeyUp;
 
         var unsubscribe = [];
 
@@ -55,6 +56,11 @@
                 vm.config.minPasswordLength = 0;
             }
 
+            // Check non-alpha pwd settings for tooltip display
+            if (vm.config.minNonAlphaNumericChars === undefined) {
+                vm.config.minNonAlphaNumericChars = 0;
+            }
+
             //set the model defaults
             if (!Utilities.isObject(vm.passwordValues)) {
                 //if it's not an object then just create a new one
@@ -152,6 +158,9 @@
             return vm.config.disableToggle !== true && vm.config.hasPassword;
         };
 
+        function newPasswordKeyUp(event) {
+            vm.passwordVal = event.target.value;
+        }
     }
 
     var component = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index 1e570b4af6..c4b6a4a2ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -226,7 +226,8 @@
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-class="{error: vm.setPasswordForm.password.$invalid}">
                             <label for="umb-passwordThree"><localize key="user_newPassword">New password</localize></label>
-                            <input type="password" ng-model="vm.password" name="password" id="umb-passwordThree" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" focus-when="{{vm.view === 'set-password'}}" />
+                            <input type="password" ng-model="vm.password" name="password" id="umb-passwordThree" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" focus-when="{{vm.view === 'set-password'}}" ng-keyup="vm.newPasswordKeyUp($event)" />
+                            <umb-password-tip password-val="vm.passwordVal"></umb-password-tip>
                         </div>
 
                         <div ng-hide="vm.resetComplete" class="control-group" ng-class="{error: vm.setPasswordForm.confirmPassword.$invalid}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index 974f8d6b4e..273f56d256 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -43,12 +43,14 @@
                            required
                            val-server-field="password"
                            ng-minlength="{{vm.config.minPasswordLength}}"
-                           no-dirty-check />
+                           no-dirty-check
+                           ng-keyup="vm.newPasswordKeyUp($event)"/>
                     <span ng-messages="changePasswordForm.password.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="required">Required</span>
                         <span class="help-inline" ng-message="minlength">Minimum {{vm.config.minPasswordLength}} characters</span>
                         <span class="help-inline" ng-message="valServerField">{{changePasswordForm.password.errorMsg}}</span>
                     </span>
+                    <umb-password-tip password-val="vm.passwordVal" min-pwd-length="vm.config.minPasswordLength" min-pwd-non-alpha-num="vm.config.minNonAlphaNumericChars"></umb-password-tip>
                 </umb-control-group>
 
                 <umb-control-group alias="confirmPassword" label="@user_confirmNewPassword" ng-if="!vm.showReset" required="true">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
index ab7f5c66e0..e80aad64f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
@@ -36,6 +36,9 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.ChangePasswordCont
       if (!$scope.model.config || $scope.model.config.minPasswordLength === undefined) {
         $scope.model.config.minPasswordLength = 0;
       }
+      if (!$scope.model.config || $scope.model.config.minNonAlphaNumericChars === undefined) {
+          $scope.model.config.minNonAlphaNumericChars = 0;
+      }
 
       //set the model defaults
       if (!Utilities.isObject($scope.model.value)) {
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 2639fbded6..9b990ce5d9 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1876,6 +1876,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="changePassword">Change your password</key>
     <key alias="changePhoto">Change photo</key>
     <key alias="newPassword">New password</key>
+    <key alias="newPasswordFormatLengthTip">Minimum %0% character(s) to go!</key>
+    <key alias="newPasswordFormatNonAlphaTip">There should be at least %0% special character(s) in there.</key>
     <key alias="noLockouts">hasn't been locked out</key>
     <key alias="noPasswordChange">The password hasn't been changed</key>
     <key alias="confirmNewPassword">Confirm new password</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 2435c9db45..8394d4e165 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1895,6 +1895,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="changePassword">Change your password</key>
     <key alias="changePhoto">Change photo</key>
     <key alias="newPassword">New password</key>
+    <key alias="newPasswordFormatLengthTip">Minimum %0% character(s) to go!</key>
+    <key alias="newPasswordFormatNonAlphaTip">There should be at least %0% special character(s) in there.</key>
     <key alias="noLockouts">hasn't been locked out</key>
     <key alias="noPasswordChange">The password hasn't been changed</key>
     <key alias="confirmNewPassword">Confirm new password</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index d682652782..f42ec404b9 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -1813,6 +1813,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="changePassword">Changer le mot de passe</key>
     <key alias="changePhoto">Changer la photo</key>
     <key alias="newPassword">Nouveau mot de passe</key>
+    <key alias="newPasswordFormatLengthTip">Plus que %0% caractère(s) minimum!</key>
+    <key alias="newPasswordFormatNonAlphaTip">Il devrait y avoir au moins %0% caractère(s) spéciaux.</key>
     <key alias="noLockouts">n'a pas été bloqué</key>
     <key alias="noPasswordChange">Le mot de passe n'a pas été modifié</key>
     <key alias="confirmNewPassword">Confirmez votre nouveau mot de passe</key>
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 42b5186c03..6ec9ac4f90 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Editors
             var keepOnlyKeys = new Dictionary<string, string[]>
             {
                 {"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl", "iconApiBaseUrl"}},
-                {"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "loginLogoImage", "canSendRequiredEmail", "usernameIsEmail"}},
+                {"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "loginLogoImage", "canSendRequiredEmail", "usernameIsEmail", "minimumPasswordLength", "minimumPasswordNonAlphaNum"}},
                 {"application", new[] {"applicationPath", "cacheBuster"}},
                 {"isDebuggingEnabled", new string[] { }},
                 {"features", new [] {"disabledFeatures"}}
@@ -100,6 +100,8 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         internal Dictionary<string, object> GetServerVariables()
         {
+            var userMembershipProvider = Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider();
+
             var defaultVals = new Dictionary<string, object>
             {
                 {
@@ -357,6 +359,8 @@ namespace Umbraco.Web.Editors
                         {"showUserInvite", EmailSender.CanSendRequiredEmail},
                         {"canSendRequiredEmail", EmailSender.CanSendRequiredEmail},
                         {"showAllowSegmentationForDocumentTypes", false},
+                        {"minimumPasswordLength", userMembershipProvider.MinRequiredPasswordLength},
+                        {"minimumPasswordNonAlphaNum", userMembershipProvider.MinRequiredNonAlphanumericCharacters},
                     }
                 },
                 {

From 95bf10e11bc4c7b4992bd91773d517e7bfd45a67 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Fri, 19 Mar 2021 11:15:09 +1000
Subject: [PATCH 154/202] Unbind listener

Listening for splitViewRequest was only unbound if the split view editor was opened. Not cleaning up the listener caused a memory leak when changing between nodes as the spit view editor was detached but not garbage-collected
---
 .../components/content/umbvariantcontenteditors.directive.js   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index 3e227bfcb3..71bf151b89 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -202,6 +202,9 @@
             splitViewChanged();
             unbindSplitViewRequest();
         }
+        
+        // if split view was never closed, the listener is not disposed when changing nodes - this unbinds it
+        $scope.$on('$destroy', () => unbindSplitViewRequest());
 
         /**
          * Changes the currently selected variant

From ebd504e8c18f9cc561558033972859bbb3b693cb Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 23 Mar 2021 03:06:44 +0100
Subject: [PATCH 155/202] Replace icon in date picker with umb-icon component
 (#10040)

* Replace icon in date picker with <umb-icon> component

* Adjust height of clear button
---
 src/Umbraco.Web.UI.Client/src/less/forms.less   |  8 +++++---
 .../src/less/property-editors.less              | 17 ++++++++++-------
 .../propertyeditors/datepicker/datepicker.html  | 10 +++++-----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index f38ba8f806..4ac1431de3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -582,19 +582,21 @@ table.domains .help-inline {
     }
   }
   .add-on {
-    display: inline-block;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
     width: auto;
     height: 22px;
     min-width: 18px;
-    padding: 5px 6px 3px 6px;
+    padding: 4px 6px;
     font-size: @baseFontSize;
     font-weight: normal;
     line-height: @baseLineHeight;
     text-align: center;
-    //text-shadow: 0 1px 0 @white;
     background-color: @white;
     border: 1px solid @inputBorder;
     color: @ui-option-type;
+
     &:hover {
         border-color:@inputBorderFocus;
         color: @ui-option-type-hover;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 0d8f270f1b..f5e652aa3d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -838,22 +838,25 @@
 //
 // Date/time picker
 // --------------------------------------------------
-.bootstrap-datetimepicker-widget .btn{padding: 0;}
-.bootstrap-datetimepicker-widget .picker-switch .btn{ background: none; border: none;}
-.umb-datepicker .input-append .add-on{cursor: pointer;}
-.umb-datepicker .input-append .on-top {
-    border: 0 none;
+.bootstrap-datetimepicker-widget .btn {padding: 0;}
+.bootstrap-datetimepicker-widget .picker-switch .btn { background: none; border: none;}
+.umb-datepicker .input-append .btn-clear {
+    border: none;
     position: absolute;
     margin-left: -31px;
     margin-top: 1px;
-    display: inline-block;
-    padding: 5px 6px 3px 6px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    height: 30px;
+    padding: 4px 6px;
     font-size: @baseFontSize;
     font-weight: normal;
     line-height: @baseLineHeight;
     text-align: center;
     background-color: @white;
     color: @ui-option-type;
+
     &:hover {
         color: @ui-option-type-hover;
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index 9501a6631b..f5ac69b9b8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -19,12 +19,12 @@
                            ng-required="model.validation.mandatory"
                            val-server="value"
                            class="datepickerinput" />
-                    <button type="button" class="on-top" ng-click="clearDate()" ng-show="hasDatetimePickerValue === true || datePickerForm.datepicker.$error.pickerError === true">
-                        <i class="icon-delete" aria-hidden="true"></i>
+                    <button type="button" class="btn-clear" ng-click="clearDate()" ng-show="hasDatetimePickerValue === true || datePickerForm.datepicker.$error.pickerError === true">
+                        <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
                         <span class="sr-only"><localize key="content_removeDate">Clear date</localize></span>
                     </button>
-                    <span class="add-on" aria-hidden="true">
-                        <i class="icon-{{ datePickerConfig.noCalendar ? 'time' : 'calendar' }}"></i>
+                    <span class="add-on">
+                        <umb-icon icon="icon-{{ datePickerConfig.noCalendar ? 'time' : 'calendar' }}" class="icon-{{ datePickerConfig.noCalendar ? 'time' : 'calendar' }}"></umb-icon>
                     </span>
                 </div>
 
@@ -32,7 +32,7 @@
 
         </div>
 
-        <div ng-messages="datePickerForm.datepicker.$error" show-validation-on-submit >
+        <div ng-messages="datePickerForm.datepicker.$error" show-validation-on-submit>
             <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
             <p class="help-inline" ng-message="valServer">{{datePickerForm.datepicker.errorMsg}}</p>
             <p class="help-inline" ng-message="pickerError"><localize key="validation_invalidDate">Invalid date</localize></p>

From 14c2bb4aa2a22ddc4d8a35e8eb61b7592c222fce Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 23 Mar 2021 13:03:01 +0100
Subject: [PATCH 156/202] Update cypress and fix tests

---
 .../cypress/integration/Settings/templates.ts             | 8 ++++++--
 .../cypress/integration/Tour/backofficeTour.ts            | 2 +-
 src/Umbraco.Tests.AcceptanceTest/package.json             | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index c586384af7..65d03e5a78 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -23,14 +23,18 @@ context('Templates', () => {
         cy.umbracoEnsureTemplateNameNotExists(name);
 
         createTemplate();
+        // We have to wait for the ace editor to load, because when the editor is loading it will "steal" the focus briefly,
+        // which causes the save event to fire if we've added something to the header field, causing errors.
+        cy.wait(500);
+
         //Type name
         cy.umbracoEditorHeaderName(name);
         // Save
         // We must drop focus for the auto save event to occur.
         cy.get('.btn-success').focus();
         // And then wait for the auto save event to finish by finding the page in the tree view.
-        // This is a bit of a roundabout way to find items in a treev view since we dont use umbracoTreeItem
-        // but we must be able to wait for the save evnent to finish, and we can't do that with umbracoTreeItem
+        // This is a bit of a roundabout way to find items in a tree view since we dont use umbracoTreeItem
+        // but we must be able to wait for the save event to finish, and we can't do that with umbracoTreeItem
         cy.get('[data-element="tree-item-templates"] > :nth-child(2) > .umb-animated > .umb-tree-item__inner > .umb-tree-item__label')
             .contains(name).should('be.visible', { timeout: 10000 });
         // Now that the auto save event has finished we can save
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
index 9bc1fff488..d3950d7d19 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
@@ -49,7 +49,7 @@ function resetTourData() {
     {
         "alias": "umbIntroIntroduction",
         "completed": false,
-        "disabled": false
+        "disabled": true
     };
 
     cy.getCookie('UMB-XSRF-TOKEN', { log: false }).then((token) => {
diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json
index 378fe719fc..069a1d85b7 100644
--- a/src/Umbraco.Tests.AcceptanceTest/package.json
+++ b/src/Umbraco.Tests.AcceptanceTest/package.json
@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.2",
-    "cypress": "^6.0.1",
+    "cypress": "^6.8.0",
     "ncp": "^2.0.0",
     "prompt": "^1.0.0",
     "umbraco-cypress-testhelpers": "^1.0.0-beta-52"

From 11f123e7c472b6d9f2e0393c97c5140b74765886 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 23 Mar 2021 23:04:33 +0100
Subject: [PATCH 157/202] Listview config icons (#10036)

* Update icons to use <umb-icon> component

* Simplify markup and use disabled button

* Use move cursor style on sortable handle

* Add class for action column

* Update setting auto focus

* Increase font size of umb-panel-header-icon
---
 .../src/less/buttons.less                      | 17 ++++++++++++-----
 src/Umbraco.Web.UI.Client/src/less/main.less   |  4 ++++
 src/Umbraco.Web.UI.Client/src/less/panel.less  |  1 +
 .../listview/includeproperties.prevalues.html  |  4 ++--
 .../listview/layouts.prevalues.html            | 18 +++++++++---------
 .../propertyeditors/listview/listview.html     |  1 -
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index c446a02424..d1a426f818 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -65,15 +65,22 @@
 // --------------------------------------------------
 
 .btn-reset {
-	padding: 0;
-	margin: 0;
-	border: none;
+    padding: 0;
+    margin: 0;
+    border: none;
     background: none;
-	color: currentColor;
+    color: currentColor;
     font-family: @baseFontFamily;
     font-size: @baseFontSize;
     line-height: @baseLineHeight;
-	cursor: pointer;
+    cursor: pointer;
+
+    // Disabled state
+    &.disabled,
+    &[disabled],
+    &:disabled:hover {
+        cursor: default;
+    }
 }
     
 // Button Sizes
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 31bb8484c4..66afbfd73f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -402,6 +402,10 @@ table thead button:focus{
 
 /* UI interactions */
 
+.ui-sortable-handle {
+    cursor: move;
+}
+
 .umb-table tbody.ui-sortable tr
 {
     cursor:pointer;
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index a036267c85..cc87a0edf5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -349,6 +349,7 @@
 
 .umb-panel-header-icon {
   cursor: pointer;
+  font-size: 2rem;
   margin-right: 5px;
   margin-top: -6px;
   height: 50px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
index 42597f0c82..7d863f6730 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
@@ -27,7 +27,7 @@
             <tbody ui-sortable="sortableOptions" ng-model="model.value">
                 <tr ng-repeat="val in model.value">
                     <td>
-                        <i class="icon icon-navigation handle" aria-hidden="true" aria-label="Sort"></i>
+                        <umb-icon icon="icon-navigation" class="icon-navigation icon handle" aria-label="Sort"></umb-icon>
                     </td>
                     <td>
                        <div class="list-view-layout__name flex-column content-start">
@@ -54,7 +54,7 @@
                     </td>
                     <td>
                         <button type="button" class="btn-icon" ng-click="removeField(val)" aria-label="Remove">
-                            <i class="icon-trash" aria-hidden="true"></i>
+                            <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
                         </button>
                     </td>
                 </tr>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
index 4527458d16..295345a827 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
@@ -6,20 +6,20 @@
 
            <div class="list-view-layout" ng-repeat="layout in model.value">
 
-               <i class="icon-navigation list-view-layout__sort-handle" aria-hidden="true" aria-label="Sort"></i>
+               <umb-icon icon="icon-navigation" class="icon-navigation list-view-layout__sort-handle" aria-label="Sort"></umb-icon>
 
                <div class="list-view-layout__icon-wrapper">
 
-                   <button ng-if="layout.isSystem !== 1" type="button" class="btn-reset" ng-click="vm.openIconPicker(layout)" umb-auto-focus>
+                   <button type="button"
+                           class="btn-reset"
+                           ng-disabled="layout.isSystem === 1"
+                           ng-click="vm.openIconPicker(layout)"
+                           umb-auto-focus="{{layout.isSystem !== 1}}">
                        <span class="list-view-layout__icon">
-                           <i class="{{layout.icon}}" aria-hidden="true"></i>
+                           <umb-icon icon="{{layout.icon}}" class="{{layout.icon}}"></umb-icon>
                        </span>
                    </button>
 
-                   <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
-                       <i class="{{layout.icon}}" aria-hidden="true"></i>
-                   </div>
-
                </div>
 
                <div class="list-view-layout__name">
@@ -32,12 +32,12 @@
                    <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
                </div>
 
-               <div>
+               <div class="list-view-layout__action">
                    <umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>
 
                    <div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
                        <button type="button" class="btn-icon" ng-click="vm.showPrompt(layout)" aria-label="Remove">
-                           <i class="icon-trash" aria-hidden="true"></i>
+                           <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
                        </button>
                        <umb-confirm-action ng-if="layout.deletePrompt"
                                            direction="left"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index e72b81b019..1f66d324df 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -57,7 +57,6 @@
                                    {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
                                </button>
 
-
                                <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)">
                                    &nbsp;&nbsp;<i class="{{::contentType.icon}}" aria-hidden="true"></i>
                                    {{::blueprint.name}}

From 9ac4eacdbd0b8858bd5a9e19f2d830a862bc61c6 Mon Sep 17 00:00:00 2001
From: Martin Bentancour <mbe@umbraco.dk>
Date: Wed, 24 Mar 2021 02:43:20 +0100
Subject: [PATCH 158/202] Anchor noopener (#10009)

* Set rel="noopener" for anchors with target="_blank"

* Reverted unwanted changes to Default.cshtml
---
 .../Importing/StandardMvc-Package.xml         |  6 ++---
 .../Services/PerformanceTests.cs              |  4 ++--
 .../mocks/services/localization.mocks.js      |  6 ++---
 .../src/installer/installer.service.js        |  6 ++---
 .../src/installer/steps/upgrade.html          |  2 +-
 .../dashboard/media/mediadashboardvideos.html |  2 +-
 .../Umbraco/Views/Default.cshtml              |  7 ++----
 src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 10 ++++----
 src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml | 12 +++++-----
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 10 ++++----
 src/Umbraco.Web.UI/Umbraco/config/lang/de.xml | 12 +++++-----
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 12 +++++-----
 .../Umbraco/config/lang/en_us.xml             | 12 +++++-----
 src/Umbraco.Web.UI/Umbraco/config/lang/es.xml | 10 ++++----
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml | 12 +++++-----
 src/Umbraco.Web.UI/Umbraco/config/lang/he.xml |  4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/it.xml |  4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml |  4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml |  4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml |  4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml |  6 ++---
 src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml |  4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml | 14 +++++------
 src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml |  4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml | 24 +++++++++----------
 src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml |  6 ++---
 .../Umbraco/config/lang/zh_tw.xml             |  6 ++---
 .../config/splashes/noNodes.aspx              |  4 ++--
 28 files changed, 104 insertions(+), 107 deletions(-)

diff --git a/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
index ee6f7cea4a..daeb74cc75 100644
--- a/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
+++ b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
@@ -210,7 +210,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
         <panelContent1>
           <![CDATA[<h2>Built by Creative Founds</h2>
 <p><img src="/images/web_applications.jpg" alt="Web Applications" class="fr"/><strong>Creative Founds</strong> design and build first class software solutions that deliver big results. We provide ASP.NET web and mobile applications, Umbraco development service &amp; technical consultancy.</p>
-<p><a href="http://www.creativefounds.co.uk" target="_blank">www.creativefounds.co.uk</a></p>]]>
+<p><a href="http://www.creativefounds.co.uk" target="_blank" rel="noopener">www.creativefounds.co.uk</a></p>]]>
         </panelContent1>
         <panelContent2>
           <![CDATA[<h2>Umbraco Development</h2>
@@ -218,7 +218,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
         </panelContent2>
         <panelContent3>
           <![CDATA[<h2>Contact Us</h2>
-<p><a href="http://www.twitter.com/chriskoiak" target="_blank"><img src="/images/twitter_square.png" alt="Contact Us on Twitter" class="fr"/></a>We'd love to hear how this package has helped you and how it can be improved. Get in touch on the <a href="https://our.umbraco.com/projects/starter-kits/standard-website-mvc" target="_blank">project website</a> or via <a href="http://www.twitter.com/chriskoiak" target="_blank">twitter</a></p>]]>
+<p><a href="http://www.twitter.com/chriskoiak" target="_blank" rel="noopener"><img src="/images/twitter_square.png" alt="Contact Us on Twitter" class="fr"/></a>We'd love to hear how this package has helped you and how it can be improved. Get in touch on the <a href="https://our.umbraco.com/projects/starter-kits/standard-website-mvc" target="_blank" rel="noopener">project website</a> or via <a href="http://www.twitter.com/chriskoiak" target="_blank" rel="noopener">twitter</a></p>]]>
         </panelContent3>
         <primaryNavigation><![CDATA[1072,1073,1077,1079,1080]]></primaryNavigation>
         <address>Standard Website MVC, Company Address, Glasgow, Postcode</address>
@@ -418,7 +418,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
               <![CDATA[<h3>Standard Website MVC</h3>
 <p>Well hello! This website package demonstrates all the standard functionality of Umbraco. It's a great starting point for <span>starting point for further development or as a prototype.</span></p>
 <h3>Creative Founds</h3>
-<p>This package was developed by <a href="http://www.twitter.com/chriskoiak" target="_blank">Chris Koiak</a> &amp; <a href="http://www.creativefounds.co.uk" target="_blank">Creative Founds</a>. </p>]]>
+<p>This package was developed by <a href="http://www.twitter.com/chriskoiak" target="_blank" rel="noopener">Chris Koiak</a> &amp; <a href="http://www.creativefounds.co.uk" target="_blank" rel="noopener">Creative Founds</a>. </p>]]>
             </bodyText>
             <umbracoNaviHide>1</umbracoNaviHide>
           </Slide>
diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs
index 9cf38e1789..718f99ce2f 100644
--- a/src/Umbraco.Tests/Services/PerformanceTests.cs
+++ b/src/Umbraco.Tests/Services/PerformanceTests.cs
@@ -297,11 +297,11 @@ namespace Umbraco.Tests.Services
   <slideshow><![CDATA[1250,1251,1252]]></slideshow>
   <panelContent1><![CDATA[<h2>Built by Creative Founds</h2>
 <p><img src='/images/web_applications.jpg' alt='Web Applications' class='fr'/><strong>Creative Founds</strong> design and build first class software solutions that deliver big results. We provide ASP.NET web and mobile applications, Umbraco development service &amp; technical consultancy.</p>
-<p><a href='http://www.creativefounds.co.uk' target='_blank'>www.creativefounds.co.uk</a></p>]]></panelContent1>
+<p><a href='http://www.creativefounds.co.uk' target='_blank' rel='noopener'>www.creativefounds.co.uk</a></p>]]></panelContent1>
   <panelContent2><![CDATA[<h2>Umbraco Development</h2>
 <p><img src='/images/umbraco_square.jpg' alt='Umbraco' class='fr'/>Umbraco the the leading ASP.NET open source CMS, under pinning over 150,000 websites. Our Certified Developers are experts in developing high performance and feature rich websites.</p>]]></panelContent2>
   <panelContent3><![CDATA[<h2>Contact Us</h2>
-<p><a href='http://www.twitter.com/chriskoiak' target='_blank'><img src='/images/twitter_square.png' alt='Contact Us on Twitter' class='fr'/></a>We'd love to hear how this package has helped you and how it can be improved. Get in touch on the <a href='https://our.umbraco.com/projects/starter-kits/standard-website-mvc' target='_blank'>project website</a> or via <a href='http://www.twitter.com/chriskoiak' target='_blank'>twitter</a></p>]]></panelContent3>
+<p><a href='http://www.twitter.com/chriskoiak' target='_blank' rel='noopener'><img src='/images/twitter_square.png' alt='Contact Us on Twitter' class='fr'/></a>We'd love to hear how this package has helped you and how it can be improved. Get in touch on the <a href='https://our.umbraco.com/projects/starter-kits/standard-website-mvc' target='_blank' rel='noopener'>project website</a> or via <a href='http://www.twitter.com/chriskoiak' target='_blank' rel='noopener'>twitter</a></p>]]></panelContent3>
   <primaryNavigation><![CDATA[1231,1232,1236,1238,1239]]></primaryNavigation>
   <address>Standard Website MVC, Company Address, Glasgow, Postcode</address>
   <copyright>Copyright &amp;copy; 2012 Your Company</copyright>
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
index ea7f3a6d4c..9a05e3cd7f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
@@ -193,7 +193,7 @@ angular.module('umbraco.mocks').
                   "defaultdialogs_recycleBinDeleting": "The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place",
                   "defaultdialogs_recycleBinIsEmpty": "The recycle bin is now empty",
                   "defaultdialogs_recycleBinWarning": "When items are deleted from the recycle bin, they will be gone forever",
-                  "defaultdialogs_regexSearchError": "<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.",
+                  "defaultdialogs_regexSearchError": "<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.",
                   "defaultdialogs_regexSearchHelp": "Search for a regular expression to add validation to a form field. Exemple: 'email, 'zip-code' 'url'",
                   "defaultdialogs_removeMacro": "Remove Macro",
                   "defaultdialogs_requiredField": "Required Field",
@@ -355,7 +355,7 @@ angular.module('umbraco.mocks').
                   "installer_databaseHeader": "Database configuration",
                   "installer_databaseInstall": "      Press the <strong>install</strong> button to install the Umbraco %0% database    ",
                   "installer_databaseInstallDone": "Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.",
-                  "installer_databaseNotFound": "<p>Database not found! Please check that the information in the 'connection string' of the \"web.config\" file is correct.</p>              <p>To proceed, please edit the 'web.config' file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named 'UmbracoDbDSN' and save the file. </p>              <p>              Click the <strong>retry</strong> button when               done.<br /><a href='https://our.umbraco.com/Documentation/Reference/Config/webconfig/' target='_blank'>              More information on editing web.config here.</a></p>",
+                  "installer_databaseNotFound": "<p>Database not found! Please check that the information in the 'connection string' of the \"web.config\" file is correct.</p>              <p>To proceed, please edit the 'web.config' file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named 'UmbracoDbDSN' and save the file. </p>              <p>              Click the <strong>retry</strong> button when               done.<br /><a href='https://our.umbraco.com/Documentation/Reference/Config/webconfig/' target='_blank' rel='noopener'>              More information on editing web.config here.</a></p>",
                   "installer_databaseText": "To complete this step, you must know some information regarding your database server ('connection string').<br />        Please contact your ISP if necessary.        If you're installing on a local machine or server you might need information from your system administrator.",
                   "installer_databaseUpgrade": "      <p>      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>      <p>      Don't worry - no content will be deleted and everything will continue working afterwards!      </p>          ",
                   "installer_databaseUpgradeDone": "Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to       proceed. ",
@@ -420,7 +420,7 @@ angular.module('umbraco.mocks').
                   "login_greeting6": "Happy friendly Friday",
                   "login_greeting7": "Happy shiny Saturday",
                   "login_instruction": "Log in below:",
-                  "login_bottomText": "<p style='text-align:right;'>&copy; 2001 - %0% <br /><a href='https://Umbraco.com' style='text-decoration: none' target='_blank'>Umbraco.org</a></p> ",
+                  "login_bottomText": "<p style='text-align:right;'>&copy; 2001 - %0% <br /><a href='https://Umbraco.com' style='text-decoration: none' target='_blank' rel='noopener'>Umbraco.org</a></p> ",
                   "main_dashboard": "Dashboard",
                   "main_sections": "Sections",
                   "main_tree": "Content",
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
index 74858d652e..d3ab9e519c 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
@@ -19,8 +19,8 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 					"Over 500 000 websites are currently powered by Umbraco",
 					"At least 2 people have named their cat 'Umbraco'",
 					"On an average day more than 1000 people download Umbraco",
-					"<a target='_blank' href='https://umbraco.tv/'>umbraco.tv</a> is the premier source of Umbraco video tutorials to get you started",
-					"You can find the world's friendliest CMS community at <a target='_blank' href='https://our.umbraco.com/'>our.umbraco.com</a>",
+					"<a target='_blank' rel='noopener' href='https://umbraco.tv/'>umbraco.tv</a> is the premier source of Umbraco video tutorials to get you started",
+					"You can find the world's friendliest CMS community at <a target='_blank' rel='noopener' href='https://our.umbraco.com/'>our.umbraco.com</a>",
 					"You can become a certified Umbraco developer by attending one of the official courses",
 					"Umbraco works really well on tablets",
 					"You have 100% control over your markup and design when crafting a website in Umbraco",
@@ -30,7 +30,7 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 					"At least 4 people have the Umbraco logo tattooed on them",
 					"'Umbraco' is the Danish name for an allen key",
 					"Umbraco has been around since 2005, that's a looong time in IT",
-					"More than 700 people from all over the world meet each year in Denmark in May for our annual conference <a target='_blank' href='https://umbra.co/codegarden'>CodeGarden</a>", 
+					"More than 700 people from all over the world meet each year in Denmark in May for our annual conference <a target='_blank' rel='noopener' href='https://umbra.co/codegarden'>CodeGarden</a>", 
 					"While you are installing Umbraco someone else on the other side of the planet is probably doing it too",
 					"You can extend Umbraco without modifying the source code using either JavaScript or C#",
 					"Umbraco has been installed in more than 198 countries"
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html b/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
index 472ceb7135..8ea69b3ee4 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
@@ -10,7 +10,7 @@
         To compare versions and read a report of changes between versions, use the <em>View Report</em> button below.
     </p>
     <p>
-        <a ng-href="{{installer.current.model.reportUrl}}" target="_blank" class="btn btn-info">View Report</a>
+        <a ng-href="{{installer.current.model.reportUrl}}" target="_blank" rel="noopener" class="btn btn-info">View Report</a>
     </p>
     <p>
         Simply click <strong>continue</strong> below to be guided through the rest of the upgrade.
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
index 96d6a3f40a..670fae2f6e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
@@ -1,5 +1,5 @@
 <h3>Hours of Umbraco training videos are only a click away</h3>
-<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
+<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
 
 <div class="row-fluid" 
 	ng-init="init('https://umbraco.tv/videos/implementor/chapterrss?sort=no')" 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 5166815a1c..5a9e5c5d7a 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -49,7 +49,7 @@
         <div style="margin: 10px;">
             <h3><img src="assets/img/application/logo.png" alt="Umbraco logo" style="vertical-align: text-bottom;" /> Umbraco</h3>
             <p>For full functionality of Umbraco CMS it is necessary to enable JavaScript.</p>
-            <p>Here are the <a href="https://www.enable-javascript.com/" target="_blank" style="text-decoration: underline;">instructions how to enable JavaScript in your web browser</a>.</p>
+            <p>Here are the <a href="https://www.enable-javascript.com/" target="_blank" rel="noopener" style="text-decoration: underline;">instructions how to enable JavaScript in your web browser</a>.</p>
         </div>
     </noscript>
 
@@ -115,15 +115,12 @@
     @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Current.Configs.Global())
 
     <script>
-
         document.angularReady = function(app) {
             @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInProviderErrors())
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
             @Html.AngularValueTinyMceAssets()
-
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
-
         }
     </script>
 
@@ -136,4 +133,4 @@
     }
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index 61c4abcade..a4710d1317 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -280,7 +280,7 @@
     <key alias="childItems" version="7.0">Podřízené položky</key>
     <key alias="target" version="7.0">Cíl</key>
     <key alias="scheduledPublishServerTime">This translates to the following time on the server:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">What does this mean?</a>]]></key>
     <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
     <key alias="nestedContentDeleteAllItems">Are you sure you want to delete all items?</key>
     <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
@@ -451,7 +451,7 @@
     <key alias="recycleBinDeleting">Položky koše jsou nyní mazány. Nezavírejte, prosím, toto okno, dokud operace probíhá</key>
     <key alias="recycleBinIsEmpty">Koš je nyní prázdný</key>
     <key alias="recycleBinWarning">Odebrání položek z koše způsobí jejich trvalé odstranění</key>
-    <key alias="regexSearchError"><![CDATA[Webová služba<a target='_blank' href='http://regexlib.com'>regexlib.com</a> má v tuto chvíli nějaké problémy, které jsou mimo naší kontrolu. Omlouváme se za vzniklé nepříjemnosti.]]></key>
+    <key alias="regexSearchError"><![CDATA[Webová služba<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> má v tuto chvíli nějaké problémy, které jsou mimo naší kontrolu. Omlouváme se za vzniklé nepříjemnosti.]]></key>
     <key alias="regexSearchHelp">Vyhledat regulární výraz pro přidání validace formulářového prvku. Například: 'email, 'PSČ' 'URL'</key>
     <key alias="removeMacro">Odstranit makro</key>
     <key alias="requiredField">Pole je vyžadování</key>
@@ -929,7 +929,7 @@
     <key alias="instruction">přihlašte se níže</key>
     <key alias="signInWith">Přihlásit se pomocí</key>
     <key alias="timeout">Relace vypršela</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.org</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.org</a></p> ]]></key>
     <key alias="forgottenPassword">Zapomenuté heslo?</key>
     <key alias="forgottenPasswordInstruction">Na uvedenou adresu bude zaslán e-mail s odkazem pro obnovení hesla</key>
     <key alias="requestPasswordResetConfirmation">Pokud odpovídá našim záznamům, bude na zadanou adresu zaslán e-mail s pokyny k obnovení hesla</key>
@@ -987,7 +987,7 @@
 																<tbody>
 																	<tr>
 																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																			<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Kliknutím na tento odkaz obnovíte své heslo
 																			</a>
 																		</td>
@@ -1920,7 +1920,7 @@
 																			<tbody>
 																				<tr>
 																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																						<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																							Kliknutím na tento odkaz přijměte pozvání
 																						</a>
 																					</td>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
index 0b00cfd423..274b7ef5b0 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
@@ -292,7 +292,7 @@
         <key alias="childItems" version="7.0">Eitemau blentyn</key>
         <key alias="target" version="7.0">Targed</key>
         <key alias="scheduledPublishServerTime">Mae hyn yn trawsnewid at yr amser ganlynol ar y gweinydd:</key>
-        <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Beth mae hyn yn golygu?</a>]]></key>
+        <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">Beth mae hyn yn golygu?</a>]]></key>
         <key alias="nestedContentDeleteItem">Ydych chi'n sicr eich bod eisiau dileu'r eitem yma?</key>
         <key alias="nestedContentEditorNotSupported">Mae'r priodwedd %0% yn defnyddio'r golygydd %1% sydd ddim yn cyd-fynd â Chynnwys Amnyth.</key>
         <key alias="nestedContentDeleteAllItems">Wyt ti'n siŵr fod ti eisiau dileu pob eitem?</key>
@@ -483,7 +483,7 @@
         <key alias="recycleBinDeleting">Mae'r eitemau yn y bin ailgylchu yn cael eu dileu. Peidiwch â chau'r ffenestr yma wrth i'r gweithrediad gymryd lle</key>
         <key alias="recycleBinIsEmpty">Mae'r bin ailgylchu yn awr yn wag</key>
         <key alias="recycleBinWarning">Pan gaiff eitemau eu dileu o'r bin ailgylchu, byddent yn diflannu am byth</key>
-        <key alias="regexSearchError"><![CDATA[Mae problem gyda gwasanaeth gwe <a target='_blank' href='http://regexlib.com'>regexlib.com</a> ar hyn o bryd, nid oes gennym reolaeth dros hyn. Mae'n ddrwg iawn gennym ni am yr anghyfleustra.]]></key>
+        <key alias="regexSearchError"><![CDATA[Mae problem gyda gwasanaeth gwe <a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> ar hyn o bryd, nid oes gennym reolaeth dros hyn. Mae'n ddrwg iawn gennym ni am yr anghyfleustra.]]></key>
         <key alias="regexSearchHelp">Chwiliwch am fynegiad cyson er mwyn ychwanegu dilysiad i faes ffurflen. Enghraifft: 'email, 'zip-code' 'url'</key>
         <key alias="removeMacro">Dileu Macro</key>
         <key alias="requiredField">Maes Gofynnol</key>
@@ -1087,7 +1087,7 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang
         <key alias="instruction">Mewngofnodwch isod</key>
         <key alias="signInWith">Mewngofnodwch gyda</key>
         <key alias="timeout">Sesiwn wedi cyrraedd terfyn amser</key>
-        <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+        <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">Umbraco.com</a></p> ]]></key>
         <key alias="forgottenPassword">Wedi anghofio eich cyfrinair?</key>
         <key alias="forgottenPasswordInstruction">Bydd ebost yn cael ei anfon i'r cyfeiriad darparwyd gyda dolen i ailosod eich cyfrinair</key>
         <key alias="requestPasswordResetConfirmation">Bydd ebost gyda chyfarwyddiadau ailosod cyfrinair yn cael ei anfon at y cyfeiriad darparwyd os yw'n cyfateb â'n cofnodion</key>
@@ -1146,7 +1146,7 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang
 																<tbody>
 																	<tr>
 																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																			<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Cliciwch y ddolen yma er mwyn ailosod eich cyfrinair
 																			</a>
 																		</td>
@@ -1269,7 +1269,7 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang
 																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
 																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
 																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>GOLYGU</a> </td> </tr></tbody></table>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>GOLYGU</a> </td> </tr></tbody></table>
 																	</td>
 																</tr>
 															</tbody>
@@ -2242,7 +2242,7 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang
 																			<tbody>
 																				<tr>
 																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																						<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																							Cliciwch y ddolen yma i dderbyn y gwahoddiad
 																						</a>
 																					</td>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index e3ad71c918..39a6fee671 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -278,7 +278,7 @@
     <key alias="childItems" version="7.0">Undersider</key>
     <key alias="target" version="7.0">Åben i vindue</key>
     <key alias="scheduledPublishServerTime">Dette oversætter til den følgende tid på serveren:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Hvad betyder det?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">Hvad betyder det?</a>]]></key>
     <key alias="nestedContentDeleteItem">Er du sikker på, at du vil slette dette element?</key>
     <key alias="nestedContentDeleteAllItems">Er du sikker på, at du vil slette alle elementer?</key>
     <key alias="nestedContentEditorNotSupported">Egenskaben %0% anvender editoren %1% som ikke er understøttet af Nested Content.</key>
@@ -463,7 +463,7 @@
     <key alias="recycleBinDeleting">Elementerne i papirkurven slettes. Luk venligst ikke dette vindue mens sletningen foregår</key>
     <key alias="recycleBinIsEmpty">Papirkurven er nu tom</key>
     <key alias="recycleBinWarning">Når elementer slettes fra papirkurven, slettes de for altid</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>'s webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]></key>
     <key alias="regexSearchHelp">Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'postnr.', 'URL'</key>
     <key alias="removeMacro">Fjern makro</key>
     <key alias="requiredField">Obligatorisk</key>
@@ -835,7 +835,7 @@
     ]]></key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% er nu blevet kopieret til din database. Tryk på <string>Næste</strong> for at fortsætte.]]></key>
     <key alias="databaseNotFound"><![CDATA[<p>Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.</p>
-<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mere information om at redigere web.config her.</a></p>]]></key>
+<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank" rel="noopener">Mere information om at redigere web.config her.</a></p>]]></key>
     <key alias="databaseText"><![CDATA[For at afslutte dette skridt er du nødt til at have nogle informationer om din database parat ("database forbindelsesstrengen").<br/>Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]></key>
     <key alias="databaseUpgrade"><![CDATA[<p>Tryk på <strong>Opgradér</strong> knappen for at opgradere din database til Umbraco %0%</p><p>Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!</p>]]></key>
     <key alias="databaseUpgradeDone"><![CDATA[Din database er blevet opgraderet til den endelige version %0%.<br/>Tryk på <strong>Næste</strong> for at fortsætte.]]></key>
@@ -908,7 +908,7 @@
     <key alias="instruction">Log ind nedenfor</key>
     <key alias="signInWith">Log ind med</key>
     <key alias="timeout">Din session er udløbet</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Glemt adgangskode?</key>
     <key alias="forgottenPasswordInstruction">En e-mail vil blive sendt til den angivne adresse med et link til at nulstille din adgangskode</key>
     <key alias="requestPasswordResetConfirmation">En e-mail med instruktioner for nulstilling af adgangskoden vil blive sendt til den angivne adresse, hvis det matcher vores optegnelser</key>
@@ -1677,7 +1677,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="sendInvite">Send invitation</key>
     <key alias="backToUsers">Tilbage til brugere</key>
     <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
-    <key alias="inviteEmailCopyFormat"><![CDATA[<html><body><p>Hej %0%, du er blevet inviteret af %1% til Umbraco backoffice.</p><p>Besked fra %1%: <em>%2%</em></p><p>Klik på dette <a href="%3%" target="_blank">link</a> for acceptere invitationen</p><p><small>Hvis du ikke kan klikke på linket, så kopier og indsæt denne URL i dit browservindue<br/><br/>%3%</small></p></body></html>]]></key>
+    <key alias="inviteEmailCopyFormat"><![CDATA[<html><body><p>Hej %0%, du er blevet inviteret af %1% til Umbraco backoffice.</p><p>Besked fra %1%: <em>%2%</em></p><p>Klik på dette <a href="%3%" target="_blank" rel="noopener">link</a> for acceptere invitationen</p><p><small>Hvis du ikke kan klikke på linket, så kopier og indsæt denne URL i dit browservindue<br/><br/>%3%</small></p></body></html>]]></key>
     <key alias="stateAll">Alle</key>
     <key alias="stateActive">Aktiv</key>
     <key alias="stateDisabled">Deaktiveret</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
index b8c115c460..e417da263c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
@@ -284,7 +284,7 @@
     <key alias="scheduledPublishServerTime">Dies führt zur folgenden Zeit auf dem Server:</key>
     <key alias="scheduledPublishDocumentation">
       <![CDATA[
-    	<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Was bedeutet dies?</a>
+    	<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">Was bedeutet dies?</a>
     ]]>
     </key>
     <key alias="nestedContentDeleteItem">Wollen Sie dieses Element wirklich entfernen?</key>
@@ -445,7 +445,7 @@
     <key alias="recycleBinDeleting">Der Papierkorb wird geleert. Bitte warten Sie und schließen Sie das Fenster erst, wenn der Vorgang abgeschlossen ist.</key>
     <key alias="recycleBinIsEmpty">Der Papierkorb ist leer</key>
     <key alias="recycleBinWarning">Wenn Sie den Papierkorb leeren, werden die enthaltenen Elemente endgültig gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden.</key>
-    <key alias="regexSearchError">Der Webservice von &lt;a target='_blank' href='http://regexlib.com'&gt;regexlib.com&lt;/a&gt; ist zur Zeit nicht erreichbar. Bitte versuchen Sie es später erneut.</key>
+    <key alias="regexSearchError">Der Webservice von &lt;a target='_blank' rel='noopener' href='http://regexlib.com'&gt;regexlib.com&lt;/a&gt; ist zur Zeit nicht erreichbar. Bitte versuchen Sie es später erneut.</key>
     <key alias="regexSearchHelp">Finden Sie einen vorbereiteten regulären Ausdruck zur Validierung der Werte, die in dieses Feld eingegeben werden - zum Beispiel 'email, 'plz', 'URL' oder ähnlich.</key>
     <key alias="removeMacro">Macro entfernen</key>
     <key alias="requiredField">Pflichtfeld</key>
@@ -927,7 +927,7 @@
     <key alias="instruction">Hier anmelden:</key>
     <key alias="signInWith">Anmelden mit</key>
     <key alias="timeout">Sitzung abgelaufen</key>
-    <key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="https://umbraco.com" style="text-decoration: none" target="_blank"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
+    <key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
     <key alias="forgottenPassword">Kennwort vergessen?</key>
     <key alias="forgottenPasswordInstruction">Es wird eine E-Mail mit einem Kennwort-Zurücksetzen-Link an die angegebene Adresse geschickt.</key>
     <key alias="requestPasswordResetConfirmation">Es wird eine E-Mail mit Anweisungen zum Zurücksetzen des Kennwortes an die angegebene Adresse geschickt sofern diese im Datenbestand gefunden wurde.</key>
@@ -986,7 +986,7 @@
 														<tbody>
 															<tr>
 																<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																	<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																	<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																		Klicken Sie hier, um Ihr Kennwort zurück zu setzen
 																	</a>
 																</td>
@@ -1104,7 +1104,7 @@
 															<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
 																<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
 																	<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																		<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>Bearbeiten</a> </td> </tr></tbody></table>
+																		<a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>Bearbeiten</a> </td> </tr></tbody></table>
 															</td>
 														</tr>
 													</tbody>
@@ -2005,7 +2005,7 @@
 																	<tbody>
 																		<tr>
 																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																				<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Um diese Einladung anzunehmen,<br>klicken Sie diese Schaltfläche
 																				</a>
 																			</td>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 9b990ce5d9..250040b331 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -283,7 +283,7 @@
     <key alias="childItems" version="7.0">Child items</key>
     <key alias="target" version="7.0">Target</key>
     <key alias="scheduledPublishServerTime">This translates to the following time on the server:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">What does this mean?</a>]]></key>
     <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
     <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
     <key alias="nestedContentDeleteAllItems">Are you sure you want to delete all items?</key>
@@ -488,7 +488,7 @@
     <key alias="recycleBinDeleting">The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place</key>
     <key alias="recycleBinIsEmpty">The recycle bin is now empty</key>
     <key alias="recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
     <key alias="regexSearchHelp">Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code', 'URL'.</key>
     <key alias="removeMacro">Remove Macro</key>
     <key alias="requiredField">Required Field</key>
@@ -990,7 +990,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="instruction">Log in below</key>
     <key alias="signInWith">Sign in with</key>
     <key alias="timeout">Session timed out</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Forgotten password?</key>
     <key alias="forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</key>
     <key alias="requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</key>
@@ -1048,7 +1048,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
 																<tbody>
 																	<tr>
 																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																			<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Click this link to reset your password
 																			</a>
 																		</td>
@@ -1169,7 +1169,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
 																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
 																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
 																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
 																	</td>
 																</tr>
 															</tbody>
@@ -2014,7 +2014,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
 																			<tbody>
 																				<tr>
 																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																						<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																							Click this link to accept the invite
 																						</a>
 																					</td>
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 8394d4e165..5448436aab 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -288,7 +288,7 @@
     <key alias="childItems" version="7.0">Child items</key>
     <key alias="target" version="7.0">Target</key>
     <key alias="scheduledPublishServerTime">This translates to the following time on the server:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">What does this mean?</a>]]></key>
     <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
     <key alias="nestedContentDeleteAllItems">Are you sure you want to delete all items?</key>
     <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
@@ -493,7 +493,7 @@
     <key alias="recycleBinDeleting">The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place</key>
     <key alias="recycleBinIsEmpty">The recycle bin is now empty</key>
     <key alias="recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
     <key alias="regexSearchHelp">Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code', 'URL'.</key>
     <key alias="removeMacro">Remove Macro</key>
     <key alias="requiredField">Required Field</key>
@@ -996,7 +996,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="instruction">Log in below</key>
     <key alias="signInWith">Sign in with</key>
     <key alias="timeout">Session timed out</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Forgotten password?</key>
     <key alias="forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</key>
     <key alias="requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</key>
@@ -1054,7 +1054,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
 																<tbody>
 																	<tr>
 																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																			<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Click this link to reset your password
 																			</a>
 																		</td>
@@ -1175,7 +1175,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
 																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
 																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
 																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
 																	</td>
 																</tr>
 															</tbody>
@@ -2033,7 +2033,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
 																			<tbody>
 																				<tr>
 																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																						<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																							Click this link to accept the invite
 																						</a>
 																					</td>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
index fb11a8dd37..96a6ec2ec0 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -208,7 +208,7 @@
     <key alias="childItems" version="7.0">Nodos hijo</key>
         <key alias="target" version="7.0">Destino</key>
     <key alias="scheduledPublishServerTime">Esto se traduce en la siguiente hora en el servidor:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">¿Esto qué significa?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">¿Esto qué significa?</a>]]></key>
     <key alias="nestedContentDeleteItem">¿Estás seguro que quieres eliminar este elemento?</key>
     <key alias="nestedContentEditorNotSupported">Propiedad %0% utiliza editor %1% que no está soportado por Nested Content.</key>
     <key alias="addTextBox">Añadir otra caja de texto</key>
@@ -320,7 +320,7 @@
         <key alias="recycleBinDeleting">Se está vaciando la papelera. No cierres esta ventana mientras se ejecuta este proceso</key>
     <key alias="recycleBinIsEmpty">La papelera está vacía</key>
         <key alias="recycleBinWarning">No podrás recuperar los elementos una vez sean borrados de la papelera</key>
-    <key alias="regexSearchError"><![CDATA[El servicio web <a target='_blank' href='http://regexlib.com'>regexlib.com</a> está experimentando algunos problemas en estos momentos, de los cuales no somos responsables. Pedimos disculpas por las molestias.]]></key>
+    <key alias="regexSearchError"><![CDATA[El servicio web <a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> está experimentando algunos problemas en estos momentos, de los cuales no somos responsables. Pedimos disculpas por las molestias.]]></key>
     <key alias="regexSearchHelp">Buscar una expresión regular para agregar validación a un campo de formulario. Ejemplo: 'correo electrónico', 'código postal', 'URL'.</key>
     <key alias="removeMacro">Eliminar macro</key>
     <key alias="requiredField">Campo obligatorio</key>
@@ -696,7 +696,7 @@
     <key alias="greeting6">Resplandeciente sábado</key>
     <key alias="instruction">Iniciar sesión</key>
     <key alias="timeout">La sesión ha caducado</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">¿Olvidaste tu contraseña?</key>
     <key alias="forgottenPasswordInstruction">Enviaremos un email a la dirección especificada con un enlace para restaurar tu contraseña</key>
         <key alias="requestPasswordResetConfirmation">Un email con instrucciones para restaurar tu contraseña será enviado a la dirección especificada si ésta está registrada.</key>
@@ -752,7 +752,7 @@
 																<tbody>
 																	<tr>
 																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																			<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Pulsa este enlace para restaurar tu contraseña
 																			</a>
 																		</td>
@@ -1484,7 +1484,7 @@
 																			<tbody>
 																				<tr>
 																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																						<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																							Pulsa este enlace para aceptar la invitación
 																						</a>
 																					</td>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index f42ec404b9..52e511a035 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -277,7 +277,7 @@
     <key alias="childItems" version="7.0">Eléments enfants</key>
     <key alias="target" version="7.0">Cible</key>
     <key alias="scheduledPublishServerTime">Ceci se traduit par l'heure suivante sur le serveur :</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Qu'est-ce que cela signifie?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">Qu'est-ce que cela signifie?</a>]]></key>
     <key alias="nestedContentDeleteItem">Etes-vous certain(e) de vouloir supprimer cet élément?</key>
 	<key alias="nestedContentDeleteAllItems">Etes-vous certain(e) de vouloir supprimer tous les éléments?</key>
     <key alias="nestedContentEditorNotSupported">La propriété %0% utilise l'éditeur %1% qui n'est pas supporté par Nested Content.</key>
@@ -454,7 +454,7 @@
     <key alias="recycleBinDeleting">Les éléments dans la corbeille sont en cours de suppression. Veuillez ne pas fermer cette fenêtre avant que cette opération ne soit terminée.</key>
     <key alias="recycleBinIsEmpty">La corbeille est maintenant vide</key>
     <key alias="recycleBinWarning">Les éléments supprimés de la corbeille seront supprimés définitivement</key>
-    <key alias="regexSearchError"><![CDATA[Le webservice <a target='_blank' href='http://regexlib.com'>regexlib.com</a> rencontre actuellement des problèmes sur lesquels nous n'avons aucun contrôle. Nous sommes sincèrement désolés pour le désagrément.]]></key>
+    <key alias="regexSearchError"><![CDATA[Le webservice <a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> rencontre actuellement des problèmes sur lesquels nous n'avons aucun contrôle. Nous sommes sincèrement désolés pour le désagrément.]]></key>
     <key alias="regexSearchHelp">Rechercher une expression régulière à ajouter pour la validation d'un champ de formulaire. Exemple: 'email, 'zip-code', 'URL'.</key>
     <key alias="removeMacro">Supprimer la macro</key>
     <key alias="requiredField">Champ obligatoire</key>
@@ -942,7 +942,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="instruction">Connectez-vous ci-dessous</key>
     <key alias="signInWith">Identifiez-vous avec</key>
     <key alias="timeout">La session a expiré</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Mot de passe oublié?</key>
     <key alias="forgottenPasswordInstruction">Un email contenant un lien pour ré-initialiser votre mot de passe sera envoyé à l'adresse spécifiée</key>
     <key alias="requestPasswordResetConfirmation">Un email contenant les instructions de ré-initialisation de votre mot de passe sera envoyée à l'adresse spécifiée si elle correspond à nos informations.</key>
@@ -1000,7 +1000,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
 																<tbody>
 																	<tr>
 																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																			<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Cliquez sur ce lien pour réinitialiser votre mot de passe
 																			</a>
 																		</td>
@@ -1119,7 +1119,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
 																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
 																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
 																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>MODIFIER</a> </td> </tr></tbody></table>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>MODIFIER</a> </td> </tr></tbody></table>
 																	</td>
 																</tr>
 															</tbody>
@@ -1950,7 +1950,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
 																			<tbody>
 																				<tr>
 																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																						<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																							Cliquez sur ce lien pour accepter l'invitation
 																						</a>
 																					</td>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
index a307dc9e1a..d69db216c1 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
@@ -181,7 +181,7 @@
     <key alias="recycleBinDeleting">הפריטים הנמצאים בסל המיחזור נמחקים כעת, השאר חלון זה פתוח עד לגמר פעולת המחיקה.</key>
     <key alias="recycleBinIsEmpty">סל המיחזור ריק כעת</key>
     <key alias="recycleBinWarning">מחיקת פריטים מסל המיחזור תמחוק את הפריטים לצמיתות</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
     <key alias="regexSearchHelp">חיפוש ביטויים להוספת אימות עבור שדות טופס. לדוגמא: 'כתובת אימייל', 'מיקוד', 'כתובת אתר' ועוד</key>
     <key alias="removeMacro">הסר מאקרו</key>
     <key alias="requiredField">שדה חובה</key>
@@ -467,7 +467,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="renewSession">יש לבצע חידוש פעילות על מנת לשמור על התוכן</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">לוח הבקרה</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
index 835e49578b..2f89060ac6 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
@@ -186,7 +186,7 @@
     <key alias="recycleBinDeleting"><![CDATA[Gli elementi presenti nel cestino verranno cancellati. Non chiudere questa finestra finchè l'operazione non è terminata.]]></key>
     <key alias="recycleBinIsEmpty"><![CDATA[Il cestino è vuoto]]></key>
     <key alias="recycleBinWarning"><![CDATA[Gli elementi cancellati dal cestino non potranno essere recuperati.]]></key>
-    <key alias="regexSearchError"><![CDATA[Il webservice <a target='_blank' href='http://regexlib.com'>regexlib.com</a> ha attualmente qualche problema, di cui non abbiamo il controllo. Siamo spiacevoli dell'inconveniente.]]></key>
+    <key alias="regexSearchError"><![CDATA[Il webservice <a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> ha attualmente qualche problema, di cui non abbiamo il controllo. Siamo spiacevoli dell'inconveniente.]]></key>
     <key alias="regexSearchHelp"><![CDATA[Ricerca un'espressione regolare da aggiungere al campo della form per poter validare il contenuto. Esempio: 'email, 'zip-code', 'URL'.]]></key>
     <key alias="removeMacro">Elimina Macro</key>
     <key alias="requiredField">Campo obbligatorio</key>
@@ -440,7 +440,7 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in
     <key alias="renewSession">Riconnetti adesso per salvare il tuo lavoro</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">Dashboard</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
index 11cc67ec98..ac56649083 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
@@ -246,7 +246,7 @@
     <key alias="recycleBinDeleting">ごみ箱を空にしています。実行中はウィンドウを閉じないでください。</key>
     <key alias="recycleBinIsEmpty">ごみ箱は空です</key>
     <key alias="recycleBinWarning">ごみ箱から削除すると復活させることはできません</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>のウェブサービスに現在問題が起きているかもしれず、操作できませんでした。大変申し訳ありませんがこの機能は使用できません。]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>のウェブサービスに現在問題が起きているかもしれず、操作できませんでした。大変申し訳ありませんがこの機能は使用できません。]]></key>
     <key alias="regexSearchHelp">フォームのフィールドを正規表現で検証できます。例: 'email, 'zip-code' 'URL'</key>
     <key alias="removeMacro">マクロを削除</key>
     <key alias="requiredField">必須フィールド</key>
@@ -608,7 +608,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="greeting6">ハッピー土曜日</key>
     <key alias="instruction">ウェブサイトにログインします。</key>
     <key alias="timeout">セッションタイムアウトしました。</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.org</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.org</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">ダッシュボード</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
index 1f7642036e..0e29856926 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
@@ -180,7 +180,7 @@
     <key alias="recycleBinDeleting">휴지통안에 이 항목들이 완전히 삭제중 입니다. 작업이 완료되기전까지 창을 닫지마세요.</key>
     <key alias="recycleBinIsEmpty">휴지통이 비었습니다.</key>
     <key alias="recycleBinWarning">휴지통에서 삭제하시면 완전히 삭제됩니다.</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>의 웹서비스는 현재 제어할 수 없는 몇가지 문제점이 보고되었습니다. 불편을 드려 대단히 죄송합니다.]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>의 웹서비스는 현재 제어할 수 없는 몇가지 문제점이 보고되었습니다. 불편을 드려 대단히 죄송합니다.]]></key>
     <key alias="regexSearchHelp">필드 유효성검사를 위해 정규표현식을 검색합니다. 예: 'email, 'zip-code' 'URL'</key>
     <key alias="removeMacro">매크로 삭제</key>
     <key alias="requiredField">필수 필드</key>
@@ -452,7 +452,7 @@
     <key alias="renewSession">TRANSLATE ME: 'Renew now to save your work'</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">대시보드</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index d5f22686fe..bd70a6d0f4 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -240,7 +240,7 @@
     <key alias="recycleBinDeleting">Innholdet i papirkurven blir nå slettet. Vennligst ikke lukk dette vinduet mens denne operasjonen foregår</key>
     <key alias="recycleBinIsEmpty">Papirkurven er nå tom</key>
     <key alias="recycleBinWarning">Når elementer blir slettet fra papirkurven vil de være slettet for alltid</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a> tjenesten opplever for tiden problemer som vi ikke har kontroll over. Vi beklager denne ubeleiligheten.]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> tjenesten opplever for tiden problemer som vi ikke har kontroll over. Vi beklager denne ubeleiligheten.]]></key>
     <key alias="regexSearchHelp">Søk etter et regulært uttrykk for å legge inn validering til et felt. Eksempel: 'email, 'zip-code', 'URL'.</key>
     <key alias="removeMacro">Fjern makro</key>
     <key alias="requiredField">Obligatorisk</key>
@@ -509,7 +509,7 @@
     <key alias="instruction">Logg på nedenfor</key>
     <key alias="signInWith">Logg på med</key>
     <key alias="timeout">Din sesjon er utløpt</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">Skrivebord</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
index 300b4dff76..6a138fcb6b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -205,7 +205,7 @@
     <key alias="childItems" version="7.0">Elementy dzieci</key>
     <key alias="target" version="7.0">Cel</key>
     <key alias="scheduledPublishServerTime">Oznacza to następującą godzinę na serwerze:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Co to oznacza?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">Co to oznacza?</a>]]></key>
     <key alias="nestedContentDeleteItem">Czy na pewno chcesz usunąć ten element?</key>
     <key alias="nestedContentEditorNotSupported">Właściwość %0% używa edytora %1%, który nie jest wspierany przez Nested Content.</key>
     <key alias="addTextBox">Dodaj kolejne pole tekstowe</key>
@@ -321,7 +321,7 @@
     <key alias="recycleBinDeleting">Zawartość kosza jest teraz usuwana. Proszę nie zamykać tego okna do momentu zakończenia procesu.</key>
     <key alias="recycleBinIsEmpty">Zawartość kosza została usunięta</key>
     <key alias="recycleBinWarning">Usunięcie elementów z kosza powoduje ich trwałe i nieodwracalne skasowanie</key>
-    <key alias="regexSearchError"><![CDATA[Serwis <a target='_blank' href='http://regexlib.com'>regexlib.com</a> aktualnie nie jest dostępny, na co nie mamy wpływu. Bardzo przepraszamy za te utrudnienia.]]></key>
+    <key alias="regexSearchError"><![CDATA[Serwis <a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> aktualnie nie jest dostępny, na co nie mamy wpływu. Bardzo przepraszamy za te utrudnienia.]]></key>
     <key alias="regexSearchHelp">Przeszukaj dla wyrażeń regularnych, aby dodać regułę sprawdzającą do formularza. Np. 'email' 'URL'</key>
     <key alias="removeMacro">Usuń Makro</key>
     <key alias="requiredField">Pole wymagane</key>
@@ -728,7 +728,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="instruction">Zaloguj się poniżej</key>
     <key alias="signInWith">Zaloguj się z</key>
     <key alias="timeout">Sesja wygasła</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Zapomniałeś hasła?</key>
     <key alias="forgottenPasswordInstruction">E-mail z linkiem do zresetowania hasła zostanie wysłany na podany adres</key>
     <key alias="requestPasswordResetConfirmation">E-mail z instrukcjami do zresetowania hasła zostanie wysłany, jeśli zgadza się z naszą bazą danych</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
index 0091cde73c..5f11605c31 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
@@ -180,7 +180,7 @@
     <key alias="recycleBinDeleting">Os itens na lixeira agora estão sendo removidos. Favor não fechar esta janela enquanto este processo é concluído</key>
     <key alias="recycleBinIsEmpty">A lixeira agora está vazia</key>
     <key alias="recycleBinWarning">Quando itens são removidos da lixeira estes somem para sempre</key>
-    <key alias="regexSearchError"><![CDATA[O serviço web <a target='_blank' href='http://regexlib.com'>regexlib.com</a> está no momento sofrendo dificuldades dos quais não temos controle. Pedimos desculpas pela inconveniência.]]></key>
+    <key alias="regexSearchError"><![CDATA[O serviço web <a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> está no momento sofrendo dificuldades dos quais não temos controle. Pedimos desculpas pela inconveniência.]]></key>
     <key alias="regexSearchHelp">Busque por uma expressão regular para adicionar validação à um campo de formulário. Exemplo: 'email', 'zip-code' (código postal), 'URL'</key>
     <key alias="removeMacro">Remover Macro</key>
     <key alias="requiredField">Campo obrigatório</key>
@@ -445,7 +445,7 @@ Pressione <strong>"próximo"</strong> para iniciar o assistente.]]></key>
     <key alias="renewSession">Renovar agora para salvar seu trabalho</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">Painel</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
index 9ad4291c59..77860523cd 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -241,7 +241,7 @@
     <key alias="removeDate">Очистить дату</key>
     <key alias="routeError">ВНИМАНИЕ: этот документ опубликован, но его URL вступает в противоречие с документом %0%</key>
     <key alias="scheduledPublishServerTime">Это время будет соответствовать следующему времени на сервере:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Что это означает?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">Что это означает?</a>]]></key>
     <key alias="setDate">Задать дату</key>
     <key alias="sortDone">Порядок сортировки обновлен</key>
     <key alias="sortHelp">Для сортировки узлов просто перетаскивайте узлы или нажмите на заголовке столбца. Вы можете выбрать несколько узлов, удерживая клавиши "shift" или "ctrl" при пометке</key>
@@ -371,7 +371,7 @@
     <key alias="recycleBinDeleting">Все элементы в корзине сейчас удаляются. Пожалуйста, не закрывайте это окно до окончания процесса удаления</key>
     <key alias="recycleBinIsEmpty">Корзина пуста</key>
     <key alias="recycleBinWarning">Вы больше не сможете восстановить элементы, удаленные из корзины</key>
-    <key alias="regexSearchError"><![CDATA[Сервис <a target='_blank' href='http://regexlib.com'>regexlib.com</a> испытывает в настоящее время некоторые трудности, не зависящие от нас. Просим извинить за причиненные неудобства.]]></key>
+    <key alias="regexSearchError"><![CDATA[Сервис <a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a> испытывает в настоящее время некоторые трудности, не зависящие от нас. Просим извинить за причиненные неудобства.]]></key>
     <key alias="regexSearchHelp">Используйте поиск регулярных выражений для добавления сервиса проверки к полю Вашей формы. Например: 'email, 'zip-code', 'URL'</key>
     <key alias="removeMacro">Удалить макрос</key>
     <key alias="requiredField">Обязательное поле</key>
@@ -887,7 +887,7 @@
     <key alias="renewSession">Обновите сейчас, чтобы сохранить сделанные изменения</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p>]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p>]]></key>
     <key alias="greeting0">Сегодня же выходной!</key>
     <key alias="greeting1">Понедельник — день тяжелый...</key>
     <key alias="greeting2">Вот уже вторник...</key>
@@ -953,7 +953,7 @@
 																<tbody>
 																	<tr>
 																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																			<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Нажмите на эту ссылку для того, чтобы сбросить пароль
 																			</a>
 																		</td>
@@ -1092,7 +1092,7 @@
 																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
 																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
 																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>ВНЕСТИ ИЗМЕНЕНИЯ</a> </td> </tr></tbody></table>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>ВНЕСТИ ИЗМЕНЕНИЯ</a> </td> </tr></tbody></table>
 																	</td>
 																</tr>
 															</tbody>
@@ -1667,7 +1667,7 @@
     <key alias="groupsHelp">Добавьте пользователя в группу(ы) для задания прав доступа</key>
     <key alias="invite">Пригласить</key>
     <key alias="inviteEmailCopySubject">Приглашение в панель администрирования Umbraco</key>
-    <key alias="inviteEmailCopyFormat"><![CDATA[<html><body><p>Здравствуйте, %0%,<br><br>Вы были приглашены пользователем %1%, и Вам предоставлен доступ в панель администрирования Umbraco.</p><p>Сообщение от %1%: <em>%2%</em></p><p>Перейдите по <a href="%3%" target="_blank">этой ссылке</a>, чтобы принять приглашение.</p><p><small>Если Вы не имеете возможности перейти по ссылке, скопируйте нижеследующий текст ссылки и вставьте в адресную строку Вашего браузера.<br/><br/>%3%</small></p></body></html>]]><![CDATA[
+    <key alias="inviteEmailCopyFormat"><![CDATA[<html><body><p>Здравствуйте, %0%,<br><br>Вы были приглашены пользователем %1%, и Вам предоставлен доступ в панель администрирования Umbraco.</p><p>Сообщение от %1%: <em>%2%</em></p><p>Перейдите по <a href="%3%" target="_blank" rel="noopener">этой ссылке</a>, чтобы принять приглашение.</p><p><small>Если Вы не имеете возможности перейти по ссылке, скопируйте нижеследующий текст ссылки и вставьте в адресную строку Вашего браузера.<br/><br/>%3%</small></p></body></html>]]><![CDATA[
         <html>
 			<head>
 				<meta name='viewport' content='width=device-width'>
@@ -1722,7 +1722,7 @@
 																			<tbody>
 																				<tr>
 																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																						<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																							Нажмите на эту ссылку, чтобы принять приглашение
 																						</a>
 																					</td>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
index a9625a9741..d9fc485007 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -302,7 +302,7 @@
     <key alias="recycleBinDeleting">Allt som ligger i papperskorgen tas nu bort. Stäng inte detta fönster förrän detta är klart</key>
     <key alias="recycleBinIsEmpty">Papperskorgen är nu tom</key>
     <key alias="recycleBinWarning">Om du tömmer papperskorgen kommer allt som ligger i den att tas bort permanent</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webbtjänst har för närvarande driftsstörningar. Tyvärr kan vi inte göra något åt detta.]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>'s webbtjänst har för närvarande driftsstörningar. Tyvärr kan vi inte göra något åt detta.]]></key>
     <key alias="regexSearchHelp">Sök efter en regular expression som kan validera ett formulärsfält. t.ex. 'email' eller 'URL'</key>
     <key alias="removeMacro">Ta bort makro</key>
     <key alias="requiredField">Obligatoriskt formulärsfält</key>
@@ -574,7 +574,7 @@
     <key alias="renewSession">Förnya nu för att spara ditt arbete</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p> ]]></key>
     <key alias="greeting0">Happy super Sunday</key>
     <key alias="greeting1">Happy manic Monday</key>
     <key alias="greeting2">Happy tremendous Tuesday</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
index 82ef1ba628..bb73d43a3e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -857,7 +857,7 @@
               <p> Devam etmek için lütfen "web.config" dosyasını düzenleyin (Visual Studio veya favori metin düzenleyicinizi kullanarak), en alta kaydırın, veritabanınız için "UmbracoDbDSN" adlı anahtara bağlantı dizesini ekleyin ve dosyayı kaydedin. </p>
               <p>
               <strong> Yeniden dene </strong> düğmesini tıklayın.
-              bitti. <br /> <a href=https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank">
+              bitti. <br /> <a href=https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
                                                         Web.config'i düzenleme hakkında daha fazla bilgi burada. </a> </p>]]>
     </key>
     <key alias="databaseText">
@@ -1008,7 +1008,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
     <key alias="instruction">Aşağıda oturum açın</key>
     <key alias="signInWith">ile oturum açın</key>
     <key alias="timeout">Oturum zaman aşımına uğradı</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align: right;">&copy; 2015 - %0% <br /> <a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com </a> </p>]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align: right;">&copy; 2015 - %0% <br /> <a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">Umbraco.com </a> </p>]]></key>
     <key alias="forgottenPassword">Şifrenizi mi unuttunuz?</key>
     <key alias="forgottenPasswordInstruction">Parolanızı sıfırlamak için bir bağlantıyla belirtilen adrese bir e-posta gönderilecektir</key>
     <key alias="requestPasswordResetConfirmation">Kayıtlarımızla eşleşirse, şifre sıfırlama talimatlarını içeren bir e-posta, belirtilen adrese gönderilecektir</key>
@@ -1067,7 +1067,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
 																<tbody>
 																	<tr>
 																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																			<a href='%1%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																				Şifrenizi sıfırlamak için bu bağlantıyı tıklayın
 																			</a>
 																		</td>
@@ -1192,7 +1192,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
 																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
 																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
 																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>DÜZENLE</a> </td> </tr></tbody></table>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>DÜZENLE</a> </td> </tr></tbody></table>
 																	</td>
 																</tr>
 															</tbody>
@@ -2063,7 +2063,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
                                                                     <tbody>
                                                                         <tr>
                                                                             <td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-                                                                                <a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+                                                                                <a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
                                                                                     Daveti Kabul Etmek İçin Bu Bağlantıyı Tıklayın
                                                                                 </a>
                                                                             </td>
@@ -2254,7 +2254,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
         <key alias="helpText">
           <![CDATA[
         <p> Durum denetleyicisi, sitenizin çeşitli alanlarını en iyi uygulama ayarları, yapılandırma, olası sorunlar vb. için değerlendirir. Sorunları bir düğmeye basarak kolayca düzeltebilirsiniz.
-        Kendi sağlık kontrollerinizi ekleyebilir, <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" class="btn-link -underline">özel durum kontrolleri hakkında daha fazla bilgi için belgeler </a>. </p>
+        Kendi sağlık kontrollerinizi ekleyebilir, <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" rel="noopener" class="btn-link -underline">özel durum kontrolleri hakkında daha fazla bilgi için belgeler </a>. </p>
         ]]>
         </key>
       </area>
@@ -2492,7 +2492,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
     <key alias="trainingHeadline">Umbraco eğitim videolarının saatleri yalnızca bir tıklama uzaklıkta</key>
     <key alias="trainingDescription">
       <![CDATA[
-            <p> Umbraco'da ustalaşmak mı istiyorsunuz? Umbraco'nun kullanımıyla ilgili bu videolardan birini izleyerek en iyi uygulamaları öğrenmek için birkaç dakikanızı ayırın. Daha da fazla Umbraco videosu için <a href="http://umbraco.tv" target="_blank">umbraco.tv </a> adresini ziyaret edin </p>
+            <p> Umbraco'da ustalaşmak mı istiyorsunuz? Umbraco'nun kullanımıyla ilgili bu videolardan birini izleyerek en iyi uygulamaları öğrenmek için birkaç dakikanızı ayırın. Daha da fazla Umbraco videosu için <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv </a> adresini ziyaret edin </p>
         ]]>
     </key>
     <key alias="getStarted">Başlamak için</key>
@@ -2503,27 +2503,27 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
     <key alias="more">Daha fazla bilgi edinin</key>
     <key alias="bulletPointOne">
       <![CDATA[
-        Ayarlar <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank">öğelerle çalışma hakkında daha fazla bilgi edinin Our Umbraco'nun Dokümantasyon bölümünde </a>
+        Ayarlar <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank" rel="noopener">öğelerle çalışma hakkında daha fazla bilgi edinin Our Umbraco'nun Dokümantasyon bölümünde </a>
     ]]>
     </key>
     <key alias="bulletPointTwo">
       <![CDATA[
-        <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank">Topluluk Forumu</a>'nda bir soru sorun
+        <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Topluluk Forumu</a>'nda bir soru sorun
     ]]>
     </key>
     <key alias="bulletPointThree">
       <![CDATA[
-        <a class="btn-link -underline" href="https://umbraco.tv" target="_blank">Eğitici videolarımızı</a> izleyin (bazıları ücretsiz, bazıları abonelik gerektirir)
+        <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">Eğitici videolarımızı</a> izleyin (bazıları ücretsiz, bazıları abonelik gerektirir)
     ]]>
     </key>
     <key alias="bulletPointFour">
       <![CDATA[
-        <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank">Üretkenliği artıran araçlarımız ve ticari desteğimiz </a> hakkında bilgi edinin
+        <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">Üretkenliği artıran araçlarımız ve ticari desteğimiz </a> hakkında bilgi edinin
     ]]>
     </key>
     <key alias="bulletPointFive">
       <![CDATA[
-        Gerçek hayattaki <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank">eğitim ve sertifika </a> fırsatları hakkında bilgi edinin
+        Gerçek hayattaki <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">eğitim ve sertifika </a> fırsatları hakkında bilgi edinin
     ]]>
     </key>
   </area>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
index 916bca0dbd..57b90db4b3 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
@@ -169,7 +169,7 @@
     <key alias="childItems" version="7.0">子项</key>
     <key alias="target" version="7.0">目标</key>
     <key alias="scheduledPublishServerTime">这将转换到服务器上的以下时间:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">这是什么意思？</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">这是什么意思？</a>]]></key>
   </area>
   <area alias="media">
     <key alias="clickToUpload">点击上传</key>
@@ -257,7 +257,7 @@
     <key alias="recycleBinDeleting">正在清空回收站，请不要关闭窗口。</key>
     <key alias="recycleBinIsEmpty">回收站已清空</key>
     <key alias="recycleBinWarning">从回收站删除的项目将不可恢复</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>的服务暂时出现问题。]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>的服务暂时出现问题。]]></key>
     <key alias="regexSearchHelp">查找正则表达式来验证输入，如: 'email、'zip-code'、'URL'。</key>
     <key alias="removeMacro">移除宏</key>
     <key alias="requiredField">必填项</key>
@@ -630,7 +630,7 @@
     <key alias="instruction">在下方登录</key>
     <key alias="signInWith">登录</key>
     <key alias="timeout">会话超时</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">忘记密码?</key>
     <key alias="forgottenPasswordInstruction">电子邮件将发送到地址指定的链接, 以重置您的密码</key>
     <key alias="requestPasswordResetConfirmation">如果电子邮件与我们的记录相符, 则将发送带有密码重置指令的邮件</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index 23123f9bfa..16177f7ca3 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -166,7 +166,7 @@
     <key alias="childItems" version="7.0">子項目</key>
     <key alias="target" version="7.0">目標</key>
     <key alias="scheduledPublishServerTime">預計發表的時間（伺服器端）</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">這是什麼意思？</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">這是什麼意思？</a>]]></key>
   </area>
   <area alias="media">
     <key alias="clickToUpload">點選以便上傳</key>
@@ -254,7 +254,7 @@
     <key alias="recycleBinDeleting">正在清空回收站，請不要關閉窗口。</key>
     <key alias="recycleBinIsEmpty">回收站已清空</key>
     <key alias="recycleBinWarning">從回收站刪除的項目將不可恢復</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>的網站服務目前出現些狀況，而我們無能為力。我們對此不便感到十分抱歉。]]></key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>的網站服務目前出現些狀況，而我們無能為力。我們對此不便感到十分抱歉。]]></key>
     <key alias="regexSearchHelp">查找規則運算式來驗證輸入，如: 'email、'zip-code'、'URL'。</key>
     <key alias="removeMacro">移除巨集</key>
     <key alias="requiredField">必填項目</key>
@@ -619,7 +619,7 @@
     <key alias="instruction">下方登入</key>
     <key alias="signInWith">登入使用</key>
     <key alias="timeout">連線時間過了</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">忘記密碼？</key>
     <key alias="forgottenPasswordInstruction">一封內有重設密碼連結的電子郵件已經寄出給您</key>
     <key alias="requestPasswordResetConfirmation">一封內有重設密碼連結的電子郵件已經寄到此信箱</key>
diff --git a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
index 52abd04af0..2162310760 100644
--- a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
+++ b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
@@ -39,14 +39,14 @@
 					<h2>Easy start with Umbraco.tv</h2>
 					<p>We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.</p>
 					
-					<a href="https://umbraco.tv?ref=tvFromInstaller" target="_blank">Umbraco.tv &rarr;</a>
+					<a href="https://umbraco.tv?ref=tvFromInstaller" target="_blank" rel="noopener">Umbraco.tv &rarr;</a>
 				</div>
 
 				<div class="col">
 					<h2>Be a part of the community</h2>
 					<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
 					
-					<a href="https://our.umbraco.com/?ref=ourFromInstaller" target="_blank">our.Umbraco &rarr;</a>
+					<a href="https://our.umbraco.com/?ref=ourFromInstaller" target="_blank" rel="noopener">our.Umbraco &rarr;</a>
 				</div>
 			</div>
 

From f0b39ce890e8f31523739a68d317b24df79fdb76 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 24 Mar 2021 10:57:02 +0100
Subject: [PATCH 159/202] Align 'Add language' test to netcore

---
 .../cypress/integration/Settings/languages.ts                | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts
index 49bcf94943..336e5793d9 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts
@@ -6,7 +6,10 @@ context('Languages', () => {
   });
 
   it('Add language', () => {
-    const name = "Kyrgyz (Kyrgyzstan)"; // Must be an option in the select box
+      // For some reason the languages to chose fom seems to be translated differently than normal, as an example:
+      // My system is set to EN (US), but most languages are translated into Danish for some reason
+      // Aghem seems untranslated though?
+      const name = "Aghem"; // Must be an option in the select box
 
      cy.umbracoEnsureLanguageNameNotExists(name);
 

From 70a582d1f0a4d5554a7b1f16ccf96f602e2e6ed7 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 24 Mar 2021 15:04:34 +0100
Subject: [PATCH 160/202] Add new cypress tests

---
 .../cypress/integration/Content/content.ts    | 204 +++++++++++++++++-
 src/Umbraco.Tests.AcceptanceTest/package.json |   2 +-
 2 files changed, 204 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index 1a40e8451f..6df39be44c 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -1,5 +1,13 @@
 /// <reference types="Cypress" />
-import { DocumentTypeBuilder, ContentBuilder, AliasHelper } from 'umbraco-cypress-testhelpers';
+import {
+    DocumentTypeBuilder,
+    ContentBuilder,
+    AliasHelper,
+    GridDataTypeBuilder,
+    PartialViewMacroBuilder,
+    MacroBuilder
+} from 'umbraco-cypress-testhelpers';
+
 context('Content', () => {
 
     beforeEach(() => {
@@ -14,6 +22,23 @@ context('Content', () => {
         cy.get('.umb-tree-item__inner').should('exist', {timeout: 10000});
     }
 
+    function createSimpleMacro(name){
+        const insertMacro = new PartialViewMacroBuilder()
+            .withName(name)
+            .withContent(`@inherits Umbraco.Web.Macros.PartialViewMacroPage
+<h1>Acceptance test</h1>`)
+            .build();
+
+        const macroWithPartial = new MacroBuilder()
+            .withName(name)
+            .withPartialViewMacro(insertMacro)
+            .withRenderInEditor()
+            .withUseInEditor()
+            .build();
+
+        cy.saveMacroWithPartial(macroWithPartial);
+    }
+
     it('Copy content', () => {
         const rootDocTypeName = "Test document type";
         const childDocTypeName = "Child test document type";
@@ -596,4 +621,181 @@ context('Content', () => {
         cy.umbracoEnsureTemplateNameNotExists(pickerDocTypeName);
         cy.umbracoEnsureDocumentTypeNameNotExists(pickedDocTypeName);
     });
+
+    it('Content with macro in RTE', () => {
+        const viewMacroName = 'Content with macro in RTE';
+        const partialFileName = viewMacroName + '.cshtml';
+
+        cy.umbracoEnsureMacroNameNotExists(viewMacroName);
+        cy.umbracoEnsurePartialViewMacroFileNameNotExists(partialFileName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(viewMacroName);
+        cy.umbracoEnsureTemplateNameNotExists(viewMacroName);
+        cy.deleteAllContent();
+
+        // First thing first we got to create the macro we will be inserting
+        createSimpleMacro(viewMacroName);
+
+        // Now we need to create a document type with a rich text editor where we can insert the macro
+        // The document type must have a template as well in order to ensure that the content is displayed correctly
+        const alias = AliasHelper.toAlias(viewMacroName);
+        const docType = new DocumentTypeBuilder()
+            .withName(viewMacroName)
+            .withAlias(alias)
+            .withAllowAsRoot(true)
+            .withDefaultTemplate(alias)
+            .addGroup()
+            .addRichTextProperty()
+            .withAlias('text')
+            .done()
+            .done()
+            .build();
+
+        cy.saveDocumentType(docType).then((generatedDocType) => {
+            // Might as wel initally create the content here, the less GUI work during the test the better
+            const contentNode = new ContentBuilder()
+                .withContentTypeAlias(generatedDocType["alias"])
+                .withAction('saveNew')
+                .addVariant()
+                .withName(viewMacroName)
+                .withSave(true)
+                .done()
+                .build();
+
+            cy.saveContent(contentNode);
+        });
+
+        // Edit the macro template in order to have something to verify on when rendered.
+        cy.editTemplate(viewMacroName, `@inherits Umbraco.Web.Mvc.UmbracoViewPage
+@using ContentModels = Umbraco.Web.PublishedModels;
+@{
+  Layout = null;
+}
+@{
+    if (Model.HasValue("text")){
+        @(Model.Value("text"))
+    }
+} `);
+
+        // Enter content
+        refreshContentTree();
+        cy.umbracoTreeItem("content", [viewMacroName]).click();
+
+        // Insert macro
+        cy.get('#mceu_13-button').click();
+        cy.get('.umb-card-grid-item').contains(viewMacroName).click();
+
+        // Save and publish
+        cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
+        cy.umbracoSuccessNotification().should('be.visible');
+
+        // Ensure that the view gets rendered correctly
+        const expected = `<h1>Acceptance test</h1><p> </p>`;
+        cy.umbracoVerifyRenderedViewContent('/', expected, true).should('be.true');
+
+        // Cleanup
+        cy.umbracoEnsureMacroNameNotExists(viewMacroName);
+        cy.umbracoEnsurePartialViewMacroFileNameNotExists(partialFileName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(viewMacroName);
+        cy.umbracoEnsureTemplateNameNotExists(viewMacroName);
+    });
+
+    it('Content with macro in grid', () => {
+        const name = 'Content with macro in grid';
+        const macroName = 'Grid macro';
+        const macroFileName = macroName + '.cshtml';
+
+        cy.umbracoEnsureDataTypeNameNotExists(name);
+        cy.umbracoEnsureDocumentTypeNameNotExists(name);
+        cy.umbracoEnsureTemplateNameNotExists(name);
+        cy.umbracoEnsureMacroNameNotExists(macroName);
+        cy.umbracoEnsurePartialViewMacroFileNameNotExists(macroFileName);
+        cy.deleteAllContent();
+
+        createSimpleMacro(macroName);
+
+        const grid = new GridDataTypeBuilder()
+            .withName(name)
+            .withDefaultGrid()
+            .build();
+
+        const alias = AliasHelper.toAlias(name);
+        // Save grid and get the ID
+        cy.saveDataType(grid).then((dataType) => {
+            // Create a document type using the data type
+            const docType = new DocumentTypeBuilder()
+                .withName(name)
+                .withAlias(alias)
+                .withAllowAsRoot(true)
+                .withDefaultTemplate(alias)
+                .addGroup()
+                .addCustomProperty(dataType['id'])
+                .withAlias('grid')
+                .done()
+                .done()
+                .build();
+
+            cy.saveDocumentType(docType).then((generatedDocType) => {
+                const contentNode = new ContentBuilder()
+                    .withContentTypeAlias(generatedDocType["alias"])
+                    .addVariant()
+                    .withName(name)
+                    .withSave(true)
+                    .done()
+                    .build();
+
+                cy.saveContent(contentNode);
+            });
+        });
+
+        // Edit the template to allow us to verify the rendered view
+        cy.editTemplate(name, `@inherits Umbraco.Web.Mvc.UmbracoViewPage
+@using ContentModels = Umbraco.Web.PublishedModels;
+@{
+  Layout = null;
+}
+@Html.GetGridHtml(Model, "grid")`);
+
+        // Act
+        // Enter content
+        refreshContentTree();
+        cy.umbracoTreeItem("content", [name]).click();
+        // Click add
+        cy.get(':nth-child(2) > .preview-row > .preview-col > .preview-cell').click(); // Choose 1 column layout.
+        cy.get('.umb-column > .templates-preview > :nth-child(2) > .ng-binding').click(); // Choose headline
+        cy.get('.umb-cell-placeholder').click();
+        // Click macro
+        cy.get(':nth-child(4) > .umb-card-grid-item > :nth-child(1)').click();
+        // Select the macro
+        cy.get('.umb-card-grid-item').contains(macroName).click();
+
+        // Save and publish
+        cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
+        cy.umbracoSuccessNotification().should('be.visible');
+
+        const expected = `
+    <div class="umb-grid">
+      <div class="grid-section">
+        <div>
+          <div class="container">
+            <div class="row clearfix">
+              <div class="col-md-12 column">
+                <div>
+                  <h1>Acceptance test</h1>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>`
+
+        cy.umbracoVerifyRenderedViewContent('/', expected, true).should('be.true');
+
+        // Clean
+        cy.umbracoEnsureDataTypeNameNotExists(name);
+        cy.umbracoEnsureDocumentTypeNameNotExists(name);
+        cy.umbracoEnsureTemplateNameNotExists(name);
+        cy.umbracoEnsureMacroNameNotExists(macroName);
+        cy.umbracoEnsurePartialViewMacroFileNameNotExists(macroFileName);
+    });
 });
diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json
index 069a1d85b7..caf75638e6 100644
--- a/src/Umbraco.Tests.AcceptanceTest/package.json
+++ b/src/Umbraco.Tests.AcceptanceTest/package.json
@@ -10,7 +10,7 @@
     "cypress": "^6.8.0",
     "ncp": "^2.0.0",
     "prompt": "^1.0.0",
-    "umbraco-cypress-testhelpers": "^1.0.0-beta-52"
+    "umbraco-cypress-testhelpers": "^1.0.0-beta-53"
   },
   "dependencies": {
     "typescript": "^3.9.2"

From 64724ac85b9aa362ced6cc33952205f5edb5b8ae Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 24 Mar 2021 15:11:26 +0100
Subject: [PATCH 161/202] Add indentation

---
 .../cypress/integration/Content/content.ts    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index 6df39be44c..b7f0b40fa6 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -644,9 +644,9 @@ context('Content', () => {
             .withAllowAsRoot(true)
             .withDefaultTemplate(alias)
             .addGroup()
-            .addRichTextProperty()
-            .withAlias('text')
-            .done()
+                .addRichTextProperty()
+                    .withAlias('text')
+                .done()
             .done()
             .build();
 
@@ -656,8 +656,8 @@ context('Content', () => {
                 .withContentTypeAlias(generatedDocType["alias"])
                 .withAction('saveNew')
                 .addVariant()
-                .withName(viewMacroName)
-                .withSave(true)
+                    .withName(viewMacroName)
+                    .withSave(true)
                 .done()
                 .build();
 
@@ -728,9 +728,9 @@ context('Content', () => {
                 .withAllowAsRoot(true)
                 .withDefaultTemplate(alias)
                 .addGroup()
-                .addCustomProperty(dataType['id'])
-                .withAlias('grid')
-                .done()
+                    .addCustomProperty(dataType['id'])
+                        .withAlias('grid')
+                    .done()
                 .done()
                 .build();
 
@@ -738,8 +738,8 @@ context('Content', () => {
                 const contentNode = new ContentBuilder()
                     .withContentTypeAlias(generatedDocType["alias"])
                     .addVariant()
-                    .withName(name)
-                    .withSave(true)
+                        .withName(name)
+                        .withSave(true)
                     .done()
                     .build();
 

From eabfa7f414fcf89efbe34cf49b7e8563c0d2de3c Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 24 Mar 2021 15:28:06 +0100
Subject: [PATCH 162/202] Getting rid of the config file and implementing an
 appSetting instead

---
 .../Configuration/GlobalSettings.cs           | 22 +++++++++++++++++++
 .../Configuration/IGlobalSettings.cs          |  9 ++++++++
 src/Umbraco.Core/Constants-AppSettings.cs     |  5 +++++
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  1 -
 .../config/content.dashboard.access.config.js | 22 -------------------
 src/Umbraco.Web.UI/web.Template.config        |  1 +
 6 files changed, 37 insertions(+), 23 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/config/content.dashboard.access.config.js

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index ba5baf9e87..0765a35a29 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -395,6 +395,28 @@ namespace Umbraco.Core.Configuration
             }
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the content dashboard should be available to all users.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
+        ///     and the default access rules for that dashboard will be in use.
+        /// </value>
+        public bool AllowContentDashboardAccessToAllUsers
+        {
+            get
+            {
+                try
+                {
+                    return bool.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.AllowContentDashboardAccessToAllUsers]);
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
 
         /// <summary>
         /// An int value representing the time in milliseconds to lock the database for a write operation
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index 483829f85f..6016de2917 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -57,6 +57,15 @@
         /// </summary>
         bool UseHttps { get; }
 
+        /// <summary>
+        /// Gets a value indicating whether the content dashboard should be available to all users.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
+        ///     and the default access rules for that dashboard will be in use.
+        /// </value>
+        bool AllowContentDashboardAccessToAllUsers { get; }
+
         /// <summary>
         /// Returns a string value to determine if umbraco should skip version-checking.
         /// </summary>
diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index f04f0e1f5f..1f096ab9f9 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -110,6 +110,11 @@ namespace Umbraco.Core
             /// </summary>
             public const string UseHttps = "Umbraco.Core.UseHttps";
 
+            /// <summary>
+            /// A true/false value indicating whether the content dashboard should be visible for all user groups.
+            /// </summary>
+            public const string AllowContentDashboardAccessToAllUsers = "Umbraco.Core.AllowContentDashboardAccessToAllUsers";
+
             /// <summary>
             /// TODO: FILL ME IN
             /// </summary>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7fb27deb7e..eb6649a7c4 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -148,7 +148,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Content Include="Config\content.dashboard.access.config.js" />
     <Content Include="Config\grid.editors.config.js" />
     <Content Include="Config\Lang\cs-CZ.user.xml" />
     <Content Include="Config\Lang\da-DK.user.xml" />
diff --git a/src/Umbraco.Web.UI/config/content.dashboard.access.config.js b/src/Umbraco.Web.UI/config/content.dashboard.access.config.js
deleted file mode 100644
index 93c727d85a..0000000000
--- a/src/Umbraco.Web.UI/config/content.dashboard.access.config.js
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "Type": "grant",
-        "Value": "admin"
-    },
-    {
-        "Type": "grant",
-        "Value": "editor"
-    },
-    {
-        "Type": "grant",
-        "Value": "sensitiveData"
-    },
-    {
-        "Type": "grant",
-        "Value": "translator"
-    },
-    {
-        "Type": "grant",
-        "Value": "writer"
-    }
-]
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 03f462fb9e..ae141e5408 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -37,6 +37,7 @@
         <add key="Umbraco.Core.TimeOutInMinutes" value="20" />
         <add key="Umbraco.Core.DefaultUILanguage" value="en-US" />
         <add key="Umbraco.Core.UseHttps" value="false" />
+        <add key="Umbraco.Core.AllowContentDashboardAccessToAllUsers" value="true"/>
 
         <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
         <add key="webpages:Enabled" value="false" />

From 6e54c6fefde685a0d10fe9a2fdf5c82177b8c0b0 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 24 Mar 2021 15:34:05 +0100
Subject: [PATCH 163/202] Implementation for IContentDashboardSettings

---
 src/Umbraco.Core/ConfigsExtensions.cs         |  6 +++
 .../Dashboards/ContentDashboardSettings.cs    | 43 +++++++++++++++++++
 .../Dashboards/IContentDashboardSettings.cs   | 13 ++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +
 .../Dashboards/ContentDashboard.cs            | 17 ++++----
 5 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
 create mode 100644 src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs

diff --git a/src/Umbraco.Core/ConfigsExtensions.cs b/src/Umbraco.Core/ConfigsExtensions.cs
index d1672c6c7f..17dc63943a 100644
--- a/src/Umbraco.Core/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/ConfigsExtensions.cs
@@ -5,9 +5,11 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Dashboards;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core
 {
@@ -48,6 +50,10 @@ namespace Umbraco.Core
                 configDir,
                 factory.GetInstance<ManifestParser>(),
                 factory.GetInstance<IRuntimeState>().Debug));
+
+            configs.Add<IContentDashboardSettings>(factory =>
+                new ContentDashboardSettings(factory.GetInstance<IGlobalSettings>(),
+                    factory.GetInstance<IUserService>()));
         }
     }
 }
diff --git a/src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs b/src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
new file mode 100644
index 0000000000..3db808fe02
--- /dev/null
+++ b/src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Dashboards
+{
+    public class ContentDashboardSettings: IContentDashboardSettings
+    {
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IUserService _userService;
+
+        public ContentDashboardSettings(IGlobalSettings globalSettings, IUserService userService)
+        {
+            _globalSettings = globalSettings;
+            _userService = userService;
+        }
+
+        public IAccessRule[] GetAccessRulesFromConfig()
+        {
+            var rules = new List<IAccessRule>();
+
+            if (_globalSettings.AllowContentDashboardAccessToAllUsers)
+            {
+                var allUserGroups = _userService.GetAllUserGroups();
+
+                foreach (var userGroup in allUserGroups)
+                {
+                    rules.Add(new AccessRule
+                    {
+                        Type = AccessRuleType.Grant,
+                        Value = userGroup.Alias
+                    });
+                }
+            }
+
+            return rules.ToArray();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs b/src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
new file mode 100644
index 0000000000..9b5ea7d7dd
--- /dev/null
+++ b/src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Dashboards
+{
+    public interface IContentDashboardSettings
+    {
+        IAccessRule[] GetAccessRulesFromConfig();
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 832b8a5801..63c7ac178d 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -131,6 +131,8 @@
     <Compile Include="Constants-CharArrays.cs" />
     <Compile Include="Collections\EventClearingObservableCollection.cs" />
     <Compile Include="Constants-SqlTemplates.cs" />
+    <Compile Include="Dashboards\ContentDashboardSettings.cs" />
+    <Compile Include="Dashboards\IContentDashboardSettings.cs" />
     <Compile Include="Exceptions\UnattendedInstallException.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
diff --git a/src/Umbraco.Web/Dashboards/ContentDashboard.cs b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
index 3dbc0cb693..4b17bcf7ff 100644
--- a/src/Umbraco.Web/Dashboards/ContentDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
@@ -10,6 +10,7 @@ namespace Umbraco.Web.Dashboards
     [Weight(10)]
     public class ContentDashboard : IDashboard
     {
+        private readonly IContentDashboardSettings _dashboardSettings;
         public string Alias => "contentIntro";
 
         public string[] Sections => new[] { "content" };
@@ -20,15 +21,9 @@ namespace Umbraco.Web.Dashboards
         {
             get
             {
-                IAccessRule[] rules;
-                var dashboardConfig = Path.Combine(IOHelper.MapPath(SystemDirectories.Config), "content.dashboard.access.config.js");
+                var rules = _dashboardSettings.GetAccessRulesFromConfig();
 
-                if (File.Exists(dashboardConfig))
-                {
-                    var rawJson = File.ReadAllText(dashboardConfig);
-                    rules = JsonConvert.DeserializeObject<AccessRule[]>(rawJson);
-                }
-                else
+                if (rules.Length == 0)
                 {
                     rules = new IAccessRule[]
                     {
@@ -36,8 +31,14 @@ namespace Umbraco.Web.Dashboards
                         new AccessRule {Type = AccessRuleType.Grant, Value = Constants.Security.AdminGroupAlias}
                     };
                 }
+
                 return rules;
             }
         }
+
+        public ContentDashboard(IContentDashboardSettings dashboardSettings)
+        {
+            _dashboardSettings = dashboardSettings;
+        }
     }
 }

From 61f486ebeaac426a6fc304d0bebbab9cc35d15e6 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 24 Mar 2021 15:36:29 +0100
Subject: [PATCH 164/202] Cleanup

---
 src/Umbraco.Core/ConfigsExtensions.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Core/ConfigsExtensions.cs b/src/Umbraco.Core/ConfigsExtensions.cs
index 17dc63943a..92d03adadb 100644
--- a/src/Umbraco.Core/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/ConfigsExtensions.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.HealthChecks;

From 56d5704167e940c540ae67864cdb5263b9b535f3 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 24 Mar 2021 16:15:21 +0100
Subject: [PATCH 165/202] bool.Try

---
 src/Umbraco.Core/Configuration/GlobalSettings.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 0765a35a29..a451018169 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -406,14 +406,8 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                try
-                {
-                    return bool.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.AllowContentDashboardAccessToAllUsers]);
-                }
-                catch
-                {
-                    return false;
-                }
+                bool.TryParse(ConfigurationManager.AppSettings[Constants.AppSettings.AllowContentDashboardAccessToAllUsers], out var value);
+                return value;
             }
         }
 

From f68d4d6968358c0c7aefe75aa2324cd591511005 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Thu, 25 Mar 2021 11:11:41 +0100
Subject: [PATCH 166/202] Taking AllowContentDashboardAccessToAllUsers prop
 from GlobalSettings to ContentDashboardSettings and saving
 AccessRulesFromConfig into a backing field

---
 src/Umbraco.Core/ConfigsExtensions.cs         |  5 +--
 .../Configuration/GlobalSettings.cs           | 17 --------
 .../Configuration/IGlobalSettings.cs          |  9 ----
 .../Dashboards/ContentDashboardSettings.cs    | 43 ++++++-------------
 .../Dashboards/IContentDashboardSettings.cs   | 17 ++++----
 .../Dashboards/ContentDashboard.cs            | 42 +++++++++++++++---
 6 files changed, 59 insertions(+), 74 deletions(-)

diff --git a/src/Umbraco.Core/ConfigsExtensions.cs b/src/Umbraco.Core/ConfigsExtensions.cs
index 92d03adadb..10594fc970 100644
--- a/src/Umbraco.Core/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/ConfigsExtensions.cs
@@ -8,7 +8,6 @@ using Umbraco.Core.Dashboards;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
-using Umbraco.Core.Services;
 
 namespace Umbraco.Core
 {
@@ -50,9 +49,7 @@ namespace Umbraco.Core
                 factory.GetInstance<ManifestParser>(),
                 factory.GetInstance<IRuntimeState>().Debug));
 
-            configs.Add<IContentDashboardSettings>(factory =>
-                new ContentDashboardSettings(factory.GetInstance<IGlobalSettings>(),
-                    factory.GetInstance<IUserService>()));
+            configs.Add<IContentDashboardSettings>(() => new ContentDashboardSettings());
         }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index a451018169..c844abe75e 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -395,23 +395,6 @@ namespace Umbraco.Core.Configuration
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether the content dashboard should be available to all users.
-        /// </summary>
-        /// <value>
-        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
-        ///     and the default access rules for that dashboard will be in use.
-        /// </value>
-        public bool AllowContentDashboardAccessToAllUsers
-        {
-            get
-            {
-                bool.TryParse(ConfigurationManager.AppSettings[Constants.AppSettings.AllowContentDashboardAccessToAllUsers], out var value);
-                return value;
-            }
-        }
-
-
         /// <summary>
         /// An int value representing the time in milliseconds to lock the database for a write operation
         /// </summary>
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index 6016de2917..483829f85f 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -57,15 +57,6 @@
         /// </summary>
         bool UseHttps { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether the content dashboard should be available to all users.
-        /// </summary>
-        /// <value>
-        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
-        ///     and the default access rules for that dashboard will be in use.
-        /// </value>
-        bool AllowContentDashboardAccessToAllUsers { get; }
-
         /// <summary>
         /// Returns a string value to determine if umbraco should skip version-checking.
         /// </summary>
diff --git a/src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs b/src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
index 3db808fe02..f8fb5c7b06 100644
--- a/src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
+++ b/src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
@@ -1,43 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Services;
+using System.Configuration;
 
 namespace Umbraco.Core.Dashboards
 {
     public class ContentDashboardSettings: IContentDashboardSettings
     {
-        private readonly IGlobalSettings _globalSettings;
-        private readonly IUserService _userService;
 
-        public ContentDashboardSettings(IGlobalSettings globalSettings, IUserService userService)
+        /// <summary>
+        /// Gets a value indicating whether the content dashboard should be available to all users.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
+        ///     and the default access rules for that dashboard will be in use.
+        /// </value>
+        public bool AllowContentDashboardAccessToAllUsers
         {
-            _globalSettings = globalSettings;
-            _userService = userService;
-        }
-
-        public IAccessRule[] GetAccessRulesFromConfig()
-        {
-            var rules = new List<IAccessRule>();
-
-            if (_globalSettings.AllowContentDashboardAccessToAllUsers)
+            get
             {
-                var allUserGroups = _userService.GetAllUserGroups();
-
-                foreach (var userGroup in allUserGroups)
-                {
-                    rules.Add(new AccessRule
-                    {
-                        Type = AccessRuleType.Grant,
-                        Value = userGroup.Alias
-                    });
-                }
+                bool.TryParse(ConfigurationManager.AppSettings[Constants.AppSettings.AllowContentDashboardAccessToAllUsers], out var value);
+                return value;
             }
-
-            return rules.ToArray();
         }
     }
 }
diff --git a/src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs b/src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
index 9b5ea7d7dd..862a28b90e 100644
--- a/src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
+++ b/src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core.Dashboards
+namespace Umbraco.Core.Dashboards
 {
     public interface IContentDashboardSettings
     {
-        IAccessRule[] GetAccessRulesFromConfig();
+        /// <summary>
+        /// Gets a value indicating whether the content dashboard should be available to all users.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
+        ///     and the default access rules for that dashboard will be in use.
+        /// </value>
+        bool AllowContentDashboardAccessToAllUsers { get; }
     }
 }
diff --git a/src/Umbraco.Web/Dashboards/ContentDashboard.cs b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
index 4b17bcf7ff..260eb8baf9 100644
--- a/src/Umbraco.Web/Dashboards/ContentDashboard.cs
+++ b/src/Umbraco.Web/Dashboards/ContentDashboard.cs
@@ -1,9 +1,8 @@
-using System.IO;
-using Newtonsoft.Json;
+using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Dashboards;
-using Umbraco.Core.IO;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Dashboards
 {
@@ -11,6 +10,9 @@ namespace Umbraco.Web.Dashboards
     public class ContentDashboard : IDashboard
     {
         private readonly IContentDashboardSettings _dashboardSettings;
+        private readonly IUserService _userService;
+        private IAccessRule[] _accessRulesFromConfig;
+
         public string Alias => "contentIntro";
 
         public string[] Sections => new[] { "content" };
@@ -21,7 +23,7 @@ namespace Umbraco.Web.Dashboards
         {
             get
             {
-                var rules = _dashboardSettings.GetAccessRulesFromConfig();
+                var rules = AccessRulesFromConfig;
 
                 if (rules.Length == 0)
                 {
@@ -36,9 +38,39 @@ namespace Umbraco.Web.Dashboards
             }
         }
 
-        public ContentDashboard(IContentDashboardSettings dashboardSettings)
+        private IAccessRule[] AccessRulesFromConfig
+        {
+            get
+            {
+                if (_accessRulesFromConfig is null)
+                {
+                    var rules = new List<IAccessRule>();
+
+                    if (_dashboardSettings.AllowContentDashboardAccessToAllUsers)
+                    {
+                        var allUserGroups = _userService.GetAllUserGroups();
+
+                        foreach (var userGroup in allUserGroups)
+                        {
+                            rules.Add(new AccessRule
+                            {
+                                Type = AccessRuleType.Grant,
+                                Value = userGroup.Alias
+                            });
+                        }
+                    }
+
+                    _accessRulesFromConfig = rules.ToArray();
+                }
+
+                return _accessRulesFromConfig;
+            }
+        }
+
+        public ContentDashboard(IContentDashboardSettings dashboardSettings, IUserService userService)
         {
             _dashboardSettings = dashboardSettings;
+            _userService = userService;
         }
     }
 }

From 121ae2e8a97bb48bb9794e141f495554e9464481 Mon Sep 17 00:00:00 2001
From: Callum Whyte <hey@callumwhyte.com>
Date: Mon, 22 Feb 2021 07:18:31 +0000
Subject: [PATCH 167/202] Handling multiple values per field in Examine
 Management

---
 .../settings/examinemanagementresults.html          |  4 ++--
 .../Editors/ExamineManagementController.cs          | 13 +++----------
 .../Models/ContentEditing/SearchResult.cs           |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
index 1d735e540f..cd455a32ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
@@ -18,9 +18,9 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr ng-repeat="(key, val) in model.searchResultValues track by key">
+                            <tr ng-repeat="(key, values) in model.searchResultValues track by key">
                                 <td>{{key}}</td>
-                                <td style="word-break: break-word;">{{val}}</td>
+                                <td style="word-break: break-word;">{{values | umbCmsJoinArray:', '}}</td>
                             </tr>
                         </tbody>
                     </table>
diff --git a/src/Umbraco.Web/Editors/ExamineManagementController.cs b/src/Umbraco.Web/Editors/ExamineManagementController.cs
index 49599bc8b9..132cc25404 100644
--- a/src/Umbraco.Web/Editors/ExamineManagementController.cs
+++ b/src/Umbraco.Web/Editors/ExamineManagementController.cs
@@ -25,7 +25,6 @@ namespace Umbraco.Web.Editors
         private readonly IAppPolicyCache _runtimeCache;
         private readonly IndexRebuilder _indexRebuilder;
 
-
         public ExamineManagementController(IExamineManager examineManager, ILogger logger,
             AppCaches appCaches,
             IndexRebuilder indexRebuilder)
@@ -79,14 +78,11 @@ namespace Umbraco.Web.Editors
                 {
                     Id = x.Id,
                     Score = x.Score,
-                    //order the values by key
-                    Values = new Dictionary<string, string>(x.Values.OrderBy(y => y.Key).ToDictionary(y => y.Key, y => y.Value))
+                    Values = x.AllValues.OrderBy(y => y.Key).ToDictionary(y => y.Key, y => y.Value)
                 })
             };
         }
 
-
-
         /// <summary>
         /// Check if the index has been rebuilt
         /// </summary>
@@ -113,7 +109,6 @@ namespace Umbraco.Web.Editors
             return found != null
                 ? null
                 : CreateModel(index);
-
         }
 
         /// <summary>
@@ -167,8 +162,6 @@ namespace Umbraco.Web.Editors
             }
         }
 
-
-
         private ExamineIndexModel CreateModel(IIndex index)
         {
             var indexName = index.Name;
@@ -182,11 +175,13 @@ namespace Umbraco.Web.Editors
             }
 
             var isHealth = indexDiag.IsHealthy();
+
             var properties = new Dictionary<string, object>
             {
                 [nameof(IIndexDiagnostics.DocumentCount)] = indexDiag.DocumentCount,
                 [nameof(IIndexDiagnostics.FieldCount)] = indexDiag.FieldCount,
             };
+
             foreach (var p in indexDiag.Metadata)
                 properties[p.Key] = p.Value;
 
@@ -198,7 +193,6 @@ namespace Umbraco.Web.Editors
                 CanRebuild = _indexRebuilder.CanRebuild(index)
             };
 
-
             return indexerModel;
         }
 
@@ -211,7 +205,6 @@ namespace Umbraco.Web.Editors
                 return Request.CreateResponse(HttpStatusCode.OK);
             }
 
-
             //if we didn't find anything try to find it by an explicitly declared searcher
             if (_examineManager.TryGetSearcher(searcherName, out searcher))
                 return Request.CreateResponse(HttpStatusCode.OK);
diff --git a/src/Umbraco.Web/Models/ContentEditing/SearchResult.cs b/src/Umbraco.Web/Models/ContentEditing/SearchResult.cs
index 1cdd539165..d33bc3530e 100644
--- a/src/Umbraco.Web/Models/ContentEditing/SearchResult.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/SearchResult.cs
@@ -16,6 +16,6 @@ namespace Umbraco.Web.Models.ContentEditing
         public int FieldCount => Values?.Count ?? 0;
 
         [DataMember(Name = "values")]
-        public IReadOnlyDictionary<string, string> Values { get; set; }
+        public IReadOnlyDictionary<string, IReadOnlyList<string>> Values { get; set; }
     }
 }

From dcc07fd612a0669c326ca0cd363dc5cf21a4aae4 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Mon, 29 Mar 2021 01:13:53 +0200
Subject: [PATCH 168/202] Add Root<T> and Breadcrumbs extension methods for
 IPublishedContent (#9033)

* Fix usage of obsolete CreatorName and WriterName properties

* Add generic Root extension method

* Add Breadcrumbs extension methods
---
 src/Umbraco.Web/PublishedContentExtensions.cs | 88 ++++++++++++++++++-
 1 file changed, 84 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index d6b8f837d2..4999bc779a 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -814,6 +814,64 @@ namespace Umbraco.Web
 
         #endregion
 
+        #region Axes: breadcrumbs
+
+        /// <summary>
+        /// Gets the breadcrumbs (ancestors and self, top to bottom) for the specified <paramref name="content" />.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="andSelf">Indicates whether the specified content should be included.</param>
+        /// <returns>
+        /// The breadcrumbs (ancestors and self, top to bottom) for the specified <paramref name="content" />.
+        /// </returns>
+        public static IEnumerable<IPublishedContent> Breadcrumbs(this IPublishedContent content, bool andSelf = true)
+        {
+            return content.AncestorsOrSelf(andSelf, null).Reverse();
+        }
+
+        /// <summary>
+        /// Gets the breadcrumbs (ancestors and self, top to bottom) for the specified <paramref name="content" /> at a level higher or equal to <paramref name="minLevel" />.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="minLevel">The minimum level.</param>
+        /// <param name="andSelf">Indicates whether the specified content should be included.</param>
+        /// <returns>
+        /// The breadcrumbs (ancestors and self, top to bottom) for the specified <paramref name="content" /> at a level higher or equal to <paramref name="minLevel" />.
+        /// </returns>
+        public static IEnumerable<IPublishedContent> Breadcrumbs(this IPublishedContent content, int minLevel, bool andSelf = true)
+        {
+            return content.AncestorsOrSelf(andSelf, n => n.Level >= minLevel).Reverse();
+        }
+
+        /// <summary>
+        /// Gets the breadcrumbs (ancestors and self, top to bottom) for the specified <paramref name="content" /> at a level higher or equal to the specified root content type <typeparamref name="T" />.
+        /// </summary>
+        /// <typeparam name="T">The root content type.</typeparam>
+        /// <param name="content">The content.</param>
+        /// <param name="andSelf">Indicates whether the specified content should be included.</param>
+        /// <returns>
+        /// The breadcrumbs (ancestors and self, top to bottom) for the specified <paramref name="content" /> at a level higher or equal to the specified root content type <typeparamref name="T" />.
+        /// </returns>
+        public static IEnumerable<IPublishedContent> Breadcrumbs<T>(this IPublishedContent content, bool andSelf = true)
+            where T : class, IPublishedContent
+        {
+            static IEnumerable<IPublishedContent> TakeUntil(IEnumerable<IPublishedContent> source, Func<IPublishedContent, bool> predicate)
+            {
+                foreach (var item in source)
+                {
+                    yield return item;
+                    if (predicate(item))
+                    {
+                        yield break;
+                    }
+                }
+            }
+
+            return TakeUntil(content.AncestorsOrSelf(andSelf, null), n => n is T).Reverse();
+        }
+
+        #endregion
+
         #region Axes: descendants, descendants-or-self
 
         /// <summary>
@@ -1155,8 +1213,8 @@ namespace Umbraco.Web
                                     { "NodeTypeAlias", n.ContentType.Alias },
                                     { "CreateDate", n.CreateDate },
                                     { "UpdateDate", n.UpdateDate },
-                                    { "CreatorName", n.CreatorName },
-                                    { "WriterName", n.WriterName },
+                                    { "CreatorName", n.CreatorName(services.UserService) },
+                                    { "WriterName", n.WriterName(services.UserService) },
                                     { "Url", n.Url() }
                                 };
 
@@ -1271,15 +1329,37 @@ namespace Umbraco.Web
         #region Axes: custom
 
         /// <summary>
-        /// Gets the root content for this content.
+        /// Gets the root content (ancestor or self at level 1) for the specified <paramref name="content" />.
         /// </summary>
         /// <param name="content">The content.</param>
-        /// <returns>The 'site' content ie AncestorOrSelf(1).</returns>
+        /// <returns>
+        /// The root content (ancestor or self at level 1) for the specified <paramref name="content" />.
+        /// </returns>
+        /// <remarks>
+        /// This is the same as calling <see cref="Umbraco.Web.PublishedContentExtensions.AncestorOrSelf(IPublishedContent, int)" /> with <c>maxLevel</c> set to 1.
+        /// </remarks>
         public static IPublishedContent Root(this IPublishedContent content)
         {
             return content.AncestorOrSelf(1);
         }
 
+        /// <summary>
+        /// Gets the root content (ancestor or self at level 1) for the specified <paramref name="content" /> if it's of the specified content type <typeparamref name="T" />.
+        /// </summary>
+        /// <typeparam name="T">The content type.</typeparam>
+        /// <param name="content">The content.</param>
+        /// <returns>
+        /// The root content (ancestor or self at level 1) for the specified <paramref name="content" /> of content type <typeparamref name="T" />.
+        /// </returns>
+        /// <remarks>
+        /// This is the same as calling <see cref="Umbraco.Web.PublishedContentExtensions.AncestorOrSelf{T}(IPublishedContent, int)" /> with <c>maxLevel</c> set to 1.
+        /// </remarks>
+        public static T Root<T>(this IPublishedContent content)
+            where T : class, IPublishedContent
+        {
+            return content.AncestorOrSelf<T>(1);
+        }
+
         #endregion
 
         #region PropertyAliasesAndNames

From 6299ea086211d9153c15807d0b51fbbd98bc9bbf Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 25 Mar 2021 15:48:39 +0100
Subject: [PATCH 169/202] Orders member type grouping of members
 alphabetically, matching the listing of member types.

---
 src/Umbraco.Web/Trees/MemberTreeController.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index c0a9d15cfa..37496d1bff 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -129,10 +129,12 @@ namespace Umbraco.Web.Trees
 
                 if (_isUmbracoProvider)
                 {
-                    nodes.AddRange(Services.MemberTypeService.GetAll()
-                        .Select(memberType =>
-                            CreateTreeNode(memberType.Alias, id, queryStrings, memberType.Name, memberType.Icon.IfNullOrWhiteSpace(Constants.Icons.Member), true,
-                                queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + memberType.Alias)));
+                    nodes.AddRange(
+                        Services.MemberTypeService.GetAll()
+                            .OrderBy(x => x.Name)
+                            .Select(memberType =>
+                                CreateTreeNode(memberType.Alias, id, queryStrings, memberType.Name, memberType.Icon.IfNullOrWhiteSpace(Constants.Icons.Member), true,
+                                    queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + memberType.Alias)));
                 }
             }
 

From 958e25d4baea890b77215e91903262f244bc54fe Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Tue, 30 Mar 2021 21:00:22 +1000
Subject: [PATCH 170/202] Revert updating deprecated WriterName/CreatorName
 refs

Changing the properties to use the extensions is a good thing (given the props are deprecated), but causes issues deep in tests. I'm reverting that change to fix the tests, and all refs to the deprecated properties should be updated in one sweep, to deal with any other test issues that might crop up.
---
 src/Umbraco.Web/PublishedContentExtensions.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 4999bc779a..c851894149 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1213,8 +1213,8 @@ namespace Umbraco.Web
                                     { "NodeTypeAlias", n.ContentType.Alias },
                                     { "CreateDate", n.CreateDate },
                                     { "UpdateDate", n.UpdateDate },
-                                    { "CreatorName", n.CreatorName(services.UserService) },
-                                    { "WriterName", n.WriterName(services.UserService) },
+                                    { "CreatorName", n.CreatorName },
+                                    { "WriterName", n.WriterName },
                                     { "Url", n.Url() }
                                 };
 

From e7ce6a307e1bdc36b1aff0f72e556e6d369c5cd0 Mon Sep 17 00:00:00 2001
From: BeardinaSuit <BeardInASuit@outlook.com>
Date: Tue, 30 Mar 2021 08:57:35 -0400
Subject: [PATCH 171/202] Handle Invalid format for Upgrade check

---
 .../Repositories/Implement/UpgradeCheckRepository.cs         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UpgradeCheckRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UpgradeCheckRepository.cs
index 365e8ba481..95f699d952 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UpgradeCheckRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UpgradeCheckRepository.cs
@@ -24,6 +24,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
                 return result ?? new UpgradeResult("None", "", "");
             }
+            catch (UnsupportedMediaTypeException)
+            {
+                // this occurs if the server for Our is up but doesn't return a valid result (ex. content type)
+                return new UpgradeResult("None", "", "");
+            }
             catch (HttpRequestException)
             {
                 // this occurs if the server for Our is down or cannot be reached

From c881fa9e7d08c11954e18489827f70cdafceb947 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 30 Mar 2021 17:03:56 +0200
Subject: [PATCH 172/202] Fixes tabbing-mode remains active after closing modal
 #9790 (#10074)

---
 .../components/forms/umbfocuslock.directive.js           | 4 ----
 .../src/less/application/umb-outline.less                | 1 +
 src/Umbraco.Web.UI.Client/src/less/forms.less            | 9 ++++++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
index 569f49b88a..f7cd32217e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
@@ -29,10 +29,6 @@
                     var defaultFocusedElement = getAutoFocusElement(focusableElements);
                     var firstFocusableElement = focusableElements[0];
                     var lastFocusableElement = focusableElements[focusableElements.length -1];
-
-                    // We need to add the tabbing-active class in order to highlight the focused button since the default style is
-                    // outline: none; set in the stylesheet specifically
-                    bodyElement.classList.add('tabbing-active');
     
                     // If there is no default focused element put focus on the first focusable element in the nodelist
                     if(defaultFocusedElement === null ){
diff --git a/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less b/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less
index 939366d5ac..1f1c2c0e72 100644
--- a/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less
+++ b/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less
@@ -15,6 +15,7 @@
             right: 0;
             border-radius: 3px;
             box-shadow: 0 0 2px 0px @ui-outline, inset 0 0 2px 2px @ui-outline;
+            pointer-events: none;
         }
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 90b2dbe37e..17c62037cc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -308,7 +308,14 @@ select[size] {
 input[type="file"],
 input[type="radio"],
 input[type="checkbox"] {
-  .umb-outline();
+  &:focus {
+    border-color: @inputBorderFocus;
+    outline: 0;
+
+    .tabbing-active & {
+      outline: 2px solid @ui-outline;
+    }
+  }
 }
 
 

From d08b84d28f6a2e081f917e3de24fed84e429ea11 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 31 Mar 2021 11:01:33 +0200
Subject: [PATCH 173/202] Allow to pass in boolean to preventEnterSubmit
 directive (#8639)

* Pass in value to preventEnterSubmit directive

* Set enabled similar to preventDefault and preventEnterSubmit directives

* Update prevent enter submit value

* Init value from controller

* Use a different default input id prefix for umb-search-filter

* Fix typo

* Check for truthly value

* Revert "Set enabled similar to preventDefault and preventEnterSubmit directives"

This reverts commit 536ce855c4545ead82cea77b4013bf9010a8687b.

* None pointer events when clicking icon

* Use color variable
---
 .../forms/prevententersubmit.directive.js     |  2 +-
 .../forms/umbsearchfilter.directive.js        | 10 +++---
 .../less/components/umb-search-filter.less    |  3 +-
 .../components/forms/umb-search-filter.html   | 31 ++++++-------------
 4 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/prevententersubmit.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/prevententersubmit.directive.js
index 355b02216f..62334387cb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/prevententersubmit.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/prevententersubmit.directive.js
@@ -17,7 +17,7 @@ angular.module("umbraco.directives")
             }
 
             $(element).on("keypress", function (event) {
-                if (event.which === 13) {
+                if (event.which === 13 && enabled === true) {
                     event.preventDefault();
                 }
             });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
index efbc384cb4..2e9f15913c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
@@ -24,7 +24,7 @@
 @param {boolean} model Set to <code>true</code> or <code>false</code> to set the checkbox to checked or unchecked.
 @param {string} inputId Set the <code>id</code> of the checkbox.
 @param {string} text Set the text for the checkbox label.
-@param {string} labelKey Set a dictinary/localization string for the checkbox label
+@param {string} labelKey Set a dictionary/localization string for the checkbox label
 @param {callback} onChange Callback when the value of the checkbox change by interaction.
 @param {boolean} autoFocus Add autofocus to the input field
 @param {boolean} preventSubmitOnEnter Set the enter prevent directive or not
@@ -42,13 +42,15 @@
         vm.change = change;
 
         function onInit() {
-            vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
+            vm.inputId = vm.inputId || "umb-search-filter_" + String.CreateGuid();
+            vm.autoFocus = Object.toBoolean(vm.autoFocus) === true;
+            vm.preventSubmitOnEnter = Object.toBoolean(vm.preventSubmitOnEnter) === true;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
             if (vm.labelKey) {
                  localizationService.localize(vm.labelKey).then(function (data) {
-                      if(data.indexOf('[') === -1){
-                        vm.text = data;
+                      if (data.indexOf('[') === -1){
+                         vm.text = data;
                       }
                  });
             }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less
index b96d3e8569..b38f5937c7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less
@@ -21,11 +21,12 @@ html .umb-search-filter {
     // "icon-search" class it kept for backward compatibility
     .umb-icon, 
     .icon-search {
-        color: #d8d7d9;
+        color: @gray-8;
         position: absolute;
         top: 0;
         bottom: 0;
         left: 10px;
         margin: auto 0;
+        pointer-events: none;
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html
index d6fde29090..ab21654f91 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html
@@ -2,27 +2,14 @@
     <div class="umb-search-filter" ng-class="vm.cssClass">
         <label for="{{vm.inputId}}" class="sr-only">{{vm.text}}</label>
         <umb-icon icon="icon-search" class="icon-search"></umb-icon>
-        <input
-                ng-if="vm.preventSubmitOnEnter"
-                id="{{vm.inputId}}"
-                type="text"
-                ng-change="vm.change()"
-                ng-model="vm.model"
-                class="umb-search-filter__input"
-                placeholder="{{vm.text}}"
-                umb-auto-focus="{{vm.autoFocus === true}}"
-                prevent-enter-submit
-                no-dirty-check />
-
-        <input
-                ng-if="!vm.preventSubmitOnEnter"
-                id="{{vm.inputId}}"
-                type="text"
-                ng-change="vm.change()"
-                ng-model="vm.model"
-                class="umb-search-filter__input {{vm.cssClass}}"
-                placeholder="{{vm.text}}"
-                umb-auto-focus="{{vm.autoFocus === true}}"
-                no-dirty-check />
+        <input type="text"
+               id="{{vm.inputId}}"
+               ng-change="vm.change()"
+               ng-model="vm.model"
+               class="umb-search-filter__input"
+               placeholder="{{vm.text}}"
+               umb-auto-focus="{{vm.autoFocus}}"
+               prevent-enter-submit="{{vm.preventSubmitOnEnter}}"
+               no-dirty-check />
     </div>
 </div>

From 15923aafc7723f1823a045b7e635cfb4cffbd786 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 30 Mar 2021 17:03:56 +0200
Subject: [PATCH 174/202] Fixes tabbing-mode remains active after closing modal
 #9790 (#10074)

(cherry picked from commit c881fa9e7d08c11954e18489827f70cdafceb947)
---
 .../components/forms/umbfocuslock.directive.js           | 4 ----
 .../src/less/application/umb-outline.less                | 1 +
 src/Umbraco.Web.UI.Client/src/less/forms.less            | 9 ++++++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
index 569f49b88a..f7cd32217e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
@@ -29,10 +29,6 @@
                     var defaultFocusedElement = getAutoFocusElement(focusableElements);
                     var firstFocusableElement = focusableElements[0];
                     var lastFocusableElement = focusableElements[focusableElements.length -1];
-
-                    // We need to add the tabbing-active class in order to highlight the focused button since the default style is
-                    // outline: none; set in the stylesheet specifically
-                    bodyElement.classList.add('tabbing-active');
     
                     // If there is no default focused element put focus on the first focusable element in the nodelist
                     if(defaultFocusedElement === null ){
diff --git a/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less b/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less
index 939366d5ac..1f1c2c0e72 100644
--- a/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less
+++ b/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less
@@ -15,6 +15,7 @@
             right: 0;
             border-radius: 3px;
             box-shadow: 0 0 2px 0px @ui-outline, inset 0 0 2px 2px @ui-outline;
+            pointer-events: none;
         }
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 90b2dbe37e..17c62037cc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -308,7 +308,14 @@ select[size] {
 input[type="file"],
 input[type="radio"],
 input[type="checkbox"] {
-  .umb-outline();
+  &:focus {
+    border-color: @inputBorderFocus;
+    outline: 0;
+
+    .tabbing-active & {
+      outline: 2px solid @ui-outline;
+    }
+  }
 }
 
 

From 72e468428ad0c76ea4076d22693cc38f8a331eae Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Fri, 19 Mar 2021 16:57:40 +0100
Subject: [PATCH 175/202] Null check on scope and options to ensure backward
 compatibility

(cherry picked from commit fe8cd239d2f4c528c1a8a3cf4c50e90bb43cacfc)
---
 .../src/common/services/listviewhelper.service.js             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
index 14643dc9cd..f9ebba00ea 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
@@ -572,13 +572,15 @@
         * Method for opening an item in a list view for editing.
         *
         * @param {Object} item The item to edit
+        * @param {Object} scope The scope with options
         */
         function editItem(item, scope) {
+
             if (!item.editPath) {
                 return;
             }
 
-            if (scope.options.useInfiniteEditor)
+            if (scope && scope.options && scope.options.useInfiniteEditor)
             {
                 var editorModel = {
                     id: item.id,

From f83f465211ccf2be428ceca598ea0ff1bc404207 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 22 Mar 2021 21:54:16 +0100
Subject: [PATCH 176/202] Fix validation of step size in integer/numeric field

---
 .../src/views/propertyeditors/email/email.html           | 5 +++--
 .../src/views/propertyeditors/integer/integer.html       | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
index 26ec22df8d..3ae03a2d7b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
@@ -1,6 +1,7 @@
 <div ng-controller="Umbraco.PropertyEditors.EmailController">
     <ng-form name="emailFieldForm">
-        <input type="email" name="textbox"
+        <input type="email"
+               name="textbox"
                ng-model="model.value"
                id="{{model.alias}}"
                class="umb-property-editor umb-textstring textstring"
@@ -8,7 +9,7 @@
                ng-required="model.config.IsRequired || model.validation.mandatory"
                val-server="value" />
 
-        <div ng-messages="emailFieldForm.textbox.$error" show-validation-on-submit >
+        <div ng-messages="emailFieldForm.textbox.$error" show-validation-on-submit>
             <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
             <p class="help-inline" ng-message="valEmail"><localize key="validation_invalidEmail">Invalid email</localize></p>
             <p class="help-inline" ng-message="valServer">{{emailFieldForm.textbox.errorMsg}}</p>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
index 5c10790400..24a8c33696 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
@@ -9,10 +9,15 @@
                aria-required="{{model.validation.mandatory}}"
                id="{{model.alias}}"
                val-server="value"
-               fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
+               min="{{model.config.min}}"
+               max="{{model.config.max}}"
+               step="{{model.config.step}}"
+               ng-step="model.config.step"
+               fix-number />
 
-        <span ng-messages="integerFieldForm.integerField.$error" show-validation-on-submit >
+        <span ng-messages="integerFieldForm.integerField.$error" show-validation-on-submit>
             <span class="help-inline" ng-message="number"><localize key="validation_invalidNumber">Not a number</localize></span>
+            <span class="help-inline" ng-message="step"><localize key="validation_invalidNumberStepSize">Not a valid numeric step size</localize></span>
             <span class="help-inline" ng-message="valServer">{{integerFieldForm.integerField.errorMsg}}</span>
         </span>
     </ng-form>

From f8e280e0b40f4ba16f38cb567b85afe8a9c0ccc3 Mon Sep 17 00:00:00 2001
From: patrickdemooij9 <patrickdemooij98@hotmail.com>
Date: Sun, 4 Apr 2021 02:16:02 +0200
Subject: [PATCH 177/202] 9962: Use $allowedEditors instead of allowed (#10086)

* 9962: Use $allowedEditors instead of allowed

* 9962: Remove redundant statement
---
 .../src/views/propertyeditors/grid/grid.controller.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 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 50146a4c36..15f5ceaa88 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
@@ -141,9 +141,9 @@ angular.module("umbraco")
                 over: function (event, ui) {
 
                     var area = event.target.getScope_HackForSortable().area;
-                    var allowedEditors = area.allowed;
+                    var allowedEditors = area.$allowedEditors.map(e => e.alias);
 
-                    if (($.inArray(ui.item[0].getScope_HackForSortable().control.editor.alias, allowedEditors) < 0 && allowedEditors) ||
+                    if (($.inArray(ui.item[0].getScope_HackForSortable().control.editor.alias, allowedEditors) < 0) ||
                         (startingArea != area && area.maxItems != '' && area.maxItems > 0 && area.maxItems < area.controls.length + 1)) {
 
                         $scope.$apply(function () {

From f549a365932e1a5b22e995c1e5e650a5b581734d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 30 Mar 2021 16:59:54 +0200
Subject: [PATCH 178/202] fixes #10021 adds ng-form and val-form-manager to the
 documentation

---
 .../components/tabs/umbtabsnav.directive.js   | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
index b1c8608124..7a10ff51b5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
@@ -11,24 +11,27 @@ Use this directive to render a tabs navigation.
 <pre>
     <div ng-controller="My.Controller as vm">
 
-        <umb-tabs-nav
-            tabs="vm.tabs"
-            on-tab-change="vm.changeTab(tab)">
-        </umb-tabs-nav>
+        <!-- The tabs navigation depends on a form and the validation manager. If the tabs are used inside a property editor or dashboard this is already added -->
+        <ng-form name="tabsForm" val-form-manager>
 
-        <umb-tab-content
-            ng-repeat="tab in vm.tabs"
-            ng-show="tab.active"
-            tab="tab">
-            <div ng-if="tab.alias === 'tabOne'">
-                <div>Content of tab 1</div>
-            </div>
-            <div ng-if="tab.alias === 'tabTwo'">
-                <div>Content of tab 2</div>
-            </div>
-        </umb-tab-content>
+            <umb-tabs-nav
+                tabs="vm.tabs"
+                on-tab-change="vm.changeTab(tab)">
+            </umb-tabs-nav>
 
+            <umb-tab-content
+                ng-repeat="tab in vm.tabs"
+                ng-show="tab.active"
+                tab="tab">
+                <div ng-if="tab.alias === 'tabOne'">
+                    <div>Content of tab 1</div>
+                </div>
+                <div ng-if="tab.alias === 'tabTwo'">
+                    <div>Content of tab 2</div>
+                </div>
+            </umb-tab-content>
 
+        </ng-form>
     </div>
 </pre>
 
@@ -37,7 +40,7 @@ Use this directive to render a tabs navigation.
     (function () {
         "use strict";
 
-        function Controller() {
+        function Controller(eventsService) {
 
             var vm = this;
 
@@ -62,7 +65,7 @@ Use this directive to render a tabs navigation.
                 selectedTab.active = true;
             };
 
-            eventsService.on("tab.tabChange", function(name, args){
+            eventsService.on("app.tabChange", function(name, args){
                 console.log("args", args);
             });
 

From 739d9a81886728029d5a9e2c68f98e96dfabca91 Mon Sep 17 00:00:00 2001
From: Rachel Breeze <RachBreeze@users.noreply.github.com>
Date: Tue, 6 Apr 2021 02:44:14 +0100
Subject: [PATCH 179/202] Improved accessibility of link picker (#10099)

* Added support for screeen reader alerts on the embed so that assitive technology knows when a url retrieve has been succesfull.
Added labels for the controls
Preview reload only triggered if the values for height and width change

* Added control ids for the link picker

* Add French translation
---
 .../tree/umbtreesearchbox.directive.js        |  1 +
 .../linkpicker/linkpicker.html                | 67 ++++++++++---------
 .../components/tree/umb-tree-search-box.html  |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  1 +
 .../Umbraco/config/lang/en_us.xml             |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml |  1 +
 6 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
index 3e2e7e362e..2ae17fdc6b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
@@ -15,6 +15,7 @@ function treeSearchBox(localizationService, searchService, $q) {
             datatypeKey: "@",
             hideSearchCallback: "=",
             searchCallback: "=",
+            inputId: "@",
             autoFocus: "="
         },
         restrict: "E",    // restrict to an element
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
index 093e69b5ed..0a2a8223e9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
@@ -16,7 +16,7 @@
 
                     <div ng-class="{'flex': showAnchor}">
 
-                        <umb-control-group label="@defaultdialogs_urlLinkPicker" class="umb-linkpicker__url">
+                        <umb-control-group label="@defaultdialogs_urlLinkPicker" class="umb-linkpicker__url" alias="urlLinkPicker">
                             <input type="text"
                                     style="margin-right: 10px;"
                                     localize="placeholder"
@@ -24,16 +24,18 @@
                                     class="umb-property-editor umb-textstring"
                                     ng-model="model.target.url"
                                     umb-auto-focus
-                                    ng-disabled="model.target.id || model.target.udi" />
+                                    ng-disabled="model.target.id || model.target.udi"
+                                    id="urlLinkPicker"/>
                         </umb-control-group>
 
-                        <umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-linkpicker__anchor" ng-if="showAnchor">
+                        <umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-linkpicker__anchor" ng-if="showAnchor" alias="anchor">
                             <input type="text"
                                     list="anchors"
                                     localize="placeholder"
                                     placeholder="@placeholders_anchor"
                                     class="umb-property-editor umb-textstring"
-                                    ng-model="model.target.anchor" />
+                                    ng-model="model.target.anchor"
+                                    id="anchor"/>
 
                             <datalist id="anchors">
                                 <option value="{{a}}" ng-repeat="a in anchorValues"></option>
@@ -41,19 +43,21 @@
                         </umb-control-group>
                     </div>
 
-                    <umb-control-group label="@defaultdialogs_nodeNameLinkPicker">
+                    <umb-control-group label="@defaultdialogs_nodeNameLinkPicker" alias="nodeNameLinkPicker">
                         <input type="text"
                                 localize="placeholder"
                                 placeholder="@placeholders_entername"
                                 class="umb-property-editor umb-textstring"
-                                ng-model="model.target.name" />
+                                ng-model="model.target.name"
+                                id="nodeNameLinkPicker"/>
                     </umb-control-group>
 
-                    <umb-control-group ng-if="showTarget" label="@content_target">
+                    <umb-control-group ng-if="showTarget" label="@content_target" alias="openInNewWindow">
                         <umb-checkbox
                                       model="vm.openInNewWindow"
                                       on-change="vm.toggleOpenInNewWindow(model, value)"
-                                      text="{{vm.labels.openInNewWindow}}">
+                                      text="{{vm.labels.openInNewWindow}}"
+                                      input-id="openInNewWindow">
                         </umb-checkbox>
                     </umb-control-group>
 
@@ -61,36 +65,35 @@
                         <h5><localize key="defaultdialogs_linkToPage">Link to page</localize></h5>
 
                         <div ng-hide="miniListView">
-                            <umb-tree-search-box
-                                hide-search-callback="hideSearch"
-                                search-callback="onSearchResults"
-                                search-from-id="{{searchInfo.searchFromId}}"
-                                search-from-name="{{searchInfo.searchFromName}}"
-                                datatype-key="{{searchInfo.dataTypeKey}}"
-                                show-search="{{searchInfo.showSearch}}"
-                                section="{{section}}">
+                            <label for="treeSearch" class="sr-only"><localize key="visuallyHiddenTexts_searchContentTree">Search content tree</localize></label>
+                            <umb-tree-search-box hide-search-callback="hideSearch"
+                                                 search-callback="onSearchResults"
+                                                 search-from-id="{{searchInfo.searchFromId}}"
+                                                 search-from-name="{{searchInfo.searchFromName}}"
+                                                 datatype-key="{{searchInfo.dataTypeKey}}"
+                                                 show-search="{{searchInfo.showSearch}}"
+                                                 section="{{section}}"
+                                                 input-id="treeSearch">
                             </umb-tree-search-box>
 
                             <br />
-
-                            <umb-tree-search-results
-                                ng-if="searchInfo.showSearch"
-                                results="searchInfo.results"
-                                select-result-callback="selectResult"
-                                empty-search-result-position="default">
+                            <umb-tree-search-results ng-if="searchInfo.showSearch"
+                                                     results="searchInfo.results"
+                                                     select-result-callback="selectResult"
+                                                     empty-search-result-position="default">
                             </umb-tree-search-results>
 
                             <div ng-hide="searchInfo.showSearch">
-                                <umb-tree
-                                    section="content"
-                                    hideheader="true"
-                                    hideoptions="true"
-                                    api="dialogTreeApi"
-                                    on-init="onTreeInit()"
-                                    enablelistviewexpand="true"
-                                    isdialog="true"
-                                    enablecheckboxes="true"
-                                    customtreeparams="{{customTreeParams}}">
+                                <umb-tree section="content"
+                                          hideheader="true"
+                                          hideoptions="true"
+                                          api="dialogTreeApi"
+                                          on-init="onTreeInit()"
+                                          enablelistviewexpand="true"
+                                          isdialog="true"
+                                          enablecheckboxes="true"
+                                          customtreeparams="{{customTreeParams}}"
+                                          id="treePicker">
                                 </umb-tree>
                             </div>
                         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
index 77498cd007..054472e4b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
@@ -2,6 +2,7 @@
     <umb-icon icon="icon-search" class="icon icon-search" ng-if="showSearch == 'false'"></umb-icon>
     <button type="button" class="btn-reset icon icon-arrow-left" ng-if="showSearch == 'true'" localize="title" title="@general_back" ng-click="hideSearch()"></button>
     <input type="text"
+           id="{{inputId}}"
            ng-model="term"
            class="umb-search-field search-query -full-width-input"
            placeholder="{{searchPlaceholderText}}"
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 250040b331..6559b2565a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2316,6 +2316,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="contextMenuDescription">Select one of the options to edit the node.</key>
     <key alias="contextDialogDescription">Perform action %0% on the %1% node</key>
     <key alias="addImageCaption">Add image caption</key>
+    <key alias="searchContentTree">Search content tree</key>
   </area>
   <area alias="references">
     <key alias="tabName">References</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 5448436aab..2b7c3ec842 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2335,6 +2335,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="contextMenuDescription">Select one of the options to edit the node.</key>
     <key alias="contextDialogDescription">Perform action %0% on the %1% node</key>
     <key alias="addImageCaption">Add image caption</key>
+    <key alias="searchContentTree">Search content tree</key>
   </area>
   <area alias="references">
     <key alias="tabName">References</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 52e511a035..8900272af7 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -2212,6 +2212,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="newPartialView">Partial View</key>
     <key alias="newPartialViewMacro">Macro de Partial View</key>
     <key alias="newMember">Membre</key>
+    <key alias="searchContentTree">Chercher dans l'arborescence de contenu</key>
   </area>
   <area alias="references">
     <key alias="tabName">Références</key>

From db6d572235afc7e061ecd4eabd10a5e9bbd2575c Mon Sep 17 00:00:00 2001
From: Rachel Breeze <RachBreeze@users.noreply.github.com>
Date: Tue, 6 Apr 2021 02:50:14 +0100
Subject: [PATCH 180/202] Accessibility: Alerts the user how many results have
 been returned on a tree search (#10100)

* Added support for screeen reader alerts on the embed so that assitive technology knows when a url retrieve has been succesfull.
Added labels for the controls
Preview reload only triggered if the values for height and width change

* Tree search details the number of search items returned

* Add French translations
---
 .../tree/umb-tree-search-results.html         | 49 +++++++++----------
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  4 ++
 .../Umbraco/config/lang/en_us.xml             |  4 ++
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml |  4 ++
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
index f472251624..fbabf4c67c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
@@ -1,30 +1,29 @@
 <div>
-  <umb-empty-state ng-if="results.length === 0" position="{{emptySearchResultPosition}}">
-    <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-  </umb-empty-state>
-
-  <ul class="umb-tree">
-    <li class="root">
-      <ul class="umb-search-group">
-        <li class="umb-search-group-item" ng-repeat="result in results">
-          <div ng-class="{ 'umb-tree-node-checked': result.selected }">
-            <button type="button"
-                    class="btn-reset umb-search-group-item-link"
-                    ng-class="{ first: $first }"
-                    ng-click="selectResultCallback($event, result)">
-                <span class="umb-search-group-item-name">
-                    <umb-icon icon="{{result.selected ? 'icon-check' : result.icon}}"
-                              class="icon umb-tree-icon sprTree {{result.selected ? 'icon-check' : result.icon}}">
-                    </umb-icon>
-                    <span class="umb-search-group-item-name__text">{{ result.name }}</span>
-                </span>
-                <small class="search-subtitle" ng-if="result.subTitle">{{ result.subTitle }}</small>
-            </button>
-          </div>
+    <umb-empty-state ng-if="results.length === 0" position="{{emptySearchResultPosition}}">
+        <p role="alert"><localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize></p>
+    </umb-empty-state>
+    <p ng-if="results.length === 1" role="alert">1 <localize key="treeSearch_searchResult">item returned</localize></p>
+    <p ng-if="results.length > 1" role="alert">{{results.length}} <localize key="treeSearch_searchResults">items returned</localize></p>
+    <ul class="umb-tree">
+        <li class="root">
+            <ul class="umb-search-group">
+                <li class="umb-search-group-item" ng-repeat="result in results">
+                    <div ng-class="{ 'umb-tree-node-checked': result.selected }">
+                        <button type="button"
+                                class="btn-reset umb-search-group-item-link"
+                                ng-class="{ first: $first }"
+                                ng-click="selectResultCallback($event, result)">
+                            <span class="umb-search-group-item-name">
+                                <umb-icon icon="{{result.selected ? 'icon-check' : result.icon}}" class="icon umb-tree-icon sprTree {{result.selected ? 'icon-check' : result.icon}}"></umb-icon>
+                                <span class="umb-search-group-item-name__text">{{ result.name }}</span>
+                            </span>
+                            <small class="search-subtitle" ng-if="result.subTitle">{{ result.subTitle }}</small>
+                        </button>
+                    </div>
+                </li>
+            </ul>
         </li>
-      </ul>
-    </li>
-  </ul>
+    </ul>
 
 </div>
 
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 6559b2565a..38dde65f57 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2577,4 +2577,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="viewPublishedContentAcceptButton">View published version</key>
     <key alias="viewPublishedContentDeclineButton">Stay in preview mode</key>
   </area>
+  <area alias="treeSearch">
+    <key alias="searchResult">item returned</key>
+    <key alias="searchResults">items returned</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 2b7c3ec842..f7d6341711 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2596,4 +2596,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="viewPublishedContentAcceptButton">View published version</key>
     <key alias="viewPublishedContentDeclineButton">Stay in preview mode</key>
   </area>
+  <area alias="treeSearch">
+    <key alias="searchResult">item returned</key>
+    <key alias="searchResults">items returned</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index 8900272af7..69e2189c67 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -2372,4 +2372,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
         ]]>
     </key>
   </area>
+  <area alias="treeSearch">
+    <key alias="searchResult">élément retrouvé</key>
+    <key alias="searchResults">éléments retrouvés</key>
+  </area>
 </language>

From fc77252ec756cf90bb74e7fbbe6dd6d75cbdacfc Mon Sep 17 00:00:00 2001
From: Dave de Moel <d.demoel@wearetriple.com>
Date: Mon, 1 Mar 2021 14:54:52 +0100
Subject: [PATCH 181/202] Updated LightInject to v6.4.0

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

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index fce15eb487..35eef49ec2 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -23,7 +23,7 @@
                   the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
                   not want this to happen as the alpha of the next major is, really, the next major already.
                 -->
-                <dependency id="LightInject" version="[5.4.0,5.999999)" />
+                <dependency id="LightInject" version="[6.4.0,6.999999)" />
                 <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
                 <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
                 <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 15149d510e..b27b4f9895 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -77,7 +77,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.4.0" />
+    <PackageReference Include="LightInject" Version="6.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Web" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNet.Identity.Core">
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 9d4bc4294c..8397e0baf3 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -83,7 +83,7 @@
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.4.0" />
+    <PackageReference Include="LightInject" Version="6.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="Lucene.Net" Version="3.0.3" />
     <PackageReference Include="Lucene.Net.Contrib" Version="3.0.3" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index d02d4f6a03..d77ca52200 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -71,7 +71,7 @@
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.4.0" />
+    <PackageReference Include="LightInject" Version="6.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Mvc" Version="2.0.0" />
     <PackageReference Include="LightInject.WebApi" Version="2.0.0" />
@@ -1309,4 +1309,4 @@
       <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
     </SGen>
   </Target>
-</Project>
+</Project>
\ No newline at end of file

From c84f616a17b6c9d2dec5dfef7cf5f249914fa525 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 17 Mar 2021 17:00:17 +0100
Subject: [PATCH 182/202] Remove HtmlSanitizer once more - see #9803

---
 build/NuSpecs/UmbracoCms.Web.nuspec           |  1 -
 src/Umbraco.Core/Constants-SvgSanitizer.cs    | 23 -------------------
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 -
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  1 +
 src/Umbraco.Web/Runtime/WebInitialComposer.cs | 10 --------
 src/Umbraco.Web/Services/IconService.cs       |  8 ++-----
 src/Umbraco.Web/Umbraco.Web.csproj            |  5 +---
 7 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 src/Umbraco.Core/Constants-SvgSanitizer.cs

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index fc31551d6c..e0ffd57aff 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -42,7 +42,6 @@
                 <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
                 <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
-                <dependency id="HtmlSanitizer" version="[5.0.376,5.999999)" />
 
             </group>
 
diff --git a/src/Umbraco.Core/Constants-SvgSanitizer.cs b/src/Umbraco.Core/Constants-SvgSanitizer.cs
deleted file mode 100644
index c92b9f56c7..0000000000
--- a/src/Umbraco.Core/Constants-SvgSanitizer.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core
-{
-    public static partial class Constants
-    {
-        /// <summary>
-        /// Defines the alias identifiers for Umbraco's core application sections.
-        /// </summary>
-        public static class SvgSanitizer
-        {
-            /// <summary>
-            /// Allowlist for SVG attributes.
-            /// </summary>
-            public static readonly IList<string> Attributes = new [] { "accent-height", "accumulate", "additive", "alignment-baseline", "allowReorder", "alphabetic", "amplitude", "arabic-form", "ascent", "attributeName", "attributeType", "autoReverse", "azimuth", "baseFrequency", "baseline-shift", "baseProfile", "bbox", "begin", "bias", "by", "calcMode", "cap-height", "class", "clip", "clipPathUnits", "clip-path", "clip-rule", "color", "color-interpolation", "color-interpolation-filters", "color-profile", "color-rendering", "contentScriptType", "contentStyleType", "cursor", "cx", "cy", "d", "decelerate", "descent", "diffuseConstant", "direction", "display", "divisor", "dominant-baseline", "dur", "dx", "dy", "edgeMode", "elevation", "enable-background", "end", "exponent", "externalResourcesRequired", "Section", "fill", "fill-opacity", "fill-rule", "filter", "filterRes", "filterUnits", "flood-color", "flood-opacity", "font-family", "font-size", "font-size-adjust", "font-stretch", "font-style", "font-variant", "font-weight", "format", "from", "fr", "fx", "fy", "g1", "g2", "glyph-name", "glyph-orientation-horizontal", "glyph-orientation-vertical", "glyphRef", "gradientTransform", "gradientUnits", "hanging", "height", "href", "hreflang", "horiz-adv-x", "horiz-origin-x", "ISection", "id", "ideographic", "image-rendering", "in", "in2", "intercept", "k", "k1", "k2", "k3", "k4", "kernelMatrix", "kernelUnitLength", "kerning", "keyPoints", "keySplines", "keyTimes", "lang", "lengthAdjust", "letter-spacing", "lighting-color", "limitingConeAngle", "local", "MSection", "marker-end", "marker-mid", "marker-start", "markerHeight", "markerUnits", "markerWidth", "mask", "maskContentUnits", "maskUnits", "mathematical", "max", "media", "method", "min", "mode", "NSection", "name", "numOctaves", "offset", "opacity", "operator", "order", "orient", "orientation", "origin", "overflow", "overline-position", "overline-thickness", "panose-1", "paint-order", "path", "pathLength", "patternContentUnits", "patternTransform", "patternUnits", "ping", "pointer-events", "points", "pointsAtX", "pointsAtY", "pointsAtZ", "preserveAlpha", "preserveAspectRatio", "primitiveUnits", "r", "radius", "referrerPolicy", "refX", "refY", "rel", "rendering-intent", "repeatCount", "repeatDur", "requiredExtensions", "requiredFeatures", "restart", "result", "rotate", "rx", "ry", "scale", "seed", "shape-rendering", "slope", "spacing", "specularConstant", "specularExponent", "speed", "spreadMethod", "startOffset", "stdDeviation", "stemh", "stemv", "stitchTiles", "stop-color", "stop-opacity", "strikethrough-position", "strikethrough-thickness", "string", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "surfaceScale", "systemLanguage", "tabindex", "tableValues", "target", "targetX", "targetY", "text-anchor", "text-decoration", "text-rendering", "textLength", "to", "transform", "type", "u1", "u2", "underline-position", "underline-thickness", "unicode", "unicode-bidi", "unicode-range", "units-per-em", "v-alphabetic", "v-hanging", "v-ideographic", "v-mathematical", "values", "vector-effect", "version", "vert-adv-y", "vert-origin-x", "vert-origin-y", "viewBox", "viewTarget", "visibility", "width", "widths", "word-spacing", "writing-mode", "x", "x-height", "x1", "x2", "xChannelSelector", "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show", "xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "y", "y1", "y2", "yChannelSelector", "z", "zoomAndPan" };
-
-            /// <summary>
-            /// Allowlist for SVG tabs.
-            /// </summary>
-            public static readonly IList<string> Tags = new [] { "a", "altGlyph", "altGlyphDef", "altGlyphItem", "animate", "animateColor", "animateMotion", "animateTransform", "circle", "clipPath", "color-profile", "cursor", "defs", "desc", "discard", "ellipse", "feBlend", "feColorMatrix", "feComponentTransfer", "feComposite", "feConvolveMatrix", "feDiffuseLighting", "feDisplacementMap", "feDistantLight", "feDropShadow", "feFlood", "feFuncA", "feFuncB", "feFuncG", "feFuncR", "feGaussianBlur", "feImage", "feMerge", "feMergeNode", "feMorphology", "feOffset", "fePointLight", "feSpecularLighting", "feSpotLight", "feTile", "feTurbulence", "filter", "font", "font-face", "font-face-format", "font-face-name", "font-face-src", "font-face-uri", "foreignObject", "g", "glyph", "glyphRef", "hatch", "hatchpath", "hkern", "image", "line", "linearGradient", "marker", "mask", "mesh", "meshgradient", "meshpatch", "meshrow", "metadata", "missing-glyph", "mpath", "path", "pattern", "polygon", "polyline", "radialGradient", "rect", "set", "solidcolor", "stop", "svg", "switch", "symbol", "text", "textPath", "title", "tref", "tspan", "unknown", "use", "view", "vkern" };
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b27b4f9895..635d8080cf 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -261,7 +261,6 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
-    <Compile Include="Constants-SvgSanitizer.cs" />
     <Compile Include="Exceptions\PanicException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 2ad23e1b73..51d9763ac3 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -111,6 +111,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index b15641b503..5d97bfe4a2 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -40,7 +40,6 @@ using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models;
-using Ganss.XSS;
 
 namespace Umbraco.Web.Runtime
 {
@@ -140,15 +139,6 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<ISectionService, SectionService>();
             composition.RegisterUnique<IDashboardService, DashboardService>();
             composition.RegisterUnique<IIconService, IconService>();
-            composition.Register<IHtmlSanitizer>(_ =>
-            {
-                var sanitizer = new HtmlSanitizer();
-                sanitizer.AllowedAttributes.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Attributes);
-                sanitizer.AllowedCssProperties.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Attributes);
-                sanitizer.AllowedTags.UnionWith(Umbraco.Core.Constants.SvgSanitizer.Tags);
-                return sanitizer;
-            },Lifetime.Singleton);
-
             composition.RegisterUnique<IExamineManager>(factory => ExamineManager.Instance);
 
             // configure the container for web
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
index 15e673e6ba..fad53103c0 100644
--- a/src/Umbraco.Web/Services/IconService.cs
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Ganss.XSS;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -15,13 +14,11 @@ namespace Umbraco.Web.Services
     public class IconService : IIconService
     {
         private readonly IGlobalSettings _globalSettings;
-        private readonly IHtmlSanitizer _htmlSanitizer;
         private readonly IAppPolicyCache _cache;
 
-        public IconService(IGlobalSettings globalSettings, IHtmlSanitizer htmlSanitizer, AppCaches appCaches)
+        public IconService(IGlobalSettings globalSettings, AppCaches appCaches)
         {
             _globalSettings = globalSettings;
-            _htmlSanitizer = htmlSanitizer;
             _cache = appCaches.RuntimeCache;
         }
 
@@ -78,12 +75,11 @@ namespace Umbraco.Web.Services
             try
             {
                 var svgContent = System.IO.File.ReadAllText(iconPath);
-                var sanitizedString = _htmlSanitizer.Sanitize(svgContent);
 
                 var svg = new IconModel
                 {
                     Name = iconName,
-                    SvgString = sanitizedString
+                    SvgString = svgContent
                 };
 
                 return svg;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index d77ca52200..ce244f126c 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -65,9 +65,6 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.1.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
-    <PackageReference Include="HtmlSanitizer">
-      <Version>5.0.376</Version>
-    </PackageReference>
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>
@@ -1299,7 +1296,7 @@
     </PropertyGroup>
     <ItemGroup>
       <!-- we want to exclude all facade references ?! -->
-      <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http' and '%(ReferencePath.FileName)' != 'System.Text.Encoding.CodePages'" />
+      <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http'" />
     </ItemGroup>
     <Delete Files="$(TargetDir)$(TargetName).XmlSerializers.dll" ContinueOnError="true" />
     <!--

From 3358ab2604bcc20b7a80bc837c7bddbb4cc97f90 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 17 Mar 2021 17:06:07 +0100
Subject: [PATCH 183/202] Also make sure NuGet installs the correct version of
 the CodePages dependency

---
 build/NuSpecs/UmbracoCms.Web.nuspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index e0ffd57aff..d8815bab63 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -42,6 +42,7 @@
                 <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
                 <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
+                <dependency id="System.Text.Encoding.CodePages" version="[4.7.1,4.999999)" />
 
             </group>
 

From 89b881e98e815665cbfc89bfdbf47bfeeaee29a2 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 6 Apr 2021 10:11:46 +0200
Subject: [PATCH 184/202] Bump version to 8.13 RC

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 4162f47da6..2a7386cb45 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.12.2")]
-[assembly: AssemblyInformationalVersion("8.12.2")]
+[assembly: AssemblyFileVersion("8.13.0")]
+[assembly: AssemblyInformationalVersion("8.13.0-rc")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 51d9763ac3..58baadcb35 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -348,9 +348,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8122</DevelopmentServerPort>
+          <DevelopmentServerPort>8130</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8122</IISUrl>
+          <IISUrl>http://localhost:8130</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 26d11a83141abc5e4d94c24e733cdca768d1a6f1 Mon Sep 17 00:00:00 2001
From: ric <60885685+ricbrady@users.noreply.github.com>
Date: Tue, 6 Apr 2021 14:44:49 +0200
Subject: [PATCH 185/202] Fixed copy preserving sort order (#10091)

---
 .../Services/Implement/ContentService.cs      | 10 +++----
 .../Services/ContentServiceTests.cs           | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index e5363d0e2b..d8e99663ea 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1415,7 +1415,7 @@ namespace Umbraco.Core.Services.Implement
 
                         var result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs.Value, d.WriterId);
                         if (result.Success == false)
-                            Logger.Error<ContentService,int,PublishResultType>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
+                            Logger.Error<ContentService, int, PublishResultType>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
                         results.Add(result);
 
                     }
@@ -2201,7 +2201,7 @@ namespace Umbraco.Core.Services.Implement
                     while (page * pageSize < total)
                     {
                         var descendants = GetPagedDescendants(content.Id, page++, pageSize, out total);
-                        foreach (var descendant in descendants)
+                        foreach (var descendant in descendants.OrderBy(x => x.Level).ThenBy(y => y.SortOrder))
                         {
                             // if parent has not been copied, skip, else gets its copy id
                             if (idmap.TryGetValue(descendant.ParentId, out parentId) == false) continue;
@@ -2420,7 +2420,7 @@ namespace Umbraco.Core.Services.Implement
                 if (report.FixedIssues.Count > 0)
                 {
                     //The event args needs a content item so we'll make a fake one with enough properties to not cause a null ref
-                    var root = new Content("root", -1, new ContentType(-1)) {Id = -1, Key = Guid.Empty};
+                    var root = new Content("root", -1, new ContentType(-1)) { Id = -1, Key = Guid.Empty };
                     scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>.EventArgs(new TreeChange<IContent>(root, TreeChangeTypes.RefreshAll)));
                 }
 
@@ -3169,7 +3169,7 @@ namespace Umbraco.Core.Services.Implement
                 if (rollbackSaveResult.Success == false)
                 {
                     //Log the error/warning
-                    Logger.Error<ContentService,int,int,int>("User '{UserId}' was unable to rollback content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                    Logger.Error<ContentService, int, int, int>("User '{UserId}' was unable to rollback content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
                 }
                 else
                 {
@@ -3178,7 +3178,7 @@ namespace Umbraco.Core.Services.Implement
                     scope.Events.Dispatch(RolledBack, this, rollbackEventArgs);
 
                     //Logging & Audit message
-                    Logger.Info<ContentService,int,int,int>("User '{UserId}' rolled back content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                    Logger.Info<ContentService, int, int, int>("User '{UserId}' rolled back content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
                     Audit(AuditType.RollBack, userId, id, $"Content '{content.Name}' was rolled back to version '{versionId}'");
                 }
 
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 008c24fcbf..0faa4af316 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -2082,6 +2082,32 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual("world", copiedTags[1].Text);
         }
 
+        [Test]
+        public void Copy_Recursive_Preserves_Sort_Order()
+        {
+            // Arrange
+            var contentService = ServiceContext.ContentService;
+            var temp = contentService.GetById(NodeDto.NodeIdSeed + 2);
+            Assert.AreEqual("Home", temp.Name);
+            Assert.AreEqual(3, contentService.CountChildren(temp.Id));
+            var reversedChildren = contentService.GetPagedChildren(temp.Id, 0, 10, out var total1).Reverse().ToArray();
+            contentService.Sort(reversedChildren);
+
+            // Act
+            var copy = contentService.Copy(temp, temp.ParentId, false, true, Constants.Security.SuperUserId);
+            var content = contentService.GetById(NodeDto.NodeIdSeed + 2);
+
+            // Assert
+            Assert.That(copy, Is.Not.Null);
+            Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
+            Assert.AreNotSame(content, copy);
+            Assert.AreEqual(3, contentService.CountChildren(copy.Id));
+
+            var copiedChildren = contentService.GetPagedChildren(copy.Id, 0, 10, out var total2).OrderBy(c => c.SortOrder).ToArray();
+            Assert.AreEqual(reversedChildren.First().Name, copiedChildren.First().Name);
+            Assert.AreEqual(reversedChildren.Last().Name, copiedChildren.Last().Name);
+        }
+
         [Test]
         public void Can_Rollback_Version_On_Content()
         {

From d85d0d75f3e7c043fa6162ad7fd3d2fecd08881a Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 6 Apr 2021 16:13:40 +0200
Subject: [PATCH 186/202] Revert "Updated LightInject to v6.4.0"

This reverts commit fc77252ec756cf90bb74e7fbbe6dd6d75cbdacfc.
---
 build/NuSpecs/UmbracoCms.Core.nuspec   | 2 +-
 src/Umbraco.Core/Umbraco.Core.csproj   | 2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 35eef49ec2..fce15eb487 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -23,7 +23,7 @@
                   the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
                   not want this to happen as the alpha of the next major is, really, the next major already.
                 -->
-                <dependency id="LightInject" version="[6.4.0,6.999999)" />
+                <dependency id="LightInject" version="[5.4.0,5.999999)" />
                 <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
                 <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
                 <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 635d8080cf..2ea5292d73 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -77,7 +77,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="6.4.0" />
+    <PackageReference Include="LightInject" Version="5.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Web" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNet.Identity.Core">
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8397e0baf3..9d4bc4294c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -83,7 +83,7 @@
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="6.4.0" />
+    <PackageReference Include="LightInject" Version="5.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="Lucene.Net" Version="3.0.3" />
     <PackageReference Include="Lucene.Net.Contrib" Version="3.0.3" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ce244f126c..a6cbefa825 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -68,7 +68,7 @@
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="6.4.0" />
+    <PackageReference Include="LightInject" Version="5.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Mvc" Version="2.0.0" />
     <PackageReference Include="LightInject.WebApi" Version="2.0.0" />
@@ -1306,4 +1306,4 @@
       <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
     </SGen>
   </Target>
-</Project>
\ No newline at end of file
+</Project>

From 2d2a89f216bb14f94ad83396bc185e27be9d5e46 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 7 Apr 2021 13:42:46 +0200
Subject: [PATCH 187/202] Revert "Add copy logic to Media Picker (#9957)"

This reverts commit f7c032af65cac83182782c758a3ab79c86b92e70.
---
 .../src/common/services/clipboard.service.js  |  43 +--
 .../mediapicker/mediapicker.controller.js     |  76 +----
 .../mediapicker/mediapicker.html              | 274 ++++++++----------
 .../mediapicker/mediapicker.controller.js     |  42 +--
 .../mediapicker/mediapicker.html              |   3 -
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |   1 -
 .../Umbraco/config/lang/en_us.xml             |   1 -
 7 files changed, 149 insertions(+), 291 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index 167c134e62..83fd3d08c2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -16,7 +16,6 @@ function clipboardService($window, notificationsService, eventsService, localSto
     const TYPES = {};
     TYPES.ELEMENT_TYPE = "elementType";
     TYPES.BLOCK = "block";
-    TYPES.IMAGE = "image";
     TYPES.RAW = "raw";
 
     var clearPropertyResolvers = {};
@@ -285,7 +284,7 @@ function clipboardService($window, notificationsService, eventsService, localSto
     *
     * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
     * @param {string} alias A string defining the alias of the data to store, example: 'product'
-    * @param {object} data A object containing the properties to be saved, this could be the object of a ElementType, ContentNode, ...
+    * @param {object} entry A object containing the properties to be saved, this could be the object of a ElementType, ContentNode, ...
     * @param {string} displayLabel (optional) A string swetting the label to display when showing paste entries.
     * @param {string} displayIcon (optional) A string setting the icon to display when showing paste entries.
     * @param {string} uniqueKey (optional) A string prodiving an identifier for this entry, existing entries with this key will be removed to ensure that you only have the latest copy of this data.
@@ -319,46 +318,6 @@ function clipboardService($window, notificationsService, eventsService, localSto
 
     };
 
-    /**
-    * @ngdoc method
-    * @name umbraco.services.clipboardService#copy
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
-    * @param {string} alias A string defining the alias of the data to store, example: 'product'
-    * @param {object[]} data An array of objects containing the properties to be saved, this could be the object of a ElementType, ContentNode, ...
-    *
-    * @description
-    * Saves multiple JS-object to the clipboard.
-    */
-    service.copyMultiple = function (type, alias, data, firstLevelClearupMethod) {
-
-        var storage = retriveStorage();
-
-        data.forEach(item => {
-            var displayLabel = item.displayLabel || item.name;
-            var displayIcon = item.displayIcon || iconHelper.convertFromLegacyIcon(item.icon);
-            var uniqueKey = item.uniqueKey || item.key || console.error("missing unique key for this content");
-
-            // remove previous copies of this entry:
-            storage.entries = storage.entries.filter(
-                (entry) => {
-                    return entry.unique !== uniqueKey;
-                }
-            );
-
-            var entry = { unique: uniqueKey, type: type, alias: alias, data: prepareEntryForStorage(type, item, firstLevelClearupMethod), label: displayLabel, icon: displayIcon, date: Date.now() };
-            storage.entries.push(entry);
-        });
-
-        if (saveStorage(storage) === true) {
-            notificationsService.success("Clipboard", "Copied to clipboard.");
-        } else {
-            notificationsService.error("Clipboard", "Couldnt copy this data to clipboard.");
-        }
-
-    };
-
 
     /**
     * @ngdoc method
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 700bfa5715..fec2e632c5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
-        function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService, umbSessionStorage, notificationsService, clipboardService) {
+        function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService, umbSessionStorage, notificationsService) {
 
             var vm = this;
 
@@ -19,8 +19,6 @@ angular.module("umbraco")
             vm.enterSubmitFolder = enterSubmitFolder;
             vm.focalPointChanged = focalPointChanged;
             vm.changePagination = changePagination;
-            vm.onNavigationChanged = onNavigationChanged;
-            vm.clickClearClipboard = clickClearClipboard;
 
             vm.clickHandler = clickHandler;
             vm.clickItemName = clickItemName;
@@ -29,9 +27,6 @@ angular.module("umbraco")
             vm.selectLayout = selectLayout;
             vm.showMediaList = false;
 
-            vm.navigation = [];
-            vm.clipboardImages = [];
-
             var dialogOptions = $scope.model;
 
             $scope.disableFolderSelect = (dialogOptions.disableFolderSelect && dialogOptions.disableFolderSelect !== "0") ? true : false;
@@ -105,43 +100,15 @@ angular.module("umbraco")
 
             function setTitle() {
                 if (!$scope.model.title) {
-                    localizationService.localizeMany(["defaultdialogs_selectMedia", "defaultdialogs_tabClipboard"])
+                    localizationService.localize("defaultdialogs_selectMedia")
                         .then(function (data) {
-                            $scope.model.title = data[0];
-
-
-                            vm.navigation = [{
-                                "alias": "empty",
-                                "name": data[0],
-                                "icon": "icon-umb-media",
-                                "active": true,
-                                "view": ""
-                            },
-                            {
-                                "alias": "clipboard",
-                                "name": data[1],
-                                "icon": "icon-paste-in",
-                                "view": "",
-                                "disabled": vm.clipboardImages.length === 0
-                            }];
-
-                            vm.activeTab = vm.navigation[0];
+                            $scope.model.title = data;
                         });
                 }
             }
 
             function onInit() {
 
-                clipboardService.retriveEntriesOfType(clipboardService.TYPES.IMAGE, ["Media"]).forEach(item => {
-                    var media = item.data.media;
-                    if ((($scope.disableFolderSelect || $scope.onlyImages) && media.isFolder) ||
-                        ($scope.onlyFolders && !media.isFolder)) {
-                        return;
-                    }
-                    setDefaultData(media);
-                    vm.clipboardImages.push(media);
-                });
-
                 setTitle();
 
                 userService.getCurrentUser().then(function (userData) {
@@ -182,7 +149,7 @@ angular.module("umbraco")
                             .then(function (node) {
                                 $scope.target = node;
                                 // Moving directly to existing node's folder
-                                gotoFolder({ id: node.parentId }).then(function () {
+                                gotoFolder({ id: node.parentId }).then(function() {
                                     selectMedia(node);
                                     $scope.target.url = mediaHelper.resolveFileFromEntity(node);
                                     $scope.target.thumbnail = mediaHelper.resolveFileFromEntity(node, true);
@@ -202,10 +169,10 @@ angular.module("umbraco")
 
             function upload(v) {
                 var fileSelect = $(".umb-file-dropzone .file-select");
-                if (fileSelect.length === 0) {
+                if (fileSelect.length === 0){
                     localizationService.localize('media_uploadNotAllowed').then(function (message) { notificationsService.warning(message); });
                 }
-                else {
+                else{
                     fileSelect.trigger("click");
                 }
             }
@@ -428,19 +395,6 @@ angular.module("umbraco")
                 });
             };
 
-            function onNavigationChanged(tab) {
-                vm.activeTab.active = false;
-                vm.activeTab = tab;
-                vm.activeTab.active = true;
-            };
-
-            function clickClearClipboard() {
-                vm.onNavigationChanged(vm.navigation[0]);
-                vm.navigation[1].disabled = true;
-                vm.clipboardImages = [];
-                clipboardService.clearEntriesOfType(clipboardService.TYPES.IMAGE, ["Media"]);
-            };
-
             var debounceSearchMedia = _.debounce(function () {
                 $scope.$apply(function () {
                     if (vm.searchOptions.filter) {
@@ -550,7 +504,13 @@ angular.module("umbraco")
                     var allowedTypes = dialogOptions.filter ? dialogOptions.filter.split(",") : null;
 
                     for (var i = 0; i < data.length; i++) {
-                        setDefaultData(data[i]);
+                        if (data[i].metaData.MediaPath !== null) {
+                            data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
+                            data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
+                        }
+                        if (data[i].metaData.UpdateDate !== null){
+                            data[i].updateDate = data[i].metaData.UpdateDate;
+                        }
                         data[i].filtered = allowedTypes && allowedTypes.indexOf(data[i].metaData.ContentTypeAlias) < 0;
                     }
 
@@ -563,16 +523,6 @@ angular.module("umbraco")
                 });
             }
 
-            function setDefaultData(item) {
-                if (item.metaData.MediaPath !== null) {
-                    item.thumbnail = mediaHelper.resolveFileFromEntity(item, true);
-                    item.image = mediaHelper.resolveFileFromEntity(item, false);
-                }
-                if (item.metaData.UpdateDate !== null) {
-                    item.updateDate = item.metaData.UpdateDate;
-                }
-            }
-
             function preSelectMedia() {
                 for (var folderIndex = 0; folderIndex < $scope.images.length; folderIndex++) {
                     var folderImage = $scope.images[folderIndex];
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index 9fd31de537..df0c8e3cef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -3,8 +3,6 @@
 
         <umb-editor-header
             name="model.title"
-            navigation="vm.navigation"
-            on-select-navigation-item="vm.onNavigationChanged(item)"
             name-locked="true"
             hide-alias="true"
             hide-icon="true"
@@ -13,161 +11,145 @@
 
         <umb-editor-container>
 
-            <div ng-if="vm.activeTab.alias === 'empty'">
-                <form id="fileupload" method="POST" enctype="multipart/form-data" umb-image-upload="options">
+            <form id="fileupload" method="POST" enctype="multipart/form-data" umb-image-upload="options">
 
-                    <div on-drag-leave="vm.dragLeave()" on-drag-end="vm.dragLeave()" on-drag-enter="vm.dragEnter()">
+                <div on-drag-leave="vm.dragLeave()" on-drag-end="vm.dragLeave()" on-drag-enter="vm.dragEnter()">
 
-                        <div class="umb-control-group">
+                    <div class="umb-control-group">
 
-                            <div class="umb-mediapicker-upload">
-                                <div class="form-search">
-                                    <umb-search-filter input-id="datatype-search"
-                                                       model="vm.searchOptions.filter"
-                                                       label-key="placeholders_search"
-                                                       text="Type to search"
-                                                       on-change="vm.changeSearch()"
-                                                       css-class="w-100"
-                                                       auto-focus="true">
-                                    </umb-search-filter>
+                        <div class="umb-mediapicker-upload">
+                            <div class="form-search">
+                                <umb-search-filter
+                                    input-id="datatype-search"
+                                    model="vm.searchOptions.filter"
+                                    label-key="placeholders_search"
+                                    text="Type to search"
+                                    on-change="vm.changeSearch()"
+                                    css-class="w-100"
+                                    auto-focus="true">
+                                </umb-search-filter>
 
-                                    <div class="form-search__toggle">
-                                        <umb-checkbox model="filterOptions.excludeSubFolders"
-                                                      on-change="vm.toggle()"
-                                                      text="Include subfolders in search"
-                                                      label-key="general_excludeFromSubFolders">
-                                        </umb-checkbox>
-                                    </div>
-                                </div>
-
-                                <div class="upload-button">
-                                    <umb-button type="button"
-                                                label-key="general_upload"
-                                                action="vm.upload()"
-                                                disabled="lockedFolder"
-                                                button-style="action">
-                                    </umb-button>
+                                <div class="form-search__toggle">
+                                    <umb-checkbox model="filterOptions.excludeSubFolders"
+                                                  on-change="vm.toggle()"
+                                                  text="Include subfolders in search"
+                                                  label-key="general_excludeFromSubFolders">
+                                    </umb-checkbox>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row umb-control-group" ng-show="vm.searchOptions.filter && images.length > 0 && !vm.loading && !activeDrag">
-                            <div style="margin-left:auto;text-align:right">
-                                <umb-layout-selector ng-show="vm.layout.layouts"
-                                                     layouts="vm.layout.layouts"
-                                                     active-layout="vm.layout.activeLayout"
-                                                     on-layout-select="vm.selectLayout(layout)">
-                                </umb-layout-selector>
+
+                            <div class="upload-button">
+                                <umb-button type="button"
+                                            label-key="general_upload"
+                                            action="vm.upload()"
+                                            disabled="lockedFolder"
+                                            button-style="action">
+                                </umb-button>
                             </div>
                         </div>
-                        <div class="row umb-control-group" ng-show="!vm.searchOptions.filter">
-                            <div class="pull-right">
-                                <umb-layout-selector ng-show="vm.layout.layouts"
-                                                     layouts="vm.layout.layouts"
-                                                     active-layout="vm.layout.activeLayout"
-                                                     on-layout-select="vm.selectLayout(layout)">
-                                </umb-layout-selector>
-                            </div>
-
-                            <ul class="umb-breadcrumbs">
-                                <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
-                                    <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder()" ng-class="{'--current':path.length === 0}">
-                                        <localize key="treeHeaders_media">Media</localize>
-                                    </button>
-                                    <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
-                                </li>
-                                <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
-                                    <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder(item)" ng-class="{'--current':$last}">{{item.name}}</button>
-                                    <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
-                                </li>
-                                <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
-                                    <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-hide="model.showFolderInput" ng-click="model.showFolderInput = true">
-                                        <i class="icon icon-add small" aria-hidden="true"></i>
-                                        <span class="sr-only">
-                                            <localize key="visuallyHiddenTexts_createNewFolder">Create new folder</localize>
-                                        </span>
-                                    </button>
-
-                                    <input type="text"
-                                           class="umb-breadcrumbs__add-ancestor"
-                                           ng-show="model.showFolderInput"
-                                           ng-model="model.newFolderName"
-                                           ng-keydown="enterSubmitFolder($event)"
-                                           ng-blur="vm.submitFolder()"
-                                           focus-when="{{model.showFolderInput}}" />
-                                </li>
-                            </ul>
-                            <umb-loader ng-if="model.creatingFolder"></umb-loader>
-                        </div>
-
-                        <umb-file-dropzone ng-if="vm.acceptedMediatypes.length > 0 && !vm.loading && !lockedFolder"
-                                           accepted-mediatypes="vm.acceptedMediatypes"
-                                           parent-id="{{currentFolder.id}}"
-                                           files-uploaded="vm.onUploadComplete"
-                                           files-queued="vm.onFilesQueue"
-                                           accept="{{vm.acceptedFileTypes}}"
-                                           max-file-size="{{vm.maxFileSize}}"
-                                           hide-dropzone="{{ !activeDrag && (images.length > 0 || vm.searchOptions.filter !== '') }}"
-                                           compact="{{ images.length > 0 }}">
-                        </umb-file-dropzone>
-
-                        <umb-media-grid ng-if="!vm.loading"
-                                        items="images"
-                                        on-click="vm.clickHandler"
-                                        on-click-name="vm.clickItemName"
-                                        item-max-width="150"
-                                        item-max-height="150"
-                                        item-min-width="100"
-                                        item-min-height="100"
-                                        disable-folder-select={{disableFolderSelect}}
-                                        only-images={{onlyImages}}
-                                        only-folders={{onlyFolders}}
-                                        include-sub-folders={{!filterOptions.excludeSubFolders}}
-                                        current-folder-id="{{currentFolder.id}}"
-                                        show-media-list=vm.showMediaList>
-                        </umb-media-grid>
-
-
-                        <umb-load-indicator ng-if="vm.loading">
-                        </umb-load-indicator>
-
-                        <div class="flex justify-center">
-                            <umb-pagination ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
-                                            page-number="vm.searchOptions.pageNumber"
-                                            total-pages="vm.searchOptions.totalPages"
-                                            on-change="vm.changePagination(pageNumber)">
-                            </umb-pagination>
-                        </div>
-
-                        <umb-empty-state ng-if="vm.searchOptions.filter && images.length === 0 && !vm.loading && !activeDrag" position="center">
-                            <localize key="general_searchNoResult"></localize>
-                        </umb-empty-state>
-
                     </div>
-                </form>
-            </div>
-            <div ng-if="vm.activeTab.alias === 'clipboard'">
-                <div style="margin-bottom:20px; text-align: right;">
-                    <umb-button type="button"
-                                icon="icon-trash"
-                                button-style="link"
-                                label-key="clipboard_labelForClearClipboard"
-                                action="vm.clickClearClipboard()">
-                    </umb-button>
+                    <div class="row umb-control-group" ng-show="vm.searchOptions.filter && images.length > 0 && !vm.loading && !activeDrag">
+                        <div style="margin-left:auto;text-align:right" >
+                            <umb-layout-selector ng-show="vm.layout.layouts"
+                                                 layouts="vm.layout.layouts"
+                                                 active-layout="vm.layout.activeLayout"
+                                                 on-layout-select="vm.selectLayout(layout)">
+                            </umb-layout-selector>
+                        </div>
+                    </div>
+                    <div class="row umb-control-group" ng-show="!vm.searchOptions.filter">
+                        <div class="pull-right">
+                            <umb-layout-selector ng-show="vm.layout.layouts"
+                                                 layouts="vm.layout.layouts"
+                                                 active-layout="vm.layout.activeLayout"
+                                                 on-layout-select="vm.selectLayout(layout)">
+                            </umb-layout-selector>
+                        </div>
+
+                        <ul class="umb-breadcrumbs">
+                            <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
+                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder()" ng-class="{'--current':path.length === 0}">
+                                    <localize key="treeHeaders_media">Media</localize>
+                                </button>
+                                <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
+                            </li>
+                            <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
+                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder(item)" ng-class="{'--current':$last}">{{item.name}}</button>
+                                <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
+                            </li>
+                            <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
+                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-hide="model.showFolderInput" ng-click="model.showFolderInput = true">
+                                    <i class="icon icon-add small" aria-hidden="true"></i>
+                                    <span class="sr-only">
+                                        <localize key="visuallyHiddenTexts_createNewFolder">Create new folder</localize>
+                                    </span>
+                                </button>
+
+                                <input type="text"
+                                       class="umb-breadcrumbs__add-ancestor"
+                                       ng-show="model.showFolderInput"
+                                       ng-model="model.newFolderName"
+                                       ng-keydown="enterSubmitFolder($event)"
+                                       ng-blur="vm.submitFolder()"
+                                focus-when="{{model.showFolderInput}}" />
+                            </li>
+                        </ul>
+                        <umb-loader ng-if="model.creatingFolder"></umb-loader>
+                    </div>
+
+                    <umb-file-dropzone
+                                       ng-if="vm.acceptedMediatypes.length > 0 && !vm.loading && !lockedFolder"
+                                       accepted-mediatypes="vm.acceptedMediatypes"
+                                       parent-id="{{currentFolder.id}}"
+                                       files-uploaded="vm.onUploadComplete"
+                                       files-queued="vm.onFilesQueue"
+                                       accept="{{vm.acceptedFileTypes}}"
+                                       max-file-size="{{vm.maxFileSize}}"
+                                       hide-dropzone="{{ !activeDrag && (images.length > 0 || vm.searchOptions.filter !== '') }}"
+                                       compact="{{ images.length > 0 }}">
+                    </umb-file-dropzone>
+
+                    <umb-media-grid
+                                    ng-if="!vm.loading"
+                                    items="images"
+                                    on-click="vm.clickHandler"
+                                    on-click-name="vm.clickItemName"
+                                    item-max-width="150"
+                                    item-max-height="150"
+                                    item-min-width="100"
+                                    item-min-height="100"
+                                    disable-folder-select={{disableFolderSelect}}
+                                    only-images={{onlyImages}}
+                                    only-folders={{onlyFolders}}
+                                    include-sub-folders={{!filterOptions.excludeSubFolders}}
+                                    current-folder-id="{{currentFolder.id}}"
+                                    show-media-list=vm.showMediaList>
+                    </umb-media-grid>
+
+
+                    <umb-load-indicator
+                                        ng-if="vm.loading">
+                    </umb-load-indicator>
+
+                    <div class="flex justify-center">
+                        <umb-pagination
+                                        ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
+                                        page-number="vm.searchOptions.pageNumber"
+                                        total-pages="vm.searchOptions.totalPages"
+                                        on-change="vm.changePagination(pageNumber)">
+                        </umb-pagination>
+                    </div>
+
+                    <umb-empty-state ng-if="vm.searchOptions.filter && images.length === 0 && !vm.loading && !activeDrag" position="center">
+                        <localize key="general_searchNoResult"></localize>
+                    </umb-empty-state>
+
                 </div>
 
-                <umb-media-grid ng-if="!vm.loading"
-                                items="vm.clipboardImages"
-                                on-click="vm.clickHandler"
-                                item-max-width="150"
-                                item-max-height="150"
-                                item-min-width="100"
-                                item-min-height="100"
-                                disable-folder-select={{disableFolderSelect}}
-                                only-images={{onlyImages}}
-                                only-folders={{onlyFolders}}
-                                show-media-list=vm.showMediaList>
-                </umb-media-grid>
-            </div>
+
+
+            </form>
+
 
         </umb-editor-container>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index b47dd2f470..f3a57224e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper, overlayService, clipboardService) {
+    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper, overlayService) {
 
         var vm = this;
 
@@ -10,7 +10,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
         vm.add = add;
         vm.remove = remove;
-        vm.copyItem = copyItem;
         vm.editItem = editItem;
         vm.showAdd = showAdd;
 
@@ -54,7 +53,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                         // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
                         // compares and be completely sure it works.
                         var found = medias.find(m => m.udi.toString() === id.toString() || m.id.toString() === id.toString());
-
+                        
                         var mediaItem = found ||
                         {
                             name: vm.labels.deletedItem,
@@ -95,7 +94,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         function sync() {
             $scope.model.value = $scope.ids.join();
             removeAllEntriesAction.isDisabled = $scope.ids.length === 0;
-            copyAllEntriesAction.isDisabled = removeAllEntriesAction.isDisabled;
         }
 
         function setDirty() {
@@ -129,7 +127,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             ];
 
             localizationService.localizeMany(labelKeys)
-                .then(function (data) {
+                .then(function(data) {
                     vm.labels.deletedItem = data[0];
                     vm.labels.trashed = data[1];
 
@@ -143,7 +141,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                             else {
                                 $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
                                 $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                            }
+                            }  
                         }
 
                         // only allow users to add and edit media if they have access to the media section
@@ -163,23 +161,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             setDirty();
         }
 
-        function copyAllEntries() {
-            clipboardService.copyMultiple(clipboardService.TYPES.IMAGE,
-                "Media",
-                $scope.mediaItems.map(item => {
-                    return { "media": item, "key": item.udi }
-                }), clearNodeForCopy);
-        }
-
-        function copyItem(item) {
-            clipboardService.copy(clipboardService.TYPES.IMAGE, "Media", { "media": item }, null, null, item.udi, clearNodeForCopy);
-        }
-
-        function clearNodeForCopy(item) {
-            delete item.media.selected;
-            delete item.media.selectable;
-        }
-
         function editItem(item) {
             var mediaEditor = {
                 id: item.id,
@@ -279,14 +260,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             });
         }
 
-        var copyAllEntriesAction = {
-            labelKey: 'clipboard_labelForCopyAllEntries',
-            labelTokens: ['Media'],
-            icon: "documents",
-            method: copyAllEntries,
-            isDisabled: true
-        }
-
         var removeAllEntriesAction = {
             labelKey: 'clipboard_labelForRemoveAllEntries',
             labelTokens: [],
@@ -294,10 +267,9 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             method: removeAllEntries,
             isDisabled: true
         };
-
+        
         if (multiPicker === true) {
             var propertyActions = [
-                copyAllEntriesAction,
                 removeAllEntriesAction
             ];
 
@@ -315,12 +287,12 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             cancel: ".unsortable",
             update: function () {
                 setDirty();
-                $timeout(function () {
+                $timeout(function() {
                     // TODO: Instead of doing this with a timeout would be better to use a watch like we do in the
                     // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
                     // watch do all the rest.
                     $scope.ids = $scope.mediaItems.map(media => $scope.model.config.idType === "udi" ? media.udi : media.id);
-
+                    
                     sync();
                 });
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index 1090c4a1f0..c09d7c7613 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -37,9 +37,6 @@
                 </umb-file-icon>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <button type="button" aria-label="Copy media" ng-if="!media.trashed" class="umb-sortable-thumbnails__action btn-reset" data-element="action-copy" ng-click="vm.copyItem(media)">
-                        <i class="icon icon-documents" aria-hidden="true"></i>
-                    </button>
                     <button type="button" aria-label="Edit media" ng-if="allowEditMedia && !media.trashed" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
                         <i class="icon icon-edit" aria-hidden="true"></i>
                     </button>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 38dde65f57..5865d39a75 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -539,7 +539,6 @@
     <key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
     <key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
     <key alias="yesRemove">Yes, remove</key>
-    <key alias="tabClipboard">Clipboard</key>
   </area>
   <area alias="dictionary">
     <key alias="noItems">There are no dictionary items.</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 f7d6341711..102f04371d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -545,7 +545,6 @@
     <key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
     <key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
     <key alias="yesRemove">Yes, remove</key>
-    <key alias="tabClipboard">Clipboard</key>
   </area>
   <area alias="dictionary">
     <key alias="noItems">There are no dictionary items.</key>

From 8b6fc762b5edb6af3c62b306265d788a0ed458e1 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 7 Apr 2021 13:54:42 +0200
Subject: [PATCH 188/202] Reintroduce old constructor to make non-breaking

---
 src/Umbraco.Core/Mapping/UmbracoMapper.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
index bd2f916524..36e3f9eab9 100644
--- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Scoping;
 
@@ -58,6 +59,14 @@ namespace Umbraco.Core.Mapping
                 profile.DefineMaps(this);
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoMapper"/> class.
+        /// </summary>
+        /// <param name="profiles"></param>
+        [Obsolete("This constructor is no longer used and will be removed in future versions, use the other constructor instead")]
+        public UmbracoMapper(MapDefinitionCollection profiles) : this(profiles, Current.ScopeProvider)
+        {}
+
         #region Define
 
         private static TTarget ThrowCtor<TSource, TTarget>(TSource source, MapperContext context)

From 9fdbbb54fb3e56f973d684e658940f561612e5b9 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 7 Apr 2021 15:44:28 +0200
Subject: [PATCH 189/202] Update cypress test to make macros in the grid work
 again

---
 .../cypress/integration/Content/content.ts                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index b7f0b40fa6..0cec374c5d 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -761,7 +761,7 @@ context('Content', () => {
         cy.umbracoTreeItem("content", [name]).click();
         // Click add
         cy.get(':nth-child(2) > .preview-row > .preview-col > .preview-cell').click(); // Choose 1 column layout.
-        cy.get('.umb-column > .templates-preview > :nth-child(2) > .ng-binding').click(); // Choose headline
+        cy.get('.umb-column > .templates-preview > :nth-child(2) > small').click(); // Choose headline
         cy.get('.umb-cell-placeholder').click();
         // Click macro
         cy.get(':nth-child(4) > .umb-card-grid-item > :nth-child(1)').click();

From ecf67669ce9cdb4bac5fd52719e43a1fb605e4b5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 7 Apr 2021 16:25:46 +0200
Subject: [PATCH 190/202] Attributes could be multiple items, test specifically
 if `Directory` is an attribute

---
 src/Umbraco.Web/Editors/CodeFileController.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 409cded781..a6d142a6ea 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -638,7 +638,10 @@ namespace Umbraco.Web.Editors
         {
             var path = IOHelper.MapPath(systemDirectory + "/" + virtualPath);
             var dirInfo = new DirectoryInfo(path);
-            return dirInfo.Attributes == FileAttributes.Directory;
+
+            // If you turn off indexing in Windows this will have the attribute:
+            // `FileAttributes.Directory | FileAttributes.NotContentIndexed`
+            return (dirInfo.Attributes & FileAttributes.Directory) != 0;
         }
 
         // this is an internal class for passing stylesheet data from the client to the controller while editing

From e21cc6f97eb1d49e2f0060186b57680e4ef44a59 Mon Sep 17 00:00:00 2001
From: Rachel Breeze <RachBreeze@users.noreply.github.com>
Date: Sat, 10 Apr 2021 01:34:18 +0100
Subject: [PATCH 191/202] Accessibility: Adding label fors and control ids for
 the macro picker (#10101)

* Added support for screeen reader alerts on the embed so that assitive technology knows when a url retrieve has been succesfull.
Added labels for the controls
Preview reload only triggered if the values for height and width change

* Added support for label fors for the macro picker and also gave the ,acro search box a title

* Now displays a count of the matching macros returned. Please note the language file amends shared with #10100

* Removed src-only class for the display of the count of messages
---
 .../macropicker/macropicker.controller.js     | 31 +++++++++++++++++--
 .../macropicker/macropicker.html              | 24 +++++++-------
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js
index 40338f2dca..1701553efc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js
@@ -1,12 +1,13 @@
 function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper, localizationService) {
 
     $scope.macros = [];
+    $scope.a11yInfo = "";
     $scope.model.selectedMacro = null;
     $scope.model.macroParams = [];
-
+    $scope.displayA11YMessageForFilter = displayA11YMessageForFilter;
     $scope.wizardStep = "macroSelect";
     $scope.noMacroParams = false;
-
+    $scope.model.searchTerm = "";
     function onInit() {
         if (!$scope.model.title) {
             localizationService.localize("defaultdialogs_selectMacro").then(function (value) {
@@ -49,6 +50,7 @@ function MacroPickerController($scope, entityResource, macroResource, umbPropEdi
                         $scope.model.submit($scope.model);
                     } else {
                         $scope.wizardStep = 'macroSelect';
+                        displayA11yMessages($scope.macros);
                     }
 
                 } else {
@@ -95,6 +97,28 @@ function MacroPickerController($scope, entityResource, macroResource, umbPropEdi
             });
     }
 
+    function displayA11yMessages(macros) {
+        if ($scope.noMacroParams || !macros || macros.length === 0)
+            localizationService.localize("general_searchNoResult").then(function (value) {
+                $scope.a11yInfo = value;
+            });
+        else if (macros) {
+            if (macros.length === 1) {
+                localizationService.localize("treeSearch_searchResult").then(function(value) {
+                    $scope.a11yInfo = "1 " + value;
+                });
+            } else {
+                localizationService.localize("treeSearch_searchResults").then(function (value) {
+                    $scope.a11yInfo = macros.length + " " + value;
+                });
+            }
+        }
+    }
+
+    function displayA11YMessageForFilter() {
+        var macros = _.filter($scope.macros, v => v.name.toLowerCase().includes($scope.model.searchTerm.toLowerCase()));
+        displayA11yMessages(macros);
+    }
     //here we check to see if we've been passed a selected macro and if so we'll set the
     //editor to start with parameter editing
     if ($scope.model.dialogData && $scope.model.dialogData.macroData) {
@@ -141,10 +165,11 @@ function MacroPickerController($scope, entityResource, macroResource, umbPropEdi
                 //we don't have a pre-selected macro so ensure the correct step is set
                 $scope.wizardStep = 'macroSelect';
             }
+            displayA11yMessages($scope.macros);
         });
 
     onInit();
-
+    
 }
 
 angular.module("umbraco").controller("Umbraco.Overlays.MacroPickerController", MacroPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
index 33d7a471a5..8bda49b328 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
@@ -16,18 +16,18 @@
                     <div ng-switch="wizardStep">
 
                         <div ng-switch-when="macroSelect" class="macro-select">
-
-                            <umb-search-filter
-                                input-id="macro-search"
-                                model="searchTerm"
-                                label-key="placeholders_filter"
-                                text="Type to filter..."
-                                css-class="w-100 mb-15"
-                                auto-focus="true">
+                            <label for="macro-search" class="sr-only">{{model.title}}</label>
+                            <umb-search-filter input-id="macro-search"
+                                               model="model.searchTerm"
+                                               label-key="placeholders_filter"
+                                               text="Type to filter..."
+                                               css-class="w-100 mb-15"
+                                               on-change="displayA11YMessageForFilter()"
+                                               auto-focus="true">
                             </umb-search-filter>
-
+                            <p ng-bind="a11yInfo" role="alert"></p>
                             <ul class="umb-card-grid -three-in-row">
-                                <li ng-repeat="availableItem in macros | orderBy:'name' | filter:searchTerm">
+                                <li ng-repeat="availableItem in macros | orderBy:'name' | filter:model.searchTerm">
                                     <button class="btn-reset umb-card-grid-item" title="{{availableItem.name}}" ng-click="selectMacro(availableItem)">
                                         <span>
                                             <i class="icon-settings-alt" aria-hidden="true"></i>
@@ -38,7 +38,7 @@
                             </ul>
 
                             <umb-empty-state ng-if="nomacros"
-                                                position="center">
+                                             position="center">
                                 <localize key="defaultdialogs_noMacros">
                                     There are no macros available to insert
                                 </localize>
@@ -53,7 +53,7 @@
                                 <li ng-repeat="param in model.macroParams">
 
                                     <ng-form name="parameterForm">
-                                        <umb-control-group label="{{param.name}}">
+                                        <umb-control-group label="{{param.name}}" alias="{{param.alias}}">
                                             <umb-property-editor model="param"></umb-property-editor>
                                         </umb-control-group>
                                     </ng-form>

From 3b6de9cb9ec3b2b510642379da00a6cea8cb4f3a Mon Sep 17 00:00:00 2001
From: Carole Rennie Logan <crgrieve@users.noreply.github.com>
Date: Fri, 9 Apr 2021 18:43:55 +0100
Subject: [PATCH 192/202] Updating typo

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

diff --git a/src/Umbraco.Core/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs
index f900288ef5..2b6244debb 100644
--- a/src/Umbraco.Core/Constants-Security.cs
+++ b/src/Umbraco.Core/Constants-Security.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core
             /// <summary>
             /// The name of the 'unknown' user.
             /// </summary>
-            public const string UnknownUserName = "SYTEM";
+            public const string UnknownUserName = "SYSTEM";
 
             public const string AdminGroupAlias = "admin";
             public const string EditorGroupAlias = "editor";

From 4f49e57573ba0739fdbade18fee59465fa1aa5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20=C3=96hman?= <dennis.ohman@bjornmamman.se>
Date: Sun, 11 Apr 2021 16:40:13 +0200
Subject: [PATCH 193/202] Removed top-margin from switcher icon

---
 .../src/less/components/editor/umb-variant-switcher.less         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
index 9d2782f184..ce9286e5f5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
@@ -69,7 +69,6 @@ button.umb-variant-switcher__toggle {
 
 .umb-variant-switcher__expand {
     color: @ui-action-discreet-type;
-	margin-top: 3px;
 	margin-left: 5px;
 	margin-right: -5px;
     transition: color 0.2s ease-in-out;

From c8b6841ef16e40670a89ba8a84aa21b2d066e9a3 Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Tue, 13 Apr 2021 02:10:44 +0100
Subject: [PATCH 194/202] Allow KeepAlive controller Ping method to be
 requested by non local requests (#10126)

* Allow KeepAlive controller Ping method to be requested by non local requests and accept head requests

* removed unused references
---
 src/Umbraco.Web/Editors/KeepAliveController.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Editors/KeepAliveController.cs b/src/Umbraco.Web/Editors/KeepAliveController.cs
index 23815e1bbe..f29ee6c60a 100644
--- a/src/Umbraco.Web/Editors/KeepAliveController.cs
+++ b/src/Umbraco.Web/Editors/KeepAliveController.cs
@@ -1,14 +1,12 @@
 using System.Runtime.Serialization;
 using System.Web.Http;
-using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.Editors
 {
     public class KeepAliveController : UmbracoApiController
     {
-        [OnlyLocalRequests]
+        [HttpHead]
         [HttpGet]
         public KeepAlivePingResult Ping()
         {

From 0dfefb72cb90bb8f2e35a2a78ecbbe17396b6ef1 Mon Sep 17 00:00:00 2001
From: Arkadiusz Biel <abi@novicell.co.uk>
Date: Sat, 31 Oct 2020 22:09:39 +0000
Subject: [PATCH 195/202] use v8 branch as default for API Docs

---
 src/ApiDocs/docfx.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json
index 76677d45d5..8283b351c4 100644
--- a/src/ApiDocs/docfx.json
+++ b/src/ApiDocs/docfx.json
@@ -50,6 +50,7 @@
     ],
     "globalMetadata": {
       "_appTitle": "Umbraco c# Api docs",
+      "branch": "v8/contrib",
       "_enableSearch": true,
       "_disableContribution": false
     },

From c885831e02a8c2e4b312dec48945ca5d491130a6 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 22 Apr 2021 16:34:11 +0200
Subject: [PATCH 196/202] Revert "use v8 branch as default for API Docs"

This reverts commit 0dfefb72cb90bb8f2e35a2a78ecbbe17396b6ef1.
---
 src/ApiDocs/docfx.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json
index 8283b351c4..76677d45d5 100644
--- a/src/ApiDocs/docfx.json
+++ b/src/ApiDocs/docfx.json
@@ -50,7 +50,6 @@
     ],
     "globalMetadata": {
       "_appTitle": "Umbraco c# Api docs",
-      "branch": "v8/contrib",
       "_enableSearch": true,
       "_disableContribution": false
     },

From 22afe5e341372540357ed2380f125e6b1b9e2913 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 26 Apr 2021 15:40:46 +1000
Subject: [PATCH 197/202] Adds cold boot restart to load test proj

---
 src/Umbraco.TestData/LoadTestComponent.cs    | 35 ++++++++++++++
 src/Umbraco.TestData/LoadTestComposer.cs     | 29 +++++++++++
 src/Umbraco.TestData/LoadTestController.cs   | 51 +++++---------------
 src/Umbraco.TestData/Umbraco.TestData.csproj |  2 +
 4 files changed, 77 insertions(+), 40 deletions(-)
 create mode 100644 src/Umbraco.TestData/LoadTestComponent.cs
 create mode 100644 src/Umbraco.TestData/LoadTestComposer.cs

diff --git a/src/Umbraco.TestData/LoadTestComponent.cs b/src/Umbraco.TestData/LoadTestComponent.cs
new file mode 100644
index 0000000000..97c006520d
--- /dev/null
+++ b/src/Umbraco.TestData/LoadTestComponent.cs
@@ -0,0 +1,35 @@
+using System.Web.Mvc;
+using System.Web.Routing;
+using Umbraco.Core.Composing;
+using System.Configuration;
+
+// see https://github.com/Shazwazza/UmbracoScripts/tree/master/src/LoadTesting
+
+namespace Umbraco.TestData
+{
+    public class LoadTestComponent : IComponent
+    {
+        public void Initialize()
+        {
+            if (ConfigurationManager.AppSettings["Umbraco.TestData.Enabled"] != "true")
+                return;
+
+
+
+            RouteTable.Routes.MapRoute(
+               name: "LoadTest",
+               url: "LoadTest/{action}",
+               defaults: new
+               {
+                   controller = "LoadTest",
+                   action = "Index"
+               },
+               namespaces: new[] { "Umbraco.TestData" }
+           );
+        }
+
+        public void Terminate()
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.TestData/LoadTestComposer.cs b/src/Umbraco.TestData/LoadTestComposer.cs
new file mode 100644
index 0000000000..2c5e404642
--- /dev/null
+++ b/src/Umbraco.TestData/LoadTestComposer.cs
@@ -0,0 +1,29 @@
+using Umbraco.Core.Composing;
+using System.Configuration;
+using Umbraco.Web.PublishedCache.NuCache;
+
+// see https://github.com/Shazwazza/UmbracoScripts/tree/master/src/LoadTesting
+
+namespace Umbraco.TestData
+{
+    public class LoadTestComposer : ComponentComposer<LoadTestComponent>, IUserComposer
+    {
+        public override void Compose(Composition composition)
+        {
+            base.Compose(composition);
+
+            if (ConfigurationManager.AppSettings["Umbraco.TestData.Enabled"] != "true")
+                return;
+
+            composition.Register(typeof(LoadTestController), Lifetime.Request);
+
+            if (ConfigurationManager.AppSettings["Umbraco.TestData.IgnoreLocalDb"] == "true")
+            {
+                composition.Register(factory => new PublishedSnapshotServiceOptions
+                {
+                    IgnoreLocalDb = true
+                });
+            }   
+        }
+    }
+}
diff --git a/src/Umbraco.TestData/LoadTestController.cs b/src/Umbraco.TestData/LoadTestController.cs
index 97665dd084..8e1faf56d1 100644
--- a/src/Umbraco.TestData/LoadTestController.cs
+++ b/src/Umbraco.TestData/LoadTestController.cs
@@ -6,10 +6,9 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Models;
 using System.Web;
 using System.Web.Hosting;
-using System.Web.Routing;
 using System.Diagnostics;
-using Umbraco.Core.Composing;
-using System.Configuration;
+using Umbraco.Core.IO;
+using System.IO;
 
 // see https://github.com/Shazwazza/UmbracoScripts/tree/master/src/LoadTesting
 
@@ -261,6 +260,15 @@ namespace Umbraco.TestData
             HttpRuntime.UnloadAppDomain();
         }
 
+        public ActionResult ColdBootRestart()
+        {
+            Directory.Delete(IOHelper.MapPath("~/App_Data/TEMP/DistCache"), true);
+
+            DoRestart();
+
+            return Content("Cold Boot Restarted.");
+        }
+
         public ActionResult Restart()
         {
             DoRestart();
@@ -331,41 +339,4 @@ namespace Umbraco.TestData
             return t;
         }
     }
-
-    public class TestComponent : IComponent
-    {
-        public void Initialize()
-        {
-            if (ConfigurationManager.AppSettings["Umbraco.TestData.Enabled"] != "true")
-                return;
-
-            RouteTable.Routes.MapRoute(
-               name: "LoadTest",
-               url: "LoadTest/{action}",
-               defaults: new
-               {
-                   controller = "LoadTest",
-                   action = "Index"
-               },
-               namespaces: new[] { "Umbraco.TestData" }
-           );
-        }
-
-        public void Terminate()
-        {
-        }
-    }
-
-    public class TestComposer : ComponentComposer<TestComponent>, IUserComposer
-    {
-        public override void Compose(Composition composition)
-        {
-            base.Compose(composition);
-
-            if (ConfigurationManager.AppSettings["Umbraco.TestData.Enabled"] != "true")
-                return;
-
-            composition.Register(typeof(LoadTestController), Lifetime.Request);
-        }
-    }
 }
diff --git a/src/Umbraco.TestData/Umbraco.TestData.csproj b/src/Umbraco.TestData/Umbraco.TestData.csproj
index a3753cc17b..113d209ef4 100644
--- a/src/Umbraco.TestData/Umbraco.TestData.csproj
+++ b/src/Umbraco.TestData/Umbraco.TestData.csproj
@@ -41,6 +41,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="LoadTestComponent.cs" />
+    <Compile Include="LoadTestComposer.cs" />
     <Compile Include="LoadTestController.cs" />
     <Compile Include="SegmentTestController.cs" />
     <Compile Include="UmbracoTestDataController.cs" />

From 4ade2264d2da7ae38112a6aaad6b101c6f56c87e Mon Sep 17 00:00:00 2001
From: Anders Bjerner <abjerner@skybrud.dk>
Date: Thu, 22 Apr 2021 19:25:59 +0200
Subject: [PATCH 198/202] Minor Danish translations

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

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 39a6fee671..9e564635fa 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -804,12 +804,12 @@
     <key alias="showShortcuts">Vis genveje</key>
     <key alias="toggleListView">Brug listevisning</key>
     <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
-    <key alias="commentLine">Comment/Uncomment lines</key>
-    <key alias="removeLine">Remove line</key>
-    <key alias="copyLineUp">Copy Lines Up</key>
-    <key alias="copyLineDown">Copy Lines Down</key>
-    <key alias="moveLineUp">Move Lines Up</key>
-    <key alias="moveLineDown">Move Lines Down</key>
+    <key alias="commentLine">Lommentér/Udkommentér linjer</key>
+    <key alias="removeLine">Slet linje</key>
+    <key alias="copyLineUp">Kopiér linjer op</key>
+    <key alias="copyLineDown">Kopiér linjer ned</key>
+    <key alias="moveLineUp">Flyt linjer op</key>
+    <key alias="moveLineDown">Flyt linjer ned</key>
     <key alias="generalHeader">Generelt</key>
     <key alias="editorHeader">Editor</key>
     <key alias="toggleAllowCultureVariants">Skift tillad sprogvarianter</key>

From e7a3fd37ce9b00097a45825ed46da692023a94bc Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 27 Apr 2021 14:57:17 +0200
Subject: [PATCH 199/202] Revert "Fixed copy preserving sort order (#10091)"

This reverts commit 26d11a83141abc5e4d94c24e733cdca768d1a6f1.
---
 .../Services/Implement/ContentService.cs      | 10 +++----
 .../Services/ContentServiceTests.cs           | 26 -------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index d8e99663ea..e5363d0e2b 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1415,7 +1415,7 @@ namespace Umbraco.Core.Services.Implement
 
                         var result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs.Value, d.WriterId);
                         if (result.Success == false)
-                            Logger.Error<ContentService, int, PublishResultType>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
+                            Logger.Error<ContentService,int,PublishResultType>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
                         results.Add(result);
 
                     }
@@ -2201,7 +2201,7 @@ namespace Umbraco.Core.Services.Implement
                     while (page * pageSize < total)
                     {
                         var descendants = GetPagedDescendants(content.Id, page++, pageSize, out total);
-                        foreach (var descendant in descendants.OrderBy(x => x.Level).ThenBy(y => y.SortOrder))
+                        foreach (var descendant in descendants)
                         {
                             // if parent has not been copied, skip, else gets its copy id
                             if (idmap.TryGetValue(descendant.ParentId, out parentId) == false) continue;
@@ -2420,7 +2420,7 @@ namespace Umbraco.Core.Services.Implement
                 if (report.FixedIssues.Count > 0)
                 {
                     //The event args needs a content item so we'll make a fake one with enough properties to not cause a null ref
-                    var root = new Content("root", -1, new ContentType(-1)) { Id = -1, Key = Guid.Empty };
+                    var root = new Content("root", -1, new ContentType(-1)) {Id = -1, Key = Guid.Empty};
                     scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>.EventArgs(new TreeChange<IContent>(root, TreeChangeTypes.RefreshAll)));
                 }
 
@@ -3169,7 +3169,7 @@ namespace Umbraco.Core.Services.Implement
                 if (rollbackSaveResult.Success == false)
                 {
                     //Log the error/warning
-                    Logger.Error<ContentService, int, int, int>("User '{UserId}' was unable to rollback content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                    Logger.Error<ContentService,int,int,int>("User '{UserId}' was unable to rollback content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
                 }
                 else
                 {
@@ -3178,7 +3178,7 @@ namespace Umbraco.Core.Services.Implement
                     scope.Events.Dispatch(RolledBack, this, rollbackEventArgs);
 
                     //Logging & Audit message
-                    Logger.Info<ContentService, int, int, int>("User '{UserId}' rolled back content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
+                    Logger.Info<ContentService,int,int,int>("User '{UserId}' rolled back content '{ContentId}' to version '{VersionId}'", userId, id, versionId);
                     Audit(AuditType.RollBack, userId, id, $"Content '{content.Name}' was rolled back to version '{versionId}'");
                 }
 
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 0faa4af316..008c24fcbf 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -2082,32 +2082,6 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual("world", copiedTags[1].Text);
         }
 
-        [Test]
-        public void Copy_Recursive_Preserves_Sort_Order()
-        {
-            // Arrange
-            var contentService = ServiceContext.ContentService;
-            var temp = contentService.GetById(NodeDto.NodeIdSeed + 2);
-            Assert.AreEqual("Home", temp.Name);
-            Assert.AreEqual(3, contentService.CountChildren(temp.Id));
-            var reversedChildren = contentService.GetPagedChildren(temp.Id, 0, 10, out var total1).Reverse().ToArray();
-            contentService.Sort(reversedChildren);
-
-            // Act
-            var copy = contentService.Copy(temp, temp.ParentId, false, true, Constants.Security.SuperUserId);
-            var content = contentService.GetById(NodeDto.NodeIdSeed + 2);
-
-            // Assert
-            Assert.That(copy, Is.Not.Null);
-            Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
-            Assert.AreNotSame(content, copy);
-            Assert.AreEqual(3, contentService.CountChildren(copy.Id));
-
-            var copiedChildren = contentService.GetPagedChildren(copy.Id, 0, 10, out var total2).OrderBy(c => c.SortOrder).ToArray();
-            Assert.AreEqual(reversedChildren.First().Name, copiedChildren.First().Name);
-            Assert.AreEqual(reversedChildren.Last().Name, copiedChildren.Last().Name);
-        }
-
         [Test]
         public void Can_Rollback_Version_On_Content()
         {

From b783399c5cd730cfcbff3fdcedf2f7a4ab2eb25c Mon Sep 17 00:00:00 2001
From: Mike Chambers <mistyn8@users.noreply.github.com>
Date: Tue, 27 Apr 2021 13:56:31 +0100
Subject: [PATCH 200/202] Update ModelsBuilderComposer.cs

issue #10186

typo in IsExternalModelsBuilderInstalled -> Umbraco.ModelsBuider
---
 .../Compose/ModelsBuilderComposer.cs                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index 01010cca66..fee9b6f62e 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -47,7 +47,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
         {
             var assemblyNames = new[]
             {
-                "Umbraco.ModelsBuider",
+                "Umbraco.ModelsBuilder",
                 "ModelsBuilder.Umbraco"
             };
 

From 349c5ac3ab56fe0cc6c0bb3abd0d6ad314fd2bf6 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 21 Mar 2021 15:14:01 +0100
Subject: [PATCH 201/202] Fix issue with active style affected nested block
 list elements

---
 .../inlineblock/inlineblock.editor.less       | 28 +++++++++++--------
 .../umb-block-list-property-editor.html       |  1 -
 .../blocklist/umbblocklistblock.component.js  |  4 +--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less
index 45a4c08598..12862d8f41 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less
@@ -45,18 +45,6 @@
         }
     }
 
-    .umb-block-list__block.--active & {
-        border-color: @gray-8;
-        box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.05);
-
-        > button {
-            > .caret {
-                transform: rotate(0deg);
-            }
-        }
-    }
-
-    
     ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > .umb-block-list__block--content > div > & {
         > button {
             color: @formErrorText;
@@ -104,6 +92,22 @@
     }
 }
 
+.umb-block-list__block.--active {
+    border-color: @gray-8;
+    box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.05);
+
+    > .umb-block-list__block--content {
+        > .umb-block-list__block--view  {
+            > .blockelement-inlineblock-editor {
+                > button {
+                    > .caret {
+                        transform: rotate(0deg);
+                    }
+                }
+            }
+        }
+    }
+}
 
 .blockelement-inlineblock-editor__inner {
     border-top: 1px solid @gray-8;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
index 9726daf5e6..38959da6ba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
@@ -61,5 +61,4 @@
         model="vm.blockTypePicker">
     </umb-overlay>
 
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
index 285437b011..1027b82e51 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
@@ -59,12 +59,12 @@
                     <style>
                     @import "${model.stylesheet}"
                     </style>
-                    <div ng-include="'${model.view}'"></div>
+                    <div class="umb-block-list__block--view" ng-include="'${model.view}'"></div>
                 `;
                 $compile(shadowRoot)($scope);
             }
             else {
-                $element.append($compile('<div ng-include="model.view"></div>')($scope));
+                $element.append($compile('<div class="umb-block-list__block--view" ng-include="model.view"></div>')($scope));
             }
         };
 

From 727be420ff0d7732c19efc395b9ab75ed65ab3b2 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 30 Mar 2021 17:33:33 +0200
Subject: [PATCH 202/202] Use umb-icon component in listview dropdown

---
 .../src/views/propertyeditors/listview/listview.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 1f66d324df..dc226ec307 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -31,12 +31,12 @@
                        <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
                            <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
                                 <button type="button" ng-click="createBlank(entityType,contentType.alias)">
-                                    <i class="{{::contentType.icon}}" aria-hidden="true"></i>
+                                    <umb-icon icon="{{::contentType.icon}}" class="{{::contentType.icon}}"></umb-icon>
                                     {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
                                 </button>
 
                                 <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)">
-                                    &nbsp;&nbsp;<i class="{{::contentType.icon}}" aria-hidden="true"></i>
+                                    &nbsp;&nbsp;<umb-icon icon="{{::contentType.icon}}" class="{{::contentType.icon}}"></umb-icon>
                                     {{::blueprint.name}}
                                 </button>
                             </umb-dropdown-item>
@@ -53,12 +53,12 @@
                        <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
                            <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
                                <button type="button" ng-click="createBlank(entityType,contentType.alias)">
-                                   <i class="{{::contentType.icon}}" aria-hidden="true"></i>
+                                   <umb-icon icon="{{::contentType.icon}}" class="{{::contentType.icon}}"></umb-icon>
                                    {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
                                </button>
 
                                <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)">
-                                   &nbsp;&nbsp;<i class="{{::contentType.icon}}" aria-hidden="true"></i>
+                                   &nbsp;&nbsp;<umb-icon icon="{{::contentType.icon}}" class="{{::contentType.icon}}"></umb-icon>
                                    {{::blueprint.name}}
                                </button>
                            </umb-dropdown-item>
@@ -69,7 +69,7 @@
 
                        <li ng-repeat="blueprint in docType.blueprints track by blueprint.id | orderBy:'name':false">
                            <button type="button" ng-click="createFromBlueprint(blueprint.id)">
-                               <i class="large {{docType.icon}}" aria-hidden="true"></i>
+                               <umb-icon icon="{{docType.icon}}" class="{{docType.icon}} large"></umb-icon>
                                <span class="menu-label">
                                    {{blueprint.name}}&nbsp;
                                </span>
@@ -78,7 +78,7 @@
 
                        <li class="sep" ng-show="allowBlank">
                            <button type="button" ng-click="createBlank(docType)">
-                               <i class="large {{docType.icon}}" aria-hidden="true"></i>
+                               <umb-icon icon="{{docType.icon}}" class="{{docType.icon}} large"></umb-icon>
                                <span class="menu-label">
                                    <localize key="blueprints_blankBlueprint">Blank</localize>
                                </span>