Skip to content

Conversation

@hoyosjs
Copy link
Member

@hoyosjs hoyosjs commented Dec 12, 2025

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.

hoyosjs and others added 2 commits December 11, 2025 15:49
Co-authored-by: Jeremy Koritzinsky <Jeremy.Koritzinsky@microsoft.com>
@dotnet-policy-service
Copy link
Contributor

Tagging subscribers to this area: @hoyosjs
See info in area-owners.md if you want to be subscribed.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 NeedsAotPublish property to explicitly mark projects requiring AOT publish
  • Removed global UseBootstrapLayout propagation from subproject.props
  • Consolidated UseLocalTargetingRuntimePack logic 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

@akoeplinger
Copy link
Member

some failures look related

Should fix the failures with a minimal diff.
@jkoritzinsky
Copy link
Member

/ba-g wasm test helix bad exit

@hoyosjs hoyosjs merged commit 3da1389 into dotnet:main Dec 13, 2025
151 of 154 checks passed
@hoyosjs hoyosjs deleted the juhoyosa/bootstrap-layout branch December 13, 2025 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants