Skip to content

Commit 6b39cda

Browse files
committed
Condition is evaluated before DependsOnTargets runs.
1 parent 8274532 commit 6b39cda

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

nuget/Microsoft.Windows.CppWinRT.targets

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
3737
<WindowsSDK_MetadataFoundationPath Condition="('$(WindowsSDK_MetadataFoundationPath)'!='') And !Exists($(WindowsSDK_MetadataFoundationPath))">$(WindowsSDK_MetadataPathVersioned)</WindowsSDK_MetadataFoundationPath>
3838

3939
<GetTargetPathDependsOn>
40-
$(GetTargetPathDependsOn);CppWinRTResolveWinMD;
40+
$(GetTargetPathDependsOn);GetCppWinRTMdMergeInputs;CppWinRTResolveWinMD;
4141
</GetTargetPathDependsOn>
4242
<PrepareForBuildDependsOn>
4343
$(PrepareForBuildDependsOn);CppWinRTVerifyKitVersion;
@@ -114,7 +114,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
114114

115115
<Target Name="CppWinRTResolveWinMD"
116116
Condition="'@(CppWinRTMdMergeInputs)' != '' AND '$(CppWinRTEnableComponentProjection)' == 'true'"
117-
DependsOnTargets="GetCppWinRTMdMergeInputs"
118117
Returns="@(WinMDFullPath)">
119118
<ItemGroup>
120119
<WinMDFullPath Remove="@(WinMDFullPath)"/>
@@ -524,13 +523,6 @@ $(XamlMetaDataProviderPch)
524523
<!-- Main target that generates all the CppWinRT projections. -->
525524
<Target Name="CppWinRTMakeProjections" DependsOnTargets="CppWinRTMakePlatformProjection;CppWinRTMakeReferenceProjection;CppWinRTMakeComponentProjection;$(CppWinRTMakeProjectionsDependsOn)" />
526525

527-
<!--Add references to all merged project WinMD files for Xaml Compiler-->
528-
<Target Name="CppWinRTAddXamlReferences" DependsOnTargets="$(CppWinRTAddXamlReferencesDependsOn)">
529-
<ItemGroup>
530-
<XamlReferencesToCompile Include="$(OutDir)*.winmd" />
531-
</ItemGroup>
532-
</Target>
533-
534526
<!--Clear merged assembly and set local assembly for Xaml Compiler.
535527
(Note: this can be removed when CppWinRT references are removed from the Xaml targets file.)-->
536528
<Target Name="CppWinRTSetXamlLocalAssembly" DependsOnTargets="$(CppWinRTSetXamlLocalAssemblyDependsOn)">

0 commit comments

Comments
 (0)