From 2da265803508419588abca3b1766bb1b3b3b542c Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 1 Dec 2021 20:20:33 +0100 Subject: [PATCH] Refactor nuget package generation. --- Build/MQTTnet.AspNetCore.nuspec | 49 ------- Build/MQTTnet.Extensions.ManagedClient.nuspec | 52 ------- Build/MQTTnet.Extensions.Rpc.nuspec | 52 ------- Build/MQTTnet.Extensions.WebSocket4Net.nuspec | 53 -------- Build/MQTTnet.nuspec | 84 ------------ Build/build.ps1 | 86 ++---------- Build/upload.ps1 | 4 +- Images/nuget.png | Bin 0 -> 4143 bytes MQTTnet.sln | 72 +--------- ReleaseNotes.md | 12 ++ .../MQTTnet.AspNetCore.csproj | 92 +++++++++---- .../MQTTnet.Extensions.ManagedClient.csproj | 97 ++++++++----- .../MQTTnet.Extensions.Rpc.csproj | 97 ++++++++----- .../MQTTnet.Extensions.WebSocket4Net.csproj | 103 +++++++++----- .../Implementations/MqttTcpChannel.Uwp.cs | 4 +- .../MqttTcpServerAdapter.Uwp.cs | 18 +-- Source/MQTTnet/MQTTnet.csproj | 127 +++++++++++------- Source/MQTTnet/MqttFactory.cs | 2 +- Source/MQTTnet/codeSigningKey.pfx | Bin 1764 -> 0 bytes .../MQTTnet.AspNetCore.Tests.csproj | 2 +- 20 files changed, 382 insertions(+), 624 deletions(-) delete mode 100644 Build/MQTTnet.AspNetCore.nuspec delete mode 100644 Build/MQTTnet.Extensions.ManagedClient.nuspec delete mode 100644 Build/MQTTnet.Extensions.Rpc.nuspec delete mode 100644 Build/MQTTnet.Extensions.WebSocket4Net.nuspec delete mode 100644 Build/MQTTnet.nuspec create mode 100644 Images/nuget.png create mode 100644 ReleaseNotes.md delete mode 100644 Source/MQTTnet/codeSigningKey.pfx diff --git a/Build/MQTTnet.AspNetCore.nuspec b/Build/MQTTnet.AspNetCore.nuspec deleted file mode 100644 index 68fa9dbd..00000000 --- a/Build/MQTTnet.AspNetCore.nuspec +++ /dev/null @@ -1,49 +0,0 @@ - - - - MQTTnet.AspNetCore - 0.0.0 - The contributors of MQTTnet - Christian Kratky - LICENSE - https://github.com/chkr1011/MQTTnet - https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png - images\Logo_128x128.png - true - This is a support library to integrate MQTTnet into AspNetCore. - For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). - Copyright Christian Kratky 2016-2021 - 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 Blazor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Build/MQTTnet.Extensions.ManagedClient.nuspec b/Build/MQTTnet.Extensions.ManagedClient.nuspec deleted file mode 100644 index 8c43ed63..00000000 --- a/Build/MQTTnet.Extensions.ManagedClient.nuspec +++ /dev/null @@ -1,52 +0,0 @@ - - - - MQTTnet.Extensions.ManagedClient - 0.0.0 - The contributors of MQTTnet - Christian Kratky - LICENSE - https://github.com/chkr1011/MQTTnet - https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png - images\Logo_128x128.png - true - This is an extension library which provides a managed MQTT client with additional features using MQTTnet. - For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). - Copyright Christian Kratky 2016-2021 - 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 Blazor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Build/MQTTnet.Extensions.Rpc.nuspec b/Build/MQTTnet.Extensions.Rpc.nuspec deleted file mode 100644 index d0384138..00000000 --- a/Build/MQTTnet.Extensions.Rpc.nuspec +++ /dev/null @@ -1,52 +0,0 @@ - - - - MQTTnet.Extensions.Rpc - 0.0.0 - The contributors of MQTTnet - Christian Kratky - LICENSE - https://github.com/chkr1011/MQTTnet - https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png - images\Logo_128x128.png - true - This is an extension library which allows executing synchronous device calls including a response using MQTTnet. - For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). - Copyright Christian Kratky 2016-2021 - 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 Blazor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Build/MQTTnet.Extensions.WebSocket4Net.nuspec b/Build/MQTTnet.Extensions.WebSocket4Net.nuspec deleted file mode 100644 index 21baa845..00000000 --- a/Build/MQTTnet.Extensions.WebSocket4Net.nuspec +++ /dev/null @@ -1,53 +0,0 @@ - - - - MQTTnet.Extensions.WebSocket4Net - 0.0.0 - The contributors of MQTTnet - Christian Kratky - LICENSE - https://github.com/chkr1011/MQTTnet - https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png - images\Logo_128x128.png - true - This is an extension library which allows using _WebSocket4Net_ as transport for MQTTnet clients. - For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). - Copyright Christian Kratky 2016-2021 - 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 Blazor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec deleted file mode 100644 index bb6012d3..00000000 --- a/Build/MQTTnet.nuspec +++ /dev/null @@ -1,84 +0,0 @@ - - - - MQTTnet - 0.0.0 - The contributors of MQTTnet - Christian Kratky - LICENSE - https://github.com/chkr1011/MQTTnet - https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png - images\Logo_128x128.png - true - MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol. - -* [Core] Improved memory management when working with large payloads. -* [Client] The OS will now choose the best TLS version to use. It is no longer fixed to 1.3 etc. (thanks to @patagonaa, #1271). -* [Client] Exposed user properties and reason string in subscribe result. -* [Client] Exposed user properties and reason string in unsubscribe result. -* [Server] Added support for returning individual subscription errors (#80 thanks to @jimch) -* [Server] Improved topic filter comparisons (support for $). -* [Server] Added more MQTTv5 response information to all interceptors (BREAKING CHANGE!). -* [Server] Improved session management for MQTT v5 (#1294, thanks to @logicaloud). -* [Server] All interceptors and events are migrated from interfaces to simple events. All existing APIs are availble but must be migrated to corresponding events. -* [Server] Removed all interceptor and event interfaces including the delegate implementations etc. -* [Server] Renamed a lot of classes and adjsuted namespaces. -* [Server] Introduced a new queueing approach for internal message process (packet bus). - -Git commit: $gitCommit - - Copyright Christian Kratky 2016-2021 - 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 Blazor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Build/build.ps1 b/Build/build.ps1 index a464ed4f..a19aa338 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -12,87 +12,29 @@ Write-Host "Nuget version = $nugetVersion" Write-Host "MSBuild path = $msbuild" Write-Host -Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile "nuget.exe" - -.\nuget.exe restore ..\MQTTnet.sln +# Cleanup +Remove-Item -Path ".\..\" -Filter "*.nupkg" +Remove-Item -Path ".\..\" -Filter "*.snupkg" # Build and execute tests -&$msbuild ..\Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /verbosity:m -&$msbuild ..\Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /verbosity:m +&$msbuild ..\Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /verbosity:m +&$msbuild ..\Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /verbosity:m -vstest.console.exe ..\Tests\MQTTnet.Core.Tests\bin\Release\netcoreapp3.1\MQTTnet.Tests.dll -vstest.console.exe ..\Tests\MQTTnet.AspNetCore.Tests\bin\Release\netcoreapp3.1\MQTTnet.AspNetCore.Tests.dll +#vstest.console.exe ..\Tests\MQTTnet.Core.Tests\bin\Release\net5.0\MQTTnet.Tests.dll +#vstest.console.exe ..\Tests\MQTTnet.AspNetCore.Tests\bin\Release\net5.0\MQTTnet.AspNetCore.Tests.dll +$certificate = ".\..\..\Build\codeSigningKey.pfx" # Build the core library -&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" +&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate -# Build the ASP.NET Core 2.0 extension -&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" +# Build the ASP.NET extension +&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate # Build the RPC extension -&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" +&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate # Build the Managed Client extension -&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" +&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate # Build the WebSocket4Net extension -&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" -&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx" - -# Create NuGet packages. - -Remove-Item .\NuGet -Force -Recurse -ErrorAction SilentlyContinue - -$gitCommit = git log -1 --format=%h - -Copy-Item MQTTnet.nuspec -Destination MQTTnet.nuspec.old -Force -(Get-Content MQTTnet.nuspec) -replace '\$gitCommit', $gitCommit | Set-Content MQTTnet.nuspec -Copy-Item MQTTnet.AspNetCore.nuspec -Destination MQTTnet.AspNetCore.nuspec.old -Force -(Get-Content MQTTnet.AspNetCore.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.AspNetCore.nuspec -Copy-Item MQTTnet.Extensions.Rpc.nuspec -Destination MQTTnet.Extensions.Rpc.nuspec.old -Force -(Get-Content MQTTnet.Extensions.Rpc.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.Rpc.nuspec -Copy-Item MQTTnet.Extensions.ManagedClient.nuspec -Destination MQTTnet.Extensions.ManagedClient.nuspec.old -Force -(Get-Content MQTTnet.Extensions.ManagedClient.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.ManagedClient.nuspec -Copy-Item MQTTnet.Extensions.WebSocket4Net.nuspec -Destination MQTTnet.Extensions.WebSocket4Net.nuspec.old -Force -(Get-Content MQTTnet.Extensions.WebSocket4Net.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.WebSocket4Net.nuspec - -New-Item -ItemType Directory -Force -Path .\NuGet -.\nuget.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion -.\nuget.exe pack MQTTnet.AspNetCore.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion -.\nuget.exe pack MQTTnet.Extensions.Rpc.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion -.\nuget.exe pack MQTTnet.Extensions.ManagedClient.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion -.\nuget.exe pack MQTTnet.Extensions.WebSocket4Net.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion - -Move-Item MQTTnet.nuspec.old -Destination MQTTnet.nuspec -Force -Move-Item MQTTnet.AspNetCore.nuspec.old -Destination MQTTnet.AspNetCore.nuspec -Force -Move-Item MQTTnet.Extensions.Rpc.nuspec.old -Destination MQTTnet.Extensions.Rpc.nuspec -Force -Move-Item MQTTnet.Extensions.ManagedClient.nuspec.old -Destination MQTTnet.Extensions.ManagedClient.nuspec -Force -Move-Item MQTTnet.Extensions.WebSocket4Net.nuspec.old -Destination MQTTnet.Extensions.WebSocket4Net.nuspec -Force - -Remove-Item "nuget.exe" -Force -Recurse -ErrorAction SilentlyContinue \ No newline at end of file +&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate \ No newline at end of file diff --git a/Build/upload.ps1 b/Build/upload.ps1 index 794fe87f..d00386c9 100644 --- a/Build/upload.ps1 +++ b/Build/upload.ps1 @@ -2,12 +2,12 @@ param([string]$apiKey) Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile "nuget.exe" -$files = Get-ChildItem -Path ".\NuGet" -Filter "*.nupkg" +$files = Get-ChildItem -Path ".\..\Source" -Recurse -Filter "*.nupkg" foreach ($file in $files) { Write-Host "Uploading: " $file - .\nuget.exe push $file.Fullname $apiKey -Source https://api.nuget.org/v3/index.json + #.\nuget.exe push $file.Fullname $apiKey -Source https://api.nuget.org/v3/index.json } Remove-Item "nuget.exe" -Force -Recurse -ErrorAction SilentlyContinue \ No newline at end of file diff --git a/Images/nuget.png b/Images/nuget.png new file mode 100644 index 0000000000000000000000000000000000000000..b725537a9ec336b3754e416fa695b36402885761 GIT binary patch literal 4143 zcmb7HWmweB*Z#pnEZs^8N=ph#F0phkpeQ9shjhpSOLs_jFQA|g(%ma9jVQ=2-6HF{ zbP4}`zP(@Hxvn$!IoHgGxz3z(-!ln@P)#awR&oFUsI;}zp5ih5KLe5A=K)2VaXb+D zs%RU7@FN&xACHg8ytK@G@p$>45!5U39^f4oKXp^TXP%CJFdH8S00x7Jx_G$y+SzzH zh8*9#x~ z#-=ibB1@VM`bFWgyN?G1uvaC!@&{MTM=PZj{nT9u3jw{SpYoOAw}J!`T*a!vQIY ze*&D`a){V^KDd2Fq9Ggbv2GqRznHcBnXi&-8>Fx?ngkFZGJ*R_$Z3EG;jxDvXdyo)N;+9shM_JVBZ6k9_$4x*?WiW}r#&p`SRc zIgQJC-8*Y6m)o1hy4*T8zvNWy^W!|5N<`z-pNFHgOq5LZP^{o+CJ}+d9=}r%NPq(D zqahN2`iFSB90b`BAWV}@1ng6|fc%R8Psp(5Lb?gKf-ScJ=q(xW#Ce&!sa~rVS&G1jHPnIezZY~Q{E9%#1}tF z$onK5S?)gFCN=-fF!X>Kmdaix!ykt#lt#Cpu`LVn%wbrv+~=4Q0|@ETQU zbS(8QI&Xd37{cWE>HzC3EXTo@E?o|XyVITvDLS;HrhO&#$9`WV+LW#)9+W;=Uw>C) zu3nmJr83vkwcJQxF5>;HieCDSAj_`>U%LfS(OL^lOYep)$=Or|jiqlNsV_DtPaGTo zwPe=sznxHYdT-uPXZyNv-uIqjS9$gfEpk^Wq;q);#^{b+(VLjAx~&Ua_SkMy2T}68 zx$voEWTXYVJgo}BJ%1?(WSi@kG6|tX7Iw2upPQAR{BaWe0vaC^0kZO_i+HWS5c=O(Z!m>*w0TU^XoFw^7v(w)=p z!2AO~L@w&N_;o*u2n5yRarqnxU7V-7r*oZYkho(u;fTMe-P6?@$4n;JC z9SyS&t}yF435c|JJVA+XNrLK3BM`HGWB#k(t9g%VZ*ZyQ*{k$_FOG^{wdkO33MB8H zPTuuS0E8Wz^v%(lA>l7{_bJ4h;l&EZ1O$T$xafA8 zE4l4lu}yk{EKVhl$K#db6FhuE)fZ=3yt<%oKh3i{eD~6xoh7hK>G`yqTyE$3j~t0K zgOeNp853<)r02i!47EF=+snB>x#9EJ!YYNx!N%B@oFztCr-k- zPNd~w*hchmNGz4_SdQ3cqarff9gVbg$-X1){@*b&9{KX2ta{A1mr-qXfl?DjgzA;B z!uD6Dds#JCxnjCI#6zRIgWcmqh9NjEd?UGJSJD%GwF-QHp*@o!6m}jpcSc*d>RDda z`1PR$RZx$;m35YBA6m)#r@-1682jVh`|ATIsm&jW4E!JD;qxw6ry8_7!x~j?`N`Q*MuW+1>q2Y4pY@$rzLvB0! zU09UJv$FvjOv?B7_59&$(L_~l#Qc0ZJF;kLoWn~+I=_%zs9sA;#>K)4eA+Q~#^_%$ z%Z!O6cEzQK7N;7FmlSu48n?&WUjoBpI*E#xT2H25zM5{qpuuik*VT1A{HZ~D`H{4Y zTlF=Ai%q;ozl#+y&7Qr97L}28ZfL%OP$7QOf#t4yt!Tu8u0KbVt*usTlgwB8<$9aJ zw`}|cCa+#-n0a`_g&a#RafScu+4p{HP5Ethc1`G@2H6xBuV}cYv`5xUUN@C{^!@cp zw=BlxV!CC{XCA`P6oFutHg|Fb#gI;mgB4U;YJ_LEvX)PyzLm8-k6B>g)^wrf_QEUl zRvZtnxX&~P7YP-8%kudeL5ye5wohpfODUSk&BJ-^xM^DAW|YqOHJUcA?BPQ_xsU?z z?Ts|7@0?Ion=C@^o{`;f8lFE1%E~fY`$A5>LnV!RF%$ zW=~h>_B~d22A4X5dxAT3qqmaIn*m_#@K8p=mgwSW$EYZCbLMC1WupXC>4=gPezO1P z)4M*zrI0B~YzGWdR*pWwBuPnTSY3(GZ+*MixB5Hcg?Mj)Y$oRojz&6g%ktckVJ3&7+GNh~`L>I6_np4G z$iMw6DF&q}W$y;(Y6Eyf#ejNIZqBLEwLaGc)Pd=1-DM2gU%KR+Ep(NXmRsgQMB0}9 z6FNFmR#v=#l{Hk73>1UE<>tasJ)-J4gofu~_OnC+TK`ub4Lm?N4UXmJ1jBUq*Cwm* z)UOqq3Tx>igfmp2*SI<^;O?y5q5W)6ER34-G+g?{6NmtUIFj>b<&HWK8Xex!*a893 z?ja=;fnau~d2%du^m=d=lrB7#o>0xY=6vdSt49U+OhyLc(rip-Vww~R6l^KT^WKdA zGR7q%PM3Y((B!E~pcMy9>2~R7fGSWB4=U$`zulXy_<4uZ0AGBj!ptW@uago5ltPOR z?M5E4P?j%{I=A43gmC_mpDmHPW|D?MO;<>ltZ`ArlMr-8L+j64q)=sKQ}1;~9&Xe9 z>-6nm?ll(Erft=2diV&0{EO||HTG{E5GQT!foJwQQhixm#FX%V5);`zoUdW*J;|9Y zo8LNc(+EB0-ubO;;GJ?q1Le!M6r5(t526kqX+a3-F@df3^d_pBIIZ`@IZHhN}c=7~B$HuvX*C2(5tJfQM zmlzXrXQTpJ$m0phId1x@|GXwxx;(d=`g^_0j8+4>T0A*ZOBIBI1}#2~+`HY%EYJ3J zA4z$Uy_!*t?bRK=Jdv7=5q+GA*mK?=9~Wm!X67U*%#bs)|F@ zx-cB>G!-8jki9#l9qUa8m(c3LRU9kbrgyh3Iy0s!e0WMHYa6}wX6imbhU5;YJp4Rf z3Y>oE@KJAG5c9W}cRVmPV&jHkTiL8cA=OO!o~&1}Sjc^{Uy*P5ab^TEP2amLUKTkA zK}=2Ke!FAUnNko#s4qvcBX!f{$aNFsM`P!g@}YO(V={jC=2J@iy60*~oQT){czYzp z3>UD@3T!$A27ZIx=ZbIgPAH5Ykqg7>pML_1%6glPjR9$Y%*HS&XZzWXAd}#Ix?fu< zZR=E%Y3OwF`{^>SIcRJRHE4~lyXjDwk5E81!0?HJ%`heX?u7Rb=ykJ;o+1qTq@dmS z&(G*%zjp&q13AnM0TwKVX)`iiD+s8Ze z8}7@PZFL6{H8<2~Yb);|gQCG{>YPYpi}9H6)hrJW3z(HF%2r+L((#S)Jy+Do_d=o) zWlq=$WWJ1F6L*XrDD~_B_xyZ{ierF_5>*#3fCyx45bwJ%25^{tsy)lm)DU<1bAU#SM#>!D0P8R&RD)@U-;A8+WpB zaT#;>pjW-Q!nj0X{G=Fc>9MdpssmVC0&?=!Kun>O(JS-)KX3S=BJg!5)8R}voJc+^ zk!uy4{&n@5q=}7aN3`2k*VNR!V6WK?{|2_-n_nwY_&Hw@r{CGo*tpCL=!00P=u~5A zWrJmwug)|p=E}%uG~d6NGquzYQ74u(sYQqhAT|ccy6Wsr>?}tX02QxC4;c7p4~DO1H?KO7w2FD=B$NZ?lh z>2~!VF~fTqGQn4>#}2CsP?`CbkXIUX5K=k-Egp|810kZ+HaX`$Bm#1fIU|uU2!1KP zKTJ_3>;l|LDS2~*Ayo&U6$3p^C!MT#Z^OM%4xGdV@OwS^og!8SLXur$&@_nvy9N>t zJM||~2dK-3l$3!vSs@mrLG-}Lk;5FwAQGP;ZI%fmufmqFp1U~Y%RzR)YS z&pd!q0E*6Y1U&Vpo#Qbx5yGx+C5NsgWn*3Rt(R&&GSmRPfjM`*@{Cqc5n(6(9e`r- zYrEMkCMIs`lnofHh<+Fd0^IEk&p<+z2T;tblh zXArS00;(!(*De@NBvFoeo*V(?OnG1-g}P%NSytc#SZuHq6~>TPZSzxR)LqB*_$|o)ApqZUlB>$S~J(Pr~L&lbV+zMfgeSg(S-HUq;IaP zp@X}^R+T|P0K?>?XT+)vv8|Yh+hB1NFWIm0yxeg%8q}IX_$8e9mXwAy WKD3-Wh5-M$2ej3pYPBlXk^ci< + - - netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0 - - - - - 7.2 - true - true - true - snupkg - + + netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0 - - - + MQTTnet.AspNetCore + MQTTnet.AspNetCore + True + The contributors of MQTTnet + MQTTnet + MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol. + The contributors of MQTTnet + MQTTnet.AspNetCore + false + false + true + true + snupkg + Christian Kratky 2016-2021 + https://github.com/chkr1011/MQTTnet + https://github.com/chkr1011/MQTTnet.git + git + 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 Blazor + en-US + True + True + nuget.png + true + true + LICENSE + For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). + + true + - - RELEASE;NETSTANDARD2_0 - + + + True + \ + + - - - - - - - + + + True + \ + + - - - + + + + + + RELEASE;NETSTANDARD2_0 + + + + + + + + + + + + + diff --git a/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj b/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj index b53859da..1ea1486e 100644 --- a/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj +++ b/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj @@ -1,40 +1,71 @@ - - netstandard1.3;netstandard2.0;netstandard2.1;net5.0 - $(TargetFrameworks);net452;net461 - $(TargetFrameworks);uap10.0 - - - - - False - false - false - true - true - snupkg - + + netstandard1.3;netstandard2.0;netstandard2.1;net5.0 + $(TargetFrameworks);net452;net461 + $(TargetFrameworks);uap10.0 - - false - UAP,Version=v10.0 - UAP - 10.0.18362.0 - 10.0.10240.0 - .NETCore - v5.0 - $(DefineConstants);WINDOWS_UWP - en - $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets - + MQTTnet.Extensions.ManagedClient + MQTTnet.Extensions.ManagedClient + True + The contributors of MQTTnet + MQTTnet + This is an extension library which provides a managed MQTT client with additional features using MQTTnet. + The contributors of MQTTnet + MQTTnet.Extensions.ManagedClient + false + false + true + true + snupkg + Christian Kratky 2016-2021 + https://github.com/chkr1011/MQTTnet + https://github.com/chkr1011/MQTTnet.git + git + 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 Blazor + en-US + True + True + nuget.png + true + true + LICENSE + For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). + - - - + + false + UAP,Version=v10.0 + UAP + 10.0.18362.0 + 10.0.10240.0 + .NETCore + v5.0 + $(DefineConstants);WINDOWS_UWP + en + $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets + - - - + + + True + \ + + + + + + True + \ + + + + + + + + + + diff --git a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj index b53859da..60ff1585 100644 --- a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj +++ b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj @@ -1,40 +1,71 @@ - - netstandard1.3;netstandard2.0;netstandard2.1;net5.0 - $(TargetFrameworks);net452;net461 - $(TargetFrameworks);uap10.0 - - - - - False - false - false - true - true - snupkg - + + netstandard1.3;netstandard2.0;netstandard2.1;net5.0 + $(TargetFrameworks);net452;net461 + $(TargetFrameworks);uap10.0 - - false - UAP,Version=v10.0 - UAP - 10.0.18362.0 - 10.0.10240.0 - .NETCore - v5.0 - $(DefineConstants);WINDOWS_UWP - en - $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets - + MQTTnet.Extensions.Rpc + MQTTnet.Extensions.Rpc + True + The contributors of MQTTnet + MQTTnet + This is an extension library which allows executing synchronous device calls including a response using MQTTnet. + The contributors of MQTTnet + MQTTnet.Extensions.Rpc + false + false + true + true + snupkg + Christian Kratky 2016-2021 + https://github.com/chkr1011/MQTTnet + https://github.com/chkr1011/MQTTnet.git + git + 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 Blazor + en-US + True + True + nuget.png + true + true + LICENSE + For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). + - - - + + false + UAP,Version=v10.0 + UAP + 10.0.18362.0 + 10.0.10240.0 + .NETCore + v5.0 + $(DefineConstants);WINDOWS_UWP + en + $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets + - - - + + + True + \ + + + + + + True + \ + + + + + + + + + + diff --git a/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj b/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj index 9a5cf528..8e5ab93b 100644 --- a/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj +++ b/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj @@ -1,44 +1,75 @@ - - netstandard1.3;netstandard2.0;netstandard2.1;net5.0 - $(TargetFrameworks);net452;net461 - $(TargetFrameworks);uap10.0 - - - - - False - false - false - true - true - snupkg - + + netstandard1.3;netstandard2.0;netstandard2.1;net5.0 + $(TargetFrameworks);net452;net461 + $(TargetFrameworks);uap10.0 - - false - UAP,Version=v10.0 - UAP - 10.0.18362.0 - 10.0.10240.0 - .NETCore - v5.0 - $(DefineConstants);WINDOWS_UWP - en - $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets - + MQTTnet.Extensions.WebSocket4Net + MQTTnet.Extensions.WebSocket4Net + True + The contributors of MQTTnet + MQTTnet + This is an extension library which allows using _WebSocket4Net_ as transport for MQTTnet clients. + The contributors of MQTTnet + MQTTnet.Extensions.WebSocket4Net + false + false + true + true + snupkg + Christian Kratky 2016-2021 + https://github.com/chkr1011/MQTTnet + https://github.com/chkr1011/MQTTnet.git + git + 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 Blazor + en-US + True + True + nuget.png + true + true + LICENSE + For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). + - - - + + false + UAP,Version=v10.0 + UAP + 10.0.18362.0 + 10.0.10240.0 + .NETCore + v5.0 + $(DefineConstants);WINDOWS_UWP + en + $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets + - - - + + + True + \ + + - - - + + + True + \ + + + + + + + + + + + + + + diff --git a/Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs b/Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs index 6bcb7680..98b7c6fc 100644 --- a/Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs +++ b/Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs @@ -12,7 +12,7 @@ using Windows.Networking; using Windows.Networking.Sockets; using Windows.Security.Cryptography.Certificates; using MQTTnet.Channel; -using MQTTnet.Client.Options; +using MQTTnet.Client; using MQTTnet.Server; namespace MQTTnet.Implementations @@ -32,7 +32,7 @@ namespace MQTTnet.Implementations _bufferSize = _options.BufferSize; } - public MqttTcpChannel(StreamSocket socket, X509Certificate2 clientCertificate, IMqttServerOptions serverOptions) + public MqttTcpChannel(StreamSocket socket, X509Certificate2 clientCertificate, MqttServerOptions serverOptions) { _socket = socket ?? throw new ArgumentNullException(nameof(socket)); _bufferSize = serverOptions.DefaultEndpointOptions.BufferSize; diff --git a/Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs b/Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs index bda77739..a6ac86cd 100644 --- a/Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs +++ b/Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs @@ -1,13 +1,13 @@ #if WINDOWS_UWP using Windows.Networking.Sockets; using MQTTnet.Adapter; -using MQTTnet.Diagnostics.Logger; using MQTTnet.Formatter; -using MQTTnet.Server; using System; using System.Runtime.InteropServices.WindowsRuntime; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; +using MQTTnet.Server; +using MQTTnet.Diagnostics; namespace MQTTnet.Implementations { @@ -16,23 +16,17 @@ namespace MQTTnet.Implementations readonly MqttNetSourceLogger _logger; readonly IMqttNetLogger _rootLogger; - IMqttServerOptions _options; + MqttServerOptions _options; StreamSocketListener _listener; - public MqttTcpServerAdapter(IMqttNetLogger logger) - { - _rootLogger = logger ?? throw new ArgumentNullException(nameof(logger)); - _logger = logger.WithSource(nameof(MqttTcpServerAdapter)); - } - public Func ClientHandler { get; set; } - public async Task StartAsync(IMqttServerOptions options) + public async Task StartAsync(MqttServerOptions options, IMqttNetLogger logger) { - _options = options ?? throw new ArgumentNullException(nameof(options)); - if (_listener != null) throw new InvalidOperationException("Server is already started."); + _options = options ?? throw new ArgumentNullException(nameof(options)); + if (options.DefaultEndpointOptions.IsEnabled) { _listener = new StreamSocketListener(); diff --git a/Source/MQTTnet/MQTTnet.csproj b/Source/MQTTnet/MQTTnet.csproj index 8efd8727..d6b07225 100644 --- a/Source/MQTTnet/MQTTnet.csproj +++ b/Source/MQTTnet/MQTTnet.csproj @@ -1,53 +1,90 @@ - + - - netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0 - $(TargetFrameworks);net452;net461 - $(TargetFrameworks);uap10.0 - MQTTnet - MQTTnet - False - - - - - - false - false - true - true - snupkg - + + + + + + @(ReleaseNotes, '%0a') + + - - false - UAP,Version=v10.0 - UAP - 10.0.18362.0 - 10.0.10240.0 - .NETCore - v5.0 - $(DefineConstants);WINDOWS_UWP - en - $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets - + + netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0 + $(TargetFrameworks);net452;net461 + $(TargetFrameworks);uap10.0 + + MQTTnet + MQTTnet + True + The contributors of MQTTnet + MQTTnet + MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol. + The contributors of MQTTnet + MQTTnet + false + false + true + true + snupkg + Christian Kratky 2016-2021 + https://github.com/chkr1011/MQTTnet + https://github.com/chkr1011/MQTTnet.git + git + 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 Blazor + en-US + True + True + nuget.png + true + true + LICENSE + - - Full - + + false + UAP,Version=v10.0 + UAP + 10.0.18362.0 + 10.0.10240.0 + .NETCore + v5.0 + $(DefineConstants);WINDOWS_UWP + en + $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets + - - - + + Full + - - - - - + + + True + \ + + + + + + True + \ + + + + + + + + + + + + + + + + - - - \ No newline at end of file diff --git a/Source/MQTTnet/MqttFactory.cs b/Source/MQTTnet/MqttFactory.cs index 34e1e5f4..005225cb 100644 --- a/Source/MQTTnet/MqttFactory.cs +++ b/Source/MQTTnet/MqttFactory.cs @@ -1,4 +1,4 @@ -using MQTTnet.Adapter; +using MQTTnet.Adapter; using MQTTnet.Client; using MQTTnet.Implementations; using MQTTnet.LowLevelClient; diff --git a/Source/MQTTnet/codeSigningKey.pfx b/Source/MQTTnet/codeSigningKey.pfx deleted file mode 100644 index 9374a5dbc11acc2a3a2c507ad3281f755fcbbf45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1764 zcmZXTcU0477sr1Y{u02E3Rsy6RF6!P5EC4TViG6<5|(8)6bdht4Pn**2~%VhDG)+r zRiF|;Rs(232}_WnBFNAn7@#7v0YUKX&z|>fPfyQ1_qpHuxzByh^T)kd7AS(l5Lgz- z1*NnSO%pfw!BDUw7MO-)fhiD9z_Jic|0p5Kkt{?hgl|D!0LuKYYp*m6Uc`boVOj7x ztTHJ5e+)goABkoX7*ju@%aL$6Y6!`KXGW>@w~Y-`14Vm$%t|J4kDqTZ6P+L4WA}$u z7G|cVzWO=rPM5wfIP-qtyt0lB$q9RZfl;2jH`j5_?H+F9>;~s$TY3gKglNc)7o8NO ze7LbE7vwGTl9VM=d7UKxRL#pd*=>j^2Jg!@OuS4?H+PszXH25Hvpu&B?YF0YC?2ia z+c&>@k2C6vei%8?-AgF9bj+B4I@jH@=B!s{pvnx1wN+0Re(2V7_ge?B>q zdHFIZ!gba3v|lxO;k{Ktous{`Tpu|>`6?-G4*zzsWxE>Vm%$<#P%2#|JnccIM@Gqd zu%^q)oXAITT6lZCy11?0+W2A<2)kju-CK_iCw7+hx$(4#6%wtm4UD_1$L&-yeOC1D zmu3aaXob)(G#136n~%L@2{jtY#{_RJg60lcTq+bM*J^Wp1$|~~>_y@66^1u&x1eXS zRL|PzXw*-N3Vxa7wlGgKJJiPOnwGfS+>U|9#YTA=tch(b{C>^w`GnH-F`6bV>NAP6 z(cu++Wu*^^YW(6UY~b)Kfu>97t4@NW-IbZWvAa&ROV=VtB^)iEv1e!4sc#)eUr1Nv z5v%-6b!#dA#_&$CS7%yR^_&pYgk7;{oG&UcmcgTazem_<<^YeCsRNmfSkStrT?e zS||EX*T5ariA5od^Pu_9SyT4-4idp#zIeEDdB8tyZZL-GpsZyp{I?z5?=WEz_0kH0xwYk_S$89R1TJ>r>J#A#5eptXD0belP2bQGR8iAa&O zHyoOzGlQiC{?4rp>Up{Euzr-RTR=2uUg|4vUU{gha4rG~C3YjItMBMNlp`7{q0 zWZ5(p98}3`bh?R*UvIrI7WnzB8Ykd<@d5MU)`l~za(|88==QO@{Kfm78_oTOp>}l2 zYgtdWF#dj^N|);q&cXzZ{ktJGdv$DwlyQ=;!>1b8+Pv0%5*l!MiRnRK6;yIwM5w=E z!aGh-ZaCyO2JWn-^J7$tVwc2uk2>|M6PFrc_-77iW?)aEi&C&)Nho#UYYz4-_6QaQ z?$O?lfGZ;9Ruv;2rrE~ZwaktU*j$VFvWM4^kCgM2S4msW`lZOXqIU#UV`58>!D@UO G;6DJc77}Ox diff --git a/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj b/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj index 24efb9b6..992e8676 100644 --- a/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj +++ b/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1;net461;net5.0