Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller

# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs

@@ -12,6 +12,7 @@ using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Security;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using static Umbraco.Core.Persistence.SqlExtensionsStatics;
 
@@ -25,6 +26,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         private readonly IMemberTypeRepository _memberTypeRepository;
         private readonly ITagRepository _tagRepository;
         private readonly IPasswordHasher _passwordHasher;
+        private readonly IJsonSerializer _serializer;
         private readonly IMemberGroupRepository _memberGroupRepository;
         private readonly IRepositoryCachePolicy<IMember, string> _memberByUsernameCachePolicy;
 
@@ -33,12 +35,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             IPasswordHasher passwordHasher,
             Lazy<PropertyEditorCollection> propertyEditors,
             DataValueReferenceFactoryCollection dataValueReferenceFactories,
-            IDataTypeService dataTypeService)
+            IDataTypeService dataTypeService,
+            IJsonSerializer serializer)
             : base(scopeAccessor, cache, logger, languageRepository, relationRepository, relationTypeRepository, propertyEditors, dataValueReferenceFactories, dataTypeService)
         {
             _memberTypeRepository = memberTypeRepository ?? throw new ArgumentNullException(nameof(memberTypeRepository));
             _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
             _passwordHasher = passwordHasher;
+            _serializer = serializer;
             _memberGroupRepository = memberGroupRepository;
 
             _memberByUsernameCachePolicy = new DefaultRepositoryCachePolicy<IMember, string>(GlobalIsolatedCache, ScopeAccessor, DefaultOptions);
@@ -322,7 +326,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // persist the property data
             InsertPropertyValues(entity, 0, out _, out _);
 
-            SetEntityTags(entity, _tagRepository);
+            SetEntityTags(entity, _tagRepository, _serializer);
 
             PersistRelations(entity);
 
@@ -382,7 +386,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             ReplacePropertyValues(entity, entity.VersionId, 0, out _, out _);
 
-            SetEntityTags(entity, _tagRepository);
+            SetEntityTags(entity, _tagRepository, _serializer);
 
             PersistRelations(entity);