Skip to content

Commit 9d1b795

Browse files
[release/10.0] Guard EF file generation against design-time builds to fix AOT build fork bomb (#38386)
Fixes #38087 Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
1 parent a036cbb commit 9d1b795

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ For Publish:
4141
-->
4242

4343
<Target Name="_EFGenerateFilesAfterBuild"
44-
Condition="'$(_EFGenerationStage)'=='' And '$(EFOptimizeContext)'=='true' And ('$(EFScaffoldModelStage)'=='build' Or '$(EFPrecompileQueriesStage)'=='build')">
44+
Condition="'$(_EFGenerationStage)'=='' And '$(DesignTimeBuild)' != 'True' And '$(EFOptimizeContext)'=='true' And ('$(EFScaffoldModelStage)'=='build' Or '$(EFPrecompileQueriesStage)'=='build')">
4545
<MSBuild Projects="$(MSBuildProjectFullPath)"
4646
Targets="_EFGenerateFiles"
4747
BuildInParallel="$(BuildInParallel)"
@@ -52,7 +52,7 @@ For Publish:
5252
<Target Name="_EFGenerateFilesBeforePublish"
5353
AfterTargets="GetCopyToPublishDirectoryItems"
5454
BeforeTargets="GeneratePublishDependencyFile"
55-
Condition="'$(_EFGenerationStage)'=='' And ('$(EFScaffoldModelStage)'=='publish' Or '$(EFPrecompileQueriesStage)'=='publish') And ('$(EFOptimizeContext)'=='true' Or ('$(EFOptimizeContext)'=='' And ('$(_EFPublishAOT)'=='true' Or '$(PublishAOT)'=='true')))">
55+
Condition="'$(_EFGenerationStage)'=='' And '$(DesignTimeBuild)' != 'True' And ('$(EFScaffoldModelStage)'=='publish' Or '$(EFPrecompileQueriesStage)'=='publish') And ('$(EFOptimizeContext)'=='true' Or ('$(EFOptimizeContext)'=='' And ('$(_EFPublishAOT)'=='true' Or '$(PublishAOT)'=='true')))">
5656
<MSBuild Projects="$(MSBuildProjectFullPath)"
5757
Targets="_EFGenerateFiles"
5858
BuildInParallel="$(BuildInParallel)"

0 commit comments

Comments
 (0)