diff --git a/System.Linq.Dynamic.Core.sln b/System.Linq.Dynamic.Core.sln
index 5f573c27..5f3c9303 100644
--- a/System.Linq.Dynamic.Core.sln
+++ b/System.Linq.Dynamic.Core.sln
@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8463ED7E-69FB-49AE-85CF-0791AFD98E38}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DBD7D9B6-FCC7-4650-91AF-E6457573A68F}"
+ ProjectSection(SolutionItems) = preProject
+ src\Directory.Build.props = src\Directory.Build.props
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{25E69107-C89E-4807-AA31-C49423F0F1E3}"
ProjectSection(SolutionItems) = preProject
@@ -19,7 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
NuGet.txt = NuGet.txt
README.md = README.md
report\run-coverlet-local.cmd = report\run-coverlet-local.cmd
- version.xml = version.xml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.DynamicLinq.Tests.net452", "test\EntityFramework.DynamicLinq.Tests.net452\EntityFramework.DynamicLinq.Tests.net452.csproj", "{6B45E89C-0788-4942-924F-EF6397114BD1}"
diff --git a/resources/logo.ico b/resources/logo.ico
new file mode 100644
index 00000000..132e7835
Binary files /dev/null and b/resources/logo.ico differ
diff --git a/resources/logo.png b/resources/logo.png
new file mode 100644
index 00000000..eb406f53
Binary files /dev/null and b/resources/logo.png differ
diff --git a/src-blazor/BlazorWASMExample/BlazorWASMExample.csproj b/src-blazor/BlazorWASMExample/BlazorWASMExample.csproj
index 3c298458..e06f4f08 100644
--- a/src-blazor/BlazorWASMExample/BlazorWASMExample.csproj
+++ b/src-blazor/BlazorWASMExample/BlazorWASMExample.csproj
@@ -18,7 +18,7 @@
-
+
\ No newline at end of file
diff --git a/src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/ConsoleApp_net40_sqlite_original.csproj b/src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/ConsoleApp_net40_sqlite_original.csproj
index f6dd3bce..e07a4f74 100644
--- a/src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/ConsoleApp_net40_sqlite_original.csproj
+++ b/src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/ConsoleApp_net40_sqlite_original.csproj
@@ -45,8 +45,8 @@
..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll
True
-
- ..\..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll
+
+ ..\..\packages\JetBrains.Annotations.2022.1.0\lib\net20\JetBrains.Annotations.dll
..\..\packages\SQLite.CodeFirst.1.3.0.17\lib\net40\SQLite.CodeFirst.dll
diff --git a/src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/packages.config b/src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/packages.config
index d211ee36..fef02f4e 100644
--- a/src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/packages.config
+++ b/src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 00000000..622dd61d
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,26 @@
+
+
+ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
+ ../../resources/logo.ico
+ ZZZ Projects;Stef Heyenrath
+ ZZZ Projects
+ Copyright © ZZZ Projects
+ en-us
+ true
+ latest
+ enable
+ logo.png
+ Apache-2.0
+ https://dynamic-linq.net/
+ Bugfixes and new Features. For details see CHANGELOG.md
+ true
+ true
+ git
+ https://github.com/zzzprojects/System.Linq.Dynamic.Core
+ true
+
+
+
+
+
+
diff --git a/src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj b/src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj
index a09bf679..e9105fdc 100644
--- a/src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj
+++ b/src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj
@@ -2,32 +2,15 @@
- 1.2.$(PatchVersion)
- Dynamic Linq extensions for EntityFramework which adds Async support
- EntityFramework.DynamicLinq
- ZZZ Projects;Stef Heyenrath
- net45;net452;net46;netstandard2.1
- EF;EFDYNAMICFUNCTIONS
- true
EntityFramework.DynamicLinq
EntityFramework.DynamicLinq.snk
- true
- true
+ EntityFramework.DynamicLinq
+ EF;EFDYNAMICFUNCTIONS
+ Dynamic Linq extensions for EntityFramework which adds Async support
system;linq;dynamic;entityframework;core;async
- Bugfixes and new Features. For details see CHANGELOG.md
- https://dynamic-linq.net/
- Apache-2.0
- https://zzzprojects.github.io/images/logo/logo-64.png
- git
- https://github.com/zzzprojects/System.Linq.Dynamic.Core
- en-us
{D3804228-91F4-4502-9595-39584E510000}
- true
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
- ZZZ Projects
- Copyright © ZZZ Projects
- 10
- enable
+ net45;net452;net46;netstandard2.1
+ 1.2.$(PatchVersion)
@@ -35,9 +18,6 @@
-
portable
true
@@ -55,7 +35,10 @@
-
+
+
+
+
diff --git a/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj b/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj
index 5b869177..6537b112 100644
--- a/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj
+++ b/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj
@@ -2,32 +2,15 @@
- 2.2.$(PatchVersion)
- Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support
- Microsoft.EntityFrameworkCore.DynamicLinq
- ZZZ Projects;Stef Heyenrath
- netstandard2.0
- $(DefineConstants);EFCORE;EFCORE_2X;EFDYNAMICFUNCTIONS
- true
Microsoft.EntityFrameworkCore.DynamicLinq
Microsoft.EntityFrameworkCore.DynamicLinq.snk
- true
- true
+ Microsoft.EntityFrameworkCore.DynamicLinq
+ $(DefineConstants);EFCORE;EFCORE_2X;EFDYNAMICFUNCTIONS
+ Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support
system;linq;dynamic;entityframework;core;async
- Bugfixes and new Features. For details see CHANGELOG.md
- https://dynamic-linq.net/
- Apache-2.0
- https://zzzprojects.github.io/images/logo/logo-64.png
- git
- https://github.com/zzzprojects/System.Linq.Dynamic.Core
- en-us
{D3804228-91F4-4502-9595-39584E510001}
- true
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
- ZZZ Projects
- Copyright © ZZZ Projects
- 10
- enable
+ netstandard2.0
+ 2.2.$(PatchVersion)
@@ -35,9 +18,6 @@
-
portable
true
@@ -59,7 +39,7 @@
-
+
diff --git a/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj b/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj
index 4d764773..e2e34391 100644
--- a/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj
+++ b/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj
@@ -2,32 +2,15 @@
- 3.2.$(PatchVersion)
- Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support
- Microsoft.EntityFrameworkCore.DynamicLinq
- ZZZ Projects;Stef Heyenrath
- netstandard2.0
- $(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE
- true
Microsoft.EntityFrameworkCore.DynamicLinq
../Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.snk
- true
- true
+ Microsoft.EntityFrameworkCore.DynamicLinq
+ $(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE
+ Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support
system;linq;dynamic;entityframework;core;async
- Bugfixes and new Features. For details see CHANGELOG.md
- https://dynamic-linq.net/
- Apache-2.0
- https://zzzprojects.github.io/images/logo/logo-64.png
- git
- https://github.com/zzzprojects/System.Linq.Dynamic.Core
- en-us
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}
- true
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
- ZZZ Projects
- Copyright © ZZZ Projects
- 10
- enable
+ netstandard2.0
+ 3.2.$(PatchVersion)
@@ -58,7 +41,7 @@
-
+
diff --git a/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj b/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj
index 2b557897..c879d151 100644
--- a/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj
+++ b/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj
@@ -2,32 +2,15 @@
- 5.2.$(PatchVersion)
- Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support
- Microsoft.EntityFrameworkCore.DynamicLinq
- ZZZ Projects;Stef Heyenrath
- netstandard2.1;net5.0
- $(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE
- true
Microsoft.EntityFrameworkCore.DynamicLinq
../Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.snk
- true
- true
+ Microsoft.EntityFrameworkCore.DynamicLinq
+ $(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE
+ Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support
system;linq;dynamic;entityframework;core;async
- Bugfixes and new Features. For details see CHANGELOG.md
- https://dynamic-linq.net/
- Apache-2.0
- https://zzzprojects.github.io/images/logo/logo-64.png
- git
- https://github.com/zzzprojects/System.Linq.Dynamic.Core
- en-us
{D3804228-91F4-4502-9595-39584E519901}
- true
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
- ZZZ Projects
- Copyright © ZZZ Projects
- 10
- enable
+ netstandard2.1;net5.0
+ 5.2.$(PatchVersion)
@@ -59,7 +42,7 @@
-
+
\ No newline at end of file
diff --git a/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6.csproj b/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6.csproj
index 55e8b65c..03f1ce55 100644
--- a/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6.csproj
+++ b/src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6.csproj
@@ -2,32 +2,15 @@
- 6.2.$(PatchVersion)
- Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support
- Microsoft.EntityFrameworkCore.DynamicLinq
- ZZZ Projects;Stef Heyenrath
- net6.0
- $(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE
- true
Microsoft.EntityFrameworkCore.DynamicLinq
../Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.snk
- true
- true
+ Microsoft.EntityFrameworkCore.DynamicLinq
+ $(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE
+ Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support
system;linq;dynamic;entityframework;core;async
- Bugfixes and new Features. For details see CHANGELOG.md
- https://dynamic-linq.net/
- Apache-2.0
- https://zzzprojects.github.io/images/logo/logo-64.png
- git
- https://github.com/zzzprojects/System.Linq.Dynamic.Core
- en-us
{D28F6393-B56B-40A2-AF67-E8D669F42546}
- true
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
- ZZZ Projects
- Copyright © ZZZ Projects
- 10
- enable
+ net6.0
+ 6.2.$(PatchVersion)
@@ -59,7 +42,7 @@
-
+
\ No newline at end of file
diff --git a/src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj b/src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj
index 1814848f..0d06a5e7 100644
--- a/src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj
+++ b/src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj
@@ -2,31 +2,15 @@
- 1.2.$(PatchVersion)
- This is a .NETStandard / .NET Core port of the the Microsoft assembly for the .Net 4.0 Dynamic language functionality.
- System.Linq.Dynamic.Core
- ZZZ Projects;Stef Heyenrath;Microsoft;Scott Guthrie;King Wilder;Nathan Arnott
- net35;net40;net45;net452;net46;netstandard1.3;netstandard2.0;netstandard2.1;uap10.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
- true
System.Linq.Dynamic.Core
System.Linq.Dynamic.Core.snk
- true
-
+ System.Linq.Dynamic.Core
+ ZZZ Projects;Stef Heyenrath;Microsoft;Scott Guthrie;King Wilder;Nathan Arnott
+ This is a .NETStandard / .NET Core port of the the Microsoft assembly for the .Net 4.0 Dynamic language functionality.
system;linq;dynamic;core;dotnet;NETCoreApp;NETStandard
- Bugfixes and new Features. For details see CHANGELOG.md
- https://dynamic-linq.net/
- Apache-2.0
- https://zzzprojects.github.io/images/logo/logo-64.png
- git
- https://github.com/zzzprojects/System.Linq.Dynamic.Core
- en-us
{D3804228-91F4-4502-9595-39584E510002}
- true
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
- ZZZ Projects
- Copyright © ZZZ Projects
- 10
- enable
+ net35;net40;net45;net452;net46;netstandard1.3;netstandard2.0;netstandard2.1;uap10.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
+ 1.2.$(PatchVersion)
@@ -75,7 +59,7 @@
-
+
diff --git a/src/Z.EntityFramework.Classic.DynamicLinq/Z.EntityFramework.Classic.DynamicLinq.csproj b/src/Z.EntityFramework.Classic.DynamicLinq/Z.EntityFramework.Classic.DynamicLinq.csproj
index 1b653e3d..88fd58ce 100644
--- a/src/Z.EntityFramework.Classic.DynamicLinq/Z.EntityFramework.Classic.DynamicLinq.csproj
+++ b/src/Z.EntityFramework.Classic.DynamicLinq/Z.EntityFramework.Classic.DynamicLinq.csproj
@@ -2,32 +2,15 @@
- 1.2.$(PatchVersion)
- Dynamic Linq extensions for Z.EntityFramework.Classic which adds Async support
- Z.EntityFramework.Classic.DynamicLinq
- ZZZ Projects;Stef Heyenrath
- net45;netstandard2.0
- EF
- true
Z.EntityFramework.Classic.DynamicLinq
Z.EntityFramework.Classic.DynamicLinq.snk
- true
- true
+ Z.EntityFramework.Classic.DynamicLinq
+ EF
+ Dynamic Linq extensions for Z.EntityFramework.Classic which adds Async support
system;linq;dynamic;Z.EntityFramework;core;async;classic
- Bugfixes and new Features. For details see CHANGELOG.md
- https://dynamic-linq.net/
- Apache-2.0
- https://zzzprojects.github.io/images/logo/logo-64.png
- git
- https://github.com/zzzprojects/System.Linq.Dynamic.Core
- en-us
{D3804228-91F4-4502-9595-39584Ea20000}
- true
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
- ZZZ Projects
- Copyright © ZZZ Projects
- 10
- enable
+ net45;netstandard2.0
+ 1.2.$(PatchVersion)
@@ -35,9 +18,6 @@
-
portable
true
@@ -55,7 +35,7 @@
-
+
\ No newline at end of file
diff --git a/test/System.Linq.Dynamic.Core.Tests.Net5/System.Linq.Dynamic.Core.Tests.Net5.csproj b/test/System.Linq.Dynamic.Core.Tests.Net5/System.Linq.Dynamic.Core.Tests.Net5.csproj
index 76ac497e..6f3f1075 100644
--- a/test/System.Linq.Dynamic.Core.Tests.Net5/System.Linq.Dynamic.Core.Tests.Net5.csproj
+++ b/test/System.Linq.Dynamic.Core.Tests.Net5/System.Linq.Dynamic.Core.Tests.Net5.csproj
@@ -7,7 +7,6 @@
True
../../src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.snk
false
-
$(DefineConstants);NETCOREAPP;EFCORE;EFCORE_3X;NETCOREAPP3_1
@@ -22,13 +21,9 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
-
diff --git a/test/System.Linq.Dynamic.Core.Tests.Net6/System.Linq.Dynamic.Core.Tests.Net6.csproj b/test/System.Linq.Dynamic.Core.Tests.Net6/System.Linq.Dynamic.Core.Tests.Net6.csproj
index 8e1bbc39..84e96058 100644
--- a/test/System.Linq.Dynamic.Core.Tests.Net6/System.Linq.Dynamic.Core.Tests.Net6.csproj
+++ b/test/System.Linq.Dynamic.Core.Tests.Net6/System.Linq.Dynamic.Core.Tests.Net6.csproj
@@ -13,8 +13,8 @@
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -26,13 +26,9 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
-
@@ -54,8 +50,8 @@
-
-
-
+
+
+
diff --git a/version.xml b/version.xml
index 95293eb3..640df83f 100644
--- a/version.xml
+++ b/version.xml
@@ -1,5 +1,5 @@
- 20
+ 21-preview-01