Skip to content

Commit

Permalink
fix compat with 10.6
Browse files Browse the repository at this point in the history
  • Loading branch information
crobibero committed Jul 6, 2020
1 parent 288d93d commit 9e41096
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
################################################################################
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

/.vs/LDAP-Auth/v15/Server/sqlite3
*/obj
*/bin
/LDAP-Auth.sln.DotSettings.user
/bin/Debug/netstandard2.0
/bin
/.vs/LDAP-Auth/v15
.idea
2 changes: 1 addition & 1 deletion LDAP-Auth/LDAP-Auth.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Jellyfin.Controller" Version="10.*" />
<PackageReference Include="Jellyfin.Controller" Version="10.*-*" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.2.0" />
</ItemGroup>

Expand Down
4 changes: 3 additions & 1 deletion LDAP-Auth/LDAPAuthenticationProviderPlugin.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using System.Security.Authentication;
using System.Threading.Tasks;
using Jellyfin.Data.Entities;
using Jellyfin.Data.Enums;
using Jellyfin.Plugin.LDAP_Auth.Config;
using MediaBrowser.Controller.Authentication;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using Microsoft.Extensions.Logging;
using Novell.Directory.Ldap;
Expand All @@ -16,7 +18,7 @@ namespace Jellyfin.Plugin.LDAP_Auth
public class LdapAuthenticationProviderPlugin : IAuthenticationProvider
{
private readonly PluginConfiguration _config;
private readonly ILogger _logger;
private readonly ILogger<LdapAuthenticationProviderPlugin> _logger;
private readonly IUserManager _userManager;

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions LDAP-Auth/LdapPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class LdapPlugin : BasePlugin<PluginConfiguration>, IHasWebPages
/// <param name="applicationPaths">Instance of the <see cref="IApplicationPaths"/> interface.</param>
/// <param name="xmlSerializer">Instance of the <see cref="IXmlSerializer"/>interface.</param>
/// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
public LdapPlugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer, ILogger<LdapPlugin> logger) : base(applicationPaths, xmlSerializer)
public LdapPlugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer, ILogger<LdapAuthenticationProviderPlugin> logger) : base(applicationPaths, xmlSerializer)
{
Instance = this;
Logger = logger;
Expand All @@ -34,7 +34,7 @@ public LdapPlugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializ
/// <summary>
/// Gets the logger.
/// </summary>
public static ILogger<LdapPlugin> Logger { get; private set; }
public static ILogger<LdapAuthenticationProviderPlugin> Logger { get; private set; }

/// <inheritdoc />
public override string Name => "LDAP-Auth";
Expand Down

0 comments on commit 9e41096

Please sign in to comment.