CHANGE: Remove the UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS compile-time define

Assets/Samples/CustomComposite/CustomComposite.cs

@@ -145,7 +145,6 @@ public override void OnGUI()
         target.scaleFactor = EditorGUILayout.Slider(m_ScaleFactorLabel, currentValue, 0, 2);
     }
 
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
     public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
     {
         var slider = new Slider(m_ScaleFactorLabel.text, 0, 2)
@@ -167,8 +166,6 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
         root.Add(slider);
     }
 
-#endif
-
     private GUIContent m_ScaleFactorLabel = new GUIContent("Scale Factor");
 }
 #endif

Assets/Samples/ProjectWideActions/ProjectWideActions.asmdef

@@ -11,12 +11,6 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "Unity",
-            "expression": "2022.3",
-            "define": "UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS"
-        }
-    ],
+    "versionDefines": [],
     "noEngineReferences": false
 }

Assets/Samples/ProjectWideActions/ProjectWideActionsExample.cs

@@ -1,5 +1,3 @@
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-
 namespace UnityEngine.InputSystem.Samples.ProjectWideActions
 {
     public class ProjectWideActionsExample : MonoBehaviour
@@ -76,5 +74,3 @@ void Update()
         }
     } // class ProjectWideActionsExample
 } // namespace UnityEngine.InputSystem.Samples.ProjectWideActions
-
-#endif

Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs

@@ -1,4 +1,3 @@
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
 using NUnit.Framework;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Editor;
@@ -405,4 +404,3 @@ public void ChangeBindingsControlSchemesCommand_CanRemoveControlSchemes()
         Assert.That(groupsProperty.stringValue, Is.EqualTo(string.Empty));
     }
 }
-#endif

Assets/Tests/InputSystem.Editor/CustomProcessorEnumTest.cs

@@ -1,4 +1,4 @@
-#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
+#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER
 
 using System;
 using NUnit.Framework;

Assets/Tests/InputSystem.Editor/InputActionReferencePropertyDrawerEditorTests.cs

@@ -1,5 +1,3 @@
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS // Mimic implementation guard
-
 using System;
 using System.Collections;
 using NUnit.Framework;
@@ -168,5 +166,3 @@ public IEnumerator FieldObjectIsNullWhenReferenceIsInvalid()
         Assert.That(fieldObj, Is.Null);
     }
 }
-
-#endif // UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs

@@ -1,6 +1,4 @@
-// UITK TreeView is not supported in earlier versions
-// Therefore the UITK version of the InputActionAsset Editor is not available on earlier Editor versions either.
-#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
+#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER
 
 using NUnit.Framework;
 using System;

Assets/Tests/InputSystem.Editor/ProjectWideInputActionsEditorTests.cs

@@ -1,5 +1,3 @@
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -496,5 +494,3 @@ public void ProjectWideActions_CanBeAssignedAndFiresCallbackWhenAssignedAndDiffe
         Assert.That(m_CallbackCount, Is.EqualTo(2));
     }
 }
-
-#endif

Assets/Tests/InputSystem.Editor/SelectorsTests.cs

@@ -1,6 +1,4 @@
-// UITK TreeView is not supported in earlier versions
-// Therefore the UITK version of the InputActionAsset Editor is not available on earlier Editor versions either.
-#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
+#if UNITY_EDITOR
 using System;
 using System.Collections.Generic;
 using System.Linq;

Assets/Tests/InputSystem.Editor/TestData.cs

@@ -1,4 +1,3 @@
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
@@ -71,4 +70,3 @@ public static Generator<IEnumerable<T>> N<T>(Generator<T> generator, int count)
         });
     }
 }
-#endif

Assets/Tests/InputSystem.Editor/TestDataGenerators.cs

@@ -1,4 +1,3 @@
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
 using System.Collections.Generic;
 using UnityEngine.InputSystem;
 
@@ -65,4 +64,3 @@ public static InputControlScheme WithName(this InputControlScheme controlScheme,
         return new InputControlScheme(name, controlScheme.deviceRequirements, controlScheme.bindingGroup);
     }
 }
-#endif

Assets/Tests/InputSystem.Editor/UIToolkitBaseTestWindow.cs

@@ -1,6 +1,6 @@
 // UITK TreeView is not supported in earlier versions
 // Therefore the UITK version of the InputActionAsset Editor is not available on earlier Editor versions either.
-#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
+#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER
 
 using NUnit.Framework;
 using System;

Assets/Tests/InputSystem.Editor/Unity.InputSystem.Tests.Editor.asmdef

@@ -21,12 +21,6 @@
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
     ],
-    "versionDefines": [
-        {
-            "name": "Unity",
-            "expression": "2022.3",
-            "define": "UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS"
-        }
-    ],
+    "versionDefines": [],
     "noEngineReferences": false
 }

Assets/Tests/InputSystem/CorePerformanceTests.cs

@@ -999,10 +999,8 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt
 
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Disable the project wide actions actions to avoid performance impact.
         InputSystem.actions?.Disable();
-#endif
 
         Measure.Method(() =>
         {
@@ -1041,10 +1039,8 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt
             .Run();
 
 
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Re-enable the project wide actions actions.
         InputSystem.actions?.Enable();
-#endif
         return;
 
         void MethodToMeasure(Gamepad g)

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -35,9 +35,7 @@ partial class CoreTests
     [TestCase(InputFeatureNames.kParanoidReadValueCachingChecks)]
     [TestCase(InputFeatureNames.kDisableUnityRemoteSupport)]
     [TestCase(InputFeatureNames.kRunPlayerUpdatesInEditMode)]
-    #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
     [TestCase(InputFeatureNames.kUseIMGUIEditorForAssets)]
-    #endif
     public void Settings_ShouldStoreSettingsAndFeatureFlags(string featureName)
     {
         using (var settings = Scoped.Object(InputSettings.CreateInstance<InputSettings>()))
@@ -713,10 +711,8 @@ public void Actions_CanTargetMultipleControls()
     [Category("Actions")]
     public void Actions_CanTargetSameControlWithMultipleActions()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Prevent these actions appearing in the `InputActionTrace`
-#endif
 
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
@@ -3681,10 +3677,8 @@ public void Actions_CanCreateActionsWithoutAnActionMap()
     [Category("Actions")]
     public void Actions_CanCreateActionAssetWithMultipleActionMaps()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Prevent these actions appearing in the `InputActionTrace`
-#endif
 
         var asset = ScriptableObject.CreateInstance<InputActionAsset>();
 
@@ -3935,10 +3929,8 @@ public void Actions_CanByPassControlActuationChecks_UsingPasshtroughAction()
     [Category("Actions")]
     public void Actions_WithMultipleBoundControls_DriveInteractionsFromControlWithGreatestActuation()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Prevent these actions appearing in the `InputActionTrace`
-#endif
 
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
@@ -4227,10 +4219,8 @@ public void Actions_WithMultipleBoundControls_ProcessesInteractionsOnAllActiveBi
     [Category("Actions")]
     public void Actions_WithMultipleBoundControls_CanHandleInteractionsThatTriggerOnlyOnButtonRelease()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Prevent these actions appearing in the `InputActionTrace`
-#endif
 
         var keyboard = InputSystem.AddDevice<Keyboard>();
         var gamepad = InputSystem.AddDevice<Gamepad>();
@@ -4762,10 +4752,8 @@ public void Actions_CanRecordActions_AndReadValueAsObject()
     [Category("Actions")]
     public void Actions_CanRecordAllActionsInTheSystem()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Prevent these actions appearing in the `InputActionTrace`
-#endif
 
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
@@ -5289,10 +5277,8 @@ public void Actions_NameInJsonIsSetToEmptyString_IfCreatedFromObjectWithNullName
     [Category("Actions")]
     public void Actions_CanQueryAllEnabledActions()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Remove from `ListEnabledActions`
-#endif
 
         var action = new InputAction(binding: "<Gamepad>/leftStick");
         action.Enable();
@@ -5566,11 +5552,9 @@ private InputActionMap CreateSingletonAction()
     [TestCaseSource(typeof(ModificationCases))]
     public void Actions_CanHandleModification(Modification modification, IInputActionCollection2 actions)
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable();
         InputActionState.DestroyAllActionMapStates(); // Required for `onActionChange` to report correct number of changes
-#endif
 
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
@@ -6458,11 +6442,9 @@ public void Actions_WhenDeviceIsRemoved_ReadingValueInActionListenersWillNotThro
     [Category("Actions")]
     public void Actions_WhenDeviceIsRemoved_DeviceIsRemovedFromDeviceMask()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable();
         InputActionState.DestroyAllActionMapStates(); // Required for `onActionChange` to report correct number of changes
-#endif
 
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
@@ -6606,11 +6588,9 @@ public void Actions_ControlsUpdate_WhenDeviceConfigurationChanges_AndControlIsNo
     [Category("Actions")]
     public void Actions_WhenControlsUpdate_NotificationIsTriggered_ButOnlyAfterBindingsHaveFirstBeenResolved()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable();
         InputActionState.DestroyAllActionMapStates(); // Required for `onActionChange` to report correct number of changes
- #endif
 
         var enabledAction = new InputAction("enabledAction", binding: "<Gamepad>/leftTrigger");
 
@@ -6668,11 +6648,9 @@ public void Actions_WhenControlsUpdate_NotificationIsTriggered_ButOnlyAfterBindi
     [Category("Actions")]
     public void Actions_WhenControlsUpdateInActionMap_NotificationIsTriggered()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable();
         InputActionState.DestroyAllActionMapStates(); // Required for `onActionChange` to report correct number of changes
-#endif
 
         var actionMap = new InputActionMap("map");
         actionMap.AddAction("action", binding: "<Gamepad>/leftTrigger");
@@ -6700,11 +6678,9 @@ public void Actions_WhenControlsUpdateInActionMap_NotificationIsTriggered()
     [Category("Actions")]
     public void Actions_WhenControlsUpdateInActionAsset_NotificationIsTriggered()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable();
         InputActionState.DestroyAllActionMapStates(); // Required for `onActionChange` to report correct number of changes
-#endif
 
         var asset = ScriptableObject.CreateInstance<InputActionAsset>();
         asset.name = "asset";
@@ -6890,10 +6866,8 @@ public void Actions_WhenInProgress_AddingAndRemovingUnusedDevice_DoesNotAffectAc
     [Category("Actions")]
     public void Actions_CanFindEnabledActions()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Remove from `ListEnabledActions`
-#endif
 
         var action1 = new InputAction(name: "a");
         var action2 = new InputAction(name: "b");
@@ -11872,10 +11846,8 @@ public void Actions_CanIterateOverActionsInMap()
     [Category("Actions")]
     public void Actions_CanUseTouchWithActions()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Prevent these actions appearing in the `InputActionTrace`
-#endif
 
         var touchscreen = InputSystem.AddDevice<Touchscreen>();
 
@@ -11947,10 +11919,8 @@ public void Actions_CanUseTouchWithActions()
     [Category("Actions")]
     public void Actions_CanDrivePointerInputFromTouchPenAndMouse()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Prevent these actions appearing in the `InputActionTrace`
-#endif
 
         // Give us known parameters for tap detection.
         InputSystem.settings.defaultTapTime = 0.5f;

Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs

@@ -865,10 +865,8 @@ public void Actions_CanPerformDoubleTapInteraction()
     [Category("Actions")]
     public void Actions_CanCustomizeButtonPressPointsOfInteractions()
     {
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         // Exclude project-wide actions from this test
         InputSystem.actions?.Disable(); // Prevent these actions appearing in the `InputActionTrace`
-#endif
 
         var gamepad = InputSystem.AddDevice<Gamepad>();