diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2022-10-12 16:36:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 16:36:12 +0200 |
| commit | 99e31846bf38c066fa6817f289757b9202a56e04 (patch) | |
| tree | 0a459be0e9a6e4a3846b596e649cec7e2410e19f /MediaBrowser.Controller | |
| parent | fc78a6c35cb7aaaeba948976073e9610d46538b7 (diff) | |
| parent | 6a6ea7fa1370857e720deaa3c3302355b5988cec (diff) | |
Merge pull request #8541 from Bond-009/minor
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/ItemResolver.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Properties/AssemblyInfo.cs b/MediaBrowser.Controller/Properties/AssemblyInfo.cs index 60e7923091..4cd5c76c1e 100644 --- a/MediaBrowser.Controller/Properties/AssemblyInfo.cs +++ b/MediaBrowser.Controller/Properties/AssemblyInfo.cs @@ -1,5 +1,6 @@ using System.Reflection; using System.Resources; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -14,6 +15,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: NeutralResourcesLanguage("en")] +[assembly: InternalsVisibleTo("Jellyfin.Server.Implementations.Tests")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from diff --git a/MediaBrowser.Controller/Resolvers/ItemResolver.cs b/MediaBrowser.Controller/Resolvers/ItemResolver.cs index 7fd54fcc69..e7bf013fa2 100644 --- a/MediaBrowser.Controller/Resolvers/ItemResolver.cs +++ b/MediaBrowser.Controller/Resolvers/ItemResolver.cs @@ -23,7 +23,7 @@ namespace MediaBrowser.Controller.Resolvers /// </summary> /// <param name="args">The args.</param> /// <returns>`0.</returns> - public virtual T Resolve(ItemResolveArgs args) + protected internal virtual T Resolve(ItemResolveArgs args) { return null; } @@ -42,7 +42,7 @@ namespace MediaBrowser.Controller.Resolvers /// </summary> /// <param name="args">The args.</param> /// <returns>BaseItem.</returns> - BaseItem IItemResolver.ResolvePath(ItemResolveArgs args) + public BaseItem ResolvePath(ItemResolveArgs args) { var item = Resolve(args); |
