diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-08-02 16:38:51 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-08-02 16:38:51 -0400 |
| commit | 8da88b8fe5b41739c5cd0df3280b9770fc7f10a4 (patch) | |
| tree | aed3679d01ee546726851982862daac2bad38b41 /src/SMAPI/Framework/ModLoading | |
| parent | ba0dff819f2e65b16a0c7bc7a9233fdb101994d0 (diff) | |
| parent | b96bcb21894257f06716e6a51102f74d2aba5178 (diff) | |
| download | SMAPI-8da88b8fe5b41739c5cd0df3280b9770fc7f10a4.tar.gz SMAPI-8da88b8fe5b41739c5cd0df3280b9770fc7f10a4.tar.bz2 SMAPI-8da88b8fe5b41739c5cd0df3280b9770fc7f10a4.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/ModLoading')
| -rw-r--r-- | src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Framework/ModLoading/ModMetadata.cs | 4 | ||||
| -rw-r--r-- | src/SMAPI/Framework/ModLoading/ModResolver.cs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs b/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs index 79fb45b8..fde37d68 100644 --- a/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs +++ b/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs @@ -18,7 +18,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework public ISet<InstructionHandleResult> Flags { get; } = new HashSet<InstructionHandleResult>(); /// <summary>The brief noun phrases indicating what the handler matched for the current module.</summary> - public ISet<string> Phrases { get; } = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase); + public ISet<string> Phrases { get; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase); /********* diff --git a/src/SMAPI/Framework/ModLoading/ModMetadata.cs b/src/SMAPI/Framework/ModLoading/ModMetadata.cs index 30701552..3ad1bd38 100644 --- a/src/SMAPI/Framework/ModLoading/ModMetadata.cs +++ b/src/SMAPI/Framework/ModLoading/ModMetadata.cs @@ -173,7 +173,7 @@ namespace StardewModdingAPI.Framework.ModLoading { return this.HasID() - && string.Equals(this.Manifest.UniqueID.Trim(), id?.Trim(), StringComparison.InvariantCultureIgnoreCase); + && string.Equals(this.Manifest.UniqueID.Trim(), id?.Trim(), StringComparison.OrdinalIgnoreCase); } /// <summary>Get the defined update keys.</summary> @@ -192,7 +192,7 @@ namespace StardewModdingAPI.Framework.ModLoading /// <param name="includeOptional">Whether to include optional dependencies.</param> public IEnumerable<string> GetRequiredModIds(bool includeOptional = false) { - HashSet<string> required = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase); + HashSet<string> required = new HashSet<string>(StringComparer.OrdinalIgnoreCase); // yield dependencies if (this.Manifest?.Dependencies != null) diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs index e73bc47d..8bbeb2a3 100644 --- a/src/SMAPI/Framework/ModLoading/ModResolver.cs +++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs @@ -190,7 +190,7 @@ namespace StardewModdingAPI.Framework.ModLoading // validate IDs are unique { var duplicatesByID = mods - .GroupBy(mod => mod.Manifest?.UniqueID?.Trim(), mod => mod, StringComparer.InvariantCultureIgnoreCase) + .GroupBy(mod => mod.Manifest?.UniqueID?.Trim(), mod => mod, StringComparer.OrdinalIgnoreCase) .Where(p => p.Count() > 1); foreach (var group in duplicatesByID) { |