Merge pull request #9938 from keveleigh/fix-2021

Updates with Unity 2021 changes

Author: keveleigh

Assets/MRTK/Core/Inspectors/Utilities/InspectorUIUtility.cs

@@ -650,7 +650,11 @@ static public bool DrawScriptableFoldout<T>(SerializedProperty scriptable, strin
                     else
                     {
                         bool isNestedInCurrentPrefab = false;
-                        var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
+#if UNITY_2021_2_OR_NEWER
+                        var prefabStage = UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
+#else
+                        var prefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
+#endif
                         if (prefabStage != null)
                         {
                             var instancePath = AssetDatabase.GetAssetPath(scriptable.objectReferenceValue);

Assets/MRTK/Core/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs

@@ -531,7 +531,11 @@ public static void AddCapabilities(IBuildInfo buildInfo, XElement rootElement =
                 AddGazeInputCapability(rootElement);
             }
 
-            if (uwpBuildInfo.ResearchModeCapabilityEnabled && EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens)
+            if (uwpBuildInfo.ResearchModeCapabilityEnabled
+#if !UNITY_2021_2_OR_NEWER
+                && EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens
+#endif // !UNITY_2021_2_OR_NEWER
+                )
             {
                 AddResearchModeCapability(rootElement);
             }

Assets/MRTK/Core/Utilities/Scenes/EditorSceneUtils.cs

@@ -253,7 +253,11 @@ public static IEnumerable<GameObject> GetRootGameObjectsInLoadedScenes()
         /// </summary>
         public static bool IsEditingPrefab()
         {
+#if UNITY_2021_2_OR_NEWER
+            var prefabStage = UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
+#else
             var prefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
+#endif
             return prefabStage != null;
         }
 

Assets/MRTK/SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs

@@ -1869,8 +1869,8 @@ private Bounds GetTargetBounds()
 
         private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMethod boundsCalculationMethod)
         {
-            KeyValuePair<Transform, Collider> colliderByTransform;
-            KeyValuePair<Transform, Bounds> rendererBoundsByTransform;
+            KeyValuePair<Transform, Collider> colliderByTransform = default;
+            KeyValuePair<Transform, Bounds> rendererBoundsByTransform = default;
 
             if (boundsCalculationMethod != BoundsCalculationMethod.RendererOnly)
             {

Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs

@@ -902,8 +902,8 @@ private Bounds GetTargetBounds()
 
         private void ExtractBoundsCorners(Transform childTransform, BoundsCalculationMethod boundsCalculationMethod)
         {
-            KeyValuePair<Transform, Collider> colliderByTransform;
-            KeyValuePair<Transform, Bounds> rendererBoundsByTransform;
+            KeyValuePair<Transform, Collider> colliderByTransform = default;
+            KeyValuePair<Transform, Bounds> rendererBoundsByTransform = default;
 
             if (boundsCalculationMethod != BoundsCalculationMethod.RendererOnly)
             {

Assets/MRTK/Tests/TestUtilities/PlayModeTestUtilities.cs

@@ -220,7 +220,10 @@ public static void EnsureInputModule()
                 {
                     CameraCache.Main.gameObject.AddComponent<MixedRealityInputModule>();
                 }
+
+#if !UNITY_2021_1_OR_NEWER
                 inputModule.forceModuleActive = true;
+#endif // !UNITY_2021_1_OR_NEWER
             }
         }
 

Assets/MRTK/Tools/BuildWindow/BuildDeployWindow.cs

@@ -34,6 +34,19 @@ private enum BuildDeployTab
             DeployOptions
         }
 
+#if UNITY_2021_2_OR_NEWER
+        /// <summary>
+        /// Matches the deprecated WSASubtarget.
+        /// </summary>
+        private enum UWPSubtarget
+        {
+            AnyDevice = 0,
+            PC = 1,
+            Mobile = 2,
+            HoloLens = 3
+        }
+#endif // UNITY_2021_2_OR_NEWER
+
         #endregion Internal Types
 
         #region Constants and Readonly Values
@@ -166,7 +179,13 @@ private static bool CanInstall
             get
             {
                 bool canInstall = true;
-                if (EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens)
+                if (
+#if UNITY_2021_2_OR_NEWER
+                    currentSubtarget == UWPSubtarget.HoloLens
+#else
+                    EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens
+#endif // UNITY_2021_2_OR_NEWER
+                    )
                 {
                     canInstall = DevicePortalConnectionEnabled;
                 }
@@ -271,6 +290,10 @@ private static bool UseRemoteTarget
         private static DeviceInfo lastTestConnectionTarget;
         private static DateTime? lastTestConnectionTime = null;
 
+#if UNITY_2021_2_OR_NEWER
+        private static UWPSubtarget currentSubtarget = UWPSubtarget.AnyDevice;
+#endif // UNITY_2021_2_OR_NEWER
+
         #endregion Fields
 
         #region Methods
@@ -380,7 +403,11 @@ private void RenderStandaloneBuildView()
 
         private void RenderUnityBuildView()
         {
+#if UNITY_2021_2_OR_NEWER
+            currentSubtarget = (UWPSubtarget)EditorGUILayout.Popup("Target Device", (int)currentSubtarget, TARGET_DEVICE_OPTIONS, GUILayout.Width(HALF_WIDTH));
+#else
             EditorUserBuildSettings.wsaSubtarget = (WSASubtarget)EditorGUILayout.Popup("Target Device", (int)EditorUserBuildSettings.wsaSubtarget, TARGET_DEVICE_OPTIONS, GUILayout.Width(HALF_WIDTH));
+#endif // UNITY_2021_2_OR_NEWER
 
 #if !UNITY_2019_1_OR_NEWER
             var curScriptingBackend = PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA);

Assets/MRTK/Tools/MSBuild/Scripts/Utilities.cs

@@ -129,7 +129,7 @@ public static bool TryGetGuidForAsset(FileInfo assetPath, out Guid guid)
                 }
             }
 
-            if (guid != null && Guid.TryParse(guidString, out guid))
+            if (guidString != null && Guid.TryParse(guidString, out guid))
             {
                 return true;
             }