From f9d67e2cd2420e3c4a8c445b1ca962bb5f49e354 Mon Sep 17 00:00:00 2001 From: Christian Kratky Date: Sat, 25 Nov 2017 19:55:26 +0100 Subject: [PATCH] Merge proces, enable signing of the assembly. --- .gitignore | 2 ++ Build/MQTTnet.nuspec | 14 ++++------- .../ApplicationBuilderExtensions.cs | 2 +- .../MQTTnet.AspnetCore/MqttHostedServer.cs | 6 ++--- .../MqttWebSocketServerAdapter.cs | 8 +++--- .../MqttWebSocketServerChannel.cs | 2 +- .../ServiceCollectionExtensions.cs | 6 ++--- .../Adapter/IMqttChannelAdapter.cs | 6 ++--- .../Adapter/IMqttServerAdapter.cs | 4 +-- .../Adapter/MqttChannelAdapter.cs | 14 +++++------ .../Adapter/MqttChannelAdapterExtensions.cs | 4 +-- .../Adapter/MqttConnectingFailedException.cs | 6 ++--- ...qttServerAdapterClientAcceptedEventArgs.cs | 2 +- .../Adapter/ReceivedMqttPacket.cs | 4 +-- .../ApplicationMessagePublisherExtensions.cs | 2 +- .../Channel/IMqttChannel.cs | 6 ++--- .../Client/IMqttClient.cs | 3 +-- .../Client/IMqttClientAdapterFactory.cs | 6 ++--- .../Client/IMqttClientChannelOptions.cs | 2 +- .../Client/IMqttClientCredentials.cs | 2 +- .../Client/IMqttClientFactory.cs | 6 ++--- .../Client/IMqttClientOptions.cs | 4 +-- .../MQTTnet.NetStandard}/Client/MqttClient.cs | 14 +++++------ .../Client/MqttClientConnectResult.cs | 2 +- .../Client/MqttClientConnectedEventArgs.cs | 2 +- .../Client/MqttClientCredentials.cs | 2 +- .../Client/MqttClientDisconnectedEventArgs.cs | 2 +- .../Client/MqttClientExtensions.cs | 2 +- .../Client/MqttClientOptions.cs | 4 +-- .../Client/MqttClientOptionsBuilder.cs | 4 +-- .../Client/MqttClientTcpOptions.cs | 2 +- .../Client/MqttClientTcpOptionsExtensions.cs | 2 +- .../Client/MqttClientTlsOptions.cs | 2 +- .../Client/MqttClientWebSocketOptions.cs | 2 +- .../Client/MqttPacketDispatcher.cs | 10 ++++---- .../Client/MqttSubscribeResult.cs | 5 ++-- .../Diagnostics/IMqttNetLogger.cs | 2 +- .../Diagnostics/MqttNetGlobalLogger.cs | 4 +-- .../Diagnostics/MqttNetLogLevel.cs | 2 +- .../Diagnostics/MqttNetLogMessage.cs | 2 +- .../MqttNetLogMessagePublishedEventArgs.cs | 2 +- .../Diagnostics/MqttNetLogger.cs | 6 ++--- .../TargetFrameworkInfoProvider.cs | 2 +- .../Exceptions/MqttCommunicationException.cs | 2 +- .../MqttCommunicationTimedOutException.cs | 2 +- .../MqttProtocolViolationException.cs | 2 +- .../IApplicationMessagePublisher.cs | 2 +- .../IApplicationMessageReceiver.cs | 3 +-- .../MqttClientAdapterFactory.cs | 8 +++--- .../Implementations/MqttServerAdapter.Uwp.cs | 8 +++--- .../Implementations/MqttServerAdapter.cs | 8 +++--- .../Implementations/MqttTcpChannel.Uwp.cs | 4 +-- .../Implementations/MqttTcpChannel.cs | 4 +-- .../Implementations/MqttWebSocketChannel.cs | 6 ++--- .../Implementations/WebSocketStream.cs | 2 +- .../MqttApplicationMessageExtensions.cs | 4 +-- .../Internal/TaskExtensions.cs | 4 +-- .../MQTTnet.Netstandard.csproj | 6 ++--- .../ManagedClient/IManagedMqttClient.cs | 4 +-- .../IManagedMqttClientOptions.cs | 4 +-- .../IManagedMqttClientStorage.cs | 2 +- .../ManagedClient/ManagedMqttClient.cs | 10 ++++---- .../ManagedMqttClientExtensions.cs | 2 +- .../ManagedClient/ManagedMqttClientOptions.cs | 4 +-- .../ManagedMqttClientOptionsBuilder.cs | 4 +-- .../ManagedMqttClientStorageManager.cs | 2 +- .../ManagedClient/ReconnectionResult.cs | 2 +- .../MqttApplicationMessage.cs | 4 +-- .../MqttApplicationMessageBuilder.cs | 6 ++--- ...MqttApplicationMessageReceivedEventArgs.cs | 2 +- Frameworks/MQTTnet.NetStandard/MqttFactory.cs | 10 ++++---- .../Packets/IMqttPacketWithIdentifier.cs | 2 +- .../Packets/MqttBasePacket.cs | 2 +- .../Packets/MqttBasePublishPacket.cs | 2 +- .../Packets/MqttConnAckPacket.cs | 4 +-- .../Packets/MqttConnectPacket.cs | 4 +-- .../Packets/MqttDisconnectPacket.cs | 2 +- .../Packets/MqttPacketExtensions.cs | 2 +- .../Packets/MqttPacketHeader.cs | 4 +-- .../Packets/MqttPingReqPacket.cs | 2 +- .../Packets/MqttPingRespPacket.cs | 2 +- .../Packets/MqttPubAckPacket.cs | 2 +- .../Packets/MqttPubCompPacket.cs | 2 +- .../Packets/MqttPubRecPacket.cs | 2 +- .../Packets/MqttPubRelPacket.cs | 2 +- .../Packets/MqttPublishPacket.cs | 4 +-- .../Packets/MqttSubAckPacket.cs | 4 +-- .../Packets/MqttSubscribePacket.cs | 2 +- .../Packets/MqttUnsubAckPacket.cs | 2 +- .../Packets/MqttUnsubscribe.cs | 2 +- .../Protocol/MqttConnectReturnCode.cs | 2 +- .../Protocol/MqttControlPacketType.cs | 2 +- .../Protocol/MqttQualityOfServiceLevel.cs | 2 +- .../Protocol/MqttSubscribeReturnCode.cs | 2 +- .../Serializer/ByteReader.cs | 2 +- .../Serializer/ByteWriter.cs | 2 +- .../Serializer/IMqttPacketSerializer.cs | 6 ++--- .../Serializer/MqttPacketReader.cs | 10 ++++---- .../Serializer/MqttPacketSerializer.cs | 10 ++++---- .../Serializer/MqttPacketWriter.cs | 6 ++--- .../Serializer/MqttProtocolVersion.cs | 2 +- .../Server/CheckSubscriptionsResult.cs | 4 +-- .../Server/ConnectedMqttClient.cs | 4 +-- .../Server/GetOrCreateClientSessionResult.cs | 2 +- .../Server/IMqttServer.cs | 2 +- .../Server/IMqttServerFactory.cs | 6 ++--- .../Server/IMqttServerStorage.cs | 2 +- ...qttApplicationMessageInterceptorContext.cs | 2 +- .../Server/MqttClientConnectedEventArgs.cs | 2 +- .../Server/MqttClientDisconnectedEventArgs.cs | 2 +- .../Server/MqttClientPendingMessagesQueue.cs | 12 ++++----- .../Server/MqttClientSession.cs | 16 ++++++------ .../Server/MqttClientSessionsManager.cs | 16 ++++++------ .../Server/MqttClientSubscribeResult.cs | 4 +-- .../Server/MqttClientSubscriptionsManager.cs | 6 ++--- .../Server/MqttConnectionValidatorContext.cs | 4 +-- .../Server/MqttRetainedMessagesManager.cs | 6 ++--- .../MQTTnet.NetStandard}/Server/MqttServer.cs | 8 +++--- .../MqttServerDefaultEndpointOptions.cs | 2 +- .../Server/MqttServerOptions.cs | 6 ++--- .../Server/MqttServerOptionsBuilder.cs | 6 ++--- .../Server/MqttServerOptionsExtensions.cs | 2 +- .../Server/MqttServerStartedEventArgs.cs | 2 +- .../Server/MqttServerTlsEndpointOptions.cs | 2 +- .../Server/MqttSubscribeResult.cs | 4 +-- .../MqttSubscriptionInterceptorContext.cs | 2 +- .../Server/MqttTopicFilterComparer.cs | 2 +- .../MQTTnet.NetStandard}/TopicFilter.cs | 4 +-- .../TopicFilterBuilder.cs | 6 ++--- MQTTnet.Core/MQTTnet.Core.csproj | 25 ------------------- MQTTnet.sln | 20 +-------------- Tests/MQTTnet.Core.Tests/ByteReaderTests.cs | 2 +- Tests/MQTTnet.Core.Tests/ByteWriterTests.cs | 2 +- Tests/MQTTnet.Core.Tests/ExtensionTests.cs | 4 +-- .../MqttApplicationMessageBuilderTests.cs | 2 +- .../MqttPacketReaderTests.cs | 2 +- .../MqttPacketSerializerTests.cs | 8 +++--- Tests/MQTTnet.Core.Tests/MqttServerTests.cs | 8 +++--- .../MqttSubscriptionsManagerTests.cs | 6 ++--- .../TestMqttCommunicationAdapter.cs | 6 ++--- .../TestMqttCommunicationAdapterFactory.cs | 6 ++--- .../TestMqttServerAdapter.cs | 12 ++++----- .../TopicFilterComparerTests.cs | 2 +- Tests/MQTTnet.TestApp.AspNetCore2/Startup.cs | 3 +-- Tests/MQTTnet.TestApp.NetCore/ClientTest.cs | 3 +-- .../ManagedClientTest.cs | 7 +++--- .../MqttNetConsoleLogger.cs | 8 +++--- .../PerformanceTest.cs | 9 +++---- Tests/MQTTnet.TestApp.NetCore/Program.cs | 8 +++--- Tests/MQTTnet.TestApp.NetCore/ServerTest.cs | 4 +-- .../JsonServerStorage.cs | 3 +-- .../MQTTnet.TestApp.UniversalWindows.csproj | 4 --- .../MainPage.xaml.cs | 15 ++++++----- 153 files changed, 323 insertions(+), 383 deletions(-) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Adapter/IMqttChannelAdapter.cs (85%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Adapter/IMqttServerAdapter.cs (82%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Adapter/MqttChannelAdapter.cs (96%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Adapter/MqttChannelAdapterExtensions.cs (89%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Adapter/MqttConnectingFailedException.cs (79%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Adapter/MqttServerAdapterClientAcceptedEventArgs.cs (93%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Adapter/ReceivedMqttPacket.cs (90%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ApplicationMessagePublisherExtensions.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Channel/IMqttChannel.cs (69%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/IMqttClient.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/IMqttClientAdapterFactory.cs (64%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/IMqttClientChannelOptions.cs (77%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/IMqttClientCredentials.cs (78%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/IMqttClientFactory.cs (74%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/IMqttClientOptions.cs (88%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClient.cs (98%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientConnectResult.cs (87%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientConnectedEventArgs.cs (90%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientCredentials.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientDisconnectedEventArgs.cs (90%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientExtensions.cs (96%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientOptions.cs (92%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientOptionsBuilder.cs (98%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientTcpOptions.cs (88%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientTcpOptionsExtensions.cs (93%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientTlsOptions.cs (92%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttClientWebSocketOptions.cs (94%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttPacketDispatcher.cs (96%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Client/MqttSubscribeResult.cs (79%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Diagnostics/IMqttNetLogger.cs (94%) rename MQTTnet.Core/Diagnostics/MqttNetGlobalLog.cs => Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetGlobalLogger.cs (86%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Diagnostics/MqttNetLogLevel.cs (74%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Diagnostics/MqttNetLogMessage.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Diagnostics/MqttNetLogger.cs (93%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Exceptions/MqttCommunicationException.cs (92%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Exceptions/MqttCommunicationTimedOutException.cs (73%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Exceptions/MqttProtocolViolationException.cs (86%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/IApplicationMessagePublisher.cs (90%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/IApplicationMessageReceiver.cs (78%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Internal/MqttApplicationMessageExtensions.cs (94%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Internal/TaskExtensions.cs (97%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/IManagedMqttClient.cs (90%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/IManagedMqttClientOptions.cs (77%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/IManagedMqttClientStorage.cs (88%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/ManagedMqttClient.cs (98%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/ManagedMqttClientExtensions.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/ManagedMqttClientOptions.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/ManagedMqttClientOptionsBuilder.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/ManagedMqttClientStorageManager.cs (98%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/ManagedClient/ReconnectionResult.cs (74%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/MqttApplicationMessage.cs (94%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/MqttApplicationMessageBuilder.cs (97%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/MqttApplicationMessageReceivedEventArgs.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/IMqttPacketWithIdentifier.cs (76%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttBasePacket.cs (62%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttBasePublishPacket.cs (81%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttConnAckPacket.cs (85%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttConnectPacket.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttDisconnectPacket.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPacketExtensions.cs (96%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPacketHeader.cs (77%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPingReqPacket.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPingRespPacket.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPubAckPacket.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPubCompPacket.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPubRecPacket.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPubRelPacket.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttPublishPacket.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttSubAckPacket.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttSubscribePacket.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttUnsubAckPacket.cs (89%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Packets/MqttUnsubscribe.cs (94%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Protocol/MqttConnectReturnCode.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Protocol/MqttControlPacketType.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Protocol/MqttQualityOfServiceLevel.cs (80%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Protocol/MqttSubscribeReturnCode.cs (84%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Serializer/ByteReader.cs (96%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Serializer/ByteWriter.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Serializer/IMqttPacketSerializer.cs (72%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Serializer/MqttPacketReader.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Serializer/MqttPacketSerializer.cs (99%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Serializer/MqttPacketWriter.cs (96%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Serializer/MqttProtocolVersion.cs (68%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/CheckSubscriptionsResult.cs (74%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/ConnectedMqttClient.cs (72%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/GetOrCreateClientSessionResult.cs (84%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/IMqttServer.cs (94%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/IMqttServerFactory.cs (72%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/IMqttServerStorage.cs (90%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttApplicationMessageInterceptorContext.cs (81%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttClientConnectedEventArgs.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttClientDisconnectedEventArgs.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttClientPendingMessagesQueue.cs (95%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttClientSession.cs (97%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttClientSessionsManager.cs (97%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttClientSubscribeResult.cs (73%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttClientSubscriptionsManager.cs (97%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttConnectionValidatorContext.cs (91%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttRetainedMessagesManager.cs (98%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttServer.cs (98%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttServerDefaultEndpointOptions.cs (83%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttServerOptions.cs (90%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttServerOptionsBuilder.cs (96%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttServerOptionsExtensions.cs (96%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttServerStartedEventArgs.cs (75%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttServerTlsEndpointOptions.cs (85%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttSubscribeResult.cs (73%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttSubscriptionInterceptorContext.cs (93%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/Server/MqttTopicFilterComparer.cs (97%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/TopicFilter.cs (92%) rename {MQTTnet.Core => Frameworks/MQTTnet.NetStandard}/TopicFilterBuilder.cs (93%) delete mode 100644 MQTTnet.Core/MQTTnet.Core.csproj rename {Frameworks/MQTTnet.NetStandard/Diagnostics => Tests/MQTTnet.TestApp.NetCore}/MqttNetConsoleLogger.cs (88%) diff --git a/.gitignore b/.gitignore index 4372f8ed..7c38d7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -291,3 +291,5 @@ __pycache__/ Build/nuget.exe *.js *.map + +*codeSigningKey.pfx diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec index 8dd284ea..2ebe29de 100644 --- a/Build/MQTTnet.nuspec +++ b/Build/MQTTnet.nuspec @@ -2,7 +2,7 @@ MQTTnet - 2.5.3 + 2.6.0 Christian Kratky Christian Kratky https://github.com/chkr1011/MQTTnet/blob/master/LICENSE @@ -10,9 +10,9 @@ https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png false MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker). - * [Core] Removed all dependencies to other libraries (BREAKING CHANGE!). -* [Core] Updated SDK libraries. -* [Client] Fixed broken support for WebSocketSecure connections (Thanks to @StAI). + * Merged projects. +* Added a strong name for the assembly. + Copyright Christian Kratky 2016-2017 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 @@ -46,23 +46,19 @@ + - - - - - diff --git a/Frameworks/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs b/Frameworks/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs index 831392da..5a25712d 100644 --- a/Frameworks/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.AspnetCore/MqttHostedServer.cs b/Frameworks/MQTTnet.AspnetCore/MqttHostedServer.cs index a8061052..7c7d3041 100644 --- a/Frameworks/MQTTnet.AspnetCore/MqttHostedServer.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs b/Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs index 27810924..5af8b64d 100644 --- a/Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerChannel.cs b/Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerChannel.cs index 55b49400..7325a5f8 100644 --- a/Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerChannel.cs +++ b/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 diff --git a/Frameworks/MQTTnet.AspnetCore/ServiceCollectionExtensions.cs b/Frameworks/MQTTnet.AspnetCore/ServiceCollectionExtensions.cs index 236d44d1..a6af6ebe 100644 --- a/Frameworks/MQTTnet.AspnetCore/ServiceCollectionExtensions.cs +++ b/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 { diff --git a/MQTTnet.Core/Adapter/IMqttChannelAdapter.cs b/Frameworks/MQTTnet.NetStandard/Adapter/IMqttChannelAdapter.cs similarity index 85% rename from MQTTnet.Core/Adapter/IMqttChannelAdapter.cs rename to Frameworks/MQTTnet.NetStandard/Adapter/IMqttChannelAdapter.cs index 13908f62..5f58d0c5 100644 --- a/MQTTnet.Core/Adapter/IMqttChannelAdapter.cs +++ b/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 { diff --git a/MQTTnet.Core/Adapter/IMqttServerAdapter.cs b/Frameworks/MQTTnet.NetStandard/Adapter/IMqttServerAdapter.cs similarity index 82% rename from MQTTnet.Core/Adapter/IMqttServerAdapter.cs rename to Frameworks/MQTTnet.NetStandard/Adapter/IMqttServerAdapter.cs index 9209185e..d4ea9413 100644 --- a/MQTTnet.Core/Adapter/IMqttServerAdapter.cs +++ b/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 { diff --git a/MQTTnet.Core/Adapter/MqttChannelAdapter.cs b/Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapter.cs similarity index 96% rename from MQTTnet.Core/Adapter/MqttChannelAdapter.cs rename to Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapter.cs index 5dfcfc01..53603fa5 100644 --- a/MQTTnet.Core/Adapter/MqttChannelAdapter.cs +++ b/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 { diff --git a/MQTTnet.Core/Adapter/MqttChannelAdapterExtensions.cs b/Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapterExtensions.cs similarity index 89% rename from MQTTnet.Core/Adapter/MqttChannelAdapterExtensions.cs rename to Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapterExtensions.cs index f271248f..58258ab6 100644 --- a/MQTTnet.Core/Adapter/MqttChannelAdapterExtensions.cs +++ b/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 { diff --git a/MQTTnet.Core/Adapter/MqttConnectingFailedException.cs b/Frameworks/MQTTnet.NetStandard/Adapter/MqttConnectingFailedException.cs similarity index 79% rename from MQTTnet.Core/Adapter/MqttConnectingFailedException.cs rename to Frameworks/MQTTnet.NetStandard/Adapter/MqttConnectingFailedException.cs index 045d0d13..68445cfd 100644 --- a/MQTTnet.Core/Adapter/MqttConnectingFailedException.cs +++ b/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 { diff --git a/MQTTnet.Core/Adapter/MqttServerAdapterClientAcceptedEventArgs.cs b/Frameworks/MQTTnet.NetStandard/Adapter/MqttServerAdapterClientAcceptedEventArgs.cs similarity index 93% rename from MQTTnet.Core/Adapter/MqttServerAdapterClientAcceptedEventArgs.cs rename to Frameworks/MQTTnet.NetStandard/Adapter/MqttServerAdapterClientAcceptedEventArgs.cs index 341f6327..42852493 100644 --- a/MQTTnet.Core/Adapter/MqttServerAdapterClientAcceptedEventArgs.cs +++ b/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 { diff --git a/MQTTnet.Core/Adapter/ReceivedMqttPacket.cs b/Frameworks/MQTTnet.NetStandard/Adapter/ReceivedMqttPacket.cs similarity index 90% rename from MQTTnet.Core/Adapter/ReceivedMqttPacket.cs rename to Frameworks/MQTTnet.NetStandard/Adapter/ReceivedMqttPacket.cs index f7fdbcc5..a44fb54e 100644 --- a/MQTTnet.Core/Adapter/ReceivedMqttPacket.cs +++ b/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 { diff --git a/MQTTnet.Core/ApplicationMessagePublisherExtensions.cs b/Frameworks/MQTTnet.NetStandard/ApplicationMessagePublisherExtensions.cs similarity index 95% rename from MQTTnet.Core/ApplicationMessagePublisherExtensions.cs rename to Frameworks/MQTTnet.NetStandard/ApplicationMessagePublisherExtensions.cs index 6893a1b6..73328de9 100644 --- a/MQTTnet.Core/ApplicationMessagePublisherExtensions.cs +++ b/Frameworks/MQTTnet.NetStandard/ApplicationMessagePublisherExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace MQTTnet.Core +namespace MQTTnet { public static class ApplicationMessagePublisherExtensions { diff --git a/MQTTnet.Core/Channel/IMqttChannel.cs b/Frameworks/MQTTnet.NetStandard/Channel/IMqttChannel.cs similarity index 69% rename from MQTTnet.Core/Channel/IMqttChannel.cs rename to Frameworks/MQTTnet.NetStandard/Channel/IMqttChannel.cs index 92c0681b..809b0b06 100644 --- a/MQTTnet.Core/Channel/IMqttChannel.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/IMqttClient.cs b/Frameworks/MQTTnet.NetStandard/Client/IMqttClient.cs similarity index 91% rename from MQTTnet.Core/Client/IMqttClient.cs rename to Frameworks/MQTTnet.NetStandard/Client/IMqttClient.cs index 6a39e211..0ac2f491 100644 --- a/MQTTnet.Core/Client/IMqttClient.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/IMqttClientAdapterFactory.cs b/Frameworks/MQTTnet.NetStandard/Client/IMqttClientAdapterFactory.cs similarity index 64% rename from MQTTnet.Core/Client/IMqttClientAdapterFactory.cs rename to Frameworks/MQTTnet.NetStandard/Client/IMqttClientAdapterFactory.cs index 3bd61431..8b144818 100644 --- a/MQTTnet.Core/Client/IMqttClientAdapterFactory.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/IMqttClientChannelOptions.cs b/Frameworks/MQTTnet.NetStandard/Client/IMqttClientChannelOptions.cs similarity index 77% rename from MQTTnet.Core/Client/IMqttClientChannelOptions.cs rename to Frameworks/MQTTnet.NetStandard/Client/IMqttClientChannelOptions.cs index 004430f9..22249632 100644 --- a/MQTTnet.Core/Client/IMqttClientChannelOptions.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/IMqttClientChannelOptions.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public interface IMqttClientChannelOptions { diff --git a/MQTTnet.Core/Client/IMqttClientCredentials.cs b/Frameworks/MQTTnet.NetStandard/Client/IMqttClientCredentials.cs similarity index 78% rename from MQTTnet.Core/Client/IMqttClientCredentials.cs rename to Frameworks/MQTTnet.NetStandard/Client/IMqttClientCredentials.cs index c4dfc127..d214d64f 100644 --- a/MQTTnet.Core/Client/IMqttClientCredentials.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/IMqttClientCredentials.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public interface IMqttClientCredentials { diff --git a/MQTTnet.Core/Client/IMqttClientFactory.cs b/Frameworks/MQTTnet.NetStandard/Client/IMqttClientFactory.cs similarity index 74% rename from MQTTnet.Core/Client/IMqttClientFactory.cs rename to Frameworks/MQTTnet.NetStandard/Client/IMqttClientFactory.cs index 8acdb91a..444c16fc 100644 --- a/MQTTnet.Core/Client/IMqttClientFactory.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/IMqttClientOptions.cs b/Frameworks/MQTTnet.NetStandard/Client/IMqttClientOptions.cs similarity index 88% rename from MQTTnet.Core/Client/IMqttClientOptions.cs rename to Frameworks/MQTTnet.NetStandard/Client/IMqttClientOptions.cs index 9139d5cb..035dba11 100644 --- a/MQTTnet.Core/Client/IMqttClientOptions.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/MqttClient.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClient.cs similarity index 98% rename from MQTTnet.Core/Client/MqttClient.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClient.cs index f270a381..a24fbff9 100644 --- a/MQTTnet.Core/Client/MqttClient.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/MqttClientConnectResult.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientConnectResult.cs similarity index 87% rename from MQTTnet.Core/Client/MqttClientConnectResult.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientConnectResult.cs index 57db57df..6044bf50 100644 --- a/MQTTnet.Core/Client/MqttClientConnectResult.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/MqttClientConnectResult.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public class MqttClientConnectResult { diff --git a/MQTTnet.Core/Client/MqttClientConnectedEventArgs.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientConnectedEventArgs.cs similarity index 90% rename from MQTTnet.Core/Client/MqttClientConnectedEventArgs.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientConnectedEventArgs.cs index 107a2c95..c8c6ce56 100644 --- a/MQTTnet.Core/Client/MqttClientConnectedEventArgs.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/MqttClientConnectedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public class MqttClientConnectedEventArgs : EventArgs { diff --git a/MQTTnet.Core/Client/MqttClientCredentials.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientCredentials.cs similarity index 83% rename from MQTTnet.Core/Client/MqttClientCredentials.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientCredentials.cs index 085778a3..feaa1e6c 100644 --- a/MQTTnet.Core/Client/MqttClientCredentials.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/MqttClientCredentials.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public class MqttClientCredentials : IMqttClientCredentials { diff --git a/MQTTnet.Core/Client/MqttClientDisconnectedEventArgs.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientDisconnectedEventArgs.cs similarity index 90% rename from MQTTnet.Core/Client/MqttClientDisconnectedEventArgs.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientDisconnectedEventArgs.cs index 1e9609ef..26125b9f 100644 --- a/MQTTnet.Core/Client/MqttClientDisconnectedEventArgs.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/MqttClientDisconnectedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public class MqttClientDisconnectedEventArgs : EventArgs { diff --git a/MQTTnet.Core/Client/MqttClientExtensions.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientExtensions.cs similarity index 96% rename from MQTTnet.Core/Client/MqttClientExtensions.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientExtensions.cs index 567184d0..a1a89e30 100644 --- a/MQTTnet.Core/Client/MqttClientExtensions.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/MqttClientOptions.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientOptions.cs similarity index 92% rename from MQTTnet.Core/Client/MqttClientOptions.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientOptions.cs index 04cf8bdb..20e711f3 100644 --- a/MQTTnet.Core/Client/MqttClientOptions.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/MqttClientOptionsBuilder.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientOptionsBuilder.cs similarity index 98% rename from MQTTnet.Core/Client/MqttClientOptionsBuilder.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientOptionsBuilder.cs index 429a3fa7..079e6351 100644 --- a/MQTTnet.Core/Client/MqttClientOptionsBuilder.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/MqttClientTcpOptions.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientTcpOptions.cs similarity index 88% rename from MQTTnet.Core/Client/MqttClientTcpOptions.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientTcpOptions.cs index e5cf8d6c..f44d424a 100644 --- a/MQTTnet.Core/Client/MqttClientTcpOptions.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/MqttClientTcpOptions.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public class MqttClientTcpOptions : IMqttClientChannelOptions { diff --git a/MQTTnet.Core/Client/MqttClientTcpOptionsExtensions.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientTcpOptionsExtensions.cs similarity index 93% rename from MQTTnet.Core/Client/MqttClientTcpOptionsExtensions.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientTcpOptionsExtensions.cs index cada6f8b..460069a7 100644 --- a/MQTTnet.Core/Client/MqttClientTcpOptionsExtensions.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/MqttClientTcpOptionsExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public static class MqttClientTcpOptionsExtensions { diff --git a/MQTTnet.Core/Client/MqttClientTlsOptions.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientTlsOptions.cs similarity index 92% rename from MQTTnet.Core/Client/MqttClientTlsOptions.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientTlsOptions.cs index 33cd691f..6478b267 100644 --- a/MQTTnet.Core/Client/MqttClientTlsOptions.cs +++ b/Frameworks/MQTTnet.NetStandard/Client/MqttClientTlsOptions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace MQTTnet.Core.Client +namespace MQTTnet.Client { public class MqttClientTlsOptions { diff --git a/MQTTnet.Core/Client/MqttClientWebSocketOptions.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttClientWebSocketOptions.cs similarity index 94% rename from MQTTnet.Core/Client/MqttClientWebSocketOptions.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttClientWebSocketOptions.cs index 25e4ae81..1819daab 100644 --- a/MQTTnet.Core/Client/MqttClientWebSocketOptions.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/MqttPacketDispatcher.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttPacketDispatcher.cs similarity index 96% rename from MQTTnet.Core/Client/MqttPacketDispatcher.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttPacketDispatcher.cs index dd9c7140..48755898 100644 --- a/MQTTnet.Core/Client/MqttPacketDispatcher.cs +++ b/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 { diff --git a/MQTTnet.Core/Client/MqttSubscribeResult.cs b/Frameworks/MQTTnet.NetStandard/Client/MqttSubscribeResult.cs similarity index 79% rename from MQTTnet.Core/Client/MqttSubscribeResult.cs rename to Frameworks/MQTTnet.NetStandard/Client/MqttSubscribeResult.cs index 9dd49449..2b7c46da 100644 --- a/MQTTnet.Core/Client/MqttSubscribeResult.cs +++ b/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 { diff --git a/MQTTnet.Core/Diagnostics/IMqttNetLogger.cs b/Frameworks/MQTTnet.NetStandard/Diagnostics/IMqttNetLogger.cs similarity index 94% rename from MQTTnet.Core/Diagnostics/IMqttNetLogger.cs rename to Frameworks/MQTTnet.NetStandard/Diagnostics/IMqttNetLogger.cs index 99f7b193..a65207bf 100644 --- a/MQTTnet.Core/Diagnostics/IMqttNetLogger.cs +++ b/Frameworks/MQTTnet.NetStandard/Diagnostics/IMqttNetLogger.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Diagnostics +namespace MQTTnet.Diagnostics { public interface IMqttNetLogger { diff --git a/MQTTnet.Core/Diagnostics/MqttNetGlobalLog.cs b/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetGlobalLogger.cs similarity index 86% rename from MQTTnet.Core/Diagnostics/MqttNetGlobalLog.cs rename to Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetGlobalLogger.cs index 64326826..a42857ea 100644 --- a/MQTTnet.Core/Diagnostics/MqttNetGlobalLog.cs +++ b/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 LogMessagePublished; diff --git a/MQTTnet.Core/Diagnostics/MqttNetLogLevel.cs b/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogLevel.cs similarity index 74% rename from MQTTnet.Core/Diagnostics/MqttNetLogLevel.cs rename to Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogLevel.cs index 32e5de17..cdc7a78a 100644 --- a/MQTTnet.Core/Diagnostics/MqttNetLogLevel.cs +++ b/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogLevel.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Diagnostics +namespace MQTTnet.Diagnostics { public enum MqttNetLogLevel { diff --git a/MQTTnet.Core/Diagnostics/MqttNetLogMessage.cs b/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogMessage.cs similarity index 95% rename from MQTTnet.Core/Diagnostics/MqttNetLogMessage.cs rename to Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogMessage.cs index e1598eb2..d118fd09 100644 --- a/MQTTnet.Core/Diagnostics/MqttNetLogMessage.cs +++ b/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogMessage.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Diagnostics +namespace MQTTnet.Diagnostics { public sealed class MqttNetLogMessage { diff --git a/MQTTnet.Core/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs b/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs similarity index 91% rename from MQTTnet.Core/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs rename to Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs index 46c54685..2407752b 100644 --- a/MQTTnet.Core/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs +++ b/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogMessagePublishedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Diagnostics +namespace MQTTnet.Diagnostics { public sealed class MqttNetLogMessagePublishedEventArgs : EventArgs { diff --git a/MQTTnet.Core/Diagnostics/MqttNetLogger.cs b/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogger.cs similarity index 93% rename from MQTTnet.Core/Diagnostics/MqttNetLogger.cs rename to Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogger.cs index a879af1b..7d9b2907 100644 --- a/MQTTnet.Core/Diagnostics/MqttNetLogger.cs +++ b/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(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) diff --git a/Frameworks/MQTTnet.NetStandard/Diagnostics/TargetFrameworkInfoProvider.cs b/Frameworks/MQTTnet.NetStandard/Diagnostics/TargetFrameworkInfoProvider.cs index 22369d9c..52582769 100644 --- a/Frameworks/MQTTnet.NetStandard/Diagnostics/TargetFrameworkInfoProvider.cs +++ b/Frameworks/MQTTnet.NetStandard/Diagnostics/TargetFrameworkInfoProvider.cs @@ -1,4 +1,4 @@ -namespace MQTTnet +namespace MQTTnet.Diagnostics { public static class TargetFrameworkInfoProvider { diff --git a/MQTTnet.Core/Exceptions/MqttCommunicationException.cs b/Frameworks/MQTTnet.NetStandard/Exceptions/MqttCommunicationException.cs similarity index 92% rename from MQTTnet.Core/Exceptions/MqttCommunicationException.cs rename to Frameworks/MQTTnet.NetStandard/Exceptions/MqttCommunicationException.cs index e019f4ee..4631de83 100644 --- a/MQTTnet.Core/Exceptions/MqttCommunicationException.cs +++ b/Frameworks/MQTTnet.NetStandard/Exceptions/MqttCommunicationException.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Exceptions +namespace MQTTnet.Exceptions { public class MqttCommunicationException : Exception { diff --git a/MQTTnet.Core/Exceptions/MqttCommunicationTimedOutException.cs b/Frameworks/MQTTnet.NetStandard/Exceptions/MqttCommunicationTimedOutException.cs similarity index 73% rename from MQTTnet.Core/Exceptions/MqttCommunicationTimedOutException.cs rename to Frameworks/MQTTnet.NetStandard/Exceptions/MqttCommunicationTimedOutException.cs index e7240072..7d0adcd4 100644 --- a/MQTTnet.Core/Exceptions/MqttCommunicationTimedOutException.cs +++ b/Frameworks/MQTTnet.NetStandard/Exceptions/MqttCommunicationTimedOutException.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Exceptions +namespace MQTTnet.Exceptions { public sealed class MqttCommunicationTimedOutException : MqttCommunicationException { diff --git a/MQTTnet.Core/Exceptions/MqttProtocolViolationException.cs b/Frameworks/MQTTnet.NetStandard/Exceptions/MqttProtocolViolationException.cs similarity index 86% rename from MQTTnet.Core/Exceptions/MqttProtocolViolationException.cs rename to Frameworks/MQTTnet.NetStandard/Exceptions/MqttProtocolViolationException.cs index cef43f5c..8756b3f8 100644 --- a/MQTTnet.Core/Exceptions/MqttProtocolViolationException.cs +++ b/Frameworks/MQTTnet.NetStandard/Exceptions/MqttProtocolViolationException.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Exceptions +namespace MQTTnet.Exceptions { public sealed class MqttProtocolViolationException : Exception { diff --git a/MQTTnet.Core/IApplicationMessagePublisher.cs b/Frameworks/MQTTnet.NetStandard/IApplicationMessagePublisher.cs similarity index 90% rename from MQTTnet.Core/IApplicationMessagePublisher.cs rename to Frameworks/MQTTnet.NetStandard/IApplicationMessagePublisher.cs index 2f6715b8..e137669e 100644 --- a/MQTTnet.Core/IApplicationMessagePublisher.cs +++ b/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 { diff --git a/MQTTnet.Core/IApplicationMessageReceiver.cs b/Frameworks/MQTTnet.NetStandard/IApplicationMessageReceiver.cs similarity index 78% rename from MQTTnet.Core/IApplicationMessageReceiver.cs rename to Frameworks/MQTTnet.NetStandard/IApplicationMessageReceiver.cs index 379ba69c..b315067c 100644 --- a/MQTTnet.Core/IApplicationMessageReceiver.cs +++ b/Frameworks/MQTTnet.NetStandard/IApplicationMessageReceiver.cs @@ -1,7 +1,6 @@ using System; -using MQTTnet.Core.Client; -namespace MQTTnet.Core +namespace MQTTnet { public interface IApplicationMessageReceiver { diff --git a/Frameworks/MQTTnet.NetStandard/Implementations/MqttClientAdapterFactory.cs b/Frameworks/MQTTnet.NetStandard/Implementations/MqttClientAdapterFactory.cs index 9884c86f..f8f0e996 100644 --- a/Frameworks/MQTTnet.NetStandard/Implementations/MqttClientAdapterFactory.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.Uwp.cs b/Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.Uwp.cs index 1b8a43cd..3966edce 100644 --- a/Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.Uwp.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.cs b/Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.cs index 3b8515c5..dadca442 100644 --- a/Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.Uwp.cs b/Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.Uwp.cs index 964bfbfe..fa96a8f8 100644 --- a/Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.Uwp.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.cs b/Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.cs index ce9dcf6c..7e23fdbe 100644 --- a/Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.NetStandard/Implementations/MqttWebSocketChannel.cs b/Frameworks/MQTTnet.NetStandard/Implementations/MqttWebSocketChannel.cs index d8e24a47..77d99a85 100644 --- a/Frameworks/MQTTnet.NetStandard/Implementations/MqttWebSocketChannel.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.NetStandard/Implementations/WebSocketStream.cs b/Frameworks/MQTTnet.NetStandard/Implementations/WebSocketStream.cs index 4ff11dad..1aa02a64 100644 --- a/Frameworks/MQTTnet.NetStandard/Implementations/WebSocketStream.cs +++ b/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 { diff --git a/MQTTnet.Core/Internal/MqttApplicationMessageExtensions.cs b/Frameworks/MQTTnet.NetStandard/Internal/MqttApplicationMessageExtensions.cs similarity index 94% rename from MQTTnet.Core/Internal/MqttApplicationMessageExtensions.cs rename to Frameworks/MQTTnet.NetStandard/Internal/MqttApplicationMessageExtensions.cs index 7ca7d005..b1d1a389 100644 --- a/MQTTnet.Core/Internal/MqttApplicationMessageExtensions.cs +++ b/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 { diff --git a/MQTTnet.Core/Internal/TaskExtensions.cs b/Frameworks/MQTTnet.NetStandard/Internal/TaskExtensions.cs similarity index 97% rename from MQTTnet.Core/Internal/TaskExtensions.cs rename to Frameworks/MQTTnet.NetStandard/Internal/TaskExtensions.cs index 45b3510b..6acb71ef 100644 --- a/MQTTnet.Core/Internal/TaskExtensions.cs +++ b/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 { diff --git a/Frameworks/MQTTnet.NetStandard/MQTTnet.Netstandard.csproj b/Frameworks/MQTTnet.NetStandard/MQTTnet.Netstandard.csproj index 9b6211d8..752ba948 100644 --- a/Frameworks/MQTTnet.NetStandard/MQTTnet.Netstandard.csproj +++ b/Frameworks/MQTTnet.NetStandard/MQTTnet.Netstandard.csproj @@ -14,6 +14,8 @@ + true + codeSigningKey.pfx @@ -33,10 +35,6 @@ - - - - diff --git a/MQTTnet.Core/ManagedClient/IManagedMqttClient.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClient.cs similarity index 90% rename from MQTTnet.Core/ManagedClient/IManagedMqttClient.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClient.cs index 8d2ac8cc..41c0ce3b 100644 --- a/MQTTnet.Core/ManagedClient/IManagedMqttClient.cs +++ b/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 { diff --git a/MQTTnet.Core/ManagedClient/IManagedMqttClientOptions.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClientOptions.cs similarity index 77% rename from MQTTnet.Core/ManagedClient/IManagedMqttClientOptions.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClientOptions.cs index 298de9a1..fbb87b79 100644 --- a/MQTTnet.Core/ManagedClient/IManagedMqttClientOptions.cs +++ b/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 { diff --git a/MQTTnet.Core/ManagedClient/IManagedMqttClientStorage.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClientStorage.cs similarity index 88% rename from MQTTnet.Core/ManagedClient/IManagedMqttClientStorage.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/IManagedMqttClientStorage.cs index 39ea89cc..28bf5703 100644 --- a/MQTTnet.Core/ManagedClient/IManagedMqttClientStorage.cs +++ b/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 { diff --git a/MQTTnet.Core/ManagedClient/ManagedMqttClient.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClient.cs similarity index 98% rename from MQTTnet.Core/ManagedClient/ManagedMqttClient.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClient.cs index c2e40777..90db1dc5 100644 --- a/MQTTnet.Core/ManagedClient/ManagedMqttClient.cs +++ b/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 { diff --git a/MQTTnet.Core/ManagedClient/ManagedMqttClientExtensions.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientExtensions.cs similarity index 95% rename from MQTTnet.Core/ManagedClient/ManagedMqttClientExtensions.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientExtensions.cs index a9984c4a..e1346679 100644 --- a/MQTTnet.Core/ManagedClient/ManagedMqttClientExtensions.cs +++ b/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 { diff --git a/MQTTnet.Core/ManagedClient/ManagedMqttClientOptions.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientOptions.cs similarity index 83% rename from MQTTnet.Core/ManagedClient/ManagedMqttClientOptions.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientOptions.cs index 2e24fd0a..813aee8a 100644 --- a/MQTTnet.Core/ManagedClient/ManagedMqttClientOptions.cs +++ b/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 { diff --git a/MQTTnet.Core/ManagedClient/ManagedMqttClientOptionsBuilder.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientOptionsBuilder.cs similarity index 95% rename from MQTTnet.Core/ManagedClient/ManagedMqttClientOptionsBuilder.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientOptionsBuilder.cs index 3972dcd2..7c753064 100644 --- a/MQTTnet.Core/ManagedClient/ManagedMqttClientOptionsBuilder.cs +++ b/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 { diff --git a/MQTTnet.Core/ManagedClient/ManagedMqttClientStorageManager.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientStorageManager.cs similarity index 98% rename from MQTTnet.Core/ManagedClient/ManagedMqttClientStorageManager.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/ManagedMqttClientStorageManager.cs index 0810f36e..d55f1376 100644 --- a/MQTTnet.Core/ManagedClient/ManagedMqttClientStorageManager.cs +++ b/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 { diff --git a/MQTTnet.Core/ManagedClient/ReconnectionResult.cs b/Frameworks/MQTTnet.NetStandard/ManagedClient/ReconnectionResult.cs similarity index 74% rename from MQTTnet.Core/ManagedClient/ReconnectionResult.cs rename to Frameworks/MQTTnet.NetStandard/ManagedClient/ReconnectionResult.cs index fae07706..42566e3e 100644 --- a/MQTTnet.Core/ManagedClient/ReconnectionResult.cs +++ b/Frameworks/MQTTnet.NetStandard/ManagedClient/ReconnectionResult.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.ManagedClient +namespace MQTTnet.ManagedClient { public enum ReconnectionResult { diff --git a/MQTTnet.Core/MqttApplicationMessage.cs b/Frameworks/MQTTnet.NetStandard/MqttApplicationMessage.cs similarity index 94% rename from MQTTnet.Core/MqttApplicationMessage.cs rename to Frameworks/MQTTnet.NetStandard/MqttApplicationMessage.cs index b07ee18f..387acb21 100644 --- a/MQTTnet.Core/MqttApplicationMessage.cs +++ b/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 { diff --git a/MQTTnet.Core/MqttApplicationMessageBuilder.cs b/Frameworks/MQTTnet.NetStandard/MqttApplicationMessageBuilder.cs similarity index 97% rename from MQTTnet.Core/MqttApplicationMessageBuilder.cs rename to Frameworks/MQTTnet.NetStandard/MqttApplicationMessageBuilder.cs index c2e04318..ce949b85 100644 --- a/MQTTnet.Core/MqttApplicationMessageBuilder.cs +++ b/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 { diff --git a/MQTTnet.Core/MqttApplicationMessageReceivedEventArgs.cs b/Frameworks/MQTTnet.NetStandard/MqttApplicationMessageReceivedEventArgs.cs similarity index 95% rename from MQTTnet.Core/MqttApplicationMessageReceivedEventArgs.cs rename to Frameworks/MQTTnet.NetStandard/MqttApplicationMessageReceivedEventArgs.cs index 3de0db54..a16a81d1 100644 --- a/MQTTnet.Core/MqttApplicationMessageReceivedEventArgs.cs +++ b/Frameworks/MQTTnet.NetStandard/MqttApplicationMessageReceivedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core +namespace MQTTnet { public sealed class MqttApplicationMessageReceivedEventArgs : EventArgs { diff --git a/Frameworks/MQTTnet.NetStandard/MqttFactory.cs b/Frameworks/MQTTnet.NetStandard/MqttFactory.cs index 99e57af6..5b0174b1 100644 --- a/Frameworks/MQTTnet.NetStandard/MqttFactory.cs +++ b/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 { diff --git a/MQTTnet.Core/Packets/IMqttPacketWithIdentifier.cs b/Frameworks/MQTTnet.NetStandard/Packets/IMqttPacketWithIdentifier.cs similarity index 76% rename from MQTTnet.Core/Packets/IMqttPacketWithIdentifier.cs rename to Frameworks/MQTTnet.NetStandard/Packets/IMqttPacketWithIdentifier.cs index 420955cd..5f7f8e97 100644 --- a/MQTTnet.Core/Packets/IMqttPacketWithIdentifier.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/IMqttPacketWithIdentifier.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public interface IMqttPacketWithIdentifier { diff --git a/MQTTnet.Core/Packets/MqttBasePacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttBasePacket.cs similarity index 62% rename from MQTTnet.Core/Packets/MqttBasePacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttBasePacket.cs index 41901e52..d9640568 100644 --- a/MQTTnet.Core/Packets/MqttBasePacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttBasePacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public abstract class MqttBasePacket { diff --git a/MQTTnet.Core/Packets/MqttBasePublishPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttBasePublishPacket.cs similarity index 81% rename from MQTTnet.Core/Packets/MqttBasePublishPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttBasePublishPacket.cs index 67d55b90..6218c154 100644 --- a/MQTTnet.Core/Packets/MqttBasePublishPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttBasePublishPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public class MqttBasePublishPacket : MqttBasePacket, IMqttPacketWithIdentifier { diff --git a/MQTTnet.Core/Packets/MqttConnAckPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttConnAckPacket.cs similarity index 85% rename from MQTTnet.Core/Packets/MqttConnAckPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttConnAckPacket.cs index 0410e669..9cf0adfe 100644 --- a/MQTTnet.Core/Packets/MqttConnAckPacket.cs +++ b/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 { diff --git a/MQTTnet.Core/Packets/MqttConnectPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttConnectPacket.cs similarity index 91% rename from MQTTnet.Core/Packets/MqttConnectPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttConnectPacket.cs index 48817120..b1943ced 100644 --- a/MQTTnet.Core/Packets/MqttConnectPacket.cs +++ b/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 { diff --git a/MQTTnet.Core/Packets/MqttDisconnectPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttDisconnectPacket.cs similarity index 83% rename from MQTTnet.Core/Packets/MqttDisconnectPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttDisconnectPacket.cs index 4db7f795..46c3270d 100644 --- a/MQTTnet.Core/Packets/MqttDisconnectPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttDisconnectPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public sealed class MqttDisconnectPacket : MqttBasePacket { diff --git a/MQTTnet.Core/Packets/MqttPacketExtensions.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPacketExtensions.cs similarity index 96% rename from MQTTnet.Core/Packets/MqttPacketExtensions.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPacketExtensions.cs index 6a7e0cea..a3df53c8 100644 --- a/MQTTnet.Core/Packets/MqttPacketExtensions.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttPacketExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public static class MqttPacketExtensions { diff --git a/MQTTnet.Core/Packets/MqttPacketHeader.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPacketHeader.cs similarity index 77% rename from MQTTnet.Core/Packets/MqttPacketHeader.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPacketHeader.cs index 41646df4..01c26ecd 100644 --- a/MQTTnet.Core/Packets/MqttPacketHeader.cs +++ b/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 { diff --git a/MQTTnet.Core/Packets/MqttPingReqPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPingReqPacket.cs similarity index 83% rename from MQTTnet.Core/Packets/MqttPingReqPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPingReqPacket.cs index 9836b5aa..fee9926c 100644 --- a/MQTTnet.Core/Packets/MqttPingReqPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttPingReqPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public sealed class MqttPingReqPacket : MqttBasePacket { diff --git a/MQTTnet.Core/Packets/MqttPingRespPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPingRespPacket.cs similarity index 83% rename from MQTTnet.Core/Packets/MqttPingRespPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPingRespPacket.cs index eff12b83..c5f82a3b 100644 --- a/MQTTnet.Core/Packets/MqttPingRespPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttPingRespPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public sealed class MqttPingRespPacket : MqttBasePacket { diff --git a/MQTTnet.Core/Packets/MqttPubAckPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPubAckPacket.cs similarity index 83% rename from MQTTnet.Core/Packets/MqttPubAckPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPubAckPacket.cs index 9e07cd32..e7fe57b7 100644 --- a/MQTTnet.Core/Packets/MqttPubAckPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttPubAckPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public sealed class MqttPubAckPacket : MqttBasePublishPacket { diff --git a/MQTTnet.Core/Packets/MqttPubCompPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPubCompPacket.cs similarity index 83% rename from MQTTnet.Core/Packets/MqttPubCompPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPubCompPacket.cs index 9b819fd0..98dace70 100644 --- a/MQTTnet.Core/Packets/MqttPubCompPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttPubCompPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public sealed class MqttPubCompPacket : MqttBasePublishPacket { diff --git a/MQTTnet.Core/Packets/MqttPubRecPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPubRecPacket.cs similarity index 83% rename from MQTTnet.Core/Packets/MqttPubRecPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPubRecPacket.cs index 3b876559..86cd4b45 100644 --- a/MQTTnet.Core/Packets/MqttPubRecPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttPubRecPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public sealed class MqttPubRecPacket : MqttBasePublishPacket { diff --git a/MQTTnet.Core/Packets/MqttPubRelPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPubRelPacket.cs similarity index 83% rename from MQTTnet.Core/Packets/MqttPubRelPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPubRelPacket.cs index 9d926894..ed1d933b 100644 --- a/MQTTnet.Core/Packets/MqttPubRelPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttPubRelPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public sealed class MqttPubRelPacket : MqttBasePublishPacket { diff --git a/MQTTnet.Core/Packets/MqttPublishPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttPublishPacket.cs similarity index 91% rename from MQTTnet.Core/Packets/MqttPublishPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttPublishPacket.cs index 573ff691..52fcceed 100644 --- a/MQTTnet.Core/Packets/MqttPublishPacket.cs +++ b/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 { diff --git a/MQTTnet.Core/Packets/MqttSubAckPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttSubAckPacket.cs similarity index 91% rename from MQTTnet.Core/Packets/MqttSubAckPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttSubAckPacket.cs index 05431a3f..c4c1a886 100644 --- a/MQTTnet.Core/Packets/MqttSubAckPacket.cs +++ b/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 { diff --git a/MQTTnet.Core/Packets/MqttSubscribePacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttSubscribePacket.cs similarity index 95% rename from MQTTnet.Core/Packets/MqttSubscribePacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttSubscribePacket.cs index c911efcc..25536e3a 100644 --- a/MQTTnet.Core/Packets/MqttSubscribePacket.cs +++ b/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 { diff --git a/MQTTnet.Core/Packets/MqttUnsubAckPacket.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttUnsubAckPacket.cs similarity index 89% rename from MQTTnet.Core/Packets/MqttUnsubAckPacket.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttUnsubAckPacket.cs index 3554fa95..4797d0a4 100644 --- a/MQTTnet.Core/Packets/MqttUnsubAckPacket.cs +++ b/Frameworks/MQTTnet.NetStandard/Packets/MqttUnsubAckPacket.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Packets +namespace MQTTnet.Packets { public sealed class MqttUnsubAckPacket : MqttBasePacket, IMqttPacketWithIdentifier { diff --git a/MQTTnet.Core/Packets/MqttUnsubscribe.cs b/Frameworks/MQTTnet.NetStandard/Packets/MqttUnsubscribe.cs similarity index 94% rename from MQTTnet.Core/Packets/MqttUnsubscribe.cs rename to Frameworks/MQTTnet.NetStandard/Packets/MqttUnsubscribe.cs index 1e06e50e..2c47cbbd 100644 --- a/MQTTnet.Core/Packets/MqttUnsubscribe.cs +++ b/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 { diff --git a/MQTTnet.Core/Protocol/MqttConnectReturnCode.cs b/Frameworks/MQTTnet.NetStandard/Protocol/MqttConnectReturnCode.cs similarity index 91% rename from MQTTnet.Core/Protocol/MqttConnectReturnCode.cs rename to Frameworks/MQTTnet.NetStandard/Protocol/MqttConnectReturnCode.cs index 604cd482..bffc4dcf 100644 --- a/MQTTnet.Core/Protocol/MqttConnectReturnCode.cs +++ b/Frameworks/MQTTnet.NetStandard/Protocol/MqttConnectReturnCode.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Protocol +namespace MQTTnet.Protocol { public enum MqttConnectReturnCode { diff --git a/MQTTnet.Core/Protocol/MqttControlPacketType.cs b/Frameworks/MQTTnet.NetStandard/Protocol/MqttControlPacketType.cs similarity index 91% rename from MQTTnet.Core/Protocol/MqttControlPacketType.cs rename to Frameworks/MQTTnet.NetStandard/Protocol/MqttControlPacketType.cs index aa46b9df..adb58b66 100644 --- a/MQTTnet.Core/Protocol/MqttControlPacketType.cs +++ b/Frameworks/MQTTnet.NetStandard/Protocol/MqttControlPacketType.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Protocol +namespace MQTTnet.Protocol { public enum MqttControlPacketType { diff --git a/MQTTnet.Core/Protocol/MqttQualityOfServiceLevel.cs b/Frameworks/MQTTnet.NetStandard/Protocol/MqttQualityOfServiceLevel.cs similarity index 80% rename from MQTTnet.Core/Protocol/MqttQualityOfServiceLevel.cs rename to Frameworks/MQTTnet.NetStandard/Protocol/MqttQualityOfServiceLevel.cs index c19496a8..579f72ef 100644 --- a/MQTTnet.Core/Protocol/MqttQualityOfServiceLevel.cs +++ b/Frameworks/MQTTnet.NetStandard/Protocol/MqttQualityOfServiceLevel.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Protocol +namespace MQTTnet.Protocol { public enum MqttQualityOfServiceLevel { diff --git a/MQTTnet.Core/Protocol/MqttSubscribeReturnCode.cs b/Frameworks/MQTTnet.NetStandard/Protocol/MqttSubscribeReturnCode.cs similarity index 84% rename from MQTTnet.Core/Protocol/MqttSubscribeReturnCode.cs rename to Frameworks/MQTTnet.NetStandard/Protocol/MqttSubscribeReturnCode.cs index a561423f..b256962b 100644 --- a/MQTTnet.Core/Protocol/MqttSubscribeReturnCode.cs +++ b/Frameworks/MQTTnet.NetStandard/Protocol/MqttSubscribeReturnCode.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Protocol +namespace MQTTnet.Protocol { public enum MqttSubscribeReturnCode { diff --git a/MQTTnet.Core/Serializer/ByteReader.cs b/Frameworks/MQTTnet.NetStandard/Serializer/ByteReader.cs similarity index 96% rename from MQTTnet.Core/Serializer/ByteReader.cs rename to Frameworks/MQTTnet.NetStandard/Serializer/ByteReader.cs index ce7f709d..ec1e3ea2 100644 --- a/MQTTnet.Core/Serializer/ByteReader.cs +++ b/Frameworks/MQTTnet.NetStandard/Serializer/ByteReader.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Serializer +namespace MQTTnet.Serializer { public sealed class ByteReader { diff --git a/MQTTnet.Core/Serializer/ByteWriter.cs b/Frameworks/MQTTnet.NetStandard/Serializer/ByteWriter.cs similarity index 95% rename from MQTTnet.Core/Serializer/ByteWriter.cs rename to Frameworks/MQTTnet.NetStandard/Serializer/ByteWriter.cs index d6abec90..af961e1a 100644 --- a/MQTTnet.Core/Serializer/ByteWriter.cs +++ b/Frameworks/MQTTnet.NetStandard/Serializer/ByteWriter.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Serializer +namespace MQTTnet.Serializer { public sealed class ByteWriter { diff --git a/MQTTnet.Core/Serializer/IMqttPacketSerializer.cs b/Frameworks/MQTTnet.NetStandard/Serializer/IMqttPacketSerializer.cs similarity index 72% rename from MQTTnet.Core/Serializer/IMqttPacketSerializer.cs rename to Frameworks/MQTTnet.NetStandard/Serializer/IMqttPacketSerializer.cs index 5834c539..6b46b528 100644 --- a/MQTTnet.Core/Serializer/IMqttPacketSerializer.cs +++ b/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 { diff --git a/MQTTnet.Core/Serializer/MqttPacketReader.cs b/Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketReader.cs similarity index 95% rename from MQTTnet.Core/Serializer/MqttPacketReader.cs rename to Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketReader.cs index 9fcae9e5..caf28813 100644 --- a/MQTTnet.Core/Serializer/MqttPacketReader.cs +++ b/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 { diff --git a/MQTTnet.Core/Serializer/MqttPacketSerializer.cs b/Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketSerializer.cs similarity index 99% rename from MQTTnet.Core/Serializer/MqttPacketSerializer.cs rename to Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketSerializer.cs index 6c2fc56a..ce45b3e2 100644 --- a/MQTTnet.Core/Serializer/MqttPacketSerializer.cs +++ b/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 { diff --git a/MQTTnet.Core/Serializer/MqttPacketWriter.cs b/Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketWriter.cs similarity index 96% rename from MQTTnet.Core/Serializer/MqttPacketWriter.cs rename to Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketWriter.cs index 4c86f961..cdf7915e 100644 --- a/MQTTnet.Core/Serializer/MqttPacketWriter.cs +++ b/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 { diff --git a/MQTTnet.Core/Serializer/MqttProtocolVersion.cs b/Frameworks/MQTTnet.NetStandard/Serializer/MqttProtocolVersion.cs similarity index 68% rename from MQTTnet.Core/Serializer/MqttProtocolVersion.cs rename to Frameworks/MQTTnet.NetStandard/Serializer/MqttProtocolVersion.cs index 6b8814a7..15e698d3 100644 --- a/MQTTnet.Core/Serializer/MqttProtocolVersion.cs +++ b/Frameworks/MQTTnet.NetStandard/Serializer/MqttProtocolVersion.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Serializer +namespace MQTTnet.Serializer { public enum MqttProtocolVersion { diff --git a/MQTTnet.Core/Server/CheckSubscriptionsResult.cs b/Frameworks/MQTTnet.NetStandard/Server/CheckSubscriptionsResult.cs similarity index 74% rename from MQTTnet.Core/Server/CheckSubscriptionsResult.cs rename to Frameworks/MQTTnet.NetStandard/Server/CheckSubscriptionsResult.cs index 625457ff..9e2d1f0d 100644 --- a/MQTTnet.Core/Server/CheckSubscriptionsResult.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/CheckSubscriptionsResult.cs @@ -1,6 +1,6 @@ -using MQTTnet.Core.Protocol; +using MQTTnet.Protocol; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class CheckSubscriptionsResult { diff --git a/MQTTnet.Core/Server/ConnectedMqttClient.cs b/Frameworks/MQTTnet.NetStandard/Server/ConnectedMqttClient.cs similarity index 72% rename from MQTTnet.Core/Server/ConnectedMqttClient.cs rename to Frameworks/MQTTnet.NetStandard/Server/ConnectedMqttClient.cs index d3633511..ea1c7465 100644 --- a/MQTTnet.Core/Server/ConnectedMqttClient.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/ConnectedMqttClient.cs @@ -1,6 +1,6 @@ -using MQTTnet.Core.Serializer; +using MQTTnet.Serializer; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class ConnectedMqttClient { diff --git a/MQTTnet.Core/Server/GetOrCreateClientSessionResult.cs b/Frameworks/MQTTnet.NetStandard/Server/GetOrCreateClientSessionResult.cs similarity index 84% rename from MQTTnet.Core/Server/GetOrCreateClientSessionResult.cs rename to Frameworks/MQTTnet.NetStandard/Server/GetOrCreateClientSessionResult.cs index 8f802720..8f5f085e 100644 --- a/MQTTnet.Core/Server/GetOrCreateClientSessionResult.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/GetOrCreateClientSessionResult.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public sealed class GetOrCreateClientSessionResult { diff --git a/MQTTnet.Core/Server/IMqttServer.cs b/Frameworks/MQTTnet.NetStandard/Server/IMqttServer.cs similarity index 94% rename from MQTTnet.Core/Server/IMqttServer.cs rename to Frameworks/MQTTnet.NetStandard/Server/IMqttServer.cs index 936e897e..3d0ccda6 100644 --- a/MQTTnet.Core/Server/IMqttServer.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/IMqttServer.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public interface IMqttServer : IApplicationMessageReceiver, IApplicationMessagePublisher { diff --git a/MQTTnet.Core/Server/IMqttServerFactory.cs b/Frameworks/MQTTnet.NetStandard/Server/IMqttServerFactory.cs similarity index 72% rename from MQTTnet.Core/Server/IMqttServerFactory.cs rename to Frameworks/MQTTnet.NetStandard/Server/IMqttServerFactory.cs index 378dfb01..6e399cae 100644 --- a/MQTTnet.Core/Server/IMqttServerFactory.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/IMqttServerFactory.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using MQTTnet.Core.Adapter; -using MQTTnet.Core.Diagnostics; +using MQTTnet.Adapter; +using MQTTnet.Diagnostics; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public interface IMqttServerFactory { diff --git a/MQTTnet.Core/Server/IMqttServerStorage.cs b/Frameworks/MQTTnet.NetStandard/Server/IMqttServerStorage.cs similarity index 90% rename from MQTTnet.Core/Server/IMqttServerStorage.cs rename to Frameworks/MQTTnet.NetStandard/Server/IMqttServerStorage.cs index 3cb518c3..da6e6e28 100644 --- a/MQTTnet.Core/Server/IMqttServerStorage.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/IMqttServerStorage.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public interface IMqttServerStorage { diff --git a/MQTTnet.Core/Server/MqttApplicationMessageInterceptorContext.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttApplicationMessageInterceptorContext.cs similarity index 81% rename from MQTTnet.Core/Server/MqttApplicationMessageInterceptorContext.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttApplicationMessageInterceptorContext.cs index 218a02dc..e5f8c3f7 100644 --- a/MQTTnet.Core/Server/MqttApplicationMessageInterceptorContext.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttApplicationMessageInterceptorContext.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttApplicationMessageInterceptorContext { diff --git a/MQTTnet.Core/Server/MqttClientConnectedEventArgs.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttClientConnectedEventArgs.cs similarity index 91% rename from MQTTnet.Core/Server/MqttClientConnectedEventArgs.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttClientConnectedEventArgs.cs index 282e0f8d..1ca3f406 100644 --- a/MQTTnet.Core/Server/MqttClientConnectedEventArgs.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttClientConnectedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttClientConnectedEventArgs : EventArgs { diff --git a/MQTTnet.Core/Server/MqttClientDisconnectedEventArgs.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttClientDisconnectedEventArgs.cs similarity index 91% rename from MQTTnet.Core/Server/MqttClientDisconnectedEventArgs.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttClientDisconnectedEventArgs.cs index b1e3d15b..78372bc9 100644 --- a/MQTTnet.Core/Server/MqttClientDisconnectedEventArgs.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttClientDisconnectedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttClientDisconnectedEventArgs : EventArgs { diff --git a/MQTTnet.Core/Server/MqttClientPendingMessagesQueue.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttClientPendingMessagesQueue.cs similarity index 95% rename from MQTTnet.Core/Server/MqttClientPendingMessagesQueue.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttClientPendingMessagesQueue.cs index bea60397..9e1a2cda 100644 --- a/MQTTnet.Core/Server/MqttClientPendingMessagesQueue.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttClientPendingMessagesQueue.cs @@ -2,13 +2,13 @@ using System.Collections.Concurrent; using System.Threading; using System.Threading.Tasks; -using MQTTnet.Core.Adapter; -using MQTTnet.Core.Diagnostics; -using MQTTnet.Core.Exceptions; -using MQTTnet.Core.Packets; -using MQTTnet.Core.Protocol; +using MQTTnet.Adapter; +using MQTTnet.Diagnostics; +using MQTTnet.Exceptions; +using MQTTnet.Packets; +using MQTTnet.Protocol; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public sealed class MqttClientPendingMessagesQueue { diff --git a/MQTTnet.Core/Server/MqttClientSession.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttClientSession.cs similarity index 97% rename from MQTTnet.Core/Server/MqttClientSession.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttClientSession.cs index 3646c405..cc889644 100644 --- a/MQTTnet.Core/Server/MqttClientSession.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttClientSession.cs @@ -2,15 +2,15 @@ using System.Collections.Generic; 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.Core.Serializer; +using MQTTnet.Adapter; +using MQTTnet.Diagnostics; +using MQTTnet.Exceptions; +using MQTTnet.Internal; +using MQTTnet.Packets; +using MQTTnet.Protocol; +using MQTTnet.Serializer; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public sealed class MqttClientSession { diff --git a/MQTTnet.Core/Server/MqttClientSessionsManager.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttClientSessionsManager.cs similarity index 97% rename from MQTTnet.Core/Server/MqttClientSessionsManager.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttClientSessionsManager.cs index 63235220..61e19f76 100644 --- a/MQTTnet.Core/Server/MqttClientSessionsManager.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttClientSessionsManager.cs @@ -3,15 +3,15 @@ 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.Core.Serializer; +using MQTTnet.Adapter; +using MQTTnet.Diagnostics; +using MQTTnet.Exceptions; +using MQTTnet.Internal; +using MQTTnet.Packets; +using MQTTnet.Protocol; +using MQTTnet.Serializer; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public sealed class MqttClientSessionsManager { diff --git a/MQTTnet.Core/Server/MqttClientSubscribeResult.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttClientSubscribeResult.cs similarity index 73% rename from MQTTnet.Core/Server/MqttClientSubscribeResult.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttClientSubscribeResult.cs index 17bfe9a5..fe75c3b2 100644 --- a/MQTTnet.Core/Server/MqttClientSubscribeResult.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttClientSubscribeResult.cs @@ -1,6 +1,6 @@ -using MQTTnet.Core.Packets; +using MQTTnet.Packets; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttClientSubscribeResult { diff --git a/MQTTnet.Core/Server/MqttClientSubscriptionsManager.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttClientSubscriptionsManager.cs similarity index 97% rename from MQTTnet.Core/Server/MqttClientSubscriptionsManager.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttClientSubscriptionsManager.cs index 8d88ddcf..86156303 100644 --- a/MQTTnet.Core/Server/MqttClientSubscriptionsManager.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttClientSubscriptionsManager.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using MQTTnet.Core.Packets; -using MQTTnet.Core.Protocol; +using MQTTnet.Packets; +using MQTTnet.Protocol; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public sealed class MqttClientSubscriptionsManager { diff --git a/MQTTnet.Core/Server/MqttConnectionValidatorContext.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttConnectionValidatorContext.cs similarity index 91% rename from MQTTnet.Core/Server/MqttConnectionValidatorContext.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttConnectionValidatorContext.cs index 83a1eabc..a24d7955 100644 --- a/MQTTnet.Core/Server/MqttConnectionValidatorContext.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttConnectionValidatorContext.cs @@ -1,6 +1,6 @@ -using MQTTnet.Core.Protocol; +using MQTTnet.Protocol; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttConnectionValidatorContext { diff --git a/MQTTnet.Core/Server/MqttRetainedMessagesManager.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttRetainedMessagesManager.cs similarity index 98% rename from MQTTnet.Core/Server/MqttRetainedMessagesManager.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttRetainedMessagesManager.cs index cf667236..c8377694 100644 --- a/MQTTnet.Core/Server/MqttRetainedMessagesManager.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttRetainedMessagesManager.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using MQTTnet.Core.Packets; -using MQTTnet.Core.Diagnostics; +using MQTTnet.Diagnostics; +using MQTTnet.Packets; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public sealed class MqttRetainedMessagesManager { diff --git a/MQTTnet.Core/Server/MqttServer.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttServer.cs similarity index 98% rename from MQTTnet.Core/Server/MqttServer.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttServer.cs index f9349284..25dc2d36 100644 --- a/MQTTnet.Core/Server/MqttServer.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttServer.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading; using System.Threading.Tasks; -using MQTTnet.Core.Adapter; -using System.Linq; -using MQTTnet.Core.Diagnostics; +using MQTTnet.Adapter; +using MQTTnet.Diagnostics; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttServer : IMqttServer { diff --git a/MQTTnet.Core/Server/MqttServerDefaultEndpointOptions.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttServerDefaultEndpointOptions.cs similarity index 83% rename from MQTTnet.Core/Server/MqttServerDefaultEndpointOptions.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttServerDefaultEndpointOptions.cs index 04c4d732..6dc21b32 100644 --- a/MQTTnet.Core/Server/MqttServerDefaultEndpointOptions.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttServerDefaultEndpointOptions.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public sealed class MqttServerDefaultEndpointOptions { diff --git a/MQTTnet.Core/Server/MqttServerOptions.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttServerOptions.cs similarity index 90% rename from MQTTnet.Core/Server/MqttServerOptions.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttServerOptions.cs index 8988b111..d04725ec 100644 --- a/MQTTnet.Core/Server/MqttServerOptions.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttServerOptions.cs @@ -1,8 +1,8 @@ using System; -using MQTTnet.Core.Packets; -using MQTTnet.Core.Protocol; +using MQTTnet.Packets; +using MQTTnet.Protocol; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttServerOptions { diff --git a/MQTTnet.Core/Server/MqttServerOptionsBuilder.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttServerOptionsBuilder.cs similarity index 96% rename from MQTTnet.Core/Server/MqttServerOptionsBuilder.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttServerOptionsBuilder.cs index 692f7c19..f6cb0bba 100644 --- a/MQTTnet.Core/Server/MqttServerOptionsBuilder.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttServerOptionsBuilder.cs @@ -1,8 +1,8 @@ using System; -using MQTTnet.Core.Packets; -using MQTTnet.Core.Protocol; +using MQTTnet.Packets; +using MQTTnet.Protocol; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttServerOptionsBuilder { diff --git a/MQTTnet.Core/Server/MqttServerOptionsExtensions.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttServerOptionsExtensions.cs similarity index 96% rename from MQTTnet.Core/Server/MqttServerOptionsExtensions.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttServerOptionsExtensions.cs index 4917018f..03246240 100644 --- a/MQTTnet.Core/Server/MqttServerOptionsExtensions.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttServerOptionsExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public static class MqttServerOptionsExtensions { diff --git a/MQTTnet.Core/Server/MqttServerStartedEventArgs.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttServerStartedEventArgs.cs similarity index 75% rename from MQTTnet.Core/Server/MqttServerStartedEventArgs.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttServerStartedEventArgs.cs index 8f46bde8..08202994 100644 --- a/MQTTnet.Core/Server/MqttServerStartedEventArgs.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttServerStartedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttServerStartedEventArgs : EventArgs { diff --git a/MQTTnet.Core/Server/MqttServerTlsEndpointOptions.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttServerTlsEndpointOptions.cs similarity index 85% rename from MQTTnet.Core/Server/MqttServerTlsEndpointOptions.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttServerTlsEndpointOptions.cs index 0fb3839d..6c90a446 100644 --- a/MQTTnet.Core/Server/MqttServerTlsEndpointOptions.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttServerTlsEndpointOptions.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public sealed class MqttServerTlsEndpointOptions { diff --git a/MQTTnet.Core/Server/MqttSubscribeResult.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttSubscribeResult.cs similarity index 73% rename from MQTTnet.Core/Server/MqttSubscribeResult.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttSubscribeResult.cs index ef80af44..2de40046 100644 --- a/MQTTnet.Core/Server/MqttSubscribeResult.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttSubscribeResult.cs @@ -1,6 +1,6 @@ -using MQTTnet.Core.Packets; +using MQTTnet.Packets; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttSubscribeResult { diff --git a/MQTTnet.Core/Server/MqttSubscriptionInterceptorContext.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttSubscriptionInterceptorContext.cs similarity index 93% rename from MQTTnet.Core/Server/MqttSubscriptionInterceptorContext.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttSubscriptionInterceptorContext.cs index 93282d3b..e05dd216 100644 --- a/MQTTnet.Core/Server/MqttSubscriptionInterceptorContext.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttSubscriptionInterceptorContext.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public class MqttSubscriptionInterceptorContext { diff --git a/MQTTnet.Core/Server/MqttTopicFilterComparer.cs b/Frameworks/MQTTnet.NetStandard/Server/MqttTopicFilterComparer.cs similarity index 97% rename from MQTTnet.Core/Server/MqttTopicFilterComparer.cs rename to Frameworks/MQTTnet.NetStandard/Server/MqttTopicFilterComparer.cs index 987a71f1..82444159 100644 --- a/MQTTnet.Core/Server/MqttTopicFilterComparer.cs +++ b/Frameworks/MQTTnet.NetStandard/Server/MqttTopicFilterComparer.cs @@ -1,6 +1,6 @@ using System; -namespace MQTTnet.Core.Server +namespace MQTTnet.Server { public static class MqttTopicFilterComparer { diff --git a/MQTTnet.Core/TopicFilter.cs b/Frameworks/MQTTnet.NetStandard/TopicFilter.cs similarity index 92% rename from MQTTnet.Core/TopicFilter.cs rename to Frameworks/MQTTnet.NetStandard/TopicFilter.cs index 6d5258f4..b82fc712 100644 --- a/MQTTnet.Core/TopicFilter.cs +++ b/Frameworks/MQTTnet.NetStandard/TopicFilter.cs @@ -1,6 +1,6 @@ -using MQTTnet.Core.Protocol; +using MQTTnet.Protocol; -namespace MQTTnet.Core +namespace MQTTnet { public sealed class TopicFilter { diff --git a/MQTTnet.Core/TopicFilterBuilder.cs b/Frameworks/MQTTnet.NetStandard/TopicFilterBuilder.cs similarity index 93% rename from MQTTnet.Core/TopicFilterBuilder.cs rename to Frameworks/MQTTnet.NetStandard/TopicFilterBuilder.cs index bb8416c1..38c8fbc2 100644 --- a/MQTTnet.Core/TopicFilterBuilder.cs +++ b/Frameworks/MQTTnet.NetStandard/TopicFilterBuilder.cs @@ -1,7 +1,7 @@ -using MQTTnet.Core.Protocol; -using MQTTnet.Core.Exceptions; +using MQTTnet.Exceptions; +using MQTTnet.Protocol; -namespace MQTTnet.Core +namespace MQTTnet { public class TopicFilterBuilder { diff --git a/MQTTnet.Core/MQTTnet.Core.csproj b/MQTTnet.Core/MQTTnet.Core.csproj deleted file mode 100644 index 60afc301..00000000 --- a/MQTTnet.Core/MQTTnet.Core.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - netstandard1.1 - MQTTnet.Core - MQTTnet.Core - False - Full - - - - - 0.0.0.0 - - - - - - - 2.5.3.0 - 2.5.3.0 - - - - \ No newline at end of file diff --git a/MQTTnet.sln b/MQTTnet.sln index 326fe7ea..ceaa04fb 100644 --- a/MQTTnet.sln +++ b/MQTTnet.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27004.2008 +VisualStudioVersion = 15.0.27004.2009 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Core.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Core.Tests.csproj", "{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}" EndProject @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9248C2E1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Frameworks", "Frameworks", "{32A630A7-2598-41D7-B625-204CD906F5FB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Core", "MQTTnet.Core\MQTTnet.Core.csproj", "{2ECB99E4-72D0-4C23-99BA-93D511D3967D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.TestApp.UniversalWindows", "Tests\MQTTnet.TestApp.UniversalWindows\MQTTnet.TestApp.UniversalWindows.csproj", "{FF1F72D6-9524-4422-9497-3CC0002216ED}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.NetStandard", "Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj", "{3587E506-55A2-4EB3-99C7-DC01E42D25D2}" @@ -63,22 +61,6 @@ Global {A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x64.Build.0 = Release|Any CPU {A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x86.ActiveCfg = Release|Any CPU {A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x86.Build.0 = Release|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|ARM.Build.0 = Debug|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|x64.ActiveCfg = Debug|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|x64.Build.0 = Debug|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|x86.ActiveCfg = Debug|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|x86.Build.0 = Debug|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|Any CPU.Build.0 = Release|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|ARM.ActiveCfg = Release|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|ARM.Build.0 = Release|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|x64.ActiveCfg = Release|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|x64.Build.0 = Release|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|x86.ActiveCfg = Release|Any CPU - {2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|x86.Build.0 = Release|Any CPU {FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|ARM.ActiveCfg = Debug|ARM diff --git a/Tests/MQTTnet.Core.Tests/ByteReaderTests.cs b/Tests/MQTTnet.Core.Tests/ByteReaderTests.cs index 76ff90b1..e2173cbc 100644 --- a/Tests/MQTTnet.Core.Tests/ByteReaderTests.cs +++ b/Tests/MQTTnet.Core.Tests/ByteReaderTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Serializer; +using MQTTnet.Serializer; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/ByteWriterTests.cs b/Tests/MQTTnet.Core.Tests/ByteWriterTests.cs index 65991931..881df5c5 100644 --- a/Tests/MQTTnet.Core.Tests/ByteWriterTests.cs +++ b/Tests/MQTTnet.Core.Tests/ByteWriterTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Serializer; +using MQTTnet.Serializer; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/ExtensionTests.cs b/Tests/MQTTnet.Core.Tests/ExtensionTests.cs index 2f0966fb..053b0ca3 100644 --- a/Tests/MQTTnet.Core.Tests/ExtensionTests.cs +++ b/Tests/MQTTnet.Core.Tests/ExtensionTests.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Exceptions; -using MQTTnet.Core.Internal; +using MQTTnet.Exceptions; +using MQTTnet.Internal; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/MqttApplicationMessageBuilderTests.cs b/Tests/MQTTnet.Core.Tests/MqttApplicationMessageBuilderTests.cs index c6a70174..59afcd68 100644 --- a/Tests/MQTTnet.Core.Tests/MqttApplicationMessageBuilderTests.cs +++ b/Tests/MQTTnet.Core.Tests/MqttApplicationMessageBuilderTests.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Protocol; +using MQTTnet.Protocol; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/MqttPacketReaderTests.cs b/Tests/MQTTnet.Core.Tests/MqttPacketReaderTests.cs index 6800e6ce..606d1daf 100644 --- a/Tests/MQTTnet.Core.Tests/MqttPacketReaderTests.cs +++ b/Tests/MQTTnet.Core.Tests/MqttPacketReaderTests.cs @@ -1,7 +1,7 @@ using System.IO; using System.Threading; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Serializer; +using MQTTnet.Serializer; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/MqttPacketSerializerTests.cs b/Tests/MQTTnet.Core.Tests/MqttPacketSerializerTests.cs index bdd07516..01d19f1f 100644 --- a/Tests/MQTTnet.Core.Tests/MqttPacketSerializerTests.cs +++ b/Tests/MQTTnet.Core.Tests/MqttPacketSerializerTests.cs @@ -3,10 +3,10 @@ using System.IO; using System.Text; using System.Threading; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Adapter; -using MQTTnet.Core.Packets; -using MQTTnet.Core.Protocol; -using MQTTnet.Core.Serializer; +using MQTTnet.Adapter; +using MQTTnet.Packets; +using MQTTnet.Protocol; +using MQTTnet.Serializer; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/MqttServerTests.cs b/Tests/MQTTnet.Core.Tests/MqttServerTests.cs index 89cae3b6..f1c8ff09 100644 --- a/Tests/MQTTnet.Core.Tests/MqttServerTests.cs +++ b/Tests/MQTTnet.Core.Tests/MqttServerTests.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Client; -using MQTTnet.Core.Diagnostics; -using MQTTnet.Core.Protocol; -using MQTTnet.Core.Server; +using MQTTnet.Diagnostics; +using MQTTnet.Protocol; +using MQTTnet.Server; +using MQTTnet.Client; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/MqttSubscriptionsManagerTests.cs b/Tests/MQTTnet.Core.Tests/MqttSubscriptionsManagerTests.cs index f4885434..2c24c483 100644 --- a/Tests/MQTTnet.Core.Tests/MqttSubscriptionsManagerTests.cs +++ b/Tests/MQTTnet.Core.Tests/MqttSubscriptionsManagerTests.cs @@ -1,7 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Packets; -using MQTTnet.Core.Protocol; -using MQTTnet.Core.Server; +using MQTTnet.Packets; +using MQTTnet.Protocol; +using MQTTnet.Server; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapter.cs b/Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapter.cs index 53a6f0fe..2bac46b6 100644 --- a/Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapter.cs +++ b/Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapter.cs @@ -3,9 +3,9 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using MQTTnet.Core.Adapter; -using MQTTnet.Core.Packets; -using MQTTnet.Core.Serializer; +using MQTTnet.Adapter; +using MQTTnet.Packets; +using MQTTnet.Serializer; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapterFactory.cs b/Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapterFactory.cs index 7da1e167..eb291f9f 100644 --- a/Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapterFactory.cs +++ b/Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapterFactory.cs @@ -1,6 +1,6 @@ -using MQTTnet.Core.Adapter; -using MQTTnet.Core.Client; -using MQTTnet.Core.Diagnostics; +using MQTTnet.Adapter; +using MQTTnet.Client; +using MQTTnet.Diagnostics; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.Core.Tests/TestMqttServerAdapter.cs b/Tests/MQTTnet.Core.Tests/TestMqttServerAdapter.cs index e65d9f8a..ea53512f 100644 --- a/Tests/MQTTnet.Core.Tests/TestMqttServerAdapter.cs +++ b/Tests/MQTTnet.Core.Tests/TestMqttServerAdapter.cs @@ -1,17 +1,17 @@ using System; using System.Threading.Tasks; -using MQTTnet.Core.Adapter; -using MQTTnet.Core.Server; -using MQTTnet.Core.Client; -using MQTTnet.Core.Diagnostics; +using MQTTnet.Adapter; +using MQTTnet.Client; +using MQTTnet.Diagnostics; +using MQTTnet.Server; namespace MQTTnet.Core.Tests { public class TestMqttServerAdapter : IMqttServerAdapter { public event EventHandler ClientAccepted; - - public async Task ConnectTestClient(IMqttServer server, string clientId, MqttApplicationMessage willMessage = null) + + public async Task ConnectTestClient(IMqttServer server, string clientId, MqttApplicationMessage willMessage = null) { var adapterA = new TestMqttCommunicationAdapter(); var adapterB = new TestMqttCommunicationAdapter(); diff --git a/Tests/MQTTnet.Core.Tests/TopicFilterComparerTests.cs b/Tests/MQTTnet.Core.Tests/TopicFilterComparerTests.cs index c65dcaba..be169212 100644 --- a/Tests/MQTTnet.Core.Tests/TopicFilterComparerTests.cs +++ b/Tests/MQTTnet.Core.Tests/TopicFilterComparerTests.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using MQTTnet.Core.Server; +using MQTTnet.Server; namespace MQTTnet.Core.Tests { diff --git a/Tests/MQTTnet.TestApp.AspNetCore2/Startup.cs b/Tests/MQTTnet.TestApp.AspNetCore2/Startup.cs index 5c9b32ed..9e5f90ae 100644 --- a/Tests/MQTTnet.TestApp.AspNetCore2/Startup.cs +++ b/Tests/MQTTnet.TestApp.AspNetCore2/Startup.cs @@ -6,8 +6,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; using MQTTnet.AspNetCore; -using MQTTnet.Core; -using MQTTnet.Core.Server; +using MQTTnet.Server; namespace MQTTnet.TestApp.AspNetCore2 { diff --git a/Tests/MQTTnet.TestApp.NetCore/ClientTest.cs b/Tests/MQTTnet.TestApp.NetCore/ClientTest.cs index dfd7d0d9..09788cce 100644 --- a/Tests/MQTTnet.TestApp.NetCore/ClientTest.cs +++ b/Tests/MQTTnet.TestApp.NetCore/ClientTest.cs @@ -1,8 +1,7 @@ using System; using System.Text; using System.Threading.Tasks; -using MQTTnet.Core; -using MQTTnet.Core.Client; +using MQTTnet.Client; namespace MQTTnet.TestApp.NetCore { diff --git a/Tests/MQTTnet.TestApp.NetCore/ManagedClientTest.cs b/Tests/MQTTnet.TestApp.NetCore/ManagedClientTest.cs index 7f76b659..21d1fdf8 100644 --- a/Tests/MQTTnet.TestApp.NetCore/ManagedClientTest.cs +++ b/Tests/MQTTnet.TestApp.NetCore/ManagedClientTest.cs @@ -1,12 +1,11 @@ using System; using System.Threading.Tasks; -using MQTTnet.Core; -using MQTTnet.Core.Client; -using MQTTnet.Core.ManagedClient; -using MQTTnet.Core.Protocol; using System.IO; using Newtonsoft.Json; using System.Collections.Generic; +using MQTTnet.Client; +using MQTTnet.ManagedClient; +using MQTTnet.Protocol; namespace MQTTnet.TestApp.NetCore { diff --git a/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetConsoleLogger.cs b/Tests/MQTTnet.TestApp.NetCore/MqttNetConsoleLogger.cs similarity index 88% rename from Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetConsoleLogger.cs rename to Tests/MQTTnet.TestApp.NetCore/MqttNetConsoleLogger.cs index 3cc13c38..67eb69e7 100644 --- a/Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetConsoleLogger.cs +++ b/Tests/MQTTnet.TestApp.NetCore/MqttNetConsoleLogger.cs @@ -1,8 +1,8 @@ using System; using System.Text; -using MQTTnet.Core.Diagnostics; +using MQTTnet.Diagnostics; -namespace MQTTnet.Diagnostics +namespace MQTTnet.TestApp.NetCore { public static class MqttNetConsoleLogger { @@ -10,8 +10,8 @@ namespace MQTTnet.Diagnostics public static void ForwardToConsole() { - MqttNetGlobalLog.LogMessagePublished -= PrintToConsole; - MqttNetGlobalLog.LogMessagePublished += PrintToConsole; + MqttNetGlobalLogger.LogMessagePublished -= PrintToConsole; + MqttNetGlobalLogger.LogMessagePublished += PrintToConsole; } private static void PrintToConsole(object sender, MqttNetLogMessagePublishedEventArgs e) diff --git a/Tests/MQTTnet.TestApp.NetCore/PerformanceTest.cs b/Tests/MQTTnet.TestApp.NetCore/PerformanceTest.cs index c6bbe04a..3aba3c1c 100644 --- a/Tests/MQTTnet.TestApp.NetCore/PerformanceTest.cs +++ b/Tests/MQTTnet.TestApp.NetCore/PerformanceTest.cs @@ -1,14 +1,13 @@ -using MQTTnet.Core; -using MQTTnet.Core.Client; -using MQTTnet.Core.Protocol; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; -using MQTTnet.Core.Server; +using MQTTnet.Client; +using MQTTnet.Protocol; +using MQTTnet.Server; namespace MQTTnet.TestApp.NetCore { diff --git a/Tests/MQTTnet.TestApp.NetCore/Program.cs b/Tests/MQTTnet.TestApp.NetCore/Program.cs index fb02de8f..0e4868af 100644 --- a/Tests/MQTTnet.TestApp.NetCore/Program.cs +++ b/Tests/MQTTnet.TestApp.NetCore/Program.cs @@ -1,11 +1,11 @@ -using MQTTnet.Core; -using MQTTnet.Core.Client; -using MQTTnet.Core.Server; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Threading; using System.Threading.Tasks; +using MQTTnet.Client; +using MQTTnet.Diagnostics; +using MQTTnet.Server; using Newtonsoft.Json; namespace MQTTnet.TestApp.NetCore diff --git a/Tests/MQTTnet.TestApp.NetCore/ServerTest.cs b/Tests/MQTTnet.TestApp.NetCore/ServerTest.cs index 23282920..767db084 100644 --- a/Tests/MQTTnet.TestApp.NetCore/ServerTest.cs +++ b/Tests/MQTTnet.TestApp.NetCore/ServerTest.cs @@ -1,9 +1,9 @@ using System; using System.Text; using System.Threading.Tasks; -using MQTTnet.Core.Protocol; -using MQTTnet.Core.Server; using MQTTnet.Diagnostics; +using MQTTnet.Protocol; +using MQTTnet.Server; namespace MQTTnet.TestApp.NetCore { diff --git a/Tests/MQTTnet.TestApp.UniversalWindows/JsonServerStorage.cs b/Tests/MQTTnet.TestApp.UniversalWindows/JsonServerStorage.cs index 9baafec0..fbf5b66d 100644 --- a/Tests/MQTTnet.TestApp.UniversalWindows/JsonServerStorage.cs +++ b/Tests/MQTTnet.TestApp.UniversalWindows/JsonServerStorage.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using MQTTnet.Core; -using MQTTnet.Core.Server; +using MQTTnet.Server; using Newtonsoft.Json; namespace MQTTnet.TestApp.UniversalWindows diff --git a/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj b/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj index fa0763c7..4445af39 100644 --- a/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj +++ b/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj @@ -131,10 +131,6 @@ {3587e506-55a2-4eb3-99c7-dc01e42d25d2} MQTTnet.NetStandard - - {2ecb99e4-72d0-4c23-99ba-93d511d3967d} - MQTTnet.Core - diff --git a/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs b/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs index 6c7258b9..5d943be6 100644 --- a/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs +++ b/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs @@ -5,13 +5,12 @@ using System.Threading.Tasks; using Windows.Security.Cryptography.Certificates; using Windows.UI.Core; using Windows.UI.Xaml; -using MQTTnet.Core; -using MQTTnet.Core.Client; -using MQTTnet.Core.Diagnostics; -using MQTTnet.Core.ManagedClient; -using MQTTnet.Core.Protocol; -using MQTTnet.Core.Server; +using MQTTnet.Client; +using MQTTnet.Diagnostics; using MQTTnet.Implementations; +using MQTTnet.ManagedClient; +using MQTTnet.Protocol; +using MQTTnet.Server; namespace MQTTnet.TestApp.UniversalWindows { @@ -26,7 +25,7 @@ namespace MQTTnet.TestApp.UniversalWindows { InitializeComponent(); - MqttNetGlobalLog.LogMessagePublished += OnTraceMessagePublished; + MqttNetGlobalLogger.LogMessagePublished += OnTraceMessagePublished; } private async void OnTraceMessagePublished(object sender, MqttNetLogMessagePublishedEventArgs e) @@ -250,7 +249,7 @@ namespace MQTTnet.TestApp.UniversalWindows { { // Write all trace messages to the console window. - MqttNetGlobalLog.LogMessagePublished += (s, e) => + MqttNetGlobalLogger.LogMessagePublished += (s, e) => { Console.WriteLine($">> [{e.TraceMessage.Timestamp:O}] [{e.TraceMessage.ThreadId}] [{e.TraceMessage.Source}] [{e.TraceMessage.Level}]: {e.TraceMessage.Message}"); if (e.TraceMessage.Exception != null)