Retarget loader to 8.0

ValidHunters · Dec 17, 2023 · 7522881 · 7522881
1 parent 1f8e2c8
commit 7522881
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "Robust.LoaderApi"]
 	path = Robust.LoaderApi
 	url = https://github.com/space-wizards/Robust.LoaderApi.git
+[submodule "Harmony"]
+	path = Harmony
+	url = https://github.com/ValidHunters/Harmony
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,6 +6,7 @@
     <!-- Launcher-loader shared stuff -->
     <PackageVersion Include="Lib.Harmony" Version="2.3.0-prerelease.2" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.4" />
+    <PackageVersion Include="MonoMod.Utils" Version="25.0.3" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NSec.Cryptography" Version="22.4.0" />
     <PackageVersion Include="SharpZstd.Interop" Version="1.5.2-beta2" />

diff --git a/Harmony b/Harmony
diff --git a/Marsey/Marsey.csproj b/Marsey/Marsey.csproj
@@ -8,7 +8,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Lib.Harmony" />
         <PackageReference Include="Newtonsoft.Json" />
     </ItemGroup>
 

diff --git a/MarseyLoader.sln b/MarseyLoader.sln
@@ -44,6 +44,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSBuild", "MSBuild", "{3B5F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marsey", "Marsey\Marsey.csproj", "{739A4128-01A5-45B5-9923-266546FF6A80}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Harmony", "Harmony\Harmony\Harmony.csproj", "{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -123,6 +125,18 @@ Global
 		{739A4128-01A5-45B5-9923-266546FF6A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{739A4128-01A5-45B5-9923-266546FF6A80}.Release|x64.ActiveCfg = Release|Any CPU
 		{739A4128-01A5-45B5-9923-266546FF6A80}.Release|x86.ActiveCfg = Release|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Debug|x64.Build.0 = Debug|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Debug|x86.Build.0 = Debug|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Release|x64.ActiveCfg = Release|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Release|x64.Build.0 = Release|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Release|x86.ActiveCfg = Release|Any CPU
+		{90CCA895-8B5E-49C8-AFCE-E0A152FA5245}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{31D3CCC5-36F4-48C3-8885-E029A2026B57} = {12BB41B7-34BA-44EF-9ECA-434A276D83BD}

diff --git a/SS14.Launcher/Models/Connector.cs b/SS14.Launcher/Models/Connector.cs
@@ -522,6 +522,9 @@ private void SetupManualPipeLogging(Process process)
 
         File.Delete(LauncherPaths.PathClientStdmarseyLog);
         FileStream? fileStdmarsey = null;
+
+        MarseyVars.SeparateLogger = _cfg.GetCVar(CVars.SeparateLogging);
+
         if (MarseyVars.MarseyHide < HideLevel.Explicit)
         {
             fileStdmarsey = new FileStream(

diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj
@@ -6,7 +6,6 @@
     <Nullable>enable</Nullable>
     <!--<PublishTrimmed>true</PublishTrimmed>
     <PublishSingleFile>true</PublishSingleFile>-->
-    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <DefineConstants Condition="'$(FullRelease)' == 'True'">FULL_RELEASE;$(DefineConstants)</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -38,7 +37,6 @@
     <PackageReference Include="CodeHollow.FeedReader" />
     <PackageReference Include="Dapper" />
     <PackageReference Include="DynamicData" />
-    <PackageReference Include="Lib.Harmony" />
     <PackageReference Include="Microsoft.Data.Sqlite" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" />
     <PackageReference Include="Newtonsoft.Json" />
@@ -81,5 +79,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Harmony\Harmony\Harmony.csproj" />
+  </ItemGroup>
   <Import Project="..\MSBuild\Robust.Trimming.targets" />
 </Project>
diff --git a/SS14.Loader/SS14.Loader.csproj b/SS14.Loader/SS14.Loader.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Harmony\Harmony\Harmony.csproj" />
     <ProjectReference Include="..\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj" />
   </ItemGroup>
 
@@ -22,7 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lib.Harmony" />
     <PackageReference Include="Microsoft.Data.Sqlite" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NSec.Cryptography" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.114",
+    "version": "8.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }