Browse Source

1. update nuget reference
2. add gen G~Z
3. add MainType DL

Robert 2 years ago
parent
commit
49998c529e

+ 2 - 2
AwInitilizer/Initilizer.csproj

@@ -62,8 +62,8 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="PhihongEv.Lib, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PhihongEv.Lib.1.0.8\lib\net40\PhihongEv.Lib.dll</HintPath>
+    <Reference Include="PhihongEv.Lib, Version=1.0.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PhihongEv.Lib.1.0.12\lib\net40\PhihongEv.Lib.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>

+ 1 - 1
AwInitilizer/KeyinListener.cs

@@ -93,7 +93,7 @@ namespace AwInitilizer
         {
             CleanInputTimer.Stop();
 
-            if (SystemID.TryParse(stackedInput, out SystemID systemID))
+            if (SystemID.TryLooseParse(stackedInput, out SystemID systemID))
             {
                 OnSystemIDReseived?.Invoke(this, systemID);
                 //SystemIDScanReseived(systemID);

+ 4 - 4
AwInitilizer/MainWindow.xaml.cs

@@ -250,7 +250,7 @@ namespace AwInitilizer
             var systemIDString = updateData.ModelName + updateData.SerialNumber;
             if (!string.IsNullOrEmpty(systemIDString))
             {
-                if (SystemID.TryParse(systemIDString, out SystemID systemID))
+                if (SystemID.TryLooseParse(systemIDString, out SystemID systemID))
                 {
                     updateData.SystemID = systemID;
                 }
@@ -667,7 +667,7 @@ namespace AwInitilizer
                 HintDialog.ShowMessage(Resx.AppResources.InitModelNameEmptyAlert);
                 isCheckPassed = false;
             }
-            else if (!ModelName.TryParse(setting.ModelName, out _))
+            else if (!ModelName.TryLooseParse(setting.ModelName, out _))
             {
                 //HintDialog.ShowMessage("ModelName format Error");
                 HintDialog.ShowMessage(Resx.AppResources.InitModelNameErrorAlert);
@@ -751,7 +751,7 @@ namespace AwInitilizer
                                                 }
                                             }
 
-                                            if (ModelName.TryParse(systemIDBytes, out var modelName))
+                                            if (ModelName.TryLooseParse(systemIDBytes, out var modelName))
                                             {
                                                 if (modelName.ToString() != setting.ModelName)
                                                 {
@@ -835,7 +835,7 @@ namespace AwInitilizer
             signinDialog.ShowDialog();
             this.Focus();
 
-            //SystemID.TryParse("DSYE122E0ED5P7D2212A011A0", out var systemID);
+            //SystemID.TryLooseParse("DSYE122E0ED5P7D2212A011A0", out var systemID);
             //SystemIDScanReseived(systemID);
 
             if (signinDialog.DialogResult != true)

+ 2 - 2
AwInitilizer/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.9.0.0")]
+// [assembly: AssemblyVersion("1.9.1.0")]
 [assembly: AssemblyVersion("1.9.1.0")]
 [assembly: AssemblyFileVersion("1.9.1.0")]
-[assembly: AssemblyInformationalVersion("f5edebc")]
+[assembly: AssemblyInformationalVersion("f1d9d77")]

+ 1 - 1
AwInitilizer/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentFTP" version="37.0.2" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
-  <package id="PhihongEv.Lib" version="1.0.8" targetFramework="net48" />
+  <package id="PhihongEv.Lib" version="1.0.12" targetFramework="net48" />
   <package id="RestSharp" version="106.15.0" targetFramework="net48" />
 </packages>

+ 1 - 1
GitVersion.yml

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

+ 3 - 3
Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
-[assembly: AssemblyInformationalVersion("f5edebc")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]
+[assembly: AssemblyInformationalVersion("f1d9d77")]
 

+ 2 - 2
MesAdaptor/MesAdaptor.csproj

@@ -31,8 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PhihongEv.Lib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PhihongEv.Lib.1.0.0\lib\net40\PhihongEv.Lib.dll</HintPath>
+    <Reference Include="PhihongEv.Lib, Version=1.0.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PhihongEv.Lib.1.0.12\lib\net40\PhihongEv.Lib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 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.9.0.0")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
-[assembly: AssemblyInformationalVersion("f5edebc")]
+// [assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]
+[assembly: AssemblyInformationalVersion("f1d9d77")]

+ 1 - 1
MesAdaptor/SajectConnectSajet2.cs

@@ -62,7 +62,7 @@ namespace MesAdaptor
         private SystemID systemID;
         public bool SajetTransSnCheck(ref string serialNumber)
         {
-            if (!SystemID.TryParse(serialNumber, out var id))
+            if (!SystemID.TryLooseParse(serialNumber, out var id))
             {
                 return false;
             }

+ 1 - 1
MesAdaptor/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="PhihongEv.Lib" version="1.0.0" targetFramework="net48" />
+  <package id="PhihongEv.Lib" version="1.0.12" targetFramework="net48" />
 </packages>