Merge 'develop' branch into 'joao/editor-runtime-split-for-module' branch

[josepmariapujol-unity]

Description

These are the changes that landed after joao/editor-runtime-split-for-module branch branched off from develop branch.

Files that had conflicts:

• CONFLICT (content): Merge conflict in Packages/com.unity.inputsystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml

• CONFLICT (modify/delete): Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs deleted in HEAD and modified in develop. Version develop of Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs left in tree.

• CONFLICT (modify/delete): Packages/com.unity.inputsystem/InputSystem/Plugins/UI/VirtualMouseInput.cs deleted in HEAD and modified in develop. Version develop of Packages/com.unity.inputsystem/InputSystem/Plugins/UI/VirtualMouseInput.cs left in tree.

Also, I fixed some metafiles (.meta) giving CI errors (Library/PackageCache/com.unity.inputsystem@7ab024b8f013/Editor/Settings/InputSettingsProvider.cs(467,33): error CS0246: The type or namespace name 'InputSettingsiOSProvider' could not be found (are you missing a using directive or an assembly reference?))

Steps:

1. Branched off from joao/editor-runtime-split-for-module branch
2. Name it input/merge-develop-branch
3. Merged develop into input/merge-develop-branch
4. Open PR to merge input/merge-develop-branch into joao/editor-runtime-split-for-module branch

Merge branch 'develop' into input/merge-develop-branch

JIRA: ISX-2474

Testing status & QA

Tested with 22.3 and 6.3LTS, in editor, build project, and gamepad:

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 any additional information such as what to focus on, or historical info for the reviewers.

Checklist

Before review:

• Changelog entry added.
  • Explains the change in Changed, Fixed, Added sections.
  • For API change contains an example snippet and/or migration example.
  • JIRA ticket linked, example (case %%). If it is a private issue, just add the case ID without a link.
  • Jira port for the next release set as "Resolved".
• Tests added/changed, if applicable.
  • Functional tests Area_CanDoX, Area_CanDoX_EvenIfYIsTheCase, Area_WhenIDoX_AndYHappens_ThisIsTheResult.
  • Performance tests.
  • Integration tests.
• Docs for new/changed API's.
  • Xmldoc cross references are set correctly.
  • Added explanation how the API works.
  • Usage code examples added.
  • The manual is updated, if needed.

During merge:

• Commit message for squash-merge is prefixed with one of the list:
  • NEW: ___.
  • FIX: ___.
  • DOCS: ___.
  • CHANGE: ___.
  • RELEASE: 1.1.0-preview.3.

[u-pr]

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 3 🔵🔵🔵⚪⚪ The PR is quite extensive, touching runtime, editor, tests, and documentation, but many changes are straightforward version bumps, documentation updates, or conditional compilation for newer Unity versions.

🏅 Score: 92 The PR contains important compatibility fixes for Unity 6000.x, bug fixes for the editor, and documentation improvements. The changes appear solid, though there is a minor typo introduced in the CSS class names.

🧪 PR contains tests

🔒 No security concerns identified

⚡ Recommended focus areas for review Typo in CSS Class Name There is a typo in the CSS class name strings used for addInteractionButton and addProcessorButton. The string is "add-binging-button" (and the dark theme variant), but it should likely be "add-binding-button". This typo matches the definition in InputActionsEditorStyles.uss (lines 182, 190), so it currently works, but it should be corrected in both files to avoid confusion in the future. addInteractionButton.AddToClassList(EditorGUIUtility.isProSkin ? "add-binging-button-dark-theme" : "add-binging-button"); new ContextualMenuManipulator(_ => {}){target = addInteractionButton, activators = {new ManipulatorActivationFilter(){button = MouseButton.LeftMouse}}}; } var processorToggle = processorsFoldout.Q<Toggle>(); processorToggle.AddToClassList("properties-foldout-toggle"); if (addProcessorButton == null) { addProcessorButton = CreateAddButton(processorToggle, "add-new-processor-button"); addProcessorButton.AddToClassList(EditorGUIUtility.isProSkin ? "add-binging-button-dark-theme" : "add-binging-button"); Typo in CSS Selector Corresponding to the issue in PropertiesView.cs, the CSS selectors .add-binging-button-dark-theme and .add-binging-button contain the typo "binging". .add-binging-button-dark-theme { width: 16px; height: 16px; background-image: resource('d_Toolbar Plus More.png'); background-color: transparent; -unity-background-scale-mode: scale-to-fit; } .add-binging-button { width: 16px; height: 16px; background-image: resource('Toolbar Plus More.png'); background-color: transparent; -unity-background-scale-mode: scale-to-fit; }

Update review

---

🤖 Helpful? Please react with 👍/👎 | Questions❓Please reach out in Slack #ask-u-pr

[u-pr]

PR Code Suggestions ✨

Explore these optional code suggestions:

Category	Suggestion	Impact
Possible issue	Reset cached asset ID when null The refactoring removed the logic that resets the cached asset ID when the actions property becomes null. This can cause the editor to fail to update (e.g., clear the UI) when the asset is removed or to detect subsequent changes if the same asset is re-assigned later. Restore the reset logic to ensure state consistency. Packages/com.unity.inputsystem/Editor/Plugins/PlayerInput/PlayerInputEditor.cs [281-287] bool CheckIfActionAssetChanged() { var obj = m_ActionsProperty.objectReferenceValue; if (obj == null) + { +#if UNITY_6000_4_OR_NEWER + m_ActionAssetEntityId = EntityId.None; +#else + m_ActionAssetInstanceID = -1; +#endif return false; + } #if UNITY_6000_4_OR_NEWER Suggestion importance[1-10]: 7 __ Why: The PR removes code that resets the cached asset ID when the property is null. This logic regression could cause the editor to fail to detect state changes if an asset is removed and then re-assigned, or lead to inconsistent state.	Medium
More suggestions

---

🤖 Helpful? Please react with 👍/👎 | Questions❓Please reach out in Slack #ask-u-pr

[josepmariapujol-unity]

Test failing due to PackageTestSuite.PackageValidationTests.ValidationSuiteRun errors.