Merge 9886c52e89 into 6fa5ca5aa9

DNS type, host, port, and path

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.13.6</Version>
+        <Version>7.13.5</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -251,7 +251,6 @@ public class ConfigHandler
             item.PublicKey = profileItem.PublicKey;
             item.ShortId = profileItem.ShortId;
             item.SpiderX = profileItem.SpiderX;
-            item.Mldsa65Verify = profileItem.Mldsa65Verify;
             item.Extra = profileItem.Extra;
             item.MuxEnabled = profileItem.MuxEnabled;
         }

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -59,10 +59,6 @@ public class BaseFmt
         {
             dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
         }
-        if (item.Mldsa65Verify.IsNotEmpty())
-        {
-            dicQuery.Add("pqv", Utils.UrlEncode(item.Mldsa65Verify));
-        }       
         if (item.AllowInsecure.Equals("true"))
         {
             dicQuery.Add("allowInsecure", "1");
@@ -163,7 +159,6 @@ public class BaseFmt
         item.PublicKey = Utils.UrlDecode(query["pbk"] ?? "");
         item.ShortId = Utils.UrlDecode(query["sid"] ?? "");
         item.SpiderX = Utils.UrlDecode(query["spx"] ?? "");
-        item.Mldsa65Verify = Utils.UrlDecode(query["pqv"] ?? "");
         item.AllowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
 
         item.Network = query["type"] ?? nameof(ETransport.tcp);

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -93,7 +93,6 @@ public class ProfileItem : ReactiveObject
     public string PublicKey { get; set; }
     public string ShortId { get; set; }
     public string SpiderX { get; set; }
-    public string Mldsa65Verify { get; set; }
     public string Extra { get; set; }
     public bool? MuxEnabled { get; set; }
 }

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -343,7 +343,6 @@ public class TlsSettings4Ray
     public string? publicKey { get; set; }
     public string? shortId { get; set; }
     public string? spiderX { get; set; }
-    public string? mldsa65Verify { get; set; }
 }
 
 public class TcpSettings4Ray

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2643,15 +2643,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Mldsa65Verify 的本地化字符串。
-        /// </summary>
-        public static string TbMldsa65Verify {
-            get {
-                return ResourceManager.GetString("TbMldsa65Verify", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Transport protocol(network) 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1398,9 +1398,6 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
-  <data name="TbMldsa65Verify" xml:space="preserve">
-    <value>Mldsa65Verify</value>
-  </data>
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>Add [Anytls] Configuration</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1398,9 +1398,6 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
-  <data name="TbMldsa65Verify" xml:space="preserve">
-    <value>Mldsa65Verify</value>
-  </data>
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>Add [Anytls] Configuration</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1398,9 +1398,6 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
-  <data name="TbMldsa65Verify" xml:space="preserve">
-    <value>Mldsa65Verify</value>
-  </data>
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>Добавить сервер [Anytls]</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1395,9 +1395,6 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密码错误，请重试。</value>
   </data>
-  <data name="TbMldsa65Verify" xml:space="preserve">
-    <value>Mldsa65Verify</value>
-  </data>
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>添加 [Anytls] 配置文件</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1395,9 +1395,6 @@
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密碼錯誤，請重試。</value>
   </data>
-  <data name="TbMldsa65Verify" xml:space="preserve">
-    <value>Mldsa65Verify</value>
-  </data>
   <data name="menuAddAnytlsServer" xml:space="preserve">
     <value>新增 [Anytls] 設定檔</value>
   </data>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -952,7 +952,6 @@ public class CoreConfigV2rayService
                     publicKey = node.PublicKey,
                     shortId = node.ShortId,
                     spiderX = node.SpiderX,
-                    mldsa65Verify = node.Mldsa65Verify,
                     show = false,
                 };
 

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -773,7 +773,7 @@
                     Grid.Row="7"
                     ColumnDefinitions="180,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="0"
@@ -843,20 +843,6 @@
                         Width="400"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
-
-                    <TextBlock
-                        Grid.Row="5"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbMldsa65Verify}" />
-                    <TextBox
-                        x:Name="txtMldsa65Verify"
-                        Grid.Row="5"
-                        Grid.Column="1"
-                        Width="400"
-                        Margin="{StaticResource Margin4}"
-                        HorizontalAlignment="Left" />
                 </Grid>
                 <Separator Grid.Row="8" Margin="{StaticResource MarginTb8}" />
             </Grid>

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -195,7 +195,6 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
             this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.SpiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Mldsa65Verify, v => v.txtMldsa65Verify.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -1008,7 +1008,6 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180" />
@@ -1094,22 +1093,6 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
-
-                    <TextBlock
-                        Grid.Row="5"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TbMldsa65Verify}" />
-                    <TextBox
-                        x:Name="txtMldsa65Verify"
-                        Grid.Row="5"
-                        Grid.Column="1"
-                        Width="400"
-                        Margin="{StaticResource Margin4}"
-                        HorizontalAlignment="Left"
-                        Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Separator
                     Grid.Row="8"

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -189,7 +189,6 @@ public partial class AddServerWindow
             this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.SpiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SelectedSource.Mldsa65Verify, v => v.txtMldsa65Verify.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });