Release S7NetPlus 0.15.0

Release highlights:
- Add flowed cancellation to ConnectAsync

S7.Net/PlcAsynchronous.cs

@@ -25,7 +25,7 @@ namespace S7.Net
         /// <returns>A task that represents the asynchronous open operation.</returns>
         public async Task OpenAsync(CancellationToken cancellationToken = default)
         {
-            var stream = await ConnectAsync().ConfigureAwait(false);
+            var stream = await ConnectAsync(cancellationToken).ConfigureAwait(false);
             try
             {
                 await queue.Enqueue(async () =>
@@ -44,11 +44,16 @@ namespace S7.Net
             }
         }
 
-        private async Task<NetworkStream> ConnectAsync()
+        private async Task<NetworkStream> ConnectAsync(CancellationToken cancellationToken)
         {
             tcpClient = new TcpClient();
             ConfigureConnection();
+
+#if NET5_0_OR_GREATER
+            await tcpClient.ConnectAsync(IP, Port, cancellationToken).ConfigureAwait(false);
+#else
             await tcpClient.ConnectAsync(IP, Port).ConfigureAwait(false);
+#endif
             return tcpClient.GetStream();
         }
 

S7.Net/S7.Net.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard2.0;netstandard1.3;net5.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Properties\S7.Net.snk</AssemblyOriginatorKeyFile>
     <InternalsVisibleTo>S7.Net.UnitTest</InternalsVisibleTo>

S7.Net/Types/S7String.cs

@@ -8,7 +8,19 @@ namespace S7.Net.Types
     /// An S7 String has a preceeding 2 byte header containing its capacity and length
     /// </summary>
     public static class S7String
-    {
+    {
+        private static Encoding stringEncoding = Encoding.ASCII;
+
+        /// <summary>
+        /// The Encoding used when serializing and deserializing S7String (Encoding.ASCII by default)
+        /// </summary>
+        /// <exception cref="ArgumentNullException">StringEncoding must not be null</exception>
+        public static Encoding StringEncoding
+        {
+            get => stringEncoding;
+            set => stringEncoding = value ?? throw new ArgumentNullException(nameof(StringEncoding));
+        }
+
         /// <summary>
         /// Converts S7 bytes to a string
         /// </summary>
@@ -30,7 +42,7 @@ namespace S7.Net.Types
 
             try
             {
-                return Encoding.ASCII.GetString(bytes, 2, length);
+                return StringEncoding.GetString(bytes, 2, length);
             }
             catch (Exception e)
             {
@@ -38,7 +50,6 @@ namespace S7.Net.Types
                     $"Failed to parse {VarType.S7String} from data. Following fields were read: size: '{size}', actual length: '{length}', total number of bytes (including header): '{bytes.Length}'.",
                     e);
             }
-            
         }
 
         /// <summary>
@@ -56,7 +67,7 @@ namespace S7.Net.Types
 
             if (reservedLength > 254) throw new ArgumentException($"The maximum string length supported is 254.");
 
-            var bytes = Encoding.ASCII.GetBytes(value);
+            var bytes = StringEncoding.GetBytes(value);
             if (bytes.Length > reservedLength) throw new ArgumentException($"The provided string length ({bytes.Length} is larger than the specified reserved length ({reservedLength}).");
 
             var buffer = new byte[2 + reservedLength];

appveyor.yml

@@ -1,4 +1,4 @@
-image: Visual Studio 2019
+image: Visual Studio 2022
 configuration: Release
 install:
   - choco install gitversion.portable -y