fix ftp upload ipaddress

adjust version exclude

AwInitilizer/Procedure/FirmwareFtpUploadProcedure.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -95,10 +96,19 @@ namespace AwInitilizer.Procedure.FirmwareBundleUpload
 
         private async Task<bool> UploadWithFtp()
         {
-            var updateList = UpdateData.FirmwareUpdateModels;
+            var updateList = UpdateData.FirmwareUpdateModels;
+            var ipAddress = "";
+            if (!string.IsNullOrEmpty(UpdateData.IpAddress))
+            {
+                ipAddress = UpdateData.IpAddress;
+            }
+            else
+            {
+                ipAddress = ServerIpAddress;
+            }
 
             //FtpClient client = new FtpClient(ServerIpAddress, "root", "y42j/4cj84");
-            FtpClient client = new FtpClient(ServerIpAddress, "vern", "vern@delta");
+            FtpClient client = new FtpClient(ipAddress, "vern", "vern@delta");
             try
             {
                 var profile = await client.AutoConnectAsync();

AwInitilizer/Procedure/VersionLogProcedure.cs

@@ -17,6 +17,10 @@ namespace AwInitilizer.Procedure.VersionLog
 
         private static readonly List<string> excludeHeaderList = new List<string>()
         {
+            "FactoryConfiguration",
+            "DDFactoryConfiguration0",
+            "DDFactoryConfiguration1",
+            "DDFactoryConfiguration2",
             "FactoryConfiguration",
             "AuxPower5V",
             "AuxPower12V",

AwInitilizer/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.11.0.0")]
 [assembly: AssemblyVersion("1.11.0.0")]
 [assembly: AssemblyFileVersion("1.11.0.0")]
-[assembly: AssemblyInformationalVersion("5acfa48")]
+[assembly: AssemblyInformationalVersion("8114f99")]

GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.11.0
+next-version: 1.11.1
 branches: {}
 ignore:
   sha: []

Initilizer/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 
 [assembly: AssemblyVersion("1.11.0.0")]
 [assembly: AssemblyFileVersion("1.11.0.0")]
-[assembly: AssemblyInformationalVersion("5acfa48")]
+[assembly: AssemblyInformationalVersion("8114f99")]
 

MesAdaptor/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.11.0.0")]
 [assembly: AssemblyVersion("1.11.0.0")]
 [assembly: AssemblyFileVersion("1.11.0.0")]
-[assembly: AssemblyInformationalVersion("5acfa48")]
+[assembly: AssemblyInformationalVersion("8114f99")]