Merge remote-tracking branch 'upstream/master' into UrlDecoding

1 files changed, 9 insertions, 7 deletions

diff --git a/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs b/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
index 67acdd9a3..e77593a03 100644
--- a/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 
@@ -11,22 +13,22 @@ namespace MediaBrowser.Controller.Resolvers
         where T : BaseItem, new()
     {
         /// <summary>
+        /// Gets the priority.
+        /// </summary>
+        /// <value>The priority.</value>
+        public virtual ResolverPriority Priority => ResolverPriority.First;
+
+        /// <summary>
         /// Resolves the specified args.
         /// </summary>
         /// <param name="args">The args.</param>
         /// <returns>`0.</returns>
-        protected virtual T Resolve(ItemResolveArgs args)
+        public virtual T Resolve(ItemResolveArgs args)
         {
             return null;
         }
 
         /// <summary>
-        /// Gets the priority.
-        /// </summary>
-        /// <value>The priority.</value>
-        public virtual ResolverPriority Priority => ResolverPriority.First;
-
-        /// <summary>
         /// Sets initial values on the newly resolved item.
         /// </summary>
         /// <param name="item">The item.</param>