use newer C# features

23 files changed, 105 insertions, 125 deletions

diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs
index 5b0c6e1f..f8371d57 100644
--- a/src/SMAPI.Installer/InteractiveInstaller.cs
+++ b/src/SMAPI.Installer/InteractiveInstaller.cs
@@ -707,7 +707,7 @@ namespace StardewModdingApi.Installer
         /// <param name="indent">The indentation to prefix to output.</param>
         private string InteractivelyChoose(string message, string[] options, string indent = "", Action<string> print = null)
         {
-            print = print ?? this.PrintInfo;
+            print ??= this.PrintInfo;
 
             while (true)
             {
diff --git a/src/SMAPI.ModBuildConfig/DeployModTask.cs b/src/SMAPI.ModBuildConfig/DeployModTask.cs
index 96d95e06..ced05a28 100644
--- a/src/SMAPI.ModBuildConfig/DeployModTask.cs
+++ b/src/SMAPI.ModBuildConfig/DeployModTask.cs
@@ -153,23 +153,22 @@ namespace StardewModdingAPI.ModBuildConfig
 
             // create zip file
             Directory.CreateDirectory(outputFolderPath);
-            using (Stream zipStream = new FileStream(zipPath, FileMode.Create, FileAccess.Write))
-            using (ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create))
+            using Stream zipStream = new FileStream(zipPath, FileMode.Create, FileAccess.Write);
+            using ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create);
+
+            foreach (var fileEntry in files)
             {
-                foreach (var fileEntry in files)
-                {
-                    string relativePath = fileEntry.Key;
-                    FileInfo file = fileEntry.Value;
+                string relativePath = fileEntry.Key;
+                FileInfo file = fileEntry.Value;
 
-                    // get file info
-                    string filePath = file.FullName;
-                    string entryName = folderName + '/' + relativePath.Replace(Path.DirectorySeparatorChar, '/');
+                // get file info
+                string filePath = file.FullName;
+                string entryName = folderName + '/' + relativePath.Replace(Path.DirectorySeparatorChar, '/');
 
-                    // add to zip
-                    using (Stream fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read))
-                    using (Stream fileStreamInZip = archive.CreateEntry(entryName).Open())
-                        fileStream.CopyTo(fileStreamInZip);
-                }
+                // add to zip
+                using Stream fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
+                using Stream fileStreamInZip = archive.CreateEntry(entryName).Open();
+                fileStream.CopyTo(fileStreamInZip);
             }
         }
 
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
index f0a7c82a..2fb6ed20 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
@@ -62,16 +62,15 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         private TResult Post<TBody, TResult>(string url, TBody content)
         {
             // note: avoid HttpClient for Mac compatibility
-            using (WebClient client = new WebClient())
-            {
-                Uri fullUrl = new Uri(this.BaseUrl, url);
-                string data = JsonConvert.SerializeObject(content);
+            using WebClient client = new WebClient();
 
-                client.Headers["Content-Type"] = "application/json";
-                client.Headers["User-Agent"] = $"SMAPI/{this.Version}";
-                string response = client.UploadString(fullUrl, data);
-                return JsonConvert.DeserializeObject<TResult>(response, this.JsonSettings);
-            }
+            Uri fullUrl = new Uri(this.BaseUrl, url);
+            string data = JsonConvert.SerializeObject(content);
+
+            client.Headers["Content-Type"] = "application/json";
+            client.Headers["User-Agent"] = $"SMAPI/{this.Version}";
+            string response = client.UploadString(fullUrl, data);
+            return JsonConvert.DeserializeObject<TResult>(response, this.JsonSettings);
         }
     }
 }
diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index 212c70ef..4eec3424 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -124,8 +124,8 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
             XElement root;
             try
             {
-                using (FileStream stream = file.OpenRead())
-                    root = XElement.Load(stream);
+                using FileStream stream = file.OpenRead();
+                root = XElement.Load(stream);
             }
             catch
             {
diff --git a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
index c45448f3..1e490448 100644
--- a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
@@ -30,10 +30,7 @@ namespace StardewModdingAPI.Toolkit.Utilities
         /// <summary>Detect the current OS.</summary>
         public static Platform DetectPlatform()
         {
-            if (EnvironmentUtility.CachedPlatform == null)
-                EnvironmentUtility.CachedPlatform = EnvironmentUtility.DetectPlatformImpl();
-
-            return EnvironmentUtility.CachedPlatform.Value;
+            return EnvironmentUtility.CachedPlatform ??= EnvironmentUtility.DetectPlatformImpl();
         }
 
 
diff --git a/src/SMAPI.Web/Controllers/JsonValidatorController.cs b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
index 2ade3e3d..c43fb929 100644
--- a/src/SMAPI.Web/Controllers/JsonValidatorController.cs
+++ b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
@@ -275,21 +275,20 @@ namespace StardewModdingAPI.Web.Controllers
                 errors = new Dictionary<string, string>(errors, StringComparer.InvariantCultureIgnoreCase);
 
                 // match error by type and message
-                foreach (var pair in errors)
+                foreach ((string target, string errorMessage) in errors)
                 {
-                    if (!pair.Key.Contains(":"))
+                    if (!target.Contains(":"))
                         continue;
 
-                    string[] parts = pair.Key.Split(':', 2);
+                    string[] parts = target.Split(':', 2);
                     if (parts[0].Equals(error.ErrorType.ToString(), StringComparison.InvariantCultureIgnoreCase) && Regex.IsMatch(error.Message, parts[1]))
-                        return pair.Value?.Trim();
+                        return errorMessage?.Trim();
                 }
 
                 // match by type
-                if (errors.TryGetValue(error.ErrorType.ToString(), out string message))
-                    return message?.Trim();
-
-                return null;
+                return errors.TryGetValue(error.ErrorType.ToString(), out string message)
+                    ? message?.Trim()
+                    : null;
             }
 
             return GetRawOverrideError()
@@ -304,10 +303,10 @@ namespace StardewModdingAPI.Web.Controllers
         {
             if (schema.ExtensionData != null)
             {
-                foreach (var pair in schema.ExtensionData)
+                foreach ((string curKey, JToken value) in schema.ExtensionData)
                 {
-                    if (pair.Key.Equals(key, StringComparison.InvariantCultureIgnoreCase))
-                        return pair.Value.ToObject<T>();
+                    if (curKey.Equals(key, StringComparison.InvariantCultureIgnoreCase))
+                        return value.ToObject<T>();
                 }
             }
 
@@ -318,14 +317,11 @@ namespace StardewModdingAPI.Web.Controllers
         /// <param name="value">The value to format.</param>
         private string FormatValue(object value)
         {
-            switch (value)
+            return value switch
             {
-                case List<string> list:
-                    return string.Join(", ", list);
-
-                default:
-                    return value?.ToString() ?? "null";
-            }
+                List<string> list => string.Join(", ", list),
+                _ => value?.ToString() ?? "null"
+            };
         }
     }
 }
diff --git a/src/SMAPI.Web/Controllers/ModsApiController.cs b/src/SMAPI.Web/Controllers/ModsApiController.cs
index 06768f03..e841a075 100644
--- a/src/SMAPI.Web/Controllers/ModsApiController.cs
+++ b/src/SMAPI.Web/Controllers/ModsApiController.cs
@@ -388,9 +388,9 @@ namespace StardewModdingAPI.Web.Controllers
                 if (map.ContainsKey(parsed.ToString()))
                     return map[parsed.ToString()];
 
-                foreach (var pair in map)
+                foreach ((string fromRaw, string toRaw) in map)
                 {
-                    if (SemanticVersion.TryParse(pair.Key, allowNonStandard, out ISemanticVersion target) && parsed.Equals(target) && SemanticVersion.TryParse(pair.Value, allowNonStandard, out ISemanticVersion newVersion))
+                    if (SemanticVersion.TryParse(fromRaw, allowNonStandard, out ISemanticVersion target) && parsed.Equals(target) && SemanticVersion.TryParse(toRaw, allowNonStandard, out ISemanticVersion newVersion))
                         return newVersion.ToString();
                 }
             }
diff --git a/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs b/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
index 140b854e..a6fd21fd 100644
--- a/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
@@ -57,8 +57,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.CurseForge
 
                     if (!SemanticVersion.TryParse(raw, out version))
                     {
-                        if (invalidVersion == null)
-                            invalidVersion = raw;
+                        invalidVersion ??= raw;
                         continue;
                     }
                 }
diff --git a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
index cc8f4737..676d660d 100644
--- a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Web.Framework.Compression
                 return rawText;
 
             // decompress
-            using (MemoryStream memoryStream = new MemoryStream())
+            using MemoryStream memoryStream = new MemoryStream();
             {
                 // read length prefix
                 int dataLength = BitConverter.ToInt32(zipBuffer, 0);
diff --git a/src/SMAPI.Web/Startup.cs b/src/SMAPI.Web/Startup.cs
index 07869797..35d22459 100644
--- a/src/SMAPI.Web/Startup.cs
+++ b/src/SMAPI.Web/Startup.cs
@@ -83,7 +83,7 @@ namespace StardewModdingAPI.Web
                 .AddRazorPages();
 
             // init MongoDB
-            services.AddSingleton<MongoDbRunner>(serv => !mongoConfig.IsConfigured()
+            services.AddSingleton<MongoDbRunner>(_ => !mongoConfig.IsConfigured()
                 ? MongoDbRunner.Start()
                 : throw new InvalidOperationException("The MongoDB connection is configured, so the local development version should not be used.")
             );
@@ -265,10 +265,10 @@ namespace StardewModdingAPI.Web
                 ["Modding:Object_data"] = new[] { "^/for-devs/object-data", "^/guides/object-data" },
                 ["Modding:Weather_data"] = new[] { "^/for-devs/weather", "^/guides/weather" }
             };
-            foreach (KeyValuePair<string, string[]> pair in wikiRedirects)
+            foreach ((string page, string[] patterns) in wikiRedirects)
             {
-                foreach (string pattern in pair.Value)
-                    redirects.Add(new RedirectToUrlRule(pattern, "https://stardewvalleywiki.com/" + pair.Key));
+                foreach (string pattern in patterns)
+                    redirects.Add(new RedirectToUrlRule(pattern, "https://stardewvalleywiki.com/" + page));
             }
 
             return redirects;
diff --git a/src/SMAPI/Framework/Input/GamePadStateBuilder.cs b/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
index 36622066..2657fd12 100644
--- a/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
@@ -205,16 +205,13 @@ namespace StardewModdingAPI.Framework.Input
         /// <summary>Get the equivalent state.</summary>
         public GamePadState GetState()
         {
-            if (this.State == null)
-            {
-                this.State = new GamePadState(
-                    leftThumbStick: this.LeftStickPos,
-                    rightThumbStick: this.RightStickPos,
-                    leftTrigger: this.LeftTrigger,
-                    rightTrigger: this.RightTrigger,
-                    buttons: this.GetButtonBitmask() // MonoGame requires one bitmask here; don't specify multiple values
-                );
-            }
+            this.State ??= new GamePadState(
+                leftThumbStick: this.LeftStickPos,
+                rightThumbStick: this.RightStickPos,
+                leftTrigger: this.LeftTrigger,
+                rightTrigger: this.RightTrigger,
+                buttons: this.GetButtonBitmask() // MonoGame requires one bitmask here; don't specify multiple values
+            );
 
             return this.State.Value;
         }
diff --git a/src/SMAPI/Framework/Input/MouseStateBuilder.cs b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
index 59956feb..1cc16ca9 100644
--- a/src/SMAPI/Framework/Input/MouseStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
@@ -89,19 +89,16 @@ namespace StardewModdingAPI.Framework.Input
         /// <summary>Get the equivalent state.</summary>
         public MouseState GetState()
         {
-            if (this.State == null)
-            {
-                this.State = new MouseState(
-                    x: this.X,
-                    y: this.Y,
-                    scrollWheel: this.ScrollWheelValue,
-                    leftButton: this.ButtonStates[SButton.MouseLeft],
-                    middleButton: this.ButtonStates[SButton.MouseMiddle],
-                    rightButton: this.ButtonStates[SButton.MouseRight],
-                    xButton1: this.ButtonStates[SButton.MouseX1],
-                    xButton2: this.ButtonStates[SButton.MouseX2]
-                );
-            }
+            this.State ??= new MouseState(
+                x: this.X,
+                y: this.Y,
+                scrollWheel: this.ScrollWheelValue,
+                leftButton: this.ButtonStates[SButton.MouseLeft],
+                middleButton: this.ButtonStates[SButton.MouseMiddle],
+                rightButton: this.ButtonStates[SButton.MouseRight],
+                xButton1: this.ButtonStates[SButton.MouseX1],
+                xButton2: this.ButtonStates[SButton.MouseX2]
+            );
 
             return this.State.Value;
         }
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index b5533335..8df492eb 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -125,12 +125,10 @@ namespace StardewModdingAPI.Framework.ModLoading
                 {
                     if (!oneAssembly)
                         this.Monitor.Log($"      Loading {assembly.File.Name} (rewritten in memory)...", LogLevel.Trace);
-                    using (MemoryStream outStream = new MemoryStream())
-                    {
-                        assembly.Definition.Write(outStream);
-                        byte[] bytes = outStream.ToArray();
-                        lastAssembly = Assembly.Load(bytes);
-                    }
+                    using MemoryStream outStream = new MemoryStream();
+                    assembly.Definition.Write(outStream);
+                    byte[] bytes = outStream.ToArray();
+                    lastAssembly = Assembly.Load(bytes);
                 }
                 else
                 {
diff --git a/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs b/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
index 7dbfa767..ac9cf313 100644
--- a/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
+++ b/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
@@ -45,23 +45,22 @@ namespace StardewModdingAPI.Framework.Networking
         [SuppressMessage("ReSharper", "AccessToDisposedClosure", Justification = "The callback is invoked synchronously.")]
         protected override void onReceiveMessage(GalaxyID peer, Stream messageStream)
         {
-            using (IncomingMessage message = new IncomingMessage())
-            using (BinaryReader reader = new BinaryReader(messageStream))
+            using IncomingMessage message = new IncomingMessage();
+            using BinaryReader reader = new BinaryReader(messageStream);
+
+            message.Read(reader);
+            ulong peerID = peer.ToUint64(); // note: GalaxyID instances get reused, so need to store the underlying ID instead
+            this.OnProcessingMessage(message, outgoing => this.SendMessageToPeerID(peerID, outgoing), () =>
             {
-                message.Read(reader);
-                ulong peerID = peer.ToUint64(); // note: GalaxyID instances get reused, so need to store the underlying ID instead
-                this.OnProcessingMessage(message, outgoing => this.SendMessageToPeerID(peerID, outgoing), () =>
+                if (this.peers.ContainsLeft(message.FarmerID) && (long)this.peers[message.FarmerID] == (long)peerID)
+                    this.gameServer.processIncomingMessage(message);
+                else if (message.MessageType == StardewValley.Multiplayer.playerIntroduction)
                 {
-                    if (this.peers.ContainsLeft(message.FarmerID) && (long)this.peers[message.FarmerID] == (long)peerID)
-                        this.gameServer.processIncomingMessage(message);
-                    else if (message.MessageType == StardewValley.Multiplayer.playerIntroduction)
-                    {
-                        NetFarmerRoot farmer = this.Multiplayer.readFarmer(message.Reader);
-                        GalaxyID capturedPeer = new GalaxyID(peerID);
-                        this.gameServer.checkFarmhandRequest(Convert.ToString(peerID), this.getConnectionId(peer), farmer, msg => this.sendMessage(capturedPeer, msg), () => this.peers[farmer.Value.UniqueMultiplayerID] = capturedPeer.ToUint64());
-                    }
-                });
-            }
+                    NetFarmerRoot farmer = this.Multiplayer.readFarmer(message.Reader);
+                    GalaxyID capturedPeer = new GalaxyID(peerID);
+                    this.gameServer.checkFarmhandRequest(Convert.ToString(peerID), this.getConnectionId(peer), farmer, msg => this.sendMessage(capturedPeer, msg), () => this.peers[farmer.Value.UniqueMultiplayerID] = capturedPeer.ToUint64());
+                }
+            });
         }
 
         /// <summary>Send a message to a remote peer.</summary>
diff --git a/src/SMAPI/Framework/Networking/SLidgrenServer.cs b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
index f2c61917..05c8b872 100644
--- a/src/SMAPI/Framework/Networking/SLidgrenServer.cs
+++ b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
@@ -44,25 +44,24 @@ namespace StardewModdingAPI.Framework.Networking
         {
             // add hook to call multiplayer core
             NetConnection peer = rawMessage.SenderConnection;
-            using (IncomingMessage message = new IncomingMessage())
-            using (Stream readStream = new NetBufferReadStream(rawMessage))
-            using (BinaryReader reader = new BinaryReader(readStream))
+            using IncomingMessage message = new IncomingMessage();
+            using Stream readStream = new NetBufferReadStream(rawMessage);
+            using BinaryReader reader = new BinaryReader(readStream);
+
+            while (rawMessage.LengthBits - rawMessage.Position >= 8)
             {
-                while (rawMessage.LengthBits - rawMessage.Position >= 8)
+                message.Read(reader);
+                NetConnection connection = rawMessage.SenderConnection; // don't pass rawMessage into context because it gets reused
+                this.OnProcessingMessage(message, outgoing => this.sendMessage(connection, outgoing), () =>
                 {
-                    message.Read(reader);
-                    NetConnection connection = rawMessage.SenderConnection; // don't pass rawMessage into context because it gets reused
-                    this.OnProcessingMessage(message, outgoing => this.sendMessage(connection, outgoing), () =>
+                    if (this.peers.ContainsLeft(message.FarmerID) && this.peers[message.FarmerID] == peer)
+                        this.gameServer.processIncomingMessage(message);
+                    else if (message.MessageType == StardewValley.Multiplayer.playerIntroduction)
                     {
-                        if (this.peers.ContainsLeft(message.FarmerID) && this.peers[message.FarmerID] == peer)
-                            this.gameServer.processIncomingMessage(message);
-                        else if (message.MessageType == StardewValley.Multiplayer.playerIntroduction)
-                        {
-                            NetFarmerRoot farmer = this.Multiplayer.readFarmer(message.Reader);
-                            this.gameServer.checkFarmhandRequest("", this.getConnectionId(rawMessage.SenderConnection), farmer, msg => this.sendMessage(peer, msg), () => this.peers[farmer.Value.UniqueMultiplayerID] = peer);
-                        }
-                    });
-                }
+                        NetFarmerRoot farmer = this.Multiplayer.readFarmer(message.Reader);
+                        this.gameServer.checkFarmhandRequest("", this.getConnectionId(rawMessage.SenderConnection), farmer, msg => this.sendMessage(peer, msg), () => this.peers[farmer.Value.UniqueMultiplayerID] = peer);
+                    }
+                });
             }
         }
     }
diff --git a/src/SMAPI/Framework/PerformanceMonitoring/AlertContext.cs b/src/SMAPI/Framework/PerformanceMonitoring/AlertContext.cs
index 01197f74..af630055 100644
--- a/src/SMAPI/Framework/PerformanceMonitoring/AlertContext.cs
+++ b/src/SMAPI/Framework/PerformanceMonitoring/AlertContext.cs
@@ -1,7 +1,7 @@
 namespace StardewModdingAPI.Framework.PerformanceMonitoring
 {
     /// <summary>The context for an alert.</summary>
-    internal struct AlertContext
+    internal readonly struct AlertContext
     {
         /*********
         ** Accessors
diff --git a/src/SMAPI/Framework/PerformanceMonitoring/AlertEntry.cs b/src/SMAPI/Framework/PerformanceMonitoring/AlertEntry.cs
index f5b80189..d5a0b343 100644
--- a/src/SMAPI/Framework/PerformanceMonitoring/AlertEntry.cs
+++ b/src/SMAPI/Framework/PerformanceMonitoring/AlertEntry.cs
@@ -1,7 +1,7 @@
 namespace StardewModdingAPI.Framework.PerformanceMonitoring
 {
     /// <summary>A single alert entry.</summary>
-    internal struct AlertEntry
+    internal readonly struct AlertEntry
     {
         /*********
         ** Accessors
diff --git a/src/SMAPI/Framework/PerformanceMonitoring/PeakEntry.cs b/src/SMAPI/Framework/PerformanceMonitoring/PeakEntry.cs
index cff502ad..1746e358 100644
--- a/src/SMAPI/Framework/PerformanceMonitoring/PeakEntry.cs
+++ b/src/SMAPI/Framework/PerformanceMonitoring/PeakEntry.cs
@@ -3,7 +3,7 @@ using System;
 namespace StardewModdingAPI.Framework.PerformanceMonitoring
 {
     /// <summary>A peak invocation time.</summary>
-    internal struct PeakEntry
+    internal readonly struct PeakEntry
     {
         /*********
         ** Accessors
diff --git a/src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounterEntry.cs b/src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounterEntry.cs
index 8adbd88d..18cca628 100644
--- a/src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounterEntry.cs
+++ b/src/SMAPI/Framework/PerformanceMonitoring/PerformanceCounterEntry.cs
@@ -3,7 +3,7 @@ using System;
 namespace StardewModdingAPI.Framework.PerformanceMonitoring
 {
     /// <summary>A single performance counter entry.</summary>
-    internal struct PerformanceCounterEntry
+    internal readonly struct PerformanceCounterEntry
     {
         /*********
         ** Accessors
diff --git a/src/SMAPI/Framework/Serialization/ColorConverter.cs b/src/SMAPI/Framework/Serialization/ColorConverter.cs
index 19979981..7315f1a5 100644
--- a/src/SMAPI/Framework/Serialization/ColorConverter.cs
+++ b/src/SMAPI/Framework/Serialization/ColorConverter.cs
@@ -35,7 +35,7 @@ namespace StardewModdingAPI.Framework.Serialization
         {
             string[] parts = str.Split(',');
             if (parts.Length != 4)
-                throw new SParseException($"Can't parse {typeof(Color).Name} from invalid value '{str}' (path: {path}).");
+                throw new SParseException($"Can't parse {nameof(Color)} from invalid value '{str}' (path: {path}).");
 
             int r = Convert.ToInt32(parts[0]);
             int g = Convert.ToInt32(parts[1]);
diff --git a/src/SMAPI/Framework/Serialization/PointConverter.cs b/src/SMAPI/Framework/Serialization/PointConverter.cs
index 3481c9b2..6cf795dc 100644
--- a/src/SMAPI/Framework/Serialization/PointConverter.cs
+++ b/src/SMAPI/Framework/Serialization/PointConverter.cs
@@ -33,7 +33,7 @@ namespace StardewModdingAPI.Framework.Serialization
         {
             string[] parts = str.Split(',');
             if (parts.Length != 2)
-                throw new SParseException($"Can't parse {typeof(Point).Name} from invalid value '{str}' (path: {path}).");
+                throw new SParseException($"Can't parse {nameof(Point)} from invalid value '{str}' (path: {path}).");
 
             int x = Convert.ToInt32(parts[0]);
             int y = Convert.ToInt32(parts[1]);
diff --git a/src/SMAPI/Framework/Serialization/RectangleConverter.cs b/src/SMAPI/Framework/Serialization/RectangleConverter.cs
index fbb2e253..a5780d8a 100644
--- a/src/SMAPI/Framework/Serialization/RectangleConverter.cs
+++ b/src/SMAPI/Framework/Serialization/RectangleConverter.cs
@@ -39,7 +39,7 @@ namespace StardewModdingAPI.Framework.Serialization
 
             var match = Regex.Match(str, @"^\{X:(?<x>\d+) Y:(?<y>\d+) Width:(?<width>\d+) Height:(?<height>\d+)\}$", RegexOptions.IgnoreCase);
             if (!match.Success)
-                throw new SParseException($"Can't parse {typeof(Rectangle).Name} from invalid value '{str}' (path: {path}).");
+                throw new SParseException($"Can't parse {nameof(Rectangle)} from invalid value '{str}' (path: {path}).");
 
             int x = Convert.ToInt32(match.Groups["x"].Value);
             int y = Convert.ToInt32(match.Groups["y"].Value);
diff --git a/src/SMAPI/Framework/Serialization/Vector2Converter.cs b/src/SMAPI/Framework/Serialization/Vector2Converter.cs
index 1d9b08e0..3e2ab776 100644
--- a/src/SMAPI/Framework/Serialization/Vector2Converter.cs
+++ b/src/SMAPI/Framework/Serialization/Vector2Converter.cs
@@ -33,7 +33,7 @@ namespace StardewModdingAPI.Framework.Serialization
         {
             string[] parts = str.Split(',');
             if (parts.Length != 2)
-                throw new SParseException($"Can't parse {typeof(Vector2).Name} from invalid value '{str}' (path: {path}).");
+                throw new SParseException($"Can't parse {nameof(Vector2)} from invalid value '{str}' (path: {path}).");
 
             float x = Convert.ToSingle(parts[0]);
             float y = Convert.ToSingle(parts[1]);