Merge branch 'feature/gogs13_2024-01-19_MoveQueryBuilderToLinq' of serset/Vit.Linq into develop

src/Test/Vit.Linq.MsTest/Vit.Linq.MsTest.csproj

@@ -17,8 +17,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Vit.Linq.QueryBuilder.NewtonsoftJson\Vit.Linq.QueryBuilder.NewtonsoftJson.csproj" />
-        <ProjectReference Include="..\..\Vit.Linq.QueryBuilder.SystemTextJson\Vit.Linq.QueryBuilder.SystemTextJson.csproj" />
+        <ProjectReference Include="..\..\Vit.Linq.Extensions\Vit.Linq.Extensions.csproj" />
+        <ProjectReference Include="..\..\Vit.Linq.NewtonsoftJson\Vit.Linq.NewtonsoftJson.csproj" />
+        <ProjectReference Include="..\..\Vit.Linq.SystemTextJson\Vit.Linq.SystemTextJson.csproj" />
         <ProjectReference Include="..\..\Vit.Linq\Vit.Linq.csproj" />
     </ItemGroup>
 

src/Test/Vit.Linq.MsTest31/Vit.Linq.MsTest31.csproj

@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
@@ -13,8 +12,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Vit.Linq.QueryBuilder.NewtonsoftJson\Vit.Linq.QueryBuilder.NewtonsoftJson.csproj" />
-        <ProjectReference Include="..\..\Vit.Linq.QueryBuilder.SystemTextJson\Vit.Linq.QueryBuilder.SystemTextJson.csproj" />
+        <ProjectReference Include="..\..\Vit.Linq.Extensions\Vit.Linq.Extensions.csproj" />
+        <ProjectReference Include="..\..\Vit.Linq.NewtonsoftJson\Vit.Linq.NewtonsoftJson.csproj" />
+        <ProjectReference Include="..\..\Vit.Linq.SystemTextJson\Vit.Linq.SystemTextJson.csproj" />
         <ProjectReference Include="..\..\Vit.Linq\Vit.Linq.csproj" />
     </ItemGroup>
 

src/Vit.Linq/Extensions/IQueryable_Page_Extensions.cs → src/Vit.Linq.Extensions/Extensions/IQueryable_Page_Extensions.cs

@@ -23,8 +23,8 @@ namespace Vit.Extensions.Linq_Extensions
         /// 
         /// </summary>
         /// <param name="query"></param>
-        /// <param name="pageIndex">页码，从1开始</param>
-        /// <param name="pageSize">每页数据个数</param>
+        /// <param name="pageIndex">start from 1</param>
+        /// <param name="pageSize"></param>
         /// <returns></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static IQueryable IQueryable_Page(this IQueryable query, int pageIndex, int pageSize)

src/Vit.Linq/Extensions/IQueryable_Sort_Extensions.cs → src/Vit.Linq.Extensions/Extensions/IQueryable_Sort_Extensions.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
+
 using Vit.Core.Util.ComponentModel.Query;
 using Vit.Linq.QueryBuilder;
 
@@ -40,7 +41,7 @@ namespace Vit.Extensions.Linq_Extensions
 
             foreach (var item in sort)
             {
-                //(x.1)get memberExp     
+                // get memberExp
                 MemberExpression memberExp = LinqHelp.GetFieldMemberExpression(parameter, item.field);
 
 
@@ -60,10 +61,10 @@ namespace Vit.Extensions.Linq_Extensions
 
         /// <summary>
         /// 
-        /// </summary>      
+        /// </summary>
         /// <param name="query"></param>
-        /// <param name="field">字段名</param>
-        /// <param name="asc">是否为正向排序</param>
+        /// <param name="field"></param>
+        /// <param name="asc"> whether sort by asc</param>
         /// <returns></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static IQueryable IQueryable_Sort(this IQueryable query, string field, bool asc = true)

src/Vit.Linq/Extensions/IQueryable_ToPageData_Extensions.cs → src/Vit.Linq.Extensions/Extensions/IQueryable_ToPageData_Extensions.cs

@@ -34,7 +34,7 @@ namespace Vit.Extensions.Linq_Extensions
 
         #region IQueryable_ToPageData  with selector
         /// <summary>
-        /// 注：先查询，后调用selector
+        ///  filter first, then ToList, then invoke selector
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="TResult"></typeparam>
@@ -55,7 +55,7 @@ namespace Vit.Extensions.Linq_Extensions
         }
 
         /// <summary>
-        /// 注：先查询，后调用selector
+        ///  filter first, then ToList, then invoke selector
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="TResult"></typeparam>

src/Vit.Linq/Extensions/Queryable_Page_Extensions.cs → src/Vit.Linq.Extensions/Extensions/Queryable_Page_Extensions.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
+
 using Vit.Core.Util.ComponentModel.Data;
 
 namespace Vit.Extensions.Linq_Extensions
@@ -15,7 +16,7 @@ namespace Vit.Extensions.Linq_Extensions
         {
             if (query == null || page == null) return query;
 
-            return query.Page(page.pageIndex, page.pageSize); 
+            return query.Page(page.pageIndex, page.pageSize);
         }
 
 
@@ -24,13 +25,13 @@ namespace Vit.Extensions.Linq_Extensions
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="query"></param>
-        /// <param name="pageIndex">页码，从1开始</param>
-        /// <param name="pageSize">每页数据个数</param>
+        /// <param name="pageIndex">start from 1</param>
+        /// <param name="pageSize"></param>
         /// <returns></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static IQueryable<T> Page<T>(this IQueryable<T> query,int pageIndex, int pageSize)
+        public static IQueryable<T> Page<T>(this IQueryable<T> query, int pageIndex, int pageSize)
           where T : class
-        {  
+        {
             return query.Skip((pageIndex - 1) * pageSize).Take(pageSize);
         }
     }

src/Vit.Linq/Extensions/Queryable_Sort_ByReflection_Extensions.cs → src/Vit.Linq.Extensions/Extensions/Queryable_Sort_ByReflection_Extensions.cs

@@ -62,8 +62,8 @@ namespace Vit.Extensions.Linq_Extensions
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="query"></param>
-        /// <param name="field">字段名</param>
-        /// <param name="asc">是否为正向排序</param>
+        /// <param name="field"></param>
+        /// <param name="asc"> whether sort by asc</param>
         /// <returns></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static IQueryable<T> Sort_ByReflection<T>(this IQueryable<T> query, string field, bool asc = true)

src/Vit.Linq/Extensions/Queryable_Sort_Extensions.cs → src/Vit.Linq.Extensions/Extensions/Queryable_Sort_Extensions.cs

@@ -52,8 +52,8 @@ namespace Vit.Extensions.Linq_Extensions
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="query"></param>
-        /// <param name="field">字段名</param>
-        /// <param name="asc">是否为正向排序</param>
+        /// <param name="field"></param>
+        /// <param name="asc"> whether sort by asc</param>
         /// <returns></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static IQueryable<T> Sort<T>(this IQueryable<T> query, string field, bool asc = true)

src/Vit.Linq/Extensions/Queryable_ToPageData_Extensions.cs → src/Vit.Linq.Extensions/Extensions/Queryable_ToPageData_Extensions.cs

@@ -13,7 +13,7 @@ namespace Vit.Extensions.Linq_Extensions
     public static partial class Queryable_ToPageData_Extensions
     {
 
-        #region ToPageData       
+        #region ToPageData
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static PageData<T> ToPageData<T>(this IQueryable<T> query, PageInfo page)
             where T : class
@@ -37,7 +37,7 @@ namespace Vit.Extensions.Linq_Extensions
 
         #region ToPageData with selector
         /// <summary>
-        /// 注：先查询，后调用selector
+        ///  filter first, then ToList, then invoke selector
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="TResult"></typeparam>
@@ -59,7 +59,7 @@ namespace Vit.Extensions.Linq_Extensions
         }
 
         /// <summary>
-        /// 注：先查询，后调用selector
+        ///  filter first, then ToList, then invoke selector
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="TResult"></typeparam>

src/Vit.Linq.QueryBuilder/Vit.Linq.QueryBuilder.csproj → src/Vit.Linq.Extensions/Vit.Linq.Extensions.csproj

@@ -11,7 +11,7 @@
 
     <PropertyGroup>
         <Authors>Lith</Authors>
-        <Description>Linq extensions (QueryBuilder)</Description>
+        <Description>Linq extensions</Description>
         <PackageProjectUrl>https://github.com/serset/Vit.Linq</PackageProjectUrl>
     </PropertyGroup>
 
@@ -19,6 +19,12 @@
         <DocumentationFile>bin\Debug\netstandard2.0\Vit.Linq.QueryBuilder</DocumentationFile>
     </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="Vit.Core" Version="2.1.19" />
+    </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\Vit.Linq\Vit.Linq.csproj" />
+    </ItemGroup>
 
 </Project>

src/Vit.Linq.QueryBuilder.NewtonsoftJson/Vit.Linq.QueryBuilder.NewtonsoftJson.csproj → src/Vit.Linq.NewtonsoftJson/Vit.Linq.NewtonsoftJson.csproj

@@ -11,12 +11,12 @@
 
     <PropertyGroup>
         <Authors>Lith</Authors>
-        <Description>Linq extensions (QueryBuilder)</Description>
+        <Description>Linq Filter</Description>
         <PackageProjectUrl>https://github.com/serset/Vit.Linq</PackageProjectUrl>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Vit.Linq.QueryBuilder\Vit.Linq.QueryBuilder.csproj" />
+        <ProjectReference Include="..\Vit.Linq\Vit.Linq.csproj" />
     </ItemGroup>
 
     <ItemGroup>

src/Vit.Linq.QueryBuilder.SystemTextJson/Vit.Linq.QueryBuilder.SystemTextJson.csproj → src/Vit.Linq.SystemTextJson/Vit.Linq.SystemTextJson.csproj

@@ -11,16 +11,16 @@
 
     <PropertyGroup>
         <Authors>Lith</Authors>
-        <Description>Linq extensions (QueryBuilder)</Description>
+        <Description>Linq Filter</Description>
         <PackageProjectUrl>https://github.com/serset/Vit.Linq</PackageProjectUrl>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Vit.Linq.QueryBuilder\Vit.Linq.QueryBuilder.csproj" />
+        <PackageReference Include="System.Text.Json" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.Text.Json" Version="6.0.0" />
+      <ProjectReference Include="..\Vit.Linq\Vit.Linq.csproj" />
     </ItemGroup>
 
 

src/Vit.Linq.sln

@@ -9,13 +9,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.MsTest", "Test\Vit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq", "Vit.Linq\Vit.Linq.csproj", "{A27EF8DC-2284-43BF-98E7-CE3C35E296CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.QueryBuilder", "Vit.Linq.QueryBuilder\Vit.Linq.QueryBuilder.csproj", "{FB5B2005-AF15-423D-81E5-545F111C9848}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.MsTest31", "Test\Vit.Linq.MsTest31\Vit.Linq.MsTest31.csproj", "{7E513E2C-BF52-4662-AD8F-5910F283178D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.QueryBuilder.SystemTextJson", "Vit.Linq.QueryBuilder.SystemTextJson\Vit.Linq.QueryBuilder.SystemTextJson.csproj", "{4A09A6CE-F8E7-4609-8628-50DA53CAD650}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.Extensions", "Vit.Linq.Extensions\Vit.Linq.Extensions.csproj", "{7644C85D-F136-4654-8422-F4C3AEE9A22F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.QueryBuilder.NewtonsoftJson", "Vit.Linq.QueryBuilder.NewtonsoftJson\Vit.Linq.QueryBuilder.NewtonsoftJson.csproj", "{3F182219-4F27-4FD2-A0C6-A4C6130C96E2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.NewtonsoftJson", "Vit.Linq.NewtonsoftJson\Vit.Linq.NewtonsoftJson.csproj", "{BC843F69-5ED6-44C2-8A41-0F5826CC1911}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.MsTest31", "Test\Vit.Linq.MsTest31\Vit.Linq.MsTest31.csproj", "{7E513E2C-BF52-4662-AD8F-5910F283178D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.SystemTextJson", "Vit.Linq.SystemTextJson\Vit.Linq.SystemTextJson.csproj", "{6C1BC7F7-5C2C-425B-90EC-96D2B94F6C1B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,22 +31,22 @@ Global
 		{A27EF8DC-2284-43BF-98E7-CE3C35E296CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A27EF8DC-2284-43BF-98E7-CE3C35E296CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A27EF8DC-2284-43BF-98E7-CE3C35E296CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB5B2005-AF15-423D-81E5-545F111C9848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB5B2005-AF15-423D-81E5-545F111C9848}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB5B2005-AF15-423D-81E5-545F111C9848}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB5B2005-AF15-423D-81E5-545F111C9848}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A09A6CE-F8E7-4609-8628-50DA53CAD650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A09A6CE-F8E7-4609-8628-50DA53CAD650}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A09A6CE-F8E7-4609-8628-50DA53CAD650}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A09A6CE-F8E7-4609-8628-50DA53CAD650}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F182219-4F27-4FD2-A0C6-A4C6130C96E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F182219-4F27-4FD2-A0C6-A4C6130C96E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F182219-4F27-4FD2-A0C6-A4C6130C96E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F182219-4F27-4FD2-A0C6-A4C6130C96E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E513E2C-BF52-4662-AD8F-5910F283178D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7E513E2C-BF52-4662-AD8F-5910F283178D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E513E2C-BF52-4662-AD8F-5910F283178D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E513E2C-BF52-4662-AD8F-5910F283178D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7644C85D-F136-4654-8422-F4C3AEE9A22F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7644C85D-F136-4654-8422-F4C3AEE9A22F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7644C85D-F136-4654-8422-F4C3AEE9A22F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7644C85D-F136-4654-8422-F4C3AEE9A22F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC843F69-5ED6-44C2-8A41-0F5826CC1911}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC843F69-5ED6-44C2-8A41-0F5826CC1911}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC843F69-5ED6-44C2-8A41-0F5826CC1911}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC843F69-5ED6-44C2-8A41-0F5826CC1911}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C1BC7F7-5C2C-425B-90EC-96D2B94F6C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C1BC7F7-5C2C-425B-90EC-96D2B94F6C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C1BC7F7-5C2C-425B-90EC-96D2B94F6C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C1BC7F7-5C2C-425B-90EC-96D2B94F6C1B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Vit.Linq/Vit.Linq.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <pack>nuget</pack>
@@ -11,7 +11,7 @@
 
     <PropertyGroup>
         <Authors>Lith</Authors>
-        <Description>Linq extensions</Description>
+        <Description>Linq Filter</Description>
         <PackageProjectUrl>https://github.com/serset/Vit.Linq</PackageProjectUrl>
     </PropertyGroup>
 
@@ -19,12 +19,5 @@
         <DocumentationFile>bin\Debug\netstandard2.0\Vit.Linq.xml</DocumentationFile>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Vit.Core" Version="2.1.19" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Vit.Linq.QueryBuilder\Vit.Linq.QueryBuilder.csproj" />
-    </ItemGroup>
 
 </Project>