Update to net 9

.github/workflows/build-test.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

.github/workflows/publish-release.yml

@@ -17,6 +17,8 @@ jobs:
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
+        with:
+            dotnet-version: '9.0.x'
 
       - name: Create build
         run: ./publish.sh

Directory.Packages.props

@@ -4,7 +4,9 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Launcher-loader shared stuff -->
+    <PackageVersion Include="Lib.Harmony.Thin" Version="2.3.3" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0-preview.3.24172.4" />
+    <PackageVersion Include="MonoMod.Core" Version="1.2.2" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Lib.Harmony" Version="2.3.3" />
     <PackageVersion Include="NP.Ava.Visuals" Version="1.0.5" />
@@ -40,8 +42,8 @@
     <PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.5" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.2"/>
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <!-- Bootstrap -->
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
   </ItemGroup>
-</Project>
+</Project>

Launcher.props

@@ -7,7 +7,7 @@
         2. Download .NET runtime script.
         3. Local dev SS14.Loader launching code.
         -->
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Version>0.28.0</Version>
     </PropertyGroup>
 </Project>

Marsey.Tests/Marsey.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -10,7 +10,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Lib.Harmony" />
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="NUnit"/>
         <PackageReference Include="NUnit3TestAdapter"/>

Marsey/Config/MarseyVars.cs

@@ -10,7 +10,7 @@ namespace Marsey.Config;
 public static class MarseyVars
 {
     // TODO: Kill this
-    public static readonly Version MarseyVersion = new Version("2.19.0");
+    public static readonly Version MarseyVersion = new Version("2.20.1");
 
     public static readonly string EnabledPatchListFileName = "patches.marsey";
 

Marsey/Game/Patches/Marseyports/MarseyPortMan.cs

@@ -15,10 +15,10 @@ namespace Marsey.Game.Patches.Marseyports;
 public static class MarseyPortMan
 {
     public static string fork = "";
-    public static Version engine = new Version();
+    public static string engine = string.Empty;
     private static IEnumerable<Type>? _backports;
 
-    public static void SetEngineVer(string eng) => engine = new Version(eng);
+    public static void SetEngineVer(string eng) => engine = eng;
     public static void SetForkID(string forkid) => fork = forkid;
 
     public static void Initialize()

Marsey/Marsey.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
@@ -10,8 +10,10 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" />
-        <PackageReference Include="Lib.Harmony" />
+        <PackageReference Include="Lib.Harmony.Thin" />
+        <PackageReference Include="MonoMod.Core" />
         <PackageReference Include="Newtonsoft.Json" />
     </ItemGroup>
 
+
 </Project>

Marsey/Stealthsey/Abjure.cs

@@ -1,19 +1,26 @@
 using Marsey.Config;
+using Marsey.Misc;
 
 namespace Marsey.Stealthsey;
 
 public static class Abjure
 {
-    private static Version? engineVer { get; set; } 
-    
+    private static Version? engineVer { get; set; }
+
     /// <summary>
     /// Checks against version with detection methods
     /// </summary>
     /// <returns>True if version is equal or over with detection and hidesey is disabled</returns>
     public static bool CheckMalbox(string engineversion, HideLevel MarseyHide)
     {
-        engineVer = new Version(engineversion);
+        engineversion = engineversion.Split('-')[0];
+
+        if (!Version.TryParse(engineversion, out var v))
+        {
+            MarseyLogger.Log(MarseyLogger.LogType.ERRO, $"Incorrect version format: {engineversion}");
+            return false;
+        }
 
         return engineVer >= MarseyVars.Detection && MarseyHide == HideLevel.Disabled;
     }
-}
+}

SS14.Launcher/Models/Connector.cs

@@ -730,7 +730,7 @@ private static async Task<ProcessStartInfo> GetLoaderStartInfo()
             basePath = Path.GetFullPath(Path.Combine(
                 LauncherPaths.DirLauncherInstall,
                 "..", "..", "..", "..",
-                "SS14.Loader", "bin", "Debug", "net8.0"));
+                "SS14.Loader", "bin", "Debug", "net9.0"));
         }
 
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))

SS14.Launcher/SS14.Launcher.csproj

@@ -90,5 +90,10 @@
   <ItemGroup>
     <PackageVersion Update="Avalonia.Themes.Simple" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="0Harmony">
+      <HintPath>..\Marsey\Lib\0Harmony.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <Import Project="..\MSBuild\Robust.Trimming.targets" />
 </Project>

download_net_runtime.py

@@ -12,12 +12,12 @@
 PLATFORM_LINUX = "linux"
 PLATFORM_MACOS = "mac"
 
-DOTNET_RUNTIME_VERSION = "8.0.0"
+DOTNET_RUNTIME_VERSION = "9.0.0"
 
 DOTNET_RUNTIME_DOWNLOADS = {
-    PLATFORM_LINUX: "https://download.visualstudio.microsoft.com/download/pr/fc4b4447-45f2-4fd2-899a-77eb1aed7792/6fd52c0c61f064ddc7fe7684e841f491/dotnet-runtime-8.0.0-linux-x64.tar.gz",
-    PLATFORM_WINDOWS: "https://download.visualstudio.microsoft.com/download/pr/924f2e25-ba50-4b90-a35c-6ef73d1149a3/b9a57fa45dad7cca93a0aa937a8ba03d/dotnet-runtime-8.0.0-win-x64.zip",
-    PLATFORM_MACOS: "https://download.visualstudio.microsoft.com/download/pr/65e0ad28-b73d-46ab-b3ae-2d2ae4460b78/50ee103e816a255f9a5331bc2975a6ef/dotnet-runtime-8.0.0-osx-x64.tar.gz"
+    PLATFORM_LINUX: "https://download.visualstudio.microsoft.com/download/pr/282bb881-c2ae-4250-b814-b362745073bd/6e15021d23f704c0d457c820a69a3de6/dotnet-runtime-9.0.0-linux-x64.tar.gz",
+    PLATFORM_WINDOWS: "https://download.visualstudio.microsoft.com/download/pr/fed1ee33-4574-4d89-85b5-3b8d7762b56a/432725cb9d6d235424768defea5ce6ee/dotnet-runtime-9.0.0-win-x64.zip",
+    PLATFORM_MACOS: "https://download.visualstudio.microsoft.com/download/pr/4be484a1-a095-48cf-8407-cae1d3dcc944/9f373dc1d85022e004df3ac1071ace59/dotnet-runtime-9.0.0-osx-x64.tar.gz"
 }
 
 p = os.path.join

publish_linux.sh

@@ -19,8 +19,8 @@ mkdir -p bin/publish/Linux/Marsey/ResourcePacks
 mkdir -p bin/publish/Linux/dotnet
 
 cp PublishFiles/SS14.Launcher PublishFiles/SS14.desktop bin/publish/Linux/
-cp SS14.Launcher/bin/Release/net8.0/linux-x64/publish/* bin/publish/Linux/bin/
-cp SS14.Loader/bin/Release/net8.0/linux-x64/publish/* bin/publish/Linux/bin/loader
+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 -r Dependencies/dotnet/linux/* bin/publish/Linux/dotnet/
 
 cd bin/publish/Linux

publish_osx.sh

@@ -23,8 +23,8 @@ mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/MacOS/Marsey/
 mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/loader/Space Station 14.app/Contents/Resources/bin/"
 
 cp -r Dependencies/dotnet/mac/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/dotnet/"
-cp -r SS14.Launcher/bin/Release/net8.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/"
-cp -r SS14.Loader/bin/Release/net8.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/loader/Space Station 14.app/Contents/Resources/bin/"
+cp -r SS14.Launcher/bin/Release/net9.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/"
+cp -r SS14.Loader/bin/Release/net9.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/loader/Space Station 14.app/Contents/Resources/bin/"
 pushd bin/publish/macOS
 zip -r ../../../SS14.Launcher_macOS.zip *
 popd

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.Strap/SS14.Launcher.Strap.csproj -c Release /nologo
 
-./exe_set_subsystem.py "SS14.Launcher/bin/Release/net8.0/win-x64/publish/SS14.Launcher.exe" 2
-./exe_set_subsystem.py "SS14.Loader/bin/Release/net8.0/win-x64/publish/SS14.Loader.exe" 2
+./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
 
 # Create intermediate directories.
 mkdir -p bin/publish/Windows/bin
@@ -25,8 +25,8 @@ mkdir -p bin/publish/Windows/Marsey/ResourcePacks
 cp -r Dependencies/dotnet/windows/* bin/publish/Windows/dotnet
 cp "SS14.Launcher.Strap/bin/Release/net45/publish/Marseyloader.exe" bin/publish/Windows
 cp "SS14.Launcher.Strap/console.bat" bin/publish/Windows
-cp SS14.Launcher/bin/Release/net8.0/win-x64/publish/* bin/publish/Windows/bin
-cp SS14.Loader/bin/Release/net8.0/win-x64/publish/* bin/publish/Windows/bin/loader
+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
 
 pushd bin/publish/Windows
 zip -r ../../../SS14.Launcher_Windows.zip *