Rework bootstrap layout usage for AOT publish of cdac project#122471
Merged
hoyosjs merged 3 commits intodotnet:mainfrom Dec 13, 2025
Merged
Rework bootstrap layout usage for AOT publish of cdac project#122471hoyosjs merged 3 commits intodotnet:mainfrom
hoyosjs merged 3 commits intodotnet:mainfrom
Conversation
Co-authored-by: Jeremy Koritzinsky <Jeremy.Koritzinsky@microsoft.com>
jkoritzinsky
approved these changes
Dec 12, 2025
Contributor
|
Tagging subscribers to this area: @hoyosjs |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors the bootstrap layout configuration for AOT publishing in the cdac project. Instead of broadly passing UseBootstrapLayout to all subprojects based on IsSourceProject, it introduces a new NeedsAotPublish property that projects can opt into, making the bootstrap layout activation more explicit and targeted.
Key changes:
- Introduced
NeedsAotPublishproperty to explicitly mark projects requiring AOT publish - Removed global
UseBootstrapLayoutpropagation from subproject.props - Consolidated
UseLocalTargetingRuntimePacklogic into eng/targetingpacks.targets
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/native/managed/subproject.props | Removed automatic propagation of UseBootstrapLayout to subprojects |
| src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj | Added NeedsAotPublish property to explicitly opt into AOT publishing |
| src/native/managed/Directory.Build.targets | Changed condition to use NeedsAotPublish instead of IsSourceProject for importing native-library.targets |
| src/native/managed/Directory.Build.props | Refactored to conditionally set UseBootstrapLayout based on NeedsAotPublish and UseBootstrap; changed import condition for native-library.props |
| eng/targetingpacks.targets | Consolidated UseLocalTargetingRuntimePack logic by adding UseBootstrapLayout to the condition, replacing property group previously in Directory.Build.props |
This was referenced Dec 12, 2025
Open
Member
|
some failures look related |
am11
reviewed
Dec 12, 2025
Should fix the failures with a minimal diff.
Member
|
/ba-g wasm test helix bad exit |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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 cdac was setting a slew of properties that had cascading effects on the bootstrap targetting pack logic. Simplify this to only kick in when using AOT publishing in-build.