Refactoring

Frameworks/MQTTnet.UniversalWindows/Implementations/MqttCommunicationAdapterFactory.cs

@@ -7,7 +7,7 @@ namespace MQTTnet.Implementations
 {
     public class MqttCommunicationAdapterFactory : IMqttCommunicationAdapterFactory
     {
-        public IMqttCommunicationAdapter CreateMqttCommunicationAdapter(MqttClientQueuedOptions options)
+        public IMqttCommunicationAdapter CreateMqttCommunicationAdapter(MqttClientOptions options)
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
 
@@ -21,6 +21,12 @@ namespace MQTTnet.Implementations
                 return new MqttChannelCommunicationAdapter(new MqttWebSocketChannel(webSocketOptions), new MqttPacketSerializer { ProtocolVersion = options.ProtocolVersion });
             }
 
+            if (options is MqttClientQueuedOptions queuedOptions)
+            {
+                return new MqttChannelCommunicationAdapter(new MqttTcpChannel(queuedOptions), new MqttPacketSerializer { ProtocolVersion = options.ProtocolVersion });
+            }
+
+
             throw new NotSupportedException();
         }
     }

Frameworks/MQTTnet.UniversalWindows/Implementations/MqttTcpChannel.cs

@@ -89,7 +89,7 @@ namespace MQTTnet.Implementations
             RawReceiveStream = ReceiveStream;
         }
 
-        private static Certificate LoadCertificate(MqttClientQueuedOptions options)
+        private static Certificate LoadCertificate(MqttClientOptions options)
         {
             if (options.TlsOptions.Certificates == null || !options.TlsOptions.Certificates.Any())
             {

Tests/MQTTnet.Core.Tests/MqttCommunicationAdapterFactory.cs

@@ -12,7 +12,7 @@ namespace MQTTnet.Core.Tests
             _adapter = adapter;
         }
 
-        public IMqttCommunicationAdapter CreateMqttCommunicationAdapter(MqttClientQueuedOptions options)
+        public IMqttCommunicationAdapter CreateMqttCommunicationAdapter(MqttClientOptions options)
         {
             return _adapter;
         }

Tests/MQTTnet.TestApp.NetCore/Program.cs

@@ -6,7 +6,6 @@ using MQTTnet.Core.Protocol;
 using MQTTnet.Core.Server;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -297,16 +296,16 @@ namespace MQTTnet.TestApp.NetCore
 
         private class TestStorage : IMqttClientQueuedStorage
         {
-            string serializationFile = Path.Combine(Environment.CurrentDirectory, "messages.bin");
+            string serializationFile = System.IO.Path.Combine(Environment.CurrentDirectory, "messages.bin");
             private IList<MqttApplicationMessage> _messages = new List<MqttApplicationMessage>();
 
             public Task<IList<MqttApplicationMessage>> LoadInflightMessagesAsync()
             {
                 //deserialize
                 // MqttApplicationMessage is not serializable
-                if (File.Exists(serializationFile))
+                if (System.IO.File.Exists(serializationFile))
                 {
-                    using (Stream stream = File.Open(serializationFile, FileMode.Open))
+                    using (System.IO.Stream stream = System.IO.File.Open(serializationFile, System.IO.FileMode.Open))
                     {
                         var bformatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
 
@@ -325,7 +324,7 @@ namespace MQTTnet.TestApp.NetCore
                 _messages = messages;
                 //serialize
                 // MqttApplicationMessage is not serializable
-                using (System.IO.Stream stream = File.Open(serializationFile, FileMode.Create))
+                using (System.IO.Stream stream = System.IO.File.Open(serializationFile, System.IO.FileMode.Create))
                 {
                     var bformatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
                     IList<TemporaryApplicationMessage> temp = new List<TemporaryApplicationMessage>();

Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs

@@ -41,7 +41,7 @@ namespace MQTTnet.TestApp.UniversalWindows
 
         private async void Connect(object sender, RoutedEventArgs e)
         {
-            MqttClientQueuedOptions options = null;
+            MqttClientOptions options = null;
             if (UseTcp.IsChecked == true)
             {
                 options = new MqttClientTcpOptions