Skip to content

Reenable PublishDotnetAot target#54175

Merged
NikolaMilosavljevic merged 2 commits into
dotnet:mainfrom
NikolaMilosavljevic:aot.fix
May 6, 2026
Merged

Reenable PublishDotnetAot target#54175
NikolaMilosavljevic merged 2 commits into
dotnet:mainfrom
NikolaMilosavljevic:aot.fix

Conversation

@NikolaMilosavljevic
Copy link
Copy Markdown
Member

This target was disabled with #54067 as it was believed to have caused some build issues.

First attempt to reenable it included a "required" fix - #54114

However, that change was incorrect and caused several jobs to fail in official CI run.

I am now just reenabling the original target code, as it appears to be working fine.

Verification

https://dev.azure.com/dnceng-public/public/_build/results?buildId=1407885&view=results

Single failure in Mac OS leg seems to be intermittent and unrelated.

Copy link
Copy Markdown
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 re-enables the PublishDotnetAot MSBuild target in the redist layout generation so the SDK build once again publishes the dotnet-aot NativeAOT shared library into the SDK layout (for supported host-native RIDs).

Changes:

  • Re-enabled the PublishDotnetAot target by restoring its original RID-based condition (instead of Condition="false").

Comment thread src/Layout/redist/targets/GenerateLayout.targets
@NikolaMilosavljevic
Copy link
Copy Markdown
Member Author

/azp run sdk-unified-build

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Split Restore and Publish into separate MSBuild invocations in the
PublishDotnetAot target. Use RuntimeIdentifiers (plural) for Restore
to force NuGet to add the RID-specific target to project.assets.json,
even after Arcade's centralized restore already ran without
RuntimeIdentifier. Remove IntermediateOutputPath to avoid propagating
it to ProjectReferences.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@NikolaMilosavljevic
Copy link
Copy Markdown
Member Author

OK - this seems to be working now. Ready for review - @JeremyKuhne @marcpopMSFT

Copy link
Copy Markdown
Member

@JeremyKuhne JeremyKuhne left a comment

Choose a reason for hiding this comment

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

Looks good

@NikolaMilosavljevic NikolaMilosavljevic merged commit 6dc6b33 into dotnet:main May 6, 2026
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants