feature(M2Mqtt): Adds auto reconnect,

M2Mqtt.sln

@@ -1,15 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2003
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.Net", "M2Mqtt\M2Mqtt.Net.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "M2Mqtt.Core", "M2Mqtt\M2Mqtt.Core.csproj", "{16E1B038-4EF7-4D60-860D-6F2B82A83732}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.NetCf39", "M2Mqtt\M2Mqtt.NetCf39.csproj", "{BB9B7FF4-6502-41AF-8851-5060B67645E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.Net", "M2Mqtt\M2Mqtt.Net.csproj", "{DF20BCE2-EBBB-41B3-801F-8343AD2D2A82}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.NetMf42", "M2Mqtt\M2Mqtt.NetMf42.csproj", "{F733523A-F14E-4F5A-9E7C-085CA80F52B1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.NetMf43", "M2Mqtt\M2Mqtt.NetMf43.csproj", "{6A6D540B-8554-4FFD-8884-8BEFCCD9AD41}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.Mono", "M2Mqtt\M2Mqtt.Mono.csproj", "{9B706DEC-4CE7-4764-BDBE-8A5F855E5857}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.WinRT", "M2Mqtt\M2Mqtt.WinRT.csproj", "{0238F0E3-A02B-428D-8A3F-410D8F15BB50}"
 EndProject
@@ -19,24 +17,18 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB9B7FF4-6502-41AF-8851-5060B67645E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB9B7FF4-6502-41AF-8851-5060B67645E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB9B7FF4-6502-41AF-8851-5060B67645E8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{BB9B7FF4-6502-41AF-8851-5060B67645E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB9B7FF4-6502-41AF-8851-5060B67645E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB9B7FF4-6502-41AF-8851-5060B67645E8}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{F733523A-F14E-4F5A-9E7C-085CA80F52B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F733523A-F14E-4F5A-9E7C-085CA80F52B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F733523A-F14E-4F5A-9E7C-085CA80F52B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F733523A-F14E-4F5A-9E7C-085CA80F52B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A6D540B-8554-4FFD-8884-8BEFCCD9AD41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A6D540B-8554-4FFD-8884-8BEFCCD9AD41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A6D540B-8554-4FFD-8884-8BEFCCD9AD41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A6D540B-8554-4FFD-8884-8BEFCCD9AD41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16E1B038-4EF7-4D60-860D-6F2B82A83732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16E1B038-4EF7-4D60-860D-6F2B82A83732}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16E1B038-4EF7-4D60-860D-6F2B82A83732}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16E1B038-4EF7-4D60-860D-6F2B82A83732}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF20BCE2-EBBB-41B3-801F-8343AD2D2A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF20BCE2-EBBB-41B3-801F-8343AD2D2A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF20BCE2-EBBB-41B3-801F-8343AD2D2A82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF20BCE2-EBBB-41B3-801F-8343AD2D2A82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B706DEC-4CE7-4764-BDBE-8A5F855E5857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B706DEC-4CE7-4764-BDBE-8A5F855E5857}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B706DEC-4CE7-4764-BDBE-8A5F855E5857}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B706DEC-4CE7-4764-BDBE-8A5F855E5857}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0238F0E3-A02B-428D-8A3F-410D8F15BB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0238F0E3-A02B-428D-8A3F-410D8F15BB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0238F0E3-A02B-428D-8A3F-410D8F15BB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -45,4 +37,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A50086D5-2816-4448-96E2-631270C57149}
+	EndGlobalSection
 EndGlobal

M2Mqtt/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+    </startup>
+</configuration>

M2Mqtt/Events/Events.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace uPLibrary.Networking.M2Mqtt.Events
+{
+    public static class Events
+    {
+        public enum Options {
+            publish_received,
+            message_published,
+            connection_closed,
+            message_subscribed,
+            message_unsubscribed,
+            reconnected,
+            connected,
+            disconnected
+        };
+
+    }
+}

M2Mqtt/M2Mqtt.Core.csproj

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RootNamespace>uPLibrary.Networking.M2Mqtt</RootNamespace>
+    <RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <ApplicationIcon />
+    <StartupObject />
+    <DefineConstants>SSL</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="WinRT\**" />
+    <EmbeddedResource Remove="WinRT\**" />
+    <None Remove="WinRT\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Spec\" />
+  </ItemGroup>
+</Project>

M2Mqtt/M2Mqtt.Mono.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,7 +15,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\M2Mqtt.Mono</OutputPath>
-    <DefineConstants>DEBUG;SSL</DefineConstants>
+    <DefineConstants>DEBUG;SSL;MONO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -41,29 +41,9 @@
     <Compile Include="Internal\InternalEvent.cs" />
     <Compile Include="Internal\MsgInternalEvent.cs" />
     <Compile Include="Internal\MsgPublishedInternalEvent.cs" />
-    <Compile Include="Messages\MqttMsgBase.cs" />
-    <Compile Include="Messages\MqttMsgConnack.cs" />
-    <Compile Include="Messages\MqttMsgConnect.cs" />
-    <Compile Include="Messages\MqttMsgConnectEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgContext.cs" />
-    <Compile Include="Messages\MqttMsgDisconnect.cs" />
-    <Compile Include="Messages\MqttMsgPingReq.cs" />
-    <Compile Include="Messages\MqttMsgPingResp.cs" />
-    <Compile Include="Messages\MqttMsgPuback.cs" />
-    <Compile Include="Messages\MqttMsgPubcomp.cs" />
-    <Compile Include="Messages\MqttMsgPublish.cs" />
-    <Compile Include="Messages\MqttMsgPublishedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgPublishEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgPubrec.cs" />
-    <Compile Include="Messages\MqttMsgPubrel.cs" />
-    <Compile Include="Messages\MqttMsgSuback.cs" />
-    <Compile Include="Messages\MqttMsgSubscribe.cs" />
-    <Compile Include="Messages\MqttMsgSubscribedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgSubscribeEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgUnsuback.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribe.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribeEventArgs.cs" />
+    <Compile Include="Messages\*.cs" />
+    <Compile Include="Topic\*.cs" />
+    <Compile Include="Events\*.cs" />
     <Compile Include="MqttClient.cs" />
     <Compile Include="MqttSecurity.cs" />
     <Compile Include="Net\Fx.cs" />

M2Mqtt/M2Mqtt.Net.csproj

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A11AEF5A-B246-4FE8-8330-06DB73CC8074}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>uPLibrary.Networking.M2Mqtt</RootNamespace>
+    <ProjectGuid>{DF20BCE2-EBBB-41B3-801F-8343AD2D2A82}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>M2Mqtt.Net</RootNamespace>
     <AssemblyName>M2Mqtt.Net</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\M2Mqtt.Net</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;SSL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\M2Mqtt.Net</OutputPath>
-    <DefineConstants>TRACE;SSL</DefineConstants>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -40,58 +40,25 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Exceptions\MqttClientException.cs" />
-    <Compile Include="Exceptions\MqttCommunicationException.cs" />
-    <Compile Include="Exceptions\MqttConnectionException.cs" />
-    <Compile Include="Exceptions\MqttTimeoutException.cs" />
-    <Compile Include="IMqttNetworkChannel.cs" />
-    <Compile Include="Internal\InternalEvent.cs" />
-    <Compile Include="Internal\MsgInternalEvent.cs" />
-    <Compile Include="Internal\MsgPublishedInternalEvent.cs" />
-    <Compile Include="Messages\MqttMsgBase.cs" />
-    <Compile Include="Messages\MqttMsgConnack.cs" />
-    <Compile Include="Messages\MqttMsgConnect.cs" />
-    <Compile Include="Messages\MqttMsgConnectEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgContext.cs" />
-    <Compile Include="Messages\MqttMsgDisconnect.cs" />
-    <Compile Include="Messages\MqttMsgPingReq.cs" />
-    <Compile Include="Messages\MqttMsgPingResp.cs" />
-    <Compile Include="Messages\MqttMsgPuback.cs" />
-    <Compile Include="Messages\MqttMsgPubcomp.cs" />
-    <Compile Include="Messages\MqttMsgPublish.cs" />
-    <Compile Include="Messages\MqttMsgPublishedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgPublishEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgPubrec.cs" />
-    <Compile Include="Messages\MqttMsgPubrel.cs" />
-    <Compile Include="Messages\MqttMsgSuback.cs" />
-    <Compile Include="Messages\MqttMsgSubscribe.cs" />
-    <Compile Include="Messages\MqttMsgSubscribedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgSubscribeEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgUnsuback.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribe.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribeEventArgs.cs" />
-    <Compile Include="MqttClient.cs" />
-    <Compile Include="MqttSecurity.cs" />
-    <Compile Include="Net\Fx.cs" />
-    <Compile Include="Net\MqttNetworkChannel.cs" />
-    <Compile Include="MqttSettings.cs" />
+    <Compile Include=".\*.cs" />
+    <Compile Include="Exceptions\*.cs" />
+    <Compile Include="Internal\*.cs" />
+    <Compile Include="Messages\*.cs" />
+    <Compile Include="Net\*.cs" />
+    <Compile Include="Session\*.cs" />
+    <Compile Include="Spec\*.cs" />
+    <Compile Include="Utility\*.cs" />
+    <Compile Include="Topic\*.cs" />
+    <Compile Include="Events\*.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Session\MqttBrokerSession.cs" />
-    <Compile Include="Session\MqttClientSession.cs" />
-    <Compile Include="Session\MqttSession.cs" />
-    <Compile Include="Utility\Trace.cs" />
-    <Compile Include="Utility\QueueExtension.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

M2Mqtt/M2Mqtt.WinRT.csproj

@@ -49,42 +49,20 @@
     <Compile Include="Internal\InternalEvent.cs" />
     <Compile Include="Internal\MsgInternalEvent.cs" />
     <Compile Include="Internal\MsgPublishedInternalEvent.cs" />
-    <Compile Include="Messages\MqttMsgBase.cs" />
-    <Compile Include="Messages\MqttMsgConnack.cs" />
-    <Compile Include="Messages\MqttMsgConnect.cs" />
-    <Compile Include="Messages\MqttMsgConnectEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgContext.cs" />
-    <Compile Include="Messages\MqttMsgDisconnect.cs" />
-    <Compile Include="Messages\MqttMsgPingReq.cs" />
-    <Compile Include="Messages\MqttMsgPingResp.cs" />
-    <Compile Include="Messages\MqttMsgPuback.cs" />
-    <Compile Include="Messages\MqttMsgPubcomp.cs" />
-    <Compile Include="Messages\MqttMsgPublish.cs" />
-    <Compile Include="Messages\MqttMsgPublishedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgPublishEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgPubrec.cs" />
-    <Compile Include="Messages\MqttMsgPubrel.cs" />
-    <Compile Include="Messages\MqttMsgSuback.cs" />
-    <Compile Include="Messages\MqttMsgSubscribe.cs" />
-    <Compile Include="Messages\MqttMsgSubscribedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgSubscribeEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgUnsuback.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribe.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribedEventArgs.cs" />
-    <Compile Include="Messages\MqttMsgUnsubscribeEventArgs.cs" />
+    <Compile Include="Messages\*.cs" />
+    <Compile Include="Topic\*.cs" />
+    <Compile Include="Events\*.cs" />
     <Compile Include="MqttClient.cs" />
     <Compile Include="MqttSecurity.cs" />
+    <Compile Include="Net\Fx.cs" />
+    <Compile Include="Net\MqttNetworkChannel.cs" />
     <Compile Include="MqttSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Session\MqttBrokerSession.cs" />
     <Compile Include="Session\MqttClientSession.cs" />
     <Compile Include="Session\MqttSession.cs" />
-    <Compile Include="Utility\QueueExtension.cs" />
     <Compile Include="Utility\Trace.cs" />
-    <Compile Include="WinRT\Fx.cs" />
-    <Compile Include="WinRT\MqttNetworkChannel.cs" />
-    <Compile Include="WinRT\Hashtable.cs" />
-    <Compile Include="WinRT\Queue.cs" />
+    <Compile Include="Utility\QueueExtension.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

M2Mqtt/Messages/GenericEventArgs.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using System.Reflection;
+
+namespace uPLibrary.Networking.M2Mqtt.Messages
+{
+    public class GenericEventArgs : EventArgs
+    {
+        public Dictionary<string, object> Dict;
+
+        public GenericEventArgs(Events.Events.Options eventType, EventArgs EA) {
+
+            Dict = new Dictionary<string, object>();
+#if (!MONO)
+
+            // I don't like this, but it's handy
+            foreach (var p in EA.GetType().GetProperties()) {
+                var t = p.GetValue(EA);
+                dynamic q = t;
+                if (t.GetType() == typeof(byte))
+                {
+                    int s = (int)q;
+                    q = $"{s}";
+                }
+                else if (t.GetType() == typeof(byte[]))
+                {
+                    // Maybe represent as hex instead??..
+                    q = Encoding.ASCII.GetString((byte[])q);
+                }
+                this.Dict.Add(p.Name, q);
+            }
+            Dict.Add("EventType", eventType.ToString());
+#endif
+        }
+    }
+}

M2Mqtt/Messages/MqttMsgSubscribe.cs

@@ -22,6 +22,7 @@ Paolo Patierno - initial API and implementation and/or initial documentation
 using System.Collections;
 using System.Text;
 using uPLibrary.Networking.M2Mqtt.Exceptions;
+using uPLibrary.Networking.M2Mqtt.Topic;
 
 namespace uPLibrary.Networking.M2Mqtt.Messages
 {
@@ -64,7 +65,7 @@ public MqttMsgSubscribe()
         {
             this.type = MQTT_MSG_SUBSCRIBE_TYPE;
         }
-        
+
         /// <summary>
         /// Constructor
         /// </summary>