Browse Source

Update nuget packages.

release/3.x.x
Christian Kratky 5 years ago
parent
commit
dbee941dcc
9 changed files with 19 additions and 18 deletions
  1. +1
    -1
      Build/MQTTnet.nuspec
  2. +2
    -2
      MQTTnet.sln
  3. +2
    -2
      Source/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs
  4. +6
    -1
      Source/MQTTnet/Formatter/MqttPacketFormatterAdapter.cs
  5. +2
    -6
      Source/MQTTnet/MQTTnet.csproj
  6. +1
    -1
      Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj
  7. +1
    -1
      Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj
  8. +1
    -1
      Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj
  9. +3
    -3
      Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj

+ 1
- 1
Build/MQTTnet.nuspec View File

@@ -57,7 +57,7 @@
<dependency id="System.Net.WebSockets.Client" version="4.3.2" />
</group>
<group targetFramework="uap10.0">
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.1.9" />
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.8" />
</group>
<group targetFramework="net452">
</group>


+ 2
- 2
MQTTnet.sln View File

@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2010
# Visual Studio Version 16
VisualStudioVersion = 16.0.28729.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj", "{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}"
EndProject


+ 2
- 2
Source/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs View File

@@ -44,9 +44,9 @@ namespace MQTTnet.AspNetCore
clientCertificate?.Dispose();

var channel = new MqttWebSocketChannel(webSocket, endpoint, isSecureConnection);
var clientAdapter = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(), _logger.CreateChildLogger(nameof(MqttWebSocketServerAdapter)));
var channelAdapter = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(), _logger.CreateChildLogger(nameof(MqttWebSocketServerAdapter)));

var eventArgs = new MqttServerAdapterClientAcceptedEventArgs(clientAdapter);
var eventArgs = new MqttServerAdapterClientAcceptedEventArgs(channelAdapter);
ClientAcceptedHandler?.Invoke(eventArgs);

if (eventArgs.SessionTask != null)


+ 6
- 1
Source/MQTTnet/Formatter/MqttPacketFormatterAdapter.cs View File

@@ -20,19 +20,22 @@ namespace MQTTnet.Formatter
UseProtocolVersion(protocolVersion);
}

public MqttProtocolVersion ProtocolVersion { get; private set; }
public MqttProtocolVersion ProtocolVersion { get; private set; } = MqttProtocolVersion.Unknown;

public IMqttDataConverter DataConverter
{
get
{
ThrowIfFormatterNotSet();

return _formatter.DataConverter;
}
}

public ArraySegment<byte> Encode(MqttBasePacket packet)
{
if (packet == null) throw new ArgumentNullException(nameof(packet));

ThrowIfFormatterNotSet();

return _formatter.Encode(packet);
@@ -40,6 +43,8 @@ namespace MQTTnet.Formatter

public MqttBasePacket Decode(ReceivedMqttPacket receivedMqttPacket)
{
if (receivedMqttPacket == null) throw new ArgumentNullException(nameof(receivedMqttPacket));

ThrowIfFormatterNotSet();

return _formatter.Decode(receivedMqttPacket);


+ 2
- 6
Source/MQTTnet/MQTTnet.csproj View File

@@ -54,7 +54,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='uap10.0'">
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net452'">
@@ -62,9 +62,5 @@

<ItemGroup Condition="'$(TargetFramework)'=='net461'">
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.2" />
</ItemGroup>

</Project>

+ 1
- 1
Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj View File

@@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>


+ 1
- 1
Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj View File

@@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="System.IO.Pipelines" Version="4.5.2" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.6" />
</ItemGroup>


+ 1
- 1
Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj View File

@@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
</ItemGroup>

<ItemGroup>


+ 3
- 3
Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj View File

@@ -12,7 +12,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17134.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -142,10 +142,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.2</Version>
<Version>6.2.8</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
<Version>5.0.0</Version>
<Version>4.0.0</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">


Loading…
Cancel
Save