Merge branch '2dust:master' into master

Author: Bayinbuluk

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.16.9</Version>
+        <Version>7.17.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Common/Extension.cs

@@ -6,17 +6,17 @@ public static class Extension
 {
     public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
     {
-        return string.IsNullOrEmpty(value) || string.IsNullOrWhiteSpace(value);
+        return string.IsNullOrWhiteSpace(value) || string.IsNullOrEmpty(value);
     }
 
-    public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)
+    public static bool IsNotEmpty([NotNullWhen(false)] this string? value)
     {
-        return string.IsNullOrWhiteSpace(value);
+        return !string.IsNullOrWhiteSpace(value);
     }
 
-    public static bool IsNotEmpty([NotNullWhen(false)] this string? value)
+    public static string? NullIfEmpty(this string? value)
     {
-        return !string.IsNullOrEmpty(value);
+        return string.IsNullOrWhiteSpace(value) ? null : value;
     }
 
     public static bool BeginWithAny(this string s, IEnumerable<char> chars)