1、更改类库引用方式；

2、将VISA类库升级至21.0.0。
cnxy · Mar 26, 2022 · 4890adb · 4890adb
1 parent 38ee9b1
commit 4890adb
Show file tree

Hide file tree

Showing 14 changed files with 378 additions and 52,938 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/VISAInstrument/Common.cs → ...strument/Configuration/VisaInformation.cs b/VISAInstrument/Common.cs → ...strument/Configuration/VisaInformation.cs
@@ -1,6 +1,6 @@
-namespace VISAInstrument
+namespace VISAInstrument.Configuration
 {
-    internal class Common
+    internal class VisaInformation
     {
         public static string[] VisaSharedComponent { get; set; }
         public static string[] NiVisaRuntime { get; set; }

diff --git a/VISAInstrument/FodyWeavers.xsd b/VISAInstrument/FodyWeavers.xsd
diff --git a/VISAInstrument/FrmMain.cs b/VISAInstrument/FrmMain.cs
@@ -7,9 +7,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using VISAInstrument.Utility;
+using VISAInstrument.Configuration;
 using VISAInstrument.Ports;
 using VISAInstrument.Properties;
+using VISAInstrument.Utility;
 using VISAInstrument.Utility.Extension;
 using VISAInstrument.Utility.Extension.UI;
 
@@ -623,7 +624,7 @@ private void rdoUntilNewLineSpecifiedCount_CheckedChanged(object sender, EventAr
 
         private void toolStripMenuItem2_Click(object sender, EventArgs e)
         {
-            string message = Common.VisaSharedComponent.Concat(Common.NiVisaRuntime).Aggregate((x, y) => $"{x}{Environment.NewLine}{y}").TrimEnd('\r', '\n');
+            string message = VisaInformation.VisaSharedComponent.Concat(VisaInformation.NiVisaRuntime).Aggregate((x, y) => $"{x}{Environment.NewLine}{y}").TrimEnd('\r', '\n');
             MessageBox.Show(this,message);
         }
 

diff --git a/VISAInstrument/Library/Ivi.Visa.dll b/VISAInstrument/Library/Ivi.Visa.dll