resolve version conflicts

9f6b0e5d · Savorboard · 8d564cde · 8744532f · 9f6b0e5d · 9f6b0e5d
Commit 9f6b0e5d authored Sep 29, 2017 by Savorboard
Showing with 14 additions and 6 deletions

CAP.MySqlCapOptionsExtension.cs src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs +7 -3

CAP.PostgreSqlCapOptionsExtension.cs ...tCore.CAP.PostgreSql/CAP.PostgreSqlCapOptionsExtension.cs +7 -3

No files found.
--- a/src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs
+++ b/src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs
@@ -32,9 +32,13 @@ namespace DotNetCore.CAP
            {
                services.AddSingleton(x =>
                {
-                    var dbContext = (DbContext)x.GetService(mysqlOptions.DbContextType);
+                    using (var scope = x.CreateScope())
-                    mysqlOptions.ConnectionString = dbContext.Database.GetDbConnection().ConnectionString;
+                    {
-                    return mysqlOptions;
+                        var provider = scope.ServiceProvider;
+                        var dbContext = (DbContext)provider.GetService(mysqlOptions.DbContextType);
+                        mysqlOptions.ConnectionString = dbContext.Database.GetDbConnection().ConnectionString;
+                        return mysqlOptions;
+                    }
                });
            }
            else

--- a/src/DotNetCore.CAP.PostgreSql/CAP.PostgreSqlCapOptionsExtension.cs
+++ b/src/DotNetCore.CAP.PostgreSql/CAP.PostgreSqlCapOptionsExtension.cs
@@ -32,9 +32,13 @@ namespace DotNetCore.CAP
            {
                services.AddSingleton(x =>
                {
-                    var dbContext = (DbContext)x.GetService(postgreSqlOptions.DbContextType);
+                    using (var scope = x.CreateScope())
-                    postgreSqlOptions.ConnectionString = dbContext.Database.GetDbConnection().ConnectionString;
+                    {
-                    return postgreSqlOptions;
+                        var provider = scope.ServiceProvider;
+                        var dbContext = (DbContext)provider.GetService(postgreSqlOptions.DbContextType);
+                        postgreSqlOptions.ConnectionString = dbContext.Database.GetDbConnection().ConnectionString;
+                        return postgreSqlOptions;
+                    }
                });
            }
            else