-
Notifications
You must be signed in to change notification settings - Fork 5.1k
[release/6.0] Add Rocky Linux RIDs (#74159) #74164
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
Conversation
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue DetailsAdd support for Rocky Linux RIDs on the 6.0 branch.
|
0f506eb
to
dd3bcdd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes seem to be roughly the same as in main, aside from the double brackets, and the package authoring changes that I don't understand.
@wfurt do you approve of this change as is?
src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
Outdated
Show resolved
Hide resolved
@@ -41,7 +41,7 @@ initNonPortableDistroRid() | |||
# We have forced __PortableBuild=0. This is because -portablebuld | |||
# has been passed as false. | |||
if (( isPortable == 0 )); then | |||
if [[ "${ID}" == "rhel" || "${ID}" == "alpine" ]]; then | |||
if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems both single or double square brackets are allowed to evaluate expressions. I mention it because the main version only had single square brackets.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To be honest, I didn't even notice that single brackets where used on main, I only wished to add rocky
as a valid alternative to the existing test. It doesn't have any functional impact here, as double brackets only give access to the extended Bash test syntax.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems double brackets are more correct. https://stackoverflow.com/a/2188369/8816314
If we have to do any corrections, we would have to add them to main, not here. But I think single brackets work too, if I'm understanding those two sources correctly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Single brackets are compatible with /bin/sh (e.g. standard POSIX tests), whereas double brackets are a bash extension. I assume it has since been decided to not use bash extensions on main, but I would leave it as it is on servicing.
Backport of PR dotnet#59178 (commit ec15b53) for servicing.
dd3bcdd
to
98a18b6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Package authoring suggestion addressed. LGTM.
Fixes #74159
Add support for Rocky Linux RIDs on the 6.0 branch.