YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-20 11:45:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

dotnet 7 packages (#1636)

Browse Source 
* Added dotnet 7 support/builds.

* Added NETCOREAPP_3_1_OR_GREATER where applicable.
This commit is contained in:
Jeffery Michael
2022-12-28 09:20:11 +01:00
committed by GitHub
parent d74c81c3d1
commit e0ce1f309e
17 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs
+1 -1
View File
@@ -46,7 +46,7 @@ namespace MQTTnet.Client
Certificates = _tlsParameters.Certificates?.ToList(),
#endif
#if NETCOREAPP3_1 || NET5_0_OR_GREATER
#if NETCOREAPP3_1_OR_GREATER
ApplicationProtocols = _tlsParameters.ApplicationProtocols,
#endif
};
Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs
+2 -2
View File
@@ -15,7 +15,7 @@ namespace MQTTnet.Client
public Func<MqttClientCertificateValidationEventArgs, bool> CertificateValidationHandler { get; set; }
#if NET48 || NETCOREAPP3_1 || NET5 || NET6
#if NET48 || NETCOREAPP3_1_OR_GREATER
public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12 | SslProtocols.Tls13;
#else
public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12 | (SslProtocols)0x00003000 /*Tls13*/;
@@ -27,7 +27,7 @@ namespace MQTTnet.Client
public IEnumerable<X509Certificate> Certificates { get; set; }
#endif
#if NETCOREAPP3_1 || NET5_0_OR_GREATER
#if NETCOREAPP3_1_OR_GREATER
public List<System.Net.Security.SslApplicationProtocol> ApplicationProtocols { get; set; }
#endif
Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs
+2 -2
View File
@@ -29,13 +29,13 @@ namespace MQTTnet.Client
public List<X509Certificate> Certificates { get; set; }
#endif
#if NETCOREAPP3_1 || NET5_0_OR_GREATER
#if NETCOREAPP3_1_OR_GREATER
public List<System.Net.Security.SslApplicationProtocol> ApplicationProtocols { get; set; }
public System.Net.Security.CipherSuitesPolicy CipherSuitesPolicy { get; set; }
#endif
#if NET48 || NETCOREAPP3_1 || NET5 || NET6
#if NET48 || NETCOREAPP3_1_OR_GREATER
public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12 | SslProtocols.Tls13;
#else
public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12 | (SslProtocols)0x00003000 /*Tls13*/;
Source/MQTTnet/Diagnostics/Runtime/TargetFrameworkProvider.cs
+2
View File
@@ -30,6 +30,8 @@ namespace MQTTnet.Diagnostics
return "net5.0";
#elif NET6_0
return "net6.0";
#elif NET7_0
return "net7.0";
#endif
}
}
Source/MQTTnet/Implementations/MqttTcpChannel.cs
+2 -2
View File
@@ -103,7 +103,7 @@ namespace MQTTnet.Implementations
var sslStream = new SslStream(networkStream, false, InternalUserCertificateValidationCallback);
try
{
#if NETCOREAPP3_1 || NET5_0_OR_GREATER
#if NETCOREAPP3_1_OR_GREATER
var sslOptions = new SslClientAuthenticationOptions
{
ApplicationProtocols = _tcpOptions.TlsOptions.ApplicationProtocols,
@@ -127,7 +127,7 @@ namespace MQTTnet.Implementations
}
catch
{
#if NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0_OR_GREATER
#if NETSTANDARD2_1 || NETCOREAPP3_1_OR_GREATER
await sslStream.DisposeAsync().ConfigureAwait(false);
#else
sslStream.Dispose();
Source/MQTTnet/Implementations/MqttTcpServerListener.cs
+1 -1
View File
@@ -198,7 +198,7 @@ namespace MQTTnet.Implementations
{
var sslStream = new SslStream(stream, false, _tlsOptions.RemoteCertificateValidationCallback);
#if NETCOREAPP3_1 || NET5_0_OR_GREATER
#if NETCOREAPP3_1_OR_GREATER
await sslStream.AuthenticateAsServerAsync(
new SslServerAuthenticationOptions()
{
Source/MQTTnet/MQTTnet.csproj
+1 -1
View File
@@ -10,7 +10,7 @@
</Target>
<PropertyGroup>
<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
<LangVersion>7.3</LangVersion>
Source/MQTTnet/Server/Options/MqttServerTlsTcpEndpointOptions.cs
+2 -2
View File
@@ -24,8 +24,8 @@ namespace MQTTnet.Server
public bool CheckCertificateRevocation { get; set; }
public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12;
#if NETCOREAPP3_1 || NET5_0_OR_GREATER
#if NETCOREAPP3_1_OR_GREATER
public System.Net.Security.CipherSuitesPolicy CipherSuitesPolicy { get; set; }
#endif
}