Enabled unit tests for .net 4.5 and reduced errors on disconnecting

ArchipelagoMW · Jun 11, 2023 · c1f4b94 · c1f4b94
1 parent ebcbdab
commit c1f4b94
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -2,9 +2,9 @@ name: Build Solution
 
 on:
   push:
-    branches: [ main, V4_development ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, V4_development ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -36,6 +36,9 @@ jobs:
     - name: Run Tests (.net 4.0)
       run: dotnet test Archipelago.MultiClient.Net.Tests/bin/Release/net472/Archipelago.MultiClient.Net.Tests.dll -l "trx;LogFileName=TestResults_net40.trx"
 
+    - name: Run Tests (.net 4.5)
+      run: dotnet test Archipelago.MultiClient.Net.Tests/bin/Release/net47/Archipelago.MultiClient.Net.Tests.dll -l "trx;LogFileName=TestResults_net45.trx"
+
     - name: Run Tests (.net standard 2.0)
       run: dotnet test Archipelago.MultiClient.Net.Tests/bin/Release/net48/Archipelago.MultiClient.Net.Tests.dll -l "trx;LogFileName=TestResults_standard20.trx"
 

diff --git a/Archipelago.MultiClient.Net/Archipelago.MultiClient.Net.csproj b/Archipelago.MultiClient.Net/Archipelago.MultiClient.Net.csproj
@@ -10,9 +10,9 @@
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<RepositoryUrl>https://github.com/ArchipelagoMW/Archipelago.MultiClient.Net</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
-		<AssemblyVersion>5.0.4.0</AssemblyVersion>
-		<FileVersion>5.0.4.0</FileVersion>
-		<Version>5.0.4</Version>
+		<AssemblyVersion>5.0.5.0</AssemblyVersion>
+		<FileVersion>5.0.5.0</FileVersion>
+		<Version>5.0.5</Version>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
 		<PackageIcon>blue-icon.png</PackageIcon>

diff --git a/Archipelago.MultiClient.Net/Helpers/ArchipelagoSocketHelper_system.net.websockets.cs b/Archipelago.MultiClient.Net/Helpers/ArchipelagoSocketHelper_system.net.websockets.cs
@@ -144,9 +144,15 @@ async Task<string> ReadMessageAsync(byte[] buffer)
 
                 if (result.MessageType == WebSocketMessageType.Close)
                 {
-                    await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
-
-                    OnSocketClosed();
+	                try
+	                {
+		                await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
+	                }
+	                catch
+	                {
+	                }
+
+					OnSocketClosed();
                 }
                 else
                 {