Skip to content

Commit bf8738c

Browse files
committed
Remove Runtime and Editor assemblies but maintain code/folder
Essentially, the monolitch assembly Unity.InputSystem was added back. The folder structure was kept so that the Runtime code is decoupled from Editor dependencies. This will help us move into a module in trunk and helps doing backports in the future, as well as current forward ports until the team is all onboarded into trunk.
1 parent 246b3e0 commit bf8738c

File tree

1,298 files changed

+84
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,298 files changed

+84
-105
lines changed

Assets/QA/Tests/XRDeviceActions/XRDeviceActions.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"rootNamespace": "",
44
"references": [
55
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
7-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
87
],
98
"includePlatforms": [],
109
"excludePlatforms": [],

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"rootNamespace": "",
44
"references": [
55
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
7-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
87
],
98
"includePlatforms": [],
109
"excludePlatforms": [],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Unity.InputSystem.Recorder",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
66
],
77
"includePlatforms": [],
88
"excludePlatforms": [],

Assets/Samples/ProjectWideActions/ProjectWideActions.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "ProjectWideActions",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
6-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
76
],
87
"includePlatforms": [],
98
"excludePlatforms": [],

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "Unity.InputSystem.RebindingUI",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
6-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
76
],
87
"includePlatforms": [],
98
"excludePlatforms": [],

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"rootNamespace": "",
44
"references": [
55
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
7-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
87
],
98
"includePlatforms": [],
109
"excludePlatforms": [],

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "InputSystem.Samples.Visualizers",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
6-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
76
],
87
"includePlatforms": [],
98
"excludePlatforms": [],

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"UnityEditor.TestRunner",
77
"Unity.InputSystem",
88
"Unity.InputSystem.TestFramework",
9-
"Unity.InputSystem.TestSupport",
10-
"Unity.InputSystem.Editor"
9+
"Unity.InputSystem.TestSupport"
1110
],
1211
"includePlatforms": [
1312
"Editor"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "Unity.InputSystem.TestSupport",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
6-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
76
],
87
"includePlatforms": [],
98
"excludePlatforms": [],

Assets/Tests/InputSystem/APIVerificationTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
using UnityEngine.InputSystem.LowLevel;
1313
using HtmlAgilityPack;
1414
using UnityEngine.InputSystem.DualShock;
15-
using UnityEngine.InputSystem.Editor;
1615
using UnityEngine;
16+
using UnityEngine.InputSystem.Editor;
1717
using UnityEngine.InputSystem.iOS.LowLevel;
1818
using UnityEngine.InputSystem.Utilities;
1919
using UnityEngine.TestTools;
@@ -212,9 +212,9 @@ internal static bool IgnoreTypeForDocsByNamespace(string @namespace)
212212

213213
[Test]
214214
[Category("API")]
215-
[TestCase("Keyboard", "Runtime/Devices/Precompiled/FastKeyboard.cs")]
216-
[TestCase("Mouse", "Runtime/Devices/Precompiled/FastMouse.cs")]
217-
[TestCase("Touchscreen", "Runtime/Devices/Precompiled/FastTouchscreen.cs")]
215+
[TestCase("Keyboard", "InputSystem/Runtime/Devices/Precompiled/FastKeyboard.cs")]
216+
[TestCase("Mouse", "InputSystem/Runtime/Devices/Precompiled/FastMouse.cs")]
217+
[TestCase("Touchscreen", "InputSystem/Runtime/Devices/Precompiled/FastTouchscreen.cs")]
218218
public void API_PrecompiledLayoutsAreUpToDate(string layoutName, string filePath)
219219
{
220220
var fullPath = "Packages/com.unity.inputsystem/" + filePath;
@@ -958,7 +958,7 @@ public void API_DocumentationManualDoesNotHaveMissingOrUnusedImages()
958958
[Category("API")]
959959
public void API_DefaultInputActionsClassIsUpToDate()
960960
{
961-
const string assetFile = "Packages/com.unity.inputsystem/Runtime/Plugins/PlayerInput/DefaultInputActions.inputactions";
961+
const string assetFile = "Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/PlayerInput/DefaultInputActions.inputactions";
962962
Assert.That(File.Exists(assetFile), Is.True);
963963

964964
var actions = new DefaultInputActions();

0 commit comments

Comments
 (0)