Removed build target switch and quality settings hack.

Author: StephenHodgson

Assets/HoloToolkit/BuildAndDeploy/Editor/BuildSLNUtilities.cs

@@ -92,7 +92,7 @@ public static void PerformBuild(BuildInfo buildInfo)
             if (buildInfo.HasAnySymbols(BuildSymbolRelease))
             {
                 //Unity automatically adds the DEBUG symbol if the BuildOptions.Development flag is
-                //specified. In order to have debug symbols and the RELEASE symbole we have to
+                //specified. In order to have debug symbols and the RELEASE symbols we have to
                 //inject the symbol Unity relies on to enable the /debug+ flag of csc.exe which is "DEVELOPMENT_BUILD"
                 buildInfo.AppendSymbols("DEVELOPMENT_BUILD");
             }

Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureMenu.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEditor;
+using UnityEditor.Build;
 using UnityEngine;
 
 namespace HoloToolkit.Unity
@@ -10,8 +11,11 @@ namespace HoloToolkit.Unity
     /// Configuration options derived from here: 
     /// https://developer.microsoft.com/en-us/windows/holographic/unity_development_overview#Configuring_a_Unity_project_for_HoloLens
     /// </summary>
-    public class AutoConfigureMenu : MonoBehaviour
+    public class AutoConfigureMenu : IActiveBuildTargetChanged
     {
+        public delegate void BuildTargetArgs(BuildTarget newTarget);
+        public static event BuildTargetArgs ActiveBuildTargetChanged;
+
         /// <summary>
         /// Displays a help page for the HoloToolkit.
         /// </summary>
@@ -25,30 +29,40 @@ public static void ShowHelp()
         /// Applies recommended scene settings to the current scenes
         /// </summary>
         [MenuItem("HoloToolkit/Configure/Apply HoloLens Scene Settings", false, 1)]
-        public static void ApplySceneSettings()
+        public static void ShowSceneSettingsWindow()
         {
-            SceneSettingsWindow window = (SceneSettingsWindow)EditorWindow.GetWindow(typeof(SceneSettingsWindow), true, "Apply HoloLens Scene Settings");
+            var window = (SceneSettingsWindow)EditorWindow.GetWindow(typeof(SceneSettingsWindow), true, "Apply HoloLens Scene Settings");
             window.Show();
         }
 
         /// <summary>
         /// Applies recommended project settings to the current project
         /// </summary>
         [MenuItem("HoloToolkit/Configure/Apply HoloLens Project Settings", false, 1)]
-        public static void ApplyProjectSettings()
+        public static void ShowProjectSettingsWindow()
         {
-            ProjectSettingsWindow window = (ProjectSettingsWindow)EditorWindow.GetWindow(typeof(ProjectSettingsWindow), true, "Apply HoloLens Project Settings");
+            var window = (ProjectSettingsWindow)EditorWindow.GetWindow(typeof(ProjectSettingsWindow), true, "Apply HoloLens Project Settings");
             window.Show();
         }
 
         /// <summary>
         /// Applies recommended capability settings to the current project
         /// </summary>
         [MenuItem("HoloToolkit/Configure/Apply HoloLens Capability Settings", false, 2)]
-        static void ApplyHoloLensCapabilitySettings()
+        public static void ShowCapabilitySettingsWindow()
         {
-            CapabilitySettingsWindow window = (CapabilitySettingsWindow)EditorWindow.GetWindow(typeof(CapabilitySettingsWindow), true, "Apply HoloLens Capability Settings");
+            var window = (CapabilitySettingsWindow)EditorWindow.GetWindow(typeof(CapabilitySettingsWindow), true, "Apply HoloLens Capability Settings");
             window.Show();
         }
+
+        public int callbackOrder { get; private set; }
+
+        public void OnActiveBuildTargetChanged(BuildTarget previousTarget, BuildTarget newTarget)
+        {
+            if (ActiveBuildTargetChanged != null)
+            {
+                ActiveBuildTargetChanged.Invoke(newTarget);
+            }
+        }
     }
 }

Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureWindow.cs

@@ -14,19 +14,22 @@ namespace HoloToolkit.Unity
     public abstract class AutoConfigureWindow<TSetting> : EditorWindow
     {
         #region Member Variables
+
         private Dictionary<TSetting, bool> values = new Dictionary<TSetting, bool>();
         private Dictionary<TSetting, string> names = new Dictionary<TSetting, string>();
         private Dictionary<TSetting, string> descriptions = new Dictionary<TSetting, string>();
 
         private string statusMessage = string.Empty;
         private Vector2 scrollPosition = Vector2.zero;
         private GUIStyle wrapStyle;
+
         #endregion // Member Variables
 
         #region Internal Methods
         private void SettingToggle(TSetting setting)
         {
             EditorGUI.BeginChangeCheck();
+
             // Draw and update setting flag
             values[setting] = GUILayout.Toggle(values[setting], new GUIContent(names[setting]));
 
@@ -36,15 +39,17 @@ private void SettingToggle(TSetting setting)
             }
 
             // If this control is the one under the mouse, update the status message
-            if ((Event.current.type == EventType.Repaint) && (GUILayoutUtility.GetLastRect().Contains(Event.current.mousePosition)))
+            if (Event.current.type == EventType.Repaint && GUILayoutUtility.GetLastRect().Contains(Event.current.mousePosition))
             {
                 StatusMessage = descriptions[setting];
                 Repaint();
             }
         }
+
         #endregion // Internal Methods
 
         #region Overridables / Event Triggers
+
         /// <summary>
         /// Called when settings should be applied.
         /// </summary>
@@ -68,13 +73,15 @@ private void SettingToggle(TSetting setting)
         #endregion // Overridables / Event Triggers
 
         #region Overrides / Event Handlers
+
         /// <summary>
         /// Called when the window is created.
         /// </summary>
         protected virtual void Awake()
         {
             wrapStyle = new GUIStyle("label") { wordWrap = true };
         }
+
         protected virtual void OnEnable()
         {
             LoadStrings();
@@ -115,12 +122,13 @@ protected virtual void OnGUI()
             if (applyClicked)
             {
                 ApplySettings();
-                Close();
             }
         }
+
         #endregion // Overrides / Event Handlers
 
         #region Public Properties
+
         /// <summary>
         /// Gets the descriptions of the settings.
         /// </summary>
@@ -173,6 +181,7 @@ protected Dictionary<TSetting, bool> Values
         /// Gets or sets the status message displayed at the bottom of the window.
         /// </summary>
         private string StatusMessage { get { return statusMessage; } set { statusMessage = value; } }
+
         #endregion // Public Properties
     }
 }

Assets/HoloToolkit/Utilities/Scripts/Editor/CapabilitySettingsWindow.cs

@@ -78,12 +78,7 @@ private void LoadSetting(PlayerSettings.WSACapability setting)
 
         protected override void ApplySettings()
         {
-            ApplySetting(PlayerSettings.WSACapability.Microphone);
-            ApplySetting(PlayerSettings.WSACapability.WebCam);
-            ApplySetting(PlayerSettings.WSACapability.SpatialPerception);
-            ApplySetting(PlayerSettings.WSACapability.InternetClient);
-            ApplySetting(PlayerSettings.WSACapability.InternetClientServer);
-            ApplySetting(PlayerSettings.WSACapability.PrivateNetworkClientServer);
+            Close();
         }
 
         protected override void LoadSettings()
@@ -98,7 +93,13 @@ protected override void LoadSettings()
 
         protected override void OnGuiChanged()
         {
-            ApplySettings();
+            ApplySetting(PlayerSettings.WSACapability.Microphone);
+            ApplySetting(PlayerSettings.WSACapability.WebCam);
+            ApplySetting(PlayerSettings.WSACapability.SpatialPerception);
+            ApplySetting(PlayerSettings.WSACapability.InternetClient);
+            ApplySetting(PlayerSettings.WSACapability.InternetClientServer);
+            ApplySetting(PlayerSettings.WSACapability.PrivateNetworkClientServer);
+
             LoadSettings();
         }