diff --git a/.gitignore b/.gitignore index b5d8031c..afeea2ed 100644 --- a/.gitignore +++ b/.gitignore @@ -5,10 +5,9 @@ /v2rayN/.vs/ /v2rayN/v2rayN/bin/Debug/app.publish /v2rayN/v2rayN/bin/Debug -/v2rayN/v2rayN/obj/Debug -/v2rayN/.vs/v2rayN/DesignTimeBuild /v2rayN/v2rayN/bin/Release -/v2rayN/v2rayN/obj/Release +/v2rayN/v2rayN/obj/ +/v2rayN/.vs/v2rayN/DesignTimeBuild /v2rayN/packages .vs/ProjectSettings.json .vs/slnx.sqlite diff --git a/v2rayN/v2rayN/LIB/Google.Protobuf.dll b/v2rayN/v2rayN/LIB/Google.Protobuf.dll deleted file mode 100644 index 596878f0..00000000 Binary files a/v2rayN/v2rayN/LIB/Google.Protobuf.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll b/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll deleted file mode 100644 index c2dfadc2..00000000 Binary files a/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/Grpc.Core.dll b/v2rayN/v2rayN/LIB/Grpc.Core.dll deleted file mode 100644 index 9413b6e5..00000000 Binary files a/v2rayN/v2rayN/LIB/Grpc.Core.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/Newtonsoft.Json.dll b/v2rayN/v2rayN/LIB/Newtonsoft.Json.dll deleted file mode 100644 index 71ae7e6c..00000000 Binary files a/v2rayN/v2rayN/LIB/Newtonsoft.Json.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/System.Buffers.dll b/v2rayN/v2rayN/LIB/System.Buffers.dll deleted file mode 100644 index b6d9c778..00000000 Binary files a/v2rayN/v2rayN/LIB/System.Buffers.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/System.Memory.dll b/v2rayN/v2rayN/LIB/System.Memory.dll deleted file mode 100644 index bdfc501e..00000000 Binary files a/v2rayN/v2rayN/LIB/System.Memory.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll b/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll deleted file mode 100644 index 31562392..00000000 Binary files a/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll deleted file mode 100644 index 8c10df69..00000000 Binary files a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll deleted file mode 100644 index dd3876df..00000000 Binary files a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/libs.zip b/v2rayN/v2rayN/LIB/libs.zip deleted file mode 100644 index 55723493..00000000 Binary files a/v2rayN/v2rayN/LIB/libs.zip and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/netstandard.dll b/v2rayN/v2rayN/LIB/netstandard.dll deleted file mode 100644 index 1f1ab22c..00000000 Binary files a/v2rayN/v2rayN/LIB/netstandard.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/zxing.dll b/v2rayN/v2rayN/LIB/zxing.dll deleted file mode 100644 index 7b99de64..00000000 Binary files a/v2rayN/v2rayN/LIB/zxing.dll and /dev/null differ diff --git a/v2rayN/v2rayN/LIB/zxing.presentation.dll b/v2rayN/v2rayN/LIB/zxing.presentation.dll deleted file mode 100644 index 8ad3f9bf..00000000 Binary files a/v2rayN/v2rayN/LIB/zxing.presentation.dll and /dev/null differ diff --git a/v2rayN/v2rayN/Program.cs b/v2rayN/v2rayN/Program.cs index 133e2108..cd3e1559 100644 --- a/v2rayN/v2rayN/Program.cs +++ b/v2rayN/v2rayN/Program.cs @@ -33,11 +33,6 @@ namespace v2rayN if (!IsDuplicateInstance()) { - if (!UnzipLibs()) - { - UI.ShowError($"Error preparing the environment(准备运行环境出错)"); - return; - } Utils.SaveLog("v2rayN start up " + Utils.GetVersion()); @@ -100,21 +95,5 @@ namespace v2rayN { Utils.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject); } - - static bool UnzipLibs() - { - string fileName = Utils.GetPath("libs.zip"); - if (!FileManager.ByteArrayToFile(fileName, Resources.libs)) - { - return false; - } - - if (!FileManager.ZipExtractToFile(fileName)) - { - return false; - } - - return true; - } } } diff --git a/v2rayN/v2rayN/Properties/Resources.Designer.cs b/v2rayN/v2rayN/Properties/Resources.Designer.cs index be8f6a6d..fb420525 100644 --- a/v2rayN/v2rayN/Properties/Resources.Designer.cs +++ b/v2rayN/v2rayN/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace v2rayN.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -100,16 +100,6 @@ namespace v2rayN.Properties { } } - /// - /// 查找 System.Byte[] 类型的本地化资源。 - /// - internal static byte[] libs { - get { - object obj = ResourceManager.GetObject("libs", resourceCulture); - return ((byte[])(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/v2rayN/v2rayN/Properties/Resources.resx b/v2rayN/v2rayN/Properties/Resources.resx index cd38282a..38dc1d7e 100644 --- a/v2rayN/v2rayN/Properties/Resources.resx +++ b/v2rayN/v2rayN/Properties/Resources.resx @@ -130,9 +130,6 @@ ..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\lib\libs.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/v2rayN/v2rayN/packages.config b/v2rayN/v2rayN/packages.config deleted file mode 100644 index 7e993a0a..00000000 --- a/v2rayN/v2rayN/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index ff7e5c38..514779ff 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -1,6 +1,5 @@  - Debug @@ -45,7 +44,7 @@ AnyCPU - pdbonly + none true bin\Release\ TRACE @@ -74,33 +73,14 @@ + + v2rayN.Program + + + true + - - False - LIB\Google.Protobuf.dll - False - - - False - LIB\Grpc.Core.dll - False - - - False - LIB\Grpc.Core.Api.dll - False - - - False - LIB\Newtonsoft.Json.dll - False - - - False - LIB\System.Buffers.dll - False - @@ -109,32 +89,12 @@ - - False - LIB\System.Memory.dll - False - - - False - LIB\System.Runtime.CompilerServices.Unsafe.dll - False - - - False - LIB\zxing.dll - False - - - False - LIB\zxing.presentation.dll - False - @@ -332,8 +292,6 @@ Designer - - SettingsSingleFileGenerator Settings.Designer.cs @@ -416,36 +374,37 @@ - - - - - - - - - - - - + + + 3.11.4 + + + 2.27.0 + + + 2.27.0 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 12.0.3 + + + 0.16.5 + + - - + copy /y $(SolutionDir)v2rayUpgrade\$(OutDir)* $(TargetDir) + +del $(TargetDir)*.xml $(TargetDir)*.so $(TargetDir)*.dylib +if not "$(ConfigurationName)" == "Debug" del $(TargetDir)*.pdb - - - 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - -