Unity-Technologies · jamesmcgill · Nov 22, 2023 · Nov 22, 2023 · Nov 22, 2023 · Nov 22, 2023
diff --git a/Assets/Samples/UnityRemote/UnityRemoteTestScript.cs b/Assets/Samples/UnityRemote/UnityRemoteTestScript.cs
@@ -7,7 +7,7 @@
 
 public class UnityRemoteTestScript : MonoBehaviour
 {
-    public new Camera camera;
+    public Camera camera;
 
     public Text accelerometerInputText;
     public Text touchInputText;

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionEditorWindow.cs
@@ -7,6 +7,8 @@
 using UnityEditor.Callbacks;
 using UnityEditor.IMGUI.Controls;
 using UnityEditor.ShortcutManagement;
+using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
 
 ////TODO: Add "Revert" button
 
@@ -35,7 +37,7 @@ internal class InputActionEditorWindow : EditorWindow, IDisposable
         /// </summary>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "line", Justification = "line parameter required by OnOpenAsset attribute")]
         [OnOpenAsset]
-        public static bool OnOpenAsset(int instanceId, int line)
+        public static bool OnOpenAsset(InstanceID instanceId, int line)
         {
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
             if (!InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kUseIMGUIEditorForAssets))

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs
@@ -9,6 +9,9 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine.InputSystem.Layouts;
 using UnityEngine.InputSystem.Utilities;
+using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 // The action tree view illustrates one of the weaknesses of Unity's editing model. While operating directly
 // on serialized data does have a number of advantages (the built-in undo system being one of them), making the

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeViewItems.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeViewItems.cs
@@ -5,6 +5,7 @@
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine.InputSystem.Utilities;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 ////TODO: sync expanded state of SerializedProperties to expanded state of tree (will help preserving expansion in inspector)
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs
@@ -11,6 +11,9 @@
 using UnityEngine.InputSystem.Layouts;
 using UnityEngine.InputSystem.Users;
 using UnityEngine.InputSystem.Utilities;
+using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 ////FIXME: Generate proper IDs for the individual tree view items; the current sequential numbering scheme just causes lots of
 ////       weird expansion/collapsing to happen.

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDeviceDebuggerWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDeviceDebuggerWindow.cs
@@ -6,6 +6,7 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.InputSystem.Utilities;
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
 
 ////TODO: allow selecting events and saving out only the selected ones
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputControlTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputControlTreeView.cs
@@ -5,6 +5,9 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.Profiling;
+using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 ////TODO: make control values editable (create state events from UI and pump them into the system)
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputEventTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputEventTreeView.cs
@@ -5,6 +5,9 @@
 using UnityEngine.InputSystem.LowLevel;
 using UnityEditor;
 using UnityEngine.Profiling;
+using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 ////FIXME: this performs horribly; the constant rebuilding on every single event makes the debug view super slow when device is noisy
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputStateWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputStateWindow.cs
@@ -5,6 +5,7 @@
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine.InputSystem.LowLevel;
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
 
 ////TODO: add ability to single-step through events
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/TreeViewHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/TreeViewHelpers.cs
@@ -1,6 +1,8 @@
 #if UNITY_EDITOR
 using System;
 using UnityEditor.IMGUI.Controls;
+using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 namespace UnityEngine.InputSystem.Editor
 {

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawer.cs
@@ -2,6 +2,7 @@
 using System;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 namespace UnityEngine.InputSystem.Editor
 {

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawerBase.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionDrawerBase.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 namespace UnityEngine.InputSystem.Editor
 {

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionMapDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionMapDrawer.cs
@@ -2,6 +2,7 @@
 using System;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 namespace UnityEngine.InputSystem.Editor
 {

diff --git a/...ages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs b/...ages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
@@ -32,7 +32,7 @@ internal class InputActionsEditorWindow : EditorWindow
         static readonly Vector2 k_MinWindowSize = new Vector2(650, 450);
 
         [OnOpenAsset]
-        public static bool OpenAsset(int instanceId, int line)
+        public static bool OpenAsset(InstanceID instanceId, int line)
         {
             if (InputSystem.settings.IsFeatureEnabled(InputFeatureNames.kUseIMGUIEditorForAssets))
                 return false;

diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/HID/HID.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/HID/HID.cs
@@ -12,11 +12,6 @@
 using UnityEngine.Pool;
 #endif
 
-// HID support is currently broken in 32-bit Windows standalone players. Consider 32bit Windows players unsupported for now.
-#if UNITY_STANDALONE_WIN && !UNITY_64
-#warning The 32-bit Windows player is not currently supported by the Input System. HID input will not work in the player. Please use x86_64, if possible.
-#endif
-
 ////REVIEW: there will probably be lots of cases where the HID device creation process just needs a little tweaking; we should
 ////        have better mechanism to do that without requiring to replace the entire process wholesale
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/HID/HIDDescriptorWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/HID/HIDDescriptorWindow.cs
@@ -5,6 +5,9 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine.InputSystem.Layouts;
 using UnityEngine.InputSystem.LowLevel;
+using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
 
 ////TODO: use two columns for treeview and separate name and value
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInput.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInput.cs
@@ -719,12 +719,7 @@ public event Action<PlayerInput> onControlsChanged
         ///
         /// Associating a camera with a player is necessary only when using split-screen (see <see cref="PlayerInputManager.splitScreen"/>).
         /// </remarks>
-        public
-        #if UNITY_EDITOR
-        // camera property is deprecated and only available in Editor.
-        new
-        #endif
-        Camera camera
+        public Camera camera
         {
             get => m_Camera;
             set => m_Camera = value;

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -3,12 +3,10 @@
     "com.unity.analytics": "3.6.12",
     "com.unity.cinemachine": "2.3.4",
     "com.unity.coding": "0.1.0-preview.24",
-    "com.unity.ide.rider": "1.2.1",
     "com.unity.ide.visualstudio": "2.0.15",
-    "com.unity.probuilder": "4.2.3",
     "com.unity.settings-manager": "1.0.3",
     "com.unity.test-framework": "1.1.33",
-    "com.unity.test-framework.build": "0.0.1-preview.12",
+    "com.unity.test-framework.build": "0.0.1-preview.15",
     "com.unity.test-framework.performance": "3.0.2",
     "com.unity.test-framework.utp-reporter": "1.1.0-preview",
     "com.unity.textmeshpro": "2.1.4",