.github/workflows/build-linux.yml

@@ -74,4 +74,3 @@ jobs:
         file: ${{ github.workspace }}/v2rayN*.zip
         tag: ${{ github.event.inputs.release_tag }}
         file_glob: true
-        prerelease: true

.github/workflows/build-osx.yml

@@ -75,4 +75,3 @@ jobs:
         file: ${{ github.workspace }}/v2rayN*.zip
         tag: ${{ github.event.inputs.release_tag }}
         file_glob: true
-        prerelease: true

.github/workflows/build-windows.yml

@@ -65,4 +65,3 @@ jobs:
         file: ${{ github.workspace }}/v2rayN*.zip
         tag: ${{ github.event.inputs.release_tag }}
         file_glob: true
-        prerelease: true

package-osx.sh

@@ -11,16 +11,16 @@ echo "When this file exists, app will not store configs under this folder" > "$P
 chmod +x "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN"
 
 mkdir -p "$PackagePath/icons.iconset"
-sips -z 16 16 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_16x16.png"
+sips -z 16 16 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_16x16.png"
-sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_16x16@2x.png"
+sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_16x16@2x.png"
-sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_32x32.png"
+sips -z 32 32 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_32x32.png"
-sips -z 64 64 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_32x32@2x.png"
+sips -z 64 64 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_32x32@2x.png"
-sips -z 128 128 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_128x128.png"
+sips -z 128 128 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_128x128.png"
-sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_128x128@2x.png"
+sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_128x128@2x.png"
-sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_256x256.png"
+sips -z 256 256 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_256x256.png"
-sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_256x256@2x.png"
+sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_256x256@2x.png"
-sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_512x512.png"
+sips -z 512 512 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_512x512.png"
-sips -z 1024 1024 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN2.png" --out "$PackagePath/icons.iconset/icon_512x512@2x.png"
+sips -z 1024 1024 "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.png" --out "$PackagePath/icons.iconset/icon_512x512@2x.png"
 iconutil -c icns "$PackagePath/icons.iconset" -o "$PackagePath/v2rayN.app/Contents/Resources/AppIcon.icns"
 
 cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF

v2rayN/AmazTool/Program.cs

@@ -15,15 +15,8 @@
                 return;
             }
 
-            var argData = Uri.UnescapeDataString(string.Join(" ", args));
+            var fileName = Uri.UnescapeDataString(string.Join(" ", args));
-            if (argData.Equals("rebootas"))
+            UpgradeApp.Upgrade(fileName);
-            {
-                Thread.Sleep(1000);
-                Utils.StartV2RayN();
-                return;
-            }
-
-            UpgradeApp.Upgrade(argData);
         }
     }
 }

v2rayN/AmazTool/UpgradeApp.cs

@@ -21,11 +21,11 @@ namespace AmazTool
             Console.WriteLine(Resx.Resource.TryTerminateProcess);
             try
             {
-                var existing = Process.GetProcessesByName(Utils.V2rayN);
+                var existing = Process.GetProcessesByName(V2rayN);
                 foreach (var pp in existing)
                 {
                     var path = pp.MainModule?.FileName ?? "";
-                    if (path.StartsWith(Utils.GetPath(Utils.V2rayN)))
+                    if (path.StartsWith(GetPath(V2rayN)))
                     {
                         pp?.Kill();
                         pp?.WaitForExit(1000);
@@ -42,7 +42,7 @@ namespace AmazTool
             StringBuilder sb = new();
             try
             {
-                string thisAppOldFile = $"{Utils.GetExePath()}.tmp";
+                string thisAppOldFile = $"{GetExePath()}.tmp";
                 File.Delete(thisAppOldFile);
                 string splitKey = "/";
 
@@ -62,12 +62,12 @@ namespace AmazTool
                         if (lst.Length == 1) continue;
                         string fullName = string.Join(splitKey, lst[1..lst.Length]);
 
-                        if (string.Equals(Utils.GetExePath(), Utils.GetPath(fullName), StringComparison.OrdinalIgnoreCase))
+                        if (string.Equals(GetExePath(), GetPath(fullName), StringComparison.OrdinalIgnoreCase))
                         {
-                            File.Move(Utils.GetExePath(), thisAppOldFile);
+                            File.Move(GetExePath(), thisAppOldFile);
                         }
 
-                        string entryOutputPath = Utils.GetPath(fullName);
+                        string entryOutputPath = GetPath(fullName);
                         Directory.CreateDirectory(Path.GetDirectoryName(entryOutputPath)!);
                         entry.ExtractToFile(entryOutputPath, true);
 
@@ -92,11 +92,39 @@ namespace AmazTool
 
             Console.WriteLine(Resx.Resource.Restartv2rayN);
             Waiting(2);
-
+            Process process = new()
-            Utils.StartV2RayN();
+            {
+                StartInfo = new()
+                {
+                    UseShellExecute = true,
+                    FileName = V2rayN,
+                    WorkingDirectory = StartupPath()
+                }
+            };
+            process.Start();
         }
 
-        public static void Waiting(int second)
+        private static string GetExePath()
+        {
+            return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
+        }
+
+        private static string StartupPath()
+        {
+            return AppDomain.CurrentDomain.BaseDirectory;
+        }
+
+        private static string GetPath(string fileName)
+        {
+            string startupPath = StartupPath();
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return startupPath;
+            }
+            return Path.Combine(startupPath, fileName);
+        }
+
+        private static void Waiting(int second)
         {
             for (var i = second; i > 0; i--)
             {
@@ -104,5 +132,7 @@ namespace AmazTool
                 Thread.Sleep(1000);
             }
         }
+
+        private static string V2rayN => "v2rayN";
     }
 }

v2rayN/AmazTool/Utils.cs

@@ -1,43 +0,0 @@
-using System.Diagnostics;
-
-namespace AmazTool
-{
-    internal class Utils
-    {
-        public static string GetExePath()
-        {
-            return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
-        }
-
-        public static string StartupPath()
-        {
-            return AppDomain.CurrentDomain.BaseDirectory;
-        }
-
-        public static string GetPath(string fileName)
-        {
-            string startupPath = StartupPath();
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return startupPath;
-            }
-            return Path.Combine(startupPath, fileName);
-        }
-
-        public static string V2rayN => "v2rayN";
-
-        public static void StartV2RayN()
-        {
-            Process process = new()
-            {
-                StartInfo = new()
-                {
-                    UseShellExecute = true,
-                    FileName = V2rayN,
-                    WorkingDirectory = StartupPath()
-                }
-            };
-            process.Start();
-        }
-    }
-}

v2rayN/ServiceLib/Common/Utils.cs

@@ -517,10 +517,10 @@ namespace ServiceLib.Common
 
         #region 杂项
 
-        public static bool UpgradeAppExists(out string upgradeFileName)
+        public static bool UpgradeAppExists(out string fileName)
         {
-            upgradeFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, GetExeName("AmazTool"));
+            fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, GetExeName("AmazTool"));
-            return File.Exists(upgradeFileName);
+            return File.Exists(fileName);
         }
 
         /// <summary>

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -32,9 +32,9 @@ namespace ServiceLib.Handler
                 {
                     if (it.CoreType == ECoreType.v2rayN)
                     {
-                        if (Utils.UpgradeAppExists(out var upgradeFileName))
+                        if (Utils.UpgradeAppExists(out var fileName))
                         {
-                            await Utils.SetLinuxChmod(upgradeFileName);
+                            await Utils.SetLinuxChmod(fileName);
                         }
                         continue;
                     }

v2rayN/ServiceLib/Sample/dns_v2ray_normal

@@ -4,15 +4,6 @@
     "proxy.example.com": "127.0.0.1"
   },
   "servers": [
-    {
-      "address": "1.1.1.1",
-      "domains": [
-        "geosite:geolocation-!cn"
-      ],
-      "expectIPs": [
-        "geoip:!cn"
-      ]
-    },
     {
       "address": "223.5.5.5",
       "domains": [
@@ -22,6 +13,7 @@
         "geoip:cn"
       ]
     },
+    "1.1.1.1",
     "8.8.8.8",
     "https://dns.google/dns-query"
   ]

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.1</Version>
   </PropertyGroup>
  
 	<ItemGroup>

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -147,13 +147,6 @@ namespace ServiceLib.ViewModels
                 {
                     ProcUtils.RebootAsAdmin(false);
                 }
-                else
-                {
-                    if (Utils.UpgradeAppExists(out var upgradeFileName))
-                    {
-                        ProcUtils.ProcessStart(upgradeFileName, Global.RebootAs, Utils.StartupPath());
-                    }
-                }
                 service?.Shutdown();
             }
             else

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -310,14 +310,14 @@ namespace ServiceLib.ViewModels
 
         public async Task UpgradeApp(string arg)
         {
-            if (!Utils.UpgradeAppExists(out var upgradeFileName))
+            if (!Utils.UpgradeAppExists(out var fileName))
             {
                 NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.UpgradeAppNotExistTip);
                 Logging.SaveLog("UpgradeApp does not exist");
                 return;
             }
 
-            var id = ProcUtils.ProcessStart(upgradeFileName, arg, Utils.StartupPath());
+            var id = ProcUtils.ProcessStart(fileName, arg, Utils.StartupPath());
             if (id > 0)
             {
                 await MyAppExitAsync(false);

v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj

@@ -48,9 +48,6 @@
       <None Update="v2rayN.png">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
-      <None Update="v2rayN2.png">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
     </ItemGroup> 
  
 </Project>