From 9e95fe8f9d402ec178024be962115abd6033fb51 Mon Sep 17 00:00:00 2001
From: David <daullmer@gmail.com>
Date: Tue, 11 Aug 2020 17:04:11 +0200
Subject: Add plugin assemblies to mvc builder

---
 .../Extensions/ApiServiceCollectionExtensions.cs           | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs')

diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index d25d1ae895..13c2d6055d 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -20,8 +20,6 @@ using Jellyfin.Server.Formatters;
 using Jellyfin.Server.Models;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Json;
-using MediaBrowser.Common.Plugins;
-using MediaBrowser.Controller;
 using MediaBrowser.Model.Entities;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
@@ -179,18 +177,14 @@ namespace Jellyfin.Server.Extensions
 
                     // From JsonDefaults.PascalCase
                     options.JsonSerializerOptions.PropertyNamingPolicy = jsonOptions.PropertyNamingPolicy;
-                })
-                .AddControllersAsServices();
+                });
 
-            if (applicationHost.Plugins != null)
+            foreach (Assembly pluginAssembly in applicationHost.GetApiPluginAssemblies())
             {
-                foreach (IPlugin plugin in applicationHost.Plugins)
-                {
-                    mvcBuilder.AddApplicationPart(plugin.GetType().Assembly);
-                }
+                mvcBuilder.AddApplicationPart(pluginAssembly);
             }
 
-            return mvcBuilder;
+            return mvcBuilder.AddControllersAsServices();
         }
 
         /// <summary>
-- 
cgit v1.2.3