Merge proces, enable signing of the assembly.

.gitignore

@@ -291,3 +291,5 @@ __pycache__/
 Build/nuget.exe
 *.js
 *.map
+
+*codeSigningKey.pfx

Build/MQTTnet.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MQTTnet</id>
-    <version>2.5.3</version>
+    <version>2.6.0</version>
     <authors>Christian Kratky</authors>
     <owners>Christian Kratky</owners>
     <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
@@ -10,9 +10,9 @@
     <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker).</description>
-    <releaseNotes>* [Core] Removed all dependencies to other libraries (BREAKING CHANGE!).
-* [Core] Updated SDK libraries.
-* [Client] Fixed broken support for WebSocketSecure connections (Thanks to @StAI).
+    <releaseNotes>* Merged projects.
+* Added a strong name for the assembly.
+
     </releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2017</copyright>
     <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 
@@ -46,23 +46,19 @@
   </metadata>
 
   <files>
+    
     <!-- .NET Standard 1.3 -->
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard1.3\MQTTnet.Core.*" target="lib\netstandard1.3\"/>
     <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.3\"/>
     
     <!-- .NET Standard 2.0 -->
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard2.0\MQTTnet.Core.*" target="lib\netstandard2.0\"/>
     <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard2.0\MQTTnet.*" target="lib\netstandard2.0\"/>
 
     <!-- Universal Windows -->
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\uap10.0\MQTTnet.Core.*" target="lib\uap10.0\"/>
     <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\uap10.0\MQTTnet.*" target="lib\uap10.0\"/>
 
     <!-- .NET Framework -->
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\net452\MQTTnet.Core.*" target="lib\net452\"/>
     <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\net452\MQTTnet.*" target="lib\net452\"/>
 
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\net461\MQTTnet.Core.*" target="lib\net461\"/>
     <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\net461\MQTTnet.*" target="lib\net461\"/>
     
   </files>

Frameworks/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs

@@ -1,8 +1,8 @@
 using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
-using MQTTnet.Core.Server;
 using System.Linq;
+using MQTTnet.Server;
 
 namespace MQTTnet.AspNetCore
 {

Frameworks/MQTTnet.AspnetCore/MqttHostedServer.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Server;
+using MQTTnet.Adapter;
+using MQTTnet.Diagnostics;
+using MQTTnet.Server;
 
 namespace MQTTnet.AspNetCore
 {

Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Serializer;
-using MQTTnet.Core.Server;
+using MQTTnet.Adapter;
+using MQTTnet.Diagnostics;
+using MQTTnet.Serializer;
+using MQTTnet.Server;
 
 namespace MQTTnet.AspNetCore
 {

Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerChannel.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Channel;
+using MQTTnet.Channel;
 using MQTTnet.Implementations;
 
 namespace MQTTnet.AspNetCore

Frameworks/MQTTnet.AspnetCore/ServiceCollectionExtensions.cs

@@ -1,9 +1,9 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Server;
+using MQTTnet.Adapter;
+using MQTTnet.Diagnostics;
+using MQTTnet.Server;
 
 namespace MQTTnet.AspNetCore
 {

Frameworks/MQTTnet.NetStandard/Adapter/IMqttChannelAdapter.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Serializer;
+using MQTTnet.Packets;
+using MQTTnet.Serializer;
 
-namespace MQTTnet.Core.Adapter
+namespace MQTTnet.Adapter
 {
     public interface IMqttChannelAdapter
     {

Frameworks/MQTTnet.NetStandard/Adapter/IMqttServerAdapter.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
-using MQTTnet.Core.Server;
+using MQTTnet.Server;
 
-namespace MQTTnet.Core.Adapter
+namespace MQTTnet.Adapter
 {
     public interface IMqttServerAdapter
     {

Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapter.cs

@@ -4,14 +4,14 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Channel;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Internal;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Serializer;
+using MQTTnet.Channel;
+using MQTTnet.Diagnostics;
+using MQTTnet.Exceptions;
+using MQTTnet.Internal;
+using MQTTnet.Packets;
+using MQTTnet.Serializer;
 
-namespace MQTTnet.Core.Adapter
+namespace MQTTnet.Adapter
 {
     public class MqttChannelAdapter : IMqttChannelAdapter
     {

Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapterExtensions.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Packets;
+using MQTTnet.Packets;
 
-namespace MQTTnet.Core.Adapter
+namespace MQTTnet.Adapter
 {
     public static class MqttChannelAdapterExtensions
     {

Frameworks/MQTTnet.NetStandard/Adapter/MqttConnectingFailedException.cs

@@ -1,7 +1,7 @@
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Protocol;
+using MQTTnet.Exceptions;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Adapter
+namespace MQTTnet.Adapter
 {
     public class MqttConnectingFailedException : MqttCommunicationException
     {

Frameworks/MQTTnet.NetStandard/Adapter/MqttServerAdapterClientAcceptedEventArgs.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Core.Adapter
+namespace MQTTnet.Adapter
 {
     public class MqttServerAdapterClientAcceptedEventArgs : EventArgs
     {

Frameworks/MQTTnet.NetStandard/Adapter/ReceivedMqttPacket.cs

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
-using MQTTnet.Core.Packets;
+using MQTTnet.Packets;
 
-namespace MQTTnet.Core.Adapter
+namespace MQTTnet.Adapter
 {
     public sealed class ReceivedMqttPacket : IDisposable
     {

Frameworks/MQTTnet.NetStandard/ApplicationMessagePublisherExtensions.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Core
+namespace MQTTnet
 {
     public static class ApplicationMessagePublisherExtensions
     {

Frameworks/MQTTnet.NetStandard/Channel/IMqttChannel.cs

@@ -1,7 +1,7 @@
-using System.Threading.Tasks;
-using System.IO;
+using System.IO;
+using System.Threading.Tasks;
 
-namespace MQTTnet.Core.Channel
+namespace MQTTnet.Channel
 {
     public interface IMqttChannel
     {

Frameworks/MQTTnet.NetStandard/Client/IMqttClient.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MQTTnet.Core.Packets;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public interface IMqttClient : IApplicationMessageReceiver, IApplicationMessagePublisher
     {

Frameworks/MQTTnet.NetStandard/Client/IMqttClientAdapterFactory.cs

@@ -1,7 +1,7 @@
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Diagnostics;
+using MQTTnet.Adapter;
+using MQTTnet.Diagnostics;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public interface IMqttClientAdapterFactory
     {

Frameworks/MQTTnet.NetStandard/Client/IMqttClientChannelOptions.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public interface IMqttClientChannelOptions
     {

Frameworks/MQTTnet.NetStandard/Client/IMqttClientCredentials.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public interface IMqttClientCredentials
     {

Frameworks/MQTTnet.NetStandard/Client/IMqttClientFactory.cs

@@ -1,7 +1,7 @@
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.ManagedClient;
+using MQTTnet.Diagnostics;
+using MQTTnet.ManagedClient;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public interface IMqttClientFactory
     {

Frameworks/MQTTnet.NetStandard/Client/IMqttClientOptions.cs

@@ -1,7 +1,7 @@
 using System;
-using MQTTnet.Core.Serializer;
+using MQTTnet.Serializer;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public interface IMqttClientOptions
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClient.cs

@@ -3,14 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Internal;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
+using MQTTnet.Adapter;
+using MQTTnet.Diagnostics;
+using MQTTnet.Exceptions;
+using MQTTnet.Internal;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClient : IMqttClient
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientConnectResult.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientConnectResult
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientConnectedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientConnectedEventArgs : EventArgs
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientCredentials.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientCredentials : IMqttClientCredentials
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientDisconnectedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientDisconnectedEventArgs : EventArgs
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientExtensions.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public static class MqttClientExtensions
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientOptions.cs

@@ -1,7 +1,7 @@
 using System;
-using MQTTnet.Core.Serializer;
+using MQTTnet.Serializer;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientOptions : IMqttClientOptions
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientOptionsBuilder.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
-using MQTTnet.Core.Serializer;
+using MQTTnet.Serializer;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientOptionsBuilder
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientTcpOptions.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientTcpOptions : IMqttClientChannelOptions
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientTcpOptionsExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public static class MqttClientTcpOptionsExtensions
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientTlsOptions.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientTlsOptions
     {

Frameworks/MQTTnet.NetStandard/Client/MqttClientWebSocketOptions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Net;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttClientWebSocketOptions : IMqttClientChannelOptions
     {

Frameworks/MQTTnet.NetStandard/Client/MqttPacketDispatcher.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Concurrent;
 using System.Threading.Tasks;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Internal;
-using MQTTnet.Core.Packets;
+using MQTTnet.Diagnostics;
+using MQTTnet.Exceptions;
+using MQTTnet.Internal;
+using MQTTnet.Packets;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttPacketDispatcher
     {

Frameworks/MQTTnet.NetStandard/Client/MqttSubscribeResult.cs

@@ -1,7 +1,6 @@
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Client
+namespace MQTTnet.Client
 {
     public class MqttSubscribeResult
     {

Frameworks/MQTTnet.NetStandard/Diagnostics/IMqttNetLogger.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Diagnostics
+namespace MQTTnet.Diagnostics
 {
     public interface IMqttNetLogger
     {

Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetGlobalLogger.cs

@@ -1,8 +1,8 @@
 using System;
 
-namespace MQTTnet.Core.Diagnostics
+namespace MQTTnet.Diagnostics
 {
-    public static class MqttNetGlobalLog
+    public static class MqttNetGlobalLogger
     {
         public static event EventHandler<MqttNetLogMessagePublishedEventArgs> LogMessagePublished;
 

Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogLevel.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Diagnostics
+namespace MQTTnet.Diagnostics
 {
     public enum MqttNetLogLevel
     {

Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogMessage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Diagnostics
+namespace MQTTnet.Diagnostics
 {
     public sealed class MqttNetLogMessage
     {

Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Diagnostics
+namespace MQTTnet.Diagnostics
 {
     public sealed class MqttNetLogMessagePublishedEventArgs : EventArgs
     {

Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogger.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Diagnostics
+namespace MQTTnet.Diagnostics
 {
     public class MqttNetLogger : IMqttNetLogger
     {
@@ -46,7 +46,7 @@ namespace MQTTnet.Core.Diagnostics
         private void Publish<TSource>(MqttNetLogLevel logLevel, Exception exception, string message, object[] parameters)
         {
             var hasLocalListeners = LogMessagePublished != null;
-            var hasGlobalListeners = MqttNetGlobalLog.HasListeners;
+            var hasGlobalListeners = MqttNetGlobalLogger.HasListeners;
 
             if (!hasLocalListeners && !hasGlobalListeners)
             {
@@ -62,7 +62,7 @@ namespace MQTTnet.Core.Diagnostics
 
             if (hasGlobalListeners)
             {
-                MqttNetGlobalLog.Publish(traceMessage);
+                MqttNetGlobalLogger.Publish(traceMessage);
             }
 
             if (hasLocalListeners)

Frameworks/MQTTnet.NetStandard/Diagnostics/TargetFrameworkInfoProvider.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet
+namespace MQTTnet.Diagnostics
 {
     public static class TargetFrameworkInfoProvider
     {

Frameworks/MQTTnet.NetStandard/Exceptions/MqttCommunicationException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Exceptions
+namespace MQTTnet.Exceptions
 {
     public class MqttCommunicationException : Exception
     {

Frameworks/MQTTnet.NetStandard/Exceptions/MqttCommunicationTimedOutException.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Exceptions
+namespace MQTTnet.Exceptions
 {
     public sealed class MqttCommunicationTimedOutException : MqttCommunicationException
     {

Frameworks/MQTTnet.NetStandard/Exceptions/MqttProtocolViolationException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Exceptions
+namespace MQTTnet.Exceptions
 {
     public sealed class MqttProtocolViolationException : Exception
     {

Frameworks/MQTTnet.NetStandard/IApplicationMessagePublisher.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Core
+namespace MQTTnet
 {
     public interface IApplicationMessagePublisher
     {

Frameworks/MQTTnet.NetStandard/IApplicationMessageReceiver.cs

@@ -1,7 +1,6 @@
 using System;
-using MQTTnet.Core.Client;
 
-namespace MQTTnet.Core
+namespace MQTTnet
 {
     public interface IApplicationMessageReceiver
     {

Frameworks/MQTTnet.NetStandard/Implementations/MqttClientAdapterFactory.cs

@@ -1,8 +1,8 @@
 using System;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Client;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Serializer;
+using MQTTnet.Adapter;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;
+using MQTTnet.Serializer;
 
 namespace MQTTnet.Implementations
 {

Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.Uwp.cs

@@ -1,11 +1,11 @@
 #if WINDOWS_UWP
 using System;
 using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Server;
 using Windows.Networking.Sockets;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Serializer;
+using MQTTnet.Adapter;
+using MQTTnet.Diagnostics;
+using MQTTnet.Serializer;
+using MQTTnet.Server;
 
 namespace MQTTnet.Implementations
 {

Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.cs

@@ -7,10 +7,10 @@ using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Server;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Serializer;
+using MQTTnet.Adapter;
+using MQTTnet.Diagnostics;
+using MQTTnet.Serializer;
+using MQTTnet.Server;
 
 namespace MQTTnet.Implementations
 {

Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.Uwp.cs

@@ -8,8 +8,8 @@ using System.Threading.Tasks;
 using Windows.Networking;
 using Windows.Networking.Sockets;
 using Windows.Security.Cryptography.Certificates;
-using MQTTnet.Core.Channel;
-using MQTTnet.Core.Client;
+using MQTTnet.Channel;
+using MQTTnet.Client;
 
 namespace MQTTnet.Implementations
 {

Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.cs

@@ -5,10 +5,10 @@ using System.Net.Sockets;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
-using MQTTnet.Core.Channel;
-using MQTTnet.Core.Client;
 using System.IO;
 using System.Linq;
+using MQTTnet.Channel;
+using MQTTnet.Client;
 
 namespace MQTTnet.Implementations
 {

Frameworks/MQTTnet.NetStandard/Implementations/MqttWebSocketChannel.cs

@@ -1,11 +1,11 @@
-using MQTTnet.Core.Channel;
-using MQTTnet.Core.Client;
-using System;
+using System;
 using System.IO;
 using System.Net.WebSockets;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.Channel;
+using MQTTnet.Client;
 
 namespace MQTTnet.Implementations
 {

Frameworks/MQTTnet.NetStandard/Implementations/WebSocketStream.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Exceptions;
+using MQTTnet.Exceptions;
 
 namespace MQTTnet.Implementations
 {

Frameworks/MQTTnet.NetStandard/Internal/MqttApplicationMessageExtensions.cs

@@ -1,6 +1,6 @@
-using MQTTnet.Core.Packets;
+using MQTTnet.Packets;
 
-namespace MQTTnet.Core.Internal
+namespace MQTTnet.Internal
 {
     internal static class MqttApplicationMessageExtensions
     {

Frameworks/MQTTnet.NetStandard/Internal/TaskExtensions.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Exceptions;
+using MQTTnet.Exceptions;
 
-namespace MQTTnet.Core.Internal
+namespace MQTTnet.Internal
 {
     public static class TaskExtensions
     {

Frameworks/MQTTnet.NetStandard/MQTTnet.Netstandard.csproj

@@ -14,6 +14,8 @@
     <Description />
     <Authors />
     <PackageId />
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>codeSigningKey.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
@@ -33,10 +35,6 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\MQTTnet.Core\MQTTnet.Core.csproj" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <PackageReference Include="System.Net.Security" Version="4.3.2" />
     <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />

Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClient.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MQTTnet.Core.Client;
+using MQTTnet.Client;
 
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public interface IManagedMqttClient : IApplicationMessageReceiver, IApplicationMessagePublisher
     {

Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClientOptions.cs

@@ -1,7 +1,7 @@
 using System;
-using MQTTnet.Core.Client;
+using MQTTnet.Client;
 
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public interface IManagedMqttClientOptions
     {

Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClientStorage.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public interface IManagedMqttClientStorage
     {

Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClient.cs

@@ -4,12 +4,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Client;
-using MQTTnet.Core.Diagnostics;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Protocol;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;
+using MQTTnet.Exceptions;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public class ManagedMqttClient : IManagedMqttClient
     {

Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientExtensions.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public static class ManagedMqttClientExtensions
     {

Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientOptions.cs

@@ -1,7 +1,7 @@
 using System;
-using MQTTnet.Core.Client;
+using MQTTnet.Client;
 
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public class ManagedMqttClientOptions : IManagedMqttClientOptions
     {

Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientOptionsBuilder.cs

@@ -1,7 +1,7 @@
 using System;
-using MQTTnet.Core.Client;
+using MQTTnet.Client;
 
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public class ManagedMqttClientOptionsBuilder
     {

Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientStorageManager.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public class ManagedMqttClientStorageManager
     {

Frameworks/MQTTnet.NetStandard/ManagedClient/ReconnectionResult.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.ManagedClient
+namespace MQTTnet.ManagedClient
 {
     public enum ReconnectionResult
     {

Frameworks/MQTTnet.NetStandard/MqttApplicationMessage.cs

@@ -1,7 +1,7 @@
 using System;
-using MQTTnet.Core.Protocol;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core
+namespace MQTTnet
 {
     public sealed class MqttApplicationMessage
     {

Frameworks/MQTTnet.NetStandard/MqttApplicationMessageBuilder.cs

@@ -2,10 +2,10 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Protocol;
+using MQTTnet.Exceptions;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core
+namespace MQTTnet
 {
     public class MqttApplicationMessageBuilder
     {

Frameworks/MQTTnet.NetStandard/MqttApplicationMessageReceivedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core
+namespace MQTTnet
 {
     public sealed class MqttApplicationMessageReceivedEventArgs : EventArgs
     {

Frameworks/MQTTnet.NetStandard/MqttFactory.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Client;
+using MQTTnet.Adapter;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;
 using MQTTnet.Implementations;
-using MQTTnet.Core.ManagedClient;
-using MQTTnet.Core.Server;
-using MQTTnet.Core.Diagnostics;
+using MQTTnet.ManagedClient;
+using MQTTnet.Server;
 
 namespace MQTTnet
 {

Frameworks/MQTTnet.NetStandard/Packets/IMqttPacketWithIdentifier.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public interface IMqttPacketWithIdentifier
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttBasePacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public abstract class MqttBasePacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttBasePublishPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public class MqttBasePublishPacket : MqttBasePacket, IMqttPacketWithIdentifier
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttConnAckPacket.cs

@@ -1,6 +1,6 @@
-using MQTTnet.Core.Protocol;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttConnAckPacket : MqttBasePacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttConnectPacket.cs

@@ -1,6 +1,6 @@
-using MQTTnet.Core.Serializer;
+using MQTTnet.Serializer;
 
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttConnectPacket : MqttBasePacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttDisconnectPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttDisconnectPacket : MqttBasePacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPacketExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public static class MqttPacketExtensions
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPacketHeader.cs

@@ -1,6 +1,6 @@
-using MQTTnet.Core.Protocol;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public class MqttPacketHeader
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPingReqPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttPingReqPacket : MqttBasePacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPingRespPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttPingRespPacket : MqttBasePacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPubAckPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttPubAckPacket : MqttBasePublishPacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPubCompPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttPubCompPacket : MqttBasePublishPacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPubRecPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttPubRecPacket : MqttBasePublishPacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPubRelPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttPubRelPacket : MqttBasePublishPacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttPublishPacket.cs

@@ -1,6 +1,6 @@
-using MQTTnet.Core.Protocol;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttPublishPacket : MqttBasePublishPacket
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttSubAckPacket.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using MQTTnet.Core.Protocol;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttSubAckPacket : MqttBasePacket, IMqttPacketWithIdentifier
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttSubscribePacket.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttSubscribePacket : MqttBasePacket, IMqttPacketWithIdentifier
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttUnsubAckPacket.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttUnsubAckPacket : MqttBasePacket, IMqttPacketWithIdentifier
     {

Frameworks/MQTTnet.NetStandard/Packets/MqttUnsubscribe.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace MQTTnet.Core.Packets
+namespace MQTTnet.Packets
 {
     public sealed class MqttUnsubscribePacket : MqttBasePacket, IMqttPacketWithIdentifier
     {

Frameworks/MQTTnet.NetStandard/Protocol/MqttConnectReturnCode.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Protocol
+namespace MQTTnet.Protocol
 {
     public enum MqttConnectReturnCode
     {

Frameworks/MQTTnet.NetStandard/Protocol/MqttControlPacketType.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Protocol
+namespace MQTTnet.Protocol
 {
     public enum MqttControlPacketType
     {

Frameworks/MQTTnet.NetStandard/Protocol/MqttQualityOfServiceLevel.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Protocol
+namespace MQTTnet.Protocol
 {
     public enum MqttQualityOfServiceLevel
     {

Frameworks/MQTTnet.NetStandard/Protocol/MqttSubscribeReturnCode.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Core.Protocol
+namespace MQTTnet.Protocol
 {
     public enum MqttSubscribeReturnCode
     {

Frameworks/MQTTnet.NetStandard/Serializer/ByteReader.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Serializer
+namespace MQTTnet.Serializer
 {
     public sealed class ByteReader
     {

Frameworks/MQTTnet.NetStandard/Serializer/ByteWriter.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Core.Serializer
+namespace MQTTnet.Serializer
 {
     public sealed class ByteWriter
     {

Frameworks/MQTTnet.NetStandard/Serializer/IMqttPacketSerializer.cs

@@ -1,7 +1,7 @@
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Packets;
+using MQTTnet.Adapter;
+using MQTTnet.Packets;
 
-namespace MQTTnet.Core.Serializer
+namespace MQTTnet.Serializer
 {
     public interface IMqttPacketSerializer
     {

Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketReader.cs

@@ -4,12 +4,12 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Protocol;
-using MQTTnet.Core.Packets;
+using MQTTnet.Adapter;
+using MQTTnet.Exceptions;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Serializer
+namespace MQTTnet.Serializer
 {
     public sealed class MqttPacketReader : BinaryReader
     {

Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketSerializer.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
+using MQTTnet.Adapter;
+using MQTTnet.Exceptions;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Serializer
+namespace MQTTnet.Serializer
 {
     public sealed class MqttPacketSerializer : IMqttPacketSerializer
     {

Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketWriter.cs

@@ -1,10 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using MQTTnet.Core.Protocol;
-using System.Collections.Generic;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Core.Serializer
+namespace MQTTnet.Serializer
 {
     public sealed class MqttPacketWriter : BinaryWriter
     {