diff --git a/Source/EntityFramework.Extended/Batch/SqlServerBatchRunner.cs b/Source/EntityFramework.Extended/Batch/SqlServerBatchRunner.cs index 990bc57..77944e2 100644 --- a/Source/EntityFramework.Extended/Batch/SqlServerBatchRunner.cs +++ b/Source/EntityFramework.Extended/Batch/SqlServerBatchRunner.cs @@ -4,7 +4,7 @@ using System.Data.Entity.Core.EntityClient; using System.Data.Entity.Core.Objects; using System.Linq; -using System.Linq.Dynamic; +using EntityFramework.DynamicLinq; using System.Linq.Expressions; using System.Text; using System.Text.RegularExpressions; diff --git a/Source/EntityFramework.Extended/Dynamic/DynamicQueryable.cs b/Source/EntityFramework.Extended/Dynamic/DynamicQueryable.cs index b33d8d5..c121d1e 100644 --- a/Source/EntityFramework.Extended/Dynamic/DynamicQueryable.cs +++ b/Source/EntityFramework.Extended/Dynamic/DynamicQueryable.cs @@ -11,7 +11,11 @@ using System.Reflection.Emit; using System.Threading; -namespace System.Linq.Dynamic +//Given the strongname debate, it's unlikely that the nuget System.Linq.Dynamic will be strong named, and as this library is, we can't +//use that nuget package. Because of this, prefixing the normal System.Linq.Dynamic Namespace avoids conflicts with +//the package in projects that use both EF.Extended and System.Linq.Dynamic. If/When this is no longer strong named, or If/When +//System.Dynamic.Linq nuget package IS strong named, then this class could be removed, and would just use nuget. +namespace EntityFramework.DynamicLinq //System.Linq.Dynamic { public static class DynamicQueryable {