Merge branch 'develop' into isxb-656-fix-for-auto-schemes-switching-with-onscreen-components

Author: bmalrat

.github/pull_request_template.md

@@ -1,18 +1,22 @@
 ### Description
 
-_Please fill this section with a description what the pull request is trying to address._
+_Please fill this section with a description what the pull request is trying to address and what changes were made._
 
-### Changes made
 
-_Please write down a short description of what changes were made._
-
-### Testing
+### Testing status & QA
 
 _Please describe the testing already done by you and what testing you request/recommend QA to execute. If you used or created any testing project please link them here too for QA._
 
-### Risk
+### Overall Product Risks
+
+_Please rate the potential complexity and halo effect from low to high for the reviewers. Note down potential risks to specific Editor branches if any._
+
+- Complexity: 
+- Halo Effect: 
+
+### Comments to reviewers
 
-_Please describe the potential risks of your changes for the reviewers._
+_Please describe any additional information such as what to focus on, or historical info for the reviewers._
 
 ### Checklist
 

.yamato/config.metadata

@@ -36,31 +36,37 @@ platforms_nix:
     type: Unity::VM::osx
     image: package-ci/macos-13:default
     flavor: m1.mac
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
   - name: mac_standalone
     type: Unity::VM::osx
     image: package-ci/macos-13:default
     flavor: m1.mac
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
     runtime: StandaloneOSX
   - name: mac_standalone_il2cpp
     type: Unity::VM::osx
     image: package-ci/macos-13:default
     flavor: m1.mac
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
     runtime: StandaloneOSX
     scripting-backend: Il2Cpp
     installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
   - name: linux
     type: Unity::VM
     image: package-ci/ubuntu-20.04:v4.50.0
     flavor: b1.large
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
   - name: linux_standalone
     type: Unity::VM
     image: package-ci/ubuntu-20.04:v4.50.0
     flavor: b1.large
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
     runtime: StandaloneLinux64
   - name: linux_standalone_il2cpp
     type: Unity::VM
     image: package-ci/ubuntu-20.04:v4.50.0
     flavor: b1.large
+    instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
     runtime: StandaloneLinux64
     scripting-backend: Il2Cpp
     installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
@@ -72,4 +78,10 @@ ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0
 
 test_category: 
   - name: performance
-  - name: all
+  - name: all
+  
+instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0
+instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0
+
+instabilities_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
+instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0

.yamato/upm-ci.yml

@@ -34,6 +34,9 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem
+  after:
+    - {{ instabilities_install_win }}
+    - {{ instabilities_run_win }}  
   artifacts:
     UTR_Output.zip:
       paths:
@@ -72,6 +75,9 @@
     - mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" %} --suite=editor {% endif %} {% if platform.name == "linux" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem
+  after:
+    - {{ instabilities_install_nix }}
+    - {{ platform.instabilities_run }}
   artifacts:
     UTR_Output.zip:
       paths:
@@ -93,6 +99,9 @@ build_ios_{{ editor.version }}_{{ category.name }}:
     - {{ unity_downloader_install }}
     - unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --fast --wait
     - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
+  after:
+    - {{ instabilities_install_nix }}
+    - {{ instabilities_run_mac }}
   artifacts:
     players:
         paths:
@@ -113,7 +122,10 @@ run_ios_{{ editor.version }}_{{ category.name }}:
     - .yamato/upm-ci.yml#build_ios_{{ editor.version }}_{{ category.name }}
   commands:
     - {{ utr_install_nix }}
-    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem
+    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem 
+  after:
+    - {{ instabilities_install_nix }}
+    - {{ instabilities_run_mac }}
   artifacts:
     logs:
         paths:
@@ -131,6 +143,9 @@ build_tvos_{{ editor.version }}:
     - {{ unity_downloader_install }}
     - unity-downloader-cli -c Editor -c AppleTV -u {{ editor.version }} --fast --wait
     - ./utr --suite=playmode --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
+  after:
+    - {{ instabilities_install_nix }}
+    - {{ instabilities_run_mac }}
   artifacts:
     players:
         paths:
@@ -151,6 +166,9 @@ run_tvos_{{ editor.version }}:
   commands:
     - {{ utr_install_nix }}
     - ./utr --suite=playmode --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem
+  after:
+    - {{ instabilities_install_nix }}
+    - {{ instabilities_run_mac }}
   artifacts:
     logs:
         paths:
@@ -169,6 +187,9 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
     - {{ unity_downloader_install }}
     - unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --fast --wait
     - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository --performance-project-id=InputSystem
+  after:
+    - {{ instabilities_install_win }}
+    - {{ instabilities_run_win }}  
   artifacts:
     players:
         paths:
@@ -201,7 +222,9 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
   after:
     - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
     - if not exist build\test-results mkdir build\test-results
-    - powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt
+    - powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt  
+    - {{ instabilities_install_win }}
+    - {{ instabilities_run_win }}  
   # Set uploadable artifact paths
   artifacts:
     logs:

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.11.2
+//     version 1.11.3
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.11.2
+//     version 1.11.3
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Tests/InputSystem/CorePerformanceTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.LowLevel;
@@ -1100,4 +1101,103 @@ public void Performance_OptimizedControls_ReadingPose4kTimes(OptimizationTestTyp
     }
 
 #endif
+
+    #if UNITY_2022_3_OR_NEWER
+
+    // All the profiler markers in the package code.
+    // Needed for the tests below.
+    string[] allInputSystemProfilerMarkers =
+    {
+        "InputUpdate",
+        "InputSystem.onBeforeUpdate",
+        "InputSystem.onAfterUpdate",
+        "PreUpdate.NewInputUpdate",
+        "PreUpdate.InputForUIUpdate",
+        "FixedUpdate.NewInputFixedUpdate"
+    };
+
+    [PrebuildSetup(typeof(ProjectWideActionsBuildSetup))]
+    [PostBuildCleanup(typeof(ProjectWideActionsBuildSetup))]
+    [UnityTest, Performance]
+    [Category("Performance")]
+    public IEnumerator Performance_MeasureInputSystemFrameTimeWithProfilerMarkers_FPS()
+    {
+        var keyboard = InputSystem.AddDevice<Keyboard>();
+        var mouse = InputSystem.AddDevice<Mouse>();
+
+        var moveAction = InputSystem.actions.FindAction("Move");
+        var lookAction = InputSystem.actions.FindAction("Look");
+        var attackAction = InputSystem.actions.FindAction("Attack");
+        var jumpAction = InputSystem.actions.FindAction("Jump");
+        var sprintAction = InputSystem.actions.FindAction("Sprint");
+
+        int performedCallCount = 0;
+
+        moveAction.performed += context => {
+            performedCallCount++;
+        };
+
+        lookAction.performed += context => {
+            performedCallCount++;
+        };
+
+        attackAction.performed += context => {
+            performedCallCount++;
+        };
+
+        jumpAction.performed += context => {
+            performedCallCount++;
+        };
+
+        sprintAction.performed += context => {
+            performedCallCount++;
+        };
+
+        using (Measure.ProfilerMarkers(allInputSystemProfilerMarkers))
+        {
+            Press(keyboard.wKey, queueEventOnly: true);
+
+            for (int i = 0; i < 500; ++i)
+            {
+                if (i % 60 == 0)
+                {
+                    PressAndRelease(keyboard.aKey, queueEventOnly: true);
+                    PressAndRelease(keyboard.sKey, queueEventOnly: true);
+                    PressAndRelease(keyboard.dKey, queueEventOnly: true);
+
+                    PressAndRelease(keyboard.leftShiftKey, queueEventOnly: true);
+
+                    PressAndRelease(keyboard.spaceKey, queueEventOnly: true);
+                }
+
+                Click(mouse.leftButton, queueEventOnly: true);
+
+                //mouse movements for higher polling mice
+                for (int j = 0; j < 99; ++j)
+                {
+                    Move(mouse.position, new Vector2(i + j, i + j), queueEventOnly: true);
+                }
+
+                InputSystem.Update();
+
+                yield return null;
+            }
+        }
+    }
+
+    [PrebuildSetup(typeof(ProjectWideActionsBuildSetup))]
+    [PostBuildCleanup(typeof(ProjectWideActionsBuildSetup))]
+    [UnityTest, Performance]
+    [Category("Performance")]
+    public IEnumerator Performance_MeasureInputSystemFrameTimeWithProfilerMarkers_DoingNothing()
+    {
+        yield return Measure.Frames()
+            .WarmupCount(30)
+            .DontRecordFrametime()
+            .MeasurementCount(500)
+            .ProfilerMarkers(allInputSystemProfilerMarkers)
+            .Run();
+    }
+
+    #endif
 }

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -12405,99 +12405,4 @@ public void Actions_ActionMapDisabledDuringOnAfterSerialization()
         Assert.That(map.enabled, Is.True);
         Assert.That(map.FindAction("MyAction", true).enabled, Is.True);
     }
-
-    // ResetDevice wasn't properly clearly Composite key state, i.e. BindingState.pressTime
-    // https://jira.unity3d.com/browse/ISXB-746
-    [Test]
-    [TestCase(false)]
-    [TestCase(true)]
-    [Category("Actions")]
-    public void Actions_CompositeBindingResetWhenResetDeviceCalledWhileExecutingAction(bool useTwoModifierComposite)
-    {
-        var keyboard = InputSystem.AddDevice<Keyboard>();
-        bool actionPerformed;
-
-        // Enables "Modifier must be pressed first" behavior on all Composite Bindings
-        InputSystem.settings.shortcutKeysConsumeInput = true;
-
-        const string modifier1 = "<Keyboard>/shift";
-        const string modifier2 = "<Keyboard>/ctrl";
-        const string key = "<Keyboard>/F1";
-
-        var map = new InputActionMap();
-        var resetAction = map.AddAction("resetAction");
-
-        if (!useTwoModifierComposite)
-        {
-            resetAction.AddCompositeBinding("OneModifier")
-                .With("Modifier", modifier1)
-                .With("Binding", key);
-        }
-        else
-        {
-            resetAction.AddCompositeBinding("TwoModifiers")
-                .With("Modifier1", modifier1)
-                .With("Modifier2", modifier2)
-                .With("Binding", key);
-        }
-
-        resetAction.performed += (InputAction.CallbackContext ctx) =>
-        {
-            // Disable the Keyboard while action is being performed.
-            // This simulates an "OnFocusLost" event occurring while processing the Action, e.g. when switching primary displays or moving the main window
-            actionPerformed = true;
-            InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, false, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
-        };
-
-        map.Enable();
-
-        actionPerformed = false;
-        Press(keyboard.leftShiftKey);
-        Press(keyboard.leftCtrlKey);
-        Press(keyboard.f1Key);
-
-        Assert.IsTrue(actionPerformed);
-
-        // Re enable the Keyboard (before keys are released) and execute Action again
-        InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
-
-        actionPerformed = false;
-        Release(keyboard.leftShiftKey);
-        Release(keyboard.leftCtrlKey);
-        Release(keyboard.f1Key);
-
-        Press(keyboard.leftCtrlKey);
-        Press(keyboard.leftShiftKey);
-        Press(keyboard.f1Key);
-
-        Assert.IsTrue(actionPerformed);
-
-        actionPerformed = false;
-        Release(keyboard.leftCtrlKey);
-        Release(keyboard.leftShiftKey);
-        Release(keyboard.f1Key);
-
-        // Re enable the Keyboard (after keys are released) and execute Action one more time
-        InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
-
-        Press(keyboard.leftCtrlKey);
-        Press(keyboard.leftShiftKey);
-        Press(keyboard.f1Key);
-
-        Assert.IsTrue(actionPerformed);
-
-        actionPerformed = false;
-        Press(keyboard.leftShiftKey);
-        Press(keyboard.leftCtrlKey);
-        Press(keyboard.f1Key);
-
-        // Re enable the Keyboard (before keys are released) and verify Action isn't triggered when Key pressed first
-        InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
-
-        Press(keyboard.f1Key);
-        Press(keyboard.leftCtrlKey);
-        Press(keyboard.leftShiftKey);
-
-        Assert.IsFalse(actionPerformed);
-    }
 }