Skip to content

Commit d99d0d0

Browse files
committed
Release S7NetPlus 0.15.0
Release highlights: - Add flowed cancellation to ConnectAsync
2 parents e3fad0b + ce9f9f9 commit d99d0d0

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

S7.Net/PlcAsynchronous.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public partial class Plc
2525
/// <returns>A task that represents the asynchronous open operation.</returns>
2626
public async Task OpenAsync(CancellationToken cancellationToken = default)
2727
{
28-
var stream = await ConnectAsync().ConfigureAwait(false);
28+
var stream = await ConnectAsync(cancellationToken).ConfigureAwait(false);
2929
try
3030
{
3131
await queue.Enqueue(async () =>
@@ -44,11 +44,16 @@ await queue.Enqueue(async () =>
4444
}
4545
}
4646

47-
private async Task<NetworkStream> ConnectAsync()
47+
private async Task<NetworkStream> ConnectAsync(CancellationToken cancellationToken)
4848
{
4949
tcpClient = new TcpClient();
5050
ConfigureConnection();
51+
52+
#if NET5_0_OR_GREATER
53+
await tcpClient.ConnectAsync(IP, Port, cancellationToken).ConfigureAwait(false);
54+
#else
5155
await tcpClient.ConnectAsync(IP, Port).ConfigureAwait(false);
56+
#endif
5257
return tcpClient.GetStream();
5358
}
5459

S7.Net/S7.Net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net452;netstandard2.0;netstandard1.3</TargetFrameworks>
4+
<TargetFrameworks>net452;netstandard2.0;netstandard1.3;net5.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>Properties\S7.Net.snk</AssemblyOriginatorKeyFile>
77
<InternalsVisibleTo>S7.Net.UnitTest</InternalsVisibleTo>

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: Visual Studio 2019
1+
image: Visual Studio 2022
22
configuration: Release
33
install:
44
- choco install gitversion.portable -y

0 commit comments

Comments
 (0)