改进生成分页

Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj

@@ -4,7 +4,7 @@
     <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet />
-    <Version>2.4.4.4</Version>
+    <Version>2.4.4.6</Version>
     <Authors>懒得勤快</Authors>
     <Description>Masuit.Tools基础公共库，包含一些常用的操作类，大都是静态类，加密解密，反射操作，Excel简单导出，权重随机筛选算法，分布式短id，表达式树，linq扩展，文件压缩，多线程下载和FTP客户端，硬件信息，字符串扩展方法，日期时间扩展操作，中国农历，大文件拷贝，图像裁剪，验证码，断点续传，集合扩展等常用封装。</Description>
     <Copyright>懒得勤快，长空X</Copyright>
@@ -17,9 +17,9 @@
     <RepositoryType>Github</RepositoryType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <FileVersion>2.4.4.4</FileVersion>
+    <FileVersion>2.4.4.6</FileVersion>
     <Company>masuit.com</Company>
-    <AssemblyVersion>2.4.4.4</AssemblyVersion>
+    <AssemblyVersion>2.4.4.6</AssemblyVersion>
     <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>

Masuit.Tools.Abstractions/Models/PagedList.cs

@@ -77,7 +77,7 @@ namespace Masuit.Tools.Models
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
-        public static PagedList<T> ToPagedList<T>(this IOrderedQueryable<T> query, int page, int size)
+        public static PagedList<T> ToPagedList<T>(this IQueryable<T> query, int page, int size)
         {
             var totalCount = query.Count();
             if (page * size > totalCount)

Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -18,10 +18,10 @@ github：https://github.com/ldqk/Masuit.Tools
         <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
         <RepositoryType>Github</RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Version>2.4.4.5</Version>
-        <FileVersion>2.4.4.5</FileVersion>
+        <Version>2.4.4.6</Version>
+        <FileVersion>2.4.4.6</FileVersion>
         <Company>masuit.com</Company>
-        <AssemblyVersion>2.4.4.5</AssemblyVersion>
+        <AssemblyVersion>2.4.4.6</AssemblyVersion>
         <Authors>懒得勤快X</Authors>
         <RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>

Masuit.Tools.Core/Models/IQueryableExt.cs

@@ -15,7 +15,7 @@ namespace Masuit.Tools.Models
         /// <param name="page">当前页</param>
         /// <param name="size">页大小</param>
         /// <returns></returns>
-        public static async Task<PagedList<T>> ToPagedListAsync<T>(this IOrderedQueryable<T> query, int page, int size)
+        public static async Task<PagedList<T>> ToPagedListAsync<T>(this IQueryable<T> query, int page, int size)
         {
             var totalCount = await query.CountAsync();
             if (page * size > totalCount)

Masuit.Tools.Net45/package.nuspec

@@ -4,7 +4,7 @@
     <!--*-->
     <id>Masuit.Tools.Net45</id>
     <!--*-->
-    <version>2.4.4.4</version>
+    <version>2.4.4.6</version>
     <title>Masuit.Tools</title>
     <!--*-->
     <authors>懒得勤快</authors>

Masuit.Tools/package.nuspec

@@ -4,7 +4,7 @@
     <!--*-->
     <id>Masuit.Tools.Net</id>
     <!--*-->
-    <version>2.4.4.4</version>
+    <version>2.4.4.6</version>
     <title>Masuit.Tools</title>
     <!--*-->
     <authors>懒得勤快</authors>