Skip to content

Recognize build 22000 as Windows 11#12627

Merged
seanbudd merged 4 commits into
nvaccess:masterfrom
josephsl:recognizeWin11
Jul 9, 2021
Merged

Recognize build 22000 as Windows 11#12627
seanbudd merged 4 commits into
nvaccess:masterfrom
josephsl:recognizeWin11

Conversation

@josephsl

@josephsl josephsl commented Jul 8, 2021

Copy link
Copy Markdown
Contributor

Link to issue number:

Fixes #12626

Summary of the issue:

Windows 11 build 22000 is presented as "Windows 10" by NVDA.

Description of how this pull request fixes the issue:

Recognize build 22000 as Windows 11:

  1. Define two Windows 11 constants: winVersion.WIN11 and winVersion.WIN11_21H2, similar to how initial Windows 10 release constant was defined.
  2. Edit winVersion.getWinVer function by comparing minimal WinVersion class (major, minor, build) to Windows 11 constant and settings release name to "Windows 11" if this is a Windows 11 build.

Testing strategy:

Manual testing:

Install Windows 11 Insider Preview (build 22000) and:

  1. Make sure Windows says "Windows 11" (open Start, type "winver", press Enter, then examine "About Windows" dialog).
  2. Verify that NVDA log reports "Windows version: Windows 11 21H2".
  3. From Python Console, try winVersion.getWinVer() >= winVersion.WIN11 (Tru on Windows 11, False otherwise).

Known issues with pull request:

None

Change log entries:

Changes for developers (or perhaps a bug fix/changes):
Windows version 10.0.22000 or later is recognized as Windows 11, not Windows 10. (#12626)

Code Review Checklist:

  • Pull Request description is up to date.
  • Unit tests.
  • System (end to end) tests.
  • Manual testing.
  • User Documentation.
  • Change log entry.
  • Context sensitive help for GUI changes.
  • UX of all users considered:
    • Speech
    • Braille
    • Low Vision
    • Different web browsers

Thanks.

josephsl added 2 commits July 8, 2021 14:08
…2626.

Despite the name, Windows 11 is powered by Windows 10 technologies internally (therefore major.minor is 10.0). The Windows 11 branding first appeared in build 22000 for Windows Insiders, therefore recognize 'Windows 10' build 22000 as Windows 11 (both the constant and release name were added).
…in use. Re nvaccess#12626.

Construct a minimum winVersion.WinVersion class (major, minor, build) and compare it against Windows 11 information. If running Windows 11 (build 22000) or later, set release name to 'Windows 11', otherwise 'Windows 10'.
@josephsl josephsl requested a review from a team as a code owner July 8, 2021 21:50
@josephsl josephsl requested a review from seanbudd July 8, 2021 21:50
Comment thread source/winVersion.py Outdated
@josephsl

josephsl commented Jul 9, 2021 via email

Copy link
Copy Markdown
Contributor Author

@seanbudd seanbudd merged commit a47af19 into nvaccess:master Jul 9, 2021
@nvaccessAuto nvaccessAuto added this to the 2021.2 milestone Jul 9, 2021
@josephsl josephsl deleted the recognizeWin11 branch July 9, 2021 04:11
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.

winVersion: build 22000 is not recognized as Windows 11

3 participants