From e558d11fa9758041b2ad9ffbe28722c57c21bd57 Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Tue, 24 Aug 2021 14:42:08 +0100
Subject: [PATCH 1/3] Revert "Optimization by returning the same instance"

This reverts commit 990fc118cbd6df423be2107a75970a834ade1f76.

When using the _reusableEditor field to create a BlockEditorPropertyEditor
it doesn't matter that content type cache has been invalidated (memory cache)
as the content types are also cached in a private field in the BlockEditorValues class.

Closes #10910

(cherry picked from commit 94b0b252ece607c9ea6fff4e417635623ee1803e)
---
 src/Umbraco.Core/PropertyEditors/DataEditor.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/DataEditor.cs b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
index d927d10052..add523ecf6 100644
--- a/src/Umbraco.Core/PropertyEditors/DataEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
@@ -19,7 +19,6 @@ namespace Umbraco.Core.PropertyEditors
     public class DataEditor : IDataEditor
     {
         private IDictionary<string, object> _defaultConfiguration;
-        private IDataValueEditor _reusableEditor;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DataEditor"/> class.
@@ -91,8 +90,7 @@ namespace Umbraco.Core.PropertyEditors
         /// simple enough for now.</para>
         /// </remarks>
         // TODO: point of that one? shouldn't we always configure?
-        public IDataValueEditor GetValueEditor() => ExplicitValueEditor ?? (_reusableEditor ?? (_reusableEditor = CreateValueEditor()));
-
+        public IDataValueEditor GetValueEditor() => ExplicitValueEditor ?? CreateValueEditor();
 
         /// <inheritdoc />
         /// <remarks>

From cac4124dea2637177824734148636a1ebcfc9688 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 30 Aug 2021 11:12:45 +0200
Subject: [PATCH 2/3] Bump version to 8.14.4

---
 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 b9bbd54c8e..c3b38dd2d8 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.14.3")]
-[assembly: AssemblyInformationalVersion("8.14.3")]
+[assembly: AssemblyFileVersion("8.14.4")]
+[assembly: AssemblyInformationalVersion("8.14.4")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 95ba9de0ca..c2e3daf779 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>8143</DevelopmentServerPort>
+          <DevelopmentServerPort>8144</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8143</IISUrl>
+          <IISUrl>http://localhost:8144</IISUrl>
           <DevelopmentServerPort>8131</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:8131</IISUrl>

From ee1faa4da2f0077c8f7fa6caf783b31771313f5e Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 30 Aug 2021 11:15:11 +0200
Subject: [PATCH 3/3] Bump version to 8.15.3

---
 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 ff286570c3..9e6adabf97 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.15.2")]
-[assembly: AssemblyInformationalVersion("8.15.2")]
+[assembly: AssemblyFileVersion("8.15.3")]
+[assembly: AssemblyInformationalVersion("8.15.3")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 56ed9483fe..5faecbe755 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>8152</DevelopmentServerPort>
+          <DevelopmentServerPort>8153</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8152</IISUrl>
+          <IISUrl>http://localhost:8153</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>