Better session handling

Author: StephenHodgson

Assets/MixedRealityToolkit/_Core/Utilities/Editor/Setup/EnforceEditorSettings.cs

@@ -4,20 +4,17 @@
 using System.IO;
 using UnityEngine;
 using UnityEditor;
-using UnityEditorInternal.VR;
+using UnityEditor.Build;
 
 namespace Microsoft.MixedReality.Toolkit.Core.Utilities.Editor.Setup
 {
     /// <summary>
     /// Sets Force Text Serialization and visible meta files in all projects that use the Mixed Reality Toolkit.
     /// </summary>
     [InitializeOnLoad]
-    public class EnforceEditorSettings
+    public class EnforceEditorSettings : IActiveBuildTargetChanged
     {
         private const string SessionKey = "_MixedRealityToolkit_Editor_ShownSettingsPrompts";
-        private const string BuildTargetGroupKey = "_MixedRealityToolkit_Editor_Settings_CurrentBuildTargetGroup";
-
-        private static BuildTargetGroup currentBuildTargetGroup = BuildTargetGroup.Unknown;
 
         private static string mixedRealityToolkit_RelativeFolderPath = string.Empty;
 
@@ -62,7 +59,7 @@ static EnforceEditorSettings()
                         "- Visible meta files\n" +
                         "- Change the Scripting Backend to use IL2CPP\n\n" +
                         "Would you like to make this change?",
-                        "Update Settings",
+                        "Apply",
                         "Later"))
                 {
                     EditorSettings.serializationMode = SerializationMode.ForceText;
@@ -99,25 +96,10 @@ private static bool IsNewSession
         {
             get
             {
-                if (!SessionState.GetBool(SessionKey, false))
-                {
-                    SessionState.SetBool(SessionKey, true);
-                    return true;
-                }
+                if (SessionState.GetBool(SessionKey, false)) { return false; }
 
-                if (currentBuildTargetGroup == BuildTargetGroup.Unknown)
-                {
-                    currentBuildTargetGroup = (BuildTargetGroup)SessionState.GetInt(BuildTargetGroupKey, (int)EditorUserBuildSettings.selectedBuildTargetGroup);
-                }
-
-                if (currentBuildTargetGroup != EditorUserBuildSettings.selectedBuildTargetGroup)
-                {
-                    currentBuildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
-                    SessionState.SetInt(BuildTargetGroupKey, (int)EditorUserBuildSettings.selectedBuildTargetGroup);
-                    return true;
-                }
-
-                return false;
+                SessionState.SetBool(SessionKey, true);
+                return true;
             }
         }
 
@@ -180,5 +162,12 @@ private static void SetIconTheme()
             AssetDatabase.SaveAssets();
             AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
         }
+
+        public int callbackOrder { get; } = 0;
+
+        public void OnActiveBuildTargetChanged(BuildTarget previousTarget, BuildTarget newTarget)
+        {
+            SessionState.SetBool(SessionKey, false);
+        }
     }
 }

ProjectSettings/ProjectSettings.asset

@@ -275,9 +275,8 @@ PlayerSettings:
   m_BuildTargetGraphicsAPIs: []
   m_BuildTargetVRSettings:
   - m_BuildTarget: Android
-    m_Enabled: 0
-    m_Devices:
-    - Oculus
+    m_Enabled: 1
+    m_Devices: []
   - m_BuildTarget: Metro
     m_Enabled: 1
     m_Devices:
@@ -304,6 +303,7 @@ PlayerSettings:
   - m_BuildTarget: Standalone
     m_Enabled: 1
     m_Devices:
+    - Oculus
     - OpenVR
   - m_BuildTarget: Tizen
     m_Enabled: 0
@@ -652,27 +652,39 @@ PlayerSettings:
   platformCapabilities:
     WindowsStoreApps:
       AllJoyn: False
+      Appointments: False
+      BackgroundMediaPlayback: False
       BlockedChatMessages: False
       Bluetooth: False
       Chat: False
       CodeGeneration: False
+      Contacts: False
       EnterpriseAuthentication: False
       HumanInterfaceDevice: False
       InputInjectionBrokered: False
       InternetClient: True
       InternetClientServer: False
       Location: False
+      LowLevelDevices: False
       Microphone: True
       MusicLibrary: False
       Objects3D: False
+      OfflineMapsManagement: False
       PhoneCall: False
+      PhoneCallHistoryPublic: False
       PicturesLibrary: False
+      PointOfService: False
       PrivateNetworkClientServer: False
       Proximity: False
+      RecordedCallsFolder: False
+      RemoteSystem: False
       RemovableStorage: False
       SharedUserCertificates: False
       SpatialPerception: True
+      SystemManagement: False
       UserAccountInformation: False
+      UserDataTasks: False
+      UserNotificationListener: False
       VideosLibrary: False
       VoipCall: False
       WebCam: False