Skip to content

Commit 96d2f4a

Browse files
author
zzzprojects
committed
FIX EFCore reference
FIX EFCore reference
1 parent aa76330 commit 96d2f4a

File tree

23 files changed

+820
-918
lines changed

23 files changed

+820
-918
lines changed

‎src/Z.EntityFramework.Plus.EF6/BatchDelete/BatchDelete.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
296296
#elif EFCORE
297297
public DbCommand CreateCommand(IQueryable query, IEntityType entity)
298298
{
299-
#if NETCORE50
299+
#if NETSTANDARD1_3
300300
try
301301
{
302302
var assembly = Assembly.Load(new AssemblyName("EntityFramework.MicrosoftSqlServer, Version = 7.0.0.0, Culture = neutral, PublicKeyToken = adb9793829ddae60"));

‎src/Z.EntityFramework.Plus.EF6/BatchUpdate/BatchUpdate.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
301301
#elif EFCORE
302302
public DbCommand CreateCommand(IQueryable query, IEntityType entity, List<Tuple<string, object>> values)
303303
{
304-
#if NETCORE50
304+
#if NETSTANDARD1_3
305305
var assembly = Assembly.Load(new AssemblyName("EntityFramework.MicrosoftSqlServer, Version = 7.0.0.0, Culture = neutral, PublicKeyToken = adb9793829ddae60"));
306306

307307
if (assembly != null)
@@ -442,7 +442,7 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
442442
var mapping = entity.Info.EntityTypeMapping.MappingFragment;
443443
#elif EFCORE
444444

445-
#if NETCORE50
445+
#if NETSTANDARD1_3
446446
Assembly assembly;
447447

448448
try
@@ -538,7 +538,7 @@ public List<Tuple<string, object>> GetInnerValues<T>(IQueryable<T> query, Expres
538538
var command = ((IQueryable) result).CreateCommand(out queryContext);
539539
var commandText = command.CommandText;
540540

541-
#if NETCORE50
541+
#if NETSTANDARD1_3
542542
// GET the 'value' part
543543
var valueSql = commandText.IndexOf("AS [value]" + Environment.NewLine + "FROM", StringComparison.CurrentCultureIgnoreCase) != -1 ?
544544
commandText.Substring(6, commandText.IndexOf("AS [value]" + Environment.NewLine + "FROM", StringComparison.CurrentCultureIgnoreCase) - 6) :

‎src/Z.EntityFramework.Plus.EF6/QueryDeferred/QueryDeferredExtensions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static partial class QueryDeferredExtensions
2323
{
2424
private static MethodInfo GetMethodInfo<T1, T2>(Func<T1, T2> f, T1 unused1)
2525
{
26-
#if NETCORE50
26+
#if NETSTANDARD1_3
2727
return f.GetMethodInfo();
2828
#else
2929
return f.Method;
@@ -32,7 +32,7 @@ private static MethodInfo GetMethodInfo<T1, T2>(Func<T1, T2> f, T1 unused1)
3232

3333
private static MethodInfo GetMethodInfo<T1, T2, T3>(Func<T1, T2, T3> f, T1 unused1, T2 unused2)
3434
{
35-
#if NETCORE50
35+
#if NETSTANDARD1_3
3636
return f.GetMethodInfo();
3737
#else
3838
return f.Method;
@@ -41,7 +41,7 @@ private static MethodInfo GetMethodInfo<T1, T2, T3>(Func<T1, T2, T3> f, T1 unuse
4141

4242
private static MethodInfo GetMethodInfo<T1, T2, T3, T4>(Func<T1, T2, T3, T4> f, T1 unused1, T2 unused2, T3 unused3)
4343
{
44-
#if NETCORE50
44+
#if NETSTANDARD1_3
4545
return f.GetMethodInfo();
4646
#else
4747
return f.Method;
@@ -50,7 +50,7 @@ private static MethodInfo GetMethodInfo<T1, T2, T3, T4>(Func<T1, T2, T3, T4> f,
5050

5151
private static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5>(Func<T1, T2, T3, T4, T5> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4)
5252
{
53-
#if NETCORE50
53+
#if NETSTANDARD1_3
5454
return f.GetMethodInfo();
5555
#else
5656
return f.Method;

‎src/Z.EntityFramework.Plus.EF6/QueryFilter/QueryFilterContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public void LoadGenericContextInfo(DbContext context)
212212
FilterSetByType.AddOrAppend(@interface, filterDbSet);
213213
}
214214

215-
#if NETCORE50
215+
#if NETSTANDARD1_3
216216
baseType = baseType.GetTypeInfo().BaseType;
217217
#else
218218
baseType = baseType.BaseType;

‎src/Z.EntityFramework.Plus.EF6/_Internal/DynamicAnonymousType/DynamicAnonymousType.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal static class DynamicAnonymousType
2020
{
2121

2222
private static readonly AssemblyName AssemblyName = new AssemblyName { Name = "<>f__AnonymousType" };
23-
#if NETCORE50
23+
#if NETSTANDARD1_3
2424
private static readonly ModuleBuilder ModuleBuilder = System.Reflection.Emit.AssemblyBuilder.DefineDynamicAssembly(AssemblyName, AssemblyBuilderAccess.Run).DefineDynamicModule(AssemblyName.Name);
2525
#else
2626
private static readonly ModuleBuilder ModuleBuilder = Thread.GetDomain().DefineDynamicAssembly(AssemblyName, AssemblyBuilderAccess.Run).DefineDynamicModule(AssemblyName.Name);
@@ -112,7 +112,7 @@ public static Type GetDynamicType(List<Tuple<string, Type>> fields)
112112
foreach (var field in fields)
113113
typeBuilder.DefineField(field.Item1, field.Item2, FieldAttributes.Public);
114114

115-
#if NETCORE50
115+
#if NETSTANDARD1_3
116116
BuiltTypes[typeKey] = new Tuple<string, Type>(typeName, typeBuilder.CreateTypeInfo().AsType());
117117
#else
118118
BuiltTypes[typeKey] = new Tuple<string, Type>(typeName, typeBuilder.CreateType());

‎src/Z.EntityFramework.Plus.EF6/_Internal/EF/DbContext/DbContext.GetDbSetProperties.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ internal static List<PropertyInfo> GetDbSetProperties(this DbContext context)
3636
#if EF5 || EF6
3737
var isDbSet = setType.IsGenericType && (typeof (IDbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()) || setType.GetInterface(typeof (IDbSet<>).FullName) != null);
3838
#elif EFCORE
39-
#if NETCORE50
39+
#if NETSTANDARD1_3
4040
var isDbSet = setType.GetType().IsConstructedGenericType && (typeof (DbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()));
4141
#else
4242
var isDbSet = setType.IsGenericType && (typeof(DbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()));

‎src/Z.EntityFramework.Plus.EF6/_Internal/EF/IQueryable`/IQueryable.Order.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#if FULL
99
using System.Linq;
1010
using System.Linq.Expressions;
11-
#if NETCORE50
11+
#if NETSTANDARD1_3
1212
using System.Reflection;
1313
#endif
1414
namespace Z.EntityFramework.Plus

‎src/Z.EntityFramework.Plus.EF6/_Internal/EF/Type/Type.GetDbSetElementType.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static Type GetDbSetElementType(this Type type)
4444
return null;
4545
#elif EFCORE
4646

47-
#if NETCORE50
47+
#if NETSTANDARD1_3
4848
return type.GetTypeInfo().GenericTypeArguments[0];
4949
#else
5050
return type.GetGenericArguments()[0];

‎src/Z.EntityFramework.Plus.EF6/_Internal/EF5_EF6/IQueryable/IQueryable.SelectByName.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using System.Linq;
1212
using System.Linq.Expressions;
1313

14-
#if NETCORE50
14+
#if NETSTANDARD1_3
1515
using System.Reflection;
1616
#endif
1717

‎src/Z.EntityFramework.Plus.EF6/_Internal/EFCore/CreateEntity/CreateEntityDataReader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public override int RecordsAffected
5757
get { return OriginalDataReader.RecordsAffected; }
5858
}
5959

60-
//#if !NETCORE50
60+
//#if !NETSTANDARD1_3
6161
// public override void Close()
6262
// {
6363
// // DO NOT close reader

0 commit comments

Comments
 (0)