update AppAny package version and fix MySql and SqlServer migration f…

…or Quartz (#4921)
elsa-workflows · Feb 9, 2024 · 796438c · 796438c
1 parent 60a349c
commit 796438c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -94,13 +94,13 @@
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
     <PackageVersion Include="xunit.extensibility.core" Version="2.6.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
+	<PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations" Version="0.5.0" />
+	<PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.MySql" Version="0.5.0" />
+	<PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL" Version="0.5.0" />
+	<PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SQLite" Version="0.5.0" />
+	<PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SqlServer" Version="0.5.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations" Version="0.4.1-ef7" />
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.MySql" Version="0.4.1-ef7" />
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL" Version="0.4.1-ef7" />
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SQLite" Version="0.4.1-ef7" />
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SqlServer" Version="0.4.1-ef7" />
     <PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="7.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="7.0.14" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
@@ -132,11 +132,6 @@
     <PackageVersion Include="System.Text.Json" Version="7.0.4" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations" Version="0.4.1-ef8" />
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.MySql" Version="0.4.1-ef8" />
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL" Version="0.4.1-ef8" />
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SQLite" Version="0.4.1-ef8" />
-    <PackageVersion Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SqlServer" Version="0.4.1-ef8" />
     <PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />

diff --git a/...odules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj b/...odules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj
@@ -8,7 +8,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations" />
         <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.MySql" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />

diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/MySqlQuartzExtensions.cs b/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/MySqlQuartzExtensions.cs
@@ -31,7 +31,7 @@ public static QuartzFeature UseMySql(this QuartzFeature feature, string connecti
             quartz.UsePersistentStore(store =>
             {
                 store.UseNewtonsoftJsonSerializer();
-                store.UseMySql(connectionString);
+                store.UseMySqlConnector(options => options.ConnectionString = connectionString);
 
                 if (useClustering)
                     store.UseClustering();

diff --git a/...a.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj b/...a.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj
@@ -8,7 +8,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations" />
         <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />

diff --git a/...lsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj b/...lsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj
@@ -8,7 +8,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations" />
         <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SqlServer" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />

diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/SqlServerQuartzExtensions.cs b/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/SqlServerQuartzExtensions.cs
@@ -31,8 +31,13 @@ public static QuartzFeature UseSqlServer(this QuartzFeature feature, string conn
             quartz.UsePersistentStore(store =>
             {
                 store.UseNewtonsoftJsonSerializer();
-                store.UseSqlServer(connectionString);
-
+                store.UseSqlServer(options =>
+                {
+                    options.ConnectionString = connectionString;
+                    options.TablePrefix = "[quartz].qrtz_";
+
+                });
+
                 if (useClustering)
                     store.UseClustering();
             });

diff --git a/...ules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj b/...ules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj
@@ -8,7 +8,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations" />
         <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SQLite" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />