Look up the target OS for crossgen2 using the full target RID #45566
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
…nstead of an OS-only portion of the RID Our source-build partners only add the full OS-Arch nonportable RID to the RID graph, so the RID graph lookup would fail on an OS-only RID lookup. Also, since the linux-musl RIDs import the linux RID, we can simplify the lookup to not look up linux-musl specifically.
ivdiazsa
reviewed
Dec 19, 2024
| var runtimeGraph = new RuntimeGraphCache(this).GetRuntimeGraph(RuntimeGraphPath); | ||
| string portablePlatform = NuGetUtils.GetBestMatchingRid( | ||
| runtimeGraph, | ||
| _targetPlatform, | ||
| new[] { "linux", "linux-musl", "osx", "win", "freebsd", "illumos" }, |
There was a problem hiding this comment.
A bit ootl here, is Linux-Musl now bundled together with Linux? Or why are we removing it here?
There was a problem hiding this comment.
The linux-musl RID has always had the linux RID as a parent. It's not 100% correct, but we can't really change it at this point due to back-compat.
There was a problem hiding this comment.
Basically, we could have done this all along (just use linux for both linux and linux-musl here), we just didn't.
This was referenced Dec 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Lookup the target OS for crossgen2 invocation based on the full RID instead of an OS-only portion of the RID. In source-build scenarios, we will likely only have a full
os-archRID in the RID graph. If we use only theosRID, we won't find a matching OS RID in the graph for the target OS. If we use the fullos-archRID, we'll be able to find our target in the graph.This work allows us to remove the
portablePlatform == null && _hostRuntimeIdentifier == _targetRuntimeIdentifierspecial case, as we'll now find the portable platform based on_targetRuntimeIdentifier.Also remove the special checks for
linux-muslas thelinux-muslRID imports thelinuxRID, so we can just look forlinuxand get the right behavior.