From 2968cc0b4c5a576e400a7ea40faacbb3580e6419 Mon Sep 17 00:00:00 2001
From: Pspritechologist <naaronn@gmail.com>
Date: Fri, 30 Jan 2026 01:09:15 -0500
Subject: [PATCH] Updated to .Net 10

The Nix stuff is a hackjob spurred on by Death, I've not idea what I'm changing there.
MonoMod is complaining so it fails to build?? No idea.
---
 .github/workflows/build-test.yml      |  2 +-
 .github/workflows/publish-release.yml |  2 +-
 Launcher.props                        |  2 +-
 Robust.LoaderApi                      |  2 +-
 SS14.Launcher/Models/Connector.cs     |  2 +-
 flake.nix                             |  2 +-
 nix/package.nix                       | 36 ++-------------------------
 publish_linux.sh                      |  4 +--
 publish_osx.sh                        |  4 +--
 publish_windows.sh                    |  8 +++---
 10 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index b9ccd12..2dde942 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 4a257bf..b1e1433 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Create build
       run: ./publish.sh
diff --git a/Launcher.props b/Launcher.props
index f28d1f0..3df82d9 100644
--- a/Launcher.props
+++ b/Launcher.props
@@ -8,7 +8,7 @@
         3. Local dev SS14.Loader launching code.
         4. build-test.yml GitHub Actions workflow
         -->
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Version>1.3.1</Version>
 
         <!--
diff --git a/Robust.LoaderApi b/Robust.LoaderApi
index b86b23f..68d0a29 160000
--- a/Robust.LoaderApi
+++ b/Robust.LoaderApi
@@ -1 +1 @@
-Subproject commit b86b23f175be52629717405bcec9f9a47e6b5887
+Subproject commit 68d0a29d46925597b0b53f0824d0d5616b5ed9da
diff --git a/SS14.Launcher/Models/Connector.cs b/SS14.Launcher/Models/Connector.cs
index 7f48414..db056ef 100644
--- a/SS14.Launcher/Models/Connector.cs
+++ b/SS14.Launcher/Models/Connector.cs
@@ -716,7 +716,7 @@ private static async Task<ProcessStartInfo> GetLoaderStartInfo()
             basePath = Path.GetFullPath(Path.Combine(
                 LauncherPaths.DirLauncherInstall,
                 "..", "..", "..", "..",
-                "SS14.Loader", "bin", "Debug", "net9.0"));
+                "SS14.Loader", "bin", "Debug", "net10.0"));
         }
 
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
diff --git a/flake.nix b/flake.nix
index da49426..baa2040 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
     in
     rec {
       packages = forAllSystems (pkgs: {
-        default = packages.${pkgs.system}.simple-station-launcher-development;
+        default = packages.${pkgs.stdenv.hostPlatform.system}.simple-station-launcher-development;
         # Build via nix build -L 'git+file://PATH?submodules=1'
         simple-station-launcher-development = pkgs.callPackage ./nix/package.nix { };
         simple-station-launcher = pkgs.callPackage ./nix/package.nix rec {
diff --git a/nix/package.nix b/nix/package.nix
index 38b9fcd..96299f9 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -13,22 +13,9 @@
   libXcursor,
   libXext,
   libXrandr,
-  fontconfig,
-  glew,
-  SDL2,
-  glfw,
-  glibc,
   libGL,
   freetype,
-  openal,
-  fluidsynth,
-  gtk3,
-  pango,
-  atk,
-  cairo,
-  zlib,
   glib,
-  gdk-pixbuf,
   soundfont-fluid,
   # Path to set ROBUST_SOUNDFONT_OVERRIDE to, essentially the default soundfont used.
   soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2",
@@ -58,9 +45,8 @@ buildDotnetModule rec {
     inherit version;
   };
 
-  # A Robust Loader component uses sdk_8_0
-  dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_9_0 sdk_8_0 ];
-  dotnet-runtime = with dotnetCorePackages; combinePackages [ runtime_9_0 runtime_8_0 ];
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
+  dotnet-runtime = dotnetCorePackages.runtime_10_0;
 
   dotnetFlags = [
     "-p:FullRelease=true"
@@ -69,31 +55,15 @@ buildDotnetModule rec {
   ];
 
   nativeBuildInputs = [
-    wrapGAppsHook
     iconConvTools
     copyDesktopItems
   ];
 
   runtimeDeps = [
-    # Required by the game.
     glfw
-    SDL2
-    glibc
     libGL
-    openal
     freetype
-    fluidsynth
-
-    # Needed for file dialogs.
-    gtk3
-    pango
-    cairo
-    atk
-    zlib
     glib
-    gdk-pixbuf
-
-    # Avalonia UI dependencies.
     libX11
     libICE
     libSM
@@ -101,8 +71,6 @@ buildDotnetModule rec {
     libXcursor
     libXext
     libXrandr
-    fontconfig
-    glew
 
     # TODO: Figure out dependencies for CEF support.
   ];
diff --git a/publish_linux.sh b/publish_linux.sh
index b26934f..32565e6 100755
--- a/publish_linux.sh
+++ b/publish_linux.sh
@@ -17,8 +17,8 @@ mkdir -p bin/publish/Linux/bin/loader
 mkdir -p bin/publish/Linux/dotnet
 
 cp PublishFiles/SS14.Launcher PublishFiles/SS14.desktop bin/publish/Linux/
-cp SS14.Launcher/bin/Release/net9.0/linux-x64/publish/* bin/publish/Linux/bin/
-cp SS14.Loader/bin/Release/net9.0/linux-x64/publish/* bin/publish/Linux/bin/loader
+cp SS14.Launcher/bin/Release/net10.0/linux-x64/publish/* bin/publish/Linux/bin/
+cp SS14.Loader/bin/Release/net10.0/linux-x64/publish/* bin/publish/Linux/bin/loader
 cp -r Dependencies/dotnet/linux/* bin/publish/Linux/dotnet/
 
 cd bin/publish/Linux
diff --git a/publish_osx.sh b/publish_osx.sh
index 0418188..13f6fdd 100755
--- a/publish_osx.sh
+++ b/publish_osx.sh
@@ -21,8 +21,8 @@ mkdir -p "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/
 mkdir -p "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/loader/SimpleStation14.app/Contents/Resources/bin/"
 
 cp -r Dependencies/dotnet/mac/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/dotnet/"
-cp -r SS14.Launcher/bin/Release/net9.0/osx-x64/publish/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/"
-cp -r SS14.Loader/bin/Release/net9.0/osx-x64/publish/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/loader/SimpleStation14.app/Contents/Resources/bin/"
+cp -r SS14.Launcher/bin/Release/net10.0/osx-x64/publish/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/"
+cp -r SS14.Loader/bin/Release/net10.0/osx-x64/publish/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/loader/SimpleStation14.app/Contents/Resources/bin/"
 pushd bin/publish/macOS
 zip -r ../../../SS14.Launcher_macOS.zip *
 popd
diff --git a/publish_windows.sh b/publish_windows.sh
index 593e786..b053f88 100755
--- a/publish_windows.sh
+++ b/publish_windows.sh
@@ -12,8 +12,8 @@ dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release
 dotnet publish SS14.Loader/SS14.Loader.csproj -c Release --no-self-contained -r win-x64 /nologo
 dotnet publish SS14.Launcher.Bootstrap/SS14.Launcher.Bootstrap.csproj -c Release /nologo
 
-./exe_set_subsystem.py "SS14.Launcher/bin/Release/net9.0/win-x64/publish/SS14.Launcher.exe" 2
-./exe_set_subsystem.py "SS14.Loader/bin/Release/net9.0/win-x64/publish/SS14.Loader.exe" 2
+./exe_set_subsystem.py "SS14.Launcher/bin/Release/net10.0/win-x64/publish/SS14.Launcher.exe" 2
+./exe_set_subsystem.py "SS14.Loader/bin/Release/net10.0/win-x64/publish/SS14.Loader.exe" 2
 
 # Create intermediate directories.
 mkdir -p bin/publish/Windows/bin
@@ -23,8 +23,8 @@ mkdir -p bin/publish/Windows/dotnet
 cp -r Dependencies/dotnet/windows/* bin/publish/Windows/dotnet
 cp "SS14.Launcher.Bootstrap/bin/Release/net45/publish/SimpleStation14 Launcher.exe" bin/publish/Windows
 cp "SS14.Launcher.Bootstrap/console.bat" bin/publish/Windows
-cp SS14.Launcher/bin/Release/net9.0/win-x64/publish/* bin/publish/Windows/bin
-cp SS14.Loader/bin/Release/net9.0/win-x64/publish/* bin/publish/Windows/bin/loader
+cp SS14.Launcher/bin/Release/net10.0/win-x64/publish/* bin/publish/Windows/bin
+cp SS14.Loader/bin/Release/net10.0/win-x64/publish/* bin/publish/Windows/bin/loader
 
 pushd bin/publish/Windows
 zip -r ../../../SS14.Launcher_Windows.zip *