Merge branch 'develop' into docs-processors

Author: ritamerkl

.yamato/analyze.yml

@@ -17,10 +17,7 @@ code_analyser:
     - upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2021.3
   triggers:
     cancel_old_ci: true
-    pull_requests:
-      - targets:
-          only:
-            - "develop"
+    expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")
   artifacts:
     UTR_Output.zip:
       paths:

.yamato/config.metadata

@@ -6,6 +6,8 @@ editors:
     run_tvos: false
   - version: 6000.1
     run_tvos: false
+  - version: 6000.2
+    run_tvos: false
   - version: trunk
     run_tvos: false    
 

.yamato/format.yml

@@ -12,7 +12,4 @@ check_formatting:
     - perl unity-meta/Tools/Format/format.pl Assets Packages --dry-run
   triggers:
     cancel_old_ci: true
-    pull_requests:
-      - targets:
-          only:
-            - "develop"
+    expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")

.yamato/test-samples.yml

@@ -14,10 +14,7 @@ test_sample_projects_{{ editor.version }}:
     - Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh 
   triggers:
     cancel_old_ci: true
-    pull_requests:
-      - targets:
-          only:
-            - "develop"
+    expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")
   artifacts:
     UTR_Output.zip:
       paths:

.yamato/upm-ci.yml

@@ -74,7 +74,6 @@ IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = 5
     #endregion
 
     [Test]
-    [Ignore("Instability, see ISXB-1284")]
     public void CanListActionMaps()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -88,7 +87,6 @@ public void CanListActionMaps()
     }
 
     [UnityTest]
-    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanCreateActionMap()
     {
         var button = m_Window.rootVisualElement.Q<Button>("add-new-action-map-button");
@@ -117,7 +115,6 @@ public IEnumerator CanCreateActionMap()
     }
 
     [UnityTest]
-    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanRenameActionMap()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -166,7 +163,6 @@ public IEnumerator CanRenameActionMap()
     }
 
     [UnityTest]
-    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanDeleteActionMap()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -195,7 +191,6 @@ public IEnumerator CanDeleteActionMap()
     }
 
     [UnityTest]
-    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanRenameAction()
     {
         var actionContainer = m_Window.rootVisualElement.Q("actions-container");
@@ -215,6 +210,8 @@ public IEnumerator CanRenameAction()
 
         // Click twice to start the rename
         SimulateClickOn(actionItem[1]);
+        yield return WaitForNotDirty();
+
         // If the item is already focused, don't click again
         if (!actionItem[1].IsFocused)
         {

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs

@@ -23,6 +23,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed an issue where an action with a name containing a slash "/" could not be found via `InputActionAsset.FindAction(string,bool)`. [ISXB-1306](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1306).
 - Fixed Gamepad stick up/down inputs that were not recognized in WebGL. [ISXB-1090](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1090)
 - Fixed reenabling the VirtualMouseInput component may sometimes lead to NullReferenceException. [ISXB-1096](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1096)
+- Fixed the default button press point not being respected in Editor (as well as some other Touchscreen properties). [ISXB-1152](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1152)
 - Fixed PlayerInput component automatically switching away from the default ActionMap set to 'None'.
 - Fixed a console error being shown when targeting visionOS builds in 2022.3.
 - Fixed a Tap Interaction issue with analog controls. The Tap interaction would keep re-starting after timeout. [ISXB-627](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-627)

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -9,7 +9,7 @@ While it's possible to have more than one Action Asset in a project, most projec
 
 The Input System's **project-wide actions** feature allows you to choose an individual Action Asset as being available project-wide, which means the actions within that asset are available more conveniently through the Input System API without needing to set up a reference to the Actions Asset.
 
-The Action Asset assigned as project-wide is also a [preloaded asset](https://docs.unity3d.com/ScriptReference/PlayerSettings.GetPreloadedAssets.html), loaded when your app starts up, and kept available until until it terminates.
+The Action Asset assigned as project-wide is also a [preloaded asset](https://docs.unity3d.com/ScriptReference/PlayerSettings.GetPreloadedAssets.html), loaded when your app starts up, and kept available until it terminates.
 
 Unless you have specific project requirements that require more than one Action Asset, the recommended workflow is to use a single Action Asset assigned as the project-wide actions, as described below.
 
@@ -40,7 +40,7 @@ When you create and assign default project-wide actions using the method describ
 
 These default actions mean that in many cases, you can start scripting with the Input System without any configuration by referring to the names of the default actions that are already configured for you. You can also rename and reconfigure the default actions, or delete these default configurations to suit your needs.
 
-If you’d like to delete all the default actions so that you can start from an empty configuration, you don’t need to delete the individual actions one-by-one. You can delete the each Action Map, which deletes all the Actions contained in the maps in one go.
+If you’d like to delete all the default actions so that you can start from an empty configuration, you don’t need to delete the individual actions one-by-one. You can delete each Action Map, which deletes all the Actions contained in the maps in one go.
 
 You can also delete all action maps, or reset all the actions back to the default values from the **more** (⋮) menu at the top right of the Input Actions section of the settings window, below the Project Settings window search field.
 

Packages/com.unity.inputsystem/Documentation~/ProjectWideActions.md

@@ -33,7 +33,7 @@ The Input System's default configuration comes with two Action Maps: "Player" an
 
 The "Player" Action Map defines several game-related actions such as "Move", "Look", "Jump" and "Attack" actions. The "UI" action map defines several user-interface-related actions such as "Navigate", "Submit" and "Cancel".
 
- Each each default action has bindings to several different types of Control. For example:
+ Each default action has bindings to several different types of Control. For example:
 
 - The "Move" action is bound to the "WSAD" keyboard keys and arrow keys, a gamepad stick, the primary 2D axis on an XR controller
 - The "Jump" action is bound to the space key, the "south" button on a gamepad, and the secondary button on an XR controller.
@@ -49,7 +49,7 @@ This workflow uses the following steps:
 
 1. Add the Input System "`using`" statement at the top of your script.
 2. Create variables to hold the Action references.
-3. In your Start method, find the and store the Action references.
+3. In your Start method, find and store the Action references.
 4. In your Update method, read the values from the Action references, and add your own code to respond accordingly.
 
 These steps are shown in the example script below:

Packages/com.unity.inputsystem/Documentation~/QuickStartGuide.md

@@ -4122,7 +4122,8 @@ internal void RestoreStateWithoutDevices(SerializedState state)
 
             if (m_Settings != null)
                 Object.DestroyImmediate(m_Settings);
-            m_Settings = state.settings;
+
+            settings = state.settings;
 
             #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
             // Note that we just reassign actions and never destroy them since always mapped to persisted asset