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/MediaRepository.cs

@@ -13,6 +13,7 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using static Umbraco.Core.Persistence.SqlExtensionsStatics;
 
@@ -26,6 +27,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         private readonly IMediaTypeRepository _mediaTypeRepository;
         private readonly ITagRepository _tagRepository;
         private readonly MediaUrlGeneratorCollection _mediaUrlGenerators;
+        private readonly IJsonSerializer _serializer;
         private readonly MediaByGuidReadRepository _mediaByGuidReadRepository;
 
         public MediaRepository(
@@ -41,12 +43,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             Lazy<PropertyEditorCollection> propertyEditorCollection,
             MediaUrlGeneratorCollection mediaUrlGenerators,
             DataValueReferenceFactoryCollection dataValueReferenceFactories,
-            IDataTypeService dataTypeService)
+            IDataTypeService dataTypeService,
+            IJsonSerializer serializer)
             : base(scopeAccessor, cache, logger, languageRepository, relationRepository, relationTypeRepository, propertyEditorCollection, dataValueReferenceFactories, dataTypeService)
         {
             _mediaTypeRepository = mediaTypeRepository ?? throw new ArgumentNullException(nameof(mediaTypeRepository));
             _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
             _mediaUrlGenerators = mediaUrlGenerators;
+            _serializer = serializer;
             _mediaByGuidReadRepository = new MediaByGuidReadRepository(this, scopeAccessor, cache, loggerFactory.CreateLogger<MediaByGuidReadRepository>());
         }
 
@@ -297,7 +301,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             InsertPropertyValues(entity, 0, out _, out _);
 
             // set tags
-            SetEntityTags(entity, _tagRepository);
+            SetEntityTags(entity, _tagRepository, _serializer);
 
             PersistRelations(entity);
 
@@ -359,7 +363,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 // replace the property data
                 ReplacePropertyValues(entity, entity.VersionId, 0, out _, out _);
 
-                SetEntityTags(entity, _tagRepository);
+                SetEntityTags(entity, _tagRepository, _serializer);
 
                 PersistRelations(entity);
             }