Merge pull request #399 from cmu-sei/v8

V8
cmu-sei · Aug 28, 2024 · b329754 · b329754
2 parents b93cc29 + 339e404
commit b329754
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/docs/core/client.md b/docs/core/client.md
@@ -37,7 +37,7 @@ Unzip to your client machine in a directory such as `c:\exercise\ghosts`. You wi
 
 ## Linux Client
 
-Your client Linux machine will need to have the latest [Microsoft dotnetcore runtime](https://dotnet.microsoft.com/download) :material-open-in-new: installed (Note that for the GHOSTS client, there are versions for dotnetcoreapp3.1 - this will eventually go away — and dotnet6.0, which is long term support (LTS) and will stick around for a while). Again, note that you only need the runtime installed, not the full SDK.
+Your client Linux machine will need to have the latest [Microsoft dotnetcore runtime version 8.0](https://dotnet.microsoft.com/download) :material-open-in-new: installed. Again, note that you only need the runtime installed, not the full SDK. Our testing has been with Ubuntu 24.04 using the [snap instructions here](https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu-install?pivots=os-linux-ubuntu-2404&tabs=dotnet8), but other distributions should work as well.
 
 ### Linux Installation
 

diff --git a/src/ghosts.client.linux/Comms/ClientSocket/ClientSocketConnection.cs b/src/ghosts.client.linux/Comms/ClientSocket/ClientSocketConnection.cs
@@ -34,11 +34,10 @@ public async Task Run()
             _attempts++;
         }
 
-        Console.WriteLine($"Connected to {url}");
-
         // Send a message to the server
         while (_connection.State == HubConnectionState.Connected)
         {
+            Console.WriteLine($"Connected to {url}");
             _ = new Timer(_ => {
                 Task.Run(async () => {
                     await ClientHeartbeat();

diff --git a/src/ghosts.client.linux/Program.cs b/src/ghosts.client.linux/Program.cs
@@ -75,20 +75,20 @@ private static void Run(IEnumerable<string> args)
                 return;
             }
 
-            if (Configuration.Sockets.IsEnabled)
-            {
-                _log.Trace("Sockets enabled. Connecting...");
-                var c = new Connection(Configuration.Sockets);
-
-                async void Start()
-                {
-                    await c.Run();
-                }
-
-                var connectionThread = new Thread(Start) { IsBackground = true };
-                connectionThread.Start();
-                Queue = c.Queue;
-            }
+            // if (Configuration.Sockets.IsEnabled)
+            // {
+            //     _log.Trace("Sockets enabled. Connecting...");
+            //     var c = new Connection(Configuration.Sockets);
+            //
+            //     async void Start()
+            //     {
+            //         await c.Run();
+            //     }
+            //
+            //     var connectionThread = new Thread(Start) { IsBackground = true };
+            //     connectionThread.Start();
+            //     Queue = c.Queue;
+            // }
 
             Program.CheckId = new CheckId();
 

diff --git a/src/ghosts.client.linux/ghosts.client.linux.csproj b/src/ghosts.client.linux/ghosts.client.linux.csproj
@@ -7,7 +7,7 @@
     <Version>8.0.0.0</Version>
     <AssemblyVersion>8.0.0.0</AssemblyVersion>
     <ReleaseVersion>8.0.0.0</ReleaseVersion>
-    <FileVersion>8.1.0.0</FileVersion>
+    <FileVersion>8.1.1.0</FileVersion>
 
     <SynchReleaseVersion>false</SynchReleaseVersion>