From 3397cdf71854f1aea4ab0efacca844da87eea82f Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Fri, 1 Nov 2019 16:13:39 -0700
Subject: [PATCH] Update WpfArcadeSdk props/targets to prepare for
 repo-inversion

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

diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets
index 6e4053cab..e2c5047a2 100644
--- a/eng/WpfArcadeSdk/tools/SdkReferences.targets
+++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets
@@ -179,6 +179,7 @@
     </ItemGroup>
   </Target>
 
+
   <!-- 
     In your project, Add a references to WinForms transport package like this:
       <ItemGroup>
diff --git a/eng/WpfArcadeSdk/tools/ShippingProjects.props b/eng/WpfArcadeSdk/tools/ShippingProjects.props
index 2ce6bf215..4cff4856c 100644
--- a/eng/WpfArcadeSdk/tools/ShippingProjects.props
+++ b/eng/WpfArcadeSdk/tools/ShippingProjects.props
@@ -30,7 +30,7 @@
       PresentationFramework.Royale;
       WindowsFormsIntegration;
       PenImc;
-      WpfGfx;
+      wpfgfx;
       D3DCompiler;
       VCRuntime
     </ExternalShippingProjects>
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index a3a83f94a..eb8c86f85 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(WpfDncEngRidSpecificLibPath)**\*.*" />
+      <NuGetReferencesForCpp Include="%24(WpfDncEngRidSpecificPackagePath)\runtimes\%24(RuntimeIdentifier)\native\**\*.*" />
     </ItemGroup>
   </Target>
 </Project>
@@ -586,19 +586,17 @@ using namespace System::Runtime::Versioning;
     <!-- Restore, then IdentifyNuGetReferences -->
     <MSBuild Projects="@(ProjectToBuild)" UnloadProjectsOnCompletion="true"
              Targets="Restore"
-             Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture);IsRestoring=true" />
+             Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)" />
     
     <MSBuild Projects="@(ProjectToBuild)"
-         Targets="IdentifyNuGetReferences"
+         Targets="Restore;IdentifyNuGetReferences"
          Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)">
       <Output  TaskParameter="TargetOutputs" ItemName="NuGetReferencesForCpp" />
     </MSBuild>
 
-    <!-- Update with file path -->
     <ItemGroup>
-      <NugetReferencesForCpp Update="@(NuGetReferencesForCpp)">
-        <FilePath>%(NuGetReferencesForCpp.FullPath)</FilePath>
-      </NugetReferencesForCpp>
+      <Link Include="@(NuGetReferencesForCpp)"
+            Condition="'%(NuGetReferencesForCpp.Extension)'=='.lib'" />
     </ItemGroup>
   </Target>
 
-- 
GitLab