From 1e37dc0f4a67d8a2e6eda32da388b106b43637a4 Mon Sep 17 00:00:00 2001
From: "Kyrie@cedu.me" <Kyrie@cedu.me>
Date: Thu, 12 Mar 2020 01:34:13 +0800
Subject: [PATCH 1/7] fix the situation that causing quic setting become null
 when TLS is not enable

---
 .gitignore                              |  4 +++-
 v2rayN/v2rayN/packages.config           |  2 +-
 v2rayN/v2rayN/v2rayN.csproj             |  8 ++++----
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj | 12 ++++++++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5d8031c7d..7b2c8c7b5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@
 /v2rayN/v2rayUpgrade/bin/Debug
 /v2rayN/v2rayUpgrade/obj/Debug 
 /v2rayN/v2rayUpgrade/bin/Release
-/v2rayN/v2rayUpgrade/obj/Release
\ No newline at end of file
+/v2rayN/v2rayUpgrade/obj/Release
+/.vs/test/v16/.suo
+/v2rayN/v2rayUpgrade/packages.config
diff --git a/v2rayN/v2rayN/packages.config b/v2rayN/v2rayN/packages.config
index 7e993a0afa..f5f789c481 100644
--- a/v2rayN/v2rayN/packages.config
+++ b/v2rayN/v2rayN/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Grpc.Tools" version="2.24.0" targetFramework="net46" developmentDependency="true" />
+  <package id="Grpc.Tools" version="2.27.0" targetFramework="net46" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 002d99e372..f6d0067cbb 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -1,6 +1,6 @@
 <?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="..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.27.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>
@@ -439,10 +439,10 @@
     <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'))" />
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.props'))" />
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.27.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')" />
+  <Import Project="..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.27.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">
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
index a36e3f553b..b683e3bca5 100644
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.27.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>
@@ -13,6 +14,8 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -71,6 +74,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -85,4 +89,12 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.27.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.props'))" />
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets'))" />
+  </Target>
+  <Import Project="..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets')" />
 </Project>
\ No newline at end of file

From 4638e66c8357732f9db99adee81012fe33b32aca Mon Sep 17 00:00:00 2001
From: "Kyrie@cedu.me" <Kyrie@cedu.me>
Date: Thu, 12 Mar 2020 01:46:41 +0800
Subject: [PATCH 2/7] fix the situation that causing quic setting become null
 when TLS is not enable

---
 v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
index bda79fbc0e..ce05e98497 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -540,8 +540,8 @@ private static int boundStreamSettings(Config config, string iobound, ref Stream
                         quicsettings.key = config.path();
                         quicsettings.header = new Header();
                         quicsettings.header.type = config.headerType();
-                        streamSettings.tlsSettings.serverName = config.address();
                         streamSettings.quicSettings = quicsettings;
+                        streamSettings.tlsSettings.serverName = config.address();                       
                         break;
                     default:
                         //tcp带http伪装

From e3478307d6d1bbffa9b2645a019b0798e46036ff Mon Sep 17 00:00:00 2001
From: lycor1s <819355396@qq.com>
Date: Thu, 12 Mar 2020 01:52:09 +0800
Subject: [PATCH 3/7] Delete .gitignore

---
 .gitignore | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7b2c8c7b5a..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
-################################################################################
-
-/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/packages
-.vs/ProjectSettings.json
-.vs/slnx.sqlite
-.vs/VSWorkspaceState.json
-/v2rayN/v2rayUpgrade/bin/Debug
-/v2rayN/v2rayUpgrade/obj/Debug 
-/v2rayN/v2rayUpgrade/bin/Release
-/v2rayN/v2rayUpgrade/obj/Release
-/.vs/test/v16/.suo
-/v2rayN/v2rayUpgrade/packages.config

From e651a4883e92c85ef88c8a0bf3fd662549b468cf Mon Sep 17 00:00:00 2001
From: lycor1s <819355396@qq.com>
Date: Thu, 12 Mar 2020 01:52:21 +0800
Subject: [PATCH 4/7] Delete packages.config

---
 v2rayN/v2rayN/packages.config | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 v2rayN/v2rayN/packages.config

diff --git a/v2rayN/v2rayN/packages.config b/v2rayN/v2rayN/packages.config
deleted file mode 100644
index f5f789c481..0000000000
--- a/v2rayN/v2rayN/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Grpc.Tools" version="2.27.0" targetFramework="net46" developmentDependency="true" />
-</packages>
\ No newline at end of file

From 774e19b5ba6fedeadd63e1c2f268cb2601885d6c Mon Sep 17 00:00:00 2001
From: lycor1s <819355396@qq.com>
Date: Thu, 12 Mar 2020 01:52:31 +0800
Subject: [PATCH 5/7] Delete v2rayN.csproj

---
 v2rayN/v2rayN/v2rayN.csproj | 453 ------------------------------------
 1 file changed, 453 deletions(-)
 delete mode 100644 v2rayN/v2rayN/v2rayN.csproj

diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
deleted file mode 100644
index f6d0067cbb..0000000000
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ /dev/null
@@ -1,453 +0,0 @@
-<?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.27.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.27.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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0A9785E6-D256-4B73-9757-4EF59955FD1E}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>v2rayN</RootNamespace>
-    <AssemblyName>v2rayN</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <PublishUrl>发布\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>v2rayN.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestCertificateThumbprint>BD431FE78E8A6683106E7110882AE5C41CBF5C60</ManifestCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestKeyFile>v2rayN_TemporaryKey.pfx</ManifestKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>false</SignManifests>
-  </PropertyGroup>
-  <PropertyGroup />
-  <PropertyGroup>
-    <TargetZone>LocalIntranet</TargetZone>
-  </PropertyGroup>
-  <PropertyGroup />
-  <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" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <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">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\AddServer4Form.Designer.cs">
-      <DependentUpon>AddServer4Form.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Base\ListViewFlickerFree.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Forms\MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\SubSettingForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\SubSettingForm.Designer.cs">
-      <DependentUpon>SubSettingForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\AddServer2Form.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\AddServer2Form.Designer.cs">
-      <DependentUpon>AddServer2Form.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\AddServer3Form.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\AddServer3Form.Designer.cs">
-      <DependentUpon>AddServer3Form.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\QRCodeControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\QRCodeControl.Designer.cs">
-      <DependentUpon>QRCodeControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\SubSettingControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\SubSettingControl.Designer.cs">
-      <DependentUpon>SubSettingControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Handler\MainFormHandler.cs" />
-    <Compile Include="Handler\SpeedtestHandler.cs" />
-    <Compile Include="Handler\StatisticsHandler.cs" />
-    <Compile Include="Handler\DownloadHandle.cs" />
-    <Compile Include="Base\HttpWebServer.cs" />
-    <Compile Include="Base\HttpWebServerB.cs" />
-    <Compile Include="HttpProxyHandler\PrivoxyHandler.cs" />
-    <Compile Include="HttpProxyHandler\PACServerHandle.cs" />
-    <Compile Include="HttpProxyHandler\ProxySetting.cs" />
-    <Compile Include="HttpProxyHandler\HttpProxyHandle.cs" />
-    <Compile Include="Base\WebClientEx.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Mode\EMove.cs" />
-    <Compile Include="Mode\ServerStatistics.cs" />
-    <Compile Include="Mode\SysproxyConfig.cs" />
-    <Compile Include="Mode\EConfigType.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Resx\ResUI.zh-Hans.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ResUI.zh-Hans.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Resx\ResUI.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ResUI.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Base\StringEx.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Forms\AddServerForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\AddServerForm.Designer.cs">
-      <DependentUpon>AddServerForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\BaseForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\BaseForm.Designer.cs">
-      <DependentUpon>BaseForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Global.cs" />
-    <Compile Include="Handler\QRCodeHelper.cs" />
-    <Compile Include="Mode\VmessQRCode.cs" />
-    <Compile Include="Mode\V2rayTcpRequest.cs" />
-    <Compile Include="Handler\ConfigHandler.cs" />
-    <Compile Include="Handler\V2rayHandler.cs" />
-    <Compile Include="Mode\V2rayConfig.cs" />
-    <Compile Include="Mode\Config.cs" />
-    <Compile Include="Forms\OptionSettingForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\OptionSettingForm.Designer.cs">
-      <DependentUpon>OptionSettingForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tool\FileManager.cs" />
-    <Compile Include="Tool\Job.cs" />
-    <Compile Include="Tool\UIRes.cs" />
-    <Compile Include="Tool\UI.cs" />
-    <Compile Include="Tool\Utils.cs" />
-    <Compile Include="Handler\V2rayConfigHandler.cs" />
-    <EmbeddedResource Include="Forms\AddServer2Form.zh-Hans.resx">
-      <DependentUpon>AddServer2Form.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\AddServer4Form.resx">
-      <DependentUpon>AddServer4Form.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\AddServer4Form.zh-Hans.resx">
-      <DependentUpon>AddServer4Form.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\AddServer3Form.zh-Hans.resx">
-      <DependentUpon>AddServer3Form.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\AddServerForm.zh-Hans.resx">
-      <DependentUpon>AddServerForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MainForm.zh-Hans.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OptionSettingForm.zh-Hans.resx">
-      <DependentUpon>OptionSettingForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\QRCodeControl.zh-Hans.resx">
-      <DependentUpon>QRCodeControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SubSettingControl.resx">
-      <DependentUpon>SubSettingControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SubSettingControl.zh-Hans.resx">
-      <DependentUpon>SubSettingControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SubSettingForm.resx">
-      <DependentUpon>SubSettingForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\AddServerForm.resx">
-      <DependentUpon>AddServerForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\BaseForm.resx">
-      <DependentUpon>BaseForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OptionSettingForm.resx">
-      <DependentUpon>OptionSettingForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\QRCodeControl.resx">
-      <DependentUpon>QRCodeControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\AddServer2Form.resx">
-      <DependentUpon>AddServer2Form.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\AddServer3Form.resx">
-      <DependentUpon>AddServer3Form.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SubSettingForm.zh-Hans.resx">
-      <DependentUpon>SubSettingForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <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>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Sample\custom_routing_block" />
-    <EmbeddedResource Include="Sample\custom_routing_direct" />
-    <EmbeddedResource Include="Sample\custom_routing_proxy" />
-    <Protobuf Include="Protos\Statistics.proto" />
-    <None Include="Resources\abp.js.gz" />
-    <None Include="Resources\pac.txt.gz" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resx\ResUI.zh-Hans.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>ResUI.zh-Hans.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resx\ResUI.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>ResUI.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="v2rayN.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Sample\SampleClientConfig.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Sample\SampleHttprequest.txt" />
-    <EmbeddedResource Include="Sample\SampleHttpresponse.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 和 x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 4.5</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Sample\SampleServerConfig.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\privoxy.exe.gz" />
-    <None Include="Resources\restart.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\option.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\server.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\minimize.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\promotion.png" />
-    <EmbeddedResource Include="Sample\BlankPac.txt" />
-    <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>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </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.27.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.props'))" />
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets'))" />
-  </Target>
-  <Import Project="..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.27.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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file

From 99a9a1ed9228ac2321bcdc8ceeacbf48d8a25608 Mon Sep 17 00:00:00 2001
From: lycor1s <819355396@qq.com>
Date: Thu, 12 Mar 2020 01:52:41 +0800
Subject: [PATCH 6/7] Delete v2rayUpgrade.csproj

---
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj | 100 ------------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj

diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
deleted file mode 100644
index b683e3bca5..0000000000
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.27.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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F82BE52A-155C-492C-9E0A-1E917EC62C78}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>v2rayUpgrade</RootNamespace>
-    <AssemblyName>v2rayUpgrade</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.27.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.props'))" />
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets'))" />
-  </Target>
-  <Import Project="..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.27.0\build\Grpc.Tools.targets')" />
-</Project>
\ No newline at end of file

From d9975cbbd76a562138412655f426a140db105599 Mon Sep 17 00:00:00 2001
From: lycor1s <qienysw@gmail.com>
Date: Thu, 12 Mar 2020 02:04:06 +0800
Subject: [PATCH 7/7] fix the situation that causing quic setting become null
 when TLS is not enable

---
 v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
index ce05e98497..72b4909cc4 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -541,7 +541,9 @@ private static int boundStreamSettings(Config config, string iobound, ref Stream
                         quicsettings.header = new Header();
                         quicsettings.header.type = config.headerType();
                         streamSettings.quicSettings = quicsettings;
-                        streamSettings.tlsSettings.serverName = config.address();                       
+                        if (config.streamSecurity() == Global.StreamSecurity){
+                            streamSettings.tlsSettings.serverName = config.address();  
+                        }              
                         break;
                     default:
                         //tcp带http伪装