-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Move corehost under src/native #45765
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
Conversation
|
Tagging subscribers to this area: @vitek-karas, @agocke Issue DetailsCommits:
|
vitek-karas
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just nits - I would split the PR into at least two - the move itself and a followup "cleanup".
src/installer/corehost.proj
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc @ViktorHofer
This is the only corehost related file I had to keep under src/installer directory, as it is sharing some targets (related to Version/GitSHA1 etc.) with rest of the installer infra. Looks like something that can be shared via src/tasks/installer in the future?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, src/tasks/* only defines tasks. The repo root's Directory.Build.targets would be used to share targets.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We also have eng/versioning.targets for very similar stuff. (and yup, targets can be converted to tasks. 😉)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, but as a principle we should only create tasks when pure msbuild isn't sufficient.
|
It is not quite right that this is linking coreclr libs. It would be nice to keep the dependencies linear (e.g. src/native->src/coreclr). |
|
As I understand this change only moves the files. It does not change how things are built, or tested. I am not sure we want to do file move as a separate step. We evidently can and it looks like a step to the right direction. |
|
Changing static host to build in clr partition may be a bit more involved. Because of that the static host picks the corresponding lib files from the libs artefacts. There is also an issue of testing. If we build static host in clr partition, we probably should test it there as well. This was not yet discussed. Maybe it is a simple matter. I am not sure. |
|
Rebased, conflicts resolved. Installer legs on all supported platforms are green.
@vitek-karas, made it as simple as possible. Touching only 36 lines fixing paths. |
|
@am11 would you mind once again resolving the conflicts? Thanks a lot for your work. @vitek-karas @VSadov after the conflicts are resolved could you please give this another look? Thanks
@jkotas is this something that should be addressed pre-merge? Maybe I'm misunderstanding but it sounds to me like the cross dependency was already there pre-move. |
|
I am working on building host (or at least singlefilehost) in clr partition. It should deal with the dependency that @jkotas mentioned and make I think moving the files and changing the build are fairly independent. I would be ok with merging this PR. |
|
Ops, I pushed after resetting to master and before cherry-picking. 🤦 |
Commits: