MERGE: develop => stable

Author: andrew-oc

.yamato/upm-ci.yml

@@ -108,7 +108,7 @@ build_android_{{ editor.version }}_{{ backend.name }}:
   name: Build Tests on {{ editor.version }} on android {{ backend.name }}
   agent:
       type: Unity::VM
-      image: mobile/android-execution-base:stable
+      image: mobile/android-package-ci-win:latest
       flavor: b1.xlarge
   commands:
     - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
@@ -127,7 +127,7 @@ run_android_{{ editor.version }}_{{ backend.name }}:
   name: Run Tests on {{ editor.version }} on android {{ backend.name }}
   agent:
       type: Unity::mobile::shield
-      image: mobile/android-execution-base:stable
+      image: mobile/android-package-ci-win:latest
       flavor: b1.medium
   # Skip repository cloning
   skip_checkout: true
@@ -184,6 +184,8 @@ publish:
     type: Unity::VM
     image: package-ci/win10:stable
     flavor: b1.large
+  variables:
+    UPMCI_ENABLE_PACKAGE_SIGNING: 1
   commands:
     - mv ./Assets/Samples ./Packages/com.unity.inputsystem
     - mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.1.1
+//     version 1.2.0
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -17,7 +17,7 @@
 
 namespace UnityEngine.InputSystem.Samples.InGameHints
 {
-    public partial class @InGameHintsActions: IInputActionCollection2, IDisposable
+    public partial class @InGameHintsActions : IInputActionCollection2, IDisposable
     {
         public InputActionAsset asset { get; }
         public @InGameHintsActions()
@@ -315,14 +315,12 @@ public void Disable()
         {
             asset.Disable();
         }
-
         public IEnumerable<InputBinding> bindings => asset.bindings;
 
         public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false)
         {
             return asset.FindAction(actionNameOrId, throwIfNotFound);
         }
-
         public int FindBinding(InputBinding bindingMask, out InputAction action)
         {
             return asset.FindBinding(bindingMask, out action);

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.1.1
+//     version 1.2.0
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -15,7 +15,7 @@
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Utilities;
 
-public partial class @SimpleControls: IInputActionCollection2, IDisposable
+public partial class @SimpleControls : IInputActionCollection2, IDisposable
 {
     public InputActionAsset asset { get; }
     public @SimpleControls()
@@ -210,14 +210,12 @@ public void Disable()
     {
         asset.Disable();
     }
-
     public IEnumerable<InputBinding> bindings => asset.bindings;
 
     public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false)
     {
         return asset.FindAction(actionNameOrId, throwIfNotFound);
     }
-
     public int FindBinding(InputBinding bindingMask, out InputAction action)
     {
         return asset.FindBinding(bindingMask, out action);

Assets/Tests/InputSystem/APIVerificationTests.cs

@@ -156,22 +156,6 @@ public void API_MethodReturnTypesAreNotIntPtr()
         Assert.That(intptrMethods, Is.Empty);
     }
 
-    [Test]
-    [Category("API")]
-    [TestCase(typeof(InputControl))]
-    [TestCase(typeof(IInputInteraction))]
-    [TestCase(typeof(InputBindingComposite))]
-    [TestCase(typeof(InputProcessor))]
-    public void API_TypesCreatedByReflectionHavePreserveAttribute(Type type)
-    {
-        var types = type.Assembly.GetTypes().Where(t => type.IsAssignableFrom(t)).Concat(typeof(APIVerificationTests).Assembly.GetTypes().Where(t => type.IsAssignableFrom(t)));
-        Assert.That(types, Is.Not.Empty);
-        var typesWithoutPreserveAttribute =
-            types.Where(t => !t.CustomAttributes.Any(a => a.AttributeType.Name.Contains("PreserveAttribute")))
-                .Where(t => !IgnoreTypeWithoutPreserveAttribute(t));
-        Assert.That(typesWithoutPreserveAttribute, Is.Empty);
-    }
-
     [Test]
     [Category("API")]
     public void API_MethodParameterTypesAreNotIntPtr()
@@ -427,23 +411,6 @@ private static bool IgnoreMethodForDocs(MethodDefinition method)
         return false;
     }
 
-    private bool IgnoreTypeWithoutPreserveAttribute(Type type)
-    {
-        // Precompiled layouts are not created through reflection and thus don't need [Preserve].
-        if (type == typeof(FastKeyboard)
-            || type == typeof(FastMouse)
-            || type == typeof(FastTouchscreen)
-            || type == typeof(FastDualShock4GamepadHID)
-#if UNITY_EDITOR || UNITY_IOS || UNITY_TVOS
-            // iOS Step Counter is created from C# code
-            || type == typeof(iOSStepCounter)
-#endif
-        )
-            return true;
-
-        return false;
-    }
-
     #if HAVE_DOCTOOLS_INSTALLED
     ////TODO: move this to a fixture setup so that it runs *once* for all API checks in a test run
     private static string GenerateDocsDirectory(out string log)

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -2096,7 +2096,6 @@ public void Actions_WithMultipleBoundControls_DriveInteractionsFromControlWithGr
         }
     }
 
-    [Preserve]
     private class ReleaseOnlyTestInteraction : IInputInteraction<float>
     {
         private bool m_WaitingForRelease;
@@ -3465,7 +3464,6 @@ public void Actions_IncompatibleProcessorIsIgnored()
     }
 
     // ReSharper disable once ClassNeverInstantiated.Local
-    [Preserve]
     private class ConstantVector2TestProcessor : InputProcessor<Vector2>
     {
         public override Vector2 Process(Vector2 value, InputControl control)
@@ -3948,7 +3946,6 @@ public void Actions_CanFindEnabledActions()
     }
 
     // ReSharper disable once ClassNeverInstantiated.Local
-    [Preserve]
     private class TestInteraction : IInputInteraction
     {
 #pragma warning disable CS0649
@@ -6287,7 +6284,6 @@ public void Actions_RegisteringExistingCompositeUnderNewName_CreatesAlias()
     #endif // UNITY_EDITOR
 
     #pragma warning disable CS0649
-    [Preserve]
     private class CompositeWithParameters : InputBindingComposite<float>
     {
         public int intParameter;
@@ -6868,7 +6864,6 @@ public void Actions_CanCreateComposite_WithPartsBeingOutOfOrder()
         }
     }
 
-    [Preserve]
     private class LogInteraction : IInputInteraction
     {
         public void Process(ref InputInteractionContext context)
@@ -7254,7 +7249,6 @@ public void Actions_CompositesInDifferentMapsTiedToSameControlsWork()
         LogAssert.NoUnexpectedReceived();
     }
 
-    [Preserve]
     private class CompositeWithVector2Part : InputBindingComposite<Vector2>
     {
         [InputControlAttribute(layout = "Vector2")]
@@ -7288,7 +7282,6 @@ public void Actions_CanCreateCompositeWithVector2PartBinding()
         }
     }
 
-    [Preserve]
     private class CompositeAskingForSourceControl : InputBindingComposite<float>
     {
         [InputControl(layout = "Button")]
@@ -8330,28 +8323,27 @@ public void Actions_ExceptionsInCallbacksAreCaughtAndLogged()
         map.actionTriggered += ctx => { throw new InvalidOperationException("TEST EXCEPTION FROM MAP"); };
         action.Enable();
 
+        LogAssert.Expect(LogType.Exception, new Regex(".*TEST EXCEPTION FROM MAP.*"));
         LogAssert.Expect(LogType.Error,
             new Regex(
                 ".*InvalidOperationException while executing 'started' callbacks of 'testMap'"));
-        LogAssert.Expect(LogType.Exception, new Regex(".*TEST EXCEPTION FROM MAP.*"));
 
+        LogAssert.Expect(LogType.Exception, new Regex(".*TEST EXCEPTION FROM ACTION.*"));
         LogAssert.Expect(LogType.Error,
             new Regex(
                 ".*InvalidOperationException while executing 'performed' callbacks of 'testMap/testAction.*'"));
-        LogAssert.Expect(LogType.Exception, new Regex(".*TEST EXCEPTION FROM ACTION.*"));
 
+        LogAssert.Expect(LogType.Exception, new Regex(".*TEST EXCEPTION FROM MAP.*"));
         LogAssert.Expect(LogType.Error,
             new Regex(
                 ".*InvalidOperationException while executing 'performed' callbacks of 'testMap'"));
-        LogAssert.Expect(LogType.Exception, new Regex(".*TEST EXCEPTION FROM MAP.*"));
 
         InputSystem.QueueStateEvent(gamepad, new GamepadState().WithButton(GamepadButton.South));
         InputSystem.Update();
 
         LogAssert.NoUnexpectedReceived();
     }
 
-    [Preserve]
     class TestInteractionCheckingDefaultState : IInputInteraction
     {
         public void Process(ref InputInteractionContext context)
@@ -8800,6 +8792,41 @@ public void Actions_CanResetAction()
         }
     }
 
+    // Corresponds to bug report ticket 1370732.
+    [Test]
+    [Category("Actions")]
+    public void Actions_ResetShouldPreserveEnabledState__IfResetWhileInDisabledState()
+    {
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        InputSystem.settings.defaultDeadzoneMin = 0;
+        InputSystem.settings.defaultDeadzoneMax = 1;
+
+        var action = new InputAction(type: InputActionType.Value, binding: "<Gamepad>/leftStick");
+        action.Enable();
+        Assert.That(action.enabled, Is.True);
+
+        action.Disable();
+        Assert.That(action.enabled, Is.False);
+
+        action.Reset();
+        Assert.That(action.enabled, Is.False);
+
+        action.Enable();
+        Assert.That(action.enabled, Is.True);
+
+        using (var trace = new InputActionTrace(action))
+        {
+            Set(gamepad.leftStick, new Vector2(0.2f, 0.3f));
+
+            Assert.That(action.inProgress, Is.True);
+            Assert.That(action.ReadValue<Vector2>(), Is.EqualTo(new Vector2(0.2f, 0.3f)));
+            Assert.That(trace,
+                Started(action, value: new Vector2(0.2f, 0.3f))
+                    .AndThen(Performed(action, value: new Vector2(0.2f, 0.3f))));
+        }
+    }
+
     private class MonoBehaviourWithActionProperty : MonoBehaviour
     {
         public InputActionProperty actionProperty;

Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using NUnit.Framework;
+using NUnit.Framework.Constraints;
 using UnityEngine;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Interactions;
@@ -92,7 +93,6 @@ public void Actions_CanGetCompletionPercentageOfTimeoutOnInteraction()
         Assert.That(multiTapAction.GetTimeoutCompletionPercentage(), Is.EqualTo(1).Within(0.0001));
     }
 
-    [Preserve]
     class InteractionThatOnlyPerforms : IInputInteraction<float>
     {
         // Get rid of unused field warning.
@@ -743,7 +743,6 @@ public void Actions_CanCustomizeButtonPressPointsOfInteractions()
         }
     }
 
-    [Preserve]
     private class CancelingTestInteraction : IInputInteraction
     {
         public void Process(ref InputInteractionContext context)
@@ -795,4 +794,21 @@ public void Actions_ValueIsDefaultWhenActionIsCanceled()
         Assert.That(canceledCount, Is.EqualTo(1));
         Assert.That(canceledValue, Is.EqualTo(0.0));
     }
+
+    // https://fogbugz.unity3d.com/f/cases/1354098/
+    [Test]
+    [Category("Actions")]
+    public void Actions_DoesNotThrowWhenDeviceIsDisconnectedWhileControlIsPressed()
+    {
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        var action = new InputAction("Action",
+            binding: "<Gamepad>/buttonSouth",
+            interactions: "Press,Press"); // this bug occurs when there are multiple interactions on a binding
+        action.Enable();
+
+        Press(gamepad.buttonSouth);
+
+        Assert.That(() => InputSystem.RemoveDevice(gamepad), Throws.Nothing);
+    }
 }

Assets/Tests/InputSystem/CoreTests_Controls.cs

@@ -1144,7 +1144,6 @@ public void Controls_CanTurnControlPathIntoHumanReadableText_UsingDisplayNamesFr
         Assert.That(InputControlPath.ToHumanReadableString("<Keyboard>/a", control: Keyboard.current), Is.EqualTo("Q [Keyboard]"));
     }
 
-    [Preserve]
     private class DeviceWithoutAnyControls : InputDevice
     {
     }