Add AOT support

aaasoft · aaasoft · commit 0644214b4302 · 2023-12-04T11:45:53.000+08:00
diff --git a/Quick.Protocol.Pipeline/QpPipelineClientOptions.cs b/Quick.Protocol.Pipeline/QpPipelineClientOptions.cs
@@ -10,7 +10,7 @@ internal partial class QpPipelineClientOptionsOptionsSerializerContext : JsonSer
 
     public class QpPipelineClientOptions : QpClientOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpPipelineClientOptionsOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpPipelineClientOptionsOptionsSerializerContext.Default;
 
         public const string URI_SCHEMA = "qp.pipe";
 
diff --git a/Quick.Protocol.Pipeline/QpPipelineServerOptions.cs b/Quick.Protocol.Pipeline/QpPipelineServerOptions.cs
@@ -8,7 +8,7 @@ internal partial class QpPipelineServerOptionsOptionsSerializerContext : JsonSer
 
     public class QpPipelineServerOptions : QpServerOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpPipelineServerOptionsOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpPipelineServerOptionsOptionsSerializerContext.Default;
 
         public string PipeName { get; set; }
 
diff --git a/Quick.Protocol.SerialPort/QpSerialPortClientOptions.cs b/Quick.Protocol.SerialPort/QpSerialPortClientOptions.cs
@@ -11,7 +11,7 @@ internal partial class QpSerialPortClientOptionsOptionsSerializerContext : JsonS
 
     public class QpSerialPortClientOptions : QpClientOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpSerialPortClientOptionsOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpSerialPortClientOptionsOptionsSerializerContext.Default;
 
         public const string URI_SCHEMA = "qp.serial";
         /// <summary>
diff --git a/Quick.Protocol.SerialPort/QpSerialPortServerOptions.cs b/Quick.Protocol.SerialPort/QpSerialPortServerOptions.cs
@@ -9,7 +9,7 @@ internal partial class QpSerialPortServerOptionsOptionsSerializerContext : JsonS
 
     public class QpSerialPortServerOptions : QpServerOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpSerialPortServerOptionsOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpSerialPortServerOptionsOptionsSerializerContext.Default;
 
         /// <summary>
         /// 端口名称
diff --git a/Quick.Protocol.Tcp/QpTcpClientOptions.cs b/Quick.Protocol.Tcp/QpTcpClientOptions.cs
@@ -11,7 +11,7 @@ internal partial class QpTcpClientOptionsOptionsSerializerContext : JsonSerializ
 
     public class QpTcpClientOptions : QpClientOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpTcpClientOptionsOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpTcpClientOptionsOptionsSerializerContext.Default;
 
         public const string URI_SCHEMA = "qp.tcp";
         /// <summary>
diff --git a/Quick.Protocol.Tcp/QpTcpServerOptions.cs b/Quick.Protocol.Tcp/QpTcpServerOptions.cs
@@ -9,7 +9,7 @@ internal partial class QpTcpServerOptionsOptionsSerializerContext : JsonSerializ
 
     public class QpTcpServerOptions : QpServerOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpTcpServerOptionsOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpTcpServerOptionsOptionsSerializerContext.Default;
         /// <summary>
         /// IP地址
         /// </summary>
diff --git a/Quick.Protocol.WebSocket.Client/QpWebSocketClientOptions.cs b/Quick.Protocol.WebSocket.Client/QpWebSocketClientOptions.cs
@@ -11,7 +11,7 @@ internal partial class QpWebSocketClientOptionsSerializerContext : JsonSerialize
 
     public class QpWebSocketClientOptions : QpClientOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpWebSocketClientOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpWebSocketClientOptionsSerializerContext.Default;
 
         public const string URI_SCHEMA_WS = "qp.ws";
         public const string URI_SCHEMA_WSS = "qp.wss";
diff --git a/Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServerOptions.cs b/Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServerOptions.cs
@@ -7,7 +7,7 @@ internal partial class QpWebSocketServerOptionsSerializerContext : JsonSerialize
 
     public class QpWebSocketServerOptions : QpServerOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpWebSocketServerOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpWebSocketServerOptionsSerializerContext.Default;
 
         private string _Path;
         /// <summary>
diff --git a/Quick.Protocol/QpChannel.cs b/Quick.Protocol/QpChannel.cs
@@ -239,7 +239,7 @@ public QpChannel(QpChannelOptions options)
                     foreach (var item in instructionSet.NoticeInfos)
                     {
                         noticeTypeDict[item.NoticeTypeName] = item.GetNoticeType();
-                        typeSerializerContextDict[item.GetNoticeType()] = item.JsonSerializerContext;
+                        typeSerializerContextDict[item.GetNoticeType()] = item.GetJsonSerializerContext();
                     }
                 }
                 //添加命令数据包信息
@@ -252,8 +252,8 @@ public QpChannel(QpChannelOptions options)
                         commandRequestTypeDict[item.RequestTypeName] = requestType;
                         commandResponseTypeDict[item.ResponseTypeName] = responseType;
                         commandRequestTypeResponseTypeDict[requestType] = responseType;
-                        typeSerializerContextDict[item.GetRequestType()] = item.JsonSerializerContext;
-                        typeSerializerContextDict[item.GetResponseType()] = item.JsonSerializerContext;
+                        typeSerializerContextDict[item.GetRequestType()] = item.GetJsonSerializerContext();
+                        typeSerializerContextDict[item.GetResponseType()] = item.GetJsonSerializerContext();
                     }
                 }
             }
diff --git a/Quick.Protocol/QpChannelOptions.cs b/Quick.Protocol/QpChannelOptions.cs
@@ -11,7 +11,7 @@ public abstract class QpChannelOptions
         /// <summary>
         /// 类型信息
         /// </summary>
-        protected abstract JsonSerializerContext JsonSerializerContext { get; }
+        protected abstract JsonSerializerContext GetJsonSerializerContext();
         /// <summary>
         /// 内部是否压缩
         /// </summary>
diff --git a/Quick.Protocol/QpClientOptions.cs b/Quick.Protocol/QpClientOptions.cs
@@ -125,7 +125,7 @@ public Uri ToUri(bool includePassword = false, bool includeOtherProperty = false
             {
                 StringBuilder sb = new StringBuilder(baseUrl);
                 int currentIndex = 0;
-                var jObj = JsonNode.Parse(JsonSerializer.Serialize(this,this.GetType(), JsonSerializerContext)).AsObject();
+                var jObj = JsonNode.Parse(JsonSerializer.Serialize(this,this.GetType(), GetJsonSerializerContext())).AsObject();
                 foreach (var property in jObj)
                 {
                     var key = property.Key;
diff --git a/Quick.Protocol/QpCommandInfo.cs b/Quick.Protocol/QpCommandInfo.cs
@@ -48,9 +48,8 @@ public class QpCommandInfo
         [DisplayName("响应示例")]
         [ReadOnly(true)]
         public string ResponseTypeSchemaSample { get; set; }
-        [JsonIgnore]
-        [Browsable(false)]
-        public JsonSerializerContext JsonSerializerContext { get; set; }
+        private JsonSerializerContext jsonSerializerContext;
+        public JsonSerializerContext GetJsonSerializerContext() => jsonSerializerContext;
 
         private Type requestType;
 
@@ -64,7 +63,7 @@ public QpCommandInfo(string name, string description,
         {
             Name = name;
             Description = description;
-            JsonSerializerContext = jsonSerializerContext;
+            this.jsonSerializerContext = jsonSerializerContext;
 
             this.requestType = requestType;
             RequestTypeName = requestType.FullName;
diff --git a/Quick.Protocol/QpNoticeInfo.cs b/Quick.Protocol/QpNoticeInfo.cs
@@ -34,18 +34,18 @@ public class QpNoticeInfo
         [DisplayName("类型")]
         [ReadOnly(true)]
         public string NoticeTypeName { get; set; }
-        [JsonIgnore]
-        [Browsable(false)]
-        public JsonSerializerContext JsonSerializerContext { get; set; }
 
+        private JsonSerializerContext jsonSerializerContext;
+        public JsonSerializerContext GetJsonSerializerContext() => jsonSerializerContext;
+        
         public QpNoticeInfo() { }
         public QpNoticeInfo(string name, string description, Type noticeType, object defaultNoticeTypeInstance, JsonSerializerContext jsonSerializerContext)
         {
             Name = name;
             Description = description;
             this.noticeType = noticeType;
             NoticeTypeName = noticeType.FullName;
-            JsonSerializerContext = jsonSerializerContext;
+            this.jsonSerializerContext = jsonSerializerContext;
             NoticeTypeSchemaSample = JsonNode.Parse(JsonSerializer.Serialize(defaultNoticeTypeInstance, noticeType, jsonSerializerContext)).ToString();
         }
 
diff --git a/Quick.Protocol/QpServerOptions.cs b/Quick.Protocol/QpServerOptions.cs
@@ -39,7 +39,7 @@ public virtual QpServerOptions Clone()
         {
             var type = this.GetType();
             var ret = (QpServerOptions)JsonSerializer.Deserialize(
-                JsonSerializer.Serialize(this, type, JsonSerializerContext), type, JsonSerializerContext);
+                JsonSerializer.Serialize(this, type, GetJsonSerializerContext()), type, GetJsonSerializerContext());
             ret.InstructionSet = InstructionSet;
             ret.CommandExecuterManagerList = CommandExecuterManagerList;
             ret.NoticeHandlerManagerList = NoticeHandlerManagerList;
diff --git a/Quick.Protocol/Streams/QpStreamClientOptions.cs b/Quick.Protocol/Streams/QpStreamClientOptions.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Text.Json.Serialization;
 
@@ -9,8 +10,9 @@ internal partial class QpStreamClientOptionsSerializerContext : JsonSerializerCo
 
     public class QpStreamClientOptions : QpClientOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpStreamClientOptionsSerializerContext.Default;
-
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpStreamClientOptionsSerializerContext.Default;
+        [Browsable(false)]
+        [JsonIgnore]
         public Stream BaseStream { get; set; }
 
         public override QpClient CreateClient()
diff --git a/Quick.Protocol/Streams/QpStreamServerOptions.cs b/Quick.Protocol/Streams/QpStreamServerOptions.cs
@@ -1,4 +1,5 @@
-﻿using System.IO;
+﻿using System.ComponentModel;
+using System.IO;
 using System.Text.Json.Serialization;
 using System.Threading;
 
@@ -9,7 +10,7 @@ internal partial class QpStreamServerOptionsSerializerContext : JsonSerializerCo
 
     public class QpStreamServerOptions : QpServerOptions
     {
-        protected override JsonSerializerContext JsonSerializerContext => QpStreamServerOptionsSerializerContext.Default;
+        protected override JsonSerializerContext GetJsonSerializerContext() => QpStreamServerOptionsSerializerContext.Default;
         public Stream BaseStream { get; set; }
         public string ChannelName { get; set; }
         public CancellationToken CancellationToken { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ internal partial class QpPipelineClientOptionsOptionsSerializerContext : JsonSer`
`10`	`10`
`11`	`11`	`public class QpPipelineClientOptions : QpClientOptions`
`12`	`12`	`{`
`13`		`- protected override JsonSerializerContext JsonSerializerContext => QpPipelineClientOptionsOptionsSerializerContext.Default;`
	`13`	`+ protected override JsonSerializerContext GetJsonSerializerContext() => QpPipelineClientOptionsOptionsSerializerContext.Default;`
`14`	`14`
`15`	`15`	`public const string URI_SCHEMA = "qp.pipe";`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ internal partial class QpPipelineServerOptionsOptionsSerializerContext : JsonSer`
`8`	`8`
`9`	`9`	`public class QpPipelineServerOptions : QpServerOptions`
`10`	`10`	`{`
`11`		`- protected override JsonSerializerContext JsonSerializerContext => QpPipelineServerOptionsOptionsSerializerContext.Default;`
	`11`	`+ protected override JsonSerializerContext GetJsonSerializerContext() => QpPipelineServerOptionsOptionsSerializerContext.Default;`
`12`	`12`
`13`	`13`	`public string PipeName { get; set; }`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ internal partial class QpSerialPortClientOptionsOptionsSerializerContext : JsonS`
`11`	`11`
`12`	`12`	`public class QpSerialPortClientOptions : QpClientOptions`
`13`	`13`	`{`
`14`		`- protected override JsonSerializerContext JsonSerializerContext => QpSerialPortClientOptionsOptionsSerializerContext.Default;`
	`14`	`+ protected override JsonSerializerContext GetJsonSerializerContext() => QpSerialPortClientOptionsOptionsSerializerContext.Default;`
`15`	`15`
`16`	`16`	`public const string URI_SCHEMA = "qp.serial";`
`17`	`17`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ internal partial class QpSerialPortServerOptionsOptionsSerializerContext : JsonS`
`9`	`9`
`10`	`10`	`public class QpSerialPortServerOptions : QpServerOptions`
`11`	`11`	`{`
`12`		`- protected override JsonSerializerContext JsonSerializerContext => QpSerialPortServerOptionsOptionsSerializerContext.Default;`
	`12`	`+ protected override JsonSerializerContext GetJsonSerializerContext() => QpSerialPortServerOptionsOptionsSerializerContext.Default;`
`13`	`13`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// 端口名称`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ internal partial class QpWebSocketServerOptionsSerializerContext : JsonSerialize`
`7`	`7`
`8`	`8`	`public class QpWebSocketServerOptions : QpServerOptions`
`9`	`9`	`{`
`10`		`- protected override JsonSerializerContext JsonSerializerContext => QpWebSocketServerOptionsSerializerContext.Default;`
	`10`	`+ protected override JsonSerializerContext GetJsonSerializerContext() => QpWebSocketServerOptionsSerializerContext.Default;`
`11`	`11`
`12`	`12`	`private string _Path;`
`13`	`13`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public QpChannel(QpChannelOptions options)`
`239`	`239`	`foreach (var item in instructionSet.NoticeInfos)`
`240`	`240`	`{`
`241`	`241`	`noticeTypeDict[item.NoticeTypeName] = item.GetNoticeType();`
`242`		`- typeSerializerContextDict[item.GetNoticeType()] = item.JsonSerializerContext;`
	`242`	`+ typeSerializerContextDict[item.GetNoticeType()] = item.GetJsonSerializerContext();`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`	`//添加命令数据包信息`
`@@ -252,8 +252,8 @@ public QpChannel(QpChannelOptions options)`
`252`	`252`	`commandRequestTypeDict[item.RequestTypeName] = requestType;`
`253`	`253`	`commandResponseTypeDict[item.ResponseTypeName] = responseType;`
`254`	`254`	`commandRequestTypeResponseTypeDict[requestType] = responseType;`
`255`		`- typeSerializerContextDict[item.GetRequestType()] = item.JsonSerializerContext;`
`256`		`- typeSerializerContextDict[item.GetResponseType()] = item.JsonSerializerContext;`
	`255`	`+ typeSerializerContextDict[item.GetRequestType()] = item.GetJsonSerializerContext();`
	`256`	`+ typeSerializerContextDict[item.GetResponseType()] = item.GetJsonSerializerContext();`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`	`}`