diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-07-23 20:29:44 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-07-23 20:29:44 -0400 |
| commit | 167d5831d12f0b7c58b3533b716f9041f6ae02e7 (patch) | |
| tree | 4358a83ff2dbf4de6677ccf14e39d7e2dfb505aa /build | |
| parent | 88be0cee94cced9a31efe7ff76684514fcdc638d (diff) | |
| download | SMAPI-167d5831d12f0b7c58b3533b716f9041f6ae02e7.tar.gz SMAPI-167d5831d12f0b7c58b3533b716f9041f6ae02e7.tar.bz2 SMAPI-167d5831d12f0b7c58b3533b716f9041f6ae02e7.zip | |
use unmerged Harmony assembly (#711)
Harmony merges Mono.Cecil and MonoMod.Common into its DLL, and keeps some (but not all) of the merged types public. That causes type conflicts in SMAPI's code since it uses both Harmony and Mono.Cecil, and extern aliases break on Linux due to IDE/compiler limitations. This commit uses a custom build of Harmony without the assembly merging, so SMAPI can use and manage Mono.Cecil itself.
Diffstat (limited to 'build')
| -rw-r--r-- | build/0Harmony.dll | bin | 802816 -> 166912 bytes | |||
| -rw-r--r-- | build/common.targets | 3 | ||||
| -rw-r--r-- | build/prepare-install-package.targets | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/build/0Harmony.dll b/build/0Harmony.dll Binary files differindex 1c5b9c09..bab3bb4d 100644 --- a/build/0Harmony.dll +++ b/build/0Harmony.dll diff --git a/build/common.targets b/build/common.targets index f5d01606..aed619da 100644 --- a/build/common.targets +++ b/build/common.targets @@ -40,6 +40,9 @@ <Copy SourceFiles="$(TargetDir)\0Harmony.dll" DestinationFolder="$(GamePath)\smapi-internal" /> <Copy SourceFiles="$(TargetDir)\0Harmony.xml" DestinationFolder="$(GamePath)\smapi-internal" /> <Copy SourceFiles="$(TargetDir)\Mono.Cecil.dll" DestinationFolder="$(GamePath)\smapi-internal" /> + <Copy SourceFiles="$(TargetDir)\Mono.Cecil.Mdb.dll" DestinationFolder="$(GamePath)\smapi-internal" /> + <Copy SourceFiles="$(TargetDir)\Mono.Cecil.Pdb.dll" DestinationFolder="$(GamePath)\smapi-internal" /> + <Copy SourceFiles="$(TargetDir)\MonoMod.Common.dll" DestinationFolder="$(GamePath)\smapi-internal" /> <Copy SourceFiles="$(TargetDir)\Newtonsoft.Json.dll" DestinationFolder="$(GamePath)\smapi-internal" /> <Copy SourceFiles="$(TargetDir)\TMXTile.dll" DestinationFolder="$(GamePath)\smapi-internal" /> <Copy SourceFiles="@(TranslationFiles)" DestinationFolder="$(GamePath)\smapi-internal\i18n" /> diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 0c1a6c1a..88e565f9 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -47,6 +47,9 @@ <Copy SourceFiles="$(SmapiBin)\0Harmony.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> <Copy SourceFiles="$(SmapiBin)\0Harmony.xml" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> <Copy SourceFiles="$(SmapiBin)\Mono.Cecil.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <Copy SourceFiles="$(SmapiBin)\Mono.Cecil.Mdb.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <Copy SourceFiles="$(SmapiBin)\Mono.Cecil.Pdb.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <Copy SourceFiles="$(SmapiBin)\MonoMod.Common.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> <Copy SourceFiles="$(SmapiBin)\Newtonsoft.Json.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> <Copy SourceFiles="$(SmapiBin)\TMXTile.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> <Copy SourceFiles="$(SmapiBin)\SMAPI.config.json" DestinationFiles="$(PackagePath)\bundle\smapi-internal\config.json" /> |