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

Author: aaasoft

QpTestClient/ConnectForm.Designer.cs

@@ -1,27 +1,20 @@
 using System.Text.Json;
 using Quick.Protocol;
-using Quick.Protocol.Utils;
-using Quick.Xml;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using QpTestClient.Utils;
 
 namespace QpTestClient
 {
     public partial class ConnectForm : Form
     {
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public TestConnectionInfo ConnectionInfo { get; private set; }
-
+        private QpClientOptions clientOptions = null;
         public ConnectForm()
         {
             InitializeComponent();
@@ -33,7 +26,7 @@ public ConnectForm()
 
         public void EditConnectionInfo(TestConnectionInfo connectionInfo)
         {
-            this.ConnectionInfo = XmlConvert.Deserialize<TestConnectionInfo>(XmlConvert.Serialize(connectionInfo), QpdFileUtils.XmlConvertOptions);
+            this.ConnectionInfo = connectionInfo;
             txtName.Text = connectionInfo.Name;
             var qpClientTypeInfo = QpClientTypeManager.Instance.GetAll().FirstOrDefault(t => t.ClientType.FullName == connectionInfo.QpClientTypeName);
             cbConnectType.SelectedItem = qpClientTypeInfo;
@@ -47,32 +40,31 @@ private void ConnectForm_Load(object sender, EventArgs e)
 
             if (cbConnectType.Items.Count <= 0)
                 return;
-            var qpClientTypeName = "Quick.Protocol.Tcp.QpTcpClient";
+
             if (ConnectionInfo != null)
-                qpClientTypeName = ConnectionInfo.QpClientTypeName;
-            var item = QpClientTypeManager.Instance.GetAll().FirstOrDefault(t => t.ClientType.FullName == qpClientTypeName);
-            if (item != null)
+            {
+                var qpClientTypeName = ConnectionInfo.QpClientTypeName;
+                var item = QpClientTypeManager.Instance.GetAll().FirstOrDefault(t => t.ClientType.FullName == qpClientTypeName);
                 cbConnectType.SelectedItem = item;
-            else
-                cbConnectType.SelectedIndex = 0;
+            }
         }
 
         private void cbConnectType_SelectedIndexChanged(object sender, EventArgs e)
         {
             var qpClientTypeInfo = (QpClientTypeInfo)cbConnectType.SelectedItem;
-
-            QpClientOptions options = null;
             if (ConnectionInfo != null && qpClientTypeInfo.ClientType.FullName == ConnectionInfo.QpClientTypeName)
             {
-                options = (QpClientOptions)JsonSerializer.Deserialize(
-                    JsonSerializer.Serialize(ConnectionInfo.QpClientOptions),
-                    qpClientTypeInfo.OptionsType);
+                clientOptions = ConnectionInfo.QpClientOptions.Clone();
             }
             else
             {
-                options = qpClientTypeInfo.CreateOptionsInstanceFunc();
+                clientOptions = qpClientTypeInfo.CreateOptionsInstanceFunc();
             }
-            pgOptions.SelectedObject = options;
+            pnlClientOptions.Controls.Clear();
+            var control = qpClientTypeInfo.CreateOptionsControlFunc();
+            control.DataContext = clientOptions;
+            control.Dock = DockStyle.Fill;
+            pnlClientOptions.Controls.Add(control);
         }
 
         private void btnOk_Click(object sender, EventArgs e)
@@ -89,7 +81,7 @@ private void btnOk_Click(object sender, EventArgs e)
             {
                 Name = name,
                 QpClientTypeName = qpClientTypeInfo.ClientType.FullName,
-                QpClientOptions = (QpClientOptions)pgOptions.SelectedObject,
+                QpClientOptions = clientOptions,
                 Instructions = ConnectionInfo?.Instructions
             };
             DialogResult = DialogResult.OK;

QpTestClient/ConnectForm.cs

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->