diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-08-19 23:48:49 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-08-19 23:48:49 -0400 |
| commit | 498a950be80a28a537c71d4b4e094bc554fcbeb3 (patch) | |
| tree | 96a03c2f9f6b6ae030d29d60bce69a78a3951440 /src/SMAPI.Installer | |
| parent | 464d6b2275f52b9db5560e242c6073fbd816bcb3 (diff) | |
| download | SMAPI-498a950be80a28a537c71d4b4e094bc554fcbeb3.tar.gz SMAPI-498a950be80a28a537c71d4b4e094bc554fcbeb3.tar.bz2 SMAPI-498a950be80a28a537c71d4b4e094bc554fcbeb3.zip | |
fix installer's assembly resolution on Linux/Mac (#582)
Diffstat (limited to 'src/SMAPI.Installer')
| -rw-r--r-- | src/SMAPI.Installer/Program.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/SMAPI.Installer/Program.cs b/src/SMAPI.Installer/Program.cs index fe3e1798..375678d2 100644 --- a/src/SMAPI.Installer/Program.cs +++ b/src/SMAPI.Installer/Program.cs @@ -26,7 +26,9 @@ namespace StardewModdingApi.Installer { // set up assembly resolution string installerPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - Program.DllSearchPath = Path.Combine(installerPath, "internal", EnvironmentUtility.DetectPlatform() == Platform.Windows ? "Windows" : "Mono", "smapi-internal"); + Program.DllSearchPath = EnvironmentUtility.DetectPlatform() == Platform.Windows + ? Path.Combine(installerPath, "internal", "Windows", "smapi-internal") + : Path.Combine(installerPath, "smapi-internal"); AppDomain.CurrentDomain.AssemblyResolve += Program.CurrentDomain_AssemblyResolve; // launch installer |