Update NativeAOT build integration targets to include ioslike platforms - #82086

Merged
kotlarmilos merged 21 commits into
dotnet:mainfrom
kotlarmilos:feature/nativeaot-targets-ios
Feb 20, 2023
Merged

Update NativeAOT build integration targets to include ioslike platforms#82086
kotlarmilos merged 21 commits into
dotnet:mainfrom
kotlarmilos:feature/nativeaot-targets-ios

Conversation

@kotlarmilos

@kotlarmiloskotlarmilos commented Feb 14, 2023•
edited
Loading

Copy link
Copy Markdown
Member

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

/cc: @ivanpovazan@akoeplinger

@kotlarmiloskotlarmilos self-assigned this Feb 14, 2023
@ghost

ghost commented Feb 14, 2023

Copy link
Copy Markdown

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:-

@kotlarmiloskotlarmilos mentioned this pull request Feb 14, 2023
Closed
4 tasks
am11
am11 reviewed Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets Outdated
filipnavara
filipnavara reviewed Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated
@kotlarmiloskotlarmilos changed the title Update NativeAOT build integration targets to include ios and iossimulatorUpdate NativeAOT build integration targets to include ioslike platformsFeb 15, 2023
@kotlarmilos
kotlarmilos marked this pull request as ready for review February 15, 2023 12:18
akoeplinger
akoeplinger reviewed Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets Outdated
filipnavara
filipnavara reviewed Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets Outdated
@kotlarmilos@filipnavara
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
efb53b5
…iler.SingleEntry.targets
Co-authored-by: Filip Navara <filip.navara@gmail.com>
am11
am11 reviewed Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets Outdated
@akoeplingerakoeplinger mentioned this pull request Feb 15, 2023
Merged
kotlarmilosand others added 2 commits February 15, 2023 16:17
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
25df2fc
…e.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
6e67656
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
am11
am11 reviewed Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets Outdated
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
7012650
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
jkotas
jkotas reviewed Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated
filipnavara
filipnavara reviewed Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated
filipnavara
filipnavara reviewed Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated
@ivanpovazanivanpovazan mentioned this pull request Feb 16, 2023
Merged
1 task
@build-analysisbuild-analysisBot mentioned this pull request Feb 16, 2023
Closed
ivanpovazan
ivanpovazan reviewed Feb 17, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets Outdated
<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>

@ivanpovazanivanpovazanFeb 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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?

@kotlarmiloskotlarmilosFeb 17, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

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

@am11am11Feb 17, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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...).

@ivanpovazanivanpovazanFeb 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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?

@am11am11Feb 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

Sure, I'll follow-up.

@jkotasjkotasFeb 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@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).

Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets Outdated
<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" />

@ivanpovazanivanpovazanFeb 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

@kotlarmiloskotlarmilosFeb 17, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

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

@filipnavarafilipnavaraFeb 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

@akoeplingerakoeplingerFeb 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I also find the explicit version easier to reason about.

@ivanpovazan

ivanpovazan commented Feb 17, 2023

Copy link
Copy Markdown
Member

FWIW: Failures are unrelated

@kotlarmilos

kotlarmilos commented Feb 17, 2023

Copy link
Copy Markdown
MemberAuthor

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

@build-analysisbuild-analysisBot mentioned this pull request Feb 17, 2023
Closed
4 tasks
@ivanpovazan

ivanpovazan commented Feb 17, 2023

Copy link
Copy Markdown
Member

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

kotlarmilos commented Feb 17, 2023

Copy link
Copy Markdown
MemberAuthor

[QUIC] Missing libmsquic on tested platforms #81901

Tracking issue: #81901

@am11am11 mentioned this pull request Feb 17, 2023
Merged
@filipnavarafilipnavara mentioned this pull request Feb 18, 2023
Merged
ivanpovazan
ivanpovazan approved these changes Feb 20, 2023
View reviewed changes

@ivanpovazanivanpovazan left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

MichalStrehovsky
MichalStrehovsky approved these changes Feb 20, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
<ItemGroup>
<NetCoreAppNativeLibrary Include="System.Native" />
<NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
<!-- FIXME: The library is currently not available for iOS-like platforms -->

@MichalStrehovskyMichalStrehovskyFeb 20, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do we have an issue we could link to?

@ivanpovazanivanpovazanFeb 20, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just created and linked: #82389

@kotlarmilos
kotlarmilos merged commit 06dd126 into dotnet:mainFeb 20, 2023
@kotlarmilos
kotlarmilos deleted the feature/nativeaot-targets-ios branch February 20, 2023 09:09
@ghostghost locked as resolved and limited conversation to collaborators Mar 22, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@marek-safarmarek-safarmarek-safar left review comments
@akoeplingerakoeplingerakoeplinger left review comments
@jkotasjkotasjkotas left review comments
@ivanpovazanivanpovazanivanpovazan approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
+2 more reviewers
@filipnavarafilipnavarafilipnavara approved these changes
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@kotlarmiloskotlarmilos

Labels

area-NativeAOT-coreclr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@kotlarmilos@ivanpovazan@marek-safar@akoeplinger@filipnavara@am11@jkotas@MichalStrehovsky
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Update NativeAOT build integration targets to include ioslike platforms - #82086
Merged
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Feb 20, 2023
Merged
Update NativeAOT build integration targets to include ioslike platforms#82086
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Conversation
@kotlarmilos
@kotlarmiloskotlarmilos
commented
Feb 14, 2023•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates NativeAOT build integration targets to include ioslike platforms, and contributes to dotnet/sdk#30068.
/cc: @ivanpovazan@akoeplinger
@kotlarmiloskotlarmilos
self-assigned this
Feb 14, 2023
@ghost
ghost
commented
Feb 14, 2023

Copy link


Copy Markdown

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:-
@kotlarmiloskotlarmilos
mentioned this pull request
Feb 14, 2023

Closed

4 tasks
am11
am11
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@kotlarmiloskotlarmilos
changed the title
Update NativeAOT build integration targets to include ios and iossimulatorUpdate NativeAOT build integration targets to include ioslike platformsFeb 15, 2023
@kotlarmilos
kotlarmilos
marked this pull request as ready for review
February 15, 2023 12:18
akoeplinger
akoeplinger
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@filipnavara
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
efb53b5
…iler.SingleEntry.targets
Co-authored-by: Filip Navara <filip.navara@gmail.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

@akoeplingerakoeplinger
mentioned this pull request
Feb 15, 2023
 Merged

kotlarmilosand others
added 2 commits
February 15, 2023 16:17
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
25df2fc
…e.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
6e67656
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
7012650
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
jkotas
jkotas
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@ivanpovazanivanpovazan
mentioned this pull request
Feb 16, 2023
 Merged

1 task
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 16, 2023

Closed

ivanpovazan
ivanpovazan
reviewed
Feb 17, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

 <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>
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Correct, otherwise it won't select the first match.
@am11am11Feb 17, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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...).
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@am11am11Feb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

can we agree on the implementation for this PR, so we can close it?
Sure, I'll follow-up.
@jkotasjkotasFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

@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).
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

 <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" />
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

nit: Use $(TargetOS.StartsWith('tvos'))
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I also find the explicit version easier to reason about.
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
FWIW: Failures are unrelated
@kotlarmilos
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 17, 2023

Closed

4 tasks
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
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
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
[QUIC] Missing libmsquic on tested platforms #81901
Tracking issue: #81901
@am11am11
mentioned this pull request
Feb 17, 2023
 Merged

@filipnavarafilipnavara
mentioned this pull request
Feb 18, 2023
 Merged

ivanpovazan
ivanpovazan
approved these changes
Feb 20, 2023
View reviewed changes
@ivanpovazanivanpovazan
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

lgtm!
@MichalStrehovsky is there anything else that would prevent us from merging this ?
MichalStrehovsky
MichalStrehovsky
approved these changes
Feb 20, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
 <ItemGroup>
 <NetCoreAppNativeLibrary Include="System.Native" />
 <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
 <!-- FIXME: The library is currently not available for iOS-like platforms -->
@MichalStrehovskyMichalStrehovskyFeb 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Do we have an issue we could link to?
@ivanpovazanivanpovazanFeb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just created and linked: #82389
@kotlarmilos
kotlarmilos
merged commit 06dd126
into
dotnet:mainFeb 20, 2023
@kotlarmilos
kotlarmilos
deleted the

feature/nativeaot-targets-ios

branch
February 20, 2023 09:09
@ghostghost
locked as resolved and limited conversation to collaborators
Mar 22, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marek-safarmarek-safarmarek-safar left review comments
@akoeplingerakoeplingerakoeplinger left review comments
@jkotasjkotasjkotas left review comments
@ivanpovazanivanpovazanivanpovazan approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes

+2 more reviewers

@filipnavarafilipnavarafilipnavara approved these changes
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@kotlarmiloskotlarmilos

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@kotlarmilos@ivanpovazan@marek-safar@akoeplinger@filipnavara@am11@jkotas@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update NativeAOT build integration targets to include ioslike platforms - #82086
Merged
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Feb 20, 2023
Merged
Update NativeAOT build integration targets to include ioslike platforms#82086
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Conversation
@kotlarmilos
@kotlarmiloskotlarmilos
commented
Feb 14, 2023•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates NativeAOT build integration targets to include ioslike platforms, and contributes to dotnet/sdk#30068.
/cc: @ivanpovazan@akoeplinger
@kotlarmiloskotlarmilos
self-assigned this
Feb 14, 2023
@ghost
ghost
commented
Feb 14, 2023

Copy link


Copy Markdown

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:-
@kotlarmiloskotlarmilos
mentioned this pull request
Feb 14, 2023

Closed

4 tasks
am11
am11
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@kotlarmiloskotlarmilos
changed the title
Update NativeAOT build integration targets to include ios and iossimulatorUpdate NativeAOT build integration targets to include ioslike platformsFeb 15, 2023
@kotlarmilos
kotlarmilos
marked this pull request as ready for review
February 15, 2023 12:18
akoeplinger
akoeplinger
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@filipnavara
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
efb53b5
…iler.SingleEntry.targets
Co-authored-by: Filip Navara <filip.navara@gmail.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

@akoeplingerakoeplinger
mentioned this pull request
Feb 15, 2023
 Merged

kotlarmilosand others
added 2 commits
February 15, 2023 16:17
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
25df2fc
…e.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
6e67656
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
7012650
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
jkotas
jkotas
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@ivanpovazanivanpovazan
mentioned this pull request
Feb 16, 2023
 Merged

1 task
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 16, 2023

Closed

ivanpovazan
ivanpovazan
reviewed
Feb 17, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

 <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>
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Correct, otherwise it won't select the first match.
@am11am11Feb 17, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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...).
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@am11am11Feb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

can we agree on the implementation for this PR, so we can close it?
Sure, I'll follow-up.
@jkotasjkotasFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

@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).
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

 <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" />
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

nit: Use $(TargetOS.StartsWith('tvos'))
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I also find the explicit version easier to reason about.
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
FWIW: Failures are unrelated
@kotlarmilos
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 17, 2023

Closed

4 tasks
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
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
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
[QUIC] Missing libmsquic on tested platforms #81901
Tracking issue: #81901
@am11am11
mentioned this pull request
Feb 17, 2023
 Merged

@filipnavarafilipnavara
mentioned this pull request
Feb 18, 2023
 Merged

ivanpovazan
ivanpovazan
approved these changes
Feb 20, 2023
View reviewed changes
@ivanpovazanivanpovazan
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

lgtm!
@MichalStrehovsky is there anything else that would prevent us from merging this ?
MichalStrehovsky
MichalStrehovsky
approved these changes
Feb 20, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
 <ItemGroup>
 <NetCoreAppNativeLibrary Include="System.Native" />
 <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
 <!-- FIXME: The library is currently not available for iOS-like platforms -->
@MichalStrehovskyMichalStrehovskyFeb 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Do we have an issue we could link to?
@ivanpovazanivanpovazanFeb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just created and linked: #82389
@kotlarmilos
kotlarmilos
merged commit 06dd126
into
dotnet:mainFeb 20, 2023
@kotlarmilos
kotlarmilos
deleted the

feature/nativeaot-targets-ios

branch
February 20, 2023 09:09
@ghostghost
locked as resolved and limited conversation to collaborators
Mar 22, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marek-safarmarek-safarmarek-safar left review comments
@akoeplingerakoeplingerakoeplinger left review comments
@jkotasjkotasjkotas left review comments
@ivanpovazanivanpovazanivanpovazan approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes

+2 more reviewers

@filipnavarafilipnavarafilipnavara approved these changes
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@kotlarmiloskotlarmilos

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@kotlarmilos@ivanpovazan@marek-safar@akoeplinger@filipnavara@am11@jkotas@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update NativeAOT build integration targets to include ioslike platforms - #82086
Merged
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Feb 20, 2023
Merged
Update NativeAOT build integration targets to include ioslike platforms#82086
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Conversation
@kotlarmilos
@kotlarmiloskotlarmilos
commented
Feb 14, 2023•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates NativeAOT build integration targets to include ioslike platforms, and contributes to dotnet/sdk#30068.
/cc: @ivanpovazan@akoeplinger
@kotlarmiloskotlarmilos
self-assigned this
Feb 14, 2023
@ghost
ghost
commented
Feb 14, 2023

Copy link


Copy Markdown

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:-
@kotlarmiloskotlarmilos
mentioned this pull request
Feb 14, 2023

Closed

4 tasks
am11
am11
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@kotlarmiloskotlarmilos
changed the title
Update NativeAOT build integration targets to include ios and iossimulatorUpdate NativeAOT build integration targets to include ioslike platformsFeb 15, 2023
@kotlarmilos
kotlarmilos
marked this pull request as ready for review
February 15, 2023 12:18
akoeplinger
akoeplinger
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@filipnavara
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
efb53b5
…iler.SingleEntry.targets
Co-authored-by: Filip Navara <filip.navara@gmail.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

@akoeplingerakoeplinger
mentioned this pull request
Feb 15, 2023
 Merged

kotlarmilosand others
added 2 commits
February 15, 2023 16:17
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
25df2fc
…e.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
6e67656
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
7012650
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
jkotas
jkotas
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@ivanpovazanivanpovazan
mentioned this pull request
Feb 16, 2023
 Merged

1 task
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 16, 2023

Closed

ivanpovazan
ivanpovazan
reviewed
Feb 17, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

 <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>
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Correct, otherwise it won't select the first match.
@am11am11Feb 17, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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...).
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@am11am11Feb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

can we agree on the implementation for this PR, so we can close it?
Sure, I'll follow-up.
@jkotasjkotasFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

@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).
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

 <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" />
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

nit: Use $(TargetOS.StartsWith('tvos'))
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I also find the explicit version easier to reason about.
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
FWIW: Failures are unrelated
@kotlarmilos
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 17, 2023

Closed

4 tasks
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
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
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
[QUIC] Missing libmsquic on tested platforms #81901
Tracking issue: #81901
@am11am11
mentioned this pull request
Feb 17, 2023
 Merged

@filipnavarafilipnavara
mentioned this pull request
Feb 18, 2023
 Merged

ivanpovazan
ivanpovazan
approved these changes
Feb 20, 2023
View reviewed changes
@ivanpovazanivanpovazan
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

lgtm!
@MichalStrehovsky is there anything else that would prevent us from merging this ?
MichalStrehovsky
MichalStrehovsky
approved these changes
Feb 20, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
 <ItemGroup>
 <NetCoreAppNativeLibrary Include="System.Native" />
 <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
 <!-- FIXME: The library is currently not available for iOS-like platforms -->
@MichalStrehovskyMichalStrehovskyFeb 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Do we have an issue we could link to?
@ivanpovazanivanpovazanFeb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just created and linked: #82389
@kotlarmilos
kotlarmilos
merged commit 06dd126
into
dotnet:mainFeb 20, 2023
@kotlarmilos
kotlarmilos
deleted the

feature/nativeaot-targets-ios

branch
February 20, 2023 09:09
@ghostghost
locked as resolved and limited conversation to collaborators
Mar 22, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marek-safarmarek-safarmarek-safar left review comments
@akoeplingerakoeplingerakoeplinger left review comments
@jkotasjkotasjkotas left review comments
@ivanpovazanivanpovazanivanpovazan approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes

+2 more reviewers

@filipnavarafilipnavarafilipnavara approved these changes
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@kotlarmiloskotlarmilos

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@kotlarmilos@ivanpovazan@marek-safar@akoeplinger@filipnavara@am11@jkotas@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Update NativeAOT build integration targets to include ioslike platforms - #82086
Merged
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Feb 20, 2023
Merged
Update NativeAOT build integration targets to include ioslike platforms#82086
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Conversation
@kotlarmilos
@kotlarmiloskotlarmilos
commented
Feb 14, 2023•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates NativeAOT build integration targets to include ioslike platforms, and contributes to dotnet/sdk#30068.
/cc: @ivanpovazan@akoeplinger
@kotlarmiloskotlarmilos
self-assigned this
Feb 14, 2023
@ghost
ghost
commented
Feb 14, 2023

Copy link


Copy Markdown

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:-
@kotlarmiloskotlarmilos
mentioned this pull request
Feb 14, 2023

Closed

4 tasks
am11
am11
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@kotlarmiloskotlarmilos
changed the title
Update NativeAOT build integration targets to include ios and iossimulatorUpdate NativeAOT build integration targets to include ioslike platformsFeb 15, 2023
@kotlarmilos
kotlarmilos
marked this pull request as ready for review
February 15, 2023 12:18
akoeplinger
akoeplinger
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@filipnavara
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
efb53b5
…iler.SingleEntry.targets
Co-authored-by: Filip Navara <filip.navara@gmail.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

@akoeplingerakoeplinger
mentioned this pull request
Feb 15, 2023
 Merged

kotlarmilosand others
added 2 commits
February 15, 2023 16:17
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
25df2fc
…e.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
6e67656
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
7012650
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
jkotas
jkotas
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@ivanpovazanivanpovazan
mentioned this pull request
Feb 16, 2023
 Merged

1 task
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 16, 2023

Closed

ivanpovazan
ivanpovazan
reviewed
Feb 17, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

 <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>
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Correct, otherwise it won't select the first match.
@am11am11Feb 17, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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...).
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@am11am11Feb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

can we agree on the implementation for this PR, so we can close it?
Sure, I'll follow-up.
@jkotasjkotasFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

@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).
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

 <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" />
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

nit: Use $(TargetOS.StartsWith('tvos'))
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I also find the explicit version easier to reason about.
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
FWIW: Failures are unrelated
@kotlarmilos
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 17, 2023

Closed

4 tasks
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
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
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
[QUIC] Missing libmsquic on tested platforms #81901
Tracking issue: #81901
@am11am11
mentioned this pull request
Feb 17, 2023
 Merged

@filipnavarafilipnavara
mentioned this pull request
Feb 18, 2023
 Merged

ivanpovazan
ivanpovazan
approved these changes
Feb 20, 2023
View reviewed changes
@ivanpovazanivanpovazan
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

lgtm!
@MichalStrehovsky is there anything else that would prevent us from merging this ?
MichalStrehovsky
MichalStrehovsky
approved these changes
Feb 20, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
 <ItemGroup>
 <NetCoreAppNativeLibrary Include="System.Native" />
 <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
 <!-- FIXME: The library is currently not available for iOS-like platforms -->
@MichalStrehovskyMichalStrehovskyFeb 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Do we have an issue we could link to?
@ivanpovazanivanpovazanFeb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just created and linked: #82389
@kotlarmilos
kotlarmilos
merged commit 06dd126
into
dotnet:mainFeb 20, 2023
@kotlarmilos
kotlarmilos
deleted the

feature/nativeaot-targets-ios

branch
February 20, 2023 09:09
@ghostghost
locked as resolved and limited conversation to collaborators
Mar 22, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marek-safarmarek-safarmarek-safar left review comments
@akoeplingerakoeplingerakoeplinger left review comments
@jkotasjkotasjkotas left review comments
@ivanpovazanivanpovazanivanpovazan approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes

+2 more reviewers

@filipnavarafilipnavarafilipnavara approved these changes
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@kotlarmiloskotlarmilos

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@kotlarmilos@ivanpovazan@marek-safar@akoeplinger@filipnavara@am11@jkotas@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update NativeAOT build integration targets to include ioslike platforms - #82086
Merged
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Feb 20, 2023
Merged
Update NativeAOT build integration targets to include ioslike platforms#82086
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Conversation
@kotlarmilos
@kotlarmiloskotlarmilos
commented
Feb 14, 2023•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates NativeAOT build integration targets to include ioslike platforms, and contributes to dotnet/sdk#30068.
/cc: @ivanpovazan@akoeplinger
@kotlarmiloskotlarmilos
self-assigned this
Feb 14, 2023
@ghost
ghost
commented
Feb 14, 2023

Copy link


Copy Markdown

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:-
@kotlarmiloskotlarmilos
mentioned this pull request
Feb 14, 2023

Closed

4 tasks
am11
am11
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@kotlarmiloskotlarmilos
changed the title
Update NativeAOT build integration targets to include ios and iossimulatorUpdate NativeAOT build integration targets to include ioslike platformsFeb 15, 2023
@kotlarmilos
kotlarmilos
marked this pull request as ready for review
February 15, 2023 12:18
akoeplinger
akoeplinger
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@filipnavara
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
efb53b5
…iler.SingleEntry.targets
Co-authored-by: Filip Navara <filip.navara@gmail.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

@akoeplingerakoeplinger
mentioned this pull request
Feb 15, 2023
 Merged

kotlarmilosand others
added 2 commits
February 15, 2023 16:17
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
25df2fc
…e.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
6e67656
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
7012650
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
jkotas
jkotas
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@ivanpovazanivanpovazan
mentioned this pull request
Feb 16, 2023
 Merged

1 task
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 16, 2023

Closed

ivanpovazan
ivanpovazan
reviewed
Feb 17, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

 <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>
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Correct, otherwise it won't select the first match.
@am11am11Feb 17, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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...).
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@am11am11Feb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

can we agree on the implementation for this PR, so we can close it?
Sure, I'll follow-up.
@jkotasjkotasFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

@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).
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

 <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" />
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

nit: Use $(TargetOS.StartsWith('tvos'))
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I also find the explicit version easier to reason about.
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
FWIW: Failures are unrelated
@kotlarmilos
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 17, 2023

Closed

4 tasks
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
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
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
[QUIC] Missing libmsquic on tested platforms #81901
Tracking issue: #81901
@am11am11
mentioned this pull request
Feb 17, 2023
 Merged

@filipnavarafilipnavara
mentioned this pull request
Feb 18, 2023
 Merged

ivanpovazan
ivanpovazan
approved these changes
Feb 20, 2023
View reviewed changes
@ivanpovazanivanpovazan
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

lgtm!
@MichalStrehovsky is there anything else that would prevent us from merging this ?
MichalStrehovsky
MichalStrehovsky
approved these changes
Feb 20, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
 <ItemGroup>
 <NetCoreAppNativeLibrary Include="System.Native" />
 <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
 <!-- FIXME: The library is currently not available for iOS-like platforms -->
@MichalStrehovskyMichalStrehovskyFeb 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Do we have an issue we could link to?
@ivanpovazanivanpovazanFeb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just created and linked: #82389
@kotlarmilos
kotlarmilos
merged commit 06dd126
into
dotnet:mainFeb 20, 2023
@kotlarmilos
kotlarmilos
deleted the

feature/nativeaot-targets-ios

branch
February 20, 2023 09:09
@ghostghost
locked as resolved and limited conversation to collaborators
Mar 22, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marek-safarmarek-safarmarek-safar left review comments
@akoeplingerakoeplingerakoeplinger left review comments
@jkotasjkotasjkotas left review comments
@ivanpovazanivanpovazanivanpovazan approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes

+2 more reviewers

@filipnavarafilipnavarafilipnavara approved these changes
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@kotlarmiloskotlarmilos

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@kotlarmilos@ivanpovazan@marek-safar@akoeplinger@filipnavara@am11@jkotas@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update NativeAOT build integration targets to include ioslike platforms - #82086
Merged
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Feb 20, 2023
Merged
Update NativeAOT build integration targets to include ioslike platforms#82086
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Conversation
@kotlarmilos
@kotlarmiloskotlarmilos
commented
Feb 14, 2023•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates NativeAOT build integration targets to include ioslike platforms, and contributes to dotnet/sdk#30068.
/cc: @ivanpovazan@akoeplinger
@kotlarmiloskotlarmilos
self-assigned this
Feb 14, 2023
@ghost
ghost
commented
Feb 14, 2023

Copy link


Copy Markdown

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:-
@kotlarmiloskotlarmilos
mentioned this pull request
Feb 14, 2023

Closed

4 tasks
am11
am11
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@kotlarmiloskotlarmilos
changed the title
Update NativeAOT build integration targets to include ios and iossimulatorUpdate NativeAOT build integration targets to include ioslike platformsFeb 15, 2023
@kotlarmilos
kotlarmilos
marked this pull request as ready for review
February 15, 2023 12:18
akoeplinger
akoeplinger
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@filipnavara
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
efb53b5
…iler.SingleEntry.targets
Co-authored-by: Filip Navara <filip.navara@gmail.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

@akoeplingerakoeplinger
mentioned this pull request
Feb 15, 2023
 Merged

kotlarmilosand others
added 2 commits
February 15, 2023 16:17
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
25df2fc
…e.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
6e67656
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
7012650
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
jkotas
jkotas
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@ivanpovazanivanpovazan
mentioned this pull request
Feb 16, 2023
 Merged

1 task
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 16, 2023

Closed

ivanpovazan
ivanpovazan
reviewed
Feb 17, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

 <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>
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Correct, otherwise it won't select the first match.
@am11am11Feb 17, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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...).
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@am11am11Feb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

can we agree on the implementation for this PR, so we can close it?
Sure, I'll follow-up.
@jkotasjkotasFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

@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).
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

 <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" />
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

nit: Use $(TargetOS.StartsWith('tvos'))
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I also find the explicit version easier to reason about.
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
FWIW: Failures are unrelated
@kotlarmilos
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 17, 2023

Closed

4 tasks
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
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
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
[QUIC] Missing libmsquic on tested platforms #81901
Tracking issue: #81901
@am11am11
mentioned this pull request
Feb 17, 2023
 Merged

@filipnavarafilipnavara
mentioned this pull request
Feb 18, 2023
 Merged

ivanpovazan
ivanpovazan
approved these changes
Feb 20, 2023
View reviewed changes
@ivanpovazanivanpovazan
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

lgtm!
@MichalStrehovsky is there anything else that would prevent us from merging this ?
MichalStrehovsky
MichalStrehovsky
approved these changes
Feb 20, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
 <ItemGroup>
 <NetCoreAppNativeLibrary Include="System.Native" />
 <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
 <!-- FIXME: The library is currently not available for iOS-like platforms -->
@MichalStrehovskyMichalStrehovskyFeb 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Do we have an issue we could link to?
@ivanpovazanivanpovazanFeb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just created and linked: #82389
@kotlarmilos
kotlarmilos
merged commit 06dd126
into
dotnet:mainFeb 20, 2023
@kotlarmilos
kotlarmilos
deleted the

feature/nativeaot-targets-ios

branch
February 20, 2023 09:09
@ghostghost
locked as resolved and limited conversation to collaborators
Mar 22, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marek-safarmarek-safarmarek-safar left review comments
@akoeplingerakoeplingerakoeplinger left review comments
@jkotasjkotasjkotas left review comments
@ivanpovazanivanpovazanivanpovazan approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes

+2 more reviewers

@filipnavarafilipnavarafilipnavara approved these changes
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@kotlarmiloskotlarmilos

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@kotlarmilos@ivanpovazan@marek-safar@akoeplinger@filipnavara@am11@jkotas@MichalStrehovsky

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Update NativeAOT build integration targets to include ioslike platforms - #82086
Merged
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Feb 20, 2023
Merged
Update NativeAOT build integration targets to include ioslike platforms#82086
kotlarmilos merged 21 commits into
dotnet:mainfrom 
kotlarmilos:feature/nativeaot-targets-ios
Conversation
@kotlarmilos
@kotlarmiloskotlarmilos
commented
Feb 14, 2023•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates NativeAOT build integration targets to include ioslike platforms, and contributes to dotnet/sdk#30068.
/cc: @ivanpovazan@akoeplinger
@kotlarmiloskotlarmilos
self-assigned this
Feb 14, 2023
@ghost
ghost
commented
Feb 14, 2023

Copy link


Copy Markdown

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:-
@kotlarmiloskotlarmilos
mentioned this pull request
Feb 14, 2023

Closed

4 tasks
am11
am11
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 14, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@kotlarmiloskotlarmilos
changed the title
Update NativeAOT build integration targets to include ios and iossimulatorUpdate NativeAOT build integration targets to include ioslike platformsFeb 15, 2023
@kotlarmilos
kotlarmilos
marked this pull request as ready for review
February 15, 2023 12:18
akoeplinger
akoeplinger
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@filipnavara
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
efb53b5
…iler.SingleEntry.targets
Co-authored-by: Filip Navara <filip.navara@gmail.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

@akoeplingerakoeplinger
mentioned this pull request
Feb 15, 2023
 Merged

kotlarmilosand others
added 2 commits
February 15, 2023 16:17
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
25df2fc
…e.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
6e67656
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
am11
am11
reviewed
Feb 15, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Outdated

@kotlarmilos@am11
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…
7012650
…iler.SingleEntry.targets
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
jkotas
jkotas
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

filipnavara
filipnavara
reviewed
Feb 16, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

@ivanpovazanivanpovazan
mentioned this pull request
Feb 16, 2023
 Merged

1 task
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 16, 2023

Closed

ivanpovazan
ivanpovazan
reviewed
Feb 17, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
Outdated

 <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>
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Correct, otherwise it won't select the first match.
@am11am11Feb 17, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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...).
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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?
@am11am11Feb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

can we agree on the implementation for this PR, so we can close it?
Sure, I'll follow-up.
@jkotasjkotasFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

@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).
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
Outdated

 <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" />
@ivanpovazanivanpovazanFeb 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

nit: Use $(TargetOS.StartsWith('tvos'))
@kotlarmiloskotlarmilosFeb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I also find the explicit version easier to reason about.
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
FWIW: Failures are unrelated
@kotlarmilos
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
Failure looks relevant. Seems that 407edf3 conditioned out libraries related to msquic.
@build-analysisbuild-analysisBot
mentioned this pull request
Feb 17, 2023

Closed

4 tasks
@ivanpovazan
ivanpovazan
commented
Feb 17, 2023

Copy link


Copy Markdown

Member
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
kotlarmilos
commented
Feb 17, 2023

Copy link


Copy Markdown

MemberAuthor
[QUIC] Missing libmsquic on tested platforms #81901
Tracking issue: #81901
@am11am11
mentioned this pull request
Feb 17, 2023
 Merged

@filipnavarafilipnavara
mentioned this pull request
Feb 18, 2023
 Merged

ivanpovazan
ivanpovazan
approved these changes
Feb 20, 2023
View reviewed changes
@ivanpovazanivanpovazan
left a comment
•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

lgtm!
@MichalStrehovsky is there anything else that would prevent us from merging this ?
MichalStrehovsky
MichalStrehovsky
approved these changes
Feb 20, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
 <ItemGroup>
 <NetCoreAppNativeLibrary Include="System.Native" />
 <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
 <!-- FIXME: The library is currently not available for iOS-like platforms -->
@MichalStrehovskyMichalStrehovskyFeb 20, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Do we have an issue we could link to?
@ivanpovazanivanpovazanFeb 20, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just created and linked: #82389
@kotlarmilos
kotlarmilos
merged commit 06dd126
into
dotnet:mainFeb 20, 2023
@kotlarmilos
kotlarmilos
deleted the

feature/nativeaot-targets-ios

branch
February 20, 2023 09:09
@ghostghost
locked as resolved and limited conversation to collaborators
Mar 22, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marek-safarmarek-safarmarek-safar left review comments
@akoeplingerakoeplingerakoeplinger left review comments
@jkotasjkotasjkotas left review comments
@ivanpovazanivanpovazanivanpovazan approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes

+2 more reviewers

@filipnavarafilipnavarafilipnavara approved these changes
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@kotlarmiloskotlarmilos

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@kotlarmilos@ivanpovazan@marek-safar@akoeplinger@filipnavara@am11@jkotas@MichalStrehovsky