Fix: Fixed using the input system in il2cpp when managed stripping le… (#811)

Author: jechter

Assets/Tests/InputSystem/APIVerificationTests.cs

@@ -136,6 +136,17 @@ public void API_MethodReturnTypesAreNotIntPtr()
         Assert.That(intptrMethods, Is.Empty);
     }
 
+    [Test]
+    [Category("API")]
+    public void API_ControlTypesHavePreserveAttribute()
+    {
+        var controlType = typeof(InputControl);
+        var controlTypes = controlType.Assembly.GetTypes().Where(t => controlType.IsAssignableFrom(t));
+        Assert.That(controlTypes, Is.Not.Empty);
+        var controlTypesWithoutPreserveAttribute = controlTypes.Where(t => !t.CustomAttributes.Any(a => a.AttributeType.Name.Contains("PreserveAttribute")));
+        Assert.That(controlTypesWithoutPreserveAttribute, Is.Empty);
+    }
+
     [Test]
     [Category("API")]
     public void API_MethodParameterTypesAreNotIntPtr()

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -13,6 +13,7 @@ however, it has to be formatted properly to pass verification tests.
 
 - Don't pass events for null devices (for devices which have not been created) to `InputSystem.onEvent` callbacks.
 - Will close debugger input state windows, when the state is no longer valid instead of throwing exceptions.
+- Fixed using the input system in il2cpp when managed stripping level is set higher then "Low".
 - Device debugger window will still show when reading from specific controls throws exceptions.
 - Offsets and sizes for elements on Linux joysticks are now computed correctly.
 - Joysticks now have a deadzone processor on the stick itself.

Packages/com.unity.inputsystem/InputSystem/Controls/AnyKeyControl.cs

@@ -9,6 +9,7 @@ namespace UnityEngine.InputSystem.Controls
     /// returns 1.0; otherwise it returns 0.0.
     /// </summary>
     [InputControlLayout(hideInUI = true)]
+    [UnityEngine.Scripting.Preserve]
     public class AnyKeyControl : ButtonControl
     {
         ////TODO: wasPressedThisFrame and wasReleasedThisFrame

Packages/com.unity.inputsystem/InputSystem/Controls/AxisControl.cs

@@ -13,6 +13,7 @@ namespace UnityEngine.InputSystem.Controls
     /// Can optionally be configured to perform normalization.
     /// Stored as either a float, a short, a byte, or a single bit.
     /// </remarks>
+    [UnityEngine.Scripting.Preserve]
     public class AxisControl : InputControl<float>
     {
         public enum Clamp

Packages/com.unity.inputsystem/InputSystem/Controls/ButtonControl.cs

@@ -15,6 +15,7 @@ namespace UnityEngine.InputSystem.Controls
     /// doing so brings many benefits through allowing code to flexibly target buttons
     /// and axes the same way.
     /// </remarks>
+    [UnityEngine.Scripting.Preserve]
     public class ButtonControl : AxisControl
     {
         public float pressPoint;

Packages/com.unity.inputsystem/InputSystem/Controls/DiscreteButtonControl.cs

@@ -17,6 +17,7 @@ namespace UnityEngine.InputSystem.Controls
     /// the value 1 could indicate that the switch is moved to the left whereas 3 could indicate it is
     /// moved up.
     /// </remarks>
+    [Scripting.Preserve]
     public class DiscreteButtonControl : ButtonControl
     {
         /// <summary>

Packages/com.unity.inputsystem/InputSystem/Controls/DoubleControl.cs

@@ -5,6 +5,7 @@ namespace UnityEngine.InputSystem.Controls
     /// <summary>
     /// A control reading a <see cref="double"/>.
     /// </summary>
+    [Scripting.Preserve]
     public class DoubleControl : InputControl<double>
     {
         public DoubleControl()

Packages/com.unity.inputsystem/InputSystem/Controls/DpadControl.cs

@@ -15,9 +15,11 @@ namespace UnityEngine.InputSystem.Controls
     /// even if pressing diagonally, the vector will have a length of 1 (instead
     /// of reading something like <c>(1,1)</c> for example).
     /// </remarks>
+    [Scripting.Preserve]
     public class DpadControl : Vector2Control
     {
         [InputControlLayout(hideInUI = true)]
+        [Scripting.Preserve]
         internal class DpadAxisControl : AxisControl
         {
             public int component;

Packages/com.unity.inputsystem/InputSystem/Controls/InputControl.cs

@@ -99,6 +99,7 @@ namespace UnityEngine.InputSystem
     /// <seealso cref="InputControlPath"/>
     /// <seealso cref="InputStateBlock"/>
     [DebuggerDisplay("{DebuggerDisplay(),nq}")]
+    [Scripting.Preserve]
     public abstract class InputControl
     {
         /// <summary>
@@ -844,6 +845,7 @@ internal virtual void ClearProcessors()
     /// <typeparam name="TValue">Type of value captured by the control. Note that this does not mean
     /// that the control has to store data in the given value format. A control that captures float
     /// values, for example, may be stored in state as byte values instead.</typeparam>
+    [Scripting.Preserve]
     public abstract class InputControl<TValue> : InputControl
         where TValue : struct
     {

Packages/com.unity.inputsystem/InputSystem/Controls/InputControlLayoutAttribute.cs

@@ -1,4 +1,5 @@
 using System;
+using UnityEngine.Scripting;
 
 ////REVIEW: should this *not* be inherited? inheritance can lead to surprises