Merge pull request #573 from yfdyh000/netbuild

规范依赖文件的结构
2020-03-23 08:35:53 +08:00 · 2020-03-23 08:35:53 +08:00 · 3ebaabc1ef
parent 1510549663 db0a757a49
commit 3ebaabc1ef
21 changed files with 40 additions and 114 deletions
--- 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
--- a/v2rayN/v2rayN/LIB/Google.Protobuf.dll
+++ b/v2rayN/v2rayN/LIB/Google.Protobuf.dll
--- a/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll
+++ b/v2rayN/v2rayN/LIB/Grpc.Core.Api.dll
--- a/v2rayN/v2rayN/LIB/Grpc.Core.dll
+++ b/v2rayN/v2rayN/LIB/Grpc.Core.dll
--- a/v2rayN/v2rayN/LIB/Newtonsoft.Json.dll
+++ b/v2rayN/v2rayN/LIB/Newtonsoft.Json.dll
--- a/v2rayN/v2rayN/LIB/System.Buffers.dll
+++ b/v2rayN/v2rayN/LIB/System.Buffers.dll
--- a/v2rayN/v2rayN/LIB/System.Memory.dll
+++ b/v2rayN/v2rayN/LIB/System.Memory.dll
--- a/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll
+++ b/v2rayN/v2rayN/LIB/System.Runtime.CompilerServices.Unsafe.dll
--- a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll
+++ b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x64.dll
--- a/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll
+++ b/v2rayN/v2rayN/LIB/grpc_csharp_ext.x86.dll
--- a/v2rayN/v2rayN/LIB/libs.zip
+++ b/v2rayN/v2rayN/LIB/libs.zip
--- a/v2rayN/v2rayN/LIB/netstandard.dll
+++ b/v2rayN/v2rayN/LIB/netstandard.dll
--- a/v2rayN/v2rayN/LIB/zxing.dll
+++ b/v2rayN/v2rayN/LIB/zxing.dll
--- a/v2rayN/v2rayN/LIB/zxing.presentation.dll
+++ b/v2rayN/v2rayN/LIB/zxing.presentation.dll
--- 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;
-        }
    }
 }
--- 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 {
            }
        }
        
-        /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
-        /// </summary>
-        internal static byte[] libs {
-            get {
-                object obj = ResourceManager.GetObject("libs", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
--- a/v2rayN/v2rayN/Properties/Resources.resx
+++ b/v2rayN/v2rayN/Properties/Resources.resx
@ -130,9 +130,6 @@
  <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="libs" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\lib\libs.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="minimize" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
--- a/v2rayN/v2rayN/packages.config
+++ b/v2rayN/v2rayN/packages.config
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Tools" version="2.24.0" targetFramework="net46" developmentDependency="true" />
-</packages>
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -45,7 +44,7 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
@ -74,33 +73,14 @@
  </PropertyGroup>
  <PropertyGroup />
  <PropertyGroup />
+  <PropertyGroup>
+    <StartupObject>v2rayN.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Google.Protobuf, Version=3.9.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\Google.Protobuf.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\Grpc.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Grpc.Core.Api, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\Grpc.Core.Api.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\System.Buffers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="System.Core" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
@ -109,32 +89,12 @@
    <Reference Include="System.Drawing" />
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\System.Memory.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="System.Messaging" />
    <Reference Include="System.Net" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
-    <Reference Include="zxing, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\zxing.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="zxing.presentation, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>LIB\zxing.presentation.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Forms\AddServer4Form.cs">
@ -332,8 +292,6 @@
    <EmbeddedResource Include="app.config">
      <SubType>Designer</SubType>
    </EmbeddedResource>
-    <None Include="LIB\libs.zip" />
-    <None Include="packages.config" />
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@ -416,36 +374,37 @@
    <None Include="Resources\sub.png" />
    <None Include="Resources\checkupdate.png" />
    <None Include="Resources\about.png" />
-    <None Include="LIB\Google.Protobuf.dll" />
-    <None Include="LIB\Grpc.Core.Api.dll" />
-    <None Include="LIB\Grpc.Core.dll" />
-    <None Include="LIB\Newtonsoft.Json.dll" />
-    <None Include="LIB\System.Buffers.dll" />
-    <None Include="LIB\System.Memory.dll" />
-    <None Include="LIB\System.Runtime.CompilerServices.Unsafe.dll" />
-    <None Include="LIB\zxing.dll" />
-    <None Include="LIB\zxing.presentation.dll" />
-    <None Include="LIB\netstandard.dll" />
-    <Content Include="LIB\grpc_csharp_ext.x64.dll" />
-    <Content Include="LIB\grpc_csharp_ext.x86.dll" />
    <Content Include="Resources\help.png" />
    <None Include="Resources\notify.png" />
    <Content Include="Resources\privoxy_conf.txt" />
  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Google.Protobuf">
+      <Version>3.11.4</Version>
+    </PackageReference>
+    <PackageReference Include="Grpc.Core">
+      <Version>2.27.0</Version>
+    </PackageReference>
+    <PackageReference Include="Grpc.Tools">
+      <Version>2.27.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="ZXing.Net">
+      <Version>0.16.5</Version>
+    </PackageReference>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>copy /y $(SolutionDir)v2rayUpgrade\$(OutDir)* $(TargetDir)
+
+del $(TargetDir)*.xml $(TargetDir)*.so $(TargetDir)*.dylib
+if not "$(ConfigurationName)" == "Debug" del $(TargetDir)*.pdb</PostBuildEvent>
  </PropertyGroup>
  <Import Project="..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props'))" />
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets'))" />
-  </Target>
-  <Import Project="..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/v2rayN/v2rayUpgrade/MainForm.cs
+++ b/v2rayN/v2rayUpgrade/MainForm.cs
@ -62,6 +62,8 @@ namespace v2rayUpgrade
                    }
                }

+                string thisAppOldFile = Application.ExecutablePath + ".tmp";
+                File.Delete(thisAppOldFile);
                string startKey = "v2rayN/";

                using (ZipArchive archive = ZipFile.OpenRead(fileName))
@ -77,6 +79,10 @@ namespace v2rayUpgrade
                        {
                            fullName = fullName.Substring(startKey.Length, fullName.Length - startKey.Length);
                        }
+                        if (Application.ExecutablePath.ToLower() == GetPath(fullName).ToLower())
+                        {
+                            File.Move(Application.ExecutablePath, thisAppOldFile);
+                        }

                        string entryOuputPath = GetPath(fullName);

--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@ -27,7 +27,7 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>