From 03023c04fc8bbb6fddf271d5bbf49030016a1d91 Mon Sep 17 00:00:00 2001
From: Computer Idiot <computeridiot999@gmail.com>
Date: Mon, 15 Aug 2022 21:33:06 +0800
Subject: [PATCH 1/6] Upgrade to SDK-style project format with .NET Upgrade
 Assistant

---
 v2rayN/v2rayN/v2rayN.csproj             | 400 +-----------------------
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj |  83 +----
 2 files changed, 20 insertions(+), 463 deletions(-)

diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 0cf80f9c..d78833cc 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -1,21 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
     <LangVersion>preview</LangVersion>
-    <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.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
     <PublishUrl>发布\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -31,27 +19,12 @@
     <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>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</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>
@@ -68,352 +41,40 @@
   <PropertyGroup>
     <SignManifests>false</SignManifests>
   </PropertyGroup>
-  <PropertyGroup />
   <PropertyGroup>
     <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
-  <PropertyGroup />
-  <PropertyGroup />
   <PropertyGroup>
     <StartupObject>v2rayN.Program</StartupObject>
   </PropertyGroup>
-  <PropertyGroup>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Data.Linq" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Messaging" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Base\HttpClientHelper.cs" />
-    <Compile Include="Base\ListViewFlickerFree.cs">
+    <Compile Update="Base\ListViewFlickerFree.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Forms\BaseServerForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\BaseServerForm.Designer.cs">
-      <DependentUpon>BaseServerForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\MainMsgControl.cs">
+    <Compile Update="Forms\MainMsgControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Forms\MainMsgControl.Designer.cs">
-      <DependentUpon>MainMsgControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\MsgFilterSetForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\MsgFilterSetForm.Designer.cs">
-      <DependentUpon>MsgFilterSetForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\RoutingRuleSettingDetailsForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\RoutingRuleSettingDetailsForm.Designer.cs">
-      <DependentUpon>RoutingRuleSettingDetailsForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\GlobalHotkeySettingForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\GlobalHotkeySettingForm.Designer.cs">
-      <DependentUpon>GlobalHotkeySettingForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\RoutingRuleSettingForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\RoutingRuleSettingForm.Designer.cs">
-      <DependentUpon>RoutingRuleSettingForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\ServerTransportControl.cs">
+    <Compile Update="Forms\ServerTransportControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Forms\ServerTransportControl.Designer.cs">
-      <DependentUpon>ServerTransportControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\GroupSettingControl.cs">
+    <Compile Update="Forms\GroupSettingControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Forms\GroupSettingControl.Designer.cs">
-      <DependentUpon>GroupSettingControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\GroupSettingForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\GroupSettingForm.Designer.cs">
-      <DependentUpon>GroupSettingForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Handler\LazyConfig.cs" />
-    <Compile Include="Handler\ShareHandler.cs" />
-    <Compile Include="Handler\UpdateHandle.cs" />
-    <Compile Include="Mode\ComboItem.cs" />
-    <Compile Include="Forms\MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\RoutingSettingForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\RoutingSettingForm.Designer.cs">
-      <DependentUpon>RoutingSettingForm.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\QRCodeControl.cs">
+    <Compile Update="Forms\QRCodeControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Forms\QRCodeControl.Designer.cs">
-      <DependentUpon>QRCodeControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\SubSettingControl.cs">
+    <Compile Update="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="Handler\ProxySetting.cs" />
-    <Compile Include="Handler\SysProxyHandle.cs" />
-    <Compile Include="Mode\ESpeedActionType.cs" />
-    <Compile Include="Mode\EGlobalHotkey.cs" />
-    <Compile Include="Mode\ECoreType.cs" />
-    <Compile Include="Mode\ESysProxyType.cs" />
-    <Compile Include="Mode\EMove.cs" />
-    <Compile Include="Mode\EServerColName.cs" />
-    <Compile Include="Mode\GitHubRelease.cs" />
-    <Compile Include="Mode\RoutingItem.cs" />
-    <Compile Include="Mode\RulesItem.cs" />
-    <Compile Include="Mode\ServerStatistics.cs" />
-    <Compile Include="Mode\CoreInfo.cs" />
-    <Compile Include="Mode\SysproxyConfig.cs" />
-    <Compile Include="Mode\EConfigType.cs" />
-    <Compile Include="Mode\ServerTestItem.cs" />
-    <Compile Include="Mode\SsSIP008.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\Logging.cs" />
-    <Compile Include="Tool\QueryableExtension.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\AddServerForm.zh-Hans.resx">
-      <DependentUpon>AddServerForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\BaseServerForm.resx">
-      <DependentUpon>BaseServerForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\GlobalHotkeySettingForm.zh-Hans.resx">
-      <DependentUpon>GlobalHotkeySettingForm.cs</DependentUpon>
-    </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\MainMsgControl.resx">
-      <DependentUpon>MainMsgControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MainMsgControl.zh-Hans.resx">
-      <DependentUpon>MainMsgControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MsgFilterSetForm.resx">
-      <DependentUpon>MsgFilterSetForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MsgFilterSetForm.zh-Hans.resx">
-      <DependentUpon>MsgFilterSetForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OptionSettingForm.zh-Hans.resx">
-      <DependentUpon>OptionSettingForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\QRCodeControl.zh-Hans.resx">
-      <DependentUpon>QRCodeControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\RoutingRuleSettingDetailsForm.resx">
-      <DependentUpon>RoutingRuleSettingDetailsForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\RoutingRuleSettingDetailsForm.zh-Hans.resx">
-      <DependentUpon>RoutingRuleSettingDetailsForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\GlobalHotkeySettingForm.resx">
-      <DependentUpon>GlobalHotkeySettingForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\RoutingRuleSettingForm.resx">
-      <DependentUpon>RoutingRuleSettingForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\RoutingRuleSettingForm.zh-Hans.resx">
-      <DependentUpon>RoutingRuleSettingForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ServerTransportControl.resx">
-      <DependentUpon>ServerTransportControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ServerTransportControl.zh-Hans.resx">
-      <DependentUpon>ServerTransportControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\GroupSettingControl.resx">
-      <DependentUpon>GroupSettingControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\GroupSettingControl.zh-Hans.resx">
-      <DependentUpon>GroupSettingControl.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\RoutingSettingForm.resx">
-      <DependentUpon>RoutingSettingForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\RoutingSettingForm.zh-Hans.resx">
-      <DependentUpon>RoutingSettingForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\GroupSettingForm.resx">
-      <DependentUpon>GroupSettingForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\GroupSettingForm.zh-Hans.resx">
-      <DependentUpon>GroupSettingForm.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\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="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>
-    <None Include="Resources\sysproxy.exe.gz" />
-    <None Include="Resources\sysproxy64.exe.gz" />
     <EmbeddedResource Include="Sample\custom_routing_white" />
     <EmbeddedResource Include="Sample\custom_routing_global" />
     <EmbeddedResource Include="Sample\custom_routing_locked" />
@@ -421,16 +82,6 @@
     <Protobuf Include="Protos\Statistics.proto" />
   </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>
@@ -465,30 +116,12 @@
   <ItemGroup>
     <EmbeddedResource Include="Sample\SampleServerConfig.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <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>
     <Content Include="Resources\NotifyIcon1.ico" />
     <Content Include="Resources\NotifyIcon2.ico" />
     <Content Include="Resources\NotifyIcon3.ico" />
     <EmbeddedResource Include="Sample\SampleInbound.txt" />
-    <None Include="Resources\share.png" />
-    <None Include="Resources\promotion.png" />
-    <None Include="Resources\sub.png" />
-    <None Include="Resources\checkupdate.png" />
-    <None Include="Resources\about.png" />
     <Content Include="Resources\help.png" />
-    <None Include="Resources\notify.png" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf">
@@ -505,6 +138,7 @@
     <PackageReference Include="log4net">
       <Version>2.0.15</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>
@@ -514,23 +148,15 @@
     <PackageReference Include="NHotkey.WindowsForms">
       <Version>2.1.0</Version>
     </PackageReference>
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="ZXing.Net">
       <Version>0.16.8</Version>
     </PackageReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <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')" />
-  <!-- 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
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
index a619ae5e..d6e2b53b 100644
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@@ -1,89 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F82BE52A-155C-492C-9E0A-1E917EC62C78}</ProjectGuid>
+    <TargetFramework>net48</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>v2rayUpgrade</RootNamespace>
-    <AssemblyName>v2rayUpgrade</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile />
-  </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>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</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.Web" />
-    <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="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>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

From a6fefcacc955e086ef7cc0cda7eb132463923643 Mon Sep 17 00:00:00 2001
From: Computer Idiot <computeridiot999@gmail.com>
Date: Mon, 15 Aug 2022 21:35:38 +0800
Subject: [PATCH 2/6] Simplify v2rayUpgrade.csproj

---
 .../v2rayUpgrade/Properties/AssemblyInfo.cs   | 34 -------------------
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj       |  4 +--
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 v2rayN/v2rayUpgrade/Properties/AssemblyInfo.cs

diff --git a/v2rayN/v2rayUpgrade/Properties/AssemblyInfo.cs b/v2rayN/v2rayUpgrade/Properties/AssemblyInfo.cs
deleted file mode 100644
index b0e6d5c3..00000000
--- a/v2rayN/v2rayUpgrade/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("v2rayUpgrade")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("v2rayUpgrade")]
-[assembly: AssemblyCopyright("Copyright © 2019-2020 (GPLv3)")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("f82be52a-155c-492c-9e0a-1e917ec62c78")]
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
-// 方法是按如下所示使用“*”: :
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
index d6e2b53b..96ae2686 100644
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <Copyright>Copyright © 2019-2020 (GPLv3)</Copyright>
+    <FileVersion>1.1.0.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

From 217215b035af7c67ed6483d49ad6b80c965b424d Mon Sep 17 00:00:00 2001
From: Computer Idiot <computeridiot999@gmail.com>
Date: Mon, 15 Aug 2022 21:42:05 +0800
Subject: [PATCH 3/6] Simplify v2rayN.csproj

---
 v2rayN/v2rayN/Properties/AssemblyInfo.cs |  35 --------
 v2rayN/v2rayN/v2rayN.csproj              | 105 +----------------------
 2 files changed, 2 insertions(+), 138 deletions(-)
 delete mode 100644 v2rayN/v2rayN/Properties/AssemblyInfo.cs

diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
deleted file mode 100644
index a8c55ef6..00000000
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// 有关程序集的常规信息通过以下
-// 特性集控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("v2rayN")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("v2rayN")]
-[assembly: AssemblyCopyright("Copyright © 2019-2022 (GPLv3)")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 使此程序集中的类型
-// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型，
-// 则将该类型上的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("72d9f089-5e7a-4c5f-be0a-8a211536b483")]
-
-// 程序集的版本信息由下面四个值组成:
-//
-//      主版本
-//      次版本 
-//      生成号
-//      修订号
-//
-// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
-// 方法是按如下所示使用“*”:
-//[assembly: AssemblyVersion("1.0.*")]
-//[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("5.33")]
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index d78833cc..c66885bf 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -3,50 +3,13 @@
     <TargetFramework>net48</TargetFramework>
     <LangVersion>preview</LangVersion>
     <OutputType>WinExe</OutputType>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <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>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
+    <Copyright>Copyright © 2019-2022 (GPLv3)</Copyright>
+    <FileVersion>5.33</FileVersion>
   </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>
-    <TargetZone>LocalIntranet</TargetZone>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>v2rayN.Program</StartupObject>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Data.Linq" />
     <Reference Include="System.IO.Compression" />
@@ -57,72 +20,8 @@
     <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="Base\ListViewFlickerFree.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="Forms\MainMsgControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="Forms\ServerTransportControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="Forms\GroupSettingControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="Forms\QRCodeControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="Forms\SubSettingControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <EmbeddedResource Include="Sample\custom_routing_white" />
-    <EmbeddedResource Include="Sample\custom_routing_global" />
-    <EmbeddedResource Include="Sample\custom_routing_locked" />
-    <EmbeddedResource Include="Sample\custom_routing_black" />
     <Protobuf Include="Protos\Statistics.proto" />
   </ItemGroup>
-  <ItemGroup>
-    <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>
-    <Content Include="Resources\NotifyIcon1.ico" />
-    <Content Include="Resources\NotifyIcon2.ico" />
-    <Content Include="Resources\NotifyIcon3.ico" />
-    <EmbeddedResource Include="Sample\SampleInbound.txt" />
-    <Content Include="Resources\help.png" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf">
       <Version>3.21.5</Version>

From 6a0ec7d294c1e913f7ebe3f0af5f42a82d7bd6b4 Mon Sep 17 00:00:00 2001
From: Computer Idiot <computeridiot999@gmail.com>
Date: Mon, 15 Aug 2022 22:18:07 +0800
Subject: [PATCH 4/6] Remove redundant dependencies introduced by .NET Upgrade
 Assistant

---
 v2rayN/v2rayN/v2rayN.csproj             | 2 --
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index c66885bf..adc62a6e 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -37,7 +37,6 @@
     <PackageReference Include="log4net">
       <Version>2.0.15</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>
@@ -47,7 +46,6 @@
     <PackageReference Include="NHotkey.WindowsForms">
       <Version>2.1.0</Version>
     </PackageReference>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="ZXing.Net">
       <Version>0.16.8</Version>
     </PackageReference>
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
index 96ae2686..43f6a0d9 100644
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@@ -6,15 +6,8 @@
     <Copyright>Copyright © 2019-2020 (GPLv3)</Copyright>
     <FileVersion>1.1.0.0</FileVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Web" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-  </ItemGroup>
 </Project>
\ No newline at end of file

From 7f28b1d2c9eaa03f78d2fc2c6be561686b2a4afc Mon Sep 17 00:00:00 2001
From: Computer Idiot <computeridiot999@gmail.com>
Date: Mon, 15 Aug 2022 22:22:04 +0800
Subject: [PATCH 5/6] Remove unneeded files

---
 v2rayN/v2rayN/app.config                     |  7 -------
 v2rayN/v2rayN/v2rayN.csproj.user             | 22 --------------------
 v2rayN/v2rayUpgrade/App.config               |  6 ------
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj.user |  6 ------
 4 files changed, 41 deletions(-)
 delete mode 100644 v2rayN/v2rayN/app.config
 delete mode 100644 v2rayN/v2rayN/v2rayN.csproj.user
 delete mode 100644 v2rayN/v2rayUpgrade/App.config
 delete mode 100644 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj.user

diff --git a/v2rayN/v2rayN/app.config b/v2rayN/v2rayN/app.config
deleted file mode 100644
index df5f1904..00000000
--- a/v2rayN/v2rayN/app.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
-  </startup>
-  
-</configuration>
diff --git a/v2rayN/v2rayN/v2rayN.csproj.user b/v2rayN/v2rayN/v2rayN.csproj.user
deleted file mode 100644
index 778969a8..00000000
--- a/v2rayN/v2rayN/v2rayN.csproj.user
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishUrlHistory>发布\</PublishUrlHistory>
-    <InstallUrlHistory />
-    <SupportUrlHistory />
-    <UpdateUrlHistory />
-    <BootstrapperUrlHistory />
-    <ErrorReportUrlHistory />
-    <FallbackCulture>zh-CN</FallbackCulture>
-    <VerifyUploadedFiles>false</VerifyUploadedFiles>
-    <ProjectView>ProjectFiles</ProjectView>
-  </PropertyGroup>
-  <PropertyGroup>
-    <EnableSecurityDebugging>false</EnableSecurityDebugging>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/v2rayN/v2rayUpgrade/App.config b/v2rayN/v2rayUpgrade/App.config
deleted file mode 100644
index 4bfa0056..00000000
--- a/v2rayN/v2rayUpgrade/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
-    </startup>
-</configuration>
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj.user b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj.user
deleted file mode 100644
index 4890b148..00000000
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>C:\Githubb\v2rayN\v2rayN\v2rayUpgrade\bin\Debug\v2ray-windows.zip</StartArguments>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

From ec2fbca979b3710b853edc5c1ecd801072049842 Mon Sep 17 00:00:00 2001
From: Computer Idiot <computeridiot999@gmail.com>
Date: Tue, 16 Aug 2022 12:45:24 +0800
Subject: [PATCH 6/6] Enable v2rayUpgrade dpiAware

---
 v2rayN/v2rayUpgrade/MainForm.Designer.cs | 6 ++++--
 v2rayN/v2rayUpgrade/app.manifest         | 9 +++++++++
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj  | 1 +
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 v2rayN/v2rayUpgrade/app.manifest

diff --git a/v2rayN/v2rayUpgrade/MainForm.Designer.cs b/v2rayN/v2rayUpgrade/MainForm.Designer.cs
index b9f9ad18..bdfa4379 100644
--- a/v2rayN/v2rayUpgrade/MainForm.Designer.cs
+++ b/v2rayN/v2rayUpgrade/MainForm.Designer.cs
@@ -37,6 +37,7 @@
             // btnClose
             // 
             this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Font = new System.Drawing.Font("微软雅黑", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnClose.ImeMode = System.Windows.Forms.ImeMode.NoControl;
             this.btnClose.Location = new System.Drawing.Point(367, 118);
             this.btnClose.Name = "btnClose";
@@ -48,6 +49,7 @@
             // 
             // btnOK
             // 
+            this.btnOK.Font = new System.Drawing.Font("微软雅黑", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnOK.ImeMode = System.Windows.Forms.ImeMode.NoControl;
             this.btnOK.Location = new System.Drawing.Point(81, 118);
             this.btnOK.Name = "btnOK";
@@ -60,7 +62,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.Location = new System.Drawing.Point(79, 64);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(205, 15);
@@ -70,7 +72,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.Location = new System.Drawing.Point(79, 37);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(471, 15);
diff --git a/v2rayN/v2rayUpgrade/app.manifest b/v2rayN/v2rayUpgrade/app.manifest
new file mode 100644
index 00000000..c7239fd8
--- /dev/null
+++ b/v2rayN/v2rayUpgrade/app.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
\ No newline at end of file
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
index 43f6a0d9..d3a7d721 100644
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@@ -5,6 +5,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <Copyright>Copyright © 2019-2020 (GPLv3)</Copyright>
     <FileVersion>1.1.0.0</FileVersion>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.IO.Compression" />