This PRfixes#108694 by updatingIsOSVersionAtLeast to treat unspecified build or revision components as zero. Previously, theIsOSVersionAtLeast didn't normalize components, leading to incorrect version checks on MacCatalyst when only two components (major and minor) were provided.

Regression

On MacCatalyst, the version does not include build or revision components, and tests only covered the four-parameter overload ofIsOSVersionAtLeast.

Testing

TheOperatingSystem tests have been extended to cover the three- and two-parameter overloads ofIsOSVersionAtLeast.

Risk

Low. Only MacCatalyst should be affected, as it is the only platform that does not provide a build component. Also, this change does not introduce a breaking change.

kotlarmilosand others added17 commits

October 29, 2024 09:51

Default build and revision numbers to 0 if they are -1 on MacCatalyst

77721e8

Update src/libraries/System.Private.CoreLib/src/System/Environment.OS…

c09f70c

…Version.MacCatalyst.csCo-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

Add three-parameter and two-parameter overloads for IsOSPlatformVersi…

78536e0

…onAtLeast

Update IsOSVersionAtLeast to handle not provided values

11e3d4f

Check only build and revision

912c9d3

Update src/libraries/System.Private.CoreLib/src/System/OperatingSyste…

487b840

…m.csCo-authored-by: Jan Kotas <jkotas@microsoft.com>

Update src/libraries/System.Private.CoreLib/src/System/OperatingSyste…

0d206e5

…m.csCo-authored-by: Jan Kotas <jkotas@microsoft.com>

New line

fa1bcf9

Update tests to pass when build or revision are -1

c59384e

Add isCurrentOS to the Assert.Equal

41dedbe

Unspecified build/revision components are to be treated as zeros

069f80e

Unspecified build component is to be treated as zero

d3cb136

Unspecified build or revision component is to be treated as zero

0335374

Update src/libraries/System.Private.CoreLib/src/System/OperatingSyste…

f9238ce

…m.csCo-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

Update src/libraries/System.Private.CoreLib/src/System/OperatingSyste…

aa8ba92

…m.csCo-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

Normalize build component to 0 if undefined

da671d6

Add comments

fe49d62

ghost added the needs-area-labelAn area label is needed to ensure this gets routed to the appropriate area owners label

Oct 29, 2024

Revert normalizing build component to 0

d2225e8

kotlarmilos self-assigned this

Oct 29, 2024

kotlarmilos added area-System.Runtime os-maccatalystMacCatalyst OS and removed needs-area-labelAn area label is needed to ensure this gets routed to the appropriate area owners labels

Oct 29, 2024

kotlarmilos added this to the9.0.1 milestone

Oct 29, 2024

kotlarmilos linked an issue

Oct 29, 2024

that may beclosed by this pull request

[MacCatalyst] OperatingSystem is currently not working#108694

Closed

kotlarmilos requested a review fromakoeplinger

October 29, 2024 10:52

kotlarmilos added the Servicing-considerIssue for next servicing release review label

Oct 29, 2024

kotlarmilos requested a review fromjkotas

October 29, 2024 11:03

jkotas approved these changes

Oct 29, 2024

View reviewed changes

jeffhandley approved these changes

Oct 29, 2024

View reviewed changes

Copy link

Member

jeffhandley left a comment

Choose a reason for hiding this comment

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

This looks good to me for servicing.

This fix targets only theIsOSVersionAtLeast so that it returns the expected value when aversion.Build orversion.Revision contains a value less than 0. That is different from the original fix in#108748 where theOperatingSystem instance itself is normalized to have0 for those properties.

Copy link

Member

jeffhandley commentedOct 29, 2024

@artl93 This is ready for Servicing now

Copy link

Member

artl93 commentedOct 29, 2024

Thanks! I'd like, to get clearer on the customer scenario for my education.

What does the app see right now? Is the problem that version checks apps do to, for example, make their code selectable based on versions of macOS work properly? How long has MacCatalyst worked this way?

Copy link

Member

kotlarmilos commentedOct 30, 2024

What does the app see right now? Is the problem that version checks apps do to, for example, make their code selectable based on versions of macOS work properly?

This issue doesn’t make the code selectable based on different versions but leads to incorrect behavior.

For example, on MacCatalyst, if the version is set to18.0 , it appears as18.0.-1.-1. In this case,OperatingSystem.IsMacCatalystVersionAtLeast(18,0) would return false, since it compared a default build component (0) with the OS-provided build component (-1).