Merge branch 'jellyfin:master' into master

1 files changed, 12 insertions, 16 deletions

diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index 8cdb9695c..272a37df1 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -1,4 +1,8 @@
-using MediaBrowser.Model.Serialization;
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System.Text.Json.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -8,9 +12,15 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public abstract class BasePluginFolder : Folder, ICollectionFolder
     {
-        [IgnoreDataMember]
+        [JsonIgnore]
         public virtual string CollectionType => null;
 
+        [JsonIgnore]
+        public override bool SupportsInheritedParentImages => false;
+
+        [JsonIgnore]
+        public override bool SupportsPeople => false;
+
         public override bool CanDelete()
         {
             return false;
@@ -20,19 +30,5 @@ namespace MediaBrowser.Controller.Entities
         {
             return true;
         }
-
-        [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages => false;
-
-        [IgnoreDataMember]
-        public override bool SupportsPeople => false;
-
-        //public override double? GetDefaultPrimaryImageAspectRatio()
-        //{
-        //    double value = 16;
-        //    value /= 9;
-
-        //    return value;
-        //}
     }
 }