Update NativeAOT build integration targets to include ioslike platforms #82086

kotlarmilos · 2023-02-14T11:44:33Z

This PR updates NativeAOT build integration targets to include ioslike platforms, and contributes to dotnet/sdk#30068.

…ulator

ghost · 2023-02-14T11:44:45Z

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas
See info in area-owners.md if you want to be subscribed.

Issue Details

This PR updates NativeAOT build integration targets to include ios and iossimulator, and contributes to dotnet/sdk#30068.

/cc: @ivanpovazan @akoeplinger

Author:	kotlarmilos
Assignees:	kotlarmilos
Labels:	`area-NativeAOT-coreclr`
Milestone:	-

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets

…s/runtime into feature/nativeaot-targets-ios

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets

…iler.SingleEntry.targets Co-authored-by: Filip Navara <filip.navara@gmail.com>

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets

…e.targets Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

…iler.SingleEntry.targets Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets

…iler.SingleEntry.targets Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets

…Native.OpenSsl for iOS platforms

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets

…Native.OpenSsl for iOSLike platforms

ivanpovazan · 2023-02-17T09:55:45Z

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

@@ -23,13 +23,20 @@ The .NET Foundation licenses this file to you under the MIT license.
 <IlcBuildTasksPath Condition="'$(IlcBuildTasksPath)' == ''">$(MSBuildThisFileDirectory)..\tools\netstandard\ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <TargetOS Condition="$(RuntimeIdentifier.StartsWith('win'))">windows</TargetOS>
 <TargetOS Condition="$(RuntimeIdentifier.StartsWith('osx'))">osx</TargetOS>
+ <TargetOS Condition="$(RuntimeIdentifier.StartsWith('maccatalyst'))">maccatalyst</TargetOS>


Should we use here the same principle as above with: <OSIdentifier Condition="'$(OSIdentifier)' == '' and $(RuntimeIdentifier.StartsWith('win'))">win</OSIdentifier> in the "first-match-wins" approach, and include '$(TargetOS)' == '' condition in this case as well?

Correct, otherwise it won't select the first match.

Up until now, these are not meant to be set from the outside, so we should also remove it from OSIdentifier since there is no use-case for it. We try to limit unnecessary extension points which become hard to maintain later and to justify their removal during refactoring. I am planning to look into deduplicating these two lists as we really need a single list of hardcoded platforms for shipping targets (ideally we shouldn't be even needing that and directly rely on SDK provided properties...).

I understand your concern and agree that if these properties are not meant to be extensible, the conditions should be removed (in both places).
However, if this is going to be changed in the near future in any case, can we agree on the implementation for this PR, so we can close it?
@jkotas what do you think?

can we agree on the implementation for this PR, so we can close it?

Sure, I'll follow-up.

@jkotas what do you think?

I agree that this can use refactoring that can be done as a follow up (not required for this PR).

ivanpovazan · 2023-02-17T09:57:13Z

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets

 <NativeFramework Include="CoreFoundation" />
 <NativeFramework Include="CryptoKit" />
 <NativeFramework Include="Foundation" />
 <NativeFramework Include="Security" />
- <NativeFramework Include="GSS" />
+ <!-- The library builds don't reference the GSS API on tvOS builds. -->
+ <NativeFramework Condition="'$(TargetOS)' != 'tvos' and '$(TargetOS)' != 'tvossimulator'" Include="GSS" />


nit: Use $(TargetOS.StartsWith('tvos'))

I wasn't sure about negating the condition (didn't find it in the repository). Would $(!TargetOS.StartsWith('tvos')) work?

I find the explicit version a bit easier to read. !$(TargetOS.StartsWith('tvos')) (! first) should work but I didn't try it.

I also find the explicit version easier to reason about.

ivanpovazan · 2023-02-17T10:13:35Z

FWIW: Failures are unrelated

kotlarmilos · 2023-02-17T12:49:04Z

Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.

ivanpovazan · 2023-02-17T13:08:59Z

Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.

Seeing it here as well: https://github.com/dotnet/runtime/pull/82249/checks?check_run_id=11417387284

kotlarmilos · 2023-02-17T13:10:47Z

[QUIC] Missing libmsquic on tested platforms #81901

Tracking issue: #81901

ivanpovazan

lgtm!
@MichalStrehovsky is there anything else that would prevent us from merging this ?

MichalStrehovsky · 2023-02-20T08:22:27Z

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets

@@ -63,11 +63,13 @@ The .NET Foundation licenses this file to you under the MIT license.

 <ItemGroup>
 <NetCoreAppNativeLibrary Include="System.Native" />
- <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
+ <!-- FIXME: The library is currently not available for iOS-like platforms -->


Do we have an issue we could link to?

Just created and linked: #82389

kotlarmilos added 4 commits February 3, 2023 18:15

Adjust Native AOT build integration targets to include ios and iossim…

7bfbbce

…ulator

Merge branch 'dotnet:main' into feature/nativeaot-targets-ios

e242cf0

Resolve conflicts

28412d7

Fix TargetOS for iossimulator in build integration targets

9c7e5d8

kotlarmilos added the area-NativeAOT-coreclr label Feb 14, 2023

kotlarmilos requested review from akoeplinger and ivanpovazan February 14, 2023 11:44

kotlarmilos self-assigned this Feb 14, 2023

kotlarmilos mentioned this pull request Feb 14, 2023

Enable dotnet SDK to support targeting iOS with NativeAOT dotnet/sdk#30068

Closed

4 tasks

Revert conditions for linux targets

e1c255d

am11 reviewed Feb 14, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets Outdated Show resolved Hide resolved

Add _IsApplePlatform property and update Native.Unix.targets

947a514

filipnavara reviewed Feb 14, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated Show resolved Hide resolved

kotlarmilos added 2 commits February 15, 2023 11:12

Add tvos, tvossimulator, and maccatalyst to _IsApplePlatform

1acfce5

Merge branch 'main' into feature/nativeaot-targets-ios

7da9fba

kotlarmilos changed the title ~~Update NativeAOT build integration targets to include ios and iossimulator~~ Update NativeAOT build integration targets to include ioslike platforms Feb 15, 2023

kotlarmilos added 2 commits February 15, 2023 13:15

Remove _IsApplePlatform from Native.Unix.targets

9dd5067

Merge branch 'feature/nativeaot-targets-ios' of github.com:kotlarmilo…

f4a4964

…s/runtime into feature/nativeaot-targets-ios

kotlarmilos marked this pull request as ready for review February 15, 2023 12:18

kotlarmilos requested a review from MichalStrehovsky as a code owner February 15, 2023 12:18

akoeplinger reviewed Feb 15, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets Outdated Show resolved Hide resolved

Add a condition to OSIdentifier to respect the order of the checks

8363dc5

filipnavara reviewed Feb 15, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets Outdated Show resolved Hide resolved

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…

efb53b5

…iler.SingleEntry.targets Co-authored-by: Filip Navara <filip.navara@gmail.com>

am11 reviewed Feb 15, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets Outdated Show resolved Hide resolved

am11 reviewed Feb 15, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets Show resolved Hide resolved

akoeplinger mentioned this pull request Feb 15, 2023

Enable building NativeAOT for Apple mobile platforms #81780

Merged

kotlarmilos and others added 2 commits February 15, 2023 16:17

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…

25df2fc

…e.targets Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…

6e67656

…iler.SingleEntry.targets Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

am11 reviewed Feb 15, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets Outdated Show resolved Hide resolved

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…

7012650

…iler.SingleEntry.targets Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

filipnavara reviewed Feb 16, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Show resolved Hide resolved

Exclude <NativeFramework Include=GSS /> for tvOS[simulator]

a3035e5

filipnavara approved these changes Feb 16, 2023

View reviewed changes

kotlarmilos added 2 commits February 16, 2023 16:17

Exclude System.Globalization.Native and System.Security.Cryptography.…

ee8832a

…Native.OpenSsl for iOS platforms

Fix tvOS condition for GSS

675b5a0

jkotas reviewed Feb 16, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated Show resolved Hide resolved

filipnavara reviewed Feb 16, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated Show resolved Hide resolved

filipnavara reviewed Feb 16, 2023

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated Show resolved Hide resolved

Exclude System.Globalization.Native and System.Security.Cryptography.…

3283372

…Native.OpenSsl for iOSLike platforms

ivanpovazan mentioned this pull request Feb 16, 2023

Adding HelloiOS sample for NativeAOT #82249

Merged

1 task

build-analysis bot mentioned this pull request Feb 16, 2023

OSX infra issue - prereq check for 'pkg-config' missing #82240

Closed

ivanpovazan reviewed Feb 17, 2023

View reviewed changes

kotlarmilos added 2 commits February 17, 2023 11:14

Add condition to TargetOS property

407edf3

Update tvOS condition

f2b51ec

build-analysis bot mentioned this pull request Feb 17, 2023

[QUIC] Missing libmsquic on tested platforms #81901

Closed

4 tasks

am11 mentioned this pull request Feb 17, 2023

Install native dependencies on all Apple OS in CI #82263

Merged

filipnavara mentioned this pull request Feb 18, 2023

[NativeAOT] Implement thunk page generation and mapping for iOS-like platforms #82317

Merged

ivanpovazan approved these changes Feb 20, 2023

View reviewed changes

MichalStrehovsky approved these changes Feb 20, 2023

View reviewed changes

kotlarmilos merged commit 06dd126 into dotnet:main Feb 20, 2023

kotlarmilos deleted the feature/nativeaot-targets-ios branch February 20, 2023 09:09

ghost locked as resolved and limited conversation to collaborators Mar 22, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update NativeAOT build integration targets to include ioslike platforms #82086

Update NativeAOT build integration targets to include ioslike platforms #82086

kotlarmilos commented Feb 14, 2023 •

edited

Loading

ghost commented Feb 14, 2023

ivanpovazan Feb 17, 2023

kotlarmilos Feb 17, 2023

am11 Feb 17, 2023 •

edited

Loading

ivanpovazan Feb 17, 2023

am11 Feb 17, 2023

jkotas Feb 17, 2023

ivanpovazan Feb 17, 2023

kotlarmilos Feb 17, 2023

filipnavara Feb 17, 2023

akoeplinger Feb 17, 2023

ivanpovazan commented Feb 17, 2023

kotlarmilos commented Feb 17, 2023

ivanpovazan commented Feb 17, 2023

kotlarmilos commented Feb 17, 2023

ivanpovazan left a comment •

edited

Loading

MichalStrehovsky Feb 20, 2023

ivanpovazan Feb 20, 2023 •

edited

Loading

Update NativeAOT build integration targets to include ioslike platforms #82086

Update NativeAOT build integration targets to include ioslike platforms #82086

Conversation

kotlarmilos commented Feb 14, 2023 • edited Loading

ghost commented Feb 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

am11 Feb 17, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ivanpovazan commented Feb 17, 2023

kotlarmilos commented Feb 17, 2023

ivanpovazan commented Feb 17, 2023

kotlarmilos commented Feb 17, 2023

ivanpovazan left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ivanpovazan Feb 20, 2023 • edited Loading

Choose a reason for hiding this comment

kotlarmilos commented Feb 14, 2023 •

edited

Loading

am11 Feb 17, 2023 •

edited

Loading

ivanpovazan left a comment •

edited

Loading

ivanpovazan Feb 20, 2023 •

edited

Loading