1 files changed, 32 insertions, 4 deletions

diff --git a/Jellyfin.Server/Migrations/Stages/CodeMigration.cs b/Jellyfin.Server/Migrations/Stages/CodeMigration.cs
index addbb69bf..47ed26965 100644
--- a/Jellyfin.Server/Migrations/Stages/CodeMigration.cs
+++ b/Jellyfin.Server/Migrations/Stages/CodeMigration.cs
@@ -2,7 +2,9 @@ using System;
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Server.ServerSetupApp;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Jellyfin.Server.Migrations.Stages;
 
@@ -16,10 +18,34 @@ internal class CodeMigration(Type migrationType, JellyfinMigrationAttribute meta
 
     public string BuildCodeMigrationId()
     {
-        return Metadata.Order.ToString("yyyyMMddHHmmsss", CultureInfo.InvariantCulture) + "_" + MigrationType.Name!;
+        return Metadata.Order.ToString("yyyyMMddHHmmsss", CultureInfo.InvariantCulture) + "_" + Metadata.Name!;
     }
 
-    public async Task Perform(IServiceProvider? serviceProvider, CancellationToken cancellationToken)
+    private ServiceCollection MigrationServices(IServiceProvider serviceProvider, IStartupLogger logger)
+    {
+        var childServiceCollection = new ServiceCollection();
+        childServiceCollection.AddSingleton(serviceProvider);
+        childServiceCollection.AddSingleton(logger);
+
+        foreach (ServiceDescriptor service in serviceProvider.GetRequiredService<IServiceCollection>())
+        {
+            if (service.Lifetime == ServiceLifetime.Singleton && !service.ServiceType.IsGenericTypeDefinition)
+            {
+                object? serviceInstance = serviceProvider.GetService(service.ServiceType);
+                if (serviceInstance != null)
+                {
+                    childServiceCollection.AddSingleton(service.ServiceType, serviceInstance);
+                    continue;
+                }
+            }
+
+            childServiceCollection.Add(service);
+        }
+
+        return childServiceCollection;
+    }
+
+    public async Task Perform(IServiceProvider? serviceProvider, IStartupLogger logger, CancellationToken cancellationToken)
     {
 #pragma warning disable CS0618 // Type or member is obsolete
         if (typeof(IMigrationRoutine).IsAssignableFrom(MigrationType))
@@ -30,7 +56,8 @@ internal class CodeMigration(Type migrationType, JellyfinMigrationAttribute meta
             }
             else
             {
-                ((IMigrationRoutine)ActivatorUtilities.CreateInstance(serviceProvider, MigrationType)).Perform();
+                using var migrationServices = MigrationServices(serviceProvider, logger).BuildServiceProvider();
+                ((IMigrationRoutine)ActivatorUtilities.CreateInstance(migrationServices, MigrationType)).Perform();
 #pragma warning restore CS0618 // Type or member is obsolete
             }
         }
@@ -42,7 +69,8 @@ internal class CodeMigration(Type migrationType, JellyfinMigrationAttribute meta
             }
             else
             {
-                await ((IAsyncMigrationRoutine)ActivatorUtilities.CreateInstance(serviceProvider, MigrationType)).PerformAsync(cancellationToken).ConfigureAwait(false);
+                using var migrationServices = MigrationServices(serviceProvider, logger).BuildServiceProvider();
+                await ((IAsyncMigrationRoutine)ActivatorUtilities.CreateInstance(migrationServices, MigrationType)).PerformAsync(cancellationToken).ConfigureAwait(false);
             }
         }
         else