Merge branch 'develop' into stable

release-notes.md

@@ -26,6 +26,10 @@ For mod developers:
 For power users:
 * Added command-line arguments to the SMAPI installer so it can be scripted.
 
+## 1.15.3
+For players:
+* Fixed mods being marked as duplicate incorrectly in some cases.
+
 ## 1.15.2
 For players:
 * Improved errors when a mod DLL can't be loaded.

src/GlobalAssemblyInfo.cs

@@ -2,5 +2,5 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.15.2.0")]
-[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyVersion("1.15.3.0")]
+[assembly: AssemblyFileVersion("1.15.3.0")]

src/StardewModdingAPI/Constants.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -36,7 +36,7 @@ namespace StardewModdingAPI
         /// <summary>SMAPI's current semantic version.</summary>
         public static ISemanticVersion ApiVersion { get; } =
 #if SMAPI_1_x
-            new SemanticVersion(1, 15, 2);
+            new SemanticVersion(1, 15, 3);
 #else
             new SemanticVersion(2, 0, 0, $"alpha-{DateTime.UtcNow:yyyyMMddHHmm}");
 #endif

src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs

@@ -76,7 +76,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                     : $"Could not load '{assemblyPath}'."
                 );
             }
-            if (assemblies[0].Status == AssemblyLoadStatus.AlreadyLoaded)
+            if (assemblies.Last().Status == AssemblyLoadStatus.AlreadyLoaded) // mod assembly is last in dependency order
                 throw new SAssemblyLoadFailedException($"Could not load '{assemblyPath}' because it was already loaded. Do you have two copies of this mod?");
 
             // rewrite & load assemblies in leaf-to-root order