From 9216ed09552a6d7af03d0f0e02a9fc360239a386 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaans@microsoft.com>
Date: Mon, 25 Nov 2019 21:52:26 -0800
Subject: [PATCH 1/8] Fix the WinMDArtifactsOutputGroup to return the CppWinRT
 generated WinMD. VS uses this to resolve project output.

---
 nuget/Microsoft.Windows.CppWinRT.targets | 63 ++++++++++++++++++------
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index e46e6b3ca..fe6ba164b 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -308,16 +308,16 @@ Copyright (C) Microsoft Corporation. All rights reserved.
             <FullXamlMetadataProviderAttribute Condition="$(XamlCodeGenerationControlFlags.Contains('FullXamlMetadataProvider'))">[$(XamlNamespace).Markup.FullXamlMetadataProvider] </FullXamlMetadataProviderAttribute>
             <XamlMarkupIdlImport Condition="$(_DisableReferences)">import "$(XamlNamespace).Markup.idl"%3b</XamlMarkupIdlImport>
             <XamlMetaDataProviderIdlLines>
-// This file is generated by the build to support Xaml apps
-$(XamlMarkupIdlImport)
-namespace $(RootNamespace)
-{
-    $(FullXamlMetadataProviderAttribute)runtimeclass XamlMetaDataProvider : [default] $(XamlNamespace).Markup.IXamlMetadataProvider
-    {
-        XamlMetaDataProvider()%3b
-    }
-}
-</XamlMetaDataProviderIdlLines>
+                // This file is generated by the build to support Xaml apps
+                $(XamlMarkupIdlImport)
+                namespace $(RootNamespace)
+                {
+                $(FullXamlMetadataProviderAttribute)runtimeclass XamlMetaDataProvider : [default] $(XamlNamespace).Markup.IXamlMetadataProvider
+                {
+                XamlMetaDataProvider()%3b
+                }
+                }
+            </XamlMetaDataProviderIdlLines>
         </PropertyGroup>
         <WriteLinesToFile Condition="!$(CppWinRTWriteOnlyWhenDifferent)"
             File="$(XamlMetaDataProviderIdl)" Lines="$(XamlMetaDataProviderIdlLines)"
@@ -335,11 +335,11 @@ namespace $(RootNamespace)
             <_PCH>@(ClCompile->Metadata('PrecompiledHeaderFile')->Distinct())</_PCH>
             <XamlMetaDataProviderPch Condition="'$(_PCH)'!=''">#include "$(_PCH)"</XamlMetaDataProviderPch>
             <XamlMetaDataProviderCppLines>
-// This file is generated by the build to support Xaml apps
-$(XamlMetaDataProviderPch)
-#include "XamlMetaDataProvider.h"
-#include "XamlMetaDataProvider.g.cpp"
-</XamlMetaDataProviderCppLines>
+                // This file is generated by the build to support Xaml apps
+                $(XamlMetaDataProviderPch)
+                #include "XamlMetaDataProvider.h"
+                #include "XamlMetaDataProvider.g.cpp"
+            </XamlMetaDataProviderCppLines>
         </PropertyGroup>
         <WriteLinesToFile Condition="!$(CppWinRTWriteOnlyWhenDifferent)"
             File="$(XamlMetaDataProviderCpp)" Lines="$(XamlMetaDataProviderCppLines)"
@@ -590,4 +590,37 @@ $(XamlMetaDataProviderPch)
         </Link>
     </ItemDefinitionGroup>
 
+    <!--
+    ============================================================
+    Override the CopyWinMDArtifactsOutputGroup to return the 
+    correct WinMD. Not that we still need to call GetResolvedWinMD
+    to make sure that projects that only use CppWinRT to consume
+    WinRT, but not to produce the WinMD, will still return the 
+    WinMD file produced by the CX target GetResolvedWinMD.
+    ============================================================
+    -->
+
+    <Target Name="WinMDArtifactsProjectOutputGroup"
+            DependsOnTargets="GetResolvedWinMD;CppWinRTResolvedWinMD"
+            Returns="@(WinMDFullPath)"/>
+
+    <Target
+        Name="CopyWinMDArtifactsOutputGroup"
+        DependsOnTargets="GetResolvedWinMD;CppWinRTResolvedWinMD"
+        Returns="@(CopyWinMDArtifactsOutputGroupOutput)">
+
+        <ItemGroup>
+            <CopyWinMDArtifactsOutputGroupOutput Include="@(WinMDFullPath)" />
+        </ItemGroup>
+    </Target>
+
+    <!-- VS uses this target to resolve the primary WinMD to determine if the project rteference is compatible. -->
+    <Target Name="PrimaryWinMDOutputGroup"
+            DependsOnTargets="GetResolvedWinMD;CppWinRTResolvedWinMD"
+            Returns="@(PrimaryWinMDFullPath)" >
+        <ItemGroup>
+            <PrimaryWinMDFullPath Include="@(WinMDFullPath)" Condition="'%(WinMDFullPath.Primary)' == 'true'"/>
+        </ItemGroup>
+    </Target>
+
 </Project>

From 8ea92f8c01a3dde90c2db05591d9be4ade2c3f71 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaans@microsoft.com>
Date: Tue, 26 Nov 2019 10:14:52 -0800
Subject: [PATCH 2/8] Comments.

---
 nuget/Microsoft.Windows.CppWinRT.targets | 44 +++++++++++++-----------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index fe6ba164b..167f2f1e9 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -308,16 +308,16 @@ Copyright (C) Microsoft Corporation. All rights reserved.
             <FullXamlMetadataProviderAttribute Condition="$(XamlCodeGenerationControlFlags.Contains('FullXamlMetadataProvider'))">[$(XamlNamespace).Markup.FullXamlMetadataProvider] </FullXamlMetadataProviderAttribute>
             <XamlMarkupIdlImport Condition="$(_DisableReferences)">import "$(XamlNamespace).Markup.idl"%3b</XamlMarkupIdlImport>
             <XamlMetaDataProviderIdlLines>
-                // This file is generated by the build to support Xaml apps
-                $(XamlMarkupIdlImport)
-                namespace $(RootNamespace)
-                {
-                $(FullXamlMetadataProviderAttribute)runtimeclass XamlMetaDataProvider : [default] $(XamlNamespace).Markup.IXamlMetadataProvider
-                {
-                XamlMetaDataProvider()%3b
-                }
-                }
-            </XamlMetaDataProviderIdlLines>
+// This file is generated by the build to support Xaml apps
+$(XamlMarkupIdlImport)
+namespace $(RootNamespace)
+{
+    $(FullXamlMetadataProviderAttribute)runtimeclass XamlMetaDataProvider : [default] $(XamlNamespace).Markup.IXamlMetadataProvider
+    {
+        XamlMetaDataProvider()%3b
+    }
+}
+</XamlMetaDataProviderIdlLines>
         </PropertyGroup>
         <WriteLinesToFile Condition="!$(CppWinRTWriteOnlyWhenDifferent)"
             File="$(XamlMetaDataProviderIdl)" Lines="$(XamlMetaDataProviderIdlLines)"
@@ -335,11 +335,11 @@ Copyright (C) Microsoft Corporation. All rights reserved.
             <_PCH>@(ClCompile->Metadata('PrecompiledHeaderFile')->Distinct())</_PCH>
             <XamlMetaDataProviderPch Condition="'$(_PCH)'!=''">#include "$(_PCH)"</XamlMetaDataProviderPch>
             <XamlMetaDataProviderCppLines>
-                // This file is generated by the build to support Xaml apps
-                $(XamlMetaDataProviderPch)
-                #include "XamlMetaDataProvider.h"
-                #include "XamlMetaDataProvider.g.cpp"
-            </XamlMetaDataProviderCppLines>
+// This file is generated by the build to support Xaml apps
+$(XamlMetaDataProviderPch)
+#include "XamlMetaDataProvider.h"
+#include "XamlMetaDataProvider.g.cpp"
+</XamlMetaDataProviderCppLines>
         </PropertyGroup>
         <WriteLinesToFile Condition="!$(CppWinRTWriteOnlyWhenDifferent)"
             File="$(XamlMetaDataProviderCpp)" Lines="$(XamlMetaDataProviderCppLines)"
@@ -592,11 +592,13 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
     <!--
     ============================================================
-    Override the CopyWinMDArtifactsOutputGroup to return the 
-    correct WinMD. Not that we still need to call GetResolvedWinMD
-    to make sure that projects that only use CppWinRT to consume
-    WinRT, but not to produce the WinMD, will still return the 
-    WinMD file produced by the CX target GetResolvedWinMD.
+    Override the WinMDArtifactsProjectOutputGroup to let VS know that 
+    this project generates a WinMD, see 
+    https://docs.microsoft.com/en-us/visualstudio/msbuild/visual-studio-integration-msbuild?view=vs-2019#output-groups
+    
+    Note that we still need to call GetResolvedWinMD
+    to make sure that projects that do not use CppWinRT to
+    produce a WinMD, continue using the WinMD produced by CX.
     ============================================================
     -->
 
@@ -614,7 +616,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         </ItemGroup>
     </Target>
 
-    <!-- VS uses this target to resolve the primary WinMD to determine if the project rteference is compatible. -->
+    <!-- VS uses this target to resolve the primary WinMD to determine if the project reference is compatible. -->
     <Target Name="PrimaryWinMDOutputGroup"
             DependsOnTargets="GetResolvedWinMD;CppWinRTResolvedWinMD"
             Returns="@(PrimaryWinMDFullPath)" >

From 4f80f46502495a36d796b387aa53cd9130f29b12 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaans@microsoft.com>
Date: Tue, 26 Nov 2019 10:45:29 -0800
Subject: [PATCH 3/8] Override GetResolvedWinMD to reduce the amount of
 overrides.

---
 nuget/Microsoft.Windows.CppWinRT.targets | 86 +++++++++++-------------
 1 file changed, 38 insertions(+), 48 deletions(-)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index 167f2f1e9..dd8cd2795 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -26,7 +26,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
         <!-- For CX projects, CppWinRT will never output a winmd-->
         <!-- NOTE: We don't set a default here as the default requires evaluation of project references
-             and this is done by the ComputeCppWinRTResolvedWinMD target. -->
+             and this is done by the CppWinRTComputeGenerateWindowsMetadata target. -->
         <CppWinRTGenerateWindowsMetadata Condition="'$(CppWinRTGenerateWindowsMetadata)' == '' AND '$(XamlLanguage)' == 'C++' ">false</CppWinRTGenerateWindowsMetadata>
         <!-- For CX projects, turn off the component projection generation-->
         <CppWinRTEnableComponentProjection Condition="'$(CppWinRTEnableComponentProjection)' == '' AND '$(XamlLanguage)' == 'C++' ">false</CppWinRTEnableComponentProjection>
@@ -41,7 +41,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         <WindowsSDK_MetadataFoundationPath Condition="('$(WindowsSDK_MetadataFoundationPath)'!='') And !Exists($(WindowsSDK_MetadataFoundationPath))">$(WindowsSDK_MetadataPathVersioned)</WindowsSDK_MetadataFoundationPath>
 
         <GetTargetPathDependsOn>
-            $(GetTargetPathDependsOn);ComputeCppWinRTResolvedWinMD;CppWinRTResolvedWinMD;
+            CppWinRTComputeGenerateWindowsMetadata;$(GetTargetPathDependsOn)
         </GetTargetPathDependsOn>
         <PrepareForBuildDependsOn>
             $(PrepareForBuildDependsOn);CppWinRTVerifyKitVersion;
@@ -57,9 +57,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
             $(AfterMidlTargets);
             GetCppWinRTMdMergeInputs;
             CppWinRTMergeProjectWinMDInputs;
-            ComputeCppWinRTResolvedWinMD;
-            CppWinRTResolvedWinMD;
-            CppWinRTResolvedWinMDToOutputDirectory;
+            CppWinRTComputeGenerateWindowsMetadata;
+            GetResolvedWinMD;
+            CppWinRTCopyWinMDToOutputDirectory;
         </AfterMidlTargets>
         <ResolveAssemblyReferencesDependsOn>
             $(ResolveAssemblyReferencesDependsOn);GetCppWinRTProjectWinMDReferences;CppWinRTRemoveStaticLibraries;
@@ -122,7 +122,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     </Target>
 
     <!-- Target used only to evaluate CppWinRTGenerateWindowsMetadata if it doesn't already have a value -->
-    <Target Name="ComputeCppWinRTResolvedWinMD"
+    <Target Name="CppWinRTComputeGenerateWindowsMetadata"
             Condition="'$(CppWinRTGenerateWindowsMetadata)' == ''"
             DependsOnTargets="GetCppWinRTMdMergeInputs">
         <PropertyGroup>
@@ -131,12 +131,36 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         </PropertyGroup>
     </Target>
 
-    <Target Name="CppWinRTResolvedWinMD"
-            Condition="'$(CppWinRTGenerateWindowsMetadata)' == 'true'"
+    <Target Name="GetResolvedWinMD"
             Returns="@(WinMDFullPath)">
+        
+        <!-- Copied from the CX GetResolvedWinMD target in Microsoft.CppBuild.targets -->
+        <ItemGroup>
+            <!-- To evaluate the GenerateWindowsMetadata value we need @(Link) to contains at least one element-->
+            <Link Include="tmp" Condition="'@(Link)'==''">
+                <DeleteSoon>true</DeleteSoon>
+            </Link>
+
+            <!-- COndition is modified to only do this if CppWinRTGenerateWindowsMetadata is not set. -->
+            <WinMDFullPath Condition="'%(Link.GenerateWindowsMetadata)' == 'true' AND '$(CppWinRTGenerateWindowsMetadata)' != 'true'" 
+                           Include="@(Link->Metadata('WindowsMetadataFile')->FullPath()->Distinct()->ClearMetadata())">
+                <TargetPath>$([System.IO.Path]::GetFileName('%(Link.WindowsMetadataFile)'))</TargetPath>
+                <Primary>true</Primary>
+            </WinMDFullPath>
+
+            <WinMDFullPath>
+                <Implementation>$(WinMDImplementationPath)$(TargetName)$(TargetExt)</Implementation>
+                <FileType>winmd</FileType>
+                <WinMDFile>true</WinMDFile>
+                <ProjectType>$(ConfigurationType)</ProjectType>
+            </WinMDFullPath>
+            
+            <Link Remove="@(Link)" Condition="'%(Link.DeleteSoon)' == 'true'" />
+        </ItemGroup>
+
+        <!-- Add C++/WinRT primary WinMD to the WinMDFullPath if CppWinRTGenerateWindowsMetadata is true -->
         <ItemGroup>
-            <WinMDFullPath Remove="@(WinMDFullPath)"/>
-            <WinMDFullPath Include="$(CppWinRTProjectWinMD)">
+            <WinMDFullPath Include="$(CppWinRTProjectWinMD)"  Condition="'$(CppWinRTGenerateWindowsMetadata)' == 'true'">
                 <TargetPath>$([System.IO.Path]::GetFileName('$(CppWinRTProjectWinMD)'))</TargetPath>
                 <Primary>true</Primary>
                 <Implementation Condition="'$(TargetExt)' == '.dll'">$(WinMDImplementationPath)$(RootNamespace)$(TargetExt)</Implementation>
@@ -146,7 +170,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
                 <ProjectType>$(ConfigurationType)</ProjectType>
             </WinMDFullPath>
         </ItemGroup>
-        <Message Text="CppWinRTResolvedWinMD: @(WinMDFullPath->'%(FullPath)')" Importance="$(CppWinRTVerbosity)"/>
+
+        <Message Text="GetResolvedWinMD: @(WinMDFullPath->'%(FullPath)')" Importance="$(CppWinRTVerbosity)"/>
     </Target>
 
     <!-- Static library reference files are merged into the project that
@@ -425,9 +450,9 @@ $(XamlMetaDataProviderPch)
 
     <!-- Only copy winmd to output folder if CppWinRTGenerateWindowsMetadata is true -->
     <!-- Note that Condition is evaluated before DependsOnTargets are run -->
-    <Target Name="CppWinRTResolvedWinMDToOutputDirectory"
+    <Target Name="CppWinRTCopyWinMDToOutputDirectory"
             Condition="'$(CppWinRTGenerateWindowsMetadata)' == 'true'"
-            DependsOnTargets="CppWinRTMergeProjectWinMDInputs;$(CppWinRTResolvedWinMDToOutputDirectoryDependsOn)"
+            DependsOnTargets="CppWinRTMergeProjectWinMDInputs;$(CppWinRTCopyWinMDToOutputDirectoryDependsOn)"
             Inputs="@(_MdMergedOutput)"
             Outputs="$(CppWinRTProjectWinMD)">
         <Copy UseHardlinksIfPossible="$(CppWinRTUseHardlinksIfPossible)"
@@ -590,39 +615,4 @@ $(XamlMetaDataProviderPch)
         </Link>
     </ItemDefinitionGroup>
 
-    <!--
-    ============================================================
-    Override the WinMDArtifactsProjectOutputGroup to let VS know that 
-    this project generates a WinMD, see 
-    https://docs.microsoft.com/en-us/visualstudio/msbuild/visual-studio-integration-msbuild?view=vs-2019#output-groups
-    
-    Note that we still need to call GetResolvedWinMD
-    to make sure that projects that do not use CppWinRT to
-    produce a WinMD, continue using the WinMD produced by CX.
-    ============================================================
-    -->
-
-    <Target Name="WinMDArtifactsProjectOutputGroup"
-            DependsOnTargets="GetResolvedWinMD;CppWinRTResolvedWinMD"
-            Returns="@(WinMDFullPath)"/>
-
-    <Target
-        Name="CopyWinMDArtifactsOutputGroup"
-        DependsOnTargets="GetResolvedWinMD;CppWinRTResolvedWinMD"
-        Returns="@(CopyWinMDArtifactsOutputGroupOutput)">
-
-        <ItemGroup>
-            <CopyWinMDArtifactsOutputGroupOutput Include="@(WinMDFullPath)" />
-        </ItemGroup>
-    </Target>
-
-    <!-- VS uses this target to resolve the primary WinMD to determine if the project reference is compatible. -->
-    <Target Name="PrimaryWinMDOutputGroup"
-            DependsOnTargets="GetResolvedWinMD;CppWinRTResolvedWinMD"
-            Returns="@(PrimaryWinMDFullPath)" >
-        <ItemGroup>
-            <PrimaryWinMDFullPath Include="@(WinMDFullPath)" Condition="'%(WinMDFullPath.Primary)' == 'true'"/>
-        </ItemGroup>
-    </Target>
-
 </Project>

From 7aa8e626b2f35c3abce14b4af869a5ec69b188d2 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaans@microsoft.com>
Date: Tue, 26 Nov 2019 10:49:28 -0800
Subject: [PATCH 4/8] Add comment.

---
 nuget/Microsoft.Windows.CppWinRT.targets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index dd8cd2795..407255e29 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -131,6 +131,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         </PropertyGroup>
     </Target>
 
+    <!-- This target overrides the GetResolvedWinMD target used to resolve the WinMD for native projects
+         so it is aware of the C++/WinRT generated WinMD.
+         Since not every project that consumesd C++/WinRT uses it to generate a WinMD,
+         we need to keep the CX logic as well. -->
     <Target Name="GetResolvedWinMD"
             Returns="@(WinMDFullPath)">
         

From 630a72eb774c0496720673fe23c1865731ab6284 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaans@microsoft.com>
Date: Tue, 26 Nov 2019 10:58:39 -0800
Subject: [PATCH 5/8] Simplify computing CppWinRTGenerateWindowsMetadata.

---
 nuget/Microsoft.Windows.CppWinRT.targets | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index 407255e29..d38338b70 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -40,11 +40,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         <!--TEMP: Override NuGet SDK's erroneous setting in uap.props -->
         <WindowsSDK_MetadataFoundationPath Condition="('$(WindowsSDK_MetadataFoundationPath)'!='') And !Exists($(WindowsSDK_MetadataFoundationPath))">$(WindowsSDK_MetadataPathVersioned)</WindowsSDK_MetadataFoundationPath>
 
-        <GetTargetPathDependsOn>
-            CppWinRTComputeGenerateWindowsMetadata;$(GetTargetPathDependsOn)
-        </GetTargetPathDependsOn>
         <PrepareForBuildDependsOn>
-            $(PrepareForBuildDependsOn);CppWinRTVerifyKitVersion;
+            $(PrepareForBuildDependsOn);
+            CppWinRTVerifyKitVersion;
         </PrepareForBuildDependsOn>
         <!-- Note: Before* targets run before Compute* targets. -->
         <BeforeMidlCompileTargets>
@@ -57,7 +55,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
             $(AfterMidlTargets);
             GetCppWinRTMdMergeInputs;
             CppWinRTMergeProjectWinMDInputs;
-            CppWinRTComputeGenerateWindowsMetadata;
             GetResolvedWinMD;
             CppWinRTCopyWinMDToOutputDirectory;
         </AfterMidlTargets>
@@ -123,7 +120,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
     <!-- Target used only to evaluate CppWinRTGenerateWindowsMetadata if it doesn't already have a value -->
     <Target Name="CppWinRTComputeGenerateWindowsMetadata"
-            Condition="'$(CppWinRTGenerateWindowsMetadata)' == ''"
             DependsOnTargets="GetCppWinRTMdMergeInputs">
         <PropertyGroup>
             <CppWinRTGenerateWindowsMetadata Condition="'@(CppWinRTMdMergeInputs)'!= ''">true</CppWinRTGenerateWindowsMetadata>
@@ -137,6 +133,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
          we need to keep the CX logic as well. -->
     <Target Name="GetResolvedWinMD"
             Returns="@(WinMDFullPath)">
+
+        <!-- If CppWinRTGenerateWindowsMetadata is not defined, compute it.-->
+        <CallTarget Targets="CppWinRTComputeGenerateWindowsMetadata" Condition="'$(CppWinRTGenerateWindowsMetadata)' == ''" />
         
         <!-- Copied from the CX GetResolvedWinMD target in Microsoft.CppBuild.targets -->
         <ItemGroup>
@@ -145,7 +144,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
                 <DeleteSoon>true</DeleteSoon>
             </Link>
 
-            <!-- COndition is modified to only do this if CppWinRTGenerateWindowsMetadata is not set. -->
+            <!-- Condition is modified to only do this if CppWinRTGenerateWindowsMetadata is not true. -->
             <WinMDFullPath Condition="'%(Link.GenerateWindowsMetadata)' == 'true' AND '$(CppWinRTGenerateWindowsMetadata)' != 'true'" 
                            Include="@(Link->Metadata('WindowsMetadataFile')->FullPath()->Distinct()->ClearMetadata())">
                 <TargetPath>$([System.IO.Path]::GetFileName('%(Link.WindowsMetadataFile)'))</TargetPath>

From 75ca4d79c29d9240c73378567420787b37024a28 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaans@microsoft.com>
Date: Tue, 26 Nov 2019 23:26:55 -0800
Subject: [PATCH 6/8] CppWinRTComputeGenerateWindowsMetadata can run during
 ResolveAssemblyReferences, so it can't depend on it.

---
 nuget/Microsoft.Windows.CppWinRT.targets | 27 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index d38338b70..7e756fb50 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -120,11 +120,28 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
     <!-- Target used only to evaluate CppWinRTGenerateWindowsMetadata if it doesn't already have a value -->
     <Target Name="CppWinRTComputeGenerateWindowsMetadata"
-            DependsOnTargets="GetCppWinRTMdMergeInputs">
+            DependsOnTargets="CppWinRTComputeXamlGeneratedMidlInputs;GetCppWinRTProjectWinMDReferences;$(CppWinRTComputeGenerateWindowsMetadataDependsOn)">
+        
         <PropertyGroup>
-            <CppWinRTGenerateWindowsMetadata Condition="'@(CppWinRTMdMergeInputs)'!= ''">true</CppWinRTGenerateWindowsMetadata>
-            <CppWinRTGenerateWindowsMetadata Condition="'@(CppWinRTMdMergeInputs)'== ''">false</CppWinRTGenerateWindowsMetadata>
+            <!-- For static libraries, only idl causes a winmd to be generated. 
+                 For exe/dll, static libraries that produce a WinMD will be merged, 
+                 so they also cause a WinMD to be generated-->
+            <CppWinRTGenerateWindowsMetadata Condition="'$(ConfigurationType)' != 'StaticLibrary' AND '@(CppWinRTStaticProjectWinMDReferences)@(Midl)'!= ''">true</CppWinRTGenerateWindowsMetadata>
+            <CppWinRTGenerateWindowsMetadata Condition="'$(ConfigurationType)' == 'StaticLibrary' AND '@(Midl)'!= ''">true</CppWinRTGenerateWindowsMetadata>
+            
+            <!-- At this point we checked all cases where we do generate a WinMD.
+                 The remaining option is no WinMD. -->
+            <CppWinRTGenerateWindowsMetadata Condition="'$(CppWinRTGenerateWindowsMetadata)'== ''">false</CppWinRTGenerateWindowsMetadata>
         </PropertyGroup>
+        
+    </Target>
+
+    <Target Name="ComputeGetResolvedWinMD"
+            Condition="'$(CppWinRTGenerateWindowsMetadata)' == ''">
+        <!-- If CppWinRTGenerateWindowsMetadata is not defined, compute it.-->
+        <!-- We use Calltarget, so we don't run anything including DependsOnTargets
+             targets if $(CppWinRTGenerateWindowsMetadata) already has a value.-->
+        <CallTarget Targets="CppWinRTComputeGenerateWindowsMetadata" />
     </Target>
 
     <!-- This target overrides the GetResolvedWinMD target used to resolve the WinMD for native projects
@@ -132,11 +149,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
          Since not every project that consumesd C++/WinRT uses it to generate a WinMD,
          we need to keep the CX logic as well. -->
     <Target Name="GetResolvedWinMD"
+            DependsOnTargets="ComputeGetResolvedWinMD"
             Returns="@(WinMDFullPath)">
 
-        <!-- If CppWinRTGenerateWindowsMetadata is not defined, compute it.-->
-        <CallTarget Targets="CppWinRTComputeGenerateWindowsMetadata" Condition="'$(CppWinRTGenerateWindowsMetadata)' == ''" />
-        
         <!-- Copied from the CX GetResolvedWinMD target in Microsoft.CppBuild.targets -->
         <ItemGroup>
             <!-- To evaluate the GenerateWindowsMetadata value we need @(Link) to contains at least one element-->

From 38400491288a35d0d98d2829a1506b0c222815a7 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaans@microsoft.com>
Date: Tue, 26 Nov 2019 23:27:07 -0800
Subject: [PATCH 7/8] Prevent cycles in the test project by different import
 order.

---
 test/nuget/Directory.Build.props                                | 2 --
 test/nuget/Directory.Build.targets                              | 2 --
 test/nuget/TestApp/TestApp.vcxproj                              | 2 ++
 test/nuget/TestRuntimeComponent1/TestRuntimeComponent1.vcxproj  | 2 ++
 test/nuget/TestRuntimeComponent2/TestRuntimeComponent2.vcxproj  | 2 ++
 test/nuget/TestRuntimeComponent3/TestRuntimeComponent3.vcxproj  | 2 ++
 .../nuget/TestRuntimeComponentCX/TestRuntimeComponentCX.vcxproj | 2 ++
 .../TestRuntimeComponentEmpty/TestRuntimeComponentEmpty.vcxproj | 2 ++
 test/nuget/TestStaticLibrary1/TestStaticLibrary1.vcxproj        | 2 ++
 test/nuget/TestStaticLibrary2/TestStaticLibrary2.vcxproj        | 2 ++
 test/nuget/TestStaticLibrary3/TestStaticLibrary3.vcxproj        | 2 ++
 test/nuget/TestStaticLibrary4/TestStaticLibrary4.vcxproj        | 2 ++
 test/nuget/TestStaticLibrary5/TestStaticLibrary5.vcxproj        | 2 ++
 test/nuget/TestStaticLibrary6/TestStaticLibrary6.vcxproj        | 2 ++
 14 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/test/nuget/Directory.Build.props b/test/nuget/Directory.Build.props
index 5f3583f51..bab3233f4 100644
--- a/test/nuget/Directory.Build.props
+++ b/test/nuget/Directory.Build.props
@@ -22,6 +22,4 @@
         <CppWinRTPath>$(SolutionDir)..\..\_build\$(CppWinRTPlatform)\$(Configuration)\</CppWinRTPath>
     </PropertyGroup>
 
-    <Import Project="$(SolutionDir)..\..\nuget\Microsoft.Windows.CppWinRT.props" />
-
 </Project>
diff --git a/test/nuget/Directory.Build.targets b/test/nuget/Directory.Build.targets
index 10be4f7f6..dbe64925b 100644
--- a/test/nuget/Directory.Build.targets
+++ b/test/nuget/Directory.Build.targets
@@ -6,6 +6,4 @@
 
     <Import Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.targets','$(MSBuildThisFileDirectory)../')))" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets','$(MSBuildThisFileDirectory)../'))" />
 
-    <Import Project="$(SolutionDir)..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
-
 </Project>
diff --git a/test/nuget/TestApp/TestApp.vcxproj b/test/nuget/TestApp/TestApp.vcxproj
index f61367d6b..8587de1f3 100644
--- a/test/nuget/TestApp/TestApp.vcxproj
+++ b/test/nuget/TestApp/TestApp.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -168,4 +169,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestRuntimeComponent1/TestRuntimeComponent1.vcxproj b/test/nuget/TestRuntimeComponent1/TestRuntimeComponent1.vcxproj
index 5f92b074f..69fc368a5 100644
--- a/test/nuget/TestRuntimeComponent1/TestRuntimeComponent1.vcxproj
+++ b/test/nuget/TestRuntimeComponent1/TestRuntimeComponent1.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -129,4 +130,5 @@
     </Text>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestRuntimeComponent2/TestRuntimeComponent2.vcxproj b/test/nuget/TestRuntimeComponent2/TestRuntimeComponent2.vcxproj
index c30618143..6c4e26fdc 100644
--- a/test/nuget/TestRuntimeComponent2/TestRuntimeComponent2.vcxproj
+++ b/test/nuget/TestRuntimeComponent2/TestRuntimeComponent2.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -136,4 +137,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestRuntimeComponent3/TestRuntimeComponent3.vcxproj b/test/nuget/TestRuntimeComponent3/TestRuntimeComponent3.vcxproj
index 20b8301fd..55f224b40 100644
--- a/test/nuget/TestRuntimeComponent3/TestRuntimeComponent3.vcxproj
+++ b/test/nuget/TestRuntimeComponent3/TestRuntimeComponent3.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -136,4 +137,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestRuntimeComponentCX/TestRuntimeComponentCX.vcxproj b/test/nuget/TestRuntimeComponentCX/TestRuntimeComponentCX.vcxproj
index 739a7fbee..81767d259 100644
--- a/test/nuget/TestRuntimeComponentCX/TestRuntimeComponentCX.vcxproj
+++ b/test/nuget/TestRuntimeComponentCX/TestRuntimeComponentCX.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -262,4 +263,5 @@
     <ClCompile Include="TestRuntimeComponentCXClass.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestRuntimeComponentEmpty/TestRuntimeComponentEmpty.vcxproj b/test/nuget/TestRuntimeComponentEmpty/TestRuntimeComponentEmpty.vcxproj
index 03fa5a174..274e6f474 100644
--- a/test/nuget/TestRuntimeComponentEmpty/TestRuntimeComponentEmpty.vcxproj
+++ b/test/nuget/TestRuntimeComponentEmpty/TestRuntimeComponentEmpty.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -130,4 +131,5 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestStaticLibrary1/TestStaticLibrary1.vcxproj b/test/nuget/TestStaticLibrary1/TestStaticLibrary1.vcxproj
index 8d00949aa..a6d96fcc5 100644
--- a/test/nuget/TestStaticLibrary1/TestStaticLibrary1.vcxproj
+++ b/test/nuget/TestStaticLibrary1/TestStaticLibrary1.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -227,4 +228,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestStaticLibrary2/TestStaticLibrary2.vcxproj b/test/nuget/TestStaticLibrary2/TestStaticLibrary2.vcxproj
index 3bae76471..e5ed5219f 100644
--- a/test/nuget/TestStaticLibrary2/TestStaticLibrary2.vcxproj
+++ b/test/nuget/TestStaticLibrary2/TestStaticLibrary2.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -227,4 +228,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestStaticLibrary3/TestStaticLibrary3.vcxproj b/test/nuget/TestStaticLibrary3/TestStaticLibrary3.vcxproj
index 4cea9b215..4ee9932f4 100644
--- a/test/nuget/TestStaticLibrary3/TestStaticLibrary3.vcxproj
+++ b/test/nuget/TestStaticLibrary3/TestStaticLibrary3.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -222,4 +223,5 @@
     </Midl>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestStaticLibrary4/TestStaticLibrary4.vcxproj b/test/nuget/TestStaticLibrary4/TestStaticLibrary4.vcxproj
index b21c082d8..c23830ec0 100644
--- a/test/nuget/TestStaticLibrary4/TestStaticLibrary4.vcxproj
+++ b/test/nuget/TestStaticLibrary4/TestStaticLibrary4.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -204,4 +205,5 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestStaticLibrary5/TestStaticLibrary5.vcxproj b/test/nuget/TestStaticLibrary5/TestStaticLibrary5.vcxproj
index 6d0fc2370..92a8a9336 100644
--- a/test/nuget/TestStaticLibrary5/TestStaticLibrary5.vcxproj
+++ b/test/nuget/TestStaticLibrary5/TestStaticLibrary5.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -204,4 +205,5 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file
diff --git a/test/nuget/TestStaticLibrary6/TestStaticLibrary6.vcxproj b/test/nuget/TestStaticLibrary6/TestStaticLibrary6.vcxproj
index afab2bb75..e085518b4 100644
--- a/test/nuget/TestStaticLibrary6/TestStaticLibrary6.vcxproj
+++ b/test/nuget/TestStaticLibrary6/TestStaticLibrary6.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -215,4 +216,5 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
+  <Import Project="$(ProjectDir)..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 </Project>
\ No newline at end of file

From c8c54879c5cfd7b696e7f1907fa4f88c5d3d9984 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaans@microsoft.com>
Date: Tue, 26 Nov 2019 23:28:17 -0800
Subject: [PATCH 8/8] Fix typo.

---
 nuget/Microsoft.Windows.CppWinRT.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuget/Microsoft.Windows.CppWinRT.targets b/nuget/Microsoft.Windows.CppWinRT.targets
index 7e756fb50..ee0ec5e16 100644
--- a/nuget/Microsoft.Windows.CppWinRT.targets
+++ b/nuget/Microsoft.Windows.CppWinRT.targets
@@ -146,7 +146,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
     <!-- This target overrides the GetResolvedWinMD target used to resolve the WinMD for native projects
          so it is aware of the C++/WinRT generated WinMD.
-         Since not every project that consumesd C++/WinRT uses it to generate a WinMD,
+         Since not every project that consumes C++/WinRT uses it to generate a WinMD,
          we need to keep the CX logic as well. -->
     <Target Name="GetResolvedWinMD"
             DependsOnTargets="ComputeGetResolvedWinMD"