浏览代码

修正Contains的bug

懒得勤快 4 年之前
父节点
当前提交
63f0ed5107

+ 2 - 2
Masuit.Tools.Abstractions/Extensions/BaseType/StringExtensions.cs

@@ -105,10 +105,10 @@ namespace Masuit.Tools
 
             if (ignoreCase)
             {
-                return Regex.IsMatch(s, string.Join("|", keys), RegexOptions.IgnoreCase);
+                return Regex.IsMatch(s, string.Join("|", keys.Select(Regex.Escape)), RegexOptions.IgnoreCase);
             }
 
-            return Regex.IsMatch(s, string.Join("|", keys));
+            return Regex.IsMatch(s, string.Join("|", keys.Select(Regex.Escape)));
         }
 
         /// <summary>

+ 3 - 3
Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj

@@ -7,7 +7,7 @@
     <LangVersion>9.0</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet />
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <Authors>懒得勤快</Authors>
     <Description>Masuit.Tools基础公共库</Description>
     <Copyright>懒得勤快,长空X</Copyright>
@@ -20,9 +20,9 @@
     <RepositoryType>Github</RepositoryType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <FileVersion>2.4</FileVersion>
+    <FileVersion>2.4.1</FileVersion>
     <Company>masuit.com</Company>
-    <AssemblyVersion>2.4</AssemblyVersion>
+    <AssemblyVersion>2.4.1</AssemblyVersion>
     <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
   </PropertyGroup>
 

+ 3 - 3
Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -21,10 +21,10 @@
         <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
         <RepositoryType>Github</RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Version>2.4.0</Version>
-        <FileVersion>2.4</FileVersion>
+        <Version>2.4.1</Version>
+        <FileVersion>2.4.1</FileVersion>
         <Company>masuit.com</Company>
-        <AssemblyVersion>2.4</AssemblyVersion>
+        <AssemblyVersion>2.4.1</AssemblyVersion>
         <Authors>懒得勤快X</Authors>
         <RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
     </PropertyGroup>

+ 2 - 2
Masuit.Tools/Masuit.Tools.csproj

@@ -28,7 +28,7 @@
     <DocumentationFile>bin\Debug\Masuit.Tools.XML</DocumentationFile>
     <NoWarn>1591</NoWarn>
     <CodeAnalysisRuleSet />
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -41,7 +41,7 @@
     <DocumentationFile>bin\Release\Masuit.Tools.XML</DocumentationFile>
     <NoWarn>1591</NoWarn>
     <CodeAnalysisRuleSet />
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

二进制
Masuit.Tools/Properties/AssemblyInfo.cs


+ 1 - 1
Masuit.Tools/package.nuspec

@@ -4,7 +4,7 @@
     <!--*-->
     <id>Masuit.Tools.Net</id>
     <!--*-->
-    <version>2.3.2.6</version>
+    <version>2.4.1</version>
     <title>Masuit.Tools</title>
     <!--*-->
     <authors>masuit.com</authors>