Skip to content

Commit 11f3824

Browse files
committed
dependency
1 parent 33d17a9 commit 11f3824

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/Tasks/Microsoft.Common.CurrentVersion.targets

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3661,9 +3661,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
36613661
_GenerateCompileInputs
36623662
36633663
Create the _CoreCompileResourceInputs list of inputs to the CoreCompile target.
3664+
Requires PrepareResources to have run first to set metadata on EmbeddedResource items.
36643665
============================================================
36653666
-->
3666-
<Target Name="_GenerateCompileInputs">
3667+
<Target Name="_GenerateCompileInputs" DependsOnTargets="PrepareResources">
36673668

36683669
<MSBuildInternalMessage
36693670
Condition="'@(ManifestResourceWithNoCulture)'!='' and '%(ManifestResourceWithNoCulture.EmittedForCompatibilityOnly)'==''"
@@ -3846,12 +3847,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
38463847
contribute to incremental build inconsistencies.
38473848
============================================================
38483849
-->
3849-
<Target Name="_GenerateCompileDependencyCache" Condition="'$(DesignTimeBuild)' != 'true' and '$(BuildingProject)' == 'true'" DependsOnTargets="ResolveAssemblyReferences;PrepareResources">
3850-
3851-
<!-- Explicitly call _GenerateCompileInputs to ensure _CoreCompileResourceInputs is populated.
3852-
This is necessary because in NoBuild scenarios, _GenerateCompileInputs may be skipped by MSBuild's
3853-
target skipping logic, leaving _CoreCompileResourceInputs empty. Using CallTarget ensures it runs. -->
3854-
<CallTarget Targets="_GenerateCompileInputs" />
3850+
<Target Name="_GenerateCompileDependencyCache" Condition="'$(DesignTimeBuild)' != 'true' and '$(BuildingProject)' == 'true'" DependsOnTargets="ResolveAssemblyReferences;_GenerateCompileInputs">
38553851
<ItemGroup>
38563852
<CustomAdditionalCompileInputs Include="$(IntermediateOutputPath)$(MSBuildProjectFile).CoreCompileInputs.cache" />
38573853
<CoreCompileCache Include="@(Compile)" />

0 commit comments

Comments
 (0)