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

Author: aaasoft

QpTestClient/ConnectForm.cs

@@ -13,6 +13,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using QpTestClient.Utils;
 
 namespace QpTestClient
 {
@@ -31,8 +32,8 @@ public ConnectForm()
         }
 
         public void EditConnectionInfo(TestConnectionInfo connectionInfo)
-        {            
-            this.ConnectionInfo = XmlConvert.Deserialize<TestConnectionInfo>(XmlConvert.Serialize(connectionInfo));
+        {
+            this.ConnectionInfo = XmlConvert.Deserialize<TestConnectionInfo>(XmlConvert.Serialize(connectionInfo), QpdFileUtils.XmlConvertOptions);
             txtName.Text = connectionInfo.Name;
             var qpClientTypeInfo = QpClientTypeManager.Instance.GetAll().FirstOrDefault(t => t.ClientType.FullName == connectionInfo.QpClientTypeName);
             cbConnectType.SelectedItem = qpClientTypeInfo;

QpTestClient/QpTestClient.csproj

@@ -54,7 +54,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Quick.Xml" Version="1.0.1" />
+		<PackageReference Include="Quick.Xml" Version="1.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>

QpTestClient/TestConnectionInfo.cs

@@ -1,5 +1,4 @@
-using Newtonsoft.Json.Linq;
-using Quick.Protocol;
+using Quick.Protocol;
 using System;
 using System.Collections.Generic;
 using System.Text;

QpTestClient/Utils/QpdFileUtils.cs

@@ -1,6 +1,9 @@
-using System;
+using Quick.Protocol;
+using Quick.Xml;
+using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 
 namespace QpTestClient.Utils
@@ -47,10 +50,24 @@ public static void DeleteQpbFile(TestConnectionInfo connectionInfo)
                 File.Delete(file);
         }
 
+        public static Quick.Xml.XmlConvertOptions XmlConvertOptions { get; private set; }
+
         public static TestConnectionInfo Load(string file)
         {
+            if (XmlConvertOptions == null)
+            {
+                XmlConvertOptions = new XmlConvertOptions()
+                {
+                     InstanceFactory = QpClientTypeManager.Instance.GetAll().ToDictionary(t => t.OptionsType, t =>
+                     {
+                         return new Func<object>(() => t.CreateOptionsInstanceFunc());
+                     })
+                };
+                XmlConvertOptions.InstanceFactory.Add(typeof(TestConnectionInfo), () => new TestConnectionInfo());
+                XmlConvertOptions.InstanceFactory.Add(typeof(QpInstruction), () => new QpInstruction());
+            }
             var content = File.ReadAllText(file);
-            return Quick.Xml.XmlConvert.Deserialize<TestConnectionInfo>(content);
+            return Quick.Xml.XmlConvert.Deserialize<TestConnectionInfo>(content, XmlConvertOptions);
         }
     }
 }