Merge pull request #1079 from PlayEveryWare/fix/platform-config-decoupling

fix: Add config editors for all platforms

Author: paulhazen

…urce/Editor/Utility/ReflectionUtility.cs …Core/Common/Utility/ReflectionUtility.csAssets/Plugins/Source/Editor/Utility/ReflectionUtility.cs renamed to com.playeveryware.eos/Runtime/Core/Common/Utility/ReflectionUtility.cs Assets/Plugins/Source/Editor/Utility/ReflectionUtility.cs renamed to com.playeveryware.eos/Runtime/Core/Common/Utility/ReflectionUtility.cs

@@ -20,15 +20,35 @@
  * SOFTWARE.
  */
 
-namespace PlayEveryWare.EpicOnlineServices.Editor.Utility
+namespace PlayEveryWare.Common.Utility
 {
+#if UNITY_EDITOR
     using System.Collections.Generic;
     using System;
     using System.Linq;
     using System.Reflection;
+    using System.Runtime.CompilerServices;
 
     public static class ReflectionUtility
     {
+        /// <summary>
+        /// Calls the static constructors on all classes that derive from the 
+        /// given type.
+        /// </summary>
+        /// <param name="baseType">
+        /// The type for which to call static constructors on.
+        /// </param>
+        public static void CallStaticConstructorsOnDerivingClasses<TBase>()
+        {
+            var types = Assembly.GetExecutingAssembly().GetTypes()
+            .Where(t => t.IsClass && !t.IsAbstract && t.IsSubclassOf(typeof(TBase)));
+
+            foreach (var type in types)
+            {
+                RuntimeHelpers.RunClassConstructor(type.TypeHandle);
+            }
+        }
+
         public static List<object> CreateInstancesOfDerivedGenericClasses(Type genericBaseType)
         {
             if (!genericBaseType.IsGenericTypeDefinition || !genericBaseType.IsAbstract)
@@ -65,6 +85,6 @@ public static List<object> CreateInstancesOfDerivedGenericClasses(Type genericBa
 
             return instances;
         }
-
     }
+#endif
 }

…Editor/Utility/ReflectionUtility.cs.meta …Common/Utility/ReflectionUtility.cs.metaAssets/Plugins/Source/Editor/Utility/ReflectionUtility.cs.meta renamed to com.playeveryware.eos/Runtime/Core/Common/Utility/ReflectionUtility.cs.meta Assets/Plugins/Source/Editor/Utility/ReflectionUtility.cs.meta renamed to com.playeveryware.eos/Runtime/Core/Common/Utility/ReflectionUtility.cs.meta

@@ -29,13 +29,14 @@ namespace PlayEveryWare.EpicOnlineServices
 
 #if UNITY_EDITOR
     using UnityEditor;
+    using PlayEveryWare.Common.Utility;
 #endif
 
 #if !EXTERNAL_TO_UNITY
     using UnityEngine;
 #endif
     using Utility;
-
+    
     public static partial class PlatformManager
     {
         /// <summary>
@@ -87,26 +88,14 @@ public static PlatformInfo Create<T>(string fullName, string configFileName, str
             }
         }
 
-#if !INCLUDE_RESTRICTED_PLATFORMS
         /// <summary>
         /// Private collection to store information about each platform.
         /// </summary>
-        private static readonly IDictionary<Platform, PlatformInfo> PlatformInformation =
-            new Dictionary<Platform, PlatformInfo>()
-            {
-#if !EXTERNAL_TO_UNITY
-                { Platform.Android, PlatformInfo.Create<AndroidConfig>("Android", "eos_android_config.json", null,     "Android")},
-                { Platform.iOS,     PlatformInfo.Create<IOSConfig>    ("iOS",     "eos_ios_config.json",     null,     "iPhone") },
-                { Platform.Linux,   PlatformInfo.Create<LinuxConfig>  ("Linux",   "eos_linux_config.json",   ".so",    "Standalone") },
-                { Platform.macOS,   PlatformInfo.Create<MacOSConfig>  ("macOS",   "eos_macos_config.json",   ".dylib", "Standalone") },
-#endif
-                { Platform.Windows, PlatformInfo.Create<WindowsConfig>("Windows", "eos_windows_config.json", ".dll",   "Standalone") },
-            };
-#endif
+        private static IDictionary<Platform, PlatformInfo> PlatformInformation = new Dictionary<Platform, PlatformInfo>();
 
-                /// <summary>
-                /// Backing value for the CurrentPlatform property.
-                /// </summary>
+        /// <summary>
+        /// Backing value for the CurrentPlatform property.
+        /// </summary>
         private static Platform s_CurrentPlatform;
 
         /// <summary>
@@ -139,8 +128,41 @@ public static Platform CurrentPlatform
             }
         }
 
+        /// <summary>
+        /// To be accessible to the platform manager, the static constructors 
+        /// for each platform config need to be executed, this function ensures
+        /// that happens.
+        /// </summary>
+        private static void InitializePlatformConfigs()
+        {
+            // This compile conditional is here because in the editor, it is
+            // acceptable to use reflection to make sure all the
+            // PlatformConfigs have their static constructors executed.
+#if UNITY_EDITOR
+            ReflectionUtility.CallStaticConstructorsOnDerivingClasses<PlatformConfig>();
+#endif
+
+#if !EXTERNAL_TO_UNITY
+            PlatformInformation.Add(Platform.Android, PlatformInfo.Create<AndroidConfig>("Android", "eos_android_config.json", null, "Android"));
+            PlatformInformation.Add(Platform.iOS, PlatformInfo.Create<IOSConfig>("iOS", "eos_ios_config.json", null, "iPhone"));
+            PlatformInformation.Add(Platform.Linux, PlatformInfo.Create<LinuxConfig>("Linux", "eos_linux_config.json", ".so", "Standalone"));
+            PlatformInformation.Add(Platform.macOS, PlatformInfo.Create<MacOSConfig>("macOS", "eos_macos_config.json", ".dylib", "Standalone"));
+#endif
+            PlatformInformation.Add(Platform.Windows, PlatformInfo.Create<WindowsConfig>("Windows", "eos_windows_config.json", ".dll", "Standalone"));
+        }
+
+        /// <summary>
+        /// This partial method is defined here so that a partial class
+        /// definition can provide implementation that initializes other
+        /// platform configs.
+        /// </summary>
+        static partial void InitializeProprietaryPlatformConfigs();
+
         static PlatformManager()
         {
+            InitializePlatformConfigs();
+            InitializeProprietaryPlatformConfigs();
+
             // If external to unity, then we know that the current platform
             // is Windows.
 #if EXTERNAL_TO_UNITY