From a090b6c21c877e8835f25e1d70d667abf07d1d3c Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 16 May 2020 11:29:40 -0400
Subject: use newer C# features

---
 .../Framework/Clients/WebApi/WebApiClient.cs            | 17 ++++++++---------
 src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs |  4 ++--
 src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs       |  5 +----
 3 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/SMAPI.Toolkit')

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();
         }
 
 
-- 
cgit