From 0015ee994edd760a93da7e4a932d8b679aa315dd Mon Sep 17 00:00:00 2001 From: js6pak Date: Fri, 1 Jan 2021 20:00:38 +0100 Subject: [PATCH] Fix netstandard plugins --- .../Reactor.OxygenFilter.MSBuild.csproj | 2 +- Reactor.OxygenFilter.MSBuild/Reobfuscate.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Reactor.OxygenFilter.MSBuild/Reactor.OxygenFilter.MSBuild.csproj b/Reactor.OxygenFilter.MSBuild/Reactor.OxygenFilter.MSBuild.csproj index 78a971c..e2b96e5 100644 --- a/Reactor.OxygenFilter.MSBuild/Reactor.OxygenFilter.MSBuild.csproj +++ b/Reactor.OxygenFilter.MSBuild/Reactor.OxygenFilter.MSBuild.csproj @@ -4,7 +4,7 @@ latest true - 0.1.2 + 0.1.3 git https://github.com/NuclearPowered/Reactor.OxygenFilter LGPL-3.0-or-later diff --git a/Reactor.OxygenFilter.MSBuild/Reobfuscate.cs b/Reactor.OxygenFilter.MSBuild/Reobfuscate.cs index 3341de5..4827adc 100644 --- a/Reactor.OxygenFilter.MSBuild/Reobfuscate.cs +++ b/Reactor.OxygenFilter.MSBuild/Reobfuscate.cs @@ -30,7 +30,10 @@ namespace Reactor.OxygenFilter.MSBuild using var stream = File.Open(Input, FileMode.Open, FileAccess.ReadWrite); var resolver = new DefaultAssemblyResolver(); - foreach (var directory in ReferencedAssemblies.Select(Path.GetDirectoryName).Distinct()) + foreach (var directory in ReferencedAssemblies + .Select(Path.GetDirectoryName) + .Distinct() + .OrderBy(x => x.EndsWith("unhollowed"))) // workaround for mono.cecil picking netstandard.dll from unhollowed instead of sdk { resolver.AddSearchDirectory(directory); }