Revert "Upgrade Harmony to 2.3.3 (will revert if it causes issues)"

This reverts commit 071bfa2032.
This commit is contained in:
EvilFactory
2024-08-01 20:06:02 -03:00
parent 071bfa2032
commit 6e622162e9
4 changed files with 19 additions and 11 deletions
@@ -10,8 +10,10 @@ namespace Barotrauma
private static string[] trackingFiles = new string[]
{
"Barotrauma.dll", "Barotrauma.deps.json", "Barotrauma.pdb", "BarotraumaCore.dll", "BarotraumaCore.pdb",
"0Harmony.dll",
"0Harmony.dll", "Mono.Cecil.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",
@@ -394,10 +394,9 @@ public sealed class CsPackageManager : IDisposable
IEnumerable<ContentPackage> packages = BuildPackagesList();
// check and load config
foreach (var package in packages.Select(p => new KeyValuePair<ContentPackage, RunConfig>(p, GetRunConfigForPackage(p))))
{
_packageRunConfigs.Add(package.Key, package.Value);
}
_packageRunConfigs.AddRange(packages
.Select(p => new KeyValuePair<ContentPackage, RunConfig>(p, GetRunConfigForPackage(p)))
.ToDictionary(p => p.Key, p=> p.Value));
// filter not to be loaded
var cpToRunA = _packageRunConfigs
@@ -459,11 +458,11 @@ public sealed class CsPackageManager : IDisposable
{
ModUtils.Logging.PrintMessage($"{nameof(CsPackageManager)}: Unable to create reliable dependencies map.");
}
foreach (var packDep in packDeps)
{
_packagesDependencies.Add(packDep.Key, packDep.Value.ToImmutableList());
}
_packagesDependencies.AddRange(packDeps.ToDictionary(
kvp => kvp.Key,
kvp => kvp.Value.ToImmutableList())
);
List<ContentPackage> packagesToLoadInOrder = new();