MERGE: develop => stable

Author: andrew-oc

.yamato/config.metadata

@@ -1,7 +1,7 @@
 editors:
   - version: 2019.4
   - version: 2020.3
-  - version: 2021.1
+  - version: 2021.2
   - version: trunk
 platforms:
   - name: win

.yamato/upm-ci.yml

@@ -171,15 +171,17 @@ all_tests:
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}
     - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
     {% endfor %}
+    - .yamato/upm-ci.yml#publish_dryrun
   triggers:
     cancel_old_ci: true
     pull_requests:
       - targets:
           only:
             - "develop"
 
-publish:
-  name: Publish to Internal Registry
+{% for run in (1..2) %}
+publish{% cycle "", "_dryrun" %}:
+  name: Publish to Internal Registry {% cycle "", "(Dry Run)" %}
   agent:
     type: Unity::VM
     image: package-ci/win10:stable
@@ -192,8 +194,9 @@ publish:
     - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
-    - upm-ci package publish --package-path ./Packages/com.unity.inputsystem/
+    - upm-ci package publish --package-path ./Packages/com.unity.inputsystem/ {% cycle "", "--dry-run" %}
   artifacts:
     artifacts:
       paths:
         - "upm-ci~/packages/*.tgz"
+{% endfor %}

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.2.0
+//     version 1.3.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,12 +315,14 @@ 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.2.0
+//     version 1.3.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,12 +210,14 @@ 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

@@ -476,6 +476,9 @@ public void API_DocsDoNotHaveXMLDocErrors()
     [Test]
     [Category("API")]
     [Ignore("Still needs a lot of documentation work to happen")]
+    #if UNITY_EDITOR_OSX
+    [Explicit]     // Fails due to file system permissions on yamato, but works locally.
+    #endif
     #if !HAVE_DOCTOOLS_INSTALLED
     //[Ignore("Must install com.unity.package-manager-doctools package to be able to run this test")]
     #endif
@@ -567,6 +570,9 @@ public void API_PrecompiledLayoutsAreUpToDate(string layoutName, string filePath
 
     [Test]
     [Category("API")]
+    #if UNITY_EDITOR_OSX
+    [Explicit] // Fails due to file system permissions on yamato, but works locally.
+    #endif
     public void API_MonoBehavioursHaveHelpUrls()
     {
         // We exclude abstract MonoBehaviours as these can't show up in the Unity inspector.
@@ -766,6 +772,12 @@ public class TrackedPoseDriver : UnityEngine.MonoBehaviour
         public class Touchscreen : UnityEngine.InputSystem.Pointer, UnityEngine.InputSystem.LowLevel.IInputStateCallbackReceiver
     ")]
     [ScopedExclusionProperty("1.0.0", "UnityEngine.InputSystem.Editor", "public sealed class InputControlPathEditor : System.IDisposable", "public void OnGUI(UnityEngine.Rect rect);")]
+    // InputEventTrace.Resize() has a new parameter with a default value.
+    [ScopedExclusionProperty("1.0.0", "UnityEngine.InputSystem.LowLevel", "public sealed class InputEventTrace : System.Collections.Generic.IEnumerable<UnityEngine.InputSystem.LowLevel.InputEventPtr>, System.Collections.IEnumerable, System.IDisposable", "public bool Resize(long newBufferSize);")]
+    // filterNoiseOnCurrent is Obsolete since 1.3.0
+    [Property("Exclusions", @"1.0.0
+        public bool filterNoiseOnCurrent { get; set; }
+    ")]
     public void API_MinorVersionsHaveNoBreakingChanges()
     {
         var currentVersion = CoreTests.PackageJson.ReadVersion();

Assets/Tests/InputSystem/Assets/UITKTestSceneDocument.uxml

@@ -1,6 +1,8 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:Button text="Button" display-tooltip-when-elided="true" name="Button" focusable="true" style="justify-content: flex-start; height: 100%; width: 50%; align-items: stretch; left: auto; flex-grow: 1;" />
-    <ui:ScrollView name="ScrollView" style="flex-grow: 1; width: 50%; height: 100px; left: 50%; top: 0; flex-direction: column; flex-basis: auto; position: absolute;">
-        <ui:TextField picking-mode="Ignore" value="filler text" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&#10;" multiline="false" readonly="true" style="font-size: 50px; white-space: normal;" />
-    </ui:ScrollView>
+    <ui:VisualElement style="width: 640px; height: 480px;">
+        <ui:ScrollView name="ScrollView" style="flex-grow: 1; width: 50%; height: 100px; left: 50%; top: 0; flex-direction: column; flex-basis: auto; position: absolute;">
+            <ui:TextField picking-mode="Ignore" value="filler text" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&#10;" multiline="false" readonly="true" style="font-size: 50px; white-space: normal;" />
+        </ui:ScrollView>
+        <ui:Button text="Button" display-tooltip-when-elided="true" name="Button" focusable="true" style="justify-content: flex-start; height: 100%; width: 50%; align-items: stretch; left: auto; flex-grow: 1;" />
+    </ui:VisualElement>
 </ui:UXML>

Assets/Tests/InputSystem/CorePerformanceTests.cs

@@ -410,6 +410,62 @@ public void Performance_Rebinding_OneSuccessfulCycle()
             .Run();
     }
 
+    public enum LookupByName
+    {
+        CaseMatches,
+        CaseDoesNotMatch
+    }
+
+    [Test, Performance]
+    [Category("Performance")]
+    [TestCase(LookupByName.CaseMatches)]
+    [TestCase(LookupByName.CaseDoesNotMatch)]
+    public void Performance_LookupActionByName(LookupByName lookup)
+    {
+        const int kActionCount = 100;
+
+        var asset = ScriptableObject.CreateInstance<InputActionAsset>();
+        var map = asset.AddActionMap("map");
+        for (var n = 0; n < kActionCount; ++n)
+            map.AddAction("action" + n);
+
+        Measure.Method(() =>
+        {
+            var _ = asset[(lookup == LookupByName.CaseDoesNotMatch ? "ACTION" : "action") + (int)(kActionCount * 0.75f)];
+        })
+            .MeasurementCount(100)
+            .WarmupCount(5)
+            .Run();
+    }
+
+    [Test, Performance]
+    [Category("Performance")]
+    public void Performance_LookupActionByGuid()
+    {
+        const int kActionCount = 100;
+
+        InputAction actionToFind = null;
+
+        var asset = ScriptableObject.CreateInstance<InputActionAsset>();
+        var map = asset.AddActionMap("map");
+        for (var n = 0; n < kActionCount; ++n)
+        {
+            var action = map.AddAction("action" + n);
+            action.GenerateId();
+
+            if (n == (int)(kActionCount * 0.75f))
+                actionToFind = action;
+        }
+
+        Measure.Method(() =>
+        {
+            Assert.That(asset[actionToFind.id.ToString()], Is.SameAs(actionToFind));
+        })
+            .MeasurementCount(100)
+            .WarmupCount(5)
+            .Run();
+    }
+
     // We're hitting MatchesPrefix a lot from rebinding, so make sure it's performing reasonably well.
     [Test, Performance]
     [Category("Performance")]