From 637eaab56eb5c8e411a378835d424f7fc0dd3dd0 Mon Sep 17 00:00:00 2001 From: nsnail Date: Thu, 15 Sep 2022 15:44:11 +0800 Subject: [PATCH 1/2] .. --- src/NSExt/ByteExtensions.cs | 4 +--- src/NSExt/DbCommandExtensions.cs | 5 +---- src/NSExt/EnumExtensions.cs | 4 +--- src/NSExt/GlobalUsings.cs | 12 ++++++++++++ src/NSExt/LoggerExtensions.cs | 12 ++---------- src/NSExt/NSExt.csproj | 6 +++--- src/NSExt/ObjectExtensions.cs | 4 +--- src/NSExt/StringExtensions.cs | 23 +++++++++++++---------- 8 files changed, 34 insertions(+), 36 deletions(-) create mode 100644 src/NSExt/GlobalUsings.cs diff --git a/src/NSExt/ByteExtensions.cs b/src/NSExt/ByteExtensions.cs index 3488282..5510a07 100644 --- a/src/NSExt/ByteExtensions.cs +++ b/src/NSExt/ByteExtensions.cs @@ -1,6 +1,4 @@ -using System.Text; - -namespace NSExt; +namespace NSExt; public static class ByteExtensions { diff --git a/src/NSExt/DbCommandExtensions.cs b/src/NSExt/DbCommandExtensions.cs index b8abc6c..e34b325 100644 --- a/src/NSExt/DbCommandExtensions.cs +++ b/src/NSExt/DbCommandExtensions.cs @@ -1,7 +1,4 @@ -using System.Data; -using System.Data.Common; - -namespace NSExt; +namespace NSExt; public static class DbCommandExtensions { diff --git a/src/NSExt/EnumExtensions.cs b/src/NSExt/EnumExtensions.cs index e85e298..60bf836 100644 --- a/src/NSExt/EnumExtensions.cs +++ b/src/NSExt/EnumExtensions.cs @@ -1,6 +1,4 @@ -using System.ComponentModel; - -namespace NSExt; +namespace NSExt; public static class EnumExtensions { diff --git a/src/NSExt/GlobalUsings.cs b/src/NSExt/GlobalUsings.cs new file mode 100644 index 0000000..ccb8554 --- /dev/null +++ b/src/NSExt/GlobalUsings.cs @@ -0,0 +1,12 @@ +global using System.Data; +global using System.Data.Common; +global using System.Runtime.CompilerServices; +global using Microsoft.Extensions.Logging; +global using System.Globalization; +global using System.Text; +global using System.Text.RegularExpressions; +global using System.Web; +global using Newtonsoft.Json; +global using Newtonsoft.Json.Linq; +global using System.ComponentModel; +global using SshNet.Security.Cryptography; diff --git a/src/NSExt/LoggerExtensions.cs b/src/NSExt/LoggerExtensions.cs index 3f7a029..1e280e6 100644 --- a/src/NSExt/LoggerExtensions.cs +++ b/src/NSExt/LoggerExtensions.cs @@ -1,8 +1,4 @@ -using System.Runtime.CompilerServices; -using Microsoft.Extensions.Logging; - -// ReSharper disable TemplateIsNotCompileTimeConstantProblem - +// ReSharper disable TemplateIsNotCompileTimeConstantProblem namespace NSExt; @@ -29,15 +25,11 @@ public static class LoggerExtensions public static void Error(this ILogger me, object message, - Exception ex = null, [CallerMemberName] string callerName = null, [CallerFilePath] string callerFilePath = null, [CallerLineNumber] int callerLineNumber = 0) { - if (ex is null) - me.LogError(CallerInfoMessage(message, callerName, callerFilePath, callerLineNumber)); - else - me.LogError(CallerInfoMessage(message, callerName, callerFilePath, callerLineNumber), ex); + me.LogError(CallerInfoMessage(message, callerName, callerFilePath, callerLineNumber)); } public static void Fatal(this ILogger me, diff --git a/src/NSExt/NSExt.csproj b/src/NSExt/NSExt.csproj index 6b5c261..41b5756 100644 --- a/src/NSExt/NSExt.csproj +++ b/src/NSExt/NSExt.csproj @@ -1,15 +1,15 @@ - net6.0 + net7.0 enable disable preview - - + + diff --git a/src/NSExt/ObjectExtensions.cs b/src/NSExt/ObjectExtensions.cs index 23bf723..fa1cd85 100644 --- a/src/NSExt/ObjectExtensions.cs +++ b/src/NSExt/ObjectExtensions.cs @@ -1,6 +1,4 @@ -using Newtonsoft.Json; - -namespace NSExt; +namespace NSExt; public static class ObjectExtensions { diff --git a/src/NSExt/StringExtensions.cs b/src/NSExt/StringExtensions.cs index 65f90e0..8d9e6b6 100644 --- a/src/NSExt/StringExtensions.cs +++ b/src/NSExt/StringExtensions.cs @@ -1,13 +1,10 @@ -using System.Globalization; -using System.Security.Cryptography; -using System.Text; -using System.Text.RegularExpressions; -using System.Web; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using MD5 = SshNet.Security.Cryptography.MD5; +// ReSharper disable UnusedMember.Global -// ReSharper disable UnusedMember.Global + +using System.Security.Cryptography; +using HMACMD5 = SshNet.Security.Cryptography.HMACMD5; +using HMACSHA1 = SshNet.Security.Cryptography.HMACSHA1; +using MD5 = SshNet.Security.Cryptography.MD5; namespace NSExt; @@ -283,7 +280,7 @@ public static class StringExtensions /// hash摘要的16进制文本形式（无连字符小写） public static string Sha1(this string me, Encoding e) { - using var sha1 = SHA1.Create(); + using var sha1 = HashAlgorithm.Create(); return BitConverter.ToString(sha1.ComputeHash(e.GetBytes(me))) .Replace("-", string.Empty) .ToLower(CultureInfo.CurrentCulture); @@ -438,4 +435,10 @@ public static class StringExtensions { return BitConverter.ToInt32(me.Split('.').Select(byte.Parse).Reverse().ToArray(), 0); } + + + public static bool NullOrWhiteSpace(this string me) + { + return string.IsNullOrWhiteSpace(me); + } } From 28da350cd70db426fdb7026ca1cee4d616f7c2db Mon Sep 17 00:00:00 2001 From: nsnail Date: Fri, 16 Sep 2022 20:03:06 +0800 Subject: [PATCH 2/2] .. --- src/NSExt/NSExt.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NSExt/NSExt.csproj b/src/NSExt/NSExt.csproj index 41b5756..2cddb80 100644 --- a/src/NSExt/NSExt.csproj +++ b/src/NSExt/NSExt.csproj @@ -1,14 +1,14 @@ - net7.0 + net6.0;net7.0 enable disable preview - +