Merge branch 'develop' into stable

2 files changed, 23 insertions, 16 deletions

diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs b/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs
index e67616d0..925e0b5c 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs
@@ -27,10 +27,13 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// <summary>The mod has no update keys set.</summary>
         NoUpdateKeys = 32,
 
+        /// <summary>Uses .NET APIs for reading and writing to the console.</summary>
+        AccessesConsole = 64,
+
         /// <summary>Uses .NET APIs for filesystem access.</summary>
-        AccessesFilesystem = 64,
+        AccessesFilesystem = 128,
 
         /// <summary>Uses .NET APIs for shell or process access.</summary>
-        AccessesShell = 128
+        AccessesShell = 256
     }
 }
diff --git a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
index 6dce5da5..2a01fe4b 100644
--- a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
@@ -105,23 +105,27 @@ namespace StardewModdingAPI.Toolkit.Utilities
         /// </remarks>
         private static bool IsRunningAndroid()
         {
-            using (Process process = new Process())
+            using Process process = new Process
             {
-                process.StartInfo.FileName = "getprop";
-                process.StartInfo.Arguments = "ro.build.user";
-                process.StartInfo.RedirectStandardOutput = true;
-                process.StartInfo.UseShellExecute = false;
-                process.StartInfo.CreateNoWindow = true;
-                try
+                StartInfo =
                 {
-                    process.Start();
-                    string output = process.StandardOutput.ReadToEnd();
-                    return !string.IsNullOrEmpty(output);
-                }
-                catch
-                {
-                    return false;
+                    FileName = "getprop",
+                    Arguments = "ro.build.user",
+                    RedirectStandardOutput = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true
                 }
+            };
+
+            try
+            {
+                process.Start();
+                string output = process.StandardOutput.ReadToEnd();
+                return !string.IsNullOrWhiteSpace(output);
+            }
+            catch
+            {
+                return false;
             }
         }