EF 6.1 support

EntityFramework.Extended.nuspec

@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>EntityFramework.Extended</id>
-    <version>6.0.0.0</version>
+    <version>6.1.0.0</version>
     <authors>LoreSoft</authors>
     <owners>LoreSoft</owners>
     <licenseUrl>https://github.com/loresoft/EntityFramework.Extended</licenseUrl>
     <projectUrl>https://github.com/loresoft/EntityFramework.Extended</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A library that extends the functionality of Entity Framework by adding batch update, future queries and audit logs.</description>
     <summary>Entity Framework extensions library.</summary>
-    <copyright>Copyright (c) 2013, LoreSoft</copyright>
+    <copyright>Copyright (c) 2014, LoreSoft</copyright>
     <language>en-US</language>
     <tags>EntityFramework</tags>
     <dependencies>

Master.proj

@@ -13,10 +13,7 @@
 
   <PropertyGroup>
     <Major>6</Major>
-    <Major4>5</Major4>
-
-    <Minor>0</Minor>
-    <Minor4>4</Minor4>
+    <Minor>1</Minor>
 
     <Build>0</Build>
     <BindBuild>0</BindBuild>
@@ -31,7 +28,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Year>2013</Year>
+    <Year>2014</Year>
   </PropertyGroup>
 
   <ItemGroup>
@@ -79,7 +76,7 @@
                   AssemblyDescription="Entity Framework extensions library. Built for .NET 4.0"
                   AssemblyCompany="LoreSoft"
                   AssemblyCopyright="Copyright © $(Year) LoreSoft"
-                  AssemblyVersion="$(Major4).$(Minor4).$(BindBuild).$(BindRevision)"
+                  AssemblyVersion="$(Major).$(Minor).$(BindBuild).$(BindRevision)"
                   AssemblyFileVersion="$(Major).$(Minor).$(Build).$(Revision)"
                   AssemblyInformationalVersion="$(Major).$(Minor).$(Build).$(Revision)"
                   GenerateClass="true" />

Source/EntityFramework.Extended.Test/EntityFramework.Extended.Test.net40.csproj

@@ -44,14 +44,17 @@
     <AssemblyOriginatorKeyFile>..\EntityFramework.Extended.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EntityFramework">
-      <HintPath>..\packages\EntityFramework.6.0.1\lib\net40\EntityFramework.dll</HintPath>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\EntityFramework.6.1.0\lib\net40\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework.SqlServer">
-      <HintPath>..\packages\EntityFramework.6.0.1\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\EntityFramework.6.1.0\lib\net40\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions">
-      <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\FluentAssertions.2.2.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

Source/EntityFramework.Extended.Test/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.1.0" targetFramework="net45" />
-  <package id="FluentAssertions" version="2.1.0.0" targetFramework="net45" />
+  <package id="FluentAssertions" version="2.2.0.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />
 </packages>

Source/EntityFramework.Extended/Batch/IBatchRunner.cs

@@ -20,9 +20,10 @@ public interface IBatchRunner
         /// <param name="entityMap">The <see cref="EntityMap"/> for <typeparamref name="TEntity"/>.</param>
         /// <param name="query">The query to create the where clause from.</param>
         /// <returns>The number of rows deleted.</returns>
-        int Delete<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query) 
+        int Delete<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query)
             where TEntity : class;
 
+#if net45
         /// <summary>
         /// Create and runs a batch delete statement asynchronously.
         /// </summary>
@@ -33,7 +34,7 @@ int Delete<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuer
         /// <returns>The number of rows deleted.</returns>
         Task<int> DeleteAsync<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query)
             where TEntity : class;
-
+#endif
         /// <summary>
         /// Create and runs a batch update statement.
         /// </summary>
@@ -43,9 +44,10 @@ Task<int> DeleteAsync<TEntity>(ObjectContext objectContext, EntityMap entityMap,
         /// <param name="query">The query to create the where clause from.</param>
         /// <param name="updateExpression">The update expression.</param>
         /// <returns>The number of rows updated.</returns>
-        int Update<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query, Expression<Func<TEntity, TEntity>> updateExpression) 
+        int Update<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query, Expression<Func<TEntity, TEntity>> updateExpression)
             where TEntity : class;
 
+#if net45
         /// <summary>
         /// Create and runs a batch update statement asynchronously.
         /// </summary>
@@ -57,5 +59,6 @@ int Update<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuer
         /// <returns>The number of rows updated.</returns>
         Task<int> UpdateAsync<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query, Expression<Func<TEntity, TEntity>> updateExpression)
             where TEntity : class;
+#endif
     }
 }

Source/EntityFramework.Extended/Batch/SqlServerBatchRunner.cs

@@ -32,9 +32,14 @@ public class SqlServerBatchRunner : IBatchRunner
         /// </returns>
         public int Delete<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query) where TEntity : class
         {
+#if net45
             return InternalDelete(objectContext, entityMap, query, false).Result;
+#else
+            return InternalDelete(objectContext, entityMap, query);
+#endif
         }
 
+#if net45
         /// <summary>
         /// Create and run a batch delete statement asynchronously.
         /// </summary>
@@ -49,9 +54,15 @@ public Task<int> DeleteAsync<TEntity>(ObjectContext objectContext, EntityMap ent
         {
             return InternalDelete(objectContext, entityMap, query, true);
         }
+#endif
 
+#if net45
         private async Task<int> InternalDelete<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query, bool async = false)
             where TEntity : class
+#else
+        private int InternalDelete<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query)
+            where TEntity : class
+#endif
         {
             DbConnection deleteConnection = null;
             DbTransaction deleteTransaction = null;
@@ -110,10 +121,13 @@ private async Task<int> InternalDelete<TEntity>(ObjectContext objectContext, Ent
 
                 deleteCommand.CommandText = sqlBuilder.ToString();
 
+#if net45
                 int result = async
                     ? await deleteCommand.ExecuteNonQueryAsync()
                     : deleteCommand.ExecuteNonQuery();
-
+#else
+                int result = deleteCommand.ExecuteNonQuery();
+#endif
                 // only commit if created transaction
                 if (ownTransaction)
                     deleteTransaction.Commit();
@@ -146,9 +160,14 @@ private async Task<int> InternalDelete<TEntity>(ObjectContext objectContext, Ent
         /// </returns>
         public int Update<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query, Expression<Func<TEntity, TEntity>> updateExpression) where TEntity : class
         {
+#if net45
             return InternalUpdate(objectContext, entityMap, query, updateExpression, false).Result;
+#else
+            return InternalUpdate(objectContext, entityMap, query, updateExpression);
+#endif
         }
 
+#if net45
         /// <summary>
         /// Create and run a batch update statement asynchronously.
         /// </summary>
@@ -164,9 +183,14 @@ public Task<int> UpdateAsync<TEntity>(ObjectContext objectContext, EntityMap ent
         {
             return InternalUpdate(objectContext, entityMap, query, updateExpression, true);
         }
-
+#endif
+#if net45
         private async Task<int> InternalUpdate<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query, Expression<Func<TEntity, TEntity>> updateExpression, bool async = false)
             where TEntity : class
+#else
+        private int InternalUpdate<TEntity>(ObjectContext objectContext, EntityMap entityMap, ObjectQuery<TEntity> query, Expression<Func<TEntity, TEntity>> updateExpression, bool async = false)
+            where TEntity : class
+#endif
         {
             DbConnection updateConnection = null;
             DbTransaction updateTransaction = null;
@@ -341,10 +365,13 @@ private async Task<int> InternalUpdate<TEntity>(ObjectContext objectContext, Ent
 
                 updateCommand.CommandText = sqlBuilder.ToString();
 
+#if net45
                 int result = async
                     ? await updateCommand.ExecuteNonQueryAsync()
                     : updateCommand.ExecuteNonQuery();
-
+#else
+                int result = updateCommand.ExecuteNonQuery();
+#endif
                 // only commit if created transaction
                 if (ownTransaction)
                     updateTransaction.Commit();
@@ -411,7 +438,7 @@ private static string GetSelectSql<TEntity>(ObjectQuery<TEntity> query, EntityMa
             {
                 var parameter = command.CreateParameter();
                 parameter.ParameterName = objectParameter.Name;
-                parameter.Value = objectParameter.Value ?? DBNull.Value;  
+                parameter.Value = objectParameter.Value ?? DBNull.Value;
 
                 command.Parameters.Add(parameter);
             }

Source/EntityFramework.Extended/Caching/CacheManager.cs

@@ -286,6 +286,7 @@ public virtual object GetOrAdd(CacheKey cacheKey, Func<CacheKey, object> valueFa
             return item;
         }
 
+#if net45
         /// <summary>
         /// Gets the cache value for the specified key that is already in the dictionary or the new value for the key as returned asynchronously by <paramref name="valueFactory"/>.
         /// </summary>
@@ -303,6 +304,7 @@ public virtual Task<object> GetOrAddAsync(CacheKey cacheKey, Func<CacheKey, Task
 
             return item;
         }
+#endif
 
         /// <summary>
         /// Removes a cache entry from the cache. 
@@ -314,7 +316,7 @@ public object Remove(string key)
             var cacheKey = new CacheKey(key);
             return Remove(cacheKey);
         }
-        
+
         /// <summary>
         /// Removes a cache entry from the cache. 
         /// </summary>

Source/EntityFramework.Extended/Caching/ICacheProvider.cs

@@ -40,6 +40,7 @@ public interface ICacheProvider
         /// </returns>
         object GetOrAdd(CacheKey cacheKey, Func<CacheKey, object> valueFactory, CachePolicy cachePolicy);
 
+#if net45
         /// <summary>
         /// Gets the cache value for the specified key that is already in the dictionary or the new value for the key as returned asynchronously by <paramref name="valueFactory"/>.
         /// </summary>
@@ -51,6 +52,7 @@ public interface ICacheProvider
         /// or the new value for the key as returned by <paramref name="valueFactory"/> if the key was not in the cache.
         /// </returns>
         Task<object> GetOrAddAsync(CacheKey cacheKey, Func<CacheKey, Task<object>> valueFactory, CachePolicy cachePolicy);
+#endif
 
         /// <summary>
         /// Removes a cache entry from the cache. 

Source/EntityFramework.Extended/Caching/MemoryCacheProvider.cs

@@ -77,6 +77,7 @@ public object GetOrAdd(CacheKey cacheKey, Func<CacheKey, object> valueFactory, C
             return value;
         }
 
+#if net45
         /// <summary>
         /// Gets the cache value for the specified key that is already in the dictionary or the new value for the key as returned asynchronously by <paramref name="valueFactory"/>.
         /// </summary>
@@ -107,6 +108,7 @@ public async Task<object> GetOrAddAsync(CacheKey cacheKey, Func<CacheKey, Task<o
 
             return value;
         }
+#endif
 
         /// <summary>
         /// Removes a cache entry from the cache.

Source/EntityFramework.Extended/EntityFramework.Extended.net40.csproj

@@ -44,11 +44,13 @@
     <AssemblyOriginatorKeyFile>..\EntityFramework.Extended.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EntityFramework">
-      <HintPath>..\packages\EntityFramework.6.0.1\lib\net40\EntityFramework.dll</HintPath>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\EntityFramework.6.1.0\lib\net40\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework.SqlServer">
-      <HintPath>..\packages\EntityFramework.6.0.1\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\EntityFramework.6.1.0\lib\net40\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -145,9 +147,7 @@
     <None Include="Audit\Audit.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />