Merge pull request #73 from Ar3sDevelopment/dev

Dev

Author: matteobruni

UnitOfWork.NET.NUnit/UnitOfWork.NET.NUnit.csproj

@@ -35,7 +35,7 @@
       <HintPath>..\packages\Autofac.4.1.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="ClassBuilder">
-      <HintPath>..\packages\ClassBuilder.4.0.0.75\lib\net45\ClassBuilder.dll</HintPath>
+      <HintPath>..\packages\ClassBuilder.4.0.0.80\lib\net45\ClassBuilder.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

UnitOfWork.NET.NUnit/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="4.1.1" targetFramework="net45" />
-  <package id="ClassBuilder" version="4.0.0.75" targetFramework="net45" />
+  <package id="ClassBuilder" version="4.0.0.80" targetFramework="net45" />
   <package id="NUnit" version="3.4.1" targetFramework="net45" />
 </packages>

UnitOfWork.NET/Classes/UnitOfWork.cs

@@ -21,7 +21,7 @@ public UnitOfWork()
 			var cb = new ContainerBuilder();
 
 			cb.Register(t => this).AsImplementedInterfaces().AsSelf().As<UnitOfWork>();
-			cb.RegisterType<Repository>().AsSelf().As<IRepository>().PreserveExistingDefaults();
+			cb.RegisterType<Repository>().AsSelf().As<IRepository>();
 			cb.RegisterGeneric(typeof(Repository<>)).AsSelf().As(typeof(IRepository<>));
 			cb.RegisterGeneric(typeof(Repository<,>)).AsSelf().As(typeof(IRepository<,>));
 			cb.RegisterGeneric(typeof(Repository<,,>)).AsSelf().As(typeof(IListRepository<,,>));
@@ -180,11 +180,11 @@ private TRepository GetRepository<TRepository>(bool force = false) where TReposi
 
 		public TRepository CustomRepository<TRepository>() where TRepository : IRepository => GetRepository<TRepository>(true);
 
-		public IRepository<T> Repository<T>() where T : class, new() => GetRepository<IRepository<T>>();
+		public IRepository<T> Repository<T>() where T : class, new() => GetRepository<IRepository<T>>() ?? CustomRepository<Repository<T>>();
 
-		public IRepository<TSource, TDestination> Repository<TSource, TDestination>() where TSource : class, new() where TDestination : class, new() => GetRepository<IRepository<TSource, TDestination>>();
+		public IRepository<TSource, TDestination> Repository<TSource, TDestination>() where TSource : class, new() where TDestination : class, new() => GetRepository<IRepository<TSource, TDestination>>() ?? CustomRepository<Repository<TSource, TDestination>>();
 
-		public IListRepository<TSource, TDestination, TListDestination> Repository<TSource, TDestination, TListDestination>() where TSource : class, new() where TDestination : class, new() where TListDestination : class, new() => GetRepository<IListRepository<TSource, TDestination, TListDestination>>();
+		public IListRepository<TSource, TDestination, TListDestination> Repository<TSource, TDestination, TListDestination>() where TSource : class, new() where TDestination : class, new() where TListDestination : class, new() => GetRepository<IListRepository<TSource, TDestination, TListDestination>>() ?? CustomRepository<Repository<TSource, TDestination, TListDestination>>();
 
 		public virtual IQueryable<T> Data<T>() where T : class, new() => Enumerable.Empty<T>().AsQueryable();
 

UnitOfWork.NET/UnitOfWork.NET.csproj

@@ -50,7 +50,7 @@
       <HintPath>..\packages\Autofac.4.1.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="ClassBuilder">
-      <HintPath>..\packages\ClassBuilder.4.0.0.75\lib\net45\ClassBuilder.dll</HintPath>
+      <HintPath>..\packages\ClassBuilder.4.0.0.80\lib\net45\ClassBuilder.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

UnitOfWork.NET/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="Autofac" version="4.1.1" targetFramework="net45" />
   <package id="Caelan.DynamicLinq" version="2.0.20.0" targetFramework="net45" />
-  <package id="ClassBuilder" version="4.0.0.75" targetFramework="net45" />
+  <package id="ClassBuilder" version="4.0.0.80" targetFramework="net45" />
   <package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net45" />
 </packages>