diff --git a/ESCPOS_NET.ConsoleTest/ESCPOS_NET.ConsoleTest.csproj b/ESCPOS_NET.ConsoleTest/ESCPOS_NET.ConsoleTest.csproj index 0da8a55..d12eeb8 100644 --- a/ESCPOS_NET.ConsoleTest/ESCPOS_NET.ConsoleTest.csproj +++ b/ESCPOS_NET.ConsoleTest/ESCPOS_NET.ConsoleTest.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/ESCPOS_NET.UnitTest/ESCPOS_NET.UnitTest.csproj b/ESCPOS_NET.UnitTest/ESCPOS_NET.UnitTest.csproj index 02202bc..39ce20f 100644 --- a/ESCPOS_NET.UnitTest/ESCPOS_NET.UnitTest.csproj +++ b/ESCPOS_NET.UnitTest/ESCPOS_NET.UnitTest.csproj @@ -6,13 +6,13 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/ESCPOS_NET/ESCPOS_NET.csproj b/ESCPOS_NET/ESCPOS_NET.csproj index 1ed71d2..6cc8375 100644 --- a/ESCPOS_NET/ESCPOS_NET.csproj +++ b/ESCPOS_NET/ESCPOS_NET.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 false true animalistic.io @@ -30,12 +30,12 @@ latestmajor - - + + - - - + + + diff --git a/ESCPOS_NET/Printers/ImmediateNetworkPrinter.cs b/ESCPOS_NET/Printers/ImmediateNetworkPrinter.cs index ad8fa75..c78f44f 100644 --- a/ESCPOS_NET/Printers/ImmediateNetworkPrinter.cs +++ b/ESCPOS_NET/Printers/ImmediateNetworkPrinter.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Logging; -using SimpleTcp; +using SuperSimpleTcp; using System; using System.IO; using System.Threading.Tasks; diff --git a/ESCPOS_NET/Printers/NetworkPrinter.cs b/ESCPOS_NET/Printers/NetworkPrinter.cs index a1dba44..361142c 100644 --- a/ESCPOS_NET/Printers/NetworkPrinter.cs +++ b/ESCPOS_NET/Printers/NetworkPrinter.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Logging; -using SimpleTcp; +using SuperSimpleTcp; using System; using System.IO; using System.Threading.Tasks; @@ -40,13 +40,13 @@ public NetworkPrinter(NetworkPrinterSettings settings) : base(settings.PrinterNa Connect(); } - private void ConnectedEvent(object sender, ClientConnectedEventArgs e) + private void ConnectedEvent(object sender, SuperSimpleTcp.ConnectionEventArgs e) { Logging.Logger?.LogInformation("[{Function}]:[{PrinterName}] Connected successfully to network printer! Connection String: {ConnectionString}", $"{this}.{MethodBase.GetCurrentMethod().Name}", PrinterName, _settings.ConnectionString); IsConnected = true; InvokeConnect(); } - private void DisconnectedEvent(object sender, ClientDisconnectedEventArgs e) + private void DisconnectedEvent(object sender, SuperSimpleTcp.ConnectionEventArgs e) { IsConnected = false; InvokeDisconnect(); diff --git a/ESCPOS_NET/Utils/TCPConnection.cs b/ESCPOS_NET/Utils/TCPConnection.cs index 559dbd6..1417705 100644 --- a/ESCPOS_NET/Utils/TCPConnection.cs +++ b/ESCPOS_NET/Utils/TCPConnection.cs @@ -1,5 +1,5 @@ using ESCPOS_NET.Utils; -using SimpleTcp; +using SuperSimpleTcp; using System; using System.IO; @@ -9,8 +9,8 @@ public class TCPConnection { public Stream ReadStream { get; private set; } = new EchoStream(); public Stream WriteStream { get; private set; } - public event EventHandler Connected; - public event EventHandler Disconnected; + public event EventHandler Connected; + public event EventHandler Disconnected; public bool IsConnected => _client?.IsConnected ?? false; private SimpleTcpClient _client; //public event EventHandler DataReceived; @@ -24,17 +24,19 @@ public TCPConnection(string destination) ReadStream.ReadTimeout = 1500; WriteStream = new InterceptableWriteMemoryStream(bytes => _client.Send(bytes)); } - private void ConnectedEventHandler(object sender, ClientConnectedEventArgs e) + + + private void ConnectedEventHandler(object sender, SuperSimpleTcp.ConnectionEventArgs e) { Connected?.Invoke(sender, e); } - private void DisconnectedEventHandler(object sender, ClientDisconnectedEventArgs e) + private void DisconnectedEventHandler(object sender, SuperSimpleTcp.ConnectionEventArgs e) { Disconnected?.Invoke(sender, e); } private void DataReceivedEventHandler(object sender, DataReceivedEventArgs e) { - ReadStream.Write(e.Data, 0, e.Data.Length); + ReadStream.Write(e.Data.Array, 0, e.Data.Count); } public void ConnectWithRetries(int timeoutMs) {