修正 #130

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-   <Version>2025.4.4</Version>
+   <Version>2025.4.5</Version>
    <Deterministic>true</Deterministic>
  </PropertyGroup>
 </Project>

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

@@ -51,9 +51,9 @@
         <PackageReference Include="AngleSharp.Css" Version="1.0.0-beta.151" />
         <PackageReference Include="DnsClient" Version="1.8.0" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="System.Management" Version="9.0.6" />
+        <PackageReference Include="System.Management" Version="9.0.7" />
         <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
         <PackageReference Include="SharpCompress" Version="0.40.0" />
     </ItemGroup>
@@ -64,7 +64,7 @@
         <PackageReference Include="System.Memory" Version="4.6.3" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="[1.0.0]" />
         <PackageReference Include="SixLabors.ImageSharp" Version="[2.1.10]" />
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.7" />
         <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
         <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="[7.0.0]" />
     </ItemGroup>
@@ -75,7 +75,7 @@
         <PackageReference Include="System.Memory" Version="4.6.3" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="[1.0.0]" />
         <PackageReference Include="SixLabors.ImageSharp" Version="[2.1.10]" />
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.7" />
         <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
         <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="[7.0.0]" />
     </ItemGroup>
@@ -83,23 +83,23 @@
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
         <PackageReference Include="Castle.Core" Version="5.1.1" />
         <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="[7.0.0]" />
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.7" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
         <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
         <PackageReference Include="Castle.Core" Version="5.2.1" />
-        <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.6" />
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
+        <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.7" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.7" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
         <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net9'">
         <PackageReference Include="Castle.Core" Version="5.2.1" />
-        <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.6" />
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
+        <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.7" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.7" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
         <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
     </ItemGroup>

Masuit.Tools.Abstractions/Strings/NumberFormater.cs

@@ -131,8 +131,8 @@ namespace Masuit.Tools.Strings
             {
                 <= 2 => "01",
                 > 2 and < 65 => "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+/".Substring(0, @base),
-                >= 65 and <= 95 => "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!-._\"#$%&'()*+,/:;<=>?@[\\]^`{|}~".Substring(0, @base),
-                _ => throw new ArgumentException("默认进制最大支持95进制")
+                >= 65 and <= 94 => "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!-._\"#$%&'()*+,/:;<=>?@[\\]^`{|}~".Substring(0, @base),
+                _ => throw new ArgumentException("默认进制最大支持94进制")
             };
 
             if (offset >= @base)

Masuit.Tools.AspNetCore/Masuit.Tools.AspNetCore.csproj

@@ -55,12 +55,12 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.32]" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net9'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.7" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.36" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.17" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.18" />
     </ItemGroup>
 </Project>

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

@@ -45,13 +45,13 @@ github：https://github.com/ldqk/Masuit.Tools
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1.32]" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net9'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.7" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.36" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.18" />
     </ItemGroup>
     <ItemGroup>
       <Compile Remove="..\Masuit.Tools.Abstractions\Mapping\**" />

NetCoreTest/NetCoreTest.csproj

@@ -6,7 +6,7 @@
     <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Controllers\" />

README.md

@@ -233,7 +233,7 @@ var num=123.45.ToChineseNumber(); // 一百二十三点四五
 可用于生成短id，短hash，随机字符串等操作，纯数学运算。
 
 ```csharp
-NumberFormater nf = new NumberFormater(36);//内置2-95进制的转换
+NumberFormater nf = new NumberFormater(36);//内置2-94进制的转换
 //NumberFormater nf = new NumberFormater("0123456789abcdefghijklmnopqrstuvwxyz");// 自定义进制字符，可用于生成验证码，自定义字符可支持任意进制，你传1w个字符进去那就支持一万进制(手动狗头)
 string s36 = nf.ToString(12345678);
 long num = nf.FromString("7clzi");

Test/Masuit.Tools.AspNetCore.ResumeFileResults.WebTest/Masuit.Tools.AspNetCore.ResumeFileResults.WebTest.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">