Skip to content

Commit 09ed40a

Browse files
JonathanMagnanJonathanMagnan
committed
Add support to EF Core 2.x and 3.0 (Net Standard 2.1)
1 parent c0f4a56 commit 09ed40a

File tree

8 files changed

+67
-12
lines changed

8 files changed

+67
-12
lines changed

‎EntityFrameworkExtras.EFCore2.NetStandard20/EntityFrameworkExtras.EFCore2.NetStandard20.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AssemblyName>EntityFrameworkExtras.EFCore</AssemblyName>
6+
</PropertyGroup>
7+
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
9+
<DefineConstants>TRACE;EFCORE EFCORE_2X</DefineConstants>
10+
</PropertyGroup>
11+
12+
<Import Project="..\EntityFrameworkExtras.Shared\EntityFrameworkExtras.Shared.projitems" Label="Shared" />
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
16+
</ItemGroup>
17+
18+
</Project>

‎EntityFrameworkExtras.EFCore3/EntityFrameworkExtras.EFCore3.csproj‎ renamed to ‎EntityFrameworkExtras.EFCore3.NetStandard20/EntityFrameworkExtras.EFCore3.NetStandard20.csproj‎

File renamed without changes.

‎EntityFrameworkExtras.EFCore3.NetStandard21/EntityFrameworkExtras.EFCore3.NetStandard21.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.1</TargetFramework>
5+
<AssemblyName>EntityFrameworkExtras.EFCore</AssemblyName>
6+
</PropertyGroup>
7+
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
9+
<DefineConstants>TRACE;EFCORE</DefineConstants>
10+
</PropertyGroup>
11+
12+
<Import Project="..\EntityFrameworkExtras.Shared\EntityFrameworkExtras.Shared.projitems" Label="Shared" />
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
16+
</ItemGroup>
17+
18+
</Project>

‎EntityFrameworkExtras.EFCore3.Tests/EntityFrameworkExtras.EFCore3.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@
165165
<None Include="packages.config" />
166166
</ItemGroup>
167167
<ItemGroup>
168-
<ProjectReference Include="..\EntityFrameworkExtras.EFCore3\EntityFrameworkExtras.EFCore3.csproj">
169-
<Project>{c1144c22-be1b-4179-b667-51c7d14a3e41}</Project>
170-
<Name>EntityFrameworkExtras.EFCore3</Name>
168+
<ProjectReference Include="..\EntityFrameworkExtras.EFCore3.NetStandard20\EntityFrameworkExtras.EFCore3.NetStandard20.csproj">
169+
<Project>{992957e5-4e42-4e90-b510-2c3e3ca56b25}</Project>
170+
<Name>EntityFrameworkExtras.EFCore3.NetStandard20</Name>
171171
</ProjectReference>
172172
</ItemGroup>
173173
<Import Project="..\EntityFrameworkExtras.Tests.Shared\EntityFrameworkExtras.Tests.Shared.projitems" Label="Shared" />

‎EntityFrameworkExtras.Shared/DatabaseExtensions.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
#if EF4 || EF5 || EF6
88
using System.Data.Entity;
99
using System.Data.SqlClient;
10+
#elif EFCORE_2X
11+
using System.Data.Common;
12+
using System.Data.SqlClient;
13+
using Microsoft.EntityFrameworkCore;
14+
using Microsoft.EntityFrameworkCore.Infrastructure;
1015
#elif EFCORE
1116
using System.Data.Common;
1217
using Microsoft.Data.SqlClient;

‎EntityFrameworkExtras.Shared/StoredProcedureInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.ObjectModel;
22

3-
#if EF4 || EF5 || EF6
3+
#if EF4 || EF5 || EF6 || EFCORE_2X
44
using System.Data.SqlClient;
55
#elif EFCORE
66
using Microsoft.Data.SqlClient;

‎EntityFrameworkExtras.Shared/StoredProcedureParser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Linq;
66
using System.Reflection;
77

8-
#if EF4 || EF5 || EF6
8+
#if EF4 || EF5 || EF6 || EFCORE_2X
99
using System.Data.SqlClient;
1010
#elif EFCORE
1111
using Microsoft.Data.SqlClient;

‎EntityFrameworkExtras.sln‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "EntityFrameworkExtras.Tests
3434
EndProject
3535
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EFCore", "EFCore", "{9E15663E-75C8-43B6-8236-4847A2685D42}"
3636
EndProject
37-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkExtras.EFCore3", "EntityFrameworkExtras.EFCore3\EntityFrameworkExtras.EFCore3.csproj", "{C1144C22-BE1B-4179-B667-51C7D14A3E41}"
38-
EndProject
3937
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFrameworkExtras.EFCore3.Tests", "EntityFrameworkExtras.EFCore3.Tests\EntityFrameworkExtras.EFCore3.Tests.csproj", "{59943B99-772A-47E4-AA70-6D758312C00C}"
4038
EndProject
39+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkExtras.EFCore2.NetStandard20", "EntityFrameworkExtras.EFCore2.NetStandard20\EntityFrameworkExtras.EFCore2.NetStandard20.csproj", "{C4C0A992-318D-4B77-B151-69E18B789A52}"
40+
EndProject
41+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkExtras.EFCore3.NetStandard20", "EntityFrameworkExtras.EFCore3.NetStandard20\EntityFrameworkExtras.EFCore3.NetStandard20.csproj", "{992957E5-4E42-4E90-B510-2C3E3CA56B25}"
42+
EndProject
43+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkExtras.EFCore3.NetStandard21", "EntityFrameworkExtras.EFCore3.NetStandard21\EntityFrameworkExtras.EFCore3.NetStandard21.csproj", "{909F9FC3-3384-467B-9A7D-1B2328080BA8}"
44+
EndProject
4145
Global
4246
GlobalSection(SharedMSBuildProjectFiles) = preSolution
4347
EntityFrameworkExtras.Shared\EntityFrameworkExtras.Shared.projitems*{357c473a-d606-4a9b-8c5f-17deb6ffb006}*SharedItemsImports = 4
@@ -83,14 +87,22 @@ Global
8387
{8A995513-92C8-4E00-8C99-48BD56496F89}.Debug|Any CPU.Build.0 = Debug|Any CPU
8488
{8A995513-92C8-4E00-8C99-48BD56496F89}.Release|Any CPU.ActiveCfg = Release|Any CPU
8589
{8A995513-92C8-4E00-8C99-48BD56496F89}.Release|Any CPU.Build.0 = Release|Any CPU
86-
{C1144C22-BE1B-4179-B667-51C7D14A3E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87-
{C1144C22-BE1B-4179-B667-51C7D14A3E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
88-
{C1144C22-BE1B-4179-B667-51C7D14A3E41}.Release|Any CPU.ActiveCfg = Release|Any CPU
89-
{C1144C22-BE1B-4179-B667-51C7D14A3E41}.Release|Any CPU.Build.0 = Release|Any CPU
9090
{59943B99-772A-47E4-AA70-6D758312C00C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9191
{59943B99-772A-47E4-AA70-6D758312C00C}.Debug|Any CPU.Build.0 = Debug|Any CPU
9292
{59943B99-772A-47E4-AA70-6D758312C00C}.Release|Any CPU.ActiveCfg = Release|Any CPU
9393
{59943B99-772A-47E4-AA70-6D758312C00C}.Release|Any CPU.Build.0 = Release|Any CPU
94+
{C4C0A992-318D-4B77-B151-69E18B789A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95+
{C4C0A992-318D-4B77-B151-69E18B789A52}.Debug|Any CPU.Build.0 = Debug|Any CPU
96+
{C4C0A992-318D-4B77-B151-69E18B789A52}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{C4C0A992-318D-4B77-B151-69E18B789A52}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{992957E5-4E42-4E90-B510-2C3E3CA56B25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99+
{992957E5-4E42-4E90-B510-2C3E3CA56B25}.Debug|Any CPU.Build.0 = Debug|Any CPU
100+
{992957E5-4E42-4E90-B510-2C3E3CA56B25}.Release|Any CPU.ActiveCfg = Release|Any CPU
101+
{992957E5-4E42-4E90-B510-2C3E3CA56B25}.Release|Any CPU.Build.0 = Release|Any CPU
102+
{909F9FC3-3384-467B-9A7D-1B2328080BA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103+
{909F9FC3-3384-467B-9A7D-1B2328080BA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
104+
{909F9FC3-3384-467B-9A7D-1B2328080BA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
105+
{909F9FC3-3384-467B-9A7D-1B2328080BA8}.Release|Any CPU.Build.0 = Release|Any CPU
94106
EndGlobalSection
95107
GlobalSection(SolutionProperties) = preSolution
96108
HideSolutionNode = FALSE
@@ -103,8 +115,10 @@ Global
103115
{357C473A-D606-4A9B-8C5F-17DEB6FFB006} = {90962F79-D846-4F3D-9255-2F28A36D089C}
104116
{44BA0CDB-A85D-4657-A935-7D57D6F0EEF9} = {90962F79-D846-4F3D-9255-2F28A36D089C}
105117
{8A995513-92C8-4E00-8C99-48BD56496F89} = {9EC06092-6237-42AE-B0C1-7CF5974368A2}
106-
{C1144C22-BE1B-4179-B667-51C7D14A3E41} = {9E15663E-75C8-43B6-8236-4847A2685D42}
107118
{59943B99-772A-47E4-AA70-6D758312C00C} = {9E15663E-75C8-43B6-8236-4847A2685D42}
119+
{C4C0A992-318D-4B77-B151-69E18B789A52} = {9E15663E-75C8-43B6-8236-4847A2685D42}
120+
{992957E5-4E42-4E90-B510-2C3E3CA56B25} = {9E15663E-75C8-43B6-8236-4847A2685D42}
121+
{909F9FC3-3384-467B-9A7D-1B2328080BA8} = {9E15663E-75C8-43B6-8236-4847A2685D42}
108122
EndGlobalSection
109123
GlobalSection(ExtensibilityGlobals) = postSolution
110124
SolutionGuid = {8FEFCD82-1FCB-4477-90F7-A935BF59298B}

0 commit comments

Comments
 (0)