From 4d8a5dc054ebcce240b20cbd9dc743da49a58c65 Mon Sep 17 00:00:00 2001
From: soul liu <soul2isme@outlook.com>
Date: Fri, 12 May 2023 15:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 General/{Soul2.General.csproj => General.csproj}          | 1 +
 General/utils/CollectionsUtils.cs                         | 8 +-------
 General/utils/StringUtils.cs                              | 8 +-------
 General/utils/TimerUtils.cs                               | 7 +------
 SerialPort/{Soul2.SerialPort.csproj => SerialPort.csproj} | 4 +++-
 SerialPort/utils/GodSerialPortUtils.cs                    | 7 +------
 Soul2-Library.sln                                         | 4 ++--
 7 files changed, 10 insertions(+), 29 deletions(-)
 rename General/{Soul2.General.csproj => General.csproj} (86%)
 rename SerialPort/{Soul2.SerialPort.csproj => SerialPort.csproj} (69%)

diff --git a/General/Soul2.General.csproj b/General/General.csproj
similarity index 86%
rename from General/Soul2.General.csproj
rename to General/General.csproj
index bc62e51..ddf4612 100644
--- a/General/Soul2.General.csproj
+++ b/General/General.csproj
@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Soul2.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
+    <AssemblyName>Soul2.$(MSBuildProjectName)</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/General/utils/CollectionsUtils.cs b/General/utils/CollectionsUtils.cs
index cf5993c..21d6223 100644
--- a/General/utils/CollectionsUtils.cs
+++ b/General/utils/CollectionsUtils.cs
@@ -1,10 +1,4 @@
-using Microsoft.VisualBasic;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections;
 
 namespace Soul2.General.utils {
     public static class CollectionsUtils {
diff --git a/General/utils/StringUtils.cs b/General/utils/StringUtils.cs
index 9d13c8e..0450722 100644
--- a/General/utils/StringUtils.cs
+++ b/General/utils/StringUtils.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Soul2.General.utils {
+namespace Soul2.General.utils {
     /// <summary>
     /// 字符串工具类
     /// By Soul2
diff --git a/General/utils/TimerUtils.cs b/General/utils/TimerUtils.cs
index a202e0b..ad6d835 100644
--- a/General/utils/TimerUtils.cs
+++ b/General/utils/TimerUtils.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Timers;
+using System.Timers;
 using Timer = System.Timers.Timer;
 
 namespace Soul2.General.utils {
diff --git a/SerialPort/Soul2.SerialPort.csproj b/SerialPort/SerialPort.csproj
similarity index 69%
rename from SerialPort/Soul2.SerialPort.csproj
rename to SerialPort/SerialPort.csproj
index 2e95d3f..58d1f34 100644
--- a/SerialPort/Soul2.SerialPort.csproj
+++ b/SerialPort/SerialPort.csproj
@@ -5,14 +5,16 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Soul2.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
+    <AssemblyName>Soul2.$(MSBuildProjectName)</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GodSharp.SerialPort" Version="1.2.0.6" />
+    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\General\Soul2.General.csproj" />
+    <ProjectReference Include="..\General\General.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/SerialPort/utils/GodSerialPortUtils.cs b/SerialPort/utils/GodSerialPortUtils.cs
index 950f1d4..e90e10b 100644
--- a/SerialPort/utils/GodSerialPortUtils.cs
+++ b/SerialPort/utils/GodSerialPortUtils.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using GodSharp.SerialPort.Extensions;
 using GodSharp.SerialPort;
 using System.IO.Ports;
diff --git a/Soul2-Library.sln b/Soul2-Library.sln
index 592c8ff..c84dec2 100644
--- a/Soul2-Library.sln
+++ b/Soul2-Library.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33530.505
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Soul2.General", "General\Soul2.General.csproj", "{8B24AB73-0D6F-426D-92D3-25CBE6ED718E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "General", "General\General.csproj", "{8B24AB73-0D6F-426D-92D3-25CBE6ED718E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Soul2.SerialPort", "SerialPort\Soul2.SerialPort.csproj", "{B2EFA26A-A2CF-4090-85FD-31085D7A1A65}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerialPort", "SerialPort\SerialPort.csproj", "{B2EFA26A-A2CF-4090-85FD-31085D7A1A65}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution