Remove references to EditorUserBuildSettings.wsaSubtarget

Author: keveleigh

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/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);