Skip to content

Add linux-riscv64 in ILCompilerSupportedRids #45852

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

Merged
merged 3 commits into from
Jan 10, 2025
Merged

Add linux-riscv64 in ILCompilerSupportedRids #45852

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c9d95a
Add linux-riscv64 in ILCompilerSupportedRids
am11 Jan 10, 2025
4ea6420
Merge branch 'main' into feature/ports/linux-riscv64
ViktorHofer Jan 10, 2025
1977030
Update GenerateBundledVersions.targets
am11 Jan 10, 2025
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
6 changes: 5 additions & 1 deletion src/Installer/redist-installer/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,11 @@

<!-- The subset of ILCompiler target RIDs that are officially supported. Should be a subset of
Copy link
Member

@jkotas jkotas Jan 10, 2025

Choose a reason for hiding this comment

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

This comment says that this list should be a subset of ILCompilerRIDs.props, but it is not the case. Does the comment or ILCompilerRIDs.props need updating?

Copy link
Member Author

@am11 am11 Jan 10, 2025

Choose a reason for hiding this comment

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

Yes it's not strictly a subset. We include the official RIDs then the current OutputRID, which covers a set that is not a superset of all the allowed RIDs. I will update the comment.

https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
<ILCompilerSupportedRids Include="@(Net90ILCompilerSupportedRids)" />
<ILCompilerSupportedRids Include="
Copy link
Member

@jkotas jkotas Jan 10, 2025

Choose a reason for hiding this comment

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

All other lists have a version number. Should this one have a version number as well?

Copy link
Member

@akoeplinger akoeplinger Jan 10, 2025

Choose a reason for hiding this comment

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

this is fine. we need one item that represents the "current" list, this is that.

Copy link
Member

@jkotas jkotas Jan 10, 2025

Choose a reason for hiding this comment

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

Should other community supported architectures be moved to the "current" list?

Copy link
Member Author

@am11 am11 Jan 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Next version properties are added around preview 1 I think. Currently, net10 is using version less properties.

Should other community supported architectures be moved to the "current" list?

It is the inheritance chain. For each component, the RID is listed once under the .NET version where its support was enabled. The next version property just inherits the previous one. LoongArch was handled last year https://github.com/dotnet/installer/pull/19469/files.

Copy link
Member

@akoeplinger akoeplinger Jan 10, 2025

Choose a reason for hiding this comment

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

I think we add the next version properties when we do branching, i.e. for net11

@(Net90ILCompilerSupportedRids);
linux-riscv64;
linux-musl-riscv64;
" />

<Net80NativeAOTRuntimePackRids Include="
ios-arm64;
Expand Down
Loading