This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
Overhaul external / binplacing / reference from runtime #15705
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mellinoe
reviewed
Feb 2, 2017
external/coreclr/coreclr.depproj
Outdated
| @@ -2,8 +2,6 @@ | |||
| <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> | |||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> | |||
| <PropertyGroup> | |||
| <OutputPath>$(RuntimePath)</OutputPath> | |||
| <!-- WORKAROUND: Force external packages to be restored for x64 until arm packages are fully broughtup--> | |||
There was a problem hiding this comment.
Intentionally removed the comment?
There was a problem hiding this comment.
I see the file was consolidated, but maybe we still want the comment in the new location (runtime.depproj)
There was a problem hiding this comment.
I can add that back, removing the comment was accidental.
There was a problem hiding this comment.
I doctored up the commits to bring that comment back 👍
|
This LGTM. The previous functionality was indeed dangerous if you used it to reference anything violating the project build ordering, and there was nothing stopping that from happening. |
mellinoe
approved these changes
Feb 2, 2017
This switches the external dir to binplace rather than copy to output. This is more flexible as it will conditionally binplace to many locations based on what's needed for the configuration.
Combine these so we have a common runtime project. Thanks to @joperezr for this change.
ReferenceFromRuntime for src projects isn't safe. It allows any source project to reference the output of another source project without properly sequencing the build. This fixes that by changing ReferenceFromRuntime to instead use a ProjectReference to the runtime project for the building configuration and filter that to just the files requested. I also completely block the use of ReferenceFromRuntime in test projects
ericstj
force-pushed
the
runtimeRefPath
branch
from
dd979c3 to
f0fcb69
Compare
picenka21
pushed a commit
to picenka21/runtime
that referenced
this pull request
Feb 18, 2022
Overhaul external / binplacing / reference from runtime Commit migrated from dotnet/corefx@327f4e5
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Best to review commit-by-commit.
First change I made was to switch external to use binplacing logic. Let let us have better control over when to copy and where and allowed copying to multiple locations easily. As part of this I binplace both the primary output (if it exist) as well as all copy-local items.
Second change was to combine coreclr and NETNative into a common runtime project (thanks @joperezr). This was to enable the following change.
Third I fixed ReferenceFromRuntime to use a project reference to the runtime project for src projects, and block its use from tests. This enables us to build multiple configurations at a time that may need different runtime libs without stomping on each other in the runtime path. It also fixes cases where folks might accidentally use ReferenceFromRuntime instead of a project reference.
Finally I noticed that the first change caused a bunch of clashing copies to occur. To fix this (which should be general goodness) I disabled copy local for project references for anything that isn't a test project.
/cc @weshaggard @tarekgh