Updated MQTTnet and OpcUa-client to latest major.

Author: dbeuchler

Directory.Packages.props

@@ -54,12 +54,12 @@
 
     <!-- Dependencies for drivers and adapters -->
     <PackageVersion Include="System.IO.Ports" Version="10.0.0" />
-    <PackageVersion Include="MQTTnet" Version="4.3.1.873" />
-    <PackageVersion Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.376.213" />
+    <PackageVersion Include="MQTTnet" Version="5.0.1.1416" />
+    <PackageVersion Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.377.21" />
 
     <PackageVersion Include="InfluxDB.LineProtocol" Version="1.1.0" />
     <PackageVersion Include="InfluxDB.Client" Version="4.18.0" />
-    <PackageVersion Include="CsvHelper" Version="33.0.0" />
+    <PackageVersion Include="CsvHelper" Version="33.1.0" />
 
     <PackageVersion Include="MimeTypeMapOfficial" Version="1.0.17" />
     <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />

src/Moryx.Drivers.Mqtt/MqttDriver.cs

@@ -1,10 +1,10 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
+using System.Buffers;
 using System.Runtime.Serialization;
 using Moryx.AbstractionLayer.Drivers;
 using MQTTnet;
-using MQTTnet.Client;
 using System.ComponentModel;
 using System.Text.RegularExpressions;
 using Moryx.AbstractionLayer.Drivers.Message;
@@ -146,7 +146,7 @@ protected override void OnInitialize()
     {
         base.OnInitialize();
 
-        var factory = new MqttFactory();
+        var factory = new MqttClientFactory();
         _mqttClient = factory.CreateMqttClient();
 
         _mqttClient.ApplicationMessageReceivedAsync += OnReceived;
@@ -339,14 +339,17 @@ public async Task OnSend(MqttMessageTopic messageTopic, byte[] message, Cancella
     private Task OnReceived(MqttApplicationMessageReceivedEventArgs args)
     {
         // Experimental: Dispatch to new thread to prevent exceptions or deadlocks from causing inflight blockage
-        ParallelOperations.ExecuteParallel(param => Receive(param.Topic, param.Payload), new { args.ApplicationMessage.Topic, args.ApplicationMessage.Payload });
+        ParallelOperations.ExecuteParallel(param => Receive(param.Topic, param.Payload), new
+        {
+            args.ApplicationMessage.Topic,
+            Payload = args.ApplicationMessage.Payload.ToArray()
+        });
 
         return Task.CompletedTask;
     }
 
     internal void Receive(string topicName, byte[] message)
     {
-
         var topic = topicName;
         if (Identifier != "")
         {

src/Moryx.Drivers.OpcUa/ApplicationConfigurationFactory.cs

@@ -27,7 +27,7 @@ public virtual async Task<ApplicationConfiguration> Create(ILogger logger, strin
         var filePath = string.IsNullOrEmpty(configPath) ? defaultPath : configPath;
         try
         {
-            config = await application.LoadApplicationConfiguration(filePath, false);
+            config = await application.LoadApplicationConfigurationAsync(filePath, false);
         }
         catch (Exception ex)
         {
@@ -37,7 +37,7 @@ public virtual async Task<ApplicationConfiguration> Create(ILogger logger, strin
 
         ApplicationName = config.ApplicationName;
         // check the application certificate
-        var haveAppCertificate = await application.CheckApplicationInstanceCertificate(false, 0);
+        var haveAppCertificate = await application.CheckApplicationInstanceCertificatesAsync(false, 0);
         if (!haveAppCertificate)
         {
             throw new Exception("Application instance certificate invalid!");

src/Moryx.Operators.Management/Moryx.Operators.Management.csproj

@@ -19,6 +19,7 @@
     <ProjectReference Include="..\Moryx.Model.PostgreSQL\Moryx.Model.PostgreSQL.csproj"/>
     <ProjectReference Include="..\Moryx.Model.Sqlite\Moryx.Model.Sqlite.csproj"/>
     <ProjectReference Include="..\Moryx.Operators\Moryx.Operators.csproj"/>
+    <ProjectReference Include="..\Moryx.Runtime.Kernel\Moryx.Runtime.Kernel.csproj" />
     <ProjectReference Include="..\Moryx.Users\Moryx.Users.csproj"/>
   </ItemGroup>
 

src/Moryx.Shifts.Management/Moryx.Shifts.Management.csproj

@@ -14,6 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Moryx.Model.PostgreSQL\Moryx.Model.PostgreSQL.csproj" />
     <ProjectReference Include="..\Moryx.Model.Sqlite\Moryx.Model.Sqlite.csproj" />
+    <ProjectReference Include="..\Moryx.Runtime.Kernel\Moryx.Runtime.Kernel.csproj" />
     <ProjectReference Include="..\Moryx.Shifts\Moryx.Shifts.csproj" />
   </ItemGroup>
 

src/Tests/Moryx.Drivers.OpcUa.Tests/HandlingWriteAndRead.cs

@@ -6,6 +6,7 @@
 using Moryx.Modules;
 using NUnit.Framework;
 using Opc.Ua;
+using Opc.Ua.Client;
 
 namespace Moryx.Drivers.OpcUa.Tests;
 
@@ -124,7 +125,7 @@ public void TestFindNode()
         //Act
         var result = _driver.FindNodeId(node.DisplayName.ToString());
 
-        //Assert           
+        //Assert
         Assert.That(result.Any(x => x.Equals(nodeId)), Is.True);
     }
 }

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttChannelFunctions.cs

@@ -17,7 +17,6 @@
 using Moryx.TestTools.UnitTest;
 using Moryx.Tools;
 using MQTTnet;
-using MQTTnet.Client;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
@@ -50,7 +49,7 @@ public void Setup()
             _driver = CreateMqttDriver();
             _mockClient = SetupMqttClientMock();
 
-            //Initialize MqttDriver 
+            //Initialize MqttDriver
             _driver.InitializeForTest(_mockClient.Object);
             ((IPlugin)_driver).Start();
             _driver.OnConnected(new MqttClientConnectedEventArgs(new MqttClientConnectResult())).Wait();
@@ -122,7 +121,7 @@ public void Channel_FindChannel_TChannel()
             Assert.That(c.Identifier.Equals(_topicBoolMqtt.Identifier));
         }
 
-        
+
         [Test(Description = "Return null, if identifier does not exist")]
         public void Channel_NotFindChannel_IdentifierDoesNotExist()
         {

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttIByteSerializable.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0
 
 using System;
+using System.Buffers;
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,7 +16,6 @@
 using Moryx.Resources.Mqtt.Tests.TestMessages;
 using Moryx.Tools;
 using MQTTnet;
-using MQTTnet.Client;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
@@ -84,8 +84,7 @@ public void Setup()
         private Expression<Func<MqttClientOptions, bool>> CorrectClientOptions()
         {
             return o => o.ProtocolVersion == _driver.MqttVersion && o.CleanSession == !_driver.ReconnectWithoutCleanSession
-                        && o.ClientId == $"{System.Net.Dns.GetHostName()}-{_driver.Id}-{_driver.Name}" && (o.ChannelOptions as MqttClientTcpOptions).Server == _driver.BrokerUrl &&
-                        (o.ChannelOptions as MqttClientTcpOptions).Port == _driver.Port;
+                        && o.ClientId == $"{System.Net.Dns.GetHostName()}-{_driver.Id}-{_driver.Name}";
         }
 
         [Test(Description = "Publish Message using Driver")]
@@ -129,7 +128,7 @@ private void SendMessageBoolMqttMessage(MqttApplicationMessage mqttMsg, Cancella
             Assert.That(mqttMsg.QualityOfServiceLevel, Is.EqualTo(MqttQualityOfServiceLevel.ExactlyOnce),
                 "Qos should be ExactlyOnce, but is " + mqttMsg.QualityOfServiceLevel);
             var msg = new BoolMqttMessage();
-            msg.FromBytes(mqttMsg.Payload);
+            msg.FromBytes(mqttMsg.Payload.ToArray());
             Assert.That(msg.Message == MESSAGE_VALUE, "Message should be " + MESSAGE_VALUE + ", but is " + msg.Message);
         }
 
@@ -160,7 +159,7 @@ private void SendMessageBoolIByteSerializableMessage(MqttApplicationMessage sent
             Assert.That(sentMsg.QualityOfServiceLevel, Is.EqualTo(MqttQualityOfServiceLevel.ExactlyOnce),
                 "Qos should be ExactlyOnce, but is " + sentMsg.QualityOfServiceLevel);
             var msg = new BoolByteSerializableMessage();
-            msg.FromBytes(sentMsg.Payload);
+            msg.FromBytes(sentMsg.Payload.ToArray());
             Assert.That(msg.Message == MESSAGE_VALUE, "Message should be " + MESSAGE_VALUE + ", but is " + msg.Message);
         }
 

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttJsonTopic.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0
 
 using System;
+using System.Buffers;
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading;
@@ -14,7 +15,6 @@
 using Moryx.Modules;
 using Moryx.Tools;
 using MQTTnet;
-using MQTTnet.Client;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using Newtonsoft.Json;
@@ -84,8 +84,7 @@ public void Setup()
         private Expression<Func<MqttClientOptions, bool>> CorrectClientOptions()
         {
             return o => o.ProtocolVersion == _driver.MqttVersion && o.CleanSession == !_driver.ReconnectWithoutCleanSession
-                        && o.ClientId == $"{System.Net.Dns.GetHostName()}-{_driver.Id}-{_driver.Name}" && (o.ChannelOptions as MqttClientTcpOptions).Server == _driver.BrokerUrl &&
-                        (o.ChannelOptions as MqttClientTcpOptions).Port == _driver.Port;
+                        && o.ClientId == $"{System.Net.Dns.GetHostName()}-{_driver.Id}-{_driver.Name}";
         }
 
         [Test(Description = "Publish Json Message using the MqttTopicJson")]
@@ -109,7 +108,8 @@ public void Send_UsingMqttTopicJson_Topic_QOS_Message()
         private void CheckSentMessage(MqttApplicationMessage sentMsg, CancellationToken token)
         {
             var msg = new JsonMessageTest();
-            var payload = Encoding.UTF8.GetString(sentMsg.Payload, 0, sentMsg.Payload.Length);
+            var payloadArray = sentMsg.Payload.ToArray();
+            var payload = Encoding.UTF8.GetString(payloadArray, 0, payloadArray.Length);
             if (sentMsg.Topic == _driver.Identifier + _mqttTopicCamel.Identifier)
             {
                 Assert.That(payload.Contains(nameof(JsonMessageTest.Age).ToLower()));

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttPrimitiveDatatypeTopic.cs

@@ -2,19 +2,20 @@
 // Licensed under the Apache License, Version 2.0
 
 using System;
+using System.Buffers;
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
+using Moryx.AbstractionLayer.Resources;
 using Moryx.AbstractionLayer.TestTools;
 using Moryx.Drivers.Mqtt;
 using Moryx.Drivers.Mqtt.MqttTopics;
 using Moryx.Logging;
 using Moryx.Modules;
 using Moryx.Tools;
 using MQTTnet;
-using MQTTnet.Client;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
@@ -85,8 +86,7 @@ public void Setup()
         private Expression<Func<MqttClientOptions, bool>> CorrectClientOptions()
         {
             return o => o.ProtocolVersion == _driver.MqttVersion && o.CleanSession == !_driver.ReconnectWithoutCleanSession
-                        && o.ClientId == $"{System.Net.Dns.GetHostName()}-{_driver.Id}-{_driver.Name}" && (o.ChannelOptions as MqttClientTcpOptions).Server == _driver.BrokerUrl &&
-                        (o.ChannelOptions as MqttClientTcpOptions).Port == _driver.Port;
+                        && o.ClientId == $"{System.Net.Dns.GetHostName()}-{_driver.Id}-{_driver.Name}";
         }
 
         [Test(Description = "Publish int32 Message using the MqttTopicPrimitive")]
@@ -115,7 +115,7 @@ private void SendMessagIntIConvertible(MqttApplicationMessage sentMsg, Cancellat
                 "Topic should be " + _driver.Identifier + _mqttTopicInt.Identifier + ", but is " + sentMsg.Topic);
             Assert.That(sentMsg.QualityOfServiceLevel, Is.EqualTo(MqttQualityOfServiceLevel.ExactlyOnce),
                 "Qos should be ExactlyOnce, but is " + sentMsg.QualityOfServiceLevel);
-            var msg = BitConverter.ToInt32(sentMsg.Payload, 0);
+            var msg = BitConverter.ToInt32(sentMsg.Payload.ToArray(), 0);
             Assert.That(msg == MESSAGE_VALUE_INT, "Message should be " + MESSAGE_VALUE_INT + ", but is " + msg);
         }