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/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 @@ - - - - - - - diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index 0cf80f9c..adc62a6e 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -1,495 +1,27 @@ - - - + + net48 preview - Debug - AnyCPU - {0A9785E6-D256-4B73-9757-4EF59955FD1E} WinExe - Properties - v2rayN - v2rayN - v4.8 - 512 - - false - - - 发布\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 2 - 1.0.0.%2a - false - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - none - true - bin\Release\ - TRACE - prompt - 4 - false + true + Copyright © 2019-2022 (GPLv3) + 5.33 v2rayN.ico - - BD431FE78E8A6683106E7110882AE5C41CBF5C60 - - - v2rayN_TemporaryKey.pfx - - - false - - - false - - - - LocalIntranet - - - - - v2rayN.Program - - - true - - - - - - - - - - - - - - Component - - - Form - - - BaseServerForm.cs - - - UserControl - - - MainMsgControl.cs - - - Form - - - MsgFilterSetForm.cs - - - Form - - - RoutingRuleSettingDetailsForm.cs - - - Form - - - GlobalHotkeySettingForm.cs - - - Form - - - RoutingRuleSettingForm.cs - - - UserControl - - - ServerTransportControl.cs - - - UserControl - - - GroupSettingControl.cs - - - Form - - - GroupSettingForm.cs - - - - - - - Form - - - MainForm.cs - - - Form - - - RoutingSettingForm.cs - - - Form - - - SubSettingForm.cs - - - Form - - - AddServer2Form.cs - - - UserControl - - - QRCodeControl.cs - - - UserControl - - - SubSettingControl.cs - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - True - True - ResUI.zh-Hans.resx - - - True - True - ResUI.resx - - - Code - - - Form - - - AddServerForm.cs - - - Form - - - BaseForm.cs - - - - - - - - - - - Form - - - OptionSettingForm.cs - - - - - - - - - - - - AddServer2Form.cs - Designer - - - AddServerForm.cs - Designer - - - BaseServerForm.cs - Designer - - - GlobalHotkeySettingForm.cs - - - MainForm.cs - Designer - - - MainForm.cs - Designer - - - MainMsgControl.cs - - - MainMsgControl.cs - - - MsgFilterSetForm.cs - - - MsgFilterSetForm.cs - - - OptionSettingForm.cs - Designer - - - QRCodeControl.cs - Designer - - - RoutingRuleSettingDetailsForm.cs - Designer - - - RoutingRuleSettingDetailsForm.cs - Designer - - - GlobalHotkeySettingForm.cs - Designer - - - RoutingRuleSettingForm.cs - Designer - - - RoutingRuleSettingForm.cs - - - ServerTransportControl.cs - - - ServerTransportControl.cs - - - GroupSettingControl.cs - Designer - - - GroupSettingControl.cs - Designer - - - SubSettingControl.cs - Designer - - - SubSettingControl.cs - - - RoutingSettingForm.cs - Designer - - - RoutingSettingForm.cs - - - GroupSettingForm.cs - Designer - - - GroupSettingForm.cs - - - SubSettingForm.cs - Designer - - - AddServerForm.cs - Designer - - - BaseForm.cs - - - OptionSettingForm.cs - Designer - - - QRCodeControl.cs - Designer - - - AddServer2Form.cs - Designer - - - SubSettingForm.cs - - - ResXFileCodeGenerator - Designer - Resources.Designer.cs - - - Designer - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - ResXFileCodeGenerator - ResUI.zh-Hans.Designer.cs - Designer - - - ResXFileCodeGenerator - ResUI.Designer.cs - Designer - - - - - - - - - - - - - False - Microsoft .NET Framework 4 %28x86 和 x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 4.5 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3.21.5 @@ -518,19 +50,10 @@ 0.16.8 - copy /y $(SolutionDir)v2rayUpgrade\$(OutDir)* $(TargetDir) del $(TargetDir)*.xml $(TargetDir)*.so $(TargetDir)*.dylib if not "$(ConfigurationName)" == "Debug" del $(TargetDir)*.pdb - - \ No newline at end of file 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 @@ - - - - 发布\ - - - - - - zh-CN - false - ProjectFiles - - - false - - - 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 @@ - - - - - - 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/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/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 @@ + + + + + true + PerMonitorV2 + + + \ No newline at end of file diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj index a619ae5e..d3a7d721 100644 --- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj +++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj @@ -1,89 +1,14 @@ - - - + - Debug - AnyCPU - {F82BE52A-155C-492C-9E0A-1E917EC62C78} + net48 WinExe - v2rayUpgrade - v2rayUpgrade - v4.8 - 512 - true - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - none - true - bin\Release\ - TRACE - prompt - 4 + true + Copyright © 2019-2020 (GPLv3) + 1.1.0.0 + app.manifest - - - - - - - - - - - - - - - - Form - - - MainForm.cs - - - - - MainForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - \ No newline at end of file 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 @@ - - - - C:\Githubb\v2rayN\v2rayN\v2rayUpgrade\bin\Debug\v2ray-windows.zip - - \ No newline at end of file