From 26047e75f6b2f96612f1a2139926e3fdf5958a3b Mon Sep 17 00:00:00 2001 From: Dustin Updyke Date: Wed, 28 Aug 2024 06:42:56 -0400 Subject: [PATCH 1/2] updates linux - temp remove of sockets --- docs/core/client.md | 2 +- .../ClientSocket/ClientSocketConnection.cs | 3 +- src/ghosts.client.linux/Program.cs | 28 +++++++++---------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/docs/core/client.md b/docs/core/client.md index c977be8b..82d40e76 100644 --- 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 index 5e1ae47c..722802f5 100644 --- 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 index d34fac3e..9d393eca 100755 --- a/src/ghosts.client.linux/Program.cs +++ b/src/ghosts.client.linux/Program.cs @@ -75,20 +75,20 @@ private static void Run(IEnumerable 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(); From 339e40493c7b4a6b4e5310319a5428c8b54da3cc Mon Sep 17 00:00:00 2001 From: Dustin Updyke Date: Wed, 28 Aug 2024 06:43:21 -0400 Subject: [PATCH 2/2] updates linux - temp remove of sockets --- src/ghosts.client.linux/ghosts.client.linux.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ghosts.client.linux/ghosts.client.linux.csproj b/src/ghosts.client.linux/ghosts.client.linux.csproj index bf2754ca..696a59db 100755 --- a/src/ghosts.client.linux/ghosts.client.linux.csproj +++ b/src/ghosts.client.linux/ghosts.client.linux.csproj @@ -7,7 +7,7 @@ 8.0.0.0 8.0.0.0 8.0.0.0 - 8.1.0.0 + 8.1.1.0 false