v1.5.0

zzzprojects · Dec 7, 2024 · 7176add · 7176add
1 parent ded6619
commit 7176add
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.5.0 (07 December 2024)
+- [#791](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/791) - Add Json support [feature] contributed by [StefH](https://github.com/StefH)
+- [#857](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/857) - RestrictOrderByToPropertyOrField [feature] contributed by [StefH](https://github.com/StefH)
+- [#789](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/789) - Add JSON support [feature]
+
 # v1.4.9 (16 November 2024)
 - [#853](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/853) - Add .NET 9 contributed by [StefH](https://github.com/StefH)
 

diff --git a/Generate-ReleaseNotes.bat b/Generate-ReleaseNotes.bat
@@ -1,5 +1,5 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=v1.4.9
+SET version=v1.5.0
 
 GitHubReleaseNotes --output CHANGELOG.md --exclude-labels invalid question documentation wontfix environment --language en --version %version% --token %GH_TOKEN%
diff --git a/NuGet.txt b/NuGet.txt
@@ -6,4 +6,4 @@ del /S *.nupkg
 
 VS rebuild
 
-dotnet nuget push **\*.nupkg --source https://api.nuget.org/v3/index.json --api-key x
+dotnet nuget push **\*.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key x
diff --git a/src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj b/src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
         <ProjectGuid>{D3804228-91F4-4502-9595-39584E510000}</ProjectGuid>
         <TargetFrameworks>net45;net452;net46;netstandard2.1</TargetFrameworks>
-        <Version>1.4.$(PatchVersion)</Version>
+        <Version>1.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/...rameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj b/...rameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
         <ProjectGuid>{D3804228-91F4-4502-9595-39584E510001}</ProjectGuid>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
-        <Version>2.4.$(PatchVersion)</Version>
+        <Version>2.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/...rameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj b/...rameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
         <ProjectGuid>{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}</ProjectGuid>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
-        <Version>3.4.$(PatchVersion)</Version>
+        <Version>3.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/...rameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj b/...rameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
         <ProjectGuid>{D3804228-91F4-4502-9595-39584E519901}</ProjectGuid>
         <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
-        <Version>5.4.$(PatchVersion)</Version>
+        <Version>5.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/...rameworkCore.DynamicLinq.EFCore6/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6.csproj b/...rameworkCore.DynamicLinq.EFCore6/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
         <ProjectGuid>{D28F6393-B56B-40A2-AF67-E8D669F42546}</ProjectGuid>
         <TargetFrameworks>net6.0</TargetFrameworks>
-        <Version>6.4.$(PatchVersion)</Version>
+        <Version>6.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/...rameworkCore.DynamicLinq.EFCore7/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore7.csproj b/...rameworkCore.DynamicLinq.EFCore7/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore7.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
         <ProjectGuid>{FB2F4C99-EC34-4D29-87E2-944B25D90ef7}</ProjectGuid>
         <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-        <Version>7.4.$(PatchVersion)</Version>
+        <Version>7.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/...rameworkCore.DynamicLinq.EFCore8/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore8.csproj b/...rameworkCore.DynamicLinq.EFCore8/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore8.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
         <ProjectGuid>{9000129D-322D-4FE6-9C47-75464577C374}</ProjectGuid>
         <TargetFrameworks>net8.0</TargetFrameworks>
-        <Version>8.4.$(PatchVersion)</Version>
+        <Version>8.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/...rameworkCore.DynamicLinq.EFCore9/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9.csproj b/...rameworkCore.DynamicLinq.EFCore9/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
         <ProjectGuid>{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}</ProjectGuid>
         <TargetFrameworks>net9.0</TargetFrameworks>
-        <Version>9.4.$(PatchVersion)</Version>
+        <Version>9.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/src/System.Linq.Dynamic.Core.NewtonsoftJson/System.Linq.Dynamic.Core.NewtonsoftJson.csproj b/src/System.Linq.Dynamic.Core.NewtonsoftJson/System.Linq.Dynamic.Core.NewtonsoftJson.csproj
@@ -9,7 +9,7 @@
         <PackageTags>system;linq;dynamic;core;dotnet;json</PackageTags>
         <ProjectGuid>{8C5851B8-5C47-4229-AB55-D4252703598E}</ProjectGuid>
         <TargetFrameworks>net45;net452;net46;netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
-        <Version>1.4.$(PatchVersion)</Version>
+        <Version>1.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/src/System.Linq.Dynamic.Core.SystemTextJson/System.Linq.Dynamic.Core.SystemTextJson.csproj b/src/System.Linq.Dynamic.Core.SystemTextJson/System.Linq.Dynamic.Core.SystemTextJson.csproj
@@ -9,7 +9,7 @@
         <PackageTags>system;linq;dynamic;core;dotnet;json</PackageTags>
         <ProjectGuid>{FA01CE15-315A-499E-AFC2-955CA7EB45FF}</ProjectGuid>
         <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
-        <Version>1.4.$(PatchVersion)</Version>
+        <Version>1.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj b/src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;core;dotnet;NETCoreApp;NETStandard</PackageTags>
         <ProjectGuid>{D3804228-91F4-4502-9595-39584E510002}</ProjectGuid>
         <TargetFrameworks>net35;net40;net45;net452;net46;netstandard1.3;netstandard2.0;netstandard2.1;uap10.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
-        <Version>1.4.$(PatchVersion)</Version>
+        <Version>1.5.$(PatchVersion)</Version>
         <!--<IsTrimmable>true</IsTrimmable>-->
     </PropertyGroup>
 

diff --git a/src/Z.EntityFramework.Classic.DynamicLinq/Z.EntityFramework.Classic.DynamicLinq.csproj b/src/Z.EntityFramework.Classic.DynamicLinq/Z.EntityFramework.Classic.DynamicLinq.csproj
@@ -10,7 +10,7 @@
         <PackageTags>system;linq;dynamic;Z.EntityFramework;core;async;classic</PackageTags>
         <ProjectGuid>{D3804228-91F4-4502-9595-39584Ea20000}</ProjectGuid>
         <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
-        <Version>1.4.$(PatchVersion)</Version>
+        <Version>1.5.$(PatchVersion)</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/test/System.Linq.Dynamic.Core.Tests.Net8/System.Linq.Dynamic.Core.Tests.Net8.csproj b/test/System.Linq.Dynamic.Core.Tests.Net8/System.Linq.Dynamic.Core.Tests.Net8.csproj
@@ -11,20 +11,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Linq.PropertyTranslator.Core" Version="1.0.5" />
         <PackageReference Include="QueryInterceptor.Core" Version="1.0.9" />

diff --git a/version.xml b/version.xml
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <PatchVersion>9</PatchVersion>
+    <PatchVersion>0</PatchVersion>
   </PropertyGroup>
 </Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ del /S *.nupkg

		VS rebuild

		dotnet nuget push *\.nupkg --source https://api.nuget.org/v3/index.json --api-key x
		dotnet nuget push *\.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key x