diff --git a/v2rayN/v2rayN/LIB/Google.Protobuf.dll b/v2rayN/v2rayN/LIB/Google.Protobuf.dll new file mode 100644 index 00000000..596878f0 Binary files /dev/null and b/v2rayN/v2rayN/LIB/Google.Protobuf.dll differ diff --git a/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll b/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll new file mode 100644 index 00000000..c2dfadc2 Binary files /dev/null and b/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll differ diff --git a/v2rayN/v2rayN/LIB/Grpc.Core.dll b/v2rayN/v2rayN/LIB/Grpc.Core.dll new file mode 100644 index 00000000..9413b6e5 Binary files /dev/null and b/v2rayN/v2rayN/LIB/Grpc.Core.dll differ diff --git a/v2rayN/v2rayN/Newtonsoft.Json.dll b/v2rayN/v2rayN/LIB/Newtonsoft.Json.dll similarity index 100% rename from v2rayN/v2rayN/Newtonsoft.Json.dll rename to v2rayN/v2rayN/LIB/Newtonsoft.Json.dll diff --git a/v2rayN/v2rayN/LIB/System.Buffers.dll b/v2rayN/v2rayN/LIB/System.Buffers.dll new file mode 100644 index 00000000..b6d9c778 Binary files /dev/null and b/v2rayN/v2rayN/LIB/System.Buffers.dll differ diff --git a/v2rayN/v2rayN/LIB/System.Memory.dll b/v2rayN/v2rayN/LIB/System.Memory.dll new file mode 100644 index 00000000..bdfc501e Binary files /dev/null and b/v2rayN/v2rayN/LIB/System.Memory.dll differ diff --git a/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll b/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll new file mode 100644 index 00000000..31562392 Binary files /dev/null and b/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll differ diff --git a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll new file mode 100644 index 00000000..8c10df69 Binary files /dev/null and b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll differ diff --git a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll new file mode 100644 index 00000000..dd3876df Binary files /dev/null and b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll differ diff --git a/v2rayN/v2rayN/zxing.dll b/v2rayN/v2rayN/LIB/zxing.dll similarity index 100% rename from v2rayN/v2rayN/zxing.dll rename to v2rayN/v2rayN/LIB/zxing.dll diff --git a/v2rayN/v2rayN/zxing.presentation.dll b/v2rayN/v2rayN/LIB/zxing.presentation.dll similarity index 100% rename from v2rayN/v2rayN/zxing.presentation.dll rename to v2rayN/v2rayN/LIB/zxing.presentation.dll diff --git a/v2rayN/v2rayN/Program.cs b/v2rayN/v2rayN/Program.cs index da87a1c4..0f32d796 100644 --- a/v2rayN/v2rayN/Program.cs +++ b/v2rayN/v2rayN/Program.cs @@ -52,7 +52,7 @@ namespace v2rayN { try { - string resourceName = "v2rayN." + new AssemblyName(args.Name).Name + ".dll"; + string resourceName = "v2rayN.LIB." + new AssemblyName(args.Name).Name + ".dll"; using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)) { if (stream == null) diff --git a/v2rayN/v2rayN/grpc_csharp_ext.x64.dll b/v2rayN/v2rayN/grpc_csharp_ext.x64.dll new file mode 100644 index 00000000..8c10df69 Binary files /dev/null and b/v2rayN/v2rayN/grpc_csharp_ext.x64.dll differ diff --git a/v2rayN/v2rayN/grpc_csharp_ext.x86.dll b/v2rayN/v2rayN/grpc_csharp_ext.x86.dll new file mode 100644 index 00000000..dd3876df Binary files /dev/null and b/v2rayN/v2rayN/grpc_csharp_ext.x86.dll differ diff --git a/v2rayN/v2rayN/packages.config b/v2rayN/v2rayN/packages.config index bd31e11d..99dcde88 100644 --- a/v2rayN/v2rayN/packages.config +++ b/v2rayN/v2rayN/packages.config @@ -1,11 +1,4 @@  - - - - - - - \ No newline at end of file diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index 2e23a6d5..41959eef 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -76,21 +76,30 @@ - ..\packages\Google.Protobuf.3.9.1\lib\net45\Google.Protobuf.dll + False + LIB\Google.Protobuf.dll + False - ..\packages\Grpc.Core.2.23.0\lib\net45\Grpc.Core.dll + False + LIB\Grpc.Core.dll + False - ..\packages\Grpc.Core.Api.2.23.0\lib\net45\Grpc.Core.Api.dll + False + LIB\Grpc.Core.Api.dll + False - - .\Newtonsoft.Json.dll + + False + LIB\Newtonsoft.Json.dll False - ..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll + False + LIB\System.Buffers.dll + False @@ -101,20 +110,25 @@ - ..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll + False + LIB\System.Memory.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + False + LIB\System.Runtime.CompilerServices.Unsafe.dll + False - - .\zxing.dll + + False + LIB\zxing.dll False - - .\zxing.presentation.dll + + False + LIB\zxing.presentation.dll False @@ -346,9 +360,6 @@ - - - @@ -398,12 +409,24 @@ + + + + + + + + + + + Always + + + Always + - - - @@ -414,7 +437,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. -