Merge branch 'development' into feat/more-unit-tests

Author: paulhazen

com.playeveryware.eos/Runtime/Core/Config/Config.cs

@@ -290,18 +290,18 @@ private async Task EnsureConfigFileExistsAsync()
         {
             bool fileExists = await FileSystemUtility.FileExistsAsync(FilePath);
 
-#if UNITY_EDITOR
             if (!fileExists)
             {
+#if UNITY_EDITOR
                 await WriteAsync();
-            }
 #else
-            // If the editor is not running, then the config file not
-            // existing should throw an error.
-            throw new FileNotFoundException(
+                // If the editor is not running, then the config file not
+                // existing should throw an error.
+                throw new FileNotFoundException(
                 $"Config file \"{FilePath}\" does not exist.");
 #endif
-        }
+            }
+    }
 
         // Functions declared below should only ever be utilized in the editor.
         // They are so divided to guarantee separation of concerns.

com.playeveryware.eos/Runtime/Core/EOSManager.cs

@@ -136,12 +136,12 @@ public delegate void OnAuthLinkExternalAccountCallback(
         private static Dictionary<LogCategory, LogLevel> logLevels;
 
         /// <summary>
-        /// Boolean indicator of whether an EOSManager has already been created.
-        /// This prevents having multiple EOSManagers doing extra work.
-        /// Note: This does not track if you delete the object.
-        /// It is presumed that EOSManager will have DontDestroyOnLoad marked on it, during Awake.
+        /// A pointer to the active EOSManager instance.
+        /// This is set when a EOSManager runs Awake, and this value is null.
+        /// This value may be "null" if the EOSManager has its game object destroyed,
+        /// for example between automated tests.
         /// </summary>
-        private static bool s_EOSManagerHasBeenCreated = false;
+        private static EOSManager s_EOSManagerInstance = null;
 
         enum EOSState
         {
@@ -1809,15 +1809,15 @@ void Awake()
         {
             // If there's already been an EOSManager,
             // disable this behaviour so that it doesn't fire Unity messages
-            if (s_EOSManagerHasBeenCreated)
+            if (s_EOSManagerInstance != null)
             {
                 EOSSingleton.print($"{nameof(EOSManager)} {(nameof(Awake))}: An EOSManager instance already exists and is running, so this behaviour is marking as inactive to not perform duplicate work.");
                 enabled = false;
                 return;
             }
 
             // Indicate that a EOSManager has been created, and mark it to not be destroyed
-            s_EOSManagerHasBeenCreated = true;
+            s_EOSManagerInstance = this;
             DontDestroyOnLoad(this.gameObject);
 
 #if UNITY_PS5 && !UNITY_EDITOR

com.playeveryware.eos/Runtime/Core/Utility/FileSystemUtility.cs

@@ -413,6 +413,7 @@ await Task.Run(() =>
             }
         }
 
+#if UNITY_EDITOR
         /// <summary>
         /// Returns the root of the Unity project.
         /// </summary>
@@ -433,7 +434,7 @@ public static string GetProjectPath()
             throw new DirectoryNotFoundException("Unable to locate the Assets folder from the current directory.");
         }
 
-#if UNITY_EDITOR
+
         #region Line Ending Manipulations
 
         public static void ConvertDosToUnixLineEndings(string filename)