Merge pull request #1 from R-R0S/update

Update to net 9

Author: R-R0S

.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;
     }
-}
+}