use ordinal comparison/sorting instead of invariant

docs/release-notes.md

@@ -13,6 +13,7 @@
   * Added trace log for GPU running the game to simplify troubleshooting some issues.
   * Fixed launcher's fallback logic on Linux when no compatible terminal was found (thanks to jlaw!).
   * Fixed rare crash when a mod adds/removes an event handler from an event handler.
+  * Fixed string sorting/comparison for some special characters.
 
 * For the Console Commands mod:
   * Fixed error opening menu when some item data is invalid.

src/SMAPI.Installer/InteractiveInstaller.cs

@@ -468,7 +468,7 @@ namespace StardewModdingApi.Installer
                             }
 
                             // find target folder
-                            ModFolder targetMod = targetMods.FirstOrDefault(p => p.Manifest?.UniqueID?.Equals(sourceMod.Manifest.UniqueID, StringComparison.InvariantCultureIgnoreCase) == true);
+                            ModFolder targetMod = targetMods.FirstOrDefault(p => p.Manifest?.UniqueID?.Equals(sourceMod.Manifest.UniqueID, StringComparison.OrdinalIgnoreCase) == true);
                             DirectoryInfo defaultTargetFolder = new DirectoryInfo(Path.Combine(paths.ModsPath, sourceMod.Directory.Name));
                             DirectoryInfo targetFolder = targetMod?.Directory ?? defaultTargetFolder;
                             this.PrintDebug(targetFolder.FullName == defaultTargetFolder.FullName
@@ -808,7 +808,7 @@ namespace StardewModdingApi.Installer
                     continue; // should never happen
 
                 // delete packaged mods (newer version bundled into SMAPI)
-                if (isDir && packagedModNames.Contains(entry.Name, StringComparer.InvariantCultureIgnoreCase))
+                if (isDir && packagedModNames.Contains(entry.Name, StringComparer.OrdinalIgnoreCase))
                 {
                     this.PrintDebug($"   Deleting {entry.Name} because it's bundled into SMAPI...");
                     this.InteractivelyDelete(entry.FullName);

src/SMAPI.Installer/Program.cs

@@ -67,7 +67,7 @@ namespace StardewModdingApi.Installer
                 AssemblyName name = new AssemblyName(e.Name);
                 foreach (FileInfo dll in new DirectoryInfo(Program.InternalFilesPath).EnumerateFiles("*.dll"))
                 {
-                    if (name.Name.Equals(AssemblyName.GetAssemblyName(dll.FullName).Name, StringComparison.InvariantCultureIgnoreCase))
+                    if (name.Name.Equals(AssemblyName.GetAssemblyName(dll.FullName).Name, StringComparison.OrdinalIgnoreCase))
                         return Assembly.LoadFrom(dll.FullName);
                 }
                 return null;

src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs

@@ -33,7 +33,7 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
         /// <exception cref="UserErrorException">The mod package isn't valid.</exception>
         public ModFileManager(string projectDir, string targetDir, Regex[] ignoreFilePatterns, bool validateRequiredModFiles)
         {
-            this.Files = new Dictionary<string, FileInfo>(StringComparer.InvariantCultureIgnoreCase);
+            this.Files = new Dictionary<string, FileInfo>(StringComparer.OrdinalIgnoreCase);
 
             // validate paths
             if (!Directory.Exists(projectDir))
@@ -68,7 +68,7 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
         /// <summary>Get the files in the mod package.</summary>
         public IDictionary<string, FileInfo> GetFiles()
         {
-            return new Dictionary<string, FileInfo>(this.Files, StringComparer.InvariantCultureIgnoreCase);
+            return new Dictionary<string, FileInfo>(this.Files, StringComparer.OrdinalIgnoreCase);
         }
 
         /// <summary>Get a semantic version from the mod manifest.</summary>
@@ -165,8 +165,8 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
                 || this.EqualsInvariant(file.Name, "Newtonsoft.Json.xml")
 
                 // code analysis files
-                || file.Name.EndsWith(".CodeAnalysisLog.xml", StringComparison.InvariantCultureIgnoreCase)
+                || file.Name.EndsWith(".CodeAnalysisLog.xml", StringComparison.OrdinalIgnoreCase)
-                || file.Name.EndsWith(".lastcodeanalysissucceeded", StringComparison.InvariantCultureIgnoreCase)
+                || file.Name.EndsWith(".lastcodeanalysissucceeded", StringComparison.OrdinalIgnoreCase)
 
                 // OS metadata files
                 || this.EqualsInvariant(file.Name, ".DS_Store")
@@ -183,7 +183,7 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
         {
             if (str == null)
                 return other == null;
-            return str.Equals(other, StringComparison.InvariantCultureIgnoreCase);
+            return str.Equals(other, StringComparison.OrdinalIgnoreCase);
         }
     }
 }

src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs

@@ -64,7 +64,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
                     this.LogError($"Argument {index} ({name}) is required.");
                 return false;
             }
-            if (oneOf?.Any() == true && !oneOf.Contains(this.Args[index], StringComparer.InvariantCultureIgnoreCase))
+            if (oneOf?.Any() == true && !oneOf.Contains(this.Args[index], StringComparer.OrdinalIgnoreCase))
             {
                 this.LogError($"Argument {index} ({name}) must be one of {string.Join(", ", oneOf)}.");
                 return false;

src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs

@@ -56,7 +56,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
                 return;
 
             // get target location
-            GameLocation location = Game1.locations.FirstOrDefault(p => p.Name != null && p.Name.Equals(locationName, StringComparison.InvariantCultureIgnoreCase));
+            GameLocation location = Game1.locations.FirstOrDefault(p => p.Name != null && p.Name.Equals(locationName, StringComparison.OrdinalIgnoreCase));
             if (location == null && locationName == "current")
                 location = Game1.currentLocation;
             if (location == null)

src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs

@@ -44,8 +44,8 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData
         public bool NameContains(string substring)
         {
             return
-                this.Name.IndexOf(substring, StringComparison.InvariantCultureIgnoreCase) != -1
+                this.Name.IndexOf(substring, StringComparison.OrdinalIgnoreCase) != -1
-                || this.DisplayName.IndexOf(substring, StringComparison.InvariantCultureIgnoreCase) != -1;
+                || this.DisplayName.IndexOf(substring, StringComparison.OrdinalIgnoreCase) != -1;
         }
 
         /// <summary>Get whether the item name is exactly equal to a case-insensitive string.</summary>
@@ -53,8 +53,8 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData
         public bool NameEquivalentTo(string name)
         {
             return
-                this.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)
+                this.Name.Equals(name, StringComparison.OrdinalIgnoreCase)
-                || this.DisplayName.Equals(name, StringComparison.InvariantCultureIgnoreCase);
+                || this.DisplayName.Equals(name, StringComparison.OrdinalIgnoreCase);
         }
     }
 }

src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs

@@ -233,7 +233,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 
             // parse
             // Specified on the wiki in the form "remote version → mapped version; another remote version → mapped version"
-            IDictionary<string, string> map = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
+            IDictionary<string, string> map = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             foreach (string pair in raw.Split(';'))
             {
                 string[] versions = pair.Split('→');

src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs

@@ -30,7 +30,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
                 .GetCustomInstallPaths(platform)
                 .Concat(this.GetDefaultInstallPaths(platform))
                 .Select(PathUtilities.NormalizePathSeparators)
-                .Distinct(StringComparer.InvariantCultureIgnoreCase);
+                .Distinct(StringComparer.OrdinalIgnoreCase);
 
             // yield valid folders
             foreach (string path in paths)

src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs

@@ -68,7 +68,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
                 foreach (string part in parts.Take(parts.Length - 1))
                 {
                     // 'default'
-                    if (part.Equals("Default", StringComparison.InvariantCultureIgnoreCase))
+                    if (part.Equals("Default", StringComparison.OrdinalIgnoreCase))
                     {
                         isDefault = true;
                         continue;

src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs

@@ -46,13 +46,13 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         public bool HasID(string id)
         {
             // try main ID
-            if (this.ID.Equals(id, StringComparison.InvariantCultureIgnoreCase))
+            if (this.ID.Equals(id, StringComparison.OrdinalIgnoreCase))
                 return true;
 
             // try former IDs
             foreach (string formerID in this.FormerIDs)
             {
-                if (formerID.Equals(id, StringComparison.InvariantCultureIgnoreCase))
+                if (formerID.Equals(id, StringComparison.OrdinalIgnoreCase))
                     return true;
             }
 

src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs

@@ -59,7 +59,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         };
 
         /// <summary>The extensions for files which an XNB mod may contain. If a mod doesn't have a <c>manifest.json</c> and contains *only* these file extensions, it should be considered an XNB mod.</summary>
-        private readonly HashSet<string> PotentialXnbModExtensions = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase)
+        private readonly HashSet<string> PotentialXnbModExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             // XNB files
             ".xgs",

src/SMAPI.Toolkit/ModToolkit.cs

@@ -22,7 +22,7 @@ namespace StardewModdingAPI.Toolkit
         private readonly string UserAgent;
 
         /// <summary>Maps vendor keys (like <c>Nexus</c>) to their mod URL template (where <c>{0}</c> is the mod ID). This doesn't affect update checks, which defer to the remote web API.</summary>
-        private readonly IDictionary<string, string> VendorModUrls = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
+        private readonly IDictionary<string, string> VendorModUrls = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
             ["Chucklefish"] = "https://community.playstarbound.com/resources/{0}",
             ["GitHub"] = "https://github.com/{0}/releases",

src/SMAPI.Toolkit/SemanticVersion.cs

@@ -278,9 +278,9 @@ namespace StardewModdingAPI.Toolkit
                 if (curParts[i] != otherParts[i])
                 {
                     // unofficial is always lower-precedence
-                    if (otherParts[i].Equals("unofficial", StringComparison.InvariantCultureIgnoreCase))
+                    if (otherParts[i].Equals("unofficial", StringComparison.OrdinalIgnoreCase))
                         return curNewer;
-                    if (curParts[i].Equals("unofficial", StringComparison.InvariantCultureIgnoreCase))
+                    if (curParts[i].Equals("unofficial", StringComparison.OrdinalIgnoreCase))
                         return curOlder;
 
                     // compare numerically if possible
@@ -295,7 +295,7 @@ namespace StardewModdingAPI.Toolkit
             }
 
             // fallback (this should never happen)
-            return string.Compare(this.ToString(), new SemanticVersion(otherMajor, otherMinor, otherPatch, otherPlatformRelease, otherTag).ToString(), StringComparison.InvariantCultureIgnoreCase);
+            return string.Compare(this.ToString(), new SemanticVersion(otherMajor, otherMinor, otherPatch, otherPlatformRelease, otherTag).ToString(), StringComparison.OrdinalIgnoreCase);
         }
 
         /// <summary>Assert that the current version is valid.</summary>

src/SMAPI.Toolkit/Serialization/InternalExtensions.cs

@@ -12,7 +12,7 @@ namespace StardewModdingAPI.Toolkit.Serialization
         /// <param name="fieldName">The field name.</param>
         public static T ValueIgnoreCase<T>(this JObject obj, string fieldName)
         {
-            JToken token = obj.GetValue(fieldName, StringComparison.InvariantCultureIgnoreCase);
+            JToken token = obj.GetValue(fieldName, StringComparison.OrdinalIgnoreCase);
             return token != null
                 ? token.Value<T>()
                 : default(T);

src/SMAPI.Web/Controllers/JsonValidatorController.cs

@@ -280,7 +280,7 @@ namespace StardewModdingAPI.Web.Controllers
                 IDictionary<string, string> errors = this.GetExtensionField<Dictionary<string, string>>(error.Schema, "@errorMessages");
                 if (errors == null)
                     return null;
-                errors = new Dictionary<string, string>(errors, StringComparer.InvariantCultureIgnoreCase);
+                errors = new Dictionary<string, string>(errors, StringComparer.OrdinalIgnoreCase);
 
                 // match error by type and message
                 foreach ((string target, string errorMessage) in errors)
@@ -289,7 +289,7 @@ namespace StardewModdingAPI.Web.Controllers
                         continue;
 
                     string[] parts = target.Split(':', 2);
-                    if (parts[0].Equals(error.ErrorType.ToString(), StringComparison.InvariantCultureIgnoreCase) && Regex.IsMatch(error.Message, parts[1]))
+                    if (parts[0].Equals(error.ErrorType.ToString(), StringComparison.OrdinalIgnoreCase) && Regex.IsMatch(error.Message, parts[1]))
                         return errorMessage?.Trim();
                 }
 
@@ -313,7 +313,7 @@ namespace StardewModdingAPI.Web.Controllers
             {
                 foreach ((string curKey, JToken value) in schema.ExtensionData)
                 {
-                    if (curKey.Equals(key, StringComparison.InvariantCultureIgnoreCase))
+                    if (curKey.Equals(key, StringComparison.OrdinalIgnoreCase))
                         return value.ToObject<T>();
                 }
             }

src/SMAPI.Web/Controllers/ModsApiController.cs

@@ -118,9 +118,9 @@ namespace StardewModdingAPI.Web.Controllers
         {
             // cross-reference data
             ModDataRecord record = this.ModDatabase.Get(search.ID);
-            WikiModEntry wikiEntry = wikiData.FirstOrDefault(entry => entry.ID.Contains(search.ID.Trim(), StringComparer.InvariantCultureIgnoreCase));
+            WikiModEntry wikiEntry = wikiData.FirstOrDefault(entry => entry.ID.Contains(search.ID.Trim(), StringComparer.OrdinalIgnoreCase));
             UpdateKey[] updateKeys = this.GetUpdateKeys(search.UpdateKeys, record, wikiEntry).ToArray();
-            ModOverrideConfig overrides = this.Config.Value.ModOverrides.FirstOrDefault(p => p.ID.Equals(search.ID?.Trim(), StringComparison.InvariantCultureIgnoreCase));
+            ModOverrideConfig overrides = this.Config.Value.ModOverrides.FirstOrDefault(p => p.ID.Equals(search.ID?.Trim(), StringComparison.OrdinalIgnoreCase));
             bool allowNonStandardVersions = overrides?.AllowNonStandardVersions ?? false;
 
             // get latest versions

src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs

@@ -13,7 +13,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         ** Fields
         *********/
         /// <summary>The cached mod data indexed by <c>{site key}:{ID}</c>.</summary>
-        private readonly IDictionary<string, Cached<IModPage>> Mods = new Dictionary<string, Cached<IModPage>>(StringComparer.InvariantCultureIgnoreCase);
+        private readonly IDictionary<string, Cached<IModPage>> Mods = new Dictionary<string, Cached<IModPage>>(StringComparer.OrdinalIgnoreCase);
 
 
         /*********

src/SMAPI.Web/Framework/Clients/GitHub/GitHubClient.cs

@@ -150,7 +150,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.GitHub
         /// <exception cref="ArgumentException">The repository key is invalid.</exception>
         private void AssertKeyFormat(string repo)
         {
-            if (repo == null || !repo.Contains("/") || repo.IndexOf("/", StringComparison.InvariantCultureIgnoreCase) != repo.LastIndexOf("/", StringComparison.InvariantCultureIgnoreCase))
+            if (repo == null || !repo.Contains("/") || repo.IndexOf("/", StringComparison.OrdinalIgnoreCase) != repo.LastIndexOf("/", StringComparison.OrdinalIgnoreCase))
                 throw new ArgumentException($"The value '{repo}' isn't a valid GitHub repository key, must be a username and project name like 'Pathoschild/SMAPI'.", nameof(repo));
         }
     }

src/SMAPI/Framework/CommandManager.cs

@@ -13,7 +13,7 @@ namespace StardewModdingAPI.Framework
         ** Fields
         *********/
         /// <summary>The commands registered with SMAPI.</summary>
-        private readonly IDictionary<string, Command> Commands = new Dictionary<string, Command>(StringComparer.InvariantCultureIgnoreCase);
+        private readonly IDictionary<string, Command> Commands = new Dictionary<string, Command>(StringComparer.OrdinalIgnoreCase);
 
 
         /*********

src/SMAPI/Framework/Content/AssetDataForMap.cs

@@ -67,7 +67,7 @@ namespace StardewModdingAPI.Framework.Content
                 {
                     // change ID if needed so new tilesheets are added after vanilla ones (to avoid errors in hardcoded game logic)
                     string id = sourceSheet.Id;
-                    if (!id.StartsWith("z_", StringComparison.InvariantCultureIgnoreCase))
+                    if (!id.StartsWith("z_", StringComparison.OrdinalIgnoreCase))
                         id = $"z_{id}";
 
                     // change ID if it conflicts with an existing tilesheet

src/SMAPI/Framework/Content/AssetInfo.cs

@@ -47,7 +47,7 @@ namespace StardewModdingAPI.Framework.Content
         public bool AssetNameEquals(string path)
         {
             path = this.GetNormalizedPath(path);
-            return this.AssetName.Equals(path, StringComparison.InvariantCultureIgnoreCase);
+            return this.AssetName.Equals(path, StringComparison.OrdinalIgnoreCase);
         }
 
 

src/SMAPI/Framework/Content/ContentCache.cs

@@ -89,7 +89,7 @@ namespace StardewModdingAPI.Framework.Content
         public string NormalizeKey(string key)
         {
             key = this.NormalizePathSeparators(key);
-            return key.EndsWith(".xnb", StringComparison.InvariantCultureIgnoreCase)
+            return key.EndsWith(".xnb", StringComparison.OrdinalIgnoreCase)
                 ? key.Substring(0, key.Length - 4)
                 : this.NormalizeAssetNameForPlatform(key);
         }

src/SMAPI/Framework/ContentCoordinator.cs

@@ -229,7 +229,7 @@ namespace StardewModdingAPI.Framework
         public IEnumerable<string> InvalidateCache(Func<string, Type, bool> predicate, bool dispose = false)
         {
             // invalidate cache & track removed assets
-            IDictionary<string, Type> removedAssets = new Dictionary<string, Type>(StringComparer.InvariantCultureIgnoreCase);
+            IDictionary<string, Type> removedAssets = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
             this.ContentManagerLock.InReadLock(() =>
             {
                 // cached assets
@@ -263,7 +263,7 @@ namespace StardewModdingAPI.Framework
             if (removedAssets.Any())
             {
                 IDictionary<string, bool> propagated = this.CoreAssets.Propagate(this.MainContentManager, removedAssets.ToDictionary(p => p.Key, p => p.Value)); // use an intercepted content manager
-                this.Monitor.Log($"Invalidated {removedAssets.Count} asset names ({string.Join(", ", removedAssets.Keys.OrderBy(p => p, StringComparer.InvariantCultureIgnoreCase))}); propagated {propagated.Count(p => p.Value)} core assets.", LogLevel.Trace);
+                this.Monitor.Log($"Invalidated {removedAssets.Count} asset names ({string.Join(", ", removedAssets.Keys.OrderBy(p => p, StringComparer.OrdinalIgnoreCase))}); propagated {propagated.Count(p => p.Value)} core assets.", LogLevel.Trace);
             }
             else
                 this.Monitor.Log("Invalidated 0 cache entries.", LogLevel.Trace);

src/SMAPI/Framework/ContentManagers/BaseContentManager.cs

@@ -87,7 +87,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             this.IsNamespaced = isNamespaced;
 
             // get asset data
-            this.LanguageCodes = this.GetKeyLocales().ToDictionary(p => p.Value, p => p.Key, StringComparer.InvariantCultureIgnoreCase);
+            this.LanguageCodes = this.GetKeyLocales().ToDictionary(p => p.Value, p => p.Key, StringComparer.OrdinalIgnoreCase);
             this.BaseDisposableReferences = reflection.GetField<List<IDisposable>>(this, "disposableAssets").GetValue();
         }
 
@@ -192,7 +192,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <returns>Returns the invalidated asset names and instances.</returns>
         public IDictionary<string, object> InvalidateCache(Func<string, Type, bool> predicate, bool dispose = false)
         {
-            IDictionary<string, object> removeAssets = new Dictionary<string, object>(StringComparer.InvariantCultureIgnoreCase);
+            IDictionary<string, object> removeAssets = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
             this.Cache.Remove((key, asset) =>
             {
                 this.ParseCacheKey(key, out string assetName, out _);
@@ -295,7 +295,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             // handle localized key
             if (!string.IsNullOrWhiteSpace(cacheKey))
             {
-                int lastSepIndex = cacheKey.LastIndexOf(".", StringComparison.InvariantCulture);
+                int lastSepIndex = cacheKey.LastIndexOf(".", StringComparison.Ordinal);
                 if (lastSepIndex >= 0)
                 {
                     string suffix = cacheKey.Substring(lastSepIndex + 1, cacheKey.Length - lastSepIndex - 1);

src/SMAPI/Framework/ContentManagers/GameContentManager.cs

@@ -123,7 +123,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             base.OnLocaleChanged();
 
             // find assets for which a translatable version was loaded
-            HashSet<string> removeAssetNames = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+            HashSet<string> removeAssetNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
             foreach (string key in this.IsLocalizableLookup.Where(p => p.Value).Select(p => p.Key))
                 removeAssetNames.Add(this.TryParseExplicitLanguageAssetKey(key, out string assetName, out _) ? assetName : key);
 
@@ -134,7 +134,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                     || (this.TryParseExplicitLanguageAssetKey(key, out string assetName, out _) && removeAssetNames.Contains(assetName))
                 )
                 .Select(p => p.Key)
-                .OrderBy(p => p, StringComparer.InvariantCultureIgnoreCase)
+                .OrderBy(p => p, StringComparer.OrdinalIgnoreCase)
                 .ToArray();
             if (invalidated.Any())
                 this.Monitor.Log($"Invalidated {invalidated.Length} asset names: {string.Join(", ", invalidated)} for locale change.", LogLevel.Trace);

src/SMAPI/Framework/ContentManagers/ModContentManager.cs

@@ -372,7 +372,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                         break;
                     }
                 }
-                if (contentKey.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase))
+                if (contentKey.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
                     contentKey = contentKey.Substring(0, contentKey.Length - 4);
 
                 try

src/SMAPI/Framework/DeprecationManager.cs

@@ -11,7 +11,7 @@ namespace StardewModdingAPI.Framework
         ** Fields
         *********/
         /// <summary>The deprecations which have already been logged (as 'mod name::noun phrase::version').</summary>
-        private readonly HashSet<string> LoggedDeprecations = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+        private readonly HashSet<string> LoggedDeprecations = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>Encapsulates monitoring and logging for a given module.</summary>
         private readonly IMonitor Monitor;

src/SMAPI/Framework/GameVersion.cs

@@ -10,7 +10,7 @@ namespace StardewModdingAPI.Framework
         ** Private methods
         *********/
         /// <summary>A mapping of game to semantic versions.</summary>
-        private static readonly IDictionary<string, string> VersionMap = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
+        private static readonly IDictionary<string, string> VersionMap = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
             ["1.0"] = "1.0.0",
             ["1.01"] = "1.0.1",
@@ -64,7 +64,7 @@ namespace StardewModdingAPI.Framework
         {
             foreach (var mapping in GameVersion.VersionMap)
             {
-                if (mapping.Value.Equals(semanticVersion, StringComparison.InvariantCultureIgnoreCase))
+                if (mapping.Value.Equals(semanticVersion, StringComparison.OrdinalIgnoreCase))
                     return mapping.Key;
             }
 

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);
 
 
         /*********

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)

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)
                 {

src/SMAPI/Framework/Models/SConfig.cs

@@ -25,7 +25,7 @@ namespace StardewModdingAPI.Framework.Models
         };
 
         /// <summary>The default values for <see cref="SuppressUpdateChecks"/>, to log changes if different.</summary>
-        private static readonly HashSet<string> DefaultSuppressUpdateChecks = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase)
+        private static readonly HashSet<string> DefaultSuppressUpdateChecks = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             "SMAPI.ConsoleCommands",
             "SMAPI.SaveBackup"
@@ -84,7 +84,7 @@ namespace StardewModdingAPI.Framework.Models
                     custom[pair.Key] = value;
             }
 
-            HashSet<string> curSuppressUpdateChecks = new HashSet<string>(this.SuppressUpdateChecks ?? new string[0], StringComparer.InvariantCultureIgnoreCase);
+            HashSet<string> curSuppressUpdateChecks = new HashSet<string>(this.SuppressUpdateChecks ?? new string[0], StringComparer.OrdinalIgnoreCase);
             if (SConfig.DefaultSuppressUpdateChecks.Count != curSuppressUpdateChecks.Count || SConfig.DefaultSuppressUpdateChecks.Any(p => !curSuppressUpdateChecks.Contains(p)))
                 custom[nameof(this.SuppressUpdateChecks)] = "[" + string.Join(", ", this.SuppressUpdateChecks ?? new string[0]) + "]";
 

src/SMAPI/Framework/Networking/MultiplayerPeer.cs

@@ -71,7 +71,7 @@ namespace StardewModdingAPI.Framework.Networking
                 return null;
 
             id = id.Trim();
-            return this.Mods.FirstOrDefault(mod => mod.ID != null && mod.ID.Equals(id, StringComparison.InvariantCultureIgnoreCase));
+            return this.Mods.FirstOrDefault(mod => mod.ID != null && mod.ID.Equals(id, StringComparison.OrdinalIgnoreCase));
         }
 
         /// <summary>Send a message to the given peer, bypassing the game's normal validation to allow messages before the connection is approved.</summary>

src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounterCollection.cs

@@ -189,7 +189,7 @@ namespace StardewModdingAPI.Framework.PerformanceMonitoring
         public void ResetSource(string source)
         {
             foreach (var i in this.PerformanceCounters)
-                if (i.Value.Source.Equals(source, StringComparison.InvariantCultureIgnoreCase))
+                if (i.Value.Source.Equals(source, StringComparison.OrdinalIgnoreCase))
                     i.Value.Reset();
         }
 

src/SMAPI/Framework/PerformanceMonitoring/PerformanceMonitor.cs

@@ -23,7 +23,7 @@ namespace StardewModdingAPI.Framework.PerformanceMonitoring
         private readonly Stopwatch InvocationStopwatch = new Stopwatch();
 
         /// <summary>The underlying performance counter collections.</summary>
-        private readonly IDictionary<string, PerformanceCounterCollection> Collections = new Dictionary<string, PerformanceCounterCollection>(StringComparer.InvariantCultureIgnoreCase);
+        private readonly IDictionary<string, PerformanceCounterCollection> Collections = new Dictionary<string, PerformanceCounterCollection>(StringComparer.OrdinalIgnoreCase);
 
 
         /*********

src/SMAPI/Framework/SCore.cs

@@ -451,7 +451,7 @@ namespace StardewModdingAPI.Framework
                 {
                     string[] looseFiles = new DirectoryInfo(this.ModsPath).GetFiles().Select(p => p.Name).ToArray();
                     if (looseFiles.Any())
-                        this.Monitor.Log($"  Ignored loose files: {string.Join(", ", looseFiles.OrderBy(p => p, StringComparer.InvariantCultureIgnoreCase))}", LogLevel.Trace);
+                        this.Monitor.Log($"  Ignored loose files: {string.Join(", ", looseFiles.OrderBy(p => p, StringComparer.OrdinalIgnoreCase))}", LogLevel.Trace);
                 }
 
                 // load manifests
@@ -650,7 +650,7 @@ namespace StardewModdingAPI.Framework
                 {
                     try
                     {
-                        HashSet<string> suppressUpdateChecks = new HashSet<string>(this.Settings.SuppressUpdateChecks, StringComparer.InvariantCultureIgnoreCase);
+                        HashSet<string> suppressUpdateChecks = new HashSet<string>(this.Settings.SuppressUpdateChecks, StringComparer.OrdinalIgnoreCase);
 
                         // prepare search model
                         List<ModSearchEntryModel> searchMods = new List<ModSearchEntryModel>();
@@ -756,7 +756,7 @@ namespace StardewModdingAPI.Framework
             using (AssemblyLoader modAssemblyLoader = new AssemblyLoader(Constants.Platform, this.Monitor, this.Settings.ParanoidWarnings))
             {
                 // init
-                HashSet<string> suppressUpdateChecks = new HashSet<string>(this.Settings.SuppressUpdateChecks, StringComparer.InvariantCultureIgnoreCase);
+                HashSet<string> suppressUpdateChecks = new HashSet<string>(this.Settings.SuppressUpdateChecks, StringComparer.OrdinalIgnoreCase);
                 InterfaceProxyFactory proxyFactory = new InterfaceProxyFactory();
                 void LogSkip(IModMetadata mod, string errorPhrase, string errorDetails)
                 {
@@ -1103,8 +1103,8 @@ namespace StardewModdingAPI.Framework
                 // find skipped dependencies
                 KeyValuePair<IModMetadata, Tuple<string, string>>[] skippedDependencies;
                 {
-                    HashSet<string> skippedDependencyIds = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                    HashSet<string> skippedDependencyIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-                    HashSet<string> skippedModIds = new HashSet<string>(from mod in skippedMods where mod.Key.HasID() select mod.Key.Manifest.UniqueID, StringComparer.InvariantCultureIgnoreCase);
+                    HashSet<string> skippedModIds = new HashSet<string>(from mod in skippedMods where mod.Key.HasID() select mod.Key.Manifest.UniqueID, StringComparer.OrdinalIgnoreCase);
                     foreach (IModMetadata mod in skippedMods.Keys)
                     {
                         foreach (string requiredId in skippedModIds.Intersect(mod.GetRequiredModIds()))
@@ -1351,8 +1351,8 @@ namespace StardewModdingAPI.Framework
             foreach (string locale in translations.Keys.ToArray())
             {
                 // handle duplicates
-                HashSet<string> keys = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                HashSet<string> keys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-                HashSet<string> duplicateKeys = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+                HashSet<string> duplicateKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
                 foreach (string key in translations[locale].Keys.ToArray())
                 {
                     if (!keys.Add(key))
@@ -1458,7 +1458,7 @@ namespace StardewModdingAPI.Framework
             foreach (FileInfo logFile in logsDir.EnumerateFiles())
             {
                 // skip non-SMAPI file
-                if (!logFile.Name.StartsWith(Constants.LogNamePrefix, StringComparison.InvariantCultureIgnoreCase))
+                if (!logFile.Name.StartsWith(Constants.LogNamePrefix, StringComparison.OrdinalIgnoreCase))
                     continue;
 
                 // skip crash log

src/SMAPI/Framework/SGame.cs

@@ -239,7 +239,7 @@ namespace StardewModdingAPI.Framework
         private void OnModMessageReceived(ModMessageModel message)
         {
             // get mod IDs to notify
-            HashSet<string> modIDs = new HashSet<string>(message.ToModIDs ?? this.ModRegistry.GetAll().Select(p => p.Manifest.UniqueID), StringComparer.InvariantCultureIgnoreCase);
+            HashSet<string> modIDs = new HashSet<string>(message.ToModIDs ?? this.ModRegistry.GetAll().Select(p => p.Manifest.UniqueID), StringComparer.OrdinalIgnoreCase);
             if (message.FromPlayerID == Game1.player?.UniqueMultiplayerID)
                 modIDs.Remove(message.FromModID); // don't send a broadcast back to the sender
 

src/SMAPI/Framework/SMultiplayer.cs

@@ -373,7 +373,7 @@ namespace StardewModdingAPI.Framework
             // filter by mod ID
             if (toModIDs != null)
             {
-                HashSet<string> sendToMods = new HashSet<string>(toModIDs, StringComparer.InvariantCultureIgnoreCase);
+                HashSet<string> sendToMods = new HashSet<string>(toModIDs, StringComparer.OrdinalIgnoreCase);
                 if (sendToSelf && toModIDs.All(id => this.ModRegistry.Get(id) == null))
                     sendToSelf = false;
 

src/SMAPI/Framework/Translator.cs

@@ -12,7 +12,7 @@ namespace StardewModdingAPI.Framework
         ** Fields
         *********/
         /// <summary>The translations for each locale.</summary>
-        private readonly IDictionary<string, IDictionary<string, string>> All = new Dictionary<string, IDictionary<string, string>>(StringComparer.InvariantCultureIgnoreCase);
+        private readonly IDictionary<string, IDictionary<string, string>> All = new Dictionary<string, IDictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>The translations for the current locale, with locale fallback taken into account.</summary>
         private IDictionary<string, Translation> ForLocale;
@@ -45,7 +45,7 @@ namespace StardewModdingAPI.Framework
             this.Locale = locale.ToLower().Trim();
             this.LocaleEnum = localeEnum;
 
-            this.ForLocale = new Dictionary<string, Translation>(StringComparer.InvariantCultureIgnoreCase);
+            this.ForLocale = new Dictionary<string, Translation>(StringComparer.OrdinalIgnoreCase);
             foreach (string next in this.GetRelevantLocales(this.Locale))
             {
                 // skip if locale not defined
@@ -90,7 +90,7 @@ namespace StardewModdingAPI.Framework
             // reset translations
             this.All.Clear();
             foreach (var pair in translations)
-                this.All[pair.Key] = new Dictionary<string, string>(pair.Value, StringComparer.InvariantCultureIgnoreCase);
+                this.All[pair.Key] = new Dictionary<string, string>(pair.Value, StringComparer.OrdinalIgnoreCase);
 
             // rebuild cache
             this.SetLocale(this.Locale, this.LocaleEnum);

src/SMAPI/Metadata/CoreAssetPropagator.cs

@@ -84,7 +84,7 @@ namespace StardewModdingAPI.Metadata
             });
 
             // reload assets
-            IDictionary<string, bool> propagated = assets.ToDictionary(p => p.Key, p => false, StringComparer.InvariantCultureIgnoreCase);
+            IDictionary<string, bool> propagated = assets.ToDictionary(p => p.Key, p => false, StringComparer.OrdinalIgnoreCase);
             foreach (var bucket in buckets)
             {
                 switch (bucket.Key)
@@ -779,7 +779,7 @@ namespace StardewModdingAPI.Metadata
         private void ReloadNpcSprites(LocalizedContentManager content, IEnumerable<string> keys, IDictionary<string, bool> propagated)
         {
             // get NPCs
-            HashSet<string> lookup = new HashSet<string>(keys, StringComparer.InvariantCultureIgnoreCase);
+            HashSet<string> lookup = new HashSet<string>(keys, StringComparer.OrdinalIgnoreCase);
             var characters =
                 (
                     from npc in this.GetCharacters()
@@ -806,7 +806,7 @@ namespace StardewModdingAPI.Metadata
         private void ReloadNpcPortraits(LocalizedContentManager content, IEnumerable<string> keys, IDictionary<string, bool> propagated)
         {
             // get NPCs
-            HashSet<string> lookup = new HashSet<string>(keys, StringComparer.InvariantCultureIgnoreCase);
+            HashSet<string> lookup = new HashSet<string>(keys, StringComparer.OrdinalIgnoreCase);
             var characters =
                 (
                     from npc in this.GetCharacters()
@@ -1031,7 +1031,7 @@ namespace StardewModdingAPI.Metadata
             if (string.IsNullOrWhiteSpace(key) || string.IsNullOrWhiteSpace(rawSubstring))
                 return false;
 
-            return key.StartsWith(this.NormalizeAssetNameIgnoringEmpty(rawSubstring), StringComparison.InvariantCultureIgnoreCase);
+            return key.StartsWith(this.NormalizeAssetNameIgnoringEmpty(rawSubstring), StringComparison.OrdinalIgnoreCase);
         }
 
         /// <summary>Get whether a normalized asset key is in the given folder.</summary>

src/SMAPI/Program.cs

@@ -67,7 +67,7 @@ namespace StardewModdingAPI
                 AssemblyName name = new AssemblyName(e.Name);
                 foreach (FileInfo dll in new DirectoryInfo(Program.DllSearchPath).EnumerateFiles("*.dll"))
                 {
-                    if (name.Name.Equals(AssemblyName.GetAssemblyName(dll.FullName).Name, StringComparison.InvariantCultureIgnoreCase))
+                    if (name.Name.Equals(AssemblyName.GetAssemblyName(dll.FullName).Name, StringComparison.OrdinalIgnoreCase))
                         return Assembly.LoadFrom(dll.FullName);
                 }
                 return null;

src/SMAPI/Translation.cs

@@ -67,7 +67,7 @@ namespace StardewModdingAPI
                 return this;
 
             // get dictionary of tokens
-            IDictionary<string, string> tokenLookup = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
+            IDictionary<string, string> tokenLookup = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             {
                 // from dictionary
                 if (tokens is IDictionary inputLookup)