Skip to content

Revert "Consolidate <NativeAotSupported definitions (#103273)" - #103497

Merged
MichalStrehovsky merged 4 commits into
dotnet:mainfrom
MichalStrehovsky:rollbacks
Jun 15, 2024
Merged

Revert "Consolidate <NativeAotSupported definitions (#103273)"#103497
MichalStrehovsky merged 4 commits into
dotnet:mainfrom
MichalStrehovsky:rollbacks

Conversation

@MichalStrehovsky

Copy link
Copy Markdown
Member

These failures are actually nondeterministic:

https://dnceng.visualstudio.com/internal/_build/results?buildId=2474015&view=results was a clean build.

https://dnceng.visualstudio.com/internal/_build/results?buildId=2474150&view=results after that failed in the MUSL x64 leg the same way I posted in #103469 (seemingly used wrong path to invoke ilc).

Cc @am11 sorry I got to roll this back for now.

@am11

am11 commented Jun 15, 2024

Copy link
Copy Markdown
Member

It only requires reverting one file src/native/managed/compile-native.proj, not everything.

am11 added a commit to am11/runtime that referenced this pull request Jun 15, 2024
@am11 am11 mentioned this pull request Jun 15, 2024
@MichalStrehovsky

Copy link
Copy Markdown
Member Author

/ba-g infra timeouts timeouts

@MichalStrehovsky
MichalStrehovsky merged commit 7e9cab2 into dotnet:main Jun 15, 2024
@MichalStrehovsky
MichalStrehovsky deleted the rollbacks branch June 15, 2024 08:16
@MichalStrehovsky

Copy link
Copy Markdown
Member Author

It only requires reverting one file src/native/managed/compile-native.proj, not everything.

My boss's boss was asking about this last night. Apparently nobody bothered to merge this while I was sleeping. I'll not take any more risks with this right now.

@am11

am11 commented Jun 15, 2024

Copy link
Copy Markdown
Member

Yea, no rush. Lets unblock the official build then revert the revert. Pretty sure #103508 will fix the issue as I was able to repro it locally.

am11 added a commit to am11/runtime that referenced this pull request Jun 15, 2024
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 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

3 participants