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

Add basic RIDs for ios and tvos #31953

Merged
merged 1 commit into from
Feb 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,124 @@
"any",
"base"
],
"ios": [
"ios",
"unix",
marek-safar marked this conversation as resolved.
Show resolved Hide resolved
"any",
"base"
],
"ios-arm64": [
Copy link
Member

Choose a reason for hiding this comment

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

I think we should add iOS Simulator and Device as separate RIDs extending from the generic iOS RID.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

that would mean the rid would need to be called something like iosdevice-arm64 and I don't think that's a good idea.

Copy link
Member

Choose a reason for hiding this comment

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

Apple decided to split them up into two separate SDKs/targets so I don't think we have a choice.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ios-arm64 - device RID
ios-x64 - simulator RID

Both have parent RID ios. As I wrote above explicitly stating device in the RID is something I think we should try to avoid

Copy link
Member

Choose a reason for hiding this comment

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

That will break down as soon as Apple introduces the rumored ARM MacBook. I really don't think we should bake in the assumption about which architectures are a device runtime vs. simulator runtime.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

why? such device would use different RID called osx-arm64

Copy link
Member

Choose a reason for hiding this comment

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

I'm talking about the iOS Simulator running on an ARM MacBook. We'd need to use a simulator build of the runtime there, not a device one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, we don't know if simulator would be needed or not but even in that case the existing naming convention covers that with ios-arm64-jit like format.

Copy link
Member

@akoeplinger akoeplinger Feb 10, 2020

Choose a reason for hiding this comment

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

We discussed offline and I wasn't aware of the "additional qualifiers" specified in https://github.com/dotnet/runtime/blob/acdb8696b02f18f2dc34286fb4ba3bd26ad14db4/src/libraries/Microsoft.NETCore.Platforms/readme.md#naming-convention

[additional qualifiers] can be things like aot. Used to further differentiate different platforms.

This settles my concern.

"ios-arm64",
"ios",
"unix-arm64",
"unix",
"any",
"base"
],
"ios-x64": [
"ios-x64",
"ios",
"unix-x64",
"unix",
"any",
"base"
],
"ios.11": [
"ios.11",
"ios",
"unix",
"any",
"base"
],
"ios.11-arm64": [
"ios.11-arm64",
"ios.11",
"ios-arm64",
"ios",
"unix-arm64",
"unix",
"any",
"base"
],
"ios.11-x64": [
"ios.11-x64",
"ios.11",
"ios-x64",
"ios",
"unix-x64",
"unix",
"any",
"base"
],
"ios.12": [
"ios.12",
"ios.11",
"ios",
"unix",
"any",
"base"
],
"ios.12-arm64": [
"ios.12-arm64",
"ios.12",
"ios.11-arm64",
"ios.11",
"ios-arm64",
"ios",
"unix-arm64",
"unix",
"any",
"base"
],
"ios.12-x64": [
"ios.12-x64",
"ios.12",
"ios.11-x64",
"ios.11",
"ios-x64",
"ios",
"unix-x64",
"unix",
"any",
"base"
],
"ios.13": [
"ios.13",
"ios.12",
"ios.11",
"ios",
"unix",
"any",
"base"
],
"ios.13-arm64": [
"ios.13-arm64",
"ios.13",
"ios.12-arm64",
"ios.12",
"ios.11-arm64",
"ios.11",
"ios-arm64",
"ios",
"unix-arm64",
"unix",
"any",
"base"
],
"ios.13-x64": [
"ios.13-x64",
"ios.13",
"ios.12-x64",
"ios.12",
"ios.11-x64",
"ios.11",
"ios-x64",
"ios",
"unix-x64",
"unix",
"any",
"base"
],
"linux": [
"linux",
"unix",
Expand Down Expand Up @@ -3054,6 +3172,166 @@
"any",
"base"
],
"tvos": [
"tvos",
"unix",
"any",
"base"
],
"tvos-arm64": [
"tvos-arm64",
"tvos",
"unix-arm64",
"unix",
"any",
"base"
],
"tvos-x64": [
"tvos-x64",
"tvos",
"unix-x64",
"unix",
"any",
"base"
],
"tvos.10": [
"tvos.10",
"tvos",
"unix",
"any",
"base"
],
"tvos.10-arm64": [
"tvos.10-arm64",
"tvos.10",
"tvos-arm64",
"tvos",
"unix-arm64",
"unix",
"any",
"base"
],
"tvos.10-x64": [
"tvos.10-x64",
"tvos.10",
"tvos-x64",
"tvos",
"unix-x64",
"unix",
"any",
"base"
],
"tvos.11": [
"tvos.11",
"tvos.10",
"tvos",
"unix",
"any",
"base"
],
"tvos.11-arm64": [
"tvos.11-arm64",
"tvos.11",
"tvos.10-arm64",
"tvos.10",
"tvos-arm64",
"tvos",
"unix-arm64",
"unix",
"any",
"base"
],
"tvos.11-x64": [
"tvos.11-x64",
"tvos.11",
"tvos.10-x64",
"tvos.10",
"tvos-x64",
"tvos",
"unix-x64",
"unix",
"any",
"base"
],
"tvos.12": [
"tvos.12",
"tvos.11",
"tvos.10",
"tvos",
"unix",
"any",
"base"
],
"tvos.12-arm64": [
"tvos.12-arm64",
"tvos.12",
"tvos.11-arm64",
"tvos.11",
"tvos.10-arm64",
"tvos.10",
"tvos-arm64",
"tvos",
"unix-arm64",
"unix",
"any",
"base"
],
"tvos.12-x64": [
"tvos.12-x64",
"tvos.12",
"tvos.11-x64",
"tvos.11",
"tvos.10-x64",
"tvos.10",
"tvos-x64",
"tvos",
"unix-x64",
"unix",
"any",
"base"
],
"tvos.13": [
"tvos.13",
"tvos.12",
"tvos.11",
"tvos.10",
"tvos",
"unix",
"any",
"base"
],
"tvos.13-arm64": [
"tvos.13-arm64",
"tvos.13",
"tvos.12-arm64",
"tvos.12",
"tvos.11-arm64",
"tvos.11",
"tvos.10-arm64",
"tvos.10",
"tvos-arm64",
"tvos",
"unix-arm64",
"unix",
"any",
"base"
],
"tvos.13-x64": [
"tvos.13-x64",
"tvos.13",
"tvos.12-x64",
"tvos.12",
"tvos.11-x64",
"tvos.11",
"tvos.10-x64",
"tvos.10",
"tvos-x64",
"tvos",
"unix-x64",
"unix",
"any",
"base"
],
"ubuntu": [
"ubuntu",
"debian",
Expand Down
Loading