Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ef core 3x support #402

Merged
merged 2 commits into from
Jul 27, 2020
Merged

Ef core 3x support #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b55e99
Add EF Core support
JonathanMagnan Jul 24, 2020
5e49330
remove unused project
JonathanMagnan Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions System.Linq.Dynamic.Core.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Dynamic.Core",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.DynamicLinq", "src\EntityFramework.DynamicLinq\EntityFramework.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510000}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq", "src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510001}"
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}"
EndProject
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}"
ProjectSection(ProjectDependencies) = postProject
Expand All @@ -40,8 +40,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-uap", "test-uap", "{EC
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net40_sqlite", "src-console\ConsoleApp_net40_sqlite\ConsoleApp_net40_sqlite.csproj", "{E587974C-19A9-426A-A952-216D5F883EB6}"
Expand Down Expand Up @@ -92,7 +90,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docfx", "docfx", "{012536E6
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lab", "lab", "{E97833C1-77B6-44E2-8793-C1F952CA936F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z.Dynamic.Core.Lab", "Z.Dynamic.Core.Lab\Z.Dynamic.Core.Lab.csproj", "{CDD8D5BF-A212-43DD-B043-4B7242C553E0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Z.Dynamic.Core.Lab", "Z.Dynamic.Core.Lab\Z.Dynamic.Core.Lab.csproj", "{CDD8D5BF-A212-43DD-B043-4B7242C553E0}"
EndProject
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -216,22 +216,6 @@ Global
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x64.Build.0 = Release|Any CPU
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x86.ActiveCfg = Release|Any CPU
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x86.Build.0 = Release|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|ARM.ActiveCfg = Debug|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|ARM.Build.0 = Debug|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|x64.ActiveCfg = Debug|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|x64.Build.0 = Debug|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|x86.ActiveCfg = Debug|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Debug|x86.Build.0 = Debug|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|Any CPU.Build.0 = Release|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|ARM.ActiveCfg = Release|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|ARM.Build.0 = Release|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|x64.ActiveCfg = Release|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|x64.Build.0 = Release|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|x86.ActiveCfg = Release|Any CPU
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4}.Release|x86.Build.0 = Release|Any CPU
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -524,6 +508,22 @@ Global
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x64.Build.0 = Release|Any CPU
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x86.ActiveCfg = Release|Any CPU
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x86.Build.0 = Release|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|ARM.Build.0 = Debug|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|x64.ActiveCfg = Debug|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|x64.Build.0 = Debug|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|x86.ActiveCfg = Debug|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|x86.Build.0 = Debug|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|Any CPU.Build.0 = Release|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|ARM.ActiveCfg = Release|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|ARM.Build.0 = Release|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|x64.ActiveCfg = Release|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|x64.Build.0 = Release|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|x86.ActiveCfg = Release|Any CPU
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -536,7 +536,6 @@ Global
{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
{BF97CB1B-5043-4256-8F42-CF3A4F3863BE} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{59E67CE3-5DB7-4D37-B308-E4E22E3DE4F4} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{0EB12661-F5CF-4071-9812-F4C8AF3D4531} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{E587974C-19A9-426A-A952-216D5F883EB6} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
Expand All @@ -555,6 +554,7 @@ Global
{0034821E-740D-4553-821B-14CE9213C43C} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{CD80A3AC-B0E1-45ED-BE07-DE6A0F1D4CD8} = {122BC4FA-7563-4E35-9D17-077F16F1629F}
{CDD8D5BF-A212-43DD-B043-4B7242C553E0} = {E97833C1-77B6-44E2-8793-C1F952CA936F}
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}
Expand Down
20 changes: 0 additions & 20 deletions src-console/ConsoleAppEF1.1/ConsoleApp_netcore1.1_EF1.1.2.csproj
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions src-console/ConsoleAppEF1.1/MyDbContext.cs
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions src-console/ConsoleAppEF1.1/Program.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src-console/ConsoleAppEF2.0.2_InMemory/ConsoleApp_netcore2.0_EF2.0.2_InMemory.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src-console/ConsoleAppEF2.0/ConsoleApp_netcore2.0_EF2.0.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src-console/ConsoleAppEF2.1.1/ConsoleApp_netcore2.1_EF2.1.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src-console/ConsoleAppEF2.1.1_InMemory/ConsoleApp_netcore2.1_EF2.1.1_InMemory.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src-console/ConsoleAppEF3.1/ConsoleApp_netcore3.1_EF3.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj" />
<ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj" />
<ProjectReference Include="..\..\src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Compile Include="..\System.Linq.Dynamic.Core\Compatibility\*.cs" />
<Compile Include="..\System.Linq.Dynamic.Core\Extensions\*.cs" />
<Compile Include="..\System.Linq.Dynamic.Core\Validation\*.cs" />
<Compile Include="..\Microsoft.EntityFrameworkCore.DynamicLinq\*.cs" />
<Compile Include="..\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\*.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
0 ...FrameworkCore.DynamicLinq.AppVeyor.csproj → ...FrameworkCore.DynamicLinq.AppVeyor.csproj
View file
Open in desktop
File renamed without changes.
59 changes: 59 additions & 0 deletions ...rameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
<AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
<Authors>ZZZ Projects;Stef Heyenrath</Authors>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);EFCORE;EFCORE_2X;EFDYNAMICFUNCTIONS</DefineConstants>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyName>
<AssemblyOriginatorKeyFile>Microsoft.EntityFrameworkCore.DynamicLinq.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
<PackageReleaseNotes>Bugfixes and new Features. For details see CHANGELOG.md</PackageReleaseNotes>
<PackageProjectUrl>https://dynamic-linq.net/</PackageProjectUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageIconUrl>https://zzzprojects.github.io/images/logo/logo-64.png</PackageIconUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/zzzprojects/System.Linq.Dynamic.Core</RepositoryUrl>
<DefaultLanguage>en-us</DefaultLanguage>
<ProjectGuid>{D3804228-91F4-4502-9595-39584E510001}</ProjectGuid>
<DebugType>full</DebugType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<Company>ZZZ Projects</Company>
<Copyright>Copyright © ZZZ Projects</Copyright>
</PropertyGroup>

<PropertyGroup Condition=" '$(buildType)' == 'azure-pipelines-ci' ">
<TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<!--<IncludeSource>True</IncludeSource>
<IncludeSymbols>True</IncludeSymbols>
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\System.Linq.Dynamic.Core\Res.cs" />
<Compile Include="..\System.Linq.Dynamic.Core\Compatibility\*.cs" />
<Compile Include="..\System.Linq.Dynamic.Core\Extensions\*.cs" />
<Compile Include="..\System.Linq.Dynamic.Core\Validation\*.cs" />
<Compile Include="..\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\*.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="10.2.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
</ItemGroup>
</Project>
0 ...osoft.EntityFrameworkCore.DynamicLinq.snk → ...osoft.EntityFrameworkCore.DynamicLinq.snk
View file
Open in desktop
File renamed without changes.
0 ...re.DynamicLinq/Properties/AssemblyInfo.cs → ...icLinq.EFCore2/Properties/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
0 ...eworkCore.DynamicLinq/DynamicFunctions.cs → ...e.DynamicLinq.EFCore3/DynamicFunctions.cs
View file
Open in desktop
File renamed without changes.
Loading