Switch back to .NET 5 for TestUi

Program crashes when hosts do not exist on the network
Portalum · Jan 19, 2022 · 4e8963d · 4e8963d
1 parent 4aed3f5
commit 4e8963d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml
@@ -12,10 +12,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6.0
+    - name: Setup .NET 5.0/6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          5.0.x
+          6.0.x
     - name: Restore dependencies
       working-directory: ./src
       run: dotnet restore

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -13,10 +13,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6.0
+    - name: Setup .NET 5.0/6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          5.0.x
+          6.0.x
     - name: Restore dependencies
       working-directory: ./src
       run: dotnet restore

diff --git a/src/Portalum.Zvt.TestUi/Portalum.Zvt.TestUi.csproj b/src/Portalum.Zvt.TestUi/Portalum.Zvt.TestUi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Application.ico</ApplicationIcon>
 

diff --git a/src/Portalum.Zvt/Portalum.Zvt.csproj b/src/Portalum.Zvt/Portalum.Zvt.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="SuperSimpleTcp" Version="2.4.1.1" />
+    <PackageReference Include="SuperSimpleTcp" Version="2.5.0.1" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
   </ItemGroup>
 

diff --git a/src/Portalum.Zvt/TcpNetworkDeviceCommunication.cs b/src/Portalum.Zvt/TcpNetworkDeviceCommunication.cs
@@ -125,14 +125,14 @@ public Task<bool> DisconnectAsync(CancellationToken cancellationToken = default)
             return Task.FromResult(false);
         }
 
-        private void Connected(object sender, ClientConnectedEventArgs e)
+        private void Connected(object sender, ConnectionEventArgs e)
         {
             this._logger?.LogInformation($"{nameof(Connected)} {e.IpPort}");
 
             this.ConnectionStateChanged?.Invoke(ConnectionState.Connected);
         }
 
-        private void Disconnected(object sender, ClientDisconnectedEventArgs e)
+        private void Disconnected(object sender, ConnectionEventArgs e)
         {
             this._logger?.LogInformation($"{nameof(Disconnected)} {e.IpPort} {e.Reason}");