Skip to content

Fix NativeAOT publish: rebuild RID-specific assembly with generated sources #38322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 11 commits into
base: main
Choose a base branch
from
+12 −6
Open

Fix NativeAOT publish: rebuild RID-specific assembly with generated sources #38322

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5e69668
Apply remaining changes
Copilot May 27, 2026
e71aa27
Apply fix to Microsoft.EntityFrameworkCore.Tasks.targets and remove t…
Copilot May 27, 2026
eca72cb
Also clear RuntimeIdentifier/SelfContained on inner Build invocation …
Copilot May 28, 2026
de16682
Make RID-clearing in inner _EFGenerateFiles MSBuild calls conditional…
Copilot May 28, 2026
57d16cb
Preserve RID and add InterceptorsNamespaces for AOT publish
Copilot May 28, 2026
3b79843
Always clear RID and unify third Build call per review feedback
Copilot May 28, 2026
5f56b21
Always run first inner Build so non-AOT publish finds non-RID assembly
Copilot May 28, 2026
2f1085f
Revert default generated interceptors namespace opt-in
Copilot May 28, 2026
a8eba43
Simplify final rebuild to CallTarget Build
Copilot May 28, 2026
7241b18
Clarify CallTarget uses current invocation properties
Copilot May 28, 2026
0c83f88
Restore PublishAot-gated RID clearing in EF inner build flow
Copilot May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,27 @@ For Publish:

<!-- Invokes OptimizeDbContext on projects that had changes since the last time they were optimized -->
<Target Name="_EFGenerateFiles">
<!-- The assembly used for file generation should be compiled without using AOT mode -->
<PropertyGroup>
<!-- Inner builds disable AOT; for AOT publish they also clear RID/SelfContained to use reflection-friendly output. -->
<_EFInnerBuildProperties>Configuration=$(Configuration);Platform=$(Platform);PublishAot=false;_EFGenerationStage=$(_EFGenerationStage)</_EFInnerBuildProperties>
<_EFInnerBuildProperties Condition="'$(PublishAot)'=='true' Or '$(_EFPublishAOT)'=='true'">$(_EFInnerBuildProperties);RuntimeIdentifier=;SelfContained=false</_EFInnerBuildProperties>
Comment on lines +65 to +67
</PropertyGroup>

<MSBuild Projects="$(MSBuildProjectFullPath)"
Targets="Build"
BuildInParallel="$(BuildInParallel)"
ContinueOnError="$(ContinueOnError)"
Condition="'$(PublishAot)'=='true'"
Properties="Configuration=$(Configuration);Platform=$(Platform);PublishAot=false;_EFGenerationStage=$(_EFGenerationStage)" />
Condition="'$(PublishAot)'=='true' Or '$(_EFPublishAOT)'=='true'"
Properties="$(_EFInnerBuildProperties)" />
Comment thread
AndriySvyryd marked this conversation as resolved.

<MSBuild Projects="$(MSBuildProjectFullPath)"
Targets="OptimizeDbContext"
BuildInParallel="$(BuildInParallel)"
ContinueOnError="$(ContinueOnError)"
Properties="Configuration=$(Configuration);Platform=$(Platform);_EFGenerationStage=$(_EFGenerationStage)" />
Properties="$(_EFInnerBuildProperties)" />

<!-- Refresh the RID-specific assembly so it includes the generated sources using the current invocation properties. -->
<CallTarget Targets="Build" />
</Target>

<Target Name="OptimizeDbContext" DependsOnTargets="ResolvePackageAssets">
Expand Down Expand Up @@ -126,8 +134,6 @@ For Publish:
<WriteLinesToFile File="$(EFGeneratedSourcesPublishFile)"
Lines="$(_EFGeneratedFiles)"
Condition="'$(_EFGenerationStage)'=='publish'" />

<CallTarget Targets="Build" />
</Target>

<Target Name="_EFValidateProperties"
Expand Down
Loading