upgrade the version number to 3.0

OTSIncAMeasureApp/About.cs

@@ -20,7 +20,7 @@ namespace OTSMeasureApp
         private void About_Load(object sender, EventArgs e)
         {
 
-            richTextBox1.Text = "Version : 2.81\n";
+            richTextBox1.Text = "Version : 3.0\n";
             richTextBox1.Text += "Opton Copyright © 2023";
             richTextBox1.Select(0, richTextBox1.Text.Length);
             //richTextBox1.SelectionColor = Color.DarkBlue;

OTSIncAMeasureApp/Program.cs

@@ -11,7 +11,7 @@ namespace OTSMeasureApp
         /// </summary>
         static Program()
         {
-            string privatepath = "System;Common;SQLiteDll;OxfordExtender;OTSCPPDll;OpenCvSharp;CefSharp";
+            string privatepath = "System;Common;DevExpress;FEIAutoScript;SQLiteDll;OxfordExtender;OTSCPPDll;OpenCvSharp;CefSharp";
             AppDomain.CurrentDomain.SetData("PRIVATE_BINPATH", privatepath);
             AppDomain.CurrentDomain.SetData("BINPATH_PROBE_ONLY", privatepath);
             var m = typeof(AppDomainSetup).GetMethod("UpdateContextProperty", BindingFlags.NonPublic | BindingFlags.Static);

OTSIncAMeasureApp/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("欧波同（中国）有限公司")]
 [assembly: AssemblyProduct("OTSIncAMeasureApp")]
-[assembly: AssemblyCopyright("Copyright ©  2022 欧波同 （中国）有限公司")]
+[assembly: AssemblyCopyright("Copyright ©  2023 欧波同 （中国）有限公司")]
 [assembly: AssemblyTrademark("Opton")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.8.1")]
-[assembly: AssemblyFileVersion("2.8.0")]
+[assembly: AssemblyVersion("3.0.0")]
+[assembly: AssemblyFileVersion("3.0.0")]

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -285,7 +285,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Utils.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Utils.v21.2.UI, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>False</Private>

OTSIncAReportApp/Program.cs

@@ -13,7 +13,7 @@ namespace OTSIncAReportApp
 
         static Program()
         {
-            string privatepath = "System;Common;SQLiteDll;OxfordExtender;OTSCPPDll;OpenCvSharp;CefSharp";
+            string privatepath = "System;Common;DevExpress;FEIAutoScript;SQLiteDll;OxfordExtender;OTSCPPDll;OpenCvSharp;CefSharp";
             AppDomain.CurrentDomain.SetData("PRIVATE_BINPATH", privatepath);
             AppDomain.CurrentDomain.SetData("BINPATH_PROBE_ONLY", privatepath);
             var m = typeof(AppDomainSetup).GetMethod("UpdateContextProperty", BindingFlags.NonPublic | BindingFlags.Static);

OTSIncAReportApp/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("欧波同（中国）有限公司")]
 [assembly: AssemblyProduct("OTSIncAReportApp")]
-[assembly: AssemblyCopyright("Copyright ©  2022 欧波同（中国有限公司）")]
+[assembly: AssemblyCopyright("Copyright ©  2023 欧波同（中国有限公司）")]
 [assembly: AssemblyTrademark("Opton")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0")]
-[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyVersion("3.0.0")]
+[assembly: AssemblyFileVersion("3.0.0")]

OTSPartA_STDEditor/OTSPartA_STDEditor.csproj

@@ -158,9 +158,11 @@
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="FEIApiControl, Version=1.0.0.1, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>

OTSPartA_STDEditor/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]

OTSSysMgrApp/About.Designer.cs

@@ -54,7 +54,7 @@
             // button1
             // 
             this.button1.Location = new System.Drawing.Point(332, 168);
-            this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(71, 25);
             this.button1.TabIndex = 2;
@@ -71,7 +71,7 @@
             "OTS IncA Report APP",
             "OTS Tool App"});
             this.listBox1.Location = new System.Drawing.Point(8, 113);
-            this.listBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.listBox1.Margin = new System.Windows.Forms.Padding(2);
             this.listBox1.Name = "listBox1";
             this.listBox1.Size = new System.Drawing.Size(396, 52);
             this.listBox1.TabIndex = 3;
@@ -83,9 +83,9 @@
             this.label2.Location = new System.Drawing.Point(15, 26);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(48, 15);
+            this.label2.Size = new System.Drawing.Size(42, 15);
             this.label2.TabIndex = 1;
-            this.label2.Text = "版本2.71";
+            this.label2.Text = "版本3.0";
             // 
             // label3
             // 
@@ -123,7 +123,7 @@
             // 
             this.pictureBox1.Image = global::OTSSysMgrApp.Properties.Resources.logo;
             this.pictureBox1.Location = new System.Drawing.Point(237, 8);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(162, 40);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -133,7 +133,7 @@
             // button2
             // 
             this.button2.Location = new System.Drawing.Point(251, 168);
-            this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button2.Margin = new System.Windows.Forms.Padding(2);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(71, 25);
             this.button2.TabIndex = 2;
@@ -155,7 +155,7 @@
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.pictureBox1);
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
             this.MaximumSize = new System.Drawing.Size(427, 246);
             this.MinimizeBox = false;