Skip to content

Fix unit tests native dependencies #9534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harshit7962 merged 1 commit into from
Sep 6, 2024
Merged

Fix unit tests native dependencies #9534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/Microsoft.DotNet.Wpf/tests/UnitTests/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)">
Expand All @@ -24,4 +35,4 @@
</ItemGroup>
</Target>

</Project>
</Project>