diff --git a/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets b/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets
index cbf43363318..4ff9238fa41 100644
--- a/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets
+++ b/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets
@@ -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>
+    </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)" />
 
     <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">
@@ -126,8 +134,6 @@ For Publish:
     <WriteLinesToFile File="$(EFGeneratedSourcesPublishFile)"
                       Lines="$(_EFGeneratedFiles)"
                       Condition="'$(_EFGenerationStage)'=='publish'" />
-
-    <CallTarget Targets="Build" />
   </Target>
 
   <Target Name="_EFValidateProperties"