diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs index b43bdb60..15e87396 100644 --- a/v2rayN/v2rayN/Tool/Utils.cs +++ b/v2rayN/v2rayN/Tool/Utils.cs @@ -12,7 +12,6 @@ using System.Net.NetworkInformation; using System.Net.Sockets; using System.Reflection; using System.Runtime.InteropServices; -using System.Runtime.Serialization.Formatters.Binary; using System.Security.Cryptography; using System.Security.Principal; using System.Text; @@ -898,22 +897,26 @@ namespace v2rayN } /// - /// 深度拷贝 + /// DeepCopy /// /// /// /// public static T DeepCopy(T obj) { - object retval; - MemoryStream ms = new(); - BinaryFormatter bf = new(); - //序列化成流 - bf.Serialize(ms, obj); - ms.Seek(0, SeekOrigin.Begin); - //反序列化成对象 - retval = bf.Deserialize(ms); - return (T)retval; + return FromJson(ToJson(obj, false))!; + + // object retval; + // MemoryStream ms = new(); + //#pragma warning disable SYSLIB0011 // 类型或成员已过时 + // BinaryFormatter bf = new(); + //#pragma warning restore SYSLIB0011 // 类型或成员已过时 + // //序列化成流 + // bf.Serialize(ms, obj); + // ms.Seek(0, SeekOrigin.Begin); + // //反序列化成对象 + // retval = bf.Deserialize(ms); + // return (T)retval; } /// diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs index fe0547e2..d645c280 100644 --- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs @@ -367,6 +367,7 @@ namespace v2rayN.ViewModels break; case 7: + case 8: continue; } item.coreType = (ECoreType)Enum.Parse(typeof(ECoreType), type); diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index 2bf9f223..918048fd 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -22,9 +22,9 @@ - + - +