CHANGE: Split Runtime and Editor code into separate folders to prepare for Module migration

.yamato/wrench/pvp-exemptions.json

@@ -127,12 +127,20 @@
         },
         "PVP-92-3": {
           "errors": [
-            "InputSystem/Plugins/iOS/IOSGameController.cs: .Switch;",
-            "InputSystem/Plugins/Switch/SwitchProController.cs: .Switch\n",
-            "InputSystem/Plugins/Switch/SwitchProControllerHID.cs: .Switch.",
-            "InputSystem/Plugins/Switch/SwitchProControllerHID.cs: .Switch\n",
-            "InputSystem/Plugins/Switch/SwitchSupportHID.cs: .Switch\n",
-            "Documentation~/Gamepad.md: .Switch."
+            "Runtime/Plugins/iOS/IOSGameController.cs: .Switch;",
+            "Runtime/Plugins/Switch/SwitchProController.cs: .Switch\n",
+            "Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch.",
+            "Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch\n",
+            "Runtime/Plugins/Switch/SwitchSupportHID.cs: .Switch\n",
+            "Documentation~/Gamepad.md: .Switch.",
+            "InputSystem/Runtime/Plugins/iOS/IOSGameController.cs: .Switch",
+            "InputSystem/Runtime/Plugins/Switch/SwitchProController.cs: .Switch\n",
+            "InputSystem/Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch",
+            "InputSystem/Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch\n",
+            "InputSystem/Runtime/Plugins/Switch/SwitchSupportHID.cs: .Switch\n",
+            "InputSystem/Runtime/Plugins/iOS/IOSGameController.cs: .Switch;",
+            "InputSystem/Runtime/Plugins/iOS/IOSGameController.cs: .Switch\n",
+            "InputSystem/Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch."
           ]
         },
         "PVP-124-2": {

Assets/QA/Tests/XRDeviceActions/XRDeviceActions.asmdef

@@ -1,9 +1,9 @@
 {
     "name": "XRDeviceActions",
+    "rootNamespace": "",
     "references": [
-        "GUID:28d8685fae23c21419ef42894cb9b075",
-        "GUID:75469ad4d38634e559750d17036d5f7c",
-        "GUID:2bafac87e7f4b9b418d9448d219b01ab"
+        "GUID:2bafac87e7f4b9b418d9448d219b01ab",
+        "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Samples/InGameHints/Unity.InputSystem.InGameHints.asmdef

@@ -1,8 +1,9 @@
 {
     "name": "Unity.InputSystem.InGameHints",
+    "rootNamespace": "",
     "references": [
-        "GUID:75469ad4d38634e559750d17036d5f7c",
-        "GUID:2bafac87e7f4b9b418d9448d219b01ab"
+        "GUID:2bafac87e7f4b9b418d9448d219b01ab",
+        "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Samples/InputRecorder/Unity.InputSystem.Recorder.asmdef

@@ -1,15 +1,16 @@
 {
     "name": "Unity.InputSystem.Recorder",
+    "rootNamespace": "",
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": true,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": []
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/Samples/RebindingUI/Unity.InputSystem.RebindingUI.asmdef

@@ -1,15 +1,16 @@
 {
     "name": "Unity.InputSystem.RebindingUI",
+    "rootNamespace": "",
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [],
-    "versionDefines": []
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/Samples/UIvsGameInput/Unity.InputSystem.UIvsGameInput.asmdef

@@ -1,8 +1,9 @@
 {
     "name": "UnityEngine.InputSystem.Samples.UIvsGameInput",
+    "rootNamespace": "",
     "references": [
-        "GUID:75469ad4d38634e559750d17036d5f7c",
-        "GUID:2bafac87e7f4b9b418d9448d219b01ab"
+        "GUID:2bafac87e7f4b9b418d9448d219b01ab",
+        "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Samples/Visualizers/Unity.InputSystem.Visualizers.asmdef

@@ -1,15 +1,16 @@
 {
     "name": "InputSystem.Samples.Visualizers",
+    "rootNamespace": "",
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": true,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": []
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/Tests/InputSystem/APIVerificationTests.cs

@@ -12,8 +12,8 @@
 using UnityEngine.InputSystem.LowLevel;
 using HtmlAgilityPack;
 using UnityEngine.InputSystem.DualShock;
-using UnityEngine.InputSystem.Editor;
 using UnityEngine;
+using UnityEngine.InputSystem.Editor;
 using UnityEngine.InputSystem.iOS.LowLevel;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.TestTools;
@@ -212,12 +212,12 @@ internal static bool IgnoreTypeForDocsByNamespace(string @namespace)
 
     [Test]
     [Category("API")]
-    [TestCase("Keyboard", "Devices/Precompiled/FastKeyboard.cs")]
-    [TestCase("Mouse", "Devices/Precompiled/FastMouse.cs")]
-    [TestCase("Touchscreen", "Devices/Precompiled/FastTouchscreen.cs")]
+    [TestCase("Keyboard", "InputSystem/Runtime/Devices/Precompiled/FastKeyboard.cs")]
+    [TestCase("Mouse", "InputSystem/Runtime/Devices/Precompiled/FastMouse.cs")]
+    [TestCase("Touchscreen", "InputSystem/Runtime/Devices/Precompiled/FastTouchscreen.cs")]
     public void API_PrecompiledLayoutsAreUpToDate(string layoutName, string filePath)
     {
-        var fullPath = "Packages/com.unity.inputsystem/InputSystem/" + filePath;
+        var fullPath = "Packages/com.unity.inputsystem/" + filePath;
         var existingCode = File.ReadAllText(fullPath);
 
         // May be a git checkout with CRLF auto-conversion on. Strip all '\r' characters.
@@ -958,7 +958,7 @@ public void API_DocumentationManualDoesNotHaveMissingOrUnusedImages()
     [Category("API")]
     public void API_DefaultInputActionsClassIsUpToDate()
     {
-        const string assetFile = "Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/DefaultInputActions.inputactions";
+        const string assetFile = "Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/PlayerInput/DefaultInputActions.inputactions";
         Assert.That(File.Exists(assetFile), Is.True);
 
         var actions = new DefaultInputActions();

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -334,12 +334,12 @@ public void Editor_DomainReload_CanRemoveDevicesDuringDomainReload()
         InputSystem.AddDevice<Keyboard>(); // just to make sure keyboard stays as-is
 
         currentTime = 1;
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
 
         runtime.ReportInputDeviceRemoved(device);
 
         currentTime = 2;
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
 
         InputSystem.Update();
 
@@ -2826,10 +2826,10 @@ public void Editor_InputEventsOccurringWhileGoingIntoPlayMode_AreDiscarded()
 
         // We need to actually pass time and have a non-zero start time for this to work.
         currentTime = 1;
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
         InputSystem.QueueStateEvent(mouse, new MouseState { position = new Vector2(234, 345) });
         currentTime = 2;
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
 
         InputSystem.Update();
 
@@ -2919,8 +2919,8 @@ public void Editor_InitializeInEditor_EnablesProjectWideActions()
             Assert.That(InputSystem.actions.enabled, Is.True);
 
             // Calling exit play mode callbacks will disable them
-            InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
-            InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
+            InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
+            InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
 
             Assert.That(InputSystem.actions.enabled, Is.False);
 
@@ -2931,8 +2931,8 @@ public void Editor_InitializeInEditor_EnablesProjectWideActions()
             // `InputSystem.InitializeInEditor()` is called. Before this test was introduced, project-wide actions were
             // enabled after entering play mode again which would lead to a different behavior than Player
             // builds.
-            InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
-            InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
+            InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
+            InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
 
             Assert.That(InputSystem.actions.enabled, Is.False);
         }
@@ -2950,14 +2950,14 @@ public void Editor_LeavingPlayMode_DestroysAllActionStates()
         InputSystem.AddDevice<Gamepad>();
 
         // Enter play mode.
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
 
         // This simulates enabling project-wide actions, which is done before just before entering play mode,
         // called from InputSystem.InitializeInEditor().
         if (InputSystem.actions)
             InputSystem.actions.Enable();
 
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
 
         DisableProjectWideActions();
 
@@ -2969,8 +2969,8 @@ public void Editor_LeavingPlayMode_DestroysAllActionStates()
         Assert.That(InputSystem.manager.m_StateChangeMonitors[0].count, Is.EqualTo(1));
 
         // Exit play mode.
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
 
         Assert.That(InputActionState.s_GlobalState.globalList.length, Is.Zero);
         // Won't get removed, just cleared.
@@ -2984,8 +2984,8 @@ public void Editor_LeavingPlayMode_RemovesAllInputUsersAndStopsListeningForUnpai
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         // Enter play mode.
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
 
         var user = InputUser.PerformPairingWithDevice(gamepad);
         ++InputUser.listenForUnpairedDeviceActivity;
@@ -2995,8 +2995,8 @@ public void Editor_LeavingPlayMode_RemovesAllInputUsersAndStopsListeningForUnpai
         Assert.That(InputUser.all, Has.Count.EqualTo(1));
 
         // Exit play mode.
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
 
         Assert.That(user.valid, Is.False);
         Assert.That(InputUser.all, Has.Count.Zero);
@@ -3022,7 +3022,7 @@ public void Editor_LeavingPlayMode_ReenablesAllDevicesTemporarilyDisabledDueToFo
 
         Assert.That(gamepad.enabled, Is.False);
 
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
 
         Assert.That(gamepad.enabled, Is.True);
         Assert.That(gamepad.disabledWhileInBackground, Is.False);
@@ -3092,15 +3092,15 @@ private void AssertAssetIsUnmodifiedAfterExitingPlayMode(Action<InputActionAsset
         AssetDatabase.TryGetGUIDAndLocalFileIdentifier(asset, out var assetGuid, out long _);
 
         // Enter play mode.
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
 
         asset = AssetDatabase.LoadAssetAtPath<InputActionAsset>(m_TestAssetPath);
         action?.Invoke(asset);
 
         // Exit play mode.
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
 
         var actualAsset = AssetDatabase.LoadAssetAtPath<InputActionAsset>(m_TestAssetPath);
         Assert.That(actualAsset.ToJson(), Is.EqualTo(originalJson), message);

Assets/Tests/InputSystem/CoreTests_ProjectWideActions.cs

@@ -163,7 +163,7 @@ public void ProjectWideActions_CanEnableCurrentActionMapOfPlayerInput(string act
         Assert.That(ReferenceEquals(playerInput.actions, InputSystem.actions));
 
 #if UNITY_EDITOR
-        InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
 #endif
 
         // This makes sure to call PlayerInput.OnEnable()
@@ -180,7 +180,7 @@ public void ProjectWideActions_CanEnableCurrentActionMapOfPlayerInput(string act
         // We do this on the editor to make sure project-wide actions maintain the enabled state
         // after entering PlayMode.
 #if UNITY_EDITOR
-        InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
+        InputSystemEditorInitializer.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
         Assert.That(playerInput.actions.enabled, Is.EqualTo(expectedResult));
 #endif
 

Assets/Tests/InputSystem/CoreTests_Remoting.cs

@@ -268,13 +268,8 @@ public void Remote_ResettingDevice_WillSendChangeToRemotes()
     public void Remote_CanConnectInputSystemsOverEditorPlayerConnection()
     {
 #if UNITY_EDITOR
-        // In the editor, RemoteInputPlayerConnection is a scriptable singleton. Creating multiple instances of it
-        // will cause an error messages - but will work nevertheless, so we expect those errors to let us run the test.
-        // We call RemoteInputPlayerConnection.instance once to make sure that we an instance is created, and we get
-        // a deterministic number of two errors.
-        var instance = RemoteInputPlayerConnection.instance;
-        UnityEngine.TestTools.LogAssert.Expect(LogType.Error, "ScriptableSingleton already exists. Did you query the singleton in a constructor?");
-        UnityEngine.TestTools.LogAssert.Expect(LogType.Error, "ScriptableSingleton already exists. Did you query the singleton in a constructor?");
+        // Ensure the singleton is initialized deterministically in editor.
+        _ = RemoteInputPlayerConnection.instance;
 #endif
         var connectionToEditor = ScriptableObject.CreateInstance<RemoteInputPlayerConnection>();
         var connectionToPlayer = ScriptableObject.CreateInstance<RemoteInputPlayerConnection>();

Assets/Tests/InputSystem/Plugins/UnityRemoteTests.cs

@@ -10,6 +10,12 @@
 
 internal class UnityRemoteTests : CoreTestsFixture
 {
+    public override void Setup()
+    {
+        base.Setup();
+        runtime.onUnityRemoteMessage = UnityRemoteSupport.GetMessageHandlerForTesting();
+    }
+
     public override void TearDown()
     {
         UnityRemoteSupport.ResetGlobalState();

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

@@ -10,7 +10,8 @@
         "UnityEditor.TestRunner",
         "Unity.PerformanceTesting",
         "Unity.Coding.Editor",
-        "Unity.InputSystem.ForUI"
+        "Unity.InputSystem.ForUI",
+        "Unity.InputSystem.ForUI.Editor"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Tests/Samples/Unity.InputSystem.Samples.Tests.asmdef

@@ -1,5 +1,6 @@
 {
     "name": "Unity.InputSystem.Samples.Tests",
+    "rootNamespace": "",
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c",
         "GUID:dc04f38471c3a459fb4d31124ee9127d",
@@ -21,5 +22,6 @@
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
     ],
-    "versionDefines": []
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Assets/Tools/RegeneratePrecompiledLayouts.cs

@@ -48,7 +48,7 @@
         [MenuItem("QA Tools/Regenerate Precompiled Layouts", priority = 20)]
         private static void GeneratePrecompiledLayouts()
         {
-            GeneratePrecompiledLayouts("Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled");
+            GeneratePrecompiledLayouts("Packages/com.unity.inputsystem/InputSystem/Runtime/Devices/Precompiled");
         }
     }
 }