Skip to content

Commit 1bb138a

Browse files
JonathanMagnanJonathanMagnan
authored
Merge pull request #402 from zzzprojects/EFCore_3x_Support
Ef core 3x support
2 parents 7f3d387 + 5e49330 commit 1bb138a

24 files changed

+285
-192
lines changed

‎System.Linq.Dynamic.Core.sln

+21-21
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Dynamic.Core",
2525
EndProject
2626
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.DynamicLinq", "src\EntityFramework.DynamicLinq\EntityFramework.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510000}"
2727
EndProject
28-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq", "src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510001}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2", "src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj", "{D3804228-91F4-4502-9595-39584E510001}"
2929
EndProject
3030
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Dynamic.Core.Tests", "test\System.Linq.Dynamic.Core.Tests\System.Linq.Dynamic.Core.Tests.csproj", "{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80}"
3131
ProjectSection(ProjectDependencies) = postProject
@@ -40,8 +40,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-uap", "test-uap", "{EC
4040
EndProject
4141
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.0_EF2.0.1", "src-console\ConsoleAppEF2.0\ConsoleApp_netcore2.0_EF2.0.1.csproj", "{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}"
4242
EndProject
43-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore1.1_EF1.1.2", "src-console\ConsoleAppEF1.1\ConsoleApp_netcore1.1_EF1.1.2.csproj", "{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}"
44-
EndProject
4543
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net40_sqlite_original", "src-console\System.Linq.Dynamic.Core.ConsoleTestApp.net40\ConsoleApp_net40_sqlite_original.csproj", "{0EB12661-F5CF-4071-9812-F4C8AF3D4531}"
4644
EndProject
4745
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net40_sqlite", "src-console\ConsoleApp_net40_sqlite\ConsoleApp_net40_sqlite.csproj", "{E587974C-19A9-426A-A952-216D5F883EB6}"
@@ -92,7 +90,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docfx", "docfx", "{012536E6
9290
EndProject
9391
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lab", "lab", "{E97833C1-77B6-44E2-8793-C1F952CA936F}"
9492
EndProject
95-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z.Dynamic.Core.Lab", "Z.Dynamic.Core.Lab\Z.Dynamic.Core.Lab.csproj", "{CDD8D5BF-A212-43DD-B043-4B7242C553E0}"
93+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Z.Dynamic.Core.Lab", "Z.Dynamic.Core.Lab\Z.Dynamic.Core.Lab.csproj", "{CDD8D5BF-A212-43DD-B043-4B7242C553E0}"
94+
EndProject
95+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3", "src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj", "{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}"
9696
EndProject
9797
Global
9898
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -216,22 +216,6 @@ Global
216216
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x64.Build.0 = Release|Any CPU
217217
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x86.ActiveCfg = Release|Any CPU
218218
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x86.Build.0 = Release|Any CPU
219-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
220-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
221-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|ARM.ActiveCfg = Debug|Any CPU
222-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|ARM.Build.0 = Debug|Any CPU
223-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|x64.ActiveCfg = Debug|Any CPU
224-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|x64.Build.0 = Debug|Any CPU
225-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|x86.ActiveCfg = Debug|Any CPU
226-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|x86.Build.0 = Debug|Any CPU
227-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
228-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|Any CPU.Build.0 = Release|Any CPU
229-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|ARM.ActiveCfg = Release|Any CPU
230-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|ARM.Build.0 = Release|Any CPU
231-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|x64.ActiveCfg = Release|Any CPU
232-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|x64.Build.0 = Release|Any CPU
233-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|x86.ActiveCfg = Release|Any CPU
234-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|x86.Build.0 = Release|Any CPU
235219
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
236220
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|Any CPU.Build.0 = Debug|Any CPU
237221
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -524,6 +508,22 @@ Global
524508
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x64.Build.0 = Release|Any CPU
525509
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x86.ActiveCfg = Release|Any CPU
526510
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x86.Build.0 = Release|Any CPU
511+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
512+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
513+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|ARM.ActiveCfg = Debug|Any CPU
514+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|ARM.Build.0 = Debug|Any CPU
515+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|x64.ActiveCfg = Debug|Any CPU
516+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|x64.Build.0 = Debug|Any CPU
517+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|x86.ActiveCfg = Debug|Any CPU
518+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|x86.Build.0 = Debug|Any CPU
519+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
520+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|Any CPU.Build.0 = Release|Any CPU
521+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|ARM.ActiveCfg = Release|Any CPU
522+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|ARM.Build.0 = Release|Any CPU
523+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|x64.ActiveCfg = Release|Any CPU
524+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|x64.Build.0 = Release|Any CPU
525+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|x86.ActiveCfg = Release|Any CPU
526+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|x86.Build.0 = Release|Any CPU
527527
EndGlobalSection
528528
GlobalSection(SolutionProperties) = preSolution
529529
HideSolutionNode = FALSE
@@ -536,7 +536,6 @@ Global
536536
{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
537537
{BF97CB1B-5043-4256-8F42-CF3A4F3863BE} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
538538
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
539-
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
540539
{0EB12661-F5CF-4071-9812-F4C8AF3D4531} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
541540
{E587974C-19A9-426A-A952-216D5F883EB6} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
542541
{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
@@ -555,6 +554,7 @@ Global
555554
{0034821E-740D-4553-821B-14CE9213C43C} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
556555
{CD80A3AC-B0E1-45ED-BE07-DE6A0F1D4CD8} = {122BC4FA-7563-4E35-9D17-077F16F1629F}
557556
{CDD8D5BF-A212-43DD-B043-4B7242C553E0} = {E97833C1-77B6-44E2-8793-C1F952CA936F}
557+
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
558558
EndGlobalSection
559559
GlobalSection(ExtensibilityGlobals) = postSolution
560560
SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}

‎src-console/ConsoleAppEF1.1/ConsoleApp_netcore1.1_EF1.1.2.csproj

-20
This file was deleted.

‎src-console/ConsoleAppEF1.1/MyDbContext.cs

-37
This file was deleted.

‎src-console/ConsoleAppEF1.1/Program.cs

-59
This file was deleted.

‎src-console/ConsoleAppEF2.0.2_InMemory/ConsoleApp_netcore2.0_EF2.0.2_InMemory.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
26+
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj" />
2727
</ItemGroup>
2828

2929
</Project>

‎src-console/ConsoleAppEF2.0/ConsoleApp_netcore2.0_EF2.0.1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
19+
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj" />
2020
</ItemGroup>
2121

2222
</Project>

‎src-console/ConsoleAppEF2.1.1/ConsoleApp_netcore2.1_EF2.1.1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
25+
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj" />
2626
</ItemGroup>
2727

2828
</Project>

‎src-console/ConsoleAppEF2.1.1_InMemory/ConsoleApp_netcore2.1_EF2.1.1_InMemory.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
27+
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj" />
2828
</ItemGroup>
2929

3030
</Project>

‎src-console/ConsoleAppEF3.1/ConsoleApp_netcore3.1_EF3.1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
27+
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj" />
2828
<ProjectReference Include="..\..\src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
2929
</ItemGroup>
3030

‎src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Compile Include="..\System.Linq.Dynamic.Core\Compatibility\*.cs" />
3939
<Compile Include="..\System.Linq.Dynamic.Core\Extensions\*.cs" />
4040
<Compile Include="..\System.Linq.Dynamic.Core\Validation\*.cs" />
41-
<Compile Include="..\Microsoft.EntityFrameworkCore.DynamicLinq\*.cs" />
41+
<Compile Include="..\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\*.cs" />
4242
</ItemGroup>
4343

4444
<ItemGroup>

‎src/Microsoft.EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj ‎src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj

File renamed without changes.

‎src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
2+
<PropertyGroup>
3+
<Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
4+
<AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
5+
<Authors>ZZZ Projects;Stef Heyenrath</Authors>
6+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
7+
<DefineConstants>$(DefineConstants);EFCORE;EFCORE_2X;EFDYNAMICFUNCTIONS</DefineConstants>
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9+
<AssemblyName>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyName>
10+
<AssemblyOriginatorKeyFile>Microsoft.EntityFrameworkCore.DynamicLinq.snk</AssemblyOriginatorKeyFile>
11+
<SignAssembly>true</SignAssembly>
12+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
13+
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
14+
<PackageReleaseNotes>Bugfixes and new Features. For details see CHANGELOG.md</PackageReleaseNotes>
15+
<PackageProjectUrl>https://dynamic-linq.net/</PackageProjectUrl>
16+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
17+
<PackageIconUrl>https://zzzprojects.github.io/images/logo/logo-64.png</PackageIconUrl>
18+
<RepositoryType>git</RepositoryType>
19+
<RepositoryUrl>https://github.com/zzzprojects/System.Linq.Dynamic.Core</RepositoryUrl>
20+
<DefaultLanguage>en-us</DefaultLanguage>
21+
<ProjectGuid>{D3804228-91F4-4502-9595-39584E510001}</ProjectGuid>
22+
<DebugType>full</DebugType>
23+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
24+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
25+
<Company>ZZZ Projects</Company>
26+
<Copyright>Copyright © ZZZ Projects</Copyright>
27+
</PropertyGroup>
28+
29+
<PropertyGroup Condition=" '$(buildType)' == 'azure-pipelines-ci' ">
30+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
31+
</PropertyGroup>
32+
33+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
34+
<!--<IncludeSource>True</IncludeSource>
35+
<IncludeSymbols>True</IncludeSymbols>
36+
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
37+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
38+
</PropertyGroup>
39+
40+
<ItemGroup>
41+
<Compile Include="..\System.Linq.Dynamic.Core\Res.cs" />
42+
<Compile Include="..\System.Linq.Dynamic.Core\Compatibility\*.cs" />
43+
<Compile Include="..\System.Linq.Dynamic.Core\Extensions\*.cs" />
44+
<Compile Include="..\System.Linq.Dynamic.Core\Validation\*.cs" />
45+
<Compile Include="..\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\*.cs" />
46+
</ItemGroup>
47+
48+
<ItemGroup>
49+
<ProjectReference Include="..\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
50+
</ItemGroup>
51+
52+
<ItemGroup>
53+
<PackageReference Include="JetBrains.Annotations" Version="10.2.1" PrivateAssets="All" />
54+
</ItemGroup>
55+
56+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
57+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
58+
</ItemGroup>
59+
</Project>

‎src/Microsoft.EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.snk ‎src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.snk

File renamed without changes.

‎src/Microsoft.EntityFrameworkCore.DynamicLinq/Properties/AssemblyInfo.cs ‎src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Properties/AssemblyInfo.cs

File renamed without changes.

‎src/Microsoft.EntityFrameworkCore.DynamicLinq/DynamicFunctions.cs ‎src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3/DynamicFunctions.cs

File renamed without changes.

0 commit comments

Comments
 (0)