.github/workflows/build-linux.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v5.0.1
       with:
         submodules: 'recursive'
         fetch-depth: '0'
@@ -110,7 +110,7 @@ jobs:
         dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which
 
     - name: Checkout repo (for scripts)
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v5.0.1
       with:
         submodules: 'recursive'
         fetch-depth: '0'

.github/workflows/build-osx.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v5.0.1
       with:
         submodules: 'recursive'
         fetch-depth: '0'

.github/workflows/build-windows-desktop.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v5.0.1
       with:
         submodules: 'recursive'
         fetch-depth: '0'

.github/workflows/build-windows.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v5.0.1
 
     - name: Setup
       uses: actions/setup-dotnet@v5.0.0

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -73,11 +73,13 @@ public class ShadowsocksFmt : BaseFmt
                     const string beginMarker = "-----BEGIN CERTIFICATE-----\n";
                     const string endMarker = "\n-----END CERTIFICATE-----";
 
-                    var base64Content = cert.Replace(beginMarker, "").Replace(endMarker, "").Trim();
+                    var base64Start = beginMarker.Length;
+                    var endIndex = cert.IndexOf(endMarker, base64Start, StringComparison.Ordinal);
+                    var base64Content = cert.Substring(base64Start, endIndex - base64Start);
 
                     // https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172
                     // Equal signs and commas [and backslashes] must be escaped with a backslash.
-                    base64Content = base64Content.Replace("=", "\\=");
+                    base64Content = base64Content.Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,");
 
                     pluginArgs += $"certRaw={base64Content};";
                 }
@@ -249,7 +251,7 @@ public class ShadowsocksFmt : BaseFmt
                     {
                         var certBase64 = certRaw.Replace("certRaw=", "");
 
-                        certBase64 = certBase64.Replace("\\=", "=");
+                        certBase64 = certBase64.Replace("\\=", "=").Replace("\\,", ",").Replace("\\\\", "\\");
 
                         const string beginMarker = "-----BEGIN CERTIFICATE-----\n";
                         const string endMarker = "\n-----END CERTIFICATE-----";

v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs

@@ -10,13 +10,6 @@ public class ActionPrecheckManager(Config config)
 
     private readonly Config _config = config;
 
-    // sing-box supported transports for different protocol types
-    private static readonly HashSet<string> SingboxUnsupportedTransports = [nameof(ETransport.kcp), nameof(ETransport.xhttp)];
-    private static readonly HashSet<EConfigType> SingboxTransportSupportedProtocols =
-        [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks];
-    private static readonly HashSet<string> SingboxShadowsocksAllowedTransports =
-        [nameof(ETransport.tcp), nameof(ETransport.ws), nameof(ETransport.quic)];
-
     public async Task<List<string>> Check(string? indexId)
     {
         if (indexId.IsNullOrEmpty())
@@ -181,16 +174,26 @@ public class ActionPrecheckManager(Config config)
             return errors;
         }
 
-        var net = item.GetNetwork();
+        var net = item.GetNetwork() ?? item.Network;
 
         if (coreType == ECoreType.sing_box)
         {
-            var transportError = ValidateSingboxTransport(item.ConfigType, net);
-            if (transportError != null)
+            // sing-box does not support xhttp / kcp
+            // sing-box does not support transports like ws/http/httpupgrade/etc. when the node is not vmess/trojan/vless
+            if (net is nameof(ETransport.kcp) or nameof(ETransport.xhttp))
             {
-                errors.Add(transportError);
+                errors.Add(string.Format(ResUI.CoreNotSupportNetwork, nameof(ECoreType.sing_box), net));
                 return errors;
             }
+
+            if (item.ConfigType is not (EConfigType.VMess or EConfigType.VLESS or EConfigType.Trojan))
+            {
+                if (net is nameof(ETransport.ws) or nameof(ETransport.http) or nameof(ETransport.h2) or nameof(ETransport.quic) or nameof(ETransport.httpupgrade))
+                {
+                    errors.Add(string.Format(ResUI.CoreNotSupportProtocolTransport, nameof(ECoreType.sing_box), item.ConfigType.ToString(), net));
+                    return errors;
+                }
+            }
         }
         else if (coreType is ECoreType.Xray)
         {
@@ -206,31 +209,6 @@ public class ActionPrecheckManager(Config config)
         return errors;
     }
 
-    private static string? ValidateSingboxTransport(EConfigType configType, string net)
-    {
-        // sing-box does not support xhttp / kcp transports
-        if (SingboxUnsupportedTransports.Contains(net))
-        {
-            return string.Format(ResUI.CoreNotSupportNetwork, nameof(ECoreType.sing_box), net);
-        }
-
-        // sing-box does not support non-tcp transports for protocols other than vmess/trojan/vless/shadowsocks
-        if (!SingboxTransportSupportedProtocols.Contains(configType) && net != nameof(ETransport.tcp))
-        {
-            return string.Format(ResUI.CoreNotSupportProtocolTransport,
-                nameof(ECoreType.sing_box), configType.ToString(), net);
-        }
-
-        // sing-box shadowsocks only supports tcp/ws/quic transports
-        if (configType == EConfigType.Shadowsocks && !SingboxShadowsocksAllowedTransports.Contains(net))
-        {
-            return string.Format(ResUI.CoreNotSupportProtocolTransport,
-                nameof(ECoreType.sing_box), configType.ToString(), net);
-        }
-
-        return null;
-    }
-
     private async Task<List<string>> ValidateRelatedNodesExistAndValid(ProfileItem? item)
     {
         var errors = new List<string>();

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs

@@ -62,11 +62,13 @@ public partial class CoreConfigSingboxService
                                     const string beginMarker = "-----BEGIN CERTIFICATE-----\n";
                                     const string endMarker = "\n-----END CERTIFICATE-----";
 
-                                    var base64Content = cert.Replace(beginMarker, "").Replace(endMarker, "").Trim();
+                                    var base64Start = beginMarker.Length;
+                                    var endIndex = cert.IndexOf(endMarker, base64Start, StringComparison.Ordinal);
+                                    var base64Content = cert.Substring(base64Start, endIndex - base64Start);
 
                                     // https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172
                                     // Equal signs and commas [and backslashes] must be escaped with a backslash.
-                                    base64Content = base64Content.Replace("=", "\\=");
+                                    base64Content = base64Content.Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,");
 
                                     pluginArgs += $"certRaw={base64Content};";
                                 }

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -90,13 +90,13 @@
                         <MenuItem x:Name="menuOpenTheFileLocation" Header="{x:Static resx:ResUI.menuOpenTheFileLocation}" />
                     </MenuItem>
 
+                    <MenuItem x:Name="menuReload" Header="{x:Static resx:ResUI.menuReload}" />
+
                     <MenuItem x:Name="menuHelp" Header="{x:Static resx:ResUI.menuHelp}">
                         <MenuItem x:Name="menuCheckUpdate" Header="{x:Static resx:ResUI.menuCheckUpdate}" />
                         <Separator />
                     </MenuItem>
 
-                    <MenuItem x:Name="menuReload" Header="{x:Static resx:ResUI.menuReload}" />
-
                     <MenuItem x:Name="menuPromotion" Header="{x:Static resx:ResUI.menuPromotion}" />
 
                     <MenuItem x:Name="menuClose" Header="{x:Static resx:ResUI.menuExit}" />

v2rayN/v2rayN/Views/BackupAndRestoreView.xaml

@@ -1,4 +1,4 @@
-<reactiveui:ReactiveUserControl
+<reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.BackupAndRestoreView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -23,6 +23,15 @@
     </UserControl.Resources>
     <DockPanel Margin="{StaticResource Margin8}">
         <DockPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Bottom">
+            <Button
+                Width="100"
+                Margin="{StaticResource Margin8}"
+                Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
+                Content="{x:Static resx:ResUI.menuClose}"
+                DockPanel.Dock="Right"
+                IsCancel="True"
+                Style="{StaticResource DefButton}" />
+
             <TextBlock
                 x:Name="txtMsg"
                 Margin="{StaticResource Margin8}"

v2rayN/v2rayN/Views/CheckUpdateView.xaml

@@ -1,4 +1,4 @@
-<reactiveui:ReactiveUserControl
+<reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.CheckUpdateView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -39,6 +39,15 @@
                 Content="{x:Static resx:ResUI.menuCheckUpdate}"
                 IsDefault="True"
                 Style="{StaticResource DefButton}" />
+
+            <Button
+                Width="100"
+                Margin="{StaticResource Margin8}"
+                HorizontalAlignment="Right"
+                Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
+                Content="{x:Static resx:ResUI.menuClose}"
+                IsCancel="True"
+                Style="{StaticResource DefButton}" />
         </StackPanel>
 
         <StackPanel>

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -32,7 +32,6 @@
 
     <materialDesign:DialogHost
         materialDesign:TransitionAssist.DisableTransitions="True"
-        CloseOnClickAway="True"
         Identifier="RootDialog"
         SnackbarMessageQueue="{Binding ElementName=MainSnackbar, Path=MessageQueue}"
         Style="{StaticResource MaterialDesignEmbeddedDialogHost}">
@@ -232,6 +231,23 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
+                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
+                            <MenuItem
+                                x:Name="menuReload"
+                                Padding="{StaticResource MarginLeftRight8}"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
+                                <MenuItem.Header>
+                                    <StackPanel Orientation="Horizontal">
+                                        <materialDesign:PackIcon
+                                            Margin="{StaticResource MarginRight8}"
+                                            VerticalAlignment="Center"
+                                            Kind="Reload" />
+                                        <TextBlock Text="{x:Static resx:ResUI.menuReload}" />
+                                    </StackPanel>
+                                </MenuItem.Header>
+                            </MenuItem>
+                        </Menu>
+                        <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem
                                 x:Name="menuHelp"
@@ -251,23 +267,6 @@
                             </MenuItem>
                         </Menu>
                         <Separator />
-                        <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem
-                                x:Name="menuReload"
-                                Padding="{StaticResource MarginLeftRight8}"
-                                AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
-                                <MenuItem.Header>
-                                    <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon
-                                            Margin="{StaticResource MarginRight8}"
-                                            VerticalAlignment="Center"
-                                            Kind="Reload" />
-                                        <TextBlock Text="{x:Static resx:ResUI.menuReload}" />
-                                    </StackPanel>
-                                </MenuItem.Header>
-                            </MenuItem>
-                        </Menu>
-                        <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                             <MenuItem
                                 x:Name="menuPromotion"

v2rayN/v2rayN/Views/QrcodeView.xaml

@@ -15,7 +15,18 @@
         <sys:Double x:Key="QrcodeWidth">400</sys:Double>
     </UserControl.Resources>
 
-    <StackPanel Margin="{StaticResource Margin8}">
+    <DockPanel Margin="{StaticResource Margin8}">
+        <StackPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Bottom">
+            <Button
+                Width="100"
+                HorizontalAlignment="Right"
+                Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
+                Content="{x:Static resx:ResUI.menuClose}"
+                IsCancel="True"
+                IsDefault="True"
+                Style="{StaticResource DefButton}" />
+        </StackPanel>
+
         <Grid Margin="{StaticResource Margin8}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -40,5 +51,5 @@
                 TextWrapping="Wrap"
                 VerticalScrollBarVisibility="Auto" />
         </Grid>
-    </StackPanel>
+    </DockPanel>
 </UserControl>

v2rayN/v2rayN/Views/SubSettingWindow.xaml

@@ -20,7 +20,6 @@
     mc:Ignorable="d">
     <materialDesign:DialogHost
         materialDesign:TransitionAssist.DisableTransitions="True"
-        CloseOnClickAway="True"
         Identifier="SubDialog"
         Style="{StaticResource MaterialDesignEmbeddedDialogHost}">
         <DockPanel>