From 071bfa20327abbaa67aff2fc767111a794c67c80 Mon Sep 17 00:00:00 2001
From: EvilFactory <evilfactory@users.noreply.github.com>
Date: Thu, 1 Aug 2024 17:29:53 -0300
Subject: [PATCH] Upgrade Harmony to 2.3.3 (will revert if it causes issues)

---
 .github/workflows/publish-release.yml           |  7 -------
 Barotrauma/BarotraumaShared/Luatrauma.props     |  2 +-
 .../SharedSource/LuaCs/LuaCsInstaller.cs        |  4 +---
 .../LuaCs/Plugins/CsPackageManager.cs           | 17 +++++++++--------
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 8ef85ef96..0266e624c 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -53,11 +53,6 @@ env:
     Sigil.dll
     MoonSharp.Interpreter.dll
     MoonSharp.VsCodeDebugger.dll
-    MonoMod.Common.dll
-    Mono.Cecil.dll
-    Mono.Cecil.Mdb.dll
-    Mono.Cecil.Pdb.dll
-    Mono.Cecil.Rocks.dll
     Microsoft.CodeAnalysis.CSharp.Scripting.dll
     Microsoft.CodeAnalysis.CSharp.dll
     Microsoft.CodeAnalysis.dll
@@ -138,8 +133,6 @@ jobs:
           cp "${artifacts_dir}/Windows/Client/Publicized/0Harmony.dll" "${refs_dir}/0Harmony.dll"
           cp "${artifacts_dir}/Windows/Client/Publicized/Farseer.NetStandard.dll" "${refs_dir}/Farseer.NetStandard.dll"
           cp "${artifacts_dir}/Windows/Client/Publicized/Lidgren.NetStandard.dll" "${refs_dir}/Lidgren.NetStandard.dll"
-          cp "${artifacts_dir}/Windows/Client/Publicized/Mono.Cecil.dll" "${refs_dir}/Mono.Cecil.dll"
-          cp "${artifacts_dir}/Windows/Client/Publicized/MonoMod.Common.dll" "${refs_dir}/MonoMod.Common.dll"
           cp "${artifacts_dir}/Windows/Client/Publicized/MoonSharp.Interpreter.dll" "${refs_dir}/MoonSharp.Interpreter.dll"
           cp "${artifacts_dir}/Windows/Client/Publicized/XNATypes.dll" "${refs_dir}/XNATypes.dll"
           cd "${refs_dir}"
diff --git a/Barotrauma/BarotraumaShared/Luatrauma.props b/Barotrauma/BarotraumaShared/Luatrauma.props
index 48c889c78..a1da67fda 100644
--- a/Barotrauma/BarotraumaShared/Luatrauma.props
+++ b/Barotrauma/BarotraumaShared/Luatrauma.props
@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageReference Include="Luatrauma.Internal.AssemblyPublicizer.MSBuild" Version="0.1.4" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.1.0" />
-    <PackageReference Include="Lib.Harmony" Version="2.2.2" />
+    <PackageReference Include="Lib.Harmony" Version="2.3.3" />
     <PackageReference Include="Sigil" Version="5.0.0" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Libraries\moonsharp\MoonSharp.Interpreter\MoonSharp.Interpreter.csproj" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Libraries\moonsharp\MoonSharp.VsCodeDebugger\MoonSharp.VsCodeDebugger.csproj" />
diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsInstaller.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsInstaller.cs
index ec1b273f4..d40c8cd2f 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsInstaller.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsInstaller.cs
@@ -10,10 +10,8 @@ namespace Barotrauma
         private static string[] trackingFiles = new string[]
         {
             "Barotrauma.dll", "Barotrauma.deps.json", "Barotrauma.pdb", "BarotraumaCore.dll", "BarotraumaCore.pdb",
-            "0Harmony.dll", "Mono.Cecil.dll",
+            "0Harmony.dll",
             "Sigil.dll",
-            "Mono.Cecil.Mdb.dll", "Mono.Cecil.Pdb.dll",
-            "Mono.Cecil.Rocks.dll", "MonoMod.Common.dll",
             "MoonSharp.Interpreter.dll", "MoonSharp.VsCodeDebugger.dll",
 
             "Microsoft.CodeAnalysis.dll", "Microsoft.CodeAnalysis.CSharp.dll",
diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs
index 8ba1f8921..37cf29cd6 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs
@@ -394,9 +394,10 @@ public sealed class CsPackageManager : IDisposable
         IEnumerable<ContentPackage> packages = BuildPackagesList();
         
         // check and load config
-        _packageRunConfigs.AddRange(packages
-            .Select(p => new KeyValuePair<ContentPackage, RunConfig>(p, GetRunConfigForPackage(p)))
-            .ToDictionary(p => p.Key, p=> p.Value));
+        foreach (var package in packages.Select(p => new KeyValuePair<ContentPackage, RunConfig>(p, GetRunConfigForPackage(p))))
+        {
+            _packageRunConfigs.Add(package.Key, package.Value);
+        }
         
         // filter not to be loaded
         var cpToRunA = _packageRunConfigs
@@ -458,11 +459,11 @@ public sealed class CsPackageManager : IDisposable
         {
             ModUtils.Logging.PrintMessage($"{nameof(CsPackageManager)}: Unable to create reliable dependencies map.");
         }
-        
-        _packagesDependencies.AddRange(packDeps.ToDictionary(
-            kvp => kvp.Key, 
-            kvp => kvp.Value.ToImmutableList())
-        );
+
+        foreach (var packDep in packDeps)
+        {
+            _packagesDependencies.Add(packDep.Key, packDep.Value.ToImmutableList());
+        }
 
         List<ContentPackage> packagesToLoadInOrder = new();