Merge pull request #864 from joshuaboniface/zipped-plugins

Add support for ZIP plugin archives

1 files changed, 5 insertions, 5 deletions

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index bb475eb2c7..3538244064 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -564,7 +564,7 @@ namespace Emby.Server.Implementations
         {
             try
             {
-                var assembly = Assembly.Load(File.ReadAllBytes(file));
+                var assembly = Assembly.LoadFrom(file);
 
                 return new Tuple<Assembly, string>(assembly, file);
             }
@@ -777,12 +777,12 @@ namespace Emby.Server.Implementations
             SocketFactory = new SocketFactory();
             RegisterSingleInstance(SocketFactory);
 
-            InstallationManager = new InstallationManager(LoggerFactory, this, ApplicationPaths, HttpClient, JsonSerializer, ServerConfigurationManager, FileSystemManager, CryptographyProvider, PackageRuntime);
-            RegisterSingleInstance(InstallationManager);
-
             ZipClient = new ZipClient(FileSystemManager);
             RegisterSingleInstance(ZipClient);
 
+            InstallationManager = new InstallationManager(LoggerFactory, this, ApplicationPaths, HttpClient, JsonSerializer, ServerConfigurationManager, FileSystemManager, CryptographyProvider, ZipClient, PackageRuntime);
+            RegisterSingleInstance(InstallationManager);
+
             HttpResultFactory = new HttpResultFactory(LoggerFactory, FileSystemManager, JsonSerializer, CreateBrotliCompressor());
             RegisterSingleInstance(HttpResultFactory);
 
@@ -1603,7 +1603,7 @@ namespace Emby.Server.Implementations
         {
             try
             {
-                return FilterAssembliesToLoad(Directory.EnumerateFiles(path, "*.dll", SearchOption.TopDirectoryOnly))
+                return FilterAssembliesToLoad(Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories))
                     .Select(LoadAssembly)
                     .Where(a => a != null)
                     .ToList();