Merge pull request #129 from FrzMtrsprt/patch-1

Simplify project files

.gitignore

@@ -19,5 +19,4 @@
 /clashN/clashUpgrade/obj
 /clashN/clashUpgrade/Properties/PublishProfiles
 /clashN/clashN/Properties/PublishProfiles
-clashN/clashN/clashN.csproj.user
+*.user
-clashN/clashUpgrade/clashUpgrade.csproj.user

clashN/clashN.sln

@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32811.315
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clashN", "clashN\clashN.csproj", "{6DE127CA-1763-4236-B297-D2EF9CB2EC9B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clashN", "clashN\clashN.csproj", "{6DE127CA-1763-4236-B297-D2EF9CB2EC9B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clashUpgrade", "clashUpgrade\clashUpgrade.csproj", "{59E0AF2B-9915-47F2-9F5F-9008F47DAE5F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,10 @@ Global
 		{6DE127CA-1763-4236-B297-D2EF9CB2EC9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6DE127CA-1763-4236-B297-D2EF9CB2EC9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6DE127CA-1763-4236-B297-D2EF9CB2EC9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59E0AF2B-9915-47F2-9F5F-9008F47DAE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59E0AF2B-9915-47F2-9F5F-9008F47DAE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59E0AF2B-9915-47F2-9F5F-9008F47DAE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59E0AF2B-9915-47F2-9F5F-9008F47DAE5F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

clashN/clashN/clashN.csproj.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_LastSelectedProfileId>C:\Users\Administrator\source\repos\clashN\clashN\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
-  </PropertyGroup>
-  <ItemGroup>
-    <ApplicationDefinition Update="App.xaml">
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Views\GlobalHotkeySettingWindow.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Resx\ResUI.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resx\ResUI.zh-Hans.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="Views\ConnectionsView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\DashboardView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\GlobalHotkeySettingWindow.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\MainWindow.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\HelpView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\ProfileQrcodeView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\MsgView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\PorfileEditWindow.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\PromotionView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\ProxiesView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\ProfilesView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\MessageSampleDialog.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\SettingsView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-</Project>

clashN/clashUpgrade/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);

clashN/clashUpgrade/Properties/AssemblyInfo.cs

@@ -1,34 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("clashUpgrade")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("clashUpgrade")]
-[assembly: AssemblyCopyright("Copyright © 2022-2022 (GPLv3)")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("edfaa67d-2768-42cf-abc7-49a9acf33986")]
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
-// 方法是按如下所示使用“*”: :
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.1.0.0")]

clashN/clashUpgrade/clashUpgrade.csproj

@@ -2,17 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows</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>
 	<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>clashUpgrade.Program</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-  </ItemGroup>
 </Project>

clashN/clashUpgrade/clashUpgrade.csproj.user

@@ -1,14 +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>
-  <PropertyGroup>
-    <_LastSelectedProfileId>C:\Githubb\clashN\clashN\clashUpgrade\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Update="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-  </ItemGroup>
-</Project>