让测试工具支持AOT中。。。

Author: aaasoft

QpTestClient/AboutBox.Designer.cs

@@ -15,6 +15,10 @@ partial class AboutBox : Form
         public AboutBox()
         {
             InitializeComponent();
+            var currentAssembly = this.GetType().Assembly;
+            //窗体图标
+            using (var stream = currentAssembly.GetManifestResourceStream($"{nameof(QpTestClient)}.Images.logo-large.png"))
+                logoPictureBox.Image = Image.FromStream(stream);
             this.Text = String.Format("关于 {0}", ProductInfoUtils.GetAssemblyTitle());
             this.labelProductName.Text = ProductInfoUtils.GetAssemblyProduct();
             this.labelVersion.Text = $"版本 {ProductInfoUtils.GetAssemblyVersion()}";

QpTestClient/AboutBox.cs

@@ -24,13 +24,17 @@ public partial class ConnectForm : Form
         public ConnectForm()
         {
             InitializeComponent();
+            var currentAssembly = this.GetType().Assembly;
+            //窗体图标
+            using (var stream = currentAssembly.GetManifestResourceStream($"{nameof(QpTestClient)}.Images.connection.ico"))
+                Icon = new Icon(stream);
         }
 
         public void EditConnectionInfo(TestConnectionInfo connectionInfo)
         {            
             this.ConnectionInfo = XmlConvert.Deserialize<TestConnectionInfo>(XmlConvert.Serialize(connectionInfo));
             txtName.Text = connectionInfo.Name;
-            var qpClientTypeInfo = QpClientTypeManager.Instance.GetAll().FirstOrDefault(t => t.QpClientType.FullName == connectionInfo.QpClientTypeName);
+            var qpClientTypeInfo = QpClientTypeManager.Instance.GetAll().FirstOrDefault(t => t.ClientType.FullName == connectionInfo.QpClientTypeName);
             cbConnectType.SelectedItem = qpClientTypeInfo;
             Text = "编辑连接";
         }
@@ -45,7 +49,7 @@ private void ConnectForm_Load(object sender, EventArgs e)
             var qpClientTypeName = "Quick.Protocol.Tcp.QpTcpClient";
             if (ConnectionInfo != null)
                 qpClientTypeName = ConnectionInfo.QpClientTypeName;
-            var item = QpClientTypeManager.Instance.GetAll().FirstOrDefault(t => t.QpClientType.FullName == qpClientTypeName);
+            var item = QpClientTypeManager.Instance.GetAll().FirstOrDefault(t => t.ClientType.FullName == qpClientTypeName);
             if (item != null)
                 cbConnectType.SelectedItem = item;
             else
@@ -57,15 +61,15 @@ private void cbConnectType_SelectedIndexChanged(object sender, EventArgs e)
             var qpClientTypeInfo = (QpClientTypeInfo)cbConnectType.SelectedItem;
 
             QpClientOptions options = null;
-            if (ConnectionInfo != null && qpClientTypeInfo.QpClientType.FullName == ConnectionInfo.QpClientTypeName)
+            if (ConnectionInfo != null && qpClientTypeInfo.ClientType.FullName == ConnectionInfo.QpClientTypeName)
             {
                 options = (QpClientOptions)JsonSerializer.Deserialize(
                     JsonSerializer.Serialize(ConnectionInfo.QpClientOptions),
-                    qpClientTypeInfo.QpClientOptionsType);
+                    qpClientTypeInfo.OptionsType);
             }
             else
             {
-                options = (QpClientOptions)Activator.CreateInstance(qpClientTypeInfo.QpClientOptionsType);
+                options = qpClientTypeInfo.CreateOptionsInstanceFunc();
             }
             pgOptions.SelectedObject = options;
         }
@@ -83,7 +87,7 @@ private void btnOk_Click(object sender, EventArgs e)
             ConnectionInfo = new TestConnectionInfo()
             {
                 Name = name,
-                QpClientTypeName = qpClientTypeInfo.QpClientType.FullName,
+                QpClientTypeName = qpClientTypeInfo.ClientType.FullName,
                 QpClientOptions = (QpClientOptions)pgOptions.SelectedObject,
                 Instructions = ConnectionInfo?.Instructions
             };