Эх сурвалжийг харах

move ending "," to Shinewave only
update yo version v1.2.1

Robert 3 жил өмнө
parent
commit
38b3e6e6db

+ 1 - 1
AwInitilizer/Properties/AssemblyInfo.cs

@@ -53,4 +53,4 @@ using System.Windows;
 // [assembly: AssemblyVersion("1.3.0.0")]
 [assembly: AssemblyVersion("1.3.0.0")]
 [assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("7fec85b")]
+[assembly: AssemblyInformationalVersion("11c7a60")]

+ 1 - 1
GitVersion.yml

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

+ 1 - 1
Initilizer/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 
 [assembly: AssemblyVersion("1.3.0.0")]
 [assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("7fec85b")]
+[assembly: AssemblyInformationalVersion("11c7a60")]
 

+ 1 - 1
MesAdaptor/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.3.0.0")]
 [assembly: AssemblyVersion("1.3.0.0")]
 [assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("7fec85b")]
+[assembly: AssemblyInformationalVersion("11c7a60")]

+ 0 - 6
MesAdaptor/SajetConnectAdapter.cs

@@ -26,12 +26,6 @@ namespace MesAdaptor
 
         public static bool SajetTransData(int command, ref string data)
         {
-            //return true;
-            if (!data.EndsWith(","))
-            {
-                data = data + ",";
-            }
-
             var idByte = Encoding.ASCII.GetBytes(data);
             var length = idByte.Length;
 

+ 5 - 0
MesAdaptor/SajetConnectShinewave.cs

@@ -226,6 +226,11 @@ namespace MesAdaptor
 
         private static bool SajetTransData(CMD command, ref string data)
         {
+            //return true;
+            if (!data.EndsWith(","))
+            {
+                data = data + ",";
+            }
             return SajetConnectAdapter.SajetTransData((int)command, ref data);
         }
 

+ 1 - 1
PhihongSystemID/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.3.0.0")]
 [assembly: AssemblyVersion("1.3.0.0")]
 [assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("7fec85b")]
+[assembly: AssemblyInformationalVersion("11c7a60")]