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

Fix building the host-targeting components and packing ILC #111552

Merged
merged 5 commits into from
Jan 17, 2025

Conversation

jkoritzinsky
Copy link
Member

NETCoreSdkRuntimeIdentifier isn't set until after the Microsoft.NET.Sdk's Sdk.props file has been imported fully. Use the "after Sdk props" hook to set the "should build host tools" property so project files and item groups in Subsets.props can see the correct property value.

Also change how we publish ILCompiler to better follow the model of crossgen2. This restores the expected behavior of publishing an AOT or single-file ilc.

Fixes failures in dotnet/sdk#45990

Copy link
Contributor

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Directory.Build.props Outdated Show resolved Hide resolved
jkoritzinsky added a commit to jkoritzinsky/runtime that referenced this pull request Jan 17, 2025
@am11
Copy link
Member

am11 commented Jan 17, 2025

We need these files on linux-x64:

image

With this PR (and main), we have 201 files in tools/ including the whole sfx.
image

@jkoritzinsky
Copy link
Member Author

@am11 where are you seeing those files being added? I'm checking the CI builds in this PR and it looks like I fixed that in 256edb9.

If this was checked locally, did you clean your build? The artifacts would have been left there from before the fix and caused issues.

@jkoritzinsky
Copy link
Member Author

Yeah I've checked all of the binlogs and they're doing the right thing (no sfx in the tools dir). I'm going to merge this in.

@jkoritzinsky jkoritzinsky merged commit 6c58f79 into dotnet:main Jan 17, 2025
145 of 147 checks passed
@jkoritzinsky jkoritzinsky deleted the import-ordering branch January 17, 2025 22:39
@am11
Copy link
Member

am11 commented Jan 17, 2025

I was building it in GHA but it was using main branch https://github.com/am11/CrossRepoCITesting/releases/tag/linux_x64_12836857446. The PR branch did removed the extra files https://github.com/am11/CrossRepoCITesting/releases/tag/linux_x64_12837954845. Sorry for the confusion. Good fix! 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants