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

1 files changed, 7 insertions, 13 deletions

diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 2456da826..094923842 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -1,12 +1,11 @@
+#nullable disable
+
 #pragma warning disable CS1591
 
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using MediaBrowser.Common;
-using MediaBrowser.Common.Plugins;
 using MediaBrowser.Model.System;
 using Microsoft.AspNetCore.Http;
 
@@ -19,8 +18,6 @@ namespace MediaBrowser.Controller
     {
         event EventHandler HasUpdateAvailableChanged;
 
-        IServiceProvider ServiceProvider { get; }
-
         bool CoreStartupHasCompleted { get; }
 
         bool CanLaunchWebBrowser { get; }
@@ -55,6 +52,11 @@ namespace MediaBrowser.Controller
         string FriendlyName { get; }
 
         /// <summary>
+        /// Gets the configured published server url.
+        /// </summary>
+        string PublishedServerUrl { get; }
+
+        /// <summary>
         /// Gets the system info.
         /// </summary>
         /// <param name="source">The originator of the request.</param>
@@ -122,13 +124,5 @@ namespace MediaBrowser.Controller
         string ExpandVirtualPath(string path);
 
         string ReverseVirtualPath(string path);
-
-        /// <summary>
-        /// Gets the list of local plugins.
-        /// </summary>
-        /// <param name="path">Plugin base directory.</param>
-        /// <param name="cleanup">Cleanup old plugins.</param>
-        /// <returns>Enumerable of local plugins.</returns>
-        IEnumerable<LocalPlugin> GetLocalPlugins(string path, bool cleanup = true);
     }
 }