Merge branch 'release-3.3.5' into fix/auto-select-options-for-new-platforms

Author: paulhazen

Assets/Plugins/Source/Editor/com.playeveryware.eos-Editor.asmdef

@@ -6,7 +6,8 @@
         "GUID:478a2357cc57436488a56e564b08d223",
         "GUID:3a63500f0eef43a438c0553491f7c5da",
         "GUID:4a3cd13b0378c984c9688988d6a41c57",
-        "GUID:be1f6e9efffcfce41aeb5c2f4c27cf75"
+        "GUID:be1f6e9efffcfce41aeb5c2f4c27cf75",
+        "GUID:793f42bcdc73d104e91ec29d214254da"
     ],
     "includePlatforms": [
         "Editor"

Assets/Tests/Common/CodeCoverageHistoryCleaner.cs

@@ -23,17 +23,13 @@
 
 namespace PlayEveryWare.EpicOnlineServices.Tests
 {
-    using EpicOnlineServices.Editor.Utility;
     using System.Collections.Generic;
     using System.IO;
     using System.Xml.Linq;
 
     using System;
     using System.Linq;
-    using UnityEditor;
     using UnityEngine;
-    using Utility;
-    using JsonUtility = Utility.JsonUtility;
 
     /// <summary>
     /// This class consolidates any code coverage history data output from the

…/Source/Editor/Configs/UnitTestConfig.cs Assets/Tests/Common/UnitTestConfig.csAssets/Plugins/Source/Editor/Configs/UnitTestConfig.cs renamed to Assets/Tests/Common/UnitTestConfig.cs Assets/Plugins/Source/Editor/Configs/UnitTestConfig.cs renamed to Assets/Tests/Common/UnitTestConfig.cs

@@ -24,13 +24,13 @@
 
 namespace PlayEveryWare.EpicOnlineServices.Tests
 {
-    using EpicOnlineServices.Editor;
-    using EpicOnlineServices.Editor.Config;
+    using Utility;
     using System;
+    using Config = Config;
 
     [Serializable]
     [ConfigGroup("EOS Unit Test Configuration")]
-    public partial class UnitTestConfig : EditorConfig
+    public partial class UnitTestConfig : Config
     {
         /// <summary>
         /// The IP address of the machine running the EOS_DevAuthTool.
@@ -56,7 +56,11 @@ public partial class UnitTestConfig : EditorConfig
         /// </summary>
         public bool Enable;
 
-        protected UnitTestConfig() : base("eos_automated_test_config.json") { }
+        protected UnitTestConfig() : base(
+            "eos_automated_test_config.json",
+            FileSystemUtility.CombinePaths(
+                FileSystemUtility.GetProjectPath(),
+                "etc/config/")) { }
 
         static UnitTestConfig()
         {

…ce/Editor/Configs/UnitTestConfig.cs.meta …sets/Tests/Common/UnitTestConfig.cs.metaAssets/Plugins/Source/Editor/Configs/UnitTestConfig.cs.meta renamed to Assets/Tests/Common/UnitTestConfig.cs.meta Assets/Plugins/Source/Editor/Configs/UnitTestConfig.cs.meta renamed to Assets/Tests/Common/UnitTestConfig.cs.meta

@@ -6,7 +6,6 @@
         "GUID:27619889b8ba8c24980f49ee34dbb44a",
         "GUID:0acc523941302664db1f4e527237feb3",
         "GUID:3a63500f0eef43a438c0553491f7c5da",
-        "GUID:cc11d9857b82d9b458fca637d5cb33fb",
         "GUID:37180d43aa4b85c4b9076e2ef48a3b2a"
     ],
     "includePlatforms": [],

Assets/Tests/Common/com.playeveryware.eos.tests.common.asmdef

@@ -308,6 +308,8 @@ protected override void OnReadCompleted()
                 Write();
             }
 #endif
+            // If thread affinity is null then instantiate it.
+            threadAffinity ??= new();
         }
 
         #region Logic for Migrating Override Values from Previous Structure

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

@@ -53,7 +53,7 @@ namespace PlayEveryWare.EpicOnlineServices.Utility
     /// <summary>
     /// Utility class used for a variety of File tasks.
     /// </summary>
-    internal static class FileSystemUtility
+    public static class FileSystemUtility
     {
         // This compile conditional exists because the following functions 
         // make use of the System.Linq namespace which is undesirable to use
@@ -417,27 +417,6 @@ await Task.Run(() =>
             }
         }
 
-        /// <summary>
-        /// Returns the root of the Unity project.
-        /// </summary>
-        /// <returns>Fully-qualified file path to the root of the Unity project.</returns>
-        public static string GetProjectPath()
-        {
-            // Assuming the current directory is within the project (e.g., in the Editor or during Play mode)
-            string assetsPath = CombinePaths(Directory.GetCurrentDirectory(), "Assets");
-
-            // Ensure the Assets folder exists at the expected location
-            if (DirectoryExists(assetsPath))
-            {
-                // Move up one directory from Assets to get the root directory of the project
-                return Path.GetFullPath(CombinePaths(assetsPath, ".."));
-            }
-
-            // If running in a different context or the assumption is wrong, handle accordingly
-            throw new DirectoryNotFoundException("Unable to locate the Assets folder from the current directory.");
-        }
-
-
         #region Line Ending Manipulations
 
         public static void ConvertDosToUnixLineEndings(string filename)
@@ -771,7 +750,27 @@ private static async Task<bool> ExistsInternalAsync(string path, bool isDirector
             return await Task.FromResult(exists);
         }
 
-#endregion
+        #endregion
+
+        /// <summary>
+        /// Returns the root of the Unity project.
+        /// </summary>
+        /// <returns>Fully-qualified file path to the root of the Unity project.</returns>
+        public static string GetProjectPath()
+        {
+            // Assuming the current directory is within the project (e.g., in the Editor or during Play mode)
+            string assetsPath = CombinePaths(Directory.GetCurrentDirectory(), "Assets");
+
+            // Ensure the Assets folder exists at the expected location
+            if (DirectoryExists(assetsPath))
+            {
+                // Move up one directory from Assets to get the root directory of the project
+                return Path.GetFullPath(CombinePaths(assetsPath, ".."));
+            }
+
+            // If running in a different context or the assumption is wrong, handle accordingly
+            throw new DirectoryNotFoundException("Unable to locate the Assets folder from the current directory.");
+        }
 
         public static void NormalizePath(ref string path)
         {