Merge branch 'v12/dev' into v12/feature/headless

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs

src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs

@@ -195,7 +195,7 @@ private void InitializeLocked()
             _contentApiCacheLevel = _converter is IContentApiPropertyValueConverter contentApiConverter
                 ? contentApiConverter.GetPropertyContentApiCacheLevel(this)
                 : _cacheLevel;
-            _modelClrType = _converter == null ? typeof (object) : _converter.GetPropertyValueType(this);
+            _modelClrType = _converter?.GetPropertyValueType(this) ?? typeof(object);
         }
 
         /// <inheritdoc />

src/Umbraco.Core/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs

@@ -10,7 +10,7 @@
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 
-internal class ContentPickerValueConverter : PropertyValueConverterBase, IContentApiPropertyValueConverter
+public class ContentPickerValueConverter : PropertyValueConverterBase, IContentApiPropertyValueConverter
 {
     private static readonly List<string> PropertiesToExclude = new()
     {

src/Umbraco.Core/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs

@@ -15,6 +15,7 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 ///     The media picker property value converter.
 /// </summary>
 [DefaultPropertyValueConverter]
+[Obsolete("Please use the MediaPicker3 instead, will be removed in V13")]
 public class MediaPickerValueConverter : PropertyValueConverterBase, IContentApiPropertyValueConverter
 {
     // hard-coding "image" here but that's how it works at UI level too
@@ -23,7 +24,7 @@ public class MediaPickerValueConverter : PropertyValueConverterBase, IContentApi
     private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
     private readonly IApiMediaBuilder _apiMediaBuilder;
 
-    [Obsolete("Use constructor that takes all parameters, scheduled for removal in V14")]
+    [Obsolete("Use constructor that takes all parameters, scheduled for removal in V13")]
     public MediaPickerValueConverter(
         IPublishedSnapshotAccessor publishedSnapshotAccessor,
         IPublishedModelFactory publishedModelFactory)

src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs

@@ -21,12 +21,13 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 ///     content.
 /// </summary>
 [DefaultPropertyValueConverter(typeof(JsonValueConverter))]
-public class NestedContentManyValueConverter : NestedContentValueConverterBase, IContentApiPropertyValueConverter
+[Obsolete("Nested content is obsolete, will be removed in V13")]
+public class NestedContentManyValueConverter : NestedContentValueConverterBase
 {
     private readonly IProfilingLogger _proflog;
     private readonly IApiElementBuilder _apiElementBuilder;
 
-    [Obsolete("Use constructor that takes all parameters, scheduled for removal in V14")]
+    [Obsolete("Use constructor that takes all parameters, scheduled for removal in V13")]
     public NestedContentManyValueConverter(
         IPublishedSnapshotAccessor publishedSnapshotAccessor,
         IPublishedModelFactory publishedModelFactory,
@@ -40,9 +41,9 @@ public NestedContentManyValueConverter(
     }
 
     /// <summary>
-    ///     Initializes a new instance of the <see cref="NestedContentSingleValueConverter" /> class.
+    ///     Initializes a new instance of the <see cref="NestedContentManyValueConverter" /> class.
     /// </summary>
-    public NestedContentManyValueConverter (
+    public NestedContentManyValueConverter(
         IPublishedSnapshotAccessor publishedSnapshotAccessor,
         IPublishedModelFactory publishedModelFactory,
         IProfilingLogger proflog,

src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs

@@ -20,12 +20,13 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 ///     content.
 /// </summary>
 [DefaultPropertyValueConverter(typeof(JsonValueConverter))]
+[Obsolete("Nested content is obsolete, will be removed in V13")]
 public class NestedContentSingleValueConverter : NestedContentValueConverterBase, IContentApiPropertyValueConverter
 {
     private readonly IProfilingLogger _proflog;
     private readonly IApiElementBuilder _apiElementBuilder;
 
-    [Obsolete("Use constructor that takes all parameters, scheduled for removal in V14")]
+    [Obsolete("Use constructor that takes all parameters, scheduled for removal in V13")]
     public NestedContentSingleValueConverter(
         IPublishedSnapshotAccessor publishedSnapshotAccessor,
         IPublishedModelFactory publishedModelFactory,