Add logo image.

aaasoft · aaasoft · commit 47db2ded156e · 2022-03-23T11:02:26.000+08:00
diff --git a/QpTestClient/QpTestClient.csproj b/QpTestClient/QpTestClient.csproj
@@ -28,7 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.6.6" />
+		<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.6.10" />
 		<PackageReference Include="Quick.Xml" Version="1.0.0" />
 	</ItemGroup>
 
diff --git a/Quick.Protocol.AllClients/Quick.Protocol.AllClients.csproj b/Quick.Protocol.AllClients/Quick.Protocol.AllClients.csproj
@@ -20,8 +20,17 @@ TCP: ConnectionUriParser.Parse("tcp://127.0.0.1:3001");
 Pipe: ConnectionUriParser.Parse("pipe://./Quick.Protocol");
 WebSocket: ConnectionUriParser.Parse("ws://127.0.0.1:3001/qp");
 SerialPort: ConnectionUriParser.Parse("serialport://COM1");</Description>
+	  <PackageIcon>logo.png</PackageIcon>
+	  <PackageTags>QuickProtocol</PackageTags>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\logo.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Quick.Protocol.Pipeline\Quick.Protocol.Pipeline.csproj" />
     <ProjectReference Include="..\Quick.Protocol.SerialPort\Quick.Protocol.SerialPort.csproj" />
diff --git a/Quick.Protocol.Pipeline/Quick.Protocol.Pipeline.csproj b/Quick.Protocol.Pipeline/Quick.Protocol.Pipeline.csproj
@@ -10,8 +10,17 @@
 		<Company />
 		<Product>Quick.Protocol</Product>
 		<Description>Pipeline support for Quick.Protocol</Description>
+		<PackageIcon>logo.png</PackageIcon>
+		<PackageTags>QuickProtocol</PackageTags>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Include="..\logo.png">
+	    <Pack>True</Pack>
+	    <PackagePath>\</PackagePath>
+	  </None>
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\Quick.Protocol\Quick.Protocol.csproj" />
 	</ItemGroup>
diff --git a/Quick.Protocol.SerialPort/Quick.Protocol.SerialPort.csproj b/Quick.Protocol.SerialPort/Quick.Protocol.SerialPort.csproj
@@ -10,8 +10,17 @@
 		<Company />
 		<Product>Quick.Protocol</Product>
 		<Description>SerialPort support for Quick.Protocol</Description>
+		<PackageIcon>logo.png</PackageIcon>
+		<PackageTags>QuickProtocol</PackageTags>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Include="..\logo.png">
+	    <Pack>True</Pack>
+	    <PackagePath>\</PackagePath>
+	  </None>
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\Quick.Protocol\Quick.Protocol.csproj" />
 	</ItemGroup>
diff --git a/Quick.Protocol.Tcp/Quick.Protocol.Tcp.csproj b/Quick.Protocol.Tcp/Quick.Protocol.Tcp.csproj
@@ -10,8 +10,17 @@
 		<Company />
 		<Product>Quick.Protocol</Product>
 		<Description>TCP support for Quick.Protocol</Description>
+		<PackageIcon>logo.png</PackageIcon>
+		<PackageTags>QuickProtocol</PackageTags>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Include="..\logo.png">
+	    <Pack>True</Pack>
+	    <PackagePath>\</PackagePath>
+	  </None>
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\Quick.Protocol\Quick.Protocol.csproj" />
 	</ItemGroup>
diff --git a/Quick.Protocol.WebSocket.Client/Quick.Protocol.WebSocket.Client.csproj b/Quick.Protocol.WebSocket.Client/Quick.Protocol.WebSocket.Client.csproj
@@ -10,8 +10,17 @@
 		<Company />
 		<Product>Quick.Protocol</Product>
 		<Description>WebSocket client support for Quick.Protocol</Description>
+		<PackageIcon>logo.png</PackageIcon>
+		<PackageTags>QuickProtocol</PackageTags>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Include="..\logo.png">
+	    <Pack>True</Pack>
+	    <PackagePath>\</PackagePath>
+	  </None>
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\Quick.Protocol\Quick.Protocol.csproj" />
 	</ItemGroup>
diff --git a/Quick.Protocol.WebSocket.Server.AspNetCore/Quick.Protocol.WebSocket.Server.AspNetCore.csproj b/Quick.Protocol.WebSocket.Server.AspNetCore/Quick.Protocol.WebSocket.Server.AspNetCore.csproj
@@ -10,8 +10,17 @@
 		<Company />
 		<Product>Quick.Protocol</Product>
 		<Description>WebSocket server support for Quick.Protocol(Use ASP.NET Core)</Description>
+		<PackageIcon>logo.png</PackageIcon>
+		<PackageTags>QuickProtocol</PackageTags>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Include="..\logo.png">
+	    <Pack>True</Pack>
+	    <PackagePath>\</PackagePath>
+	  </None>
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
 	</ItemGroup>
diff --git a/Quick.Protocol/QpServer.cs b/Quick.Protocol/QpServer.cs
@@ -12,7 +12,7 @@ public abstract class QpServer
     {
         private CancellationTokenSource cts;
         private QpServerOptions options;
-        
+
         private List<QpServerChannel> channelList = new List<QpServerChannel>();
 
         /// <summary>
@@ -34,7 +34,7 @@ public abstract class QpServer
         /// 通道连接断开时
         /// </summary>
         public event EventHandler<QpServerChannel> ChannelDisconnected;
-        
+
         /// <summary>
         /// 通道认证超时
         /// </summary>
@@ -114,7 +114,7 @@ private void beginAccept(CancellationToken token)
 
         public virtual void Stop()
         {
-            cts.Cancel();
+            cts?.Cancel();
             cts = null;
         }
     }
diff --git a/Quick.Protocol/QpServerChannel.cs b/Quick.Protocol/QpServerChannel.cs
@@ -145,8 +145,7 @@ public void Stop()
         {
             try
             {
-                if (cts != null && !cts.IsCancellationRequested)
-                    cts.Cancel();
+                cts?.Cancel();
                 stream?.Close();
                 stream?.Dispose();
             }
diff --git a/Quick.Protocol/Quick.Protocol.csproj b/Quick.Protocol/Quick.Protocol.csproj
@@ -10,11 +10,20 @@
 	<Version>2.1.4</Version>
     <Company />
     <Description>A simple protocol for TCP,Pipeline,SerialPort,WebSocket.</Description>
+    <PackageIcon>logo.png</PackageIcon>
+    <PackageTags>QuickProtocol</PackageTags>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\logo.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NJsonSchema" Version="10.6.6" />
+    <PackageReference Include="NJsonSchema" Version="10.6.10" />
   </ItemGroup>
 
 </Project>
diff --git a/logo.png b/logo.png

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public abstract class QpServer`
`12`	`12`	`{`
`13`	`13`	`private CancellationTokenSource cts;`
`14`	`14`	`private QpServerOptions options;`
`15`		`-`
	`15`	`+`
`16`	`16`	`private List<QpServerChannel> channelList = new List<QpServerChannel>();`
`17`	`17`
`18`	`18`	`/// <summary>`
`@@ -34,7 +34,7 @@ public abstract class QpServer`
`34`	`34`	`/// 通道连接断开时`
`35`	`35`	`/// </summary>`
`36`	`36`	`public event EventHandler<QpServerChannel> ChannelDisconnected;`
`37`		`-`
	`37`	`+`
`38`	`38`	`/// <summary>`
`39`	`39`	`/// 通道认证超时`
`40`	`40`	`/// </summary>`
`@@ -114,7 +114,7 @@ private void beginAccept(CancellationToken token)`
`114`	`114`
`115`	`115`	`public virtual void Stop()`
`116`	`116`	`{`
`117`		`- cts.Cancel();`
	`117`	`+ cts?.Cancel();`
`118`	`118`	`cts = null;`
`119`	`119`	`}`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,7 @@ public void Stop()`
`145`	`145`	`{`
`146`	`146`	`try`
`147`	`147`	`{`
`148`		`- if (cts != null && !cts.IsCancellationRequested)`
`149`		`- cts.Cancel();`
	`148`	`+ cts?.Cancel();`
`150`	`149`	`stream?.Close();`
`151`	`150`	`stream?.Dispose();`
`152`	`151`	`}`