Merge branch 'main' into v17/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json

tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs

@@ -138,7 +138,7 @@ public class DataTypeBuilder
         var creatorId = _creatorId ?? 1;
         var databaseType = _databaseType ?? ValueStorageType.Ntext;
         var sortOrder = _sortOrder ?? 0;
-        var serializer = new SystemTextConfigurationEditorJsonSerializer();
+        var serializer = new SystemTextConfigurationEditorJsonSerializer(new DefaultJsonSerializerEncoderFactory());
 
         var dataType = new DataType(editor, serializer, parentId)
         {

tests/Umbraco.Tests.Common/TestHelperBase.cs

@@ -136,7 +136,7 @@ public abstract class TestHelperBase
         }
     }
 
-    public IJsonSerializer JsonSerializer { get; } = new SystemTextJsonSerializer();
+    public IJsonSerializer JsonSerializer { get; } = new SystemTextJsonSerializer(new DefaultJsonSerializerEncoderFactory());
 
     public IVariationContextAccessor VariationContextAccessor { get; } = new TestVariationContextAccessor();
 

tests/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs

@@ -17,7 +17,7 @@ public class MockedValueEditors
 
         return new DataValueEditor(
             Mock.Of<IShortStringHelper>(),
-            new SystemTextJsonSerializer(),
+            new SystemTextJsonSerializer(new DefaultJsonSerializerEncoderFactory()),
             Mock.Of<IIOHelper>(),
             new DataEditorAttribute(name) { ValueType = valueType });
     }