Update AssemblyInfo.cs

与最新的在线默认规则保持一致

v2rayN/v2rayN/Handler/V2rayConfigHandler.cs

@@ -84,7 +84,7 @@ namespace v2rayN.Handler
                 // TODO: 统计配置
                 statistic(config, ref v2rayConfig);
 
-                Utils.ToJsonFile(v2rayConfig, fileName);
+                Utils.ToJsonFile(v2rayConfig, fileName, false);
 
                 msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
             }
@@ -919,7 +919,7 @@ namespace v2rayN.Handler
                 //传出设置
                 ServerOutbound(config, ref v2rayConfig);
 
-                Utils.ToJsonFile(v2rayConfig, fileName);
+                Utils.ToJsonFile(v2rayConfig, fileName, false);
 
                 msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
             }

v2rayN/v2rayN/Handler/V2rayHandler.cs

@@ -30,6 +30,7 @@ namespace v2rayN.Handler
         {
             lstV2ray = new List<string>
             {
+                "xray",
                 "wv2ray",
                 "v2ray"
             };
@@ -161,7 +162,7 @@ namespace v2rayN.Handler
         private string V2rayFindexe() {
             //查找v2ray文件是否存在
             string fileName = string.Empty;
-            lstV2ray.Reverse();
+            //lstV2ray.Reverse();
             foreach (string name in lstV2ray)
             {
                 string vName = string.Format("{0}.exe", name);

v2rayN/v2rayN/Properties/AssemblyInfo.cs

@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("3.27")]
+[assembly: AssemblyFileVersion("3.28")]

v2rayN/v2rayN/Sample/custom_routing_block

@@ -1 +1 @@
-geosite:category-ads,
+geosite:category-ads-all,

v2rayN/v2rayN/Tool/Utils.cs

@@ -119,16 +119,22 @@ namespace v2rayN
         /// <param name="obj"></param>
         /// <param name="filePath"></param>
         /// <returns></returns>
-        public static int ToJsonFile(Object obj, string filePath)
+        public static int ToJsonFile(Object obj, string filePath, bool nullValue = true)
         {
             int result;
             try
             {
                 using (StreamWriter file = File.CreateText(filePath))
                 {
-                    //JsonSerializer serializer = new JsonSerializer();
-                    JsonSerializer serializer = new JsonSerializer() { Formatting = Formatting.Indented };
-                    //JsonSerializer serializer = new JsonSerializer() { Formatting = Formatting.Indented, NullValueHandling = NullValueHandling.Ignore };
+                    JsonSerializer serializer;
+                    if (nullValue)
+                    {
+                        serializer = new JsonSerializer() { Formatting = Formatting.Indented };
+                    }
+                    else
+                    {
+                        serializer = new JsonSerializer() { Formatting = Formatting.Indented, NullValueHandling = NullValueHandling.Ignore };
+                    }
 
                     serializer.Serialize(file, obj);
                 }
@@ -800,7 +806,7 @@ namespace v2rayN
         public static string GetTempPath(string filename)
         {
             return Path.Combine(GetTempPath(), filename);
-        }              
+        }
 
         public static string UnGzip(byte[] buf)
         {