From b9e2ed051fe5b8d7d7c7c3212c9e6477380da3d4 Mon Sep 17 00:00:00 2001
From: RobertBeekman <mail@rbeekman.nl>
Date: Mon, 26 Feb 2024 20:20:49 +0100
Subject: [PATCH] Update packages

---
 .../Artemis.Plugins.Mqtt.csproj               |  8 ++++----
 src/Artemis.Plugins.Mqtt/MqttConnector.cs     | 19 ++++++++++---------
 src/Artemis.Plugins.Mqtt/MqttModule.cs        |  3 +--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Artemis.Plugins.Mqtt/Artemis.Plugins.Mqtt.csproj b/src/Artemis.Plugins.Mqtt/Artemis.Plugins.Mqtt.csproj
index 7f7cc99..6074806 100644
--- a/src/Artemis.Plugins.Mqtt/Artemis.Plugins.Mqtt.csproj
+++ b/src/Artemis.Plugins.Mqtt/Artemis.Plugins.Mqtt.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Platforms>x64</Platforms>
         <EnableDynamicLoading>true</EnableDynamicLoading>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2023.1017.2" />
-        <PackageReference Include="MQTTnet" Version="3.0.14-rc5" />
-        <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.14-rc5" />
+        <PackageReference Include="ArtemisRGB.UI.Shared" IncludeAssets="compile;build;buildTransitive" Version="1.2024.225.6" />
+        <PackageReference Include="MQTTnet" Version="4.3.3.952" />
+        <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.3.3.952" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Artemis.Plugins.Mqtt/MqttConnector.cs b/src/Artemis.Plugins.Mqtt/MqttConnector.cs
index f44757f..0b3eeef 100644
--- a/src/Artemis.Plugins.Mqtt/MqttConnector.cs
+++ b/src/Artemis.Plugins.Mqtt/MqttConnector.cs
@@ -3,9 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using MQTTnet;
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Extensions.ManagedClient;
 
 namespace Artemis.Plugins.Mqtt;
@@ -21,9 +19,9 @@ public sealed class MqttConnector : IDisposable
     public MqttConnector()
     {
         client = clientFactory.CreateManagedMqttClient();
-        client.UseApplicationMessageReceivedHandler(OnClientMessageReceived);
-        client.UseConnectedHandler(OnClientConnected);
-        client.UseDisconnectedHandler(OnClientDisconnected);
+        client.ApplicationMessageReceivedAsync += OnClientMessageReceived;
+        client.ConnectedAsync += OnClientConnected;
+        client.DisconnectedAsync += OnClientDisconnected;
     }
 
     /// <summary>
@@ -92,20 +90,23 @@ public Task Stop()
         return client.StopAsync();
     }
 
-    private void OnClientMessageReceived(MqttApplicationMessageReceivedEventArgs e)
+    private Task OnClientMessageReceived(MqttApplicationMessageReceivedEventArgs e)
     {
         MessageReceived?.Invoke(this, e);
+        return Task.CompletedTask;
     }
 
-    private void OnClientConnected(MqttClientConnectedEventArgs e)
+    private Task OnClientConnected(MqttClientConnectedEventArgs e)
     {
         IsConnected = true;
         Connected?.Invoke(this, e);
+        return Task.CompletedTask;
     }
 
-    private void OnClientDisconnected(MqttClientDisconnectedEventArgs e)
+    private Task OnClientDisconnected(MqttClientDisconnectedEventArgs e)
     {
         IsConnected = false;
         Disconnected?.Invoke(this, e);
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.Plugins.Mqtt/MqttModule.cs b/src/Artemis.Plugins.Mqtt/MqttModule.cs
index a064af6..acc9df4 100644
--- a/src/Artemis.Plugins.Mqtt/MqttModule.cs
+++ b/src/Artemis.Plugins.Mqtt/MqttModule.cs
@@ -8,8 +8,7 @@
 using Artemis.Plugins.Mqtt.DataModels;
 using Artemis.Plugins.Mqtt.DataModels.Dynamic;
 using MQTTnet;
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
+using MQTTnet.Client;
 using Serilog;
 
 namespace Artemis.Plugins.Mqtt;