Update Twin-ADS Lib to V6 and .NET 8.0 with some cleanups

NET/AdsMapperCli/AdsMapperCli.csproj

@@ -2,12 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <StartupObject>AdsMapperCli.Program</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.*" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.*" />
+    <PackageReference Include="System.Text.Json" Version="8.*" />
   </ItemGroup>
 
   <ItemGroup>

NET/AdsMapperCli/DestinationDataObject.cs

@@ -6,37 +6,37 @@ namespace AdsMapperCli
     /* PLC Struct:
      TYPE ST_Test :
     STRUCT
-	    bBoolValue1 : BOOL := TRUE;
-	    nByteValue1 : BYTE := 255;
-	    nSbyteValue1 : BYTE := 127;
-	    nUshortValue1 : UINT := 65535;
-	    nShortValue1 : INT := 32767;
-	    nUintValue1 : UDINT := 4294967295;
-	    nIntValue1 : DINT := 2147483647;
-	    fFloatValue1 : REAL := -1.11;
-	    fDoubleValue1 : LREAL := 1.11;
-	    fDoubleValue2 : LREAL := 2.22;
-	    fDoubleValue3 : LREAL := 3.33;
-	    fDoubleValue4MappedName : LREAL := 4.44;
-	    tPlcTimeValue1 : TIME := T#1H33M44S555MS;
-	    dPlcDateValue1 : DATE := D#2021-08-30;
-	    dtPlcDateTimeValue1 : DATE_AND_TIME := DT#2021-08-30-11:12:13;
-	    aIntArrayValue : ARRAY[0..2] OF DINT := [1, 2, 3];
-	    eEnumStateValue : E_State := E_State.eRunning;
-    	sPlcVersion : STRING(10) := '21.08.30.0';
-	    sUtf7String : STRING(6) := 'ÄÖö@Ü7';
-	    wsUnicodeString : WSTRING(6) := "ÄÖö@Ü8";
+        bBoolValue1 : BOOL := TRUE;
+        nByteValue1 : BYTE := 255;
+        nSbyteValue1 : BYTE := 127;
+        nUshortValue1 : UINT := 65535;
+        nShortValue1 : INT := 32767;
+        nUintValue1 : UDINT := 4294967295;
+        nIntValue1 : DINT := 2147483647;
+        fFloatValue1 : REAL := -1.11;
+        fDoubleValue1 : LREAL := 1.11;
+        fDoubleValue2 : LREAL := 2.22;
+        fDoubleValue3 : LREAL := 3.33;
+        fDoubleValue4MappedName : LREAL := 4.44;
+        tPlcTimeValue1 : TIME := T#1H33M44S555MS;
+        dPlcDateValue1 : DATE := D#2021-08-30;
+        dtPlcDateTimeValue1 : DATE_AND_TIME := DT#2021-08-30-11:12:13;
+        aIntArrayValue : ARRAY[0..2] OF DINT := [1, 2, 3];
+        eEnumStateValue : E_State := E_State.eRunning;
+        sPlcVersion : STRING(10) := '21.08.30.0';
+        sUtf7String : STRING(6) := 'ÄÖö@Ü7';
+        wsUnicodeString : WSTRING(6) := "ÄÖö@Ü8";
     END_STRUCT
     END_TYPE
 
     {attribute 'qualified_only'}
     {attribute 'strict'}
     TYPE E_State :
     (
-	    eNone    := 0,
-	    eStartup := 1,
-	    eRunning := 2,
-	    eStop    := 3
+        eNone    := 0,
+        eStartup := 1,
+        eRunning := 2,
+        eStop    := 3
     );
     END_TYPE
     */
@@ -78,9 +78,10 @@ public class DestinationDataObject : IPlcState
         public string Utf7String { get; set; }
         public string UnicodeString { get; set; }
 
-        //public Motor MotorObject { get; set; }
+        // public Motor MotorObject { get; set; }
     }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Only for tests")]
     public class Motor
     {
         public double ActualSpeed { get; set; }

NET/AdsMapperCli/Program.cs

@@ -1,64 +1,68 @@
 using Mbc.Ads.Mapper;
 using Mbc.Pcs.Net.Connection;
 using Mbc.Pcs.Net.State;
-using NLog;
+using Microsoft.Extensions.Logging;
+using NLog.Extensions.Logging;
 using System;
 
 namespace AdsMapperCli
 {
     public static class Program
     {
-        private static readonly ILogger _logger = LogManager.GetCurrentClassLogger();
-        private static PlcAdsConnectionService _adsConnectionService;
-        private static PlcAdsStateReader<DestinationDataObject> _plcAdsTestPlaceStatus;
+        private static ILogger Logger;
+        private static PlcAdsConnectionService adsConnectionService;
+        private static PlcAdsStateReader<DestinationDataObject> plcAdsTestPlaceStatus;
 
         public static void Main(string[] args)
         {
             SetupNLog();
             try
             {
-                string amsnetid = "172.28.85.92.1.1";
-                _logger.Info("Setup & Connect to TwinCat on {0}", amsnetid);
-                _adsConnectionService = new PlcAdsConnectionService(amsnetid, 851);
-                _adsConnectionService.ConnectionStateChanged += OnConnectionStateChanged;
+                string amsnetid = "204.35.225.246.1.1";
+                Logger.LogInformation("Setup & Connect to TwinCat on {0}", amsnetid);
+                adsConnectionService = new PlcAdsConnectionService(amsnetid, 851);
+                adsConnectionService.ConnectionStateChanged += OnConnectionStateChanged;
 
                 var testPlaceStatusConfig = new PlcAdsStateReaderConfig<DestinationDataObject>
                 {
-                    VariablePath = $"PCS_Status.stTest",
+                    VariablePath = $"GVL.stTest",
                     AdsMapperConfiguration = new AdsMapperConfiguration<DestinationDataObject>(
                         cfg => cfg.ForAllSourceMember(opt => opt.RemovePrefix("f", "n", "b", "a", "e", "t", "d", "dt", "s", "ws"))),
                     CycleTime = TimeSpan.FromMilliseconds(2),
                     MaxDelay = TimeSpan.FromMilliseconds(500),
                 };
 
                 // Setup state Reader
-                _plcAdsTestPlaceStatus = new PlcAdsStateReader<DestinationDataObject>(_adsConnectionService, testPlaceStatusConfig);
-                _plcAdsTestPlaceStatus.StatesChanged += OnPlcStatesChange;
+                plcAdsTestPlaceStatus = new PlcAdsStateReader<DestinationDataObject>(adsConnectionService, testPlaceStatusConfig, Logger);
+                plcAdsTestPlaceStatus.StatesChanged += OnPlcStatesChange;
 
                 // RocknRoll
-                _adsConnectionService.Start();
+                adsConnectionService.Start();
 
                 // Wait for termination
                 var keepRunning = true;
-                Console.CancelKeyPress += delegate (object sender, ConsoleCancelEventArgs e) 
+                Console.CancelKeyPress += (sender, e) =>
                 {
                     e.Cancel = true;
                     keepRunning = false;
                 };
 
-                while (keepRunning) { }
+                while (keepRunning)
+                {
+                    // endless
+                }
 
-                _logger.Info("stopping output");
-                _plcAdsTestPlaceStatus.StopSampling();
+                Logger.LogInformation("stopping output");
+                plcAdsTestPlaceStatus.StopSampling();
             }
             catch (Exception ex)
             {
-                _logger.Info(ex, "houston we have a problem: {0}", ex.Message);
+                Logger.LogInformation(ex, "houston we have a problem: {0}", ex.Message);
             }
             finally
             {
-                _plcAdsTestPlaceStatus?.Dispose();
-                _adsConnectionService?.Dispose();
+                plcAdsTestPlaceStatus?.Dispose();
+                adsConnectionService?.Dispose();
             }
         }
 
@@ -68,22 +72,24 @@ private static void SetupNLog()
             // Targets where to log to: Console
             var logconsole = new NLog.Targets.ConsoleTarget("logconsole");
             // Rules for mapping loggers to targets
-            config.AddRule(LogLevel.Info, LogLevel.Fatal, logconsole);
+            config.AddRule(NLog.LogLevel.Info, NLog.LogLevel.Fatal, logconsole);
             // Apply config
             NLog.LogManager.Configuration = config;
+
+            Logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger("AdsMapperCli");
         }
 
         private static void OnConnectionStateChanged(object sender, PlcConnectionChangeArgs e)
         {
             if (e.Connected)
             {
-                _logger.Info("Connected to TwinCat");
-                _plcAdsTestPlaceStatus.StartSampling();
+                Logger.LogInformation("Connected to TwinCat");
+                plcAdsTestPlaceStatus.StartSampling();
             }
             else
             {
                 Console.WriteLine("Disconnected to TwinCat");
-                _plcAdsTestPlaceStatus.StopSampling();
+                plcAdsTestPlaceStatus.StopSampling();
             }
         }
 
@@ -92,8 +98,8 @@ private static void OnPlcStatesChange(object source, PlcMultiStateChangedEventAr
             var config = new System.Text.Json.JsonSerializerOptions() { WriteIndented = true, Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
             config.Converters.Add(new System.Text.Json.Serialization.JsonStringEnumConverter());
 
-            _logger.Info("New State");
-            _logger.Info(System.Text.Json.JsonSerializer.Serialize(testPlaceStatusEvent.State, config));
+            Logger.LogInformation("New State");
+            Logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(testPlaceStatusEvent.State, config));
         }
     }
 }

NET/Build/Mbc.CodeAnalysis.ruleset

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Microsoft Managed Recommended Rules" Description="These rules focus on the most critical problems in your code, including potential security holes, application crashes, and other important logic and design errors. It is recommended to include this rule set in any custom rule set you create for your projects." ToolsVersion="16.0">
+<RuleSet Name="Microsoft Managed Recommended Rules" Description="These rules focus on the most critical problems in your code, including potential security holes, application crashes, and other important logic and design errors. It is recommended to include this rule set in any custom rule set you create for your projects." ToolsVersion="17.0">
   <Localization ResourceAssembly="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.dll" ResourceBaseName="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.Localized">
     <Name Resource="MinimumRecommendedRules_Name" />
     <Description Resource="MinimumRecommendedRules_Description" />
   </Localization>
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
-    <Rule Id="CS1591" Action="None" />
+    <Rule Id="CS1591" Action="Hidden" />
   </Rules>
   <Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
     <Rule Id="CA1028" Action="None" />
@@ -20,11 +20,11 @@
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA0001" Action="None" />
-    <Rule Id="SA1101" Action="None" />
+    <Rule Id="SA1101" Action="Hidden" />
     <Rule Id="SA1118" Action="None" />
     <Rule Id="SA1121" Action="None" />
     <Rule Id="SA1124" Action="None" />
-    <Rule Id="SA1200" Action="None" />
+    <Rule Id="SA1200" Action="Hidden" />
     <Rule Id="SA1201" Action="None" />
     <Rule Id="SA1202" Action="None" />
     <Rule Id="SA1208" Action="None" />
@@ -35,14 +35,14 @@
     <Rule Id="SA1515" Action="None" />
     <Rule Id="SA1516" Action="None" />
     <Rule Id="SA1591" Action="None" />
-    <Rule Id="SA1600" Action="None" />
+    <Rule Id="SA1600" Action="Hidden" />
     <Rule Id="SA1601" Action="None" />
     <Rule Id="SA1602" Action="None" />
     <Rule Id="SA1611" Action="None" />
     <Rule Id="SA1615" Action="None" />
     <Rule Id="SA1623" Action="None" />
-    <Rule Id="SA1629" Action="None" />
-    <Rule Id="SA1633" Action="None" />
+    <Rule Id="SA1629" Action="Hidden" />
+    <Rule Id="SA1633" Action="Hidden" />
     <Rule Id="SA1642" Action="None" />
     <Rule Id="SA1652" Action="None" />
   </Rules>

NET/Build/Mbc.Pcs.Net.TwinCat.EventLog.nuspec

@@ -1,18 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>Mbc.Pcs.Net.TwinCat.EventLog</id>
-    <version>1.0.0</version>
+    <version>1.0.2</version>
     <authors>mbc engineering</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <projectUrl>https://github.com/mbc-engineering/net-pcs</projectUrl>
     <description>unofficial assemblies from type libraries for TwinCat Alarm and Event alias TcEventLoggerLib and TcEventLogProxyLib</description>
     <dependencies>
       <group targetFramework=".NETFramework4.6.1" />
+      <!-- Version 7.0 for Windows 7 is the default value-->
+      <group targetFramework="net6.0-windows7.0" />
+      <group targetFramework="net8.0-windows7.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="..\libs\Interop.TCEVENTLOGGERLib.dll" target="lib\net461\Interop.TCEVENTLOGGERLib.dll" />
-    <file src="..\libs\Interop.TcEventLogProxyLib.dll" target="lib\net461\Interop.TcEventLogProxyLib.dll" />
+    <file src="..\Libs\Interop.TCEVENTLOGGERLib.dll" target="lib\net461\Interop.TCEVENTLOGGERLib.dll" />
+    <file src="..\Libs\Interop.TcEventLogProxyLib.dll" target="lib\net461\Interop.TcEventLogProxyLib.dll" />
+    <file src="..\Libs\Interop.TCEVENTLOGGERLib.dll" target="lib\net6.0-windows7.0\Interop.TCEVENTLOGGERLib.dll" />
+    <file src="..\Libs\Interop.TcEventLogProxyLib.dll" target="lib\net6.0-windows7.0\Interop.TcEventLogProxyLib.dll" />
+    <file src="..\Libs\Interop.TCEVENTLOGGERLib.dll" target="lib\net8.0-windows7.0\Interop.TCEVENTLOGGERLib.dll" />
+    <file src="..\Libs\Interop.TcEventLogProxyLib.dll" target="lib\net8.0-windows7.0\Interop.TcEventLogProxyLib.dll" />
   </files>
 </package>

NET/CallAds/CallAds.csproj

@@ -63,7 +63,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Beckhoff.TwinCAT.Ads">
-      <Version>4.3.11</Version>
+      <Version>5.0.528</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />