summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-07-11 01:44:02 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-07-11 01:44:02 -0400
commitbd20c2e1375ed5e32315ef5e292802bccc42f530 (patch)
tree32f30b832d9bf41af3391c75463247ac262e89b7 /src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
parent8f96a97f070d654764de3b138678d8f62707f485 (diff)
downloadSMAPI-bd20c2e1375ed5e32315ef5e292802bccc42f530.tar.gz
SMAPI-bd20c2e1375ed5e32315ef5e292802bccc42f530.tar.bz2
SMAPI-bd20c2e1375ed5e32315ef5e292802bccc42f530.zip
alias Mono.Cecil references (#711)
This is needed to migrate to Harmony 2.0 because it uses MonoMod, which has a copy of Mono.Cecil merged into its assembly, which leads to "type X exists in both 0Harmony.dll and Mono.Cecil.dll" errors. We can't use the version bundled with MonoMod since only some of the types are publicly accessible.
Diffstat (limited to 'src/SMAPI/Framework/ModLoading/AssemblyLoader.cs')
-rw-r--r--src/SMAPI/Framework/ModLoading/AssemblyLoader.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index 3606eb66..8311a4b9 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -1,10 +1,12 @@
+extern alias MonoCecilPackage;
+
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
+using MonoCecilPackage.Mono.Cecil;
+using MonoCecilPackage.Mono.Cecil.Cil;
using StardewModdingAPI.Framework.Exceptions;
using StardewModdingAPI.Framework.ModLoading.Framework;
using StardewModdingAPI.Metadata;