Merge branch 'dev'

northwood-studios · Jul 8, 2024 · 2a3eaa0 · 2a3eaa0
2 parents 5739046 + 7a25b23
commit 2a3eaa0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, windows-latest]
-        framework: ['7.0']
+        framework: ['8.0']
         include:
         - os: ubuntu-20.04
           target: linux-x64

diff --git a/Core/LocalAdmin.cs b/Core/LocalAdmin.cs
@@ -30,7 +30,7 @@ namespace LocalAdmin.V2.Core;
 
 public sealed class LocalAdmin : IDisposable
 {
-    public const string VersionString = "2.5.14";
+    public const string VersionString = "2.5.15";
     private const ushort DefaultPort = 7777;
 
     private static readonly ConcurrentQueue<string> InputQueue = new();

diff --git a/Core/TcpServer.cs b/Core/TcpServer.cs
@@ -58,6 +58,7 @@ public void Start()
                 }
 
                 _client = _listener.EndAcceptTcpClient(result);
+                _client.NoDelay = true;
 
                 _client.ReceiveBufferSize = LocalAdmin.Configuration!.SlToLaBufferSize;
                 _client.SendBufferSize = LocalAdmin.Configuration.LaToSlBufferSize;
@@ -103,9 +104,7 @@ public void Start()
                                 continue;
                             }
 
-                            var length = (lengthBuffer[0] << 24) | (lengthBuffer[1] << 16) |
-                                         (lengthBuffer[2] << 8) | lengthBuffer[3];
-
+                            var length = MemoryMarshal.Cast<byte, int>(lengthBuffer)[0];
                             var buffer = ArrayPool<byte>.Shared.Rent(length);
 
                             while (_client.Available < length)

diff --git a/LocalAdmin V2.csproj b/LocalAdmin V2.csproj
@@ -2,8 +2,8 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
-        <TargetFramework Condition="$(RuntimeIdentifier.StartsWith('win', StringComparison.OrdinalIgnoreCase))">net7.0-windows</TargetFramework>
-        <TargetFramework Condition="!$(RuntimeIdentifier.StartsWith('win', StringComparison.OrdinalIgnoreCase))">net7.0</TargetFramework>
+        <TargetFramework Condition="$(RuntimeIdentifier.StartsWith('win', StringComparison.OrdinalIgnoreCase))">net8.0-windows</TargetFramework>
+        <TargetFramework Condition="!$(RuntimeIdentifier.StartsWith('win', StringComparison.OrdinalIgnoreCase))">net8.0</TargetFramework>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>