Avoid using obsolete code

.github/workflows/ReleaseNotes.md

@@ -1,4 +1,5 @@
-* [Core] Optimized packet serialization of PUBACK and PUBREC packets for protocol version 5.0.0 (#1939, thanks to @Y-Sindo).
-* [Core] The package inspector is now fully async (#1941).
-* [Client] Added a dedicated exception when the client is not connected (#1954, thanks to @marcpiulachs).
-* [ManagedClient] Added a new event (SubscriptionsChangedAsync) which is fired when a subscription or unsubscription was made (#1894, thanks to @pdufrene).
+* [Client] Exposed the _EndPoint_ type to support other endpoint types (like Unix Domain Sockets) in client options (#1919).
+* [ManagedClient] Added support for intercepting (and cancelling) publish messages (#1915, thanks to @hannasm).
+* [Server] Added new events for delivered and dropped messages (#1866, thanks to @kallayj).
+* [Server] The server will no longer treat a client which is receiving a large payload as alive. The packet must be received completely within the keep alive boundaries (BREAKING CHANGE!, #1883).
+* [Server] Fixed "service not registered" exception in ASP.NET integration (#1889).

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]
 
 env:
-  VERSION: "4.3.4.${{github.run_number}}"
+  VERSION: "4.3.3.${{github.run_number}}"
 
 jobs:
   build:

Samples/ManagedClient/Managed_Client_Subscribe_Samples.cs

@@ -1,87 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// ReSharper disable UnusedType.Global
-// ReSharper disable UnusedMember.Global
-// ReSharper disable InconsistentNaming
-
-using MQTTnet.Client;
-using MQTTnet.Extensions.ManagedClient;
-
-namespace MQTTnet.Samples.ManagedClient;
-
-public sealed class Managed_Client_Subscribe_Samples
-{
-    public static async Task Connect_Client()
-    {
-        /*
-         * This sample creates a simple managed MQTT client and connects to a public broker, subscribe to a topic and verifies subscription result.
-         *
-         * The managed client extends the existing _MqttClient_. It adds the following features.
-         * - Reconnecting when connection is lost.
-         * - Storing pending messages in an internal queue so that an enqueue is possible while the client remains not connected.
-         */
-        
-        var mqttFactory = new MqttFactory();
-        var subscribed = false;
-
-        using (var managedMqttClient = mqttFactory.CreateManagedMqttClient())
-        {
-            var mqttClientOptions = new MqttClientOptionsBuilder()
-                .WithTcpServer("broker.hivemq.com")
-                .Build();
-
-            var managedMqttClientOptions = new ManagedMqttClientOptionsBuilder()
-                .WithClientOptions(mqttClientOptions)
-                .Build();
-
-            await managedMqttClient.StartAsync(managedMqttClientOptions);
-
-            // The application message is not sent. It is stored in an internal queue and
-            // will be sent when the client is connected.
-            await managedMqttClient.EnqueueAsync("Topic", "Payload");
-
-            Console.WriteLine("The managed MQTT client is connected.");
-            
-            // Wait until the queue is fully processed.
-            SpinWait.SpinUntil(() => managedMqttClient.PendingApplicationMessagesCount == 0, 10000);
-            
-            Console.WriteLine($"Pending messages = {managedMqttClient.PendingApplicationMessagesCount}");
-
-            managedMqttClient.SubscriptionsChangedAsync += args => SubscriptionsResultAsync(args, subscribed);
-            await managedMqttClient.SubscribeAsync("Topic").ConfigureAwait(false);
-
-            SpinWait.SpinUntil(() => subscribed, 1000);
-            Console.WriteLine("Subscription properly done");
-        }
-    }
-
-    private static Task SubscriptionsResultAsync(SubscriptionsChangedEventArgs arg, bool subscribed)
-    {
-        foreach (var mqttClientSubscribeResult in arg.SubscribeResult)
-        {
-            Console.WriteLine($"Subscription reason {mqttClientSubscribeResult.ReasonString}");
-            foreach (var item in mqttClientSubscribeResult.Items)
-            {
-                Console.WriteLine($"For topic filter {item.TopicFilter}, result code: {item.ResultCode}");
-
-                if (item.TopicFilter.Topic == "Topic" && item.ResultCode == MqttClientSubscribeResultCode.GrantedQoS0 && !subscribed)
-                {
-                    subscribed = true;
-                }
-            }
-        }
-
-        foreach (var mqttClientUnsubscribeResult in arg.UnsubscribeResult)
-        {
-            Console.WriteLine($"Unsubscription reason {mqttClientUnsubscribeResult.ReasonString}");
-            foreach (var item in mqttClientUnsubscribeResult.Items)
-            {
-                Console.WriteLine($"For topic filter {item.TopicFilter}, result code: {item.ResultCode}");
-            }
-        }
-
-        return Task.CompletedTask;
-    }
-}

Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj

@@ -11,7 +11,6 @@
         <Description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol.</Description>
         <Authors>The contributors of MQTTnet</Authors>
         <PackageId>MQTTnet.AspNetCore</PackageId>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
         <SignAssembly>false</SignAssembly>
         <DelaySign>false</DelaySign>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -38,10 +37,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="True" PackagePath="\" />
-        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
     </ItemGroup>
-
+    
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
@@ -50,11 +51,11 @@
         <DefineConstants>RELEASE;NETSTANDARD2_0</DefineConstants>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.1' ">
+    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' ">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1' and '$(TargetFramework)' != 'net5.0' and '$(TargetFramework)' != 'net6.0' and '$(TargetFramework)' != 'net7.0' ">
         <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.1.0" />
     </ItemGroup>
 

Source/MQTTnet.Extensions.ManagedClient/IManagedMqttClient.cs

@@ -25,8 +25,6 @@ namespace MQTTnet.Extensions.ManagedClient
         
         event Func<ManagedProcessFailedEventArgs, Task> SynchronizingSubscriptionsFailedAsync;
         
-        event Func<SubscriptionsChangedEventArgs, Task> SubscriptionsChangedAsync;
-        
         IMqttClient InternalClient { get; }
         
         bool IsConnected { get; }

Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj

@@ -13,7 +13,6 @@
         <Description>This is an extension library which provides a managed MQTT client with additional features using MQTTnet.</Description>
         <Authors>The contributors of MQTTnet</Authors>
         <PackageId>MQTTnet.Extensions.ManagedClient</PackageId>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
         <SignAssembly>false</SignAssembly>
         <DelaySign>false</DelaySign>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -51,8 +50,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="True" PackagePath="\" />
-        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
     </ItemGroup>
     
     <ItemGroup>

Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClient.cs

@@ -25,8 +25,7 @@ namespace MQTTnet.Extensions.ManagedClient
         readonly AsyncEvent<ConnectingFailedEventArgs> _connectingFailedEvent = new AsyncEvent<ConnectingFailedEventArgs>();
         readonly AsyncEvent<EventArgs> _connectionStateChangedEvent = new AsyncEvent<EventArgs>();
         readonly AsyncEvent<ManagedProcessFailedEventArgs> _synchronizingSubscriptionsFailedEvent = new AsyncEvent<ManagedProcessFailedEventArgs>();
-        readonly AsyncEvent<SubscriptionsChangedEventArgs> _subscriptionsChangedEvent = new AsyncEvent<SubscriptionsChangedEventArgs>();
-
+        
         readonly MqttNetSourceLogger _logger;
         readonly BlockingQueue<ManagedMqttApplicationMessage> _messageQueue = new BlockingQueue<ManagedMqttApplicationMessage>();
 
@@ -134,12 +133,6 @@ namespace MQTTnet.Extensions.ManagedClient
             remove => _synchronizingSubscriptionsFailedEvent.RemoveHandler(value);
         }
 
-        public event Func<SubscriptionsChangedEventArgs, Task> SubscriptionsChangedAsync
-        {
-            add => _subscriptionsChangedEvent.AddHandler(value);
-            remove => _subscriptionsChangedEvent.RemoveHandler(value);
-        }
-
         public IMqttClient InternalClient { get; }
 
         public bool IsConnected => InternalClient.IsConnected;
@@ -379,14 +372,6 @@ namespace MQTTnet.Extensions.ManagedClient
             }
         }
 
-        async Task HandleSubscriptionsResultAsync(SendSubscribeUnsubscribeResult subscribeUnsubscribeResult)
-        {
-            if (_subscriptionsChangedEvent.HasHandlers)
-            {
-                await _subscriptionsChangedEvent.InvokeAsync(new SubscriptionsChangedEventArgs(subscribeUnsubscribeResult.SubscribeResults, subscribeUnsubscribeResult.UnsubscribeResults)).ConfigureAwait(false);
-            }
-        }
-
         async Task MaintainConnectionAsync(CancellationToken cancellationToken)
         {
             try
@@ -488,22 +473,19 @@ namespace MQTTnet.Extensions.ManagedClient
                 if (_reconnectSubscriptions.Any())
                 {
                     topicFilters = new List<MqttTopicFilter>();
-                    SendSubscribeUnsubscribeResult subscribeUnsubscribeResult;
-                    
+
                     foreach (var sub in _reconnectSubscriptions)
                     {
                         topicFilters.Add(sub.Value);
 
                         if (topicFilters.Count == Options.MaxTopicFiltersInSubscribeUnsubscribePackets)
                         {
-                            subscribeUnsubscribeResult = await SendSubscribeUnsubscribe(topicFilters, null).ConfigureAwait(false);
+                            await SendSubscribeUnsubscribe(topicFilters, null).ConfigureAwait(false);
                             topicFilters.Clear();
-                            await HandleSubscriptionsResultAsync(subscribeUnsubscribeResult).ConfigureAwait(false);
                         }
                     }
 
-                    subscribeUnsubscribeResult = await SendSubscribeUnsubscribe(topicFilters, null).ConfigureAwait(false);
-                    await HandleSubscriptionsResultAsync(subscribeUnsubscribeResult).ConfigureAwait(false);
+                    await SendSubscribeUnsubscribe(topicFilters, null).ConfigureAwait(false);
                 }
             }
             catch (Exception exception)
@@ -519,7 +501,6 @@ namespace MQTTnet.Extensions.ManagedClient
             while (await _subscriptionsQueuedSignal.WaitAsync(GetRemainingTime(endTime), cancellationToken).ConfigureAwait(false))
             {
                 List<MqttTopicFilter> subscriptions;
-                SendSubscribeUnsubscribeResult subscribeUnsubscribeResult;
                 HashSet<string> unsubscriptions;
 
                 lock (_subscriptions)
@@ -555,14 +536,12 @@ namespace MQTTnet.Extensions.ManagedClient
 
                     if (addedTopicFilters.Count == Options.MaxTopicFiltersInSubscribeUnsubscribePackets)
                     {
-                        subscribeUnsubscribeResult = await SendSubscribeUnsubscribe(addedTopicFilters, null).ConfigureAwait(false);
+                        await SendSubscribeUnsubscribe(addedTopicFilters, null).ConfigureAwait(false);
                         addedTopicFilters.Clear();
-                        await HandleSubscriptionsResultAsync(subscribeUnsubscribeResult).ConfigureAwait(false);
                     }
                 }
-                
-                subscribeUnsubscribeResult = await SendSubscribeUnsubscribe(addedTopicFilters, null).ConfigureAwait(false);
-                await HandleSubscriptionsResultAsync(subscribeUnsubscribeResult).ConfigureAwait(false);
+
+                await SendSubscribeUnsubscribe(addedTopicFilters, null).ConfigureAwait(false);
 
                 var removedTopicFilters = new List<string>();
                 foreach (var unSub in unsubscriptions)
@@ -571,14 +550,12 @@ namespace MQTTnet.Extensions.ManagedClient
 
                     if (removedTopicFilters.Count == Options.MaxTopicFiltersInSubscribeUnsubscribePackets)
                     {
-                        subscribeUnsubscribeResult = await SendSubscribeUnsubscribe(null, removedTopicFilters).ConfigureAwait(false);
+                        await SendSubscribeUnsubscribe(null, removedTopicFilters).ConfigureAwait(false);
                         removedTopicFilters.Clear();
-                        await HandleSubscriptionsResultAsync(subscribeUnsubscribeResult).ConfigureAwait(false);
                     }
                 }
 
-                subscribeUnsubscribeResult = await SendSubscribeUnsubscribe(null, removedTopicFilters).ConfigureAwait(false);
-                await HandleSubscriptionsResultAsync(subscribeUnsubscribeResult).ConfigureAwait(false);
+                await SendSubscribeUnsubscribe(null, removedTopicFilters).ConfigureAwait(false);
             }
         }
 
@@ -611,10 +588,8 @@ namespace MQTTnet.Extensions.ManagedClient
             }
         }
 
-        async Task<SendSubscribeUnsubscribeResult> SendSubscribeUnsubscribe(List<MqttTopicFilter> addedSubscriptions, List<string> removedSubscriptions)
+        async Task SendSubscribeUnsubscribe(List<MqttTopicFilter> addedSubscriptions, List<string> removedSubscriptions)
         {
-            var subscribeResults = new List<MqttClientSubscribeResult>();
-            var unsubscribeResults = new List<MqttClientUnsubscribeResult>();
             try
             {
                 if (removedSubscriptions != null && removedSubscriptions.Any())
@@ -626,8 +601,7 @@ namespace MQTTnet.Extensions.ManagedClient
                         unsubscribeOptionsBuilder.WithTopicFilter(removedSubscription);
                     }
 
-                    var unsubscribeResult = await InternalClient.UnsubscribeAsync(unsubscribeOptionsBuilder.Build()).ConfigureAwait(false);
-                    unsubscribeResults.Add(unsubscribeResult);
+                    await InternalClient.UnsubscribeAsync(unsubscribeOptionsBuilder.Build()).ConfigureAwait(false);
 
                     //clear because these worked, maybe the subscribe below will fail, only report those
                     removedSubscriptions.Clear();
@@ -642,16 +616,13 @@ namespace MQTTnet.Extensions.ManagedClient
                         subscribeOptionsBuilder.WithTopicFilter(addedSubscription);
                     }
 
-                    var subscribeResult = await InternalClient.SubscribeAsync(subscribeOptionsBuilder.Build()).ConfigureAwait(false);
-                    subscribeResults.Add(subscribeResult);
+                    await InternalClient.SubscribeAsync(subscribeOptionsBuilder.Build()).ConfigureAwait(false);
                 }
             }
             catch (Exception exception)
             {
                 await HandleSubscriptionExceptionAsync(exception, addedSubscriptions, removedSubscriptions).ConfigureAwait(false);
             }
-
-            return new SendSubscribeUnsubscribeResult(subscribeResults, unsubscribeResults);
         }
 
         void StartPublishing()

Source/MQTTnet.Extensions.ManagedClient/SendSubscribeUnsubscribeResult.cs

@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using MQTTnet.Client;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class SendSubscribeUnsubscribeResult
-    {
-        public SendSubscribeUnsubscribeResult(List<MqttClientSubscribeResult> subscribeResults, List<MqttClientUnsubscribeResult> unsubscribeResults)
-        {
-            SubscribeResults = subscribeResults ?? throw new ArgumentNullException(nameof(subscribeResults));
-            UnsubscribeResults = unsubscribeResults ?? throw new ArgumentNullException(nameof(unsubscribeResults));
-        }
-        
-        public List<MqttClientSubscribeResult> SubscribeResults { get; private set; }
-        
-        public List<MqttClientUnsubscribeResult> UnsubscribeResults { get; private set; }
-    }
-}

Source/MQTTnet.Extensions.ManagedClient/SubscriptionsChangedEventArgs.cs

@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using MQTTnet.Client;
-using System;
-using System.Collections.Generic;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class SubscriptionsChangedEventArgs : EventArgs
-    {
-        public SubscriptionsChangedEventArgs(List<MqttClientSubscribeResult> subscribeResult, List<MqttClientUnsubscribeResult> unsubscribeResult)
-        {
-            SubscribeResult = subscribeResult ?? throw new ArgumentNullException(nameof(subscribeResult));
-            UnsubscribeResult = unsubscribeResult ?? throw new ArgumentNullException(nameof(unsubscribeResult));
-        }
-
-        public List<MqttClientSubscribeResult> SubscribeResult { get; }
-
-        public List<MqttClientUnsubscribeResult> UnsubscribeResult { get; }
-    }
-}

Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj

@@ -13,7 +13,6 @@
         <Description>This is an extension library which allows executing synchronous device calls including a response using MQTTnet.</Description>
         <Authors>The contributors of MQTTnet</Authors>
         <PackageId>MQTTnet.Extensions.Rpc</PackageId>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
         <SignAssembly>false</SignAssembly>
         <DelaySign>false</DelaySign>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -52,8 +51,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="True" PackagePath="\" />
-        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
     </ItemGroup>
     
     <ItemGroup>

Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj

@@ -13,7 +13,6 @@
         <Description>This is an extension library which allows using _WebSocket4Net_ as transport for MQTTnet clients.</Description>
         <Authors>The contributors of MQTTnet</Authors>
         <PackageId>MQTTnet.Extensions.WebSocket4Net</PackageId>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
         <SignAssembly>false</SignAssembly>
         <DelaySign>false</DelaySign>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -52,8 +51,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="True" PackagePath="\" />
-        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
     </ItemGroup>
     
     <ItemGroup>

Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs

@@ -76,7 +76,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
             List<KeyValuePair<string, string>> customHeaders = null;
             if (_webSocketOptions.RequestHeaders != null)
             {
-                customHeaders = _webSocketOptions.RequestHeaders.ToList();
+                customHeaders = _webSocketOptions.RequestHeaders.Select(i => new KeyValuePair<string, string>(i.Key, i.Value)).ToList();
             }
 
             EndPoint proxy = null;

Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Connection_Tests.cs

@@ -65,7 +65,7 @@ namespace MQTTnet.Tests.Clients.MqttClient
                         return CompletedTask.Instance;
                     };
 
-                    await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("127.0.0.1").Build());
+                    await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("1.2.3.4").Build());
 
                     Assert.Fail("Must fail!");
                 }
@@ -175,7 +175,7 @@ namespace MQTTnet.Tests.Clients.MqttClient
                 testEnvironment.IgnoreClientLogErrors = true;
 
                 var client = testEnvironment.CreateClient();
-                var options = new MqttClientOptionsBuilder().WithTcpServer("1.2.3.4").WithTimeout(TimeSpan.FromSeconds(2)).Build();
+                var options = new MqttClientOptionsBuilder().WithTcpServer("127.0.0.1").WithTimeout(TimeSpan.FromSeconds(2)).Build();
 
                 try
                 {
@@ -240,9 +240,9 @@ namespace MQTTnet.Tests.Clients.MqttClient
                     await mqttClient.SubscribeAsync("test", MqttQualityOfServiceLevel.AtLeastOnce);
                 }
             }
-            catch (MqttClientNotConnectedException exception)
+            catch (MqttCommunicationException exception)
             {
-                if (exception.Message == "The MQTT client is not connected.")
+                if (exception.Message == "The client is not connected.")
                 {
                     return;
                 }

Source/MQTTnet/Adapter/MqttChannelAdapter.cs

@@ -141,8 +141,7 @@ namespace MQTTnet.Adapter
 
             try
             {
-                var localPacketInspector = PacketInspector;
-                localPacketInspector?.BeginReceivePacket();
+                PacketInspector?.BeginReceivePacket();
 
                 ReceivedMqttPacket receivedPacket;
                 var receivedPacketTask = ReceiveAsync(cancellationToken);
@@ -160,10 +159,7 @@ namespace MQTTnet.Adapter
                     return null;
                 }
 
-                if (localPacketInspector != null)
-                {
-                    await localPacketInspector.EndReceivePacket().ConfigureAwait(false);
-                }
+                PacketInspector?.EndReceivePacket();
 
                 Interlocked.Add(ref _statistics._bytesSent, receivedPacket.TotalLength);
 
@@ -219,13 +215,8 @@ namespace MQTTnet.Adapter
                 try
                 {
                     var packetBuffer = PacketFormatterAdapter.Encode(packet);
+                    PacketInspector?.BeginSendPacket(packetBuffer);
 
-                    var localPacketInspector = PacketInspector;
-                    if (localPacketInspector != null)
-                    {
-                        await localPacketInspector.BeginSendPacket(packetBuffer).ConfigureAwait(false);    
-                    }
-                    
                     _logger.Verbose("TX ({0} bytes) >>> {1}", packetBuffer.Length, packet);
 
                     if (packetBuffer.Payload.Count == 0 || !AllowPacketFragmentation)

Source/MQTTnet/Adapter/MqttPacketInspector.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.IO;
-using System.Threading.Tasks;
 using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Internal;
@@ -13,20 +12,16 @@ namespace MQTTnet.Adapter
 {
     public sealed class MqttPacketInspector
     {
-        readonly AsyncEvent<InspectMqttPacketEventArgs> _asyncEvent;
         readonly MqttNetSourceLogger _logger;
-
+        readonly AsyncEvent<InspectMqttPacketEventArgs> _asyncEvent;
+        
         MemoryStream _receivedPacketBuffer;
-
+        
         public MqttPacketInspector(AsyncEvent<InspectMqttPacketEventArgs> asyncEvent, IMqttNetLogger logger)
         {
             _asyncEvent = asyncEvent ?? throw new ArgumentNullException(nameof(asyncEvent));
-
-            if (logger == null)
-            {
-                throw new ArgumentNullException(nameof(logger));
-            }
-
+            
+            if (logger == null) throw new ArgumentNullException(nameof(logger));
             _logger = logger.WithSource(nameof(MqttPacketInspector));
         }
 
@@ -41,15 +36,28 @@ namespace MQTTnet.Adapter
             {
                 _receivedPacketBuffer = new MemoryStream();
             }
-
+            
             _receivedPacketBuffer?.SetLength(0);
         }
 
-        public Task BeginSendPacket(MqttPacketBuffer buffer)
+        public void EndReceivePacket()
         {
             if (!_asyncEvent.HasHandlers)
             {
-                return CompletedTask.Instance;
+                return;
+            }
+
+            var buffer = _receivedPacketBuffer.ToArray();
+            _receivedPacketBuffer.SetLength(0);
+
+            InspectPacket(buffer, MqttPacketFlowDirection.Inbound);
+        }
+
+        public void BeginSendPacket(MqttPacketBuffer buffer)
+        {
+            if (!_asyncEvent.HasHandlers)
+            {
+                return;
             }
 
             // Create a copy of the actual packet so that the inspector gets no access
@@ -57,20 +65,7 @@ namespace MQTTnet.Adapter
             // intended for debugging etc. so that this is OK.
             var bufferCopy = buffer.ToArray();
 
-            return InspectPacket(bufferCopy, MqttPacketFlowDirection.Outbound);
-        }
-
-        public Task EndReceivePacket()
-        {
-            if (!_asyncEvent.HasHandlers)
-            {
-                return CompletedTask.Instance;
-            }
-
-            var buffer = _receivedPacketBuffer.ToArray();
-            _receivedPacketBuffer.SetLength(0);
-
-            return InspectPacket(buffer, MqttPacketFlowDirection.Inbound);
+            InspectPacket(bufferCopy, MqttPacketFlowDirection.Outbound);
         }
 
         public void FillReceiveBuffer(byte[] buffer)
@@ -79,16 +74,16 @@ namespace MQTTnet.Adapter
             {
                 return;
             }
-
+            
             _receivedPacketBuffer?.Write(buffer, 0, buffer.Length);
         }
 
-        async Task InspectPacket(byte[] buffer, MqttPacketFlowDirection direction)
+        void InspectPacket(byte[] buffer, MqttPacketFlowDirection direction)
         {
             try
             {
                 var eventArgs = new InspectMqttPacketEventArgs(direction, buffer);
-                await _asyncEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
+                _asyncEvent.InvokeAsync(eventArgs).GetAwaiter().GetResult();
             }
             catch (Exception exception)
             {

Source/MQTTnet/Client/MqttClient.cs

@@ -930,7 +930,7 @@ namespace MQTTnet.Client
 
         static void ThrowNotConnected()
         {
-            throw new MqttClientNotConnectedException();
+            throw new MqttCommunicationException("The client is not connected.");
         }
 
         void TryInitiateDisconnect()

Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs

@@ -18,14 +18,14 @@ namespace MQTTnet.Client
     public sealed class MqttClientOptionsBuilder
     {
         readonly MqttClientOptions _options = new MqttClientOptions();
+        int? _port;
 
         [Obsolete] MqttClientWebSocketProxyOptions _proxyOptions;
+        EndPoint _remoteEndPoint;
 
         MqttClientTcpOptions _tcpOptions;
         MqttClientTlsOptions _tlsOptions;
-        EndPoint _remoteEndPoint;
-        int? _port;
-        
+
         [Obsolete] MqttClientOptionsBuilderTlsParameters _tlsParameters;
 
         MqttClientWebSocketOptions _webSocketOptions;
@@ -89,7 +89,7 @@ namespace MQTTnet.Client
 
                 if (_tcpOptions.RemoteEndpoint == null)
                 {
-                    _tcpOptions.RemoteEndpoint = _remoteEndPoint;    
+                    _tcpOptions.RemoteEndpoint = _remoteEndPoint;
                 }
             }
             else if (_webSocketOptions != null)
@@ -145,7 +145,6 @@ namespace MQTTnet.Client
             return this;
         }
 
-        [Obsolete("Use WithTcpServer(... configure) or WithWebSocketServer(... configure) instead.")]
         public MqttClientOptionsBuilder WithConnectionUri(Uri uri)
         {
             if (uri == null)
@@ -158,24 +157,33 @@ namespace MQTTnet.Client
             {
                 case "tcp":
                 case "mqtt":
+                {
                     WithTcpServer(uri.Host, port);
                     break;
+                }
 
                 case "mqtts":
+                {
                     WithTcpServer(uri.Host, port)
                         .WithTlsOptions(
                             o =>
                             {
+                                o.UseTls();
                             });
                     break;
+                }
 
                 case "ws":
                 case "wss":
+                {
                     WithWebSocketServer(o => o.WithUri(uri.ToString()));
                     break;
+                }
 
                 default:
-                    throw new ArgumentException("Unexpected scheme in uri.");
+                {
+                    throw new ArgumentException("Unexpected scheme in URI.");
+                }
             }
 
             if (!string.IsNullOrEmpty(uri.UserInfo))
@@ -189,7 +197,6 @@ namespace MQTTnet.Client
             return this;
         }
 
-        [Obsolete("Use WithTcpServer(... configure) or WithWebSocketServer(... configure) instead.")]
         public MqttClientOptionsBuilder WithConnectionUri(string uri)
         {
             return WithConnectionUri(new Uri(uri, UriKind.Absolute));
@@ -218,6 +225,14 @@ namespace MQTTnet.Client
             return this;
         }
 
+        public MqttClientOptionsBuilder WithEndPoint(EndPoint endPoint)
+        {
+            _remoteEndPoint = endPoint ?? throw new ArgumentNullException(nameof(endPoint));
+            _tcpOptions = new MqttClientTcpOptions();
+
+            return this;
+        }
+
         public MqttClientOptionsBuilder WithExtendedAuthenticationExchangeHandler(IMqttExtendedAuthenticationExchangeHandler handler)
         {
             _options.ExtendedAuthenticationExchangeHandler = handler;
@@ -344,14 +359,6 @@ namespace MQTTnet.Client
 
             return this;
         }
-        
-        public MqttClientOptionsBuilder WithEndPoint(EndPoint endPoint)
-        {
-            _remoteEndPoint = endPoint ?? throw new ArgumentNullException(nameof(endPoint));
-            _tcpOptions = new MqttClientTcpOptions();
-
-            return this;
-        }
 
         public MqttClientOptionsBuilder WithTcpServer(Action<MqttClientTcpOptions> optionsBuilder)
         {

Source/MQTTnet/Exceptions/MqttClientNotConnectedException.cs

@@ -1,19 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-namespace MQTTnet.Exceptions
-{
-    public class MqttClientNotConnectedException : MqttCommunicationException
-    {
-        public MqttClientNotConnectedException() : base("The MQTT client is not connected.")
-        {
-        }
-
-        public MqttClientNotConnectedException(Exception innerException) : base("The MQTT client is not connected.", innerException)
-        {
-        }
-    }
-}

Source/MQTTnet/Formatter/V5/MqttV5PacketEncoder.cs

@@ -279,7 +279,7 @@ namespace MQTTnet.Formatter.V5
             _propertiesWriter.WriteReasonString(packet.ReasonString);
             _propertiesWriter.WriteUserProperties(packet.UserProperties);
 
-            if (_propertiesWriter.Length > 0 || packet.ReasonCode != MqttPubAckReasonCode.Success)
+            if (_bufferWriter.Length > 0 || packet.ReasonCode != MqttPubAckReasonCode.Success)
             {
                 _bufferWriter.WriteByte((byte)packet.ReasonCode);
                 _propertiesWriter.WriteTo(_bufferWriter);
@@ -375,7 +375,7 @@ namespace MQTTnet.Formatter.V5
 
             _bufferWriter.WriteTwoByteInteger(packet.PacketIdentifier);
 
-            if (_propertiesWriter.Length > 0 || packet.ReasonCode != MqttPubRecReasonCode.Success)
+            if (_bufferWriter.Length > 0 || packet.ReasonCode != MqttPubRecReasonCode.Success)
             {
                 _bufferWriter.WriteByte((byte)packet.ReasonCode);
                 _propertiesWriter.WriteTo(_bufferWriter);
@@ -534,4 +534,4 @@ namespace MQTTnet.Formatter.V5
             }
         }
     }
-}
+}

Source/MQTTnet/MQTTnet.csproj

@@ -23,7 +23,6 @@
         <Description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol.</Description>
         <Authors>The contributors of MQTTnet</Authors>
         <PackageId>MQTTnet</PackageId>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
         <DelaySign>false</DelaySign>
         <SignAssembly>false</SignAssembly>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -70,8 +69,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="True" PackagePath="\" />
-        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
     </ItemGroup>
 
     <ItemGroup>