Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit 73c095d

Browse files
committed
Merge branch 'master' into release
2 parents 1513017 + 8178c2d commit 73c095d

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ public T[] GetAttributes<T>(Type type, bool inherit = true) where T : Attribute
6060

6161
public T[] GetAttributes<T>(Type type, MemberInfo memberInfo, bool inherit = true) where T : Attribute
6262
{
63+
if (typeof(Expression).IsSameOrParentOf(type))
64+
return Array.Empty<T>();
65+
6366
if (typeof(T) == typeof(ColumnAttribute))
6467
{
6568
var et = _model?.FindEntityType(type);

Source/LinqToDB.EntityFrameworkCore/linq2db.EntityFrameworkCore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="linq2db" Version="2.7.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.1" />
12+
<PackageReference Include="linq2db" Version="2.8.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.6" />
1414
</ItemGroup>
1515

1616
</Project>

Tests/LinqToDB.EntityFrameworkCore.Tests/LinqToDB.EntityFrameworkCore.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.0.20171219.105559" />
15-
<PackageReference Include="linq2db" Version="2.7.0" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.4" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
15+
<PackageReference Include="linq2db" Version="2.8.0" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.6" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.6" />
1818
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
21-
<PackageReference Include="NUnit" Version="3.11.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
20+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.4" />
21+
<PackageReference Include="NUnit" Version="3.12.0" />
2222
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.0" />
2323
</ItemGroup>
2424

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ branches:
1010
- /dev.*/
1111

1212
environment:
13-
assemblyVersion: 1.6.0
14-
packageVersion: 1.6.0
13+
assemblyVersion: 1.7.0
14+
packageVersion: 1.7.0
1515
access_token:
1616
secure: IlfmHXRdUK6v8dX/WqieXQ==
1717

0 commit comments

Comments
 (0)