Skip to content

Commit 327126d

Browse files
committed
making it work on more recent versions of unity
1 parent 0927db0 commit 327126d

18 files changed

+62
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"UnityEngine.TestRunner",
66
"UnityEditor.TestRunner",
77
"Unity.InputSystem",
8+
"Unity.InputSystem.Editor",
89
"Unity.InputSystem.TestFramework"
910
],
1011
"includePlatforms": [

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"UnityEditor.TestRunner",
1212
"Unity.PerformanceTesting",
1313
"Unity.Coding.Editor",
14-
"Unity.InputSystem.ForUI"
14+
"Unity.InputSystem.ForUI",
15+
"Unity.InputSystem.ForUI.Editor"
1516
],
1617
"includePlatforms": [],
1718
"excludePlatforms": [],

Packages/com.unity.inputsystem/Editor.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/com.unity.inputsystem/Editor/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
[assembly: InternalsVisibleTo("Unity.InputSystem.Tests")]
99
[assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")]
1010
[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI")] // To avoid minor bump
11+
[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI.Editor")] // To avoid minor bump
1112

Packages/com.unity.inputsystem/Editor/EditorInitialization.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ static EditorInitialization()
99
{
1010
EditorHooks.m_SettingsProviderConfigKeyGetter = () => InputSettingsProvider.kEditorBuildSettingsConfigKey;
1111

12+
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
1213
EditorHooks.m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildSetter = (value) =>
1314
ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild = value;
1415
EditorHooks.m_ProjectWideActionsBuildProvideractionsToIncludeInPlayerBuildGetter = () =>
1516
ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild;
17+
#endif
1618

1719
EditorHooks.m_InputSettingsProviderForceReload = InputSettingsProvider.ForceReload;
1820

Packages/com.unity.inputsystem/Editor/Internal.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/com.unity.inputsystem/Editor/Plugins.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/com.unity.inputsystem/Editor/Plugins/InputForUI.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
using System.Runtime.CompilerServices;
2+
using UnityEngine.Scripting;
3+
4+
[assembly: InternalsVisibleTo("UnityEngine.InputForUIVisualizer")]
5+
[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI")]
6+
[assembly: InternalsVisibleTo("Unity.InputSystem.Tests")]
7+
[assembly: AlwaysLinkAssembly]

Packages/com.unity.inputsystem/Editor/Plugins/InputForUI/AssemblyInfo.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)