Merge branch 'master' into bug/authorization-header-issue

3 files changed, 16 insertions, 9 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>
diff --git a/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs b/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
index bb80e6025..a07b3e898 100644
--- a/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
+++ b/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Model.IO;
 namespace MediaBrowser.Controller.Resolvers
 {
     /// <summary>
-    /// Provides a base "rule" that anyone can use to have paths ignored by the resolver
+    /// Provides a base "rule" that anyone can use to have paths ignored by the resolver.
     /// </summary>
     public interface IResolverIgnoreRule
     {
diff --git a/MediaBrowser.Controller/Resolvers/ResolverPriority.cs b/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
index ac73a5ea8..d4f975b6d 100644
--- a/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
+++ b/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
@@ -26,8 +26,13 @@ namespace MediaBrowser.Controller.Resolvers
         Fourth = 4,
 
         /// <summary>
+        /// The Fifth.
+        /// </summary>
+        Fifth = 5,
+
+        /// <summary>
         /// The last.
         /// </summary>
-        Last = 5
+        Last = 6
     }
 }