up 7.5.5

https://github.com/2dust/v2rayN/issues/6429

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -81,6 +81,7 @@ public static class ProcUtils
             return;
         }
 
+        var procId = review ? proc?.Id : null;
         var fileName = review ? proc?.MainModule?.FileName : null;
         var processName = review ? proc?.ProcessName : null;
 
@@ -90,15 +91,27 @@ public static class ProcUtils
         try { proc?.Dispose(); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
 
         await Task.Delay(300);
-        if (review && fileName != null)
+        if (review && procId != null && fileName != null)
         {
-            var proc2 = Process.GetProcessesByName(processName)
+            try
-                .FirstOrDefault(t => t.MainModule?.FileName == fileName);
-            if (proc2 != null)
             {
-                Logging.SaveLog($"{_tag}, KillProcess not completing the job");
+                var lstProc = Process.GetProcessesByName(processName);
+                foreach (var proc2 in lstProc)
+                {
+                    if (proc2.Id == procId)
+                    {
+                        Logging.SaveLog($"{_tag}, KillProcess not completing the job, procId");
                         await ProcessKill(proc2, false);
-                proc2 = null;
+                    }
+                    if (proc2.MainModule != null && proc2.MainModule?.FileName == fileName)
+                    {
+                        Logging.SaveLog($"{_tag}, KillProcess not completing the job, fileName");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(_tag, ex);
             }
         }
     }

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -5,6 +5,7 @@ namespace ServiceLib.Common
     internal static class WindowsUtils
     {
         private static readonly string _tag = "WindowsUtils";
+
         public static string? RegReadValue(string path, string name, string def)
         {
             RegistryKey? regKey = null;

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -1,6 +1,4 @@
-using YamlDotNet.Core.Tokens;
+namespace ServiceLib.Handler
-
-namespace ServiceLib.Handler
 {
     /// <summary>
     /// Core configuration file processing class

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -3,6 +3,7 @@
     public static class SysProxyHandler
     {
         private static readonly string _tag = "SysProxyHandler";
+
         public static async Task<bool> UpdateSysProxy(Config config, bool forceDisable)
         {
             var type = config.SystemProxyItem.SysProxyType;

v2rayN/ServiceLib/Handler/WebDavHandler.cs

@@ -15,7 +15,6 @@ namespace ServiceLib.Handler
         private readonly string _webFileName = "backup.zip";
         private readonly string _tag = "WebDav--";
 
-
         public WebDavHandler()
         {
             _config = AppHandler.Instance.Config;

v2rayN/ServiceLib/Sample/SampleClientConfig

@@ -5,24 +5,25 @@
 		"loglevel": "warning"
 	},
 	"inbounds": [],
-	"outbounds": [{
+	"outbounds": [
+		{
 			"tag": "proxy",
 			"protocol": "vmess",
 			"settings": {
 				"vnext": [{
-					"address": "v2ray.cool",
+					"address": "",
-					"port": 10086,
+					"port": 0,
 					"users": [{
-						"id": "a3482e88-686a-4a58-8126-99c9df64b7bf",
+						"id": "",
 						"security": "auto"
 					}]
 				}],
 				"servers": [{
-					"address": "v2ray.cool",
+					"address": "",
-					"method": "chacha20",
+					"method": "",
 					"ota": false,
-					"password": "123456",
+					"password": "",
-					"port": 10086,
+					"port": 0,
 					"level": 1
 				}]
 			},
@@ -35,24 +36,20 @@
 		},
 		{
 			"protocol": "freedom",
-			"settings": {},
 			"tag": "direct"
 		},
 		{
 			"protocol": "blackhole",
-			"tag": "block",
+			"tag": "block"
-			"settings": {
-				"response": {
-					"type": "http"
-				}
-			}
 		}
 	],
 	"routing": {
 		"domainStrategy": "IPIfNonMatch",
 		"rules": [
 			{
-                    "inboundTag": ["api"],
+				"inboundTag": [
+					"api"
+				],
 				"outboundTag": "api",
 				"type": "field"
 			}

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.5.2</Version>
+	<Version>7.5.5</Version>
   </PropertyGroup>
  
 	<ItemGroup>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -313,7 +313,7 @@ namespace ServiceLib.Services.CoreConfig
                     var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
                     await GenOutbound(item, outbound);
                     outbound.tag = $"{Global.ProxyTag}-{tagProxy.Count + 1}";
-                    singboxConfig.outbounds.Add(outbound);
+                    singboxConfig.outbounds.Insert(0, outbound);
                     tagProxy.Add(outbound.tag);
                 }
                 if (tagProxy.Count <= 0)
@@ -333,7 +333,7 @@ namespace ServiceLib.Services.CoreConfig
                     outbounds = tagProxy,
                     interrupt_exist_connections = false,
                 };
-                singboxConfig.outbounds.Add(outUrltest);
+                singboxConfig.outbounds.Insert(0, outUrltest);
 
                 //add selector outbound
                 var outSelector = new Outbound4Sbox
@@ -344,7 +344,7 @@ namespace ServiceLib.Services.CoreConfig
                     interrupt_exist_connections = false,
                 };
                 outSelector.outbounds.Insert(0, outUrltest.tag);
-                singboxConfig.outbounds.Add(outSelector);
+                singboxConfig.outbounds.Insert(0, outSelector);
 
                 ret.Success = true;
                 ret.Data = JsonUtils.Serialize(singboxConfig);

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -154,7 +154,7 @@ namespace ServiceLib.Services.CoreConfig
                     var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     await GenOutbound(item, outbound);
                     outbound.tag = $"{Global.ProxyTag}-{tagProxy.Count + 1}";
-                    v2rayConfig.outbounds.Add(outbound);
+                    v2rayConfig.outbounds.Insert(0, outbound);
                     tagProxy.Add(outbound.tag);
                 }
                 if (tagProxy.Count <= 0)
@@ -182,15 +182,12 @@ namespace ServiceLib.Services.CoreConfig
                         rule.balancerTag = balancer.tag;
                     }
                 }
-                else
-                {
                 v2rayConfig.routing.rules.Add(new()
                 {
                     network = "tcp,udp",
                     balancerTag = balancer.tag,
                     type = "field"
                 });
-                }
 
                 ret.Success = true;
                 ret.Data = JsonUtils.Serialize(v2rayConfig);

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -13,6 +13,7 @@ namespace ServiceLib.Services
         public event EventHandler<RetResult>? UpdateCompleted;
 
         public event ErrorEventHandler? Error;
+
         private static readonly string _tag = "DownloadService";
 
         public async Task<int> DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout, Action<bool, string> updateFunc)

v2rayN/v2rayN.Desktop/App.axaml

@@ -3,12 +3,13 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:semi="https://irihi.tech/semi"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     x:DataType="vms:StatusBarViewModel"
     RequestedThemeVariant="Default">
     <Application.Styles>
+        <semi:SemiTheme />
         <StyleInclude Source="Assets/GlobalStyles.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
         <StyleInclude Source="avares://DialogHost.Avalonia/Styles.xaml" />
     </Application.Styles>

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -103,6 +103,8 @@ namespace v2rayN.Desktop.ViewModels
         private void ModifyFontSize()
         {
             double size = CurrentFontSize;
+            if (size < Global.MinFontSize) return;
+
             Style style = new(x => Selectors.Or(
                 x.OfType<Button>(),
                 x.OfType<TextBox>(),

v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj

@@ -28,8 +28,8 @@
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
         <PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
         <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />		
-        <PackageReference Include="Semi.Avalonia" Version="11.2.1.2" />
+        <PackageReference Include="Semi.Avalonia" Version="11.2.1.3" />
-        <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.2.1.2" />
+        <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.2.1.3" />
         <PackageReference Include="ReactiveUI" Version="20.1.63" />
         <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 	</ItemGroup>

v2rayN/v2rayN/Common/WindowsUtils.cs

@@ -14,6 +14,7 @@ namespace v2rayN
     internal static class WindowsUtils
     {
         private static readonly string _tag = "WindowsUtils";
+
         /// <summary>
         /// 获取剪贴板数
         /// </summary>

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -122,7 +122,7 @@ namespace v2rayN.ViewModels
                y => y > 0)
                   .Subscribe(c =>
                   {
-                      if (_config.UiItem.CurrentFontSize != CurrentFontSize && CurrentFontSize >= Global.MinFontSize)
+                      if (_config.UiItem.CurrentFontSize != CurrentFontSize)
                       {
                           _config.UiItem.CurrentFontSize = CurrentFontSize;
                           ModifyFontSize();
@@ -158,6 +158,8 @@ namespace v2rayN.ViewModels
         private void ModifyFontSize()
         {
             double size = (long)CurrentFontSize;
+            if (size < Global.MinFontSize) return;
+
             Application.Current.Resources["StdFontSize"] = size;
             Application.Current.Resources["StdFontSize1"] = size + 1;
             Application.Current.Resources["StdFontSize-1"] = size - 1;

v2rayN/v2rayN/v2rayN.csproj

@@ -14,7 +14,7 @@
 	</PropertyGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
+		<PackageReference Include="MaterialDesignThemes" Version="5.2.0" />
 		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.2.0" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" /> 
 		<PackageReference Include="ReactiveUI.WPF" Version="20.1.63" />