Merge branch 'master' into 1547-use-mqttclientdefaultcertificatevalidationhandlerhandle-by-default

MQTTnet.sln.DotSettings

@@ -243,6 +243,5 @@ See the LICENSE file in the project root for more information.</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGREQ/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGRESP/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBCOMP/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBREC/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Tnet/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unsub/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Samples/Diagnostics/PackageInspection_Samples.cs

@@ -26,7 +26,7 @@ public static class PackageInspection_Samples
                 .WithTcpServer("broker.hivemq.com")
                 .Build();
             
-            mqttClient.InspectPackageAsync += OnInspectPackage;
+            mqttClient.InspectPackage += OnInspectPackage;
             
             await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
             

Source/MQTTnet.Tests/Diagnostics/PacketInspection_Tests.cs

@@ -30,7 +30,7 @@ namespace MQTTnet.Tests.Diagnostics
 
                     var packets = new List<string>();
                     
-                    mqttClient.InspectPackageAsync += eventArgs =>
+                    mqttClient.InspectPackage += eventArgs =>
                     {
                         packets.Add(eventArgs.Direction + ":" + Convert.ToBase64String(eventArgs.Buffer));
                         return CompletedTask.Instance;

Source/MQTTnet.Tests/Server/General.cs

@@ -954,7 +954,7 @@ namespace MQTTnet.Tests.Server
 
                 var client = testEnvironment.CreateClient();
 
-                client.InspectPackageAsync += e =>
+                client.InspectPackage += e =>
                 {
                     if (e.Buffer.Length > 0)
                     {

Source/MQTTnet/Client/IMqttClient.cs

@@ -8,16 +8,14 @@ namespace MQTTnet.Client
     public interface IMqttClient : IDisposable
     {
         event Func<MqttApplicationMessageReceivedEventArgs, Task> ApplicationMessageReceivedAsync;
-
-        event Func<MqttClientBeforeReleasePublishPacketEventArgs, Task> BeforeReleasePublishPacketAsync;
-
+        
         event Func<MqttClientConnectedEventArgs, Task> ConnectedAsync;
 
         event Func<MqttClientConnectingEventArgs, Task> ConnectingAsync;
 
         event Func<MqttClientDisconnectedEventArgs, Task> DisconnectedAsync;
 
-        event Func<InspectMqttPacketEventArgs, Task> InspectPackageAsync;
+        event Func<InspectMqttPacketEventArgs, Task> InspectPackage;
 
         bool IsConnected { get; }
 
@@ -31,8 +29,6 @@ namespace MQTTnet.Client
 
         Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken = default);
 
-        Task<MqttClientReleasePublishPacketResult> ReleasePublishPacketAsync(MqttClientReleasePublishPacketOptions options, CancellationToken cancellationToken = default);
-
         Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken = default);
 
         Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken = default);

Source/MQTTnet/Client/MqttClient.cs

@@ -21,7 +21,6 @@ namespace MQTTnet.Client
         readonly IMqttClientAdapterFactory _adapterFactory;
         readonly MqttApplicationMessageFactory _applicationMessageFactory = new MqttApplicationMessageFactory();
         readonly AsyncEvent<MqttApplicationMessageReceivedEventArgs> _applicationMessageReceivedEvent = new AsyncEvent<MqttApplicationMessageReceivedEventArgs>();
-        readonly AsyncEvent<MqttClientBeforeReleasePublishPacketEventArgs> _beforeReleasePublishPacketEvent = new AsyncEvent<MqttClientBeforeReleasePublishPacketEventArgs>();
 
         readonly MqttClientPublishResultFactory _clientPublishResultFactory = new MqttClientPublishResultFactory();
         readonly MqttClientSubscribeResultFactory _clientSubscribeResultFactory = new MqttClientSubscribeResultFactory();
@@ -64,12 +63,6 @@ namespace MQTTnet.Client
             remove => _applicationMessageReceivedEvent.RemoveHandler(value);
         }
 
-        public event Func<MqttClientBeforeReleasePublishPacketEventArgs, Task> BeforeReleasePublishPacketAsync
-        {
-            add => _beforeReleasePublishPacketEvent.AddHandler(value);
-            remove => _beforeReleasePublishPacketEvent.RemoveHandler(value);
-        }
-
         public event Func<MqttClientConnectedEventArgs, Task> ConnectedAsync
         {
             add => _connectedEvent.AddHandler(value);
@@ -88,12 +81,12 @@ namespace MQTTnet.Client
             remove => _disconnectedEvent.RemoveHandler(value);
         }
 
-        public event Func<InspectMqttPacketEventArgs, Task> InspectPackageAsync
+        public event Func<InspectMqttPacketEventArgs, Task> InspectPackage
         {
             add => _inspectPacketEvent.AddHandler(value);
             remove => _inspectPacketEvent.RemoveHandler(value);
         }
-
+        
         public bool IsConnected => (MqttClientConnectionStatus)_connectionStatus == MqttClientConnectionStatus.Connected;
 
         public MqttClientOptions Options { get; private set; }
@@ -156,7 +149,17 @@ namespace MQTTnet.Client
 
                 _lastPacketSentTimestamp = DateTime.UtcNow;
 
-                SetupKeepAliveHandling(connectResult, _backgroundCancellationTokenSource.Token);
+                var keepAliveInterval = Options.KeepAlivePeriod;
+                if (connectResult.ServerKeepAlive > 0)
+                {
+                    _logger.Info($"Using keep alive value ({connectResult.ServerKeepAlive}) sent from the server.");
+                    keepAliveInterval = TimeSpan.FromSeconds(connectResult.ServerKeepAlive);
+                }
+
+                if (keepAliveInterval != TimeSpan.Zero)
+                {
+                    _keepAlivePacketsSenderTask = Task.Run(() => TrySendKeepAliveMessagesAsync(backgroundCancellationToken), backgroundCancellationToken);
+                }
 
                 CompareExchangeConnectionStatus(MqttClientConnectionStatus.Connected, MqttClientConnectionStatus.Connecting);
 
@@ -231,11 +234,6 @@ namespace MQTTnet.Client
 
         public Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken = default)
         {
-            if (applicationMessage == null)
-            {
-                throw new ArgumentNullException(nameof(applicationMessage));
-            }
-
             cancellationToken.ThrowIfCancellationRequested();
 
             MqttTopicValidator.ThrowIfInvalid(applicationMessage);
@@ -266,51 +264,6 @@ namespace MQTTnet.Client
             }
         }
 
-        public async Task<MqttClientReleasePublishPacketResult> ReleasePublishPacketAsync(
-            MqttClientReleasePublishPacketOptions options,
-            CancellationToken cancellationToken = default)
-        {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            ThrowIfDisposed();
-            ThrowIfNotConnected();
-
-            if (options.PacketIdentifier == 0)
-            {
-                throw new MqttProtocolViolationException("Releasing a PUBLISH packet requires a valid packet identifier.");
-            }
-
-            if (Options.AutoReleasePublishPackets)
-            {
-                throw new InvalidOperationException("Manually releasing PUBLISH packets requires the feature _AutoReleasePublishPackets_ disabled in the client options.");
-            }
-
-            var eventArgs = new MqttClientBeforeReleasePublishPacketEventArgs(options.PacketIdentifier);
-            await _beforeReleasePublishPacketEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
-            
-            var pubRelPacket = _packetFactories.PubRel.Create(options);
-                
-            MqttPubCompPacket pubCompPacket;
-            if (cancellationToken.CanBeCanceled)
-            {
-                pubCompPacket = await SendAndReceiveAsync<MqttPubCompPacket>(pubRelPacket, cancellationToken).ConfigureAwait(false);
-            }
-            else
-            {
-                using (var timeout = new CancellationTokenSource(Options.Timeout))
-                {
-                    pubCompPacket = await SendAndReceiveAsync<MqttPubCompPacket>(pubRelPacket, timeout.Token).ConfigureAwait(false);
-                }
-            }
-
-            return new MqttClientReleasePublishPacketResult(pubCompPacket.PacketIdentifier, pubCompPacket.ReasonString, pubCompPacket.UserProperties);
-        }
-
         public Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken = default)
         {
             if (data == null)
@@ -458,7 +411,7 @@ namespace MQTTnet.Client
 
                 _adapter?.Dispose();
                 _adapter = null;
-
+                
                 _packetDispatcher?.Dispose();
                 _packetDispatcher = null;
             }
@@ -495,7 +448,7 @@ namespace MQTTnet.Client
             try
             {
                 _packetDispatcher.Dispose(new MqttClientDisconnectedException(exception));
-
+                
                 var receiverTask = WaitForTaskAsync(_packetReceiverTask, sender);
                 var publishPacketReceiverTask = WaitForTaskAsync(_publishPacketReceiverTask, sender);
                 var keepAliveTask = WaitForTaskAsync(_keepAlivePacketsSenderTask, sender);
@@ -551,12 +504,9 @@ namespace MQTTnet.Client
                 {
                     case MqttClientConnectionStatus.Disconnected:
                     case MqttClientConnectionStatus.Disconnecting:
-                    {
                         return true;
-                    }
                     case MqttClientConnectionStatus.Connected:
                     case MqttClientConnectionStatus.Connecting:
-                    {
                         // This will compare the _connectionStatus to old value and set it to "MqttClientConnectionStatus.Disconnecting" afterwards.
                         // So the first caller will get a "false" and all subsequent ones will get "true".
                         var curStatus = CompareExchangeConnectionStatus(MqttClientConnectionStatus.Disconnecting, connectionStatus);
@@ -567,7 +517,6 @@ namespace MQTTnet.Client
 
                         connectionStatus = curStatus;
                         break;
-                    }
                 }
             } while (true);
         }
@@ -652,7 +601,7 @@ namespace MQTTnet.Client
             {
                 // The packet is unknown. Probably due to a restart of the client.
                 // So wen send this to the server to trigger a full resend of the message.
-                var pubRelPacket = _packetFactories.PubRel.Create(pubRecPacket, MqttPubRelReasonCode.PacketIdentifierNotFound);
+                var pubRelPacket = _packetFactories.PubRel.Create(pubRecPacket, MqttApplicationMessageReceivedReasonCode.PacketIdentifierNotFound);
                 return SendAsync(pubRelPacket, cancellationToken);
             }
 
@@ -679,7 +628,7 @@ namespace MQTTnet.Client
             // No packet identifier is used for QoS 0 [3.3.2.2 Packet Identifier]
             await SendAsync(publishPacket, cancellationToken).ConfigureAwait(false);
 
-            return _clientPublishResultFactory.Create((MqttPubAckPacket)null);
+            return _clientPublishResultFactory.Create(null);
         }
 
         async Task<MqttClientPublishResult> PublishExactlyOnceAsync(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
@@ -688,16 +637,10 @@ namespace MQTTnet.Client
 
             var pubRecPacket = await SendAndReceiveAsync<MqttPubRecPacket>(publishPacket, cancellationToken).ConfigureAwait(false);
 
-            if (!Options.AutoReleasePublishPackets)
-            {
-                return _clientPublishResultFactory.Create(pubRecPacket);
-            }
+            var pubRelPacket = _packetFactories.PubRel.Create(pubRecPacket, MqttApplicationMessageReceivedReasonCode.Success);
 
-            var eventArgs = new MqttClientBeforeReleasePublishPacketEventArgs(pubRecPacket.PacketIdentifier);
-            await _beforeReleasePublishPacketEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
-            
-            var pubRelPacket = _packetFactories.PubRel.Create(pubRecPacket, MqttPubRelReasonCode.Success);
             var pubCompPacket = await SendAndReceiveAsync<MqttPubCompPacket>(pubRelPacket, cancellationToken).ConfigureAwait(false);
+
             return _clientPublishResultFactory.Create(pubRecPacket, pubCompPacket);
         }
 
@@ -748,32 +691,6 @@ namespace MQTTnet.Client
             return _adapter.SendPacketAsync(packet, cancellationToken);
         }
 
-        void SetupKeepAliveHandling(MqttClientConnectResult connectResult, CancellationToken cancellationToken)
-        {
-            if (Options.UseExternalKeepAliveManagement)
-            {
-                _logger.Info("Using external keep alive management.");
-                return;
-            }
-
-            var keepAliveInterval = Options.KeepAlivePeriod;
-
-            if (connectResult.ServerKeepAlive > 0)
-            {
-                _logger.Info("Using keep alive value {0} sent from the server.", connectResult.ServerKeepAlive);
-                keepAliveInterval = TimeSpan.FromSeconds(connectResult.ServerKeepAlive);
-            }
-
-            if (keepAliveInterval != TimeSpan.Zero)
-            {
-                _keepAlivePacketsSenderTask = Task.Factory.StartNew(
-                    () => TrySendKeepAliveMessagesAsync(cancellationToken),
-                    cancellationToken,
-                    TaskCreationOptions.PreferFairness,
-                    TaskScheduler.Default);
-            }
-        }
-
         void ThrowIfConnected(string message)
         {
             if (IsConnected)
@@ -916,7 +833,7 @@ namespace MQTTnet.Client
                 {
                     exception = aggregateException.GetBaseException();
                 }
-
+                
                 if (exception is OperationCanceledException)
                 {
                 }

Source/MQTTnet/Client/MqttClientExtensions.cs

@@ -80,23 +80,6 @@ namespace MQTTnet.Client
             return client.ConnectAsync(client.Options, cancellationToken);
         }
 
-        public static Task<MqttClientReleasePublishPacketResult> ReleasePublishPacketAsync(
-            this IMqttClient mqttClient,
-            ushort packetIdentifier,
-            string reasonString = null,
-            List<MqttUserProperty> userProperties = null,
-            CancellationToken cancellationToken = default)
-        {
-            var options = new MqttClientReleasePublishPacketOptions
-            {
-                PacketIdentifier = packetIdentifier,
-                ReasonString = reasonString,
-                UserProperties = userProperties
-            };
-
-            return mqttClient.ReleasePublishPacketAsync(options, cancellationToken);
-        }
-
         public static Task SendExtendedAuthenticationExchangeDataAsync(this IMqttClient client, MqttExtendedAuthenticationExchangeData data)
         {
             if (client == null)

Source/MQTTnet/Client/Options/MqttClientCertificateValidationEventArgs.cs

@@ -10,12 +10,20 @@ namespace MQTTnet.Client
 {
     public sealed class MqttClientCertificateValidationEventArgs : EventArgs
     {
-        public X509Certificate Certificate { get; set; }
+        public MqttClientCertificateValidationEventArgs(X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors, IMqttClientChannelOptions clientOptions)
+        {
+            Certificate = certificate ?? throw new ArgumentNullException(nameof(certificate));
+            Chain = chain ?? throw new ArgumentNullException(nameof(chain));
+            SslPolicyErrors = sslPolicyErrors;
+            ClientOptions = clientOptions ?? throw new ArgumentNullException(nameof(clientOptions));
+        }
 
-        public X509Chain Chain { get; set; }
+        public X509Certificate Certificate { get; }
 
-        public SslPolicyErrors SslPolicyErrors { get; set; }
+        public X509Chain Chain { get; }
 
-        public IMqttClientChannelOptions ClientOptions { get; set; }
+        public IMqttClientChannelOptions ClientOptions { get; }
+
+        public SslPolicyErrors SslPolicyErrors { get; }
     }
-}
+}

Source/MQTTnet/Client/Options/MqttClientDefaultCertificateValidationHandler.cs

@@ -12,11 +12,18 @@ namespace MQTTnet.Client
     {
         public static bool Handle(MqttClientCertificateValidationEventArgs eventArgs)
         {
-            if (eventArgs.SslPolicyErrors == SslPolicyErrors.None)
+            var sslPolicyErrors = eventArgs.SslPolicyErrors;
+            
+            if (eventArgs.ClientOptions?.TlsOptions?.IgnoreCertificateChainErrors ?? false)
+            {
+                sslPolicyErrors &= ~SslPolicyErrors.RemoteCertificateChainErrors;
+            }
+            
+            if (sslPolicyErrors == SslPolicyErrors.None)
             {
                 return true;
             }
-
+            
             if (eventArgs.Chain.ChainStatus.Any(c =>
                     c.Status == X509ChainStatusFlags.RevocationStatusUnknown || c.Status == X509ChainStatusFlags.Revoked || c.Status == X509ChainStatusFlags.OfflineRevocation))
             {

Source/MQTTnet/Client/Options/MqttClientOptions.cs

@@ -24,11 +24,6 @@ namespace MQTTnet.Client
         /// </summary>
         public string AuthenticationMethod { get; set; }
 
-        /// <summary>
-        ///     Gets or sets whether PUBLISH packets with QoS level 2 should be released automatically.
-        /// </summary>
-        public bool AutoReleasePublishPackets { get; set; } = true;
-
         public IMqttClientChannelOptions ChannelOptions { get; set; }
 
         /// <summary>
@@ -113,14 +108,6 @@ namespace MQTTnet.Client
         /// </summary>
         public bool TryPrivate { get; set; } = true;
 
-        /// <summary>
-        ///     Gets or sets whether the sending of keep alive packets (PINGREQ, PINGRESP) is handled externally (False by
-        ///     default).
-        ///     If set to true the user of this library must make sure that PINGREQ packets are sent according to the sent keep
-        ///     alive interval.
-        /// </summary>
-        public bool UseExternalKeepAliveManagement { get; set; }
-
         /// <summary>
         ///     Gets or sets the user properties.
         ///     In MQTT 5, user properties are basic UTF-8 string key-value pairs that you can append to almost every type of MQTT

Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs

@@ -13,8 +13,8 @@ namespace MQTTnet.Client
     public sealed class MqttClientOptionsBuilderTlsParameters
     {
         public bool UseTls { get; set; }
-        
-        public Func<MqttClientCertificateValidationEventArgs, bool> CertificateValidationHandler { get; set; }
+
+        public Func<MqttClientCertificateValidationEventArgs, bool> CertificateValidationHandler { get; set; } = MqttClientDefaultCertificateValidationHandler.Handle;
 
 #if NET48 || NETCOREAPP3_1 || NET5 || NET6
         public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12 | SslProtocols.Tls13;

Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs

@@ -11,7 +11,7 @@ namespace MQTTnet.Client
 {
     public sealed class MqttClientTlsOptions
     {
-        public Func<MqttClientCertificateValidationEventArgs, bool> CertificateValidationHandler { get; set; }
+        public Func<MqttClientCertificateValidationEventArgs, bool> CertificateValidationHandler { get; set; } = MqttClientDefaultCertificateValidationHandler.Handle;
 
         public bool UseTls { get; set; }
 

Source/MQTTnet/Client/Publishing/MqttClientBeforeReleasePublishPacketEventArgs.cs

@@ -1,18 +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.Client
-{
-    public sealed class MqttClientBeforeReleasePublishPacketEventArgs : EventArgs
-    {
-        public MqttClientBeforeReleasePublishPacketEventArgs(ushort packetIdentifier)
-        {
-            PacketIdentifier = packetIdentifier;
-        }
-
-        public ushort PacketIdentifier { get; }
-    }
-}

Source/MQTTnet/Client/Publishing/MqttClientPublishResult.cs

@@ -9,14 +9,6 @@ namespace MQTTnet.Client
 {
     public sealed class MqttClientPublishResult
     {
-        public MqttClientPublishResult(ushort? packetIdentifier, MqttClientPublishReasonCode reasonCode, string reasonString, IReadOnlyCollection<MqttUserProperty> userProperties)
-        {
-            PacketIdentifier = packetIdentifier;
-            ReasonCode = reasonCode;
-            ReasonString = reasonString;
-            UserProperties = userProperties;
-        }
-
         /// <summary>
         ///     Returns if the overall status of the publish is a success. This can be the reason code _Success_ or
         ///     _NoMatchingSubscribers_. _NoMatchingSubscribers_ usually indicates only that no other client is interested in the topic but overall transmit
@@ -27,19 +19,19 @@ namespace MQTTnet.Client
         /// <summary>
         ///     Gets the packet identifier which was used for this publish.
         /// </summary>
-        public ushort? PacketIdentifier { get; }
+        public ushort? PacketIdentifier { get; set; }
 
         /// <summary>
         ///     Gets or sets the reason code.
         ///     Hint: MQTT 5 feature only.
         /// </summary>
-        public MqttClientPublishReasonCode ReasonCode { get; }
+        public MqttClientPublishReasonCode ReasonCode { get; set; } = MqttClientPublishReasonCode.Success;
 
         /// <summary>
         ///     Gets or sets the reason string.
         ///     Hint: MQTT 5 feature only.
         /// </summary>
-        public string ReasonString { get; }
+        public string ReasonString { get; set; }
 
         /// <summary>
         ///     Gets or sets the user properties.
@@ -50,6 +42,6 @@ namespace MQTTnet.Client
         ///     The feature is very similar to the HTTP header concept.
         ///     Hint: MQTT 5 feature only.
         /// </summary>
-        public IReadOnlyCollection<MqttUserProperty> UserProperties { get; }
+        public IReadOnlyCollection<MqttUserProperty> UserProperties { get; internal set; }
     }
 }

Source/MQTTnet/Client/Publishing/MqttClientPublishResultFactory.cs

@@ -2,7 +2,6 @@
 // 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.Packets;
 using MQTTnet.Protocol;
@@ -11,8 +10,8 @@ namespace MQTTnet.Client
 {
     public sealed class MqttClientPublishResultFactory
     {
+        static readonly MqttClientPublishResult EmptySuccessResult = new MqttClientPublishResult();
         static readonly IReadOnlyCollection<MqttUserProperty> EmptyUserProperties = new List<MqttUserProperty>();
-        static readonly MqttClientPublishResult EmptySuccessResult = new MqttClientPublishResult(null, MqttClientPublishReasonCode.Success, null, EmptyUserProperties);
 
         public MqttClientPublishResult Create(MqttPubAckPacket pubAckPacket)
         {
@@ -22,55 +21,59 @@ namespace MQTTnet.Client
                 return EmptySuccessResult;
             }
 
-            var result = new MqttClientPublishResult(
-                pubAckPacket.PacketIdentifier,
-                (MqttClientPublishReasonCode)(int)pubAckPacket.ReasonCode,
-                pubAckPacket.ReasonString,
-                pubAckPacket.UserProperties ?? EmptyUserProperties);
+            var result = new MqttClientPublishResult
+            {
+                // Both enums have the same values. So it can be easily converted.
+                ReasonCode = (MqttClientPublishReasonCode)(int)pubAckPacket.ReasonCode,
+                PacketIdentifier = pubAckPacket.PacketIdentifier,
+                ReasonString = pubAckPacket.ReasonString,
+                UserProperties = pubAckPacket.UserProperties ?? EmptyUserProperties
+            };
 
             return result;
         }
 
-        public MqttClientPublishResult Create(MqttPubRecPacket pubRecPacket)
-        {
-            if (pubRecPacket == null)
-            {
-                throw new ArgumentNullException(nameof(pubRecPacket));
-            }
-
-            return new MqttClientPublishResult(
-                pubRecPacket.PacketIdentifier,
-                (MqttClientPublishReasonCode)(int)pubRecPacket.ReasonCode,
-                pubRecPacket.ReasonString,
-                pubRecPacket.UserProperties ?? EmptyUserProperties);
-        }
-
         public MqttClientPublishResult Create(MqttPubRecPacket pubRecPacket, MqttPubCompPacket pubCompPacket)
         {
             if (pubRecPacket == null || pubCompPacket == null)
             {
-                return new MqttClientPublishResult(null, MqttClientPublishReasonCode.UnspecifiedError, null, EmptyUserProperties);
+                return new MqttClientPublishResult
+                {
+                    ReasonCode = MqttClientPublishReasonCode.UnspecifiedError
+                };
             }
 
+            MqttClientPublishResult result;
+
             // The PUBCOMP is the last packet in QoS 2. So we use the results from that instead of PUBREC.
             if (pubCompPacket.ReasonCode == MqttPubCompReasonCode.PacketIdentifierNotFound)
             {
-                return new MqttClientPublishResult(
-                    pubCompPacket.PacketIdentifier,
-                    MqttClientPublishReasonCode.UnspecifiedError,
-                    pubCompPacket.ReasonString,
-                    pubCompPacket.UserProperties ?? EmptyUserProperties);
+                result = new MqttClientPublishResult
+                {
+                    PacketIdentifier = pubCompPacket.PacketIdentifier,
+                    ReasonCode = MqttClientPublishReasonCode.UnspecifiedError,
+                    ReasonString = pubCompPacket.ReasonString,
+                    UserProperties = pubCompPacket.UserProperties ?? EmptyUserProperties
+                };
+
+                return result;
             }
 
-            var reasonCode = MqttClientPublishReasonCode.Success;
+            result = new MqttClientPublishResult
+            {
+                PacketIdentifier = pubCompPacket.PacketIdentifier,
+                ReasonCode = MqttClientPublishReasonCode.Success,
+                ReasonString = pubCompPacket.ReasonString,
+                UserProperties = pubCompPacket.UserProperties ?? EmptyUserProperties
+            };
 
             if (pubRecPacket.ReasonCode != MqttPubRecReasonCode.Success)
             {
                 // Both enums share the same values.
-                reasonCode = (MqttClientPublishReasonCode)pubRecPacket.ReasonCode;
+                result.ReasonCode = (MqttClientPublishReasonCode)pubRecPacket.ReasonCode;
             }
 
-            return new MqttClientPublishResult(pubCompPacket.PacketIdentifier, reasonCode, pubCompPacket.ReasonString, pubCompPacket.UserProperties ?? EmptyUserProperties);
+            return result;
         }
     }
 }

Source/MQTTnet/Client/Publishing/MqttClientReleasePublishPacketOptions.cs

@@ -1,30 +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.Collections.Generic;
-using MQTTnet.Packets;
-using MQTTnet.Protocol;
-
-namespace MQTTnet.Client
-{
-    public sealed class MqttClientReleasePublishPacketOptions
-    {
-        /// <summary>
-        ///     Gets or sets the identifier of the PUBLISH packet which should be released.
-        /// </summary>
-        public ushort PacketIdentifier { get; set; }
-        
-        public MqttPubRelReasonCode ReasonCode { get; set; } = MqttPubRelReasonCode.Success;
-
-        /// <summary>
-        ///     <remarks>MQTT 5.0.0+ feature.</remarks>
-        /// </summary>
-        public string ReasonString { get; set; }
-
-        /// <summary>
-        ///     <remarks>MQTT 5.0.0+ feature.</remarks>
-        /// </summary>
-        public List<MqttUserProperty> UserProperties { get; set; }
-    }
-}

Source/MQTTnet/Client/Publishing/MqttClientReleasePublishPacketResult.cs

@@ -1,31 +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.Collections.Generic;
-using MQTTnet.Packets;
-
-namespace MQTTnet.Client
-{
-    public sealed class MqttClientReleasePublishPacketResult
-    {
-        public MqttClientReleasePublishPacketResult(uint packetIdentifier, string reasonString, List<MqttUserProperty> userProperties)
-        {
-            PacketIdentifier = packetIdentifier;
-            ReasonString = reasonString;
-            UserProperties = userProperties;
-        }
-
-        /// <summary>
-        ///     Gets or sets the identifier which was used in the PUBCOMP packet.
-        /// </summary>
-        public uint PacketIdentifier { get; }
-
-        public string ReasonString { get; }
-
-        /// <summary>
-        ///     <remarks>MQTT 5.0.0+ feature.</remarks>
-        /// </summary>
-        public List<MqttUserProperty> UserProperties { get; }
-    }
-}

Source/MQTTnet/Formatter/MqttPubRelPacketFactory.cs

@@ -11,7 +11,7 @@ namespace MQTTnet.Formatter
 {
     public sealed class MqttPubRelPacketFactory
     {
-        public MqttPubRelPacket Create(MqttPubRecPacket pubRecPacket, MqttPubRelReasonCode reasonCode)
+        public MqttPubRelPacket Create(MqttPubRecPacket pubRecPacket, MqttApplicationMessageReceivedReasonCode reasonCode)
         {
             if (pubRecPacket == null)
             {
@@ -21,23 +21,7 @@ namespace MQTTnet.Formatter
             return new MqttPubRelPacket
             {
                 PacketIdentifier = pubRecPacket.PacketIdentifier,
-                ReasonCode = reasonCode
-            };
-        }
-
-        public MqttPubRelPacket Create(MqttClientReleasePublishPacketOptions options)
-        {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            return new MqttPubRelPacket
-            {
-                PacketIdentifier = options.PacketIdentifier,
-                ReasonCode = options.ReasonCode,
-                ReasonString = options.ReasonString,
-                UserProperties = options.UserProperties
+                ReasonCode = (MqttPubRelReasonCode)(int)reasonCode
             };
         }
     }

Source/MQTTnet/Implementations/MqttTcpChannel.cs

@@ -264,27 +264,15 @@ namespace MQTTnet.Implementations
             }
         }
 
-        bool InternalUserCertificateValidationCallback(object sender, X509Certificate x509Certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        bool InternalUserCertificateValidationCallback(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {
             var certificateValidationHandler = _tcpOptions?.TlsOptions?.CertificateValidationHandler;
             if (certificateValidationHandler != null)
             {
-                var eventArgs = new MqttClientCertificateValidationEventArgs
-                {
-                    Certificate = x509Certificate,
-                    Chain = chain,
-                    SslPolicyErrors = sslPolicyErrors,
-                    ClientOptions = _tcpOptions
-                };
-
+                var eventArgs = new MqttClientCertificateValidationEventArgs(certificate, chain, sslPolicyErrors, _tcpOptions);
                 return certificateValidationHandler(eventArgs);
             }
 
-            if (_tcpOptions?.TlsOptions?.IgnoreCertificateChainErrors ?? false)
-            {
-                sslPolicyErrors &= ~SslPolicyErrors.RemoteCertificateChainErrors;
-            }
-
             return sslPolicyErrors == SslPolicyErrors.None;
         }
 

Source/MQTTnet/Implementations/MqttWebSocketChannel.cs

@@ -224,14 +224,7 @@ namespace MQTTnet.Implementations
                 clientWebSocket.Options.RemoteCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) =>
                 {
                     // TODO: Find a way to add client options to same callback. Problem is that they have a different type.
-                    var context = new MqttClientCertificateValidationEventArgs
-                    {
-                        Certificate = certificate,
-                        Chain = chain,
-                        SslPolicyErrors = sslPolicyErrors,
-                        ClientOptions = _options
-                    };
-
+                    var context = new MqttClientCertificateValidationEventArgs(certificate, chain, sslPolicyErrors, _options);
                     return certificateValidationHandler(context);
                 };
 #endif

Source/MQTTnet/Server/Internal/MqttClient.cs

@@ -273,7 +273,7 @@ namespace MQTTnet.Server
         {
             // Do not fire the event _ClientAcknowledgedPublishPacket_ here because the QoS 2 process is only finished
             // properly when the client has sent the PUBCOMP packet.
-            var pubRelPacket = _packetFactories.PubRel.Create(pubRecPacket, MqttPubRelReasonCode.Success);
+            var pubRelPacket = _packetFactories.PubRel.Create(pubRecPacket, MqttApplicationMessageReceivedReasonCode.Success);
             Session.EnqueueControlPacket(new MqttPacketBusItem(pubRelPacket));
 
             return CompletedTask.Instance;