Merge branch 'dev' of https://github.com/nsnail/ns-ext into dev

src/Constant/Regexes.cs

@@ -0,0 +1,19 @@
+namespace NSExt.Constant;
+#pragma warning disable SYSLIB1045
+
+// 使用 RegexGenerator 新特性会生成重复key值的xmlcomment导致出错
+internal static class Regexes
+{
+    public static readonly Regex RegexBacksLantUnicode
+        = new("\\\\u([a-fA-F0-9]{4})", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    public static readonly Regex RegexHtmlTag = new("<[^>]*>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    public static readonly Regex RegexMobile
+        = new("^(\\d{3})\\d{4}(\\d{4})$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    public static readonly Regex RegexPercentUnicode
+        = new("\\\\u([a-fA-F0-9]{4})", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    public static readonly Regex RegexUpLetter = new("([A-Z])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+}

src/Extensions/DbCommandExtensions.cs

@@ -1,7 +1,7 @@
 namespace NSExt.Extensions;
 
 /// <summary>
-///     DbCommandExtensions
+/// DbCommandExtensions
 /// </summary>
 public static class DbCommandExtensions
 {
@@ -15,30 +15,18 @@ public static class DbCommandExtensions
 
         //应逆向替换，否则由于 多个表的过滤器问题导致替换不完整  如 @TenantId1  @TenantId10
         for (var i = me.Parameters.Count - 1; i >= 0; i--) {
+            #pragma warning disable IDE0072
             sql = me.Parameters[i].DbType switch {
+                      #pragma warning restore IDE0072
                       DbType.String or DbType.DateTime or DbType.Date or DbType.Time or DbType.DateTime2
                           or DbType.DateTimeOffset or DbType.Guid or DbType.VarNumeric or DbType.AnsiStringFixedLength
-                          or DbType.AnsiString or DbType.StringFixedLength => sql.Replace( //
-                              me.Parameters[i].ParameterName, "'" + me.Parameters[i].Value + "'")
-                    , DbType.Boolean => sql.Replace( //
-                          me.Parameters[i].ParameterName
-                        , Convert.ToBoolean(me.Parameters[i].Value, CultureInfo.InvariantCulture) ? "1" : "0")
-                    , DbType.Binary   => throw new NotImplementedException()
-                    , DbType.Byte     => throw new NotImplementedException()
-                    , DbType.Currency => throw new NotImplementedException()
-                    , DbType.Decimal  => throw new NotImplementedException()
-                    , DbType.Double   => throw new NotImplementedException()
-                    , DbType.Int16    => throw new NotImplementedException()
-                    , DbType.Int32    => throw new NotImplementedException()
-                    , DbType.Int64    => throw new NotImplementedException()
-                    , DbType.Object   => throw new NotImplementedException()
-                    , DbType.SByte    => throw new NotImplementedException()
-                    , DbType.Single   => throw new NotImplementedException()
-                    , DbType.UInt16   => throw new NotImplementedException()
-                    , DbType.UInt32   => throw new NotImplementedException()
-                    , DbType.UInt64   => throw new NotImplementedException()
-                    , DbType.Xml      => throw new NotImplementedException()
-                    , _               => sql.Replace(me.Parameters[i].ParameterName, me.Parameters[i].Value?.ToString())
+                          or DbType.AnsiString
+                          or DbType.StringFixedLength =>
+                          sql.Replace(me.Parameters[i].ParameterName, "'" + me.Parameters[i].Value + "'")
+                    , DbType.Boolean => sql.Replace(//
+                        me.Parameters[i].ParameterName
+                                                  , Convert.ToBoolean(me.Parameters[i].Value, CultureInfo.InvariantCulture) ? "1" : "0")
+                    , _ => sql.Replace(me.Parameters[i].ParameterName, me.Parameters[i].Value?.ToString())
                   };
         }
 

src/Extensions/JsonSerializerOptionsExtensions.cs

@@ -15,14 +15,12 @@ public static class JsonSerializerOptionsExtensions
     public static JsonSerializerOptions NewJsonSerializerOptions(this JsonSerializerOptions _)
     {
         return new JsonSerializerOptions {
-                                             ReadCommentHandling  = JsonCommentHandling.Skip
-                                           , AllowTrailingCommas  = true
-                                           , DictionaryKeyPolicy  = JsonNamingPolicy.CamelCase
-                                           , PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-                                           , Encoder              = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-                                           , NumberHandling
-                                                 = JsonNumberHandling.AllowReadingFromString |
-                                                   JsonNumberHandling.WriteAsString
+                                             ReadCommentHandling         = JsonCommentHandling.Skip
+                                           , AllowTrailingCommas         = true
+                                           , DictionaryKeyPolicy         = JsonNamingPolicy.CamelCase
+                                           , PropertyNamingPolicy        = JsonNamingPolicy.CamelCase
+                                           , Encoder                     = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                                           , NumberHandling              = JsonNumberHandling.AllowReadingFromString
                                            , PropertyNameCaseInsensitive = true
                                          };
     }

src/Extensions/StringExtensions.cs

@@ -4,13 +4,14 @@
 #pragma warning disable CA1720
 using System.Security.Cryptography;
 using System.Text.Json;
+using NSExt.Constant;
 
 namespace NSExt.Extensions;
 
 /// <summary>
 ///     StringExtensions
 /// </summary>
-public static partial class StringExtensions
+public static class StringExtensions
 {
     private static readonly JsonSerializerOptions _defaultJsonSerializerOptions
         = default(JsonSerializerOptions).NewJsonSerializerOptions();
@@ -369,7 +370,7 @@ public static partial class StringExtensions
     /// <returns>掩码后的手机号</returns>
     public static string MaskMobile(this string me)
     {
-        return RegexMobile().Replace(me, "$1****$2");
+        return Regexes.RegexMobile.Replace(me, "$1****$2");
     }
 
     /// <summary>
@@ -444,7 +445,7 @@ public static partial class StringExtensions
     /// <returns>处理之后的字符串</returns>
     public static string RemoveHtmlTag(this string me)
     {
-        return RegexHtmlTag().Replace(me, string.Empty);
+        return Regexes.RegexHtmlTag.Replace(me, string.Empty);
     }
 
     /// <summary>
@@ -473,7 +474,7 @@ public static partial class StringExtensions
     /// </summary>
     public static string Snakecase(this string me)
     {
-        return RegexUpperCaseLetter().Replace(me, "-$1").ToLower(CultureInfo.InvariantCulture).TrimStart('-');
+        return Regexes.RegexUpLetter.Replace(me, "-$1").ToLower(CultureInfo.InvariantCulture).TrimStart('-');
     }
 
     /// <summary>
@@ -513,8 +514,8 @@ public static partial class StringExtensions
     public static string UnicodeDe(this string me)
     {
         const string replacement = "&#x$1;";
-        return me.Contains(@"\u") ? RegexBacksLantUnicode().Replace(me, replacement).HtmlDe() :
-            me.Contains(@"%u")    ? RegexPercentUnicode().Replace(me, replacement).HtmlDe() : me.HtmlDe();
+        return me.Contains(@"\u") ? Regexes.RegexBacksLantUnicode.Replace(me, replacement).HtmlDe() :
+            me.Contains(@"%u")    ? Regexes.RegexPercentUnicode.Replace(me, replacement).HtmlDe() : me.HtmlDe();
     }
 
     /// <summary>
@@ -551,19 +552,4 @@ public static partial class StringExtensions
                            .Replace("-", string.Empty)
                            .ToLower(CultureInfo.CurrentCulture);
     }
-
-    [GeneratedRegex("\\\\u([a-fA-F0-9]{4})")]
-    private static partial Regex RegexBacksLantUnicode();
-
-    [GeneratedRegex("<[^>]*>")]
-    private static partial Regex RegexHtmlTag();
-
-    [GeneratedRegex("^(\\d{3})\\d{4}(\\d{4})$")]
-    private static partial Regex RegexMobile();
-
-    [GeneratedRegex("\\\\u([a-fA-F0-9]{4})")]
-    private static partial Regex RegexPercentUnicode();
-
-    [GeneratedRegex("([A-Z])")]
-    private static partial Regex RegexUpperCaseLetter();
 }

src/NSExt.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFramework>net7.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
         <PackageReference Include="MinVer" Version="4.3.0-beta.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
-    <Import Project="../CodeQuality.props"/>
+    <Import Project="../CodeQuality.props" />
 </Project>