@@ -41,6 +41,17 @@ | |||||
<dependency id="System.Net.WebSockets.Client" version="4.3.1" /> | <dependency id="System.Net.WebSockets.Client" version="4.3.1" /> | ||||
<dependency id="System.Threading.Thread" version="4.3.0" /> | <dependency id="System.Threading.Thread" version="4.3.0" /> | ||||
</group> | </group> | ||||
<group targetFramework="netstandard2.0"> | |||||
<dependency id="NETStandard.Library" version="2.0.0" /> | |||||
<dependency id="Microsoft.Extensions.DependencyInjection" version="2.0.0" /> | |||||
<dependency id="Microsoft.Extensions.Logging" version="2.0.0" /> | |||||
<dependency id="Microsoft.Extensions.Options" version="2.0.0" /> | |||||
<dependency id="System.Net.Security" version="4.3.2" /> | |||||
<dependency id="System.Net.WebSockets" version="4.3.0" /> | |||||
<dependency id="System.Net.WebSockets.Client" version="4.3.1" /> | |||||
<dependency id="System.Threading.Thread" version="4.3.0" /> | |||||
</group> | |||||
<group targetFramework="uap10.0"> | <group targetFramework="uap10.0"> | ||||
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.4.0" /> | <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.4.0" /> | ||||
@@ -62,6 +73,10 @@ | |||||
<!-- .NET Standard 1.3 --> | <!-- .NET Standard 1.3 --> | ||||
<file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard1.3\MQTTnet.Core.*" target="lib\netstandard1.3\"/> | <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard1.3\MQTTnet.Core.*" target="lib\netstandard1.3\"/> | ||||
<file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.3\"/> | <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.3\"/> | ||||
<!-- .NET Standard 2.0 --> | |||||
<file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard2.0\MQTTnet.Core.*" target="lib\netstandard2.0\"/> | |||||
<file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard2.0\MQTTnet.*" target="lib\netstandard2.0\"/> | |||||
<!-- Universal Windows --> | <!-- Universal Windows --> | ||||
<file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\uap10.0\MQTTnet.Core.*" target="lib\uap10.0\"/> | <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\uap10.0\MQTTnet.Core.*" target="lib\uap10.0\"/> | ||||
@@ -10,6 +10,7 @@ if ($path) { | |||||
&$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | &$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | ||||
&$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | &$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | ||||
&$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | |||||
&$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | &$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | ||||
&$msbuild ..\Frameworks\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | &$msbuild ..\Frameworks\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m | ||||
@@ -1,4 +1,4 @@ | |||||
#if NET452 || NETSTANDARD1_3 | |||||
#if NET452 || NETSTANDARD1_3 || NETSTANDARD2_0 | |||||
using System; | using System; | ||||
using System.Net; | using System.Net; | ||||
using System.Net.Security; | using System.Net.Security; | ||||
@@ -1,4 +1,4 @@ | |||||
#if NET452 || NETSTANDARD1_3 | |||||
#if NET452 || NETSTANDARD1_3 || NETSTANDARD2_0 | |||||
using System; | using System; | ||||
using System.Net.Security; | using System.Net.Security; | ||||
using System.Net.Sockets; | using System.Net.Sockets; | ||||
@@ -1,7 +1,7 @@ | |||||
<Project Sdk="Microsoft.NET.Sdk"> | <Project Sdk="Microsoft.NET.Sdk"> | ||||
<PropertyGroup> | <PropertyGroup> | ||||
<TargetFrameworks>netstandard1.3;net452;uap10.0</TargetFrameworks> | |||||
<TargetFrameworks>netstandard1.3;netstandard2.0;net452;uap10.0</TargetFrameworks> | |||||
<AssemblyName>MQTTnet</AssemblyName> | <AssemblyName>MQTTnet</AssemblyName> | ||||
<RootNamespace>MQTTnet</RootNamespace> | <RootNamespace>MQTTnet</RootNamespace> | ||||
<AssemblyVersion>2.5.0.0</AssemblyVersion> | <AssemblyVersion>2.5.0.0</AssemblyVersion> | ||||
@@ -32,23 +32,40 @@ | |||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\..\MQTTnet.Core\MQTTnet.Core.csproj" /> | <ProjectReference Include="..\..\MQTTnet.Core\MQTTnet.Core.csproj" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'"> | |||||
<PackageReference Include="System.Net.Security" Version="4.3.2" /> | |||||
<PackageReference Include="System.Net.WebSockets" Version="4.3.0" /> | |||||
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.1" /> | |||||
<PackageReference Include="System.Threading.Thread" Version="4.3.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" /> | |||||
</ItemGroup> | |||||
<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3'"> | <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3'"> | ||||
<PackageReference Include="System.Net.Security" Version="4.3.2" /> | <PackageReference Include="System.Net.Security" Version="4.3.2" /> | ||||
<PackageReference Include="System.Net.WebSockets" Version="4.3.0" /> | <PackageReference Include="System.Net.WebSockets" Version="4.3.0" /> | ||||
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.1" /> | <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.1" /> | ||||
<PackageReference Include="System.Threading.Thread" Version="4.3.0" /> | <PackageReference Include="System.Threading.Thread" Version="4.3.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0'"> | <ItemGroup Condition="'$(TargetFramework)'=='uap10.0'"> | ||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.4.0" /> | <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.4.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" /> | |||||
</ItemGroup> | |||||
<ItemGroup Condition="'$(TargetFramework)'=='net452'"> | |||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
</Project> | </Project> |
@@ -7,7 +7,6 @@ | |||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" /> | |||||
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" /> | <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" /> | ||||
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" /> | <PackageReference Include="MSTest.TestFramework" Version="1.2.0" /> | ||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> | ||||
@@ -15,7 +14,6 @@ | |||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\..\Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" /> | <ProjectReference Include="..\..\Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" /> | ||||
<ProjectReference Include="..\..\MQTTnet.Core\MQTTnet.Core.csproj" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
</Project> | </Project> |
@@ -7,13 +7,11 @@ | |||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" /> | |||||
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> | <PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\..\Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" /> | <ProjectReference Include="..\..\Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" /> | ||||
<ProjectReference Include="..\..\MQTTnet.Core\MQTTnet.Core.csproj" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||