Skip to content

Commit b22e984

Browse files
aaasoftaaasoft
committed
Release version 2.1.6
1 parent 7b2f00c commit b22e984

File tree

10 files changed

+38
-33
lines changed

10 files changed

+38
-33
lines changed

‎QpTestClient/QpTestClient.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Product>[QuickProtocol]测试客户端</Product>
99
<AssemblyTitle>[QuickProtocol]测试客户端</AssemblyTitle>
1010
<Authors>aaasoft</Authors>
11-
<Version>2.1.5</Version>
11+
<Version>2.1.6</Version>
1212
<ApplicationIcon>logo.ico</ApplicationIcon>
1313
<Description>用于测试连接到[QuickProtocol]服务端的客户端。
1414
项目地址：https://github.com/QuickProtocol

‎Quick.Protocol.AllClients/Quick.Protocol.AllClients.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
66
<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>
77
<Copyright />
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
99
<Authors>scbeta</Authors>
10-
<Version>2.1.5</Version>
10+
<Version>2.1.6</Version>
1111
<Company />
1212
<Description>Incluse all QpClient implements.
1313
Common use:

‎Quick.Protocol.Pipeline/Quick.Protocol.Pipeline.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
77
<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>
8-
<Version>2.1.5</Version>
8+
<Version>2.1.6</Version>
99
<Authors>scbeta</Authors>
1010
<Company />
1111
<Product>Quick.Protocol</Product>

‎Quick.Protocol.SerialPort/Quick.Protocol.SerialPort.csproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
77
<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>
8-
<Version>2.1.5</Version>
8+
<Version>2.1.6</Version>
99
<Authors>scbeta</Authors>
1010
<Company />
1111
<Product>Quick.Protocol</Product>
@@ -22,13 +22,11 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<ProjectReference Include="..\Quick.Protocol\Quick.Protocol.csproj" />
25+
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
2626
</ItemGroup>
2727

28-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
29-
<PackageReference Include="System.IO.Ports">
30-
<Version>6.0.0</Version>
31-
</PackageReference>
28+
<ItemGroup>
29+
<ProjectReference Include="..\Quick.Protocol\Quick.Protocol.csproj" />
3230
</ItemGroup>
3331

3432
</Project>

‎Quick.Protocol.Tcp/Quick.Protocol.Tcp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
77
<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>
8-
<Version>2.1.5</Version>
8+
<Version>2.1.6</Version>
99
<Authors>scbeta</Authors>
1010
<Company />
1111
<Product>Quick.Protocol</Product>

‎Quick.Protocol.WebSocket.Client/Quick.Protocol.WebSocket.Client.csproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
77
<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>
8-
<Version>2.1.5</Version>
8+
<Version>2.1.6</Version>
99
<Authors>scbeta</Authors>
1010
<Company />
1111
<Product>Quick.Protocol</Product>
@@ -22,12 +22,10 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<ProjectReference Include="..\Quick.Protocol\Quick.Protocol.csproj" />
25+
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
2626
</ItemGroup>
2727

28-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
29-
<PackageReference Include="System.Net.WebSockets.Client">
30-
<Version>4.3.2</Version>
31-
</PackageReference>
28+
<ItemGroup>
29+
<ProjectReference Include="..\Quick.Protocol\Quick.Protocol.csproj" />
3230
</ItemGroup>
3331
</Project>

‎Quick.Protocol.WebSocket.Server.AspNetCore/Quick.Protocol.WebSocket.Server.AspNetCore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
77
<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>
8-
<Version>2.1.5</Version>
8+
<Version>2.1.6</Version>
99
<Authors>scbeta</Authors>
1010
<Company />
1111
<Product>Quick.Protocol</Product>

‎Quick.Protocol/Quick.Protocol.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
66
<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>
77
<Copyright />
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
99
<Authors>scbeta</Authors>
10-
<Version>2.1.5</Version>
10+
<Version>2.1.6</Version>
1111
<Company />
1212
<Description>A simple protocol for TCP,Pipeline,SerialPort,WebSocket.</Description>
1313
<PackageIcon>logo.png</PackageIcon>

‎Test/Pipeline/PipelineClient/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static void Main(string[] args)
5555
Console.WriteLine("SendCommand Error:" + ex.ToString());
5656
}
5757

58-
//client.SendNoticePackage(new Quick.Protocol.Notices.Ping() { Content = "Hello Quick.Protocol V2!" });
58+
client.SendNoticePackage(new Quick.Protocol.Notices.PrivateNotice() { Content = "Hello Quick.Protocol V2!" });
5959
//client.SendNoticePackage(new Quick.Protocol.Notices.Ping() { Content = "".PadRight(5 * 1024, '0') });
6060
});
6161
Console.ReadLine();

‎Test/Pipeline/PipelineServer/Program.cs‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Quick.Protocol;
1+
using Newtonsoft.Json;
2+
using Quick.Protocol;
23
using System;
34

45
namespace PipelineServer
@@ -15,20 +16,28 @@ static void Main(string[] args)
1516
//Quick.Protocol.Utils.LogUtils.LogContent = true;
1617

1718
var commandExecuterManager = new CommandExecuterManager();
18-
commandExecuterManager.Register<Quick.Protocol.Commands.PrivateCommand.Request, Quick.Protocol.Commands.PrivateCommand.Response>((handler, req) =>
19-
{
20-
return new Quick.Protocol.Commands.PrivateCommand.Response()
19+
commandExecuterManager.Register<Quick.Protocol.Commands.PrivateCommand.Request, Quick.Protocol.Commands.PrivateCommand.Response>(
20+
(handler, req) =>
21+
{
22+
return new Quick.Protocol.Commands.PrivateCommand.Response()
23+
{
24+
Content = req.Content
25+
};
26+
});
27+
var noticeHandlerManager = new NoticeHandlerManager();
28+
noticeHandlerManager.Register<Quick.Protocol.Notices.PrivateNotice>(
29+
(handler, notice) =>
2130
{
22-
Content = req.Content
23-
};
24-
});
31+
Console.WriteLine($"收到PrivateNotice: {JsonConvert.SerializeObject(notice)}");
32+
});
2533
var serverOptions = new Quick.Protocol.Pipeline.QpPipelineServerOptions()
2634
{
2735
PipeName = "Quick.Protocol",
2836
Password = "HelloQP",
2937
ServerProgram = nameof(PipelineServer) + " 1.0"
3038
};
3139
serverOptions.RegisterCommandExecuterManager(commandExecuterManager);
40+
serverOptions.RegisterNoticeHandlerManager(noticeHandlerManager);
3241

3342
var server = new Quick.Protocol.Pipeline.QpPipelineServer(serverOptions);
3443

0 commit comments

Comments
 (0)