-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
RID work for macOS 12 #59066
RID work for macOS 12 #59066
Conversation
Tagging subscribers to this area: @Anipik, @safern, @ViktorHofer Issue DetailsNote this is weird as with 11.0 the naming has changed as well as and OS was lying us of a while about actual os version, reporting 10.17 instead. Since we seems to use updated SDK this does not seems to be necessary any more so as the game of mapping kernel to OS version. It seems like starting with 11.0, the releases we used to track as 10.x are really now major releases and the 'x' becomes insignificant. So I changed the 12 rid to match Win & RHEL. We may do more cleanup for Environment.OSVersion but since that seems to war I'll do it separately if needed.
|
ping. anybody brave? |
Tagging subscribers to this area: @vitek-karas, @agocke, @VSadov Issue DetailsNote this is weird as with 11.0 the naming has changed as well as and OS was lying us of a while about actual os version, reporting 10.17 instead. Since we seems to use updated SDK this does not seems to be necessary any more so as the game of mapping kernel to OS version. It seems like starting with 11.0, the releases we used to track as 10.x are really now major releases and the 'x' becomes insignificant. So I changed the 12 rid to match Win & RHEL. We may do more cleanup for Environment.OSVersion but since that seems to war I'll do it separately if needed.
|
Are you planning to backport this to 6.0? |
yes. I think this would qualify for servicing. I will get ready separate change for 5.x |
@agocke please speed up the review |
The precedent we're setting with Windows 11 is that we match the OS product version, not the marketing version. It looks to me like that's what this PR is doing -- that the OS is reporting a new product version. Is that correct? |
There is really no marketing version here. With this, we should match what There are two parts: In the old days, there was no convent API to get that so we had mapping from kernel version to OS version. AFAIK that is no longer needed. And there is the "normal" rid work to add 12.0 to the graph. |
I personally don't know versioning story around macOS. On Windows we decided (See #58588) that there's little point in introducing win11 RIDs. Core of the reasoning is that OS still returns 10 as the major version and that we don't introduce new RIDs for Windows Server releases either. If on macOS the OS actually returns the new version and it makes a material difference, then we should add a new RID (I don't know this though). I guess this is just a "small pushback" to make sure that we need to add the new RID (trying to keep the always growing list of RIDs in check). |
We already made the leap with 11.0 @vitek-karas. (with 5.0 & ARM based machines) |
It looks like Big Sur reported itself as 11.0, except if you set Change LGTM |
OK - makes sense 😄 |
I verified the outcome with recent builds on two separate machines using
First one is my 12.0 VM. It shows the expected RID matching the change. Unless there are concerns I'll pick up all the changes and I'll create servicing request for 6.0.x. |
* RID work for macOS 12 (#59066) * fix rid processing on macOS (#60494) * fix rid processing on macOS * Update src/native/corehost/hostmisc/pal.unix.cpp * Update src/native/corehost/hostmisc/pal.unix.cpp * remove extra size calculation * Fix "fix rid processing on macOS" (#60668) The `else if (major == 12)` is dead code, since the previous if `if (major > 11)` would be true for `major == 12`. Judging by the comment and code, it looks like the intention of this `else if` statement was to match `major == 11`. * add the packaging for platforms package Co-authored-by: Austin Wise <[email protected]> Co-authored-by: Anirudh Agnihotry <[email protected]>
Note this is weird as with 11.0 the naming has changed as well as and OS was lying us of a while about actual os version, reporting 10.17 instead. Since we seems to use updated SDK this does not seems to be necessary any more so as the game of mapping kernel to OS version.
It seems like starting with 11.0, the releases we used to track as 10.x are really now major releases and the 'x' becomes insignificant. So I changed the 12 rid to match Win & RHEL.
We may do more cleanup for Environment.OSVersion but since that seems to war I'll do it separately if needed.
kern.osproductversion
was missing in some very old OS X versions but it is available in 10.13 and later.