Merge pull request #113 from elsa-workflows/copilot/fix-fluentmigrator-dependency

Replace FluentMigrator.Runner meta-package with FluentMigrator.Runner.Core

Author: sfmskywalker

Directory.Packages.props

@@ -151,6 +151,9 @@
         <PackageVersion Include="FastEndpoints.Swagger" Version="7.1.1"/>
         <PackageVersion Include="FluentMigrator" Version="7.2.0"/>
         <PackageVersion Include="FluentMigrator.Runner" Version="7.2.0"/>
+        <PackageVersion Include="FluentMigrator.Runner.Core" Version="7.2.0"/>
+        <PackageVersion Include="FluentMigrator.Runner.SqlServer" Version="7.2.0"/>
+        <PackageVersion Include="FluentMigrator.Runner.SQLite" Version="7.2.0"/>
         <PackageVersion Include="FluentStorage" Version="6.0.0"/>
         <PackageVersion Include="Fluid.Core" Version="2.31.0"/>
         <PackageVersion Include="Fody" Version="6.9.3"/>

src/modules/persistence/Elsa.Persistence.Dapper/Elsa.Persistence.Dapper.csproj

@@ -15,11 +15,11 @@
         <PackageReference Include="Azure.Identity"/>
         <PackageReference Include="Dapper"/>
         <PackageReference Include="FluentMigrator"/>
-        <PackageReference Include="FluentMigrator.Runner"/>
+        <PackageReference Include="FluentMigrator.Runner.Core"/>
         <PackageReference Include="Microsoft.Data.Sqlite.Core"/>
+        <PackageReference Include="Microsoft.Data.SqlClient"/>
         <PackageReference Include="Microsoft.Identity.Client"/>
         <PackageReference Include="Npgsql"/>
-        <PackageReference Include="System.Data.SqlClient"/>
         <PackageReference Include="System.Formats.Asn1"/>
     </ItemGroup>
 

src/modules/persistence/Elsa.Persistence.Dapper/Features/DapperMigrationsFeature.cs

@@ -15,26 +15,14 @@ namespace Elsa.Persistence.Dapper.Features;
 public class DapperMigrationsFeature(IModule module) : FeatureBase(module)
 {
     /// <summary>
-    /// Configures migrations to use SQLite.
-    /// </summary>
-    public DapperMigrationsFeature UseSqlite()
-    {
-        ConfigureRunner += runner => runner.AddSQLite();
-        return this;
-    }
-
-    /// <summary>
-    /// Configures migrations to use SQLite.
-    /// </summary>
-    public DapperMigrationsFeature UseSqlServer()
-    {
-        ConfigureRunner += runner => runner.AddSqlServer();
-        return this;
-    }
-
-    /// <summary>
-    /// Gets or sets a delegate to configure migrations.
+    /// Gets or sets a delegate used to configure the <see cref="IMigrationRunnerBuilder"/> for Dapper migrations.
     /// </summary>
+    /// <remarks>
+    /// The delegate must configure a database provider on the runner (for example by calling
+    /// <c>AddSqlServer()</c> or <c>AddSQLite()</c>) in addition to any other settings.
+    /// This replaces the removed <c>UseSqlServer()</c> and <c>UseSqlite()</c> convenience methods;
+    /// consumers migrating from those APIs should move their provider configuration into this delegate.
+    /// </remarks>
     public Action<IMigrationRunnerBuilder> ConfigureRunner { get; set; } = runner => runner
         .WithGlobalConnectionString(sp => sp.GetRequiredService<IDbConnectionProvider>().GetConnectionString())
         .WithMigrationsIn(typeof(Initial).Assembly);

src/workbench/Elsa.Server.Web/Elsa.Server.Web.csproj

@@ -25,6 +25,8 @@
 		<PackageReference Include="Elsa.Workflows.Api" />
         <PackageReference Include="Elsa.WorkflowProviders.BlobStorage" />
 		<PackageReference Include="Elsa.Workflows.Runtime.Distributed" />
+        <PackageReference Include="FluentMigrator.Runner.SqlServer" />
+        <PackageReference Include="FluentMigrator.Runner.SQLite" />
         <PackageReference Include="Hangfire.Core" />
         <PackageReference Include="Hangfire.MemoryStorage" />
         <PackageReference Include="Hangfire.PostgreSql" />

src/workbench/Elsa.Server.Web/Program.cs

@@ -12,6 +12,7 @@
 using Elsa.Identity.Multitenancy;
 using Elsa.OpenTelemetry.Middleware;
 using Elsa.Persistence.Dapper.Extensions;
+using Elsa.Persistence.Dapper.Contracts;
 using Elsa.Persistence.Dapper.Services;
 using Elsa.Persistence.EFCore.Extensions;
 using Elsa.Persistence.EFCore.Modules.Alterations;
@@ -53,6 +54,7 @@
 using Elsa.Workflows.Runtime.Options;
 using Elsa.Workflows.Runtime.Stores;
 using Elsa.Workflows.Runtime.Tasks;
+using FluentMigrator.Runner;
 using Hangfire;
 using Hangfire.MemoryStorage;
 using Hangfire.PostgreSql;
@@ -128,10 +130,16 @@
             {
                 dapper.UseMigrations(feature =>
                 {
-                    if (sqlDatabaseProvider == SqlDatabaseProvider.SqlServer)
-                        feature.UseSqlServer();
-                    else
-                        feature.UseSqlite();
+                    feature.ConfigureRunner = builder =>
+                    {
+                        var runnerBuilder = sqlDatabaseProvider == SqlDatabaseProvider.SqlServer
+                            ? builder.AddSqlServer()
+                            : builder.AddSQLite();
+                        
+                        runnerBuilder
+                            .WithGlobalConnectionString(sp => sp.GetRequiredService<IDbConnectionProvider>().GetConnectionString())
+                            .WithMigrationsIn(typeof(Elsa.Persistence.Dapper.Migrations.Management.Initial).Assembly);
+                    };
                 });
                 dapper.DbConnectionProvider = sp =>
                 {