C#7.3 Compatibility, .Net Standart 2.0

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Stira.WpfCore"]
+	path = Stira.WpfCore
+	url = https://github.com/Touseefelahi/Stira.WpfCore.git

DeviceControl.Wpf/DeviceControl.Wpf.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>library</OutputType>
     <AssemblyName>DeviceControl.Wpf</AssemblyName>
-    <TargetFrameworks>net5.0-windows;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

Directory.Build.props

@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Nullable>enable</Nullable>
     <AvaloniaVersion>11.0.2</AvaloniaVersion>
   </PropertyGroup>
 </Project>

GenICam.Tests/GenICam.Tests.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
+    <TargetFrameworks>net5.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 

GenICam.Tests/Helper.cs

@@ -37,7 +37,7 @@ public void MathParser(string formula)
 
         [Theory]
         [InlineData("(8))")]
-        [InlineData("((8)")]
+        [InlineData("(8")]
         public void GetBracket(string formula)
         {
             var expected = "(8)";

GenICam/Exceptions/GenICamException.cs

@@ -12,7 +12,7 @@ public class GenICamException : Exception
         /// </summary>
         /// <param name="message">error message</param>
         /// <param name="inner">inner exception that holds the original exception</param>
-        public GenICamException(string message, Exception? inner = null)
+        public GenICamException(string message, Exception inner = null)
             : base(message, inner)
         {
         }

GenICam/GenICam.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Platforms>x64</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Version>2.2</Version>

GenICam/Helpers/MathParserHelper.cs

@@ -11,7 +11,7 @@ namespace GenICam
     /// </summary>
     public class MathParserHelper
     {
-        private static readonly List<char> opreations = new() { '(', '+', '-', '/', '*', '=', '?', ':', ')', '>', '<', '&', '|', '^', '~', '%' };
+        private static readonly List<char> opreations = new List<char>() { '(', '+', '-', '/', '*', '=', '?', ':', ')', '>', '<', '&', '|', '^', '~', '%' };
 
         /// <summary>
         /// Prepare a formula.
@@ -46,17 +46,18 @@ public static string PrepareFromula(string formula, Dictionary<string, string> e
         /// <returns>The result.</returns>
         public static double CalculateExpression(string experssion)
         {
+            //throw new NotImplementedException();
             try
             {
                 if (experssion.Contains("?"))
                 {
-                    var cases = experssion.Split(':', 2);
-                    var subs = cases[0].Split("?", 2);
+                    var cases = experssion.Split(new char[] { ':' }, 2);
+                    var subs = cases[0].Split(new char[] { '?' }, 2);
 
                     experssion = $"if({GetBracketed(subs[0])}, {GetBracketed(subs[1])}, {CalculateExpression(GetBracketed(cases[1]))})";
                 }
 
-                return new Expression(experssion).calculate();
+                return new Expression(GetBracketed(experssion)).calculate();
             }
             catch (Exception ex)
             {
@@ -96,7 +97,7 @@ public static string GetBracketed(string formula)
 
             while (openBracketCounter > 0)
             {
-                formula = formula.Remove(0, 1);
+                formula += ")";
                 --openBracketCounter;
             }
 
@@ -149,7 +150,7 @@ public static double Evaluate(string expression)
             {
                 if (word.StartsWith("0x"))
                 {
-                    values.Push(long.Parse(word[2..], System.Globalization.NumberStyles.HexNumber));
+                    values.Push(long.Parse(word.Substring(2), System.Globalization.NumberStyles.HexNumber));
 
                     // valuesList.Last().Push(values.Peek());
                 }
@@ -622,7 +623,7 @@ private string EvaluateFormula(string formula)
             double result;
             string equation;
 
-            foreach (var item in formula.Split('(', StringSplitOptions.None))
+            foreach (var item in formula.Split('('))
             {
                 equation = item;
                 if (item.Contains(')'))

GenICam/Interfaces/Helpers/IPValue.cs

@@ -11,13 +11,13 @@ public interface IPValue
         /// Gets the value async.
         /// </summary>
         /// <returns>The value as long.</returns>
-        public Task<long?> GetValueAsync();
+        Task<long?> GetValueAsync();
 
         /// <summary>
         /// Sets the value async.
         /// </summary>
         /// <param name="value">The value to set.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        public Task<IReplyPacket> SetValueAsync(long value);
+        Task<IReplyPacket> SetValueAsync(long value);
     }
 }

GenICam/Interfaces/Helpers/IReplyPacket.cs

@@ -10,53 +10,53 @@ public interface IReplyPacket
         /// <summary>
         /// Gets or sets error to display if any.
         /// </summary>
-        public string Error { get; set; }
+         string Error { get; set; }
 
         /// <summary>
         /// Gets or sets iP address of the sender.
         /// </summary>
-        public string IPSender { get; set; }
+         string IPSender { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether command sent.
         /// </summary>
-        public bool IsSent { get; set; }
+         bool IsSent { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether command Sent and camera replied.
         /// </summary>
-        public bool IsSentAndReplyReceived { get; set; }
+         bool IsSentAndReplyReceived { get; set; }
 
         /// <summary>
         /// Gets or sets sending Port.
         /// </summary>
-        public int PortSender { get; set; }
+         int PortSender { get; set; }
 
         /// <summary>
         /// Gets raw reply packet.
         /// </summary>
-        public List<byte> Reply { get; }
+         List<byte> Reply { get; }
 
         /// <summary>
         /// Gets or sets register value.
         /// </summary>
-        public uint RegisterValue { get; set; }
+         uint RegisterValue { get; set; }
 
         /// <summary>
         /// Gets or sets memory Value.
         /// </summary>
-        public byte[] MemoryValue { get; set; }
+         byte[] MemoryValue { get; set; }
 
         /// <summary>
         /// It sets the list of byte.
         /// </summary>
         /// <param name="reply">The reply bytes.</param>
-        public void SetReply(byte[] reply);
+         void SetReply(byte[] reply);
 
         /// <summary>
         /// It sets the list of byte.
         /// </summary>
         /// <param name="reply">The reply bytes.</param>
-        public void SetReply(List<byte> reply);
+         void SetReply(List<byte> reply);
     }
 }

GenICam/Interfaces/IBoolean.cs

@@ -11,13 +11,13 @@ public interface IBoolean
         /// Gets the value async.
         /// </summary>
         /// <returns>The value as boolean.</returns>
-        public Task<bool> GetValueAsync();
+         Task<bool> GetValueAsync();
 
         /// <summary>
         /// Sets the value async.
         /// </summary>
         /// <param name="value">The value to set.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        public Task<IReplyPacket> SetValueAsync(bool value);
+         Task<IReplyPacket> SetValueAsync(bool value);
     }
 }

GenICam/Interfaces/ICategory.cs

@@ -10,16 +10,16 @@ public interface ICategory
         /// <summary>
         /// Gets the category properties.
         /// </summary>
-        public CategoryProperties CategoryProperties { get; }
+         CategoryProperties CategoryProperties { get; }
 
         /// <summary>
         /// Gets or sets the PFeatures.
         /// </summary>
-        public List<ICategory> PFeatures { get; set; }
+         List<ICategory> PFeatures { get; set; }
 
         /// <summary>
         /// Gets the PValue.
         /// </summary>
-        public IPValue PValue { get; }
+         IPValue PValue { get; }
     }
 }

GenICam/Interfaces/ICommand.cs

@@ -11,12 +11,12 @@ public interface ICommand
         /// Submits the command.
         /// </summary>
         /// <returns>A task.</returns>
-        public Task <IReplyPacket>Execute();
+         Task <IReplyPacket>Execute();
 
         /// <summary>
         /// Returns true if the command has been executed; false as long as it still  executes.
         /// </summary>
         /// <returns>True when it's finished.</returns>
-        public Task<bool> IsDone();
+         Task<bool> IsDone();
     }
 }

GenICam/Interfaces/IEnumeration.cs

@@ -13,20 +13,20 @@ public interface IEnumeration
         /// Gets the index value corresponding to the enumeration value.
         /// </summary>
         /// <returns>The index value as a long.</returns>
-        public Task<long> GetValueAsync();
+         Task<long> GetValueAsync();
 
         /// <summary>
         /// Sets the index value corresponding to the enumeration value.
         /// </summary>
         /// <param name="value">The index value to set.</param>
         /// <returns>A task.</returns>
-        public Task<IReplyPacket> SetValueAsync(long value);
+         Task<IReplyPacket> SetValueAsync(long value);
 
         /// <summary>
         /// Gets the entries of the enumeration.
         /// </summary>
         /// <returns>A dictionation with the enumeration values.</returns>
-        public Dictionary<string, EnumEntry> GetEntries();
+         Dictionary<string, EnumEntry> GetEntries();
 
         /// <summary>
         /// Returns a list of valid enumeration values.
@@ -42,22 +42,22 @@ public interface IEnumeration
         /// <param name="entryName">The entry name.</param>
         /// <returns>An enumeration entry.</returns>
         [Obsolete]
-        public EnumEntry GetEntryByName(string entryName);
+         EnumEntry GetEntryByName(string entryName);
 
         /// <summary>
         /// Gets the entry.
         /// </summary>
         /// <param name="entryValue">The entry index value.</param>
         /// <returns>An enumeration entry.</returns>
         [Obsolete]
-        public KeyValuePair<string, EnumEntry> GetEntry(long entryValue);
+         KeyValuePair<string, EnumEntry> GetEntry(long entryValue);
 
         /// <summary>
         /// Get the current entry.
         /// </summary>
         /// <param name="entryValue">The entry index value.</param>
         /// <returns>An enumeration entry.</returns>
         [Obsolete]
-        public KeyValuePair<string, EnumEntry> GetCurrentEntry();
+         KeyValuePair<string, EnumEntry> GetCurrentEntry();
     }
 }