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.

Sign up for GitHub

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

Jump to bottom

Try to untangle the rid calculation. #82832

Merged
merged 38 commits into from
Apr 21, 2023
Merged

Try to untangle the rid calculation. #82832

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
9d890f4
Try to untangle the rid calculation.
tmds Mar 1, 2023
c320ff9
Ignore __portableOS.
tmds Mar 1, 2023
494afb7
Add back musl detection.
tmds Mar 1, 2023
034d1d5
Try fix AnyOS tests.
tmds Mar 1, 2023
92ffb2f
Try fix coreclr linux_musl_arm64 job.
tmds Mar 2, 2023
ae67592
src/tests/build.proj: use PackageRID for restore.
tmds Mar 2, 2023
8c91698
Use RuntimeOS as an override for _packageOS.
tmds Mar 2, 2023
4ce7c57
Remove (probably) out-dated override for non-portable ToolsRID.
tmds Mar 2, 2023
e5ec2a5
CI cross-builds for linux-musl use linux.
tmds Mar 2, 2023
6d84cb4
Add missing arch to rid.
tmds Mar 2, 2023
802bd95
Try simplified ToolsRID.
tmds Mar 3, 2023
959f5be
Update comments.
tmds Mar 3, 2023
44dcd0d
Rename OutputRid to OutputRID.
tmds Mar 3, 2023
9c2a977
Tweak comment.
tmds Mar 3, 2023
b16dc2d
Move TargetsLinux{Bionic,Musl} with the other Targets properties.
tmds Mar 4, 2023
220c624
Don't use RuntimeOS for PackageRID for CrossBuilds.
tmds Mar 5, 2023
b422a2f
Move RuntimeOS condition to ToolsRID assignment.
tmds Mar 5, 2023
edeb0f2
Clean up a few things.
tmds Mar 5, 2023
76b3e61
Fix broken Condition.
tmds Mar 5, 2023
9c31e98
Try fix the linux-bionic build.
tmds Mar 6, 2023
0d194d5
Try fix the linux-bionic build, part II.
tmds Mar 6, 2023
06bb0ea
Try fix the linux-bionic build, part III.
tmds Mar 6, 2023
6973d62
Fix PackageRID.
tmds Mar 6, 2023
83baf6c
Use RuntimeOS as _packageOS override.
tmds Mar 6, 2023
1eeef02
Remove RuntimeOS.
tmds Mar 7, 2023
a361268
Fix '-os linux-musl' mapping.
tmds Mar 7, 2023
89a70f6
Clean up .
tmds Mar 7, 2023
78bcd23
Rename __PortableOS to __PortableTargetOS.
tmds Mar 7, 2023
d672f14
Extend comments.
tmds Mar 8, 2023
bd52080
Extend OutputRID comment too.
tmds Mar 8, 2023
3e5800c
build.sh: include linux-bionic, linux-musl in usage.
tmds Mar 14, 2023
a29df93
Merge branch 'main' into rid_cleanup
tmds Mar 28, 2023
0814de1
SourceBuild.props: no need to pass RuntimeOS. Only set ToolsOS, Packa…
tmds Apr 4, 2023
01bae0d
Fix comment.
tmds Apr 18, 2023
8a0f558
linux-bionic doesn't get built on linux-bionic.
tmds Apr 20, 2023
acb8cf5
Merge remote-tracking branch 'origin/main' into rid_cleanup
tmds Apr 20, 2023
81402ef
Unconditionally assign TargetsLinuxBionic/TargetsLinuxMusl.
tmds Apr 20, 2023
8219051
Remove SkipInferTargetOSName.
tmds Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,6 @@
<!-- Detect linux flavors using __PortableTargetOS from the native script. -->
<_portableOS Condition="'$(_portableOS)' == 'linux' and '$(__PortableTargetOS)' == 'linux-musl'">linux-musl</_portableOS>
<_portableOS Condition="'$(_portableOS)' == 'linux' and '$(__PortableTargetOS)' == 'linux-bionic'">linux-bionic</_portableOS>

<TargetsLinuxBionic Condition="'$(_portableOS)' == 'linux-bionic'">true</TargetsLinuxBionic>
<TargetsLinuxMusl Condition="'$(_portableOS)' == 'linux-musl'">true</TargetsLinuxMusl>
</PropertyGroup>

<!-- PackageRID is used for packages needed for the target. -->
Expand Down Expand Up @@ -253,11 +250,13 @@
<OutputRID Condition="'$(OutputRID)' == ''">$(_outputOS)-$(TargetArchitecture)</OutputRID>
</PropertyGroup>

<PropertyGroup Label="CalculateTargetOSName" Condition="'$(SkipInferTargetOSName)' != 'true'">
<PropertyGroup Label="CalculateTargetOSName">
Copy link
Member

Choose a reason for hiding this comment

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

Nit: Would be good to move this up in a follow-up and add TargetsMobile into the group as well.

<TargetsFreeBSD Condition="'$(TargetOS)' == 'freebsd'">true</TargetsFreeBSD>
<Targetsillumos Condition="'$(TargetOS)' == 'illumos'">true</Targetsillumos>
<TargetsSolaris Condition="'$(TargetOS)' == 'solaris'">true</TargetsSolaris>
<TargetsLinux Condition="'$(TargetOS)' == 'linux' or '$(TargetOS)' == 'android'">true</TargetsLinux>
<TargetsLinuxBionic Condition="'$(_portableOS)' == 'linux-bionic'">true</TargetsLinuxBionic>
<TargetsLinuxMusl Condition="'$(_portableOS)' == 'linux-musl'">true</TargetsLinuxMusl>
<TargetsNetBSD Condition="'$(TargetOS)' == 'netbsd'">true</TargetsNetBSD>
<TargetsOSX Condition="'$(TargetOS)' == 'osx'">true</TargetsOSX>
<TargetsMacCatalyst Condition="'$(TargetOS)' == 'maccatalyst'">true</TargetsMacCatalyst>
Expand Down
1 change: 0 additions & 1 deletion src/libraries/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project>
<PropertyGroup>
<SkipInferTargetOSName>true</SkipInferTargetOSName>
<DisableArcadeTestFramework>true</DisableArcadeTestFramework>
<!-- Enabling this rule will cause build failures on undocumented public APIs.
We cannot add it in eng/Versions.props because src/coreclr does not have access to UseIntellisensePackageDocXmlFile, which ensures
Expand Down