YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-18 10:26:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Christian
2022-11-13 18:41:28 +01:00
parent 2090b08547
commit 3937aa76e3
8 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClientExtensions.cs
+6 -3
View File
@@ -39,16 +39,19 @@ namespace MQTTnet.Extensions.ManagedClient
return managedMqttClient.EnqueueAsync(applicationMessage);
}
public static Task StopAsync(this IManagedMqttClient managedMqttClient, CancellationToken cancellationToken = default)
public static Task StopAsync(this IManagedMqttClient managedMqttClient, bool isClean = true, CancellationToken cancellationToken = default)
{
if (managedMqttClient == null)
{
throw new ArgumentNullException(nameof(managedMqttClient));
}
return managedMqttClient.StopAsync(new MqttClientDisconnectOptions(), cancellationToken);
return managedMqttClient.StopAsync(new MqttClientDisconnectOptions
{
IsClean = isClean
}, cancellationToken);
}
public static Task SubscribeAsync(this IManagedMqttClient managedMqttClient, MqttTopicFilter topicFilter)
{
if (managedMqttClient == null)
Source/MQTTnet.Extensions.ManagedClient/New/NewManagedMqttClient.cs
+4 -5
View File
@@ -7,7 +7,6 @@ using System.Threading;
using System.Threading.Tasks;
using MQTTnet.Client;
using MQTTnet.Diagnostics;
using MQTTnet.Implementations;
using MQTTnet.Internal;
namespace MQTTnet.Extensions.ManagedClient
@@ -145,7 +144,7 @@ namespace MQTTnet.Extensions.ManagedClient
_workSignal.Set();
return PlatformAbstractionLayer.CompletedTask;
return CompletedTask.Instance;
}
public async Task StopAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken = default)
@@ -183,7 +182,7 @@ namespace MQTTnet.Extensions.ManagedClient
_subscriptionsManager.Subscribe(options);
_workSignal.Set();
return PlatformAbstractionLayer.CompletedTask;
return CompletedTask.Instance;
}
public Task UnsubscribeAsync(MqttClientUnsubscribeOptions options)
@@ -193,7 +192,7 @@ namespace MQTTnet.Extensions.ManagedClient
_subscriptionsManager.Unsubscribe(options);
_workSignal.Set();
return PlatformAbstractionLayer.CompletedTask;
return CompletedTask.Instance;
}
protected override void Dispose(bool disposing)
@@ -208,7 +207,7 @@ namespace MQTTnet.Extensions.ManagedClient
Task OnInternalClientDisconnected(MqttClientDisconnectedEventArgs eventArgs)
{
_workSignal.Set();
return PlatformAbstractionLayer.CompletedTask;
return CompletedTask.Instance;
}
async Task UpdateConnectionStatus(MaintainConnectionResult maintainConnectionResult)