Skip to content
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

[release/6.0] Update dotnet host for testing and fix failing globalization test #80560

Merged
merged 2 commits into from
Jan 12, 2023

Conversation

akoeplinger
Copy link
Member

@akoeplinger akoeplinger commented Jan 12, 2023

We changed how we got the OS version in f30e7fa to account for the macOS versioning changes.

The dotnet host used for testing was still on a version before that change so the RID it set (which flows through to RuntimeInformation.RuntimeIdentifier) was using the old format.
Updating to the latest 6.0.13 and adding the change from 5da4464 so we only check for the major OS version fixes the OSVersion_ValidVersion_OSX test.

This also backports #63971 which is necessary to fix a globalization test on macOS 12.

Fixes #80252

akoeplinger and others added 2 commits January 12, 2023 17:33
…rsion_OSX

We changed how we got the OS version in dotnet@f30e7fa to account for the macOS versioning changes. The `dotnet` host used for testing was still on a version before that change so the RID it set (which flows through to RuntimeInformation.RuntimeIdentifier) was using the old format. Updating to the latest 6.0.13 fixes that.

Also bring in the change from dotnet@5da4464#diff-3b1296c3b8a733ad1c027de7b5c653d0843afcc959cf9b2656160a9dcf8c0aa5R193-R194 so we only check for the major OS version.
@ghost
Copy link

ghost commented Jan 12, 2023

Tagging subscribers to this area: @dotnet/area-system-globalization
See info in area-owners.md if you want to be subscribed.

Issue Details

We changed how we got the OS version in f30e7fa to account for the macOS versioning changes.

The dotnet host used for testing was still on a version before that change so the RID it set (which flows through to RuntimeInformation.RuntimeIdentifier) was using the old format.
Updating to the latest 6.0.13 and adding the change from 5da4464 so we only check for the major OS version fixes the OSVersion_ValidVersion_OSX test.

This also backports #63971 which is necessary to fix a globalization test on macOS 12.

Author: akoeplinger
Assignees: akoeplinger
Labels:

area-System.Globalization

Milestone: -

@akoeplinger
Copy link
Member Author

@carlossanlop this is a test/CI-only change so I think we don't need approval right?

Copy link
Member

@tarekgh tarekgh left a comment

Choose a reason for hiding this comment

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

Thanks @akoeplinger for fixing this.

@akoeplinger akoeplinger added this to the 6.0.x milestone Jan 12, 2023
Copy link
Member

@carlossanlop carlossanlop left a comment

Choose a reason for hiding this comment

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

Thank you so much for fixing this, @akoeplinger.

@carlossanlop
Copy link
Member

@carlossanlop this is a test/CI-only change so I think we don't need approval right?

Yes, it's tell mode, no approval needed. I'll merge when the CI finishes.

@carlossanlop
Copy link
Member

CI failures are unrelated.

Ready to merge. :shipit:

@carlossanlop carlossanlop merged commit ace6275 into dotnet:release/6.0 Jan 12, 2023
@akoeplinger akoeplinger deleted the fix-mac-12 branch January 13, 2023 11:25
@ghost ghost locked as resolved and limited conversation to collaborators Feb 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants