Browse Source

1. add upload software version
2. update to version 1.4.0

Robert 3 years ago
parent
commit
538b0124a3

+ 12 - 1
AwInitilizer/Procedure/VersionLogProcedure.cs

@@ -12,6 +12,8 @@ namespace AwInitilizer.Procedure.VersionLog
 {
     public class VersionLogProcedure : ProcedureBase
     {
+        private static readonly string SoftwareVersionHeader = "FullsetTestingVersion";
+
         private static readonly List<string> excludeHeaderList = new List<string>()
         {
             "FactoryConfiguration",
@@ -80,7 +82,6 @@ namespace AwInitilizer.Procedure.VersionLog
                         //LogPair.Add(infoPair.Key, infoPair.Value);
                     }
                 }
-                return true;
             }
             else
             {
@@ -88,6 +89,16 @@ namespace AwInitilizer.Procedure.VersionLog
 
                 return false;
             }
+
+
+            var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            var version = assembly.GetName().Version.ToString();
+            var gitVersion = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location).ProductVersion;
+            var logVersion = string.Format("{0}-{1}", version, gitVersion);
+
+            LogWriter.Report(SoftwareVersionHeader, logVersion);
+
+            return true;
         }
 
         private string GetMesReportKey(string readVersion)

+ 4 - 4
AwInitilizer/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
-[assembly: AssemblyInformationalVersion("668f576")]
+// [assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyInformationalVersion("436453e")]

+ 1 - 1
GitVersion.yml

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

+ 3 - 3
Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
-[assembly: AssemblyInformationalVersion("668f576")]
+[assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyInformationalVersion("436453e")]
 

+ 4 - 4
MesAdaptor/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
-[assembly: AssemblyInformationalVersion("668f576")]
+// [assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyInformationalVersion("436453e")]

+ 4 - 4
PhihongSystemID/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
-[assembly: AssemblyInformationalVersion("668f576")]
+// [assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyInformationalVersion("436453e")]