From bb1047aacfb4bb9949d0da0ea0f3180abd64a33f Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <thomas.goulet-73@outlook.com>
Date: Tue, 6 Aug 2024 23:33:03 -0400
Subject: [PATCH] Fix unit tests native dependencies

---
 .../tests/UnitTests/Directory.Build.targets   | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/tests/UnitTests/Directory.Build.targets
index 911e37bda6e..92dfe533cca 100644
--- a/src/Microsoft.DotNet.Wpf/tests/UnitTests/Directory.Build.targets
+++ b/src/Microsoft.DotNet.Wpf/tests/UnitTests/Directory.Build.targets
@@ -9,13 +9,24 @@
     <_PackagingNativePath Condition="'$(WpfRuntimeIdentifier)'=='win-x86' And '$(Configuration)' == 'Debug'">$(ArtifactsDir)packaging\$(Configuration)\Microsoft.DotNet.Wpf.GitHub.Debug</_PackagingNativePath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!-- These exist to ensure that dependencies (esp. native ones) are binplaced with tests correctly -->
-    <None Include="$(_PackagingNativePath)\runtimes\$(WpfRuntimeIdentifier)\native\*.dll"
-          CopyToOutputDirectory="PreserveNewest"
-          Visible="False" />
-  </ItemGroup>
+  <!--
+    We need to copy the native dependencies from the packaging folder to make sure that we use the ones built or redistributed in the current build.
+  -->
+  <Target Name="IncludeNativeDependencies"
+          BeforeTargets="AssignTargetPaths"
+          Returns="@(None)">
+    <ItemGroup>
+      <!-- These exist to ensure that dependencies (esp. native ones) are binplaced with tests correctly -->
+      <None Include="$(_PackagingNativePath)\runtimes\$(WpfRuntimeIdentifier)\native\*.dll"
+            CopyToOutputDirectory="PreserveNewest"
+            Visible="False" />
+    </ItemGroup>
+  </Target>
 
+  <!--
+    A WindowsBase facade is included in the Microsoft.NETCore.App targeting pack while we ship our own WindowsBase in the Microsoft.WindowsDesktop.App targeting pack.
+    To allow our projects to reference our version of WindowsBase without conflicting, we remove the version from the Microsoft.NETCore.App targeting pack from the list of reference.
+  -->
   <Target Name="RemoveWindowsBaseNetCoreAppReference"
           AfterTargets="ResolveTargetingPackAssets"
           Returns="@(Reference)">
@@ -24,4 +35,4 @@
     </ItemGroup>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>