Merge pull request #149 from stoveproject/dev

dev to master

Author: osoykan

common.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.3.6</VersionPrefix>
+    <VersionPrefix>2.4.0</VersionPrefix>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/osoykan/Stove</PackageProjectUrl>

src/Stove.Dapper/Stove.Dapper.csproj

@@ -30,6 +30,6 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.5" />
     <PackageReference Include="DapperExtensions.DotnetCore" Version="1.0.1" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.5.0" />
   </ItemGroup>
 </Project>

src/Stove.EntityFrameworkCore/EntityFrameworkCore/Repositories/EfCoreRepositoryBase{TEntity,TPrimaryKey}.cs

@@ -25,7 +25,6 @@ namespace Stove.EntityFrameworkCore.Repositories
 	/// <typeparam name="TPrimaryKey">Primary key of the entity</typeparam>
 	public class EfCoreRepositoryBase<TDbContext, TEntity, TPrimaryKey> :
 		StoveRepositoryBase<TEntity, TPrimaryKey>,
-		ISupportsExplicitLoading<TEntity, TPrimaryKey>,
 		IRepositoryWithDbContext
 		where TEntity : class, IEntity<TPrimaryKey>
 		where TDbContext : DbContext

src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveEntityMaterializerSource.cs

@@ -14,25 +14,25 @@ public class StoveEntityMaterializerSource : EntityMaterializerSource
         private static readonly MethodInfo NormalizeDateTimeMethod = typeof(StoveEntityMaterializerSource).GetTypeInfo().GetMethod(nameof(NormalizeDateTime), BindingFlags.Static | BindingFlags.NonPublic);
         private static readonly MethodInfo NormalizeNullableDateTimeMethod = typeof(StoveEntityMaterializerSource).GetTypeInfo().GetMethod(nameof(NormalizeNullableDateTime), BindingFlags.Static | BindingFlags.NonPublic);
 
-        public override Expression CreateReadValueExpression(Expression valueBuffer, Type type, int index, IProperty property = null)
+        public override Expression CreateReadValueExpression(Expression valueBuffer, Type type, int index, IPropertyBase propertyBase)
         {
             if (type == typeof(DateTime))
             {
                 return Expression.Call(
                     NormalizeDateTimeMethod,
-                    base.CreateReadValueExpression(valueBuffer, type, index, property)
+                    base.CreateReadValueExpression(valueBuffer, type, index, propertyBase)
                 );
             }
 
             if (type == typeof(DateTime?))
             {
                 return Expression.Call(
                     NormalizeNullableDateTimeMethod,
-                    base.CreateReadValueExpression(valueBuffer, type, index, property)
+                    base.CreateReadValueExpression(valueBuffer, type, index, propertyBase)
                 );
             }
 
-            return base.CreateReadValueExpression(valueBuffer, type, index, property);
+            return base.CreateReadValueExpression(valueBuffer, type, index, propertyBase);
         }
 
         private static DateTime NormalizeDateTime(DateTime value)

src/Stove.EntityFrameworkCore/EntityFrameworkCore/Uow/EfCoreUnitOfWork.cs

@@ -167,18 +167,5 @@ protected virtual void Release(DbContext dbContext)
         {
             dbContext.Dispose();
         }
-
-        //private static void ObjectContext_ObjectMaterialized(DbContext dbContext, ObjectMaterializedEventArgs e)
-        //{
-        //    dbContext.Configuration.AutoDetectChangesEnabled = true;
-
-        //    dbContext.Entry(e.Entity).State = previousState;
-
-        //    DateTimePropertyInfoHelper.NormalizeDatePropertyKinds(e.Entity, entityType);
-        //    var previousState = dbContext.Entry(e.Entity).State;
-
-        //    dbContext.Configuration.AutoDetectChangesEnabled = false;
-        //    var entityType = ObjectContext.GetObjectType(e.Entity.GetType());
-        //}
-    }
+	}
 }

src/Stove.EntityFrameworkCore/Stove.EntityFrameworkCore.csproj

@@ -19,8 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.1.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Stove.NHibernate/Stove.NHibernate.csproj

@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentNHibernate" Version="2.1.2" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="NHibernate" Version="5.1.2" />
   </ItemGroup>
 

src/Stove.NLog/Stove.NLog.csproj

@@ -27,6 +27,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="4.5.5" />
+    <PackageReference Include="NLog" Version="4.5.6" />
   </ItemGroup>    
 </Project>

src/Stove.WebApi/Stove.WebApi.csproj

@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>