Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate <NativeAotSupported definitions #103273

Merged
merged 17 commits into from
Jun 12, 2024

Conversation

am11
Copy link
Member

@am11 am11 commented Jun 11, 2024

No description provided.

Copy link
Contributor

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

@am11 am11 mentioned this pull request Jun 11, 2024
Copy link
Member

@MichalStrehovsky MichalStrehovsky left a comment

Choose a reason for hiding this comment

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

Looks good otherwise, thanks!

<!-- Decide if we're going to do the NativeAOT builds -->
<PropertyGroup>
<!-- disable on Mono, for now -->
<SupportsNativeAotComponents Condition="'$(SupportsNativeAotComponents)' == '' and '$(RuntimeFlavor)' == 'Mono'">false</SupportsNativeAotComponents>
Copy link
Member

Choose a reason for hiding this comment

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

Cc @lambdageek - we might be losing this exclusion, but that doesn't seem harmful on its own.

Copy link
Member

Choose a reason for hiding this comment

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

yea it's ok. I don't think there's anything that depends on compile-native.proj when we're building Mono, so this check was probably redundant

Copy link
Member

Choose a reason for hiding this comment

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

I think in an earlier iteration of the cdacreader build infrastructure I had compile-native as a separate subset and it was getting pulled in from some mono cross-compiler scenarios. But now it's only pulled in from coreclr's runtime-prereqs.proj, which shouldn't be triggered by any mono builds

src/installer/pkg/projects/netcoreappRIDs.props Outdated Show resolved Hide resolved
Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
@am11
Copy link
Member Author

am11 commented Jun 12, 2024

I have subsequent changes on top of this to consolidate LocateNativeCompiler targets (scattered in multiple places). When this is merged, I'll open a next PR.

@MichalStrehovsky
Copy link
Member

MichalStrehovsky commented Jun 12, 2024

I have subsequent changes on top of this to consolidate LocateNativeCompiler targets (scattered in multiple places). When this is merged, I'll open a next PR.

I want to give @lambdageek at least a chance to see this since I'm not directly involved in compile-native and might not know about all the workflows (I don't know why it excludes runtimeflavor mono).

(We're all probably in different time zones)

@dotnet dotnet deleted a comment from azure-pipelines bot Jun 12, 2024
@lambdageek
Copy link
Member

/azp run runtime-extra-platforms,runtime-ioslike

Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@lambdageek lambdageek merged commit b86c463 into dotnet:main Jun 12, 2024
187 of 208 checks passed
MichalStrehovsky added a commit that referenced this pull request Jun 13, 2024
I think we had a bad interaction between #103332 and #103273.

Windows x86 with native AOT got broken in Preview 5 (#86573 (comment)).
lewing pushed a commit that referenced this pull request Jun 13, 2024
I think we had a bad interaction between #103332 and #103273.

Windows x86 with native AOT got broken in Preview 5 (#86573 (comment)).
MichalStrehovsky added a commit that referenced this pull request Jun 13, 2024
This was enabled in #103273 but needs more work to actually build. Official builds are failing.
MichalStrehovsky added a commit that referenced this pull request Jun 14, 2024
This was enabled in #103273 but needs more work to actually build. Official builds are failing.
MichalStrehovsky added a commit to MichalStrehovsky/runtime that referenced this pull request Jun 14, 2024
MichalStrehovsky added a commit that referenced this pull request Jun 15, 2024
* Revert "Do not set UseNativeAotForComponents for arm32 MUSL (#103469)"

This reverts commit f1f0750.

* Revert "Set UseNativeAotForComponents to false on bionic (#103454)"

This reverts commit d901213.

* Revert "Try fixing x86 Windows legs (#103411)"

This reverts commit 6927fea.

* Revert "Consolidate <NativeAotSupported definitions (#103273)"

This reverts commit b86c463.
am11 added a commit to am11/runtime that referenced this pull request Jun 15, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Jul 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants