Refactor namespaces.

Source/MQTTnet/Packets/MqttAuthPacket.cs

@@ -8,5 +8,7 @@ namespace MQTTnet.Packets
     public class MqttAuthPacket : MqttBasePacket
     {
         public MqttAuthenticateReasonCode ReasonCode { get; set; }
+
+        public MqttAuthPacketProperties Properties { get; set; }
     }
 }

Source/MQTTnet/Packets/MqttAuthPacketProperties.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace MQTTnet.Packets
+{
+    public class MqttAuthPacketProperties
+    {
+        public string AuthenticationMethod { get; set; }
+
+        public byte[] AuthenticationData { get; set; }
+
+        public string ReasonString { get; set; }
+
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+    }
+}

Source/MQTTnet/Packets/MqttConnAckPacket.cs

@@ -4,14 +4,15 @@ namespace MQTTnet.Packets
 {
     public class MqttConnAckPacket : MqttBasePacket
     {
-        public MqttConnectReturnCode ConnectReturnCode { get; set; }
+        public MqttConnectReturnCode? ReturnCode { get; set; }
+
+        #region Added in MQTTv3.1.1
 
-        /// <summary>
-        /// Added in MQTTv3.1.1.
-        /// </summary>
         public bool IsSessionPresent { get; set; }
 
-        #region Added in MQTTv5
+        #endregion
+
+        #region Added in MQTTv5.0.0
 
         public MqttConnectReasonCode? ReasonCode { get; set; }
 
@@ -21,7 +22,7 @@ namespace MQTTnet.Packets
 
         public override string ToString()
         {
-            return string.Concat("ConnAck: [ConnectReturnCode=", ConnectReturnCode, "] [ReasonCode=", ReasonCode, "] [IsSessionPresent=", IsSessionPresent, "]");
+            return string.Concat("ConnAck: [ReturnCode=", ReturnCode, "] [ReasonCode=", ReasonCode, "] [IsSessionPresent=", IsSessionPresent, "]");
         }
     }
 }

Source/MQTTnet/Packets/MqttConnAckPacketProperties.cs

@@ -6,7 +6,6 @@ namespace MQTTnet.Packets
     {
         public uint? SessionExpiryInterval { get; set; }
 
-        // TODO: Add enum
         public ushort? ReceiveMaximum { get; set; }
 
         public bool? RetainAvailable { get; set; }
@@ -19,7 +18,7 @@ namespace MQTTnet.Packets
 
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
 
         public bool? WildcardSubscriptionAvailable { get; set; }
 

Source/MQTTnet/Packets/MqttConnectPacket.cs

@@ -14,14 +14,12 @@
 
         public ushort KeepAlivePeriod { get; set; }
 
-        /// <summary>
-        /// MQTTv5: Also called "Clean Start".
-        /// </summary>
+        // Also called "Clean Start" in MQTTv5.
         public bool CleanSession { get; set; }
 
         public MqttApplicationMessage WillMessage { get; set; }
 
-        #region Added in MQTTv5
+        #region Added in MQTTv5.0.0
 
         public MqttConnectPacketProperties Properties { get; set; }
 

Source/MQTTnet/Packets/MqttConnectPacketProperties.cs

@@ -22,6 +22,6 @@ namespace MQTTnet.Packets
 
         public uint? MaximumPacketSize { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
     }
 }

Source/MQTTnet/Packets/MqttDisconnectPacket.cs

@@ -1,10 +1,20 @@
-namespace MQTTnet.Packets
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Packets
 {
     public class MqttDisconnectPacket : MqttBasePacket
     {
+        #region Added in MQTTv5
+
+        public MqttDisconnectReasonCode? ReasonCode { get; set; }
+
+        public MqttDisconnectPacketProperties Properties { get; set; }
+
+        #endregion
+
         public override string ToString()
         {
-            return "Disconnect";
+            return string.Concat("Disconnect: [ReasonCode=", ReasonCode, "]");
         }
     }
 }

Source/MQTTnet/Packets/MqttDisconnectPacketProperties.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace MQTTnet.Packets
+{
+    public class MqttDisconnectPacketProperties
+    {
+        public uint? SessionExpiryInterval { get; set; }
+
+        public string ReasonString { get; set; }
+
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+
+        public string ServerReference { get; set; }
+    }
+}

Source/MQTTnet/Packets/MqttPubAckPacket.cs

@@ -14,7 +14,7 @@ namespace MQTTnet.Packets
 
         public override string ToString()
         {
-            return string.Concat("PubAck: [PacketIdentifier=", PacketIdentifier, "] [ConnectReasonCode=", ReasonCode, "]");
+            return string.Concat("PubAck: [PacketIdentifier=", PacketIdentifier, "] [ReasonCode=", ReasonCode, "]");
         }
     }
 }

Source/MQTTnet/Packets/MqttPubAckPacketProperties.cs

@@ -6,6 +6,6 @@ namespace MQTTnet.Packets
     {
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
     }
 }

Source/MQTTnet/Packets/MqttPubCompPacketProperties.cs

@@ -6,6 +6,6 @@ namespace MQTTnet.Packets
     {
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
     }
 }

Source/MQTTnet/Packets/MqttPubRecPacketProperties.cs

@@ -6,6 +6,6 @@ namespace MQTTnet.Packets
     {
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
     }
 }

Source/MQTTnet/Packets/MqttPubRelPacketProperties.cs

@@ -6,6 +6,6 @@ namespace MQTTnet.Packets
     {
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
     }
 }

Source/MQTTnet/Packets/MqttPublishPacketProperties.cs

@@ -1,10 +1,11 @@
 using System.Collections.Generic;
+using MQTTnet.Protocol;
 
 namespace MQTTnet.Packets
 {
     public class MqttPublishPacketProperties
     {
-        public byte? PayloadFormatIndicator { get; set; }
+        public MqttPayloadFormatIndicator? PayloadFormatIndicator { get; set; }
 
         public uint? MessageExpiryInterval { get; set; }
 
@@ -14,7 +15,7 @@ namespace MQTTnet.Packets
 
         public byte[] CorrelationData { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
 
         public uint? SubscriptionIdentifier { get; set; }
 

Source/MQTTnet/Packets/MqttSubAckPacket.cs

@@ -8,11 +8,11 @@ namespace MQTTnet.Packets
     {
         public ushort? PacketIdentifier { get; set; }
 
-        public List<MqttSubscribeReturnCode> SubscribeReturnCodes { get; } = new List<MqttSubscribeReturnCode>();
+        public List<MqttSubscribeReturnCode> ReturnCodes { get; } = new List<MqttSubscribeReturnCode>();
 
-        #region Added in MQTTv5
+        #region Added in MQTTv5.0.0
 
-        public List<MqttSubscribeReasonCode?> ReasonCodes { get; set; }
+        public List<MqttSubscribeReasonCode> ReasonCodes { get; } = new List<MqttSubscribeReasonCode>();
 
         public MqttSubAckPacketProperties Properties { get; set; }
 
@@ -20,8 +20,10 @@ namespace MQTTnet.Packets
 
         public override string ToString()
         {
-            var subscribeReturnCodesText = string.Join(",", SubscribeReturnCodes.Select(f => f.ToString()));
-            return string.Concat("SubAck: [PacketIdentifier=", PacketIdentifier, "] [SubscribeReturnCodes=", subscribeReturnCodesText, "]");
+            var returnCodesText = string.Join(",", ReturnCodes.Select(f => f.ToString()));
+            var reasonCodesText = string.Join(",", ReasonCodes.Select(f => f.ToString()));
+
+            return string.Concat("SubAck: [PacketIdentifier=", PacketIdentifier, "] [ReturnCodes=", returnCodesText, "] [ReasonCode=", reasonCodesText, "]");
         }
     }
 }

Source/MQTTnet/Packets/MqttSubAckPacketProperties.cs

@@ -6,6 +6,6 @@ namespace MQTTnet.Packets
     {
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
     }
 }

Source/MQTTnet/Packets/MqttSubscribePacket.cs

@@ -7,7 +7,7 @@ namespace MQTTnet.Packets
     {
         public ushort? PacketIdentifier { get; set; }
 
-        public IList<TopicFilter> TopicFilters { get; set; } = new List<TopicFilter>();
+        public List<TopicFilter> TopicFilters { get; } = new List<TopicFilter>();
 
         #region Added in MQTTv5
 

Source/MQTTnet/Packets/MqttSubscribePacketProperties.cs

@@ -6,6 +6,6 @@ namespace MQTTnet.Packets
     {
         public uint? SubscriptionIdentifier { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
     }
 }

Source/MQTTnet/Packets/MqttUnsubAckPacket.cs

@@ -1,12 +1,26 @@
-namespace MQTTnet.Packets
+using System.Collections.Generic;
+using System.Linq;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Packets
 {
     public class MqttUnsubAckPacket : MqttBasePacket, IMqttPacketWithIdentifier
     {
         public ushort? PacketIdentifier { get; set; }
 
+        #region Added in MQTTv5
+
+        public MqttUnsubAckPacketProperties Properties { get; set; }
+
+        public List<MqttUnsubscribeReasonCode> ReasonCodes { get; } = new List<MqttUnsubscribeReasonCode>();
+
+        #endregion
+
         public override string ToString()
         {
-            return string.Concat("UnsubAck: [PacketIdentifier=", PacketIdentifier, "]");
+            var reasonCodesText = string.Join(",", ReasonCodes.Select(f => f.ToString()));
+
+            return string.Concat("UnsubAck: [PacketIdentifier=", PacketIdentifier, "] [ReasonCodes=", reasonCodesText, "]");
         }
     }
 }

Source/MQTTnet/Packets/MqttUnsubAckPacketProperties.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace MQTTnet.Packets
+{
+    public class MqttUnsubAckPacketProperties
+    {
+        public string ReasonString { get; set; }
+
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+    }
+}

Source/MQTTnet/Packets/MqttUnsubscribePacket.cs

@@ -6,7 +6,13 @@ namespace MQTTnet.Packets
     {
         public ushort? PacketIdentifier { get; set; }
 
-        public IList<string> TopicFilters { get; set; } = new List<string>();
+        public List<string> TopicFilters { get; } = new List<string>();
+
+        #region Added in MQTTv5
+
+        public MqttUnsubscribePacketProperties Properties { get; set; }
+
+        #endregion
 
         public override string ToString()
         {

Source/MQTTnet/Packets/MqttUnsubscribePacketProperties.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace MQTTnet.Packets
+{
+    public class MqttUnsubscribePacketProperties
+    {
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+    }
+}