Merge pull request #593 from johelvisguzman/issue592

(GH-592) Fixed issues with ef not being able to resolved the dbcontext type

Author: johelvisguzman

src/DotNetToolkit.Repository.EntityFramework/Internal/EfRepositoryContextFactory.cs

@@ -24,7 +24,7 @@ internal class EfRepositoryContextFactory<TDbContext> : IRepositoryContextFactor
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="EfRepositoryContextFactory{TDbContext}"/> class.
+        /// Initializes a new instance of the <see cref="EfRepositoryContextFactory{TDbContext}"/> using an IOC container to resolve the <typeparamref name="TDbContext"/>.
         /// </summary>
         public EfRepositoryContextFactory() { }
 
@@ -56,8 +56,6 @@ public EfRepositoryContextFactory(DbConnection existingConnection)
         /// <returns>The new repository context.</returns>
         public IRepositoryContext Create()
         {
-            TDbContext underlyingContext;
-
             var args = new List<object>();
 
             if (_existingConnection != null)
@@ -70,37 +68,11 @@ public IRepositoryContext Create()
                 args.Add(_nameOrConnectionString);
             }
 
-            try
-            {
-                underlyingContext = (TDbContext)Activator.CreateInstance(typeof(TDbContext), args.ToArray());
-            }
-            catch (Exception ex)
-            {
-                throw ex.InnerException ?? ex;
-            }
+            var underlyingContext = args.Count > 0
+                ? (TDbContext)Activator.CreateInstance(typeof(TDbContext), args.ToArray())
+                : RepositoryDependencyResolver.Current.Resolve<TDbContext>();
 
             return new EfRepositoryContext(underlyingContext);
-
-        }
-
-        #endregion
-    }
-
-    /// <summary>
-    /// An implementation of <see cref="IRepositoryContextFactory" /> with the <see cref="RepositoryDependencyResolver"/> using an IOC container to resolve the <see cref="DbContext"/>.
-    /// </summary>
-    /// <seealso cref="IRepositoryContextFactory" />
-    internal class EfRepositoryContextFactory : IRepositoryContextFactory
-    {
-        #region Implementation of IRepositoryContextFactory
-
-        /// <summary>
-        /// Create a new repository context.
-        /// </summary>
-        /// <returns>The new repository context.</returns>
-        public IRepositoryContext Create()
-        {
-            return new EfRepositoryContext(RepositoryDependencyResolver.Current.Resolve<DbContext>());
         }
 
         #endregion

src/DotNetToolkit.Repository.EntityFramework/RepositoryOptionsBuilderExtensions.cs

@@ -13,7 +13,7 @@
     public static class RepositoryOptionsBuilderExtensions
     {
         /// <summary>
-        /// Configures the context to use entity framework.
+        /// Configures the context to use entity framework using an IOC container to resolve the <typeparamref name="TDbContext"/>.
         /// </summary>
         /// <param name="source">The repository options builder.</param>
         /// <returns>The same builder instance.</returns>
@@ -57,19 +57,5 @@ public static RepositoryOptionsBuilder UseEntityFramework<TDbContext>([NotNull]
 
             return source;
         }
-
-        /// <summary>
-        /// Configures the context to use entity framework with the <see cref="RepositoryDependencyResolver"/> using an IOC container to resolve the <see cref="DbContext"/>.
-        /// </summary>
-        /// <param name="source">The repository options builder.</param>
-        /// <returns>The same builder instance.</returns>
-        public static RepositoryOptionsBuilder UseEntityFramework([NotNull] this RepositoryOptionsBuilder source)
-        {
-            Guard.NotNull(source, nameof(source));
-
-            source.UseInternalContextFactory(new EfRepositoryContextFactory());
-
-            return source;
-        }
     }
 }

src/DotNetToolkit.Repository.EntityFrameworkCore/Internal/EfCoreRepositoryContextFactory.cs

@@ -21,7 +21,7 @@ internal class EfCoreRepositoryContextFactory<TDbContext> : IRepositoryContextFa
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="EfCoreRepositoryContextFactory{TDbContext}"/> class.
+        /// Initializes a new instance of the <see cref="EfCoreRepositoryContextFactory{TDbContext}"/> using an IOC container to resolve the <typeparamref name="TDbContext"/>.
         /// </summary>
         public EfCoreRepositoryContextFactory() { }
 
@@ -44,43 +44,14 @@ public EfCoreRepositoryContextFactory(DbContextOptions contextOptions)
         /// <returns>The new repository context.</returns>
         public IRepositoryContext Create()
         {
-            TDbContext underlyingContext;
-
-            try
-            {
-                underlyingContext = _contextOptions != null
-                    ? (TDbContext)Activator.CreateInstance(typeof(TDbContext), _contextOptions)
-                    : (TDbContext)Activator.CreateInstance(typeof(TDbContext));
-            }
-            catch (Exception ex)
-            {
-                throw ex.InnerException ?? ex;
-            }
+            var underlyingContext = _contextOptions != null
+                ? (TDbContext)Activator.CreateInstance(typeof(TDbContext), _contextOptions)
+                : RepositoryDependencyResolver.Current.Resolve<TDbContext>();
 
             return new EfCoreRepositoryContext(underlyingContext);
 
         }
 
         #endregion
     }
-
-    /// <summary>
-    /// An implementation of <see cref="IRepositoryContextFactory" /> with the <see cref="RepositoryDependencyResolver"/> using an IOC container to resolve the <see cref="DbContext"/>.
-    /// </summary>
-    /// <seealso cref="IRepositoryContextFactory" />
-    internal class EfCoreRepositoryContextFactory : IRepositoryContextFactory
-    {
-        #region Implementation of IRepositoryContextFactory
-
-        /// <summary>
-        /// Create a new repository context.
-        /// </summary>
-        /// <returns>The new repository context.</returns>
-        public IRepositoryContext Create()
-        {
-            return new EfCoreRepositoryContext(RepositoryDependencyResolver.Current.Resolve<DbContext>());
-        }
-
-        #endregion
-    }
 }

src/DotNetToolkit.Repository.EntityFrameworkCore/RepositoryOptionsBuilderExtensions.cs

@@ -13,7 +13,7 @@
     public static class RepositoryOptionsBuilderExtensions
     {
         /// <summary>
-        /// Configures the context to use entity framework core.
+        /// Configures the context to use entity framework core using an IOC container to resolve the <typeparamref name="TDbContext"/>.
         /// </summary>
         /// <param name="source">The repository options builder.</param>
         /// <returns>The same builder instance.</returns>
@@ -59,19 +59,5 @@ public static RepositoryOptionsBuilder UseEntityFrameworkCore<TDbContext>([NotNu
 
             return source;
         }
-
-        /// <summary>
-        /// Configures the context to use entity framework with the <see cref="RepositoryDependencyResolver"/> using an IOC container to resolve the <see cref="DbContext"/>.
-        /// </summary>
-        /// <param name="source">The repository options builder.</param>
-        /// <returns>The same builder instance.</returns>
-        public static RepositoryOptionsBuilder UseEntityFrameworkCore([NotNull] this RepositoryOptionsBuilder source)
-        {
-            Guard.NotNull(source, nameof(source));
-
-            source.UseInternalContextFactory(new EfCoreRepositoryContextFactory());
-
-            return source;
-        }
     }
 }