configurator updates and change cleanup

Author: davidkline-ms

Assets/MixedRealityToolkit/Inspectors/Setup/MixedRealityProjectConfiguratorWindow.cs

@@ -17,14 +17,6 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
         {
             { MRConfig.ForceTextSerialization, true },
             { MRConfig.VisibleMetaFiles, true },
-#if UNITY_2019_3_OR_NEWER
-            { MRConfig.XRManagerEnabled, false },
-            // XR Manager platforms
-            { MRConfig.XRManagerWindows, true },
-            { MRConfig.XRManagerOculus, true },
-            { MRConfig.XRManagerAndroid, false },
-            { MRConfig.XRManageriOS, false },
-#endif // UNITY_2019_3_OR_NEWER
             { MRConfig.VirtualRealitySupported, true },
             { MRConfig.SinglePassInstancing, true },
             { MRConfig.SpatialAwarenessLayer, true },
@@ -57,10 +49,6 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
 
         private bool showConfigurations = true;
 
-#if UNITY_2019_3_OR_NEWER
-        private bool showXRManagerPlatforms = true;
-#endif // UNITY_2019_3_OR_NEWER
-
         /// <summary>
         /// Show the MRTK Project Configurator utility window or focus if already opened
         /// </summary>
@@ -152,30 +140,19 @@ private void RenderConfigurations()
             EditorGUILayout.LabelField("Project Settings", EditorStyles.boldLabel);
             RenderToggle(MRConfig.ForceTextSerialization, "Enable Force Text Serialization");
             RenderToggle(MRConfig.VisibleMetaFiles, "Enable Visible meta files");
-#if UNITY_2019_3_OR_NEWER
-            RenderToggle(MRConfig.XRManagerEnabled, "Enable XR Manager");
-            showXRManagerPlatforms = EditorGUILayout.Foldout(showXRManagerPlatforms, "XR Manager Platforms", true);
-            if (showXRManagerPlatforms)
-            {
-                using (new EditorGUI.IndentLevelScope())
-                {
-                    RenderToggle(MRConfig.XRManagerWindows, "Windows XR");
-                    RenderToggle(MRConfig.XRManagerOculus, "Oculus XR");
-                    RenderToggle(MRConfig.XRManagerAndroid, "Android ARCore XR");
-                    RenderToggle(MRConfig.XRManageriOS, "iOS ARKit XR");
-                }
-            }
-#endif // UNITY_2019_3_OR_NEWER
             if (!MixedRealityOptimizeUtils.IsBuildTargetAndroid() && !MixedRealityOptimizeUtils.IsBuildTargetIOS())
             {
 #if UNITY_2019_3_OR_NEWER
                 RenderToggle(MRConfig.VirtualRealitySupported, "Enable Legacy XR");
 #else
-
                 RenderToggle(MRConfig.VirtualRealitySupported, "Enable VR Supported");
 #endif // UNITY_2019_3_OR_NEWER
             }
+#if UNITY_2019_3_OR_NEWER
+            RenderToggle(MRConfig.SinglePassInstancing, "Set Single Pass Instanced rendering path (legacy XR API)");
+#else
             RenderToggle(MRConfig.SinglePassInstancing, "Set Single Pass Instanced rendering path");
+#endif // UNITY_2019_3_OR_NEWER
             RenderToggle(MRConfig.SpatialAwarenessLayer, "Set Default Spatial Awareness Layer");
             RenderToggle(MRConfig.EnableMSBuildForUnity, "Enable MSBuild for Unity");
             EditorGUILayout.Space();

Assets/MixedRealityToolkit/Utilities/Editor/PackageManifest/PackageManifestUpdater.cs

@@ -33,14 +33,6 @@ public enum Configurations
             SinglePassInstancing,
             SpatialAwarenessLayer,
             EnableMSBuildForUnity,
-#if UNITY_2019_3_OR_NEWER
-            XRManagerEnabled,
-            // XR Manager platforms
-            XRManagerWindows,
-            XRManagerOculus,
-            XRManagerAndroid,
-            XRManageriOS,
-#endif // UNITY_2019_3_OR_NEWER
 
             // WSA Capabilities
             SpatialPerceptionCapability = 1000,
@@ -66,13 +58,6 @@ public enum Configurations
             { Configurations.LatestScriptingRuntime,  () => { return IsLatestScriptingRuntime(); } },
             { Configurations.ForceTextSerialization,  () => { return IsForceTextSerialization(); } },
             { Configurations.VisibleMetaFiles,  () => { return IsVisibleMetaFiles(); } },
-#if UNITY_2019_3_OR_NEWER
-            { Configurations.XRManagerEnabled,  () => { return false; /* todo */ } },
-            { Configurations.XRManagerWindows,  () => { return false; /* todo */ } },
-            { Configurations.XRManagerOculus,  () => { return false; /* todo */ } },
-            { Configurations.XRManagerAndroid,  () => { return false; /* todo */ } },
-            { Configurations.XRManageriOS,  () => { return false; /* todo */ } },
-#endif
             // Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
             // with legacy requirements.
 #pragma warning disable 0618
@@ -109,13 +94,6 @@ public enum Configurations
             { Configurations.LatestScriptingRuntime,  () => { SetLatestScriptingRuntime(); } },
             { Configurations.ForceTextSerialization,  () => { SetForceTextSerialization(); } },
             { Configurations.VisibleMetaFiles,  () => { SetVisibleMetaFiles(); } },
-#if UNITY_2019_3_OR_NEWER
-            { Configurations.XRManagerEnabled,  () => { /* todo */ } },
-            { Configurations.XRManagerWindows,  () => { /* todo */ } },
-            { Configurations.XRManagerOculus,  () => { /* todo */ } },
-            { Configurations.XRManagerAndroid,  () => { /* todo */ } },
-            { Configurations.XRManageriOS,  () => { /* todo */ } },
-#endif
             // Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
             // with legacy requirements.
 #pragma warning disable 0618

Assets/MixedRealityToolkit/Utilities/Editor/PackageManifest/PackageManifestUpdater.cs.meta

@@ -1,20 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Collections.Generic;
 using UnityEditor;
-using UnityEngine;
-
-#if UNITY_2019_3_OR_NEWER
-using UnityEditor.PackageManager;
-using UnityEditor.PackageManager.Requests;
-using PackageInfo = UnityEditor.PackageManager.PackageInfo;
-#endif // UNITY_2019_3_OR_NEWER
-
-#if XR_MANAGEMENT_ENABLED
-using System.Threading;
-using UnityEngine.XR.Management;
-#endif //XR_MANAGEMENT_ENABLED
 
 namespace Microsoft.MixedReality.Toolkit.Utilities.Editor
 {
@@ -47,6 +34,5 @@ public static bool LegacyXREnabled
 #pragma warning restore 0618
             }
         }
-
     }
 }