From f3e70801a2c15ec57718658454012d664a8f2237 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Thu, 29 Aug 2024 21:38:30 +0200
Subject: [PATCH 1/4] update ImageSharp

---
 tanks-backend/TanksServer/TanksServer.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tanks-backend/TanksServer/TanksServer.csproj b/tanks-backend/TanksServer/TanksServer.csproj
index d4ef742..702cd9c 100644
--- a/tanks-backend/TanksServer/TanksServer.csproj
+++ b/tanks-backend/TanksServer/TanksServer.csproj
@@ -21,7 +21,7 @@
     <ItemGroup>
         <PackageReference Include="DotNext.Threading" Version="5.3.0" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
     </ItemGroup>
 
     <ItemGroup>

From d2032772d3c61808a3d8e1b328ad581e7fdc85d5 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Thu, 29 Aug 2024 21:44:25 +0200
Subject: [PATCH 2/4] fix SendToServicePointDisplay

---
 .../TanksServer/Interactivity/SendToServicePointDisplay.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tanks-backend/TanksServer/Interactivity/SendToServicePointDisplay.cs b/tanks-backend/TanksServer/Interactivity/SendToServicePointDisplay.cs
index 0f57195..aa4366d 100644
--- a/tanks-backend/TanksServer/Interactivity/SendToServicePointDisplay.cs
+++ b/tanks-backend/TanksServer/Interactivity/SendToServicePointDisplay.cs
@@ -18,7 +18,7 @@ internal sealed class SendToServicePointDisplay : IFrameConsumer
     private readonly MapService _mapService;
     private readonly ILogger<SendToServicePointDisplay> _logger;
     private readonly PlayerServer _players;
-    private readonly ByteGrid _scoresBuffer;
+    private readonly Cp437Grid _scoresBuffer;
     private readonly TimeSpan _minFrameTime;
     private readonly IOptionsMonitor<HostConfiguration> _options;
 
@@ -43,7 +43,7 @@ internal sealed class SendToServicePointDisplay : IFrameConsumer
 
         var localIp = GetLocalIPv4(displayConfig.Value).Split('.');
         Debug.Assert(localIp.Length == 4);
-        _scoresBuffer = ByteGrid.New(12, 20);
+        _scoresBuffer = Cp437Grid.New(12, 20);
 
         _scoresBuffer[00] = "== TANKS! ==";
         _scoresBuffer[01] = "-- scores --";

From 6016d4e2d96e803f8b363d15e6471cd8f68add90 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sat, 7 Sep 2024 13:38:01 +0200
Subject: [PATCH 3/4] update shell.nix

---
 shell.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index 0555690..e453fac 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,11 +1,23 @@
 {pkgs ? import <nixpkgs> {}}:
+let
+rust-toolchain = pkgs.symlinkJoin {
+    name = "rust-toolchain";
+    paths = with pkgs; [rustc cargo rustPlatform.rustcSrc rustfmt clippy];
+  };
+in
 pkgs.mkShell {
   nativeBuildInputs = with pkgs.buildPackages; [
-    rustup
+    rust-toolchain
+
     pkg-config
     xe
     lzma
     cargo-tarpaulin
     gnumake
+    iconv
+
+    dotnet-sdk_8
   ];
+
+  RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
 }

From 9f8028c216c4f655d5df34387d9afa0c0944d825 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sat, 7 Sep 2024 15:31:50 +0200
Subject: [PATCH 4/4] set new servicepoint commit

---
 tanks-backend/servicepoint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tanks-backend/servicepoint b/tanks-backend/servicepoint
index ff71369..c5cb647 160000
--- a/tanks-backend/servicepoint
+++ b/tanks-backend/servicepoint
@@ -1 +1 @@
-Subproject commit ff713690e3799eaaf7aed5ec5ac557cc91d96178
+Subproject commit c5cb6475b24fdcdcd073ea44457628daed4e21a6