DRAFT: Split Runtime and Editor code into separate assemblies

Assets/QA/Tests/XRDeviceActions/XRDeviceActions.asmdef

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

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

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

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

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

Assets/Samples/ProjectWideActions/ProjectWideActions.asmdef

@@ -2,7 +2,8 @@
     "name": "ProjectWideActions",
     "rootNamespace": "",
     "references": [
-        "GUID:75469ad4d38634e559750d17036d5f7c"
+        "GUID:d46adbc216ac24e9a86f26d7a54b2384",
+        "GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

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

@@ -1,15 +1,17 @@
 {
     "name": "Unity.InputSystem.RebindingUI",
+    "rootNamespace": "",
     "references": [
-        "GUID:75469ad4d38634e559750d17036d5f7c"
+        "GUID:d46adbc216ac24e9a86f26d7a54b2384",
+        "GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
     ],
-    "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,10 @@
 {
     "name": "UnityEngine.InputSystem.Samples.UIvsGameInput",
+    "rootNamespace": "",
     "references": [
-        "GUID:75469ad4d38634e559750d17036d5f7c",
-        "GUID:2bafac87e7f4b9b418d9448d219b01ab"
+        "GUID:2bafac87e7f4b9b418d9448d219b01ab",
+        "GUID:d46adbc216ac24e9a86f26d7a54b2384",
+        "GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

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

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

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

@@ -6,7 +6,8 @@
         "UnityEditor.TestRunner",
         "Unity.InputSystem",
         "Unity.InputSystem.TestFramework",
-        "Unity.InputSystem.TestSupport"
+        "Unity.InputSystem.TestSupport",
+        "Unity.InputSystem.Editor"
     ],
     "includePlatforms": [
         "Editor"

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

@@ -2,7 +2,8 @@
     "name": "Unity.InputSystem.TestSupport",
     "rootNamespace": "",
     "references": [
-        "GUID:75469ad4d38634e559750d17036d5f7c"
+        "GUID:d46adbc216ac24e9a86f26d7a54b2384",
+        "GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Tests/InputSystem/APIVerificationTests.cs

@@ -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", "Runtime/Devices/Precompiled/FastKeyboard.cs")]
+    [TestCase("Mouse", "Runtime/Devices/Precompiled/FastMouse.cs")]
+    [TestCase("Touchscreen", "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.
@@ -800,7 +800,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/Runtime/Plugins/PlayerInput/DefaultInputActions.inputactions";
         Assert.That(File.Exists(assetFile), Is.True);
 
         var actions = new DefaultInputActions();

Assets/Tests/InputSystem/CoreTests_Analytics.cs

@@ -565,8 +565,8 @@ public void Analytics_ShouldReportBuildAnalytics_WhenHavingSettingsAssetWithCust
     [TestCase(InputSystemComponent.PlayerInputManager, typeof(PlayerInputManager))]
     [TestCase(InputSystemComponent.InputSystemUIInputModule, typeof(InputSystemUIInputModule))]
     [TestCase(InputSystemComponent.StandaloneInputModule, typeof(StandaloneInputModule))]
-    [TestCase(InputSystemComponent.VirtualMouseInput, typeof(VirtualMouseInput))]
-    [TestCase(InputSystemComponent.TouchSimulation, typeof(TouchSimulation))]
+    // [TestCase(InputSystemComponent.VirtualMouseInput, typeof(VirtualMouseInput))]
+    // [TestCase(InputSystemComponent.TouchSimulation, typeof(TouchSimulation))]
     [TestCase(InputSystemComponent.OnScreenButton, typeof(OnScreenButton))]
     [TestCase(InputSystemComponent.OnScreenStick, typeof(OnScreenStick))]
     [Category("Analytics")]

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -333,12 +333,12 @@
         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();
 
@@ -2632,7 +2632,7 @@
     [Category("Editor")]
     public void Editor_CanIconsForLayouts()
     {
-        const string kIconPath = "Packages/com.unity.inputsystem/InputSystem/Editor/Icons/";
+        const string kIconPath = "Packages/com.unity.inputsystem/Editor/Icons/";
         var skinPrefix = EditorGUIUtility.isProSkin ? "d_" : "";
         var scale = Mathf.Clamp((int)EditorGUIUtility.pixelsPerPoint, 0, 4);
         var scalePostFix = scale > 1 ? $"@{scale}x" : "";
@@ -2822,10 +2822,10 @@
 
         // 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();
 
@@ -2915,8 +2915,8 @@
             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);
 
@@ -2927,8 +2927,8 @@
             // `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);
         }
@@ -2946,14 +2946,14 @@
         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();
 
@@ -2965,8 +2965,8 @@
         Assert.That(InputSystem.s_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.
@@ -2980,8 +2980,8 @@
         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;
@@ -2991,8 +2991,8 @@
         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);
@@ -3017,7 +3017,7 @@
 
         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);
@@ -3087,15 +3087,15 @@
         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 @@
         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 @@
         // 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