Fixed equality checks for platforms (#835)

XRTK · May 11, 2021 · bda52b4 · bda52b4
1 parent 0893abf
commit bda52b4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/Editor/BuildPipeline/BuildDeployWindow.cs b/Editor/BuildPipeline/BuildDeployWindow.cs
@@ -47,7 +47,7 @@ availablePlatform is EditorPlatform ||
 
                     for (var i = 0; i < platforms.Count; i++)
                     {
-                        if (MixedRealityPreferences.CurrentPlatformTarget == platforms[i])
+                        if (MixedRealityPreferences.CurrentPlatformTarget.GetType() == platforms[i].GetType())
                         {
                             platformIndex = i;
                             break;
@@ -86,7 +86,7 @@ private void OnGUI()
         {
             for (var i = 0; i < Platforms.Count; i++)
             {
-                if (MixedRealityPreferences.CurrentPlatformTarget == Platforms[i])
+                if (MixedRealityPreferences.CurrentPlatformTarget.GetType() == Platforms[i].GetType())
                 {
                     platformIndex = i;
                     break;

diff --git a/Editor/BuildPipeline/UnityPlayerBuildTools.cs b/Editor/BuildPipeline/UnityPlayerBuildTools.cs
@@ -45,7 +45,7 @@ public static IBuildInfo BuildInfo
                 BuildInfo buildInfoInstance;
 
                 if (buildInfo == null ||
-                    buildInfo.BuildPlatform != MixedRealityPreferences.CurrentPlatformTarget)
+                    buildInfo.BuildPlatform.GetType() != MixedRealityPreferences.CurrentPlatformTarget.GetType())
                 {
                     buildInfoInstance = AppDomain.CurrentDomain
                         .GetAssemblies()
@@ -69,7 +69,7 @@ public static IBuildInfo BuildInfo
                                 var asset = AssetDatabase.LoadAssetAtPath(assetPath, type) as IBuildInfo;
                                 var currentPlatform = MixedRealityPreferences.CurrentPlatformTarget;
 
-                                if (asset?.BuildPlatform == currentPlatform)
+                                if (asset?.BuildPlatform.GetType() == currentPlatform.GetType())
                                 {
                                     instance = asset as BuildInfo;
                                     break;
@@ -97,7 +97,7 @@ public static IBuildInfo BuildInfo
                     }
 
                     Debug.Assert(buildInfoInstance.IsNotNull());
-                    var buildAsset = buildInfoInstance.GetOrCreateAsset($"{MixedRealityPreferences.ProfileGenerationPath}\\BuildInfo\\", true);
+                    var buildAsset = buildInfoInstance.GetOrCreateAsset($"{MixedRealityPreferences.ProfileGenerationPath}\\BuildInfo\\");
                     Debug.Assert(!buildAsset.IsNull());
                 }
                 else

diff --git a/Editor/Profiles/MixedRealityToolkitRootProfileInspector.cs b/Editor/Profiles/MixedRealityToolkitRootProfileInspector.cs
@@ -52,7 +52,7 @@ availablePlatform is EditorPlatform ||
 
                     for (var i = 0; i < platforms.Count; i++)
                     {
-                        if (MixedRealityPreferences.CurrentPlatformTarget == platforms[i])
+                        if (MixedRealityPreferences.CurrentPlatformTarget.GetType() == platforms[i].GetType())
                         {
                             platformIndex = i;
                             break;
@@ -141,10 +141,11 @@ public override void OnInspectorGUI()
 
         internal void RenderSystemFields()
         {
+            var currentPlatform = MixedRealityPreferences.CurrentPlatformTarget;
 
             for (var i = 0; i < Platforms.Count; i++)
             {
-                if (MixedRealityPreferences.CurrentPlatformTarget == Platforms[i])
+                if (currentPlatform.GetType() == Platforms[i].GetType())
                 {
                     platformIndex = i;
                     break;

diff --git a/Runtime/Definitions/Platforms/BasePlatform.cs b/Runtime/Definitions/Platforms/BasePlatform.cs
@@ -43,8 +43,14 @@ public string Name
                                                       ValidBuildTargets.Any(buildTarget => UnityEditor.EditorUserBuildSettings.activeBuildTarget == buildTarget);
 
         /// <inheritdoc />
-        public virtual UnityEditor.BuildTarget[] ValidBuildTargets { get; } = null;
+        public virtual UnityEditor.BuildTarget[] ValidBuildTargets => null;
 
 #endif // UNITY_EDITOR
+
+        /// <inheritdoc />
+        public override bool Equals(object other) => other?.GetType() == GetType();
+
+        /// <inheritdoc />
+        public override int GetHashCode() => GetType().GetHashCode();
     }
-}
+}