Merge branch 'jellyfin:master' into master

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -20,7 +20,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
   </ItemGroup>
 
@@ -35,7 +34,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -20,6 +20,7 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.MediaInfo;
 using Microsoft.Extensions.Configuration;
+using IConfigurationManager = MediaBrowser.Common.Configuration.IConfigurationManager;
 
 namespace MediaBrowser.Controller.MediaEncoding
 {

MediaBrowser.Controller/Plugins/IPluginServiceRegistrator.cs

@@ -0,0 +1,19 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace MediaBrowser.Controller.Plugins;
+
+/// <summary>
+/// Defines the <see cref="IPluginServiceRegistrator" />.
+/// </summary>
+/// <remarks>
+/// This interface is only used for service registration and requires a parameterless constructor.
+/// </remarks>
+public interface IPluginServiceRegistrator
+{
+    /// <summary>
+    /// Registers the plugin's services with the service collection.
+    /// </summary>
+    /// <param name="serviceCollection">The service collection.</param>
+    /// <param name="applicationHost">The server application host.</param>
+    void RegisterServices(IServiceCollection serviceCollection, IServerApplicationHost applicationHost);
+}