Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets #91077
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
…oft.NET.CrossGen.targets
ViktorHofer
approved these changes
Aug 24, 2023
|
We should backport this into release/8.0. |
|
Yep, will backport. |
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5968286720 |
This was referenced Aug 24, 2023
am11
reviewed
Aug 24, 2023
| @@ -443,7 +443,7 @@ Copyright (c) .NET Foundation. All rights reserved. | |||
| <ResolveReadyToRunCompilers RuntimePacks="@(ResolvedRuntimePack)" | |||
| Crossgen2Packs="@(ResolvedCrossgen2Pack)" | |||
| TargetingPacks="@(ResolvedTargetingPack)" | |||
| RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)" | |||
| RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))" | |||
There was a problem hiding this comment.
Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj:
runtime/src/libraries/pretest.proj
Line 105 in f8d9b3c
ghost
locked as resolved and limited conversation to collaborators
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.
The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the
RuntimeIdentifierGraphPathif set (SDK always sets starting with .NET 8 RC1), otherwiseBundledRuntimeIdentifierGraphFile.From what I can tell, the runtime repo does not actually use this particular
ResolveReadyToRunCompilerstarget right now. The only place I found pulling in this target file isruntime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
Line 176 in 658bdd0
but the project also pulls in ReadyToRun.targets
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
Line 29 in 658bdd0
which overrides
ResolveReadyToRunCompilersruntime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
Line 2 in 658bdd0
Fixes #90977
cc @dsplaisted @tmds