From 6021f534e524b6cbf89128a3dab71b3823bf699b Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Mon, 4 Nov 2019 12:35:16 -0800
Subject: [PATCH] Update Wpf.Cpp.targets & SdkReferences.targets to reliably
 restore Microsoft.DotNet.Wpf.DncEng and include libs during build

---
 eng/WpfArcadeSdk/tools/SdkReferences.targets |  1 -
 eng/WpfArcadeSdk/tools/Wpf.Cpp.targets       | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets
index e2c5047a2..6e4053cab 100644
--- a/eng/WpfArcadeSdk/tools/SdkReferences.targets
+++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets
@@ -179,7 +179,6 @@
     </ItemGroup>
   </Target>
 
-
   <!-- 
     In your project, Add a references to WinForms transport package like this:
       <ItemGroup>
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index eb8c86f85..a3a83f94a 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
@@ -553,7 +553,7 @@ using namespace System::Runtime::Versioning;
 <!-- Save Microsoft.NETCore.App assemblies and return them -->
     <ItemGroup>
       <NuGetReferencesForCpp Remove="%40(NuGetReferencesForCpp)" />
-      <NuGetReferencesForCpp Include="%24(WpfDncEngRidSpecificPackagePath)\runtimes\%24(RuntimeIdentifier)\native\**\*.*" />
+      <NuGetReferencesForCpp Include="%24(WpfDncEngRidSpecificLibPath)**\*.*" />
     </ItemGroup>
   </Target>
 </Project>
@@ -586,17 +586,19 @@ using namespace System::Runtime::Versioning;
     <!-- Restore, then IdentifyNuGetReferences -->
     <MSBuild Projects="@(ProjectToBuild)" UnloadProjectsOnCompletion="true"
              Targets="Restore"
-             Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)" />
+             Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture);IsRestoring=true" />
     
     <MSBuild Projects="@(ProjectToBuild)"
-         Targets="Restore;IdentifyNuGetReferences"
+         Targets="IdentifyNuGetReferences"
          Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)">
       <Output  TaskParameter="TargetOutputs" ItemName="NuGetReferencesForCpp" />
     </MSBuild>
 
+    <!-- Update with file path -->
     <ItemGroup>
-      <Link Include="@(NuGetReferencesForCpp)"
-            Condition="'%(NuGetReferencesForCpp.Extension)'=='.lib'" />
+      <NugetReferencesForCpp Update="@(NuGetReferencesForCpp)">
+        <FilePath>%(NuGetReferencesForCpp.FullPath)</FilePath>
+      </NugetReferencesForCpp>
     </ItemGroup>
   </Target>
 
-- 
GitLab