1.0.4

.gitattributes

@@ -60,4 +60,4 @@
 #*.pdf   diff=astextplain
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -1,8 +1,9 @@
+pkg
 build
 bin
 obj
-bin\log
 packages
+Migrations
 _gsdata_
 _ReSharper*
 TestResults

.tgitconfig

@@ -0,0 +1,4 @@
+[hook "startcommit"]
+	cmdline = code-format.cmd
+	wait = true
+	show = true

Directory.Build.props

@@ -0,0 +1,7 @@
+<Project>
+    <PropertyGroup>
+        <BaseOutputPath>../build/temp/bin</BaseOutputPath>
+        <BaseIntermediateOutputPath>../build/temp/obj</BaseIntermediateOutputPath>
+        <MSBuildProjectExtensionsPath>../build/temp/obj</MSBuildProjectExtensionsPath>
+    </PropertyGroup>
+</Project>

code-format.cmd

@@ -0,0 +1,3 @@
+do.exe trim-utf8-bom
+do.exe remove-whitespace
+do.exe convert-lf

git-clean.ps1

@@ -0,0 +1 @@
+git reset --hard | git clean -d -fx .

push2nuget.ps1

@@ -1,4 +1,3 @@
-# 定义参数
 Param(
     # Nuget APIKey
     [string] $apikey
@@ -6,18 +5,18 @@ Param(
 
 if ($apikey -eq $null -or $apikey -eq "")
 {
-    Write-Error "必须指定apiKey";
+    Write-Error "require apiKey";
     return;
 }
 
-rm -r ../build/nupkgs/
+rm -r ./build/nupkgs
-dotnet build -c Release ../src/NSExt.sln
+dotnet build -c Release ./src/NSExt.sln
-$files = Get-ChildItem -Path ../build/nupkgs/ -Filter *.nupkg
+$files = Get-ChildItem -Path ./build/nupkgs/ -Filter *.nupkg
 foreach($file in $files)
 {
     dotnet nuget push $file.fullName --skip-duplicate --api-key $apikey --source https://api.nuget.org/v3/index.json
 }
-$files = Get-ChildItem -Path ../build/nupkgs/ -Filter *.snupkg
+$files = Get-ChildItem -Path ./build/nupkgs/ -Filter *.snupkg
 foreach($file in $files)
 {
     dotnet nuget push $file.fullName --skip-duplicate --api-key $apikey --source https://api.nuget.org/v3/index.json

src/NSExt/Extensions/LoggerExtensions.cs

@@ -10,7 +10,7 @@ public static class LoggerExtensions
                                             int    callerLineNumber)
     {
         return
-            $"{message} <s:{Thread.CurrentThread.ManagedThreadId}#{callerName}@{Path.GetFileName(callerFilePath)}:{callerLineNumber}>";
+            $"{message} <s:{Environment.CurrentManagedThreadId}#{callerName}@{Path.GetFileName(callerFilePath)}:{callerLineNumber}>";
     }
 
     public static void Debug(this ILogger              me,

src/NSExt/Extensions/StringExtensions.cs

@@ -8,7 +8,7 @@ namespace NSExt.Extensions;
 
 public static class StringExtensions
 {
-    private static readonly JsonSerializerOptions _DEFAULT_JSON_SERIALIZER_OPTIONS =
+    private static readonly JsonSerializerOptions _defaultJsonSerializerOptions =
         default(JsonSerializerOptions).NewJsonSerializerOptions();
 
     /// <summary>
@@ -300,6 +300,16 @@ public static class StringExtensions
                            .ToLower(CultureInfo.CurrentCulture);
     }
 
+    /// <summary>
+    ///     html编码
+    /// </summary>
+    /// <param name="me"></param>
+    /// <returns></returns>
+    public static string Html(this string me)
+    {
+        return HttpUtility.HtmlEncode(me);
+    }
+
     /// <summary>
     ///     解码html编码
     /// </summary>
@@ -450,7 +460,7 @@ public static class StringExtensions
     /// <returns>反序列化后生成的对象</returns>
     public static T Object<T>(this string me, JsonSerializerOptions options = null)
     {
-        return JsonSerializer.Deserialize<T>(me, options ?? _DEFAULT_JSON_SERIALIZER_OPTIONS);
+        return JsonSerializer.Deserialize<T>(me, options ?? _defaultJsonSerializerOptions);
     }
 
 
@@ -463,7 +473,7 @@ public static class StringExtensions
     /// <returns>反序列化后生成的对象</returns>
     public static object Object(this string me, Type type, JsonSerializerOptions options = null)
     {
-        return JsonSerializer.Deserialize(me, type, options ?? _DEFAULT_JSON_SERIALIZER_OPTIONS);
+        return JsonSerializer.Deserialize(me, type, options ?? _defaultJsonSerializerOptions);
     }
 
 

src/NSExt/NSExt.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
-        <VersionPrefix>1.0.3</VersionPrefix>
+        <Version>1.0.4</Version>
     </PropertyGroup>
 
     <ItemGroup>