Skip to content

FIX: Add ENABLE_VR || UNITY_GAMECORE conditionals back for InputDeviceCharacteristics #2210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 4, 2025

Conversation

jdiehlUnity
Copy link
Collaborator

@jdiehlUnity jdiehlUnity commented Jul 31, 2025

Description

Adding ENABLE_VR || UNITY_GAMECORE conditionals back in to guard against the InputDeviceCharacteristics enum that comes from the XR module dll.

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.

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.

After merge:

  • Create forward/backward port if needed. If you are blocked from creating a forward port now please add a task to ISX-1444.

@jdiehlUnity jdiehlUnity marked this pull request as ready for review July 31, 2025 17:50
@codecov-github-com
Copy link

codecov-github-com bot commented Jul 31, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

@@             Coverage Diff             @@
##           develop    #2210      +/-   ##
===========================================
- Coverage    68.10%   68.09%   -0.02%     
===========================================
  Files          367      367              
  Lines        53602    53602              
===========================================
- Hits         36506    36500       -6     
- Misses       17096    17102       +6     
Flag Coverage Δ
linux_2021.3_pkg 5.41% <ø> (ø)
linux_2021.3_project 70.35% <ø> (ø)
linux_2022.3_pkg 5.19% <ø> (ø)
linux_2022.3_project 65.20% <ø> (ø)
linux_6000.0_pkg 5.19% <ø> (ø)
linux_6000.0_project 68.00% <ø> (ø)
linux_6000.1_pkg 5.19% <ø> (ø)
linux_6000.1_project 68.00% <ø> (ø)
linux_6000.2_pkg 5.19% <ø> (ø)
linux_6000.2_project 68.00% <ø> (ø)
linux_trunk_pkg 5.19% <ø> (ø)
linux_trunk_project 67.99% <ø> (ø)
mac_2021.3_pkg 5.40% <ø> (ø)
mac_2021.3_project 70.36% <ø> (ø)
mac_2022.3_pkg 5.18% <ø> (ø)
mac_2022.3_project 65.23% <ø> (ø)
mac_6000.0_pkg 5.19% <ø> (ø)
mac_6000.0_project 68.02% <ø> (ø)
mac_6000.1_pkg 5.19% <ø> (ø)
mac_6000.1_project 68.02% <ø> (-0.02%) ⬇️
mac_6000.2_pkg 5.19% <ø> (ø)
mac_6000.2_project 68.02% <ø> (ø)
mac_trunk_pkg 5.19% <ø> (ø)
mac_trunk_project 68.02% <ø> (ø)
win_2021.3_pkg 5.41% <ø> (ø)
win_2021.3_project 70.44% <ø> (ø)
win_2022.3_pkg 5.18% <ø> (ø)
win_2022.3_project 65.30% <ø> (ø)
win_6000.0_pkg 5.19% <ø> (ø)
win_6000.0_project 68.10% <ø> (ø)
win_6000.1_pkg 5.19% <ø> (ø)
win_6000.1_project 68.10% <ø> (ø)
win_6000.2_pkg 5.19% <ø> (ø)
win_6000.2_project 68.09% <ø> (-0.01%) ⬇️
win_trunk_pkg 5.19% <ø> (ø)
win_trunk_project 68.09% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...utsystem/InputSystem/Plugins/XR/GenericXRDevice.cs 87.87% <ø> (ø)
...utsystem/InputSystem/Plugins/XR/XRLayoutBuilder.cs 91.81% <ø> (ø)
...ty.inputsystem/InputSystem/Plugins/XR/XRSupport.cs 41.83% <ø> (ø)

... and 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jfreire-unity
Copy link
Collaborator

@jamesmcgill can you validate that these changes unblock your release?

@jfreire-unity jfreire-unity changed the title Add ENABLE_VR || UNITY_GAMECORE conditionals back for InputDeviceCharacteristics FIX: Add ENABLE_VR || UNITY_GAMECORE conditionals back for InputDeviceCharacteristics Aug 4, 2025
@jamesmcgill
Copy link
Collaborator

@jamesmcgill can you validate that these changes unblock your release?

I can recheck my local test with this.
I don't think we can really validate the release is unblocked until the version is updated on 6000.2/staging

@jamesmcgill
Copy link
Collaborator

@jdiehlUnity can you add a CHANGELOG entry ? thanks!

Maybe you could also fix the previous changelog entry too. It's in the wrong version (due to the github merge process).

@jamesmcgill
Copy link
Collaborator

Did a quick test. I don't see the error locally anymore with this. Thanks!

Copy link
Collaborator

@Pauliusd01 Pauliusd01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not entirely sure what I can help with QA wise but I did build the editor extensions for the platform that was having problems and did not see any errors when switching to it. If there's anything else let me know and I'll check it out

@jfreire-unity
Copy link
Collaborator

I added a CHANGELOG to make sure we can merge ASAP, if CI tests pass.

@Pauliusd01 Pauliusd01 merged commit e83bf4f into develop Aug 4, 2025
130 of 132 checks passed
@Pauliusd01 Pauliusd01 deleted the bugfix/InputDeviceCharacteristics branch August 4, 2025 11:25
@jdiehlUnity
Copy link
Collaborator Author

I added a CHANGELOG to make sure we can merge ASAP, if CI tests pass.

thanks for correcting this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants