Merge branch 'develop' into stable

Pathoschild · Pathoschild · commit 8df1ab7e1102 · 2017-08-23T17:53:33.000-04:00
diff --git a/release-notes.md b/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.
diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs
@@ -2,5 +2,5 @@
 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")]
diff --git a/src/StardewModdingAPI/Constants.cs b/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 @@ public static class Constants
         /// <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
diff --git a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs b/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -76,7 +76,7 @@ public Assembly Load(string assemblyPath, bool assumeCompatible)
                     : $"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

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public Assembly Load(string assemblyPath, bool assumeCompatible)`
`76`	`76`	`: $"Could not load '{assemblyPath}'."`
`77`	`77`	`);`
`78`	`78`	`}`
`79`		`- if (assemblies[0].Status == AssemblyLoadStatus.AlreadyLoaded)`
	`79`	`+ if (assemblies.Last().Status == AssemblyLoadStatus.AlreadyLoaded) // mod assembly is last in dependency order`
`80`	`80`	`throw new SAssemblyLoadFailedException($"Could not load '{assemblyPath}' because it was already loaded. Do you have two copies of this mod?");`
`81`	`81`
`82`	`82`	`// rewrite & load assemblies in leaf-to-root order`