From d4dc9316fdada2556fcf1007fef5bc996f973f1f Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 10 Nov 2021 10:45:38 -0800
Subject: [PATCH] Include the "TargetingPack" folder in the mobile apps.

Fixes #61322
Fixes #61299
---
 src/tests/build.proj | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/tests/build.proj b/src/tests/build.proj
index f8f67ff905e33..7a161270572bd 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -215,6 +215,7 @@
       <AssembliesInTestDirs Include="%(AllCMDsPresent.RelativeDir)*.dll" Exclude="@(TestAssemblies)"/>
       <RuntimePackLibs Include="$(MicrosoftNetCoreAppRuntimePackDir)lib/**/*.dll" />
       <RuntimePackNativeLibs Include="$(MicrosoftNetCoreAppRuntimePackDir)native/**/*.dll;$(MicrosoftNetCoreAppRuntimePackDir)native/**/*.a;$(MicrosoftNetCoreAppRuntimePackDir)native/**/*.so" />
+      <TestTargetingPathLibs Include="$(TargetingPackPath)/*.dll" />
     </ItemGroup>
 
     <Copy
@@ -233,6 +234,10 @@
         SourceFiles="@(RuntimePackLibs)"
         DestinationFolder="$(BuildDir)" />
 
+    <Copy
+        SourceFiles="@(TestTargetingPathLibs)"
+        DestinationFolder="$(BuildDir)" />
+
     <AndroidAppBuilderTask
         RuntimeIdentifier="$(RuntimeIdentifier)"
         ProjectName="$(Category)"
@@ -285,6 +290,7 @@
       <TestDlls Include="%(TestDllPaths.Identity)" Condition="Exists(%(TestDllPaths.Identity))" />
       <AssembliesInTestDirs Include="%(AllCMDsPresent.RelativeDir)*.dll" Exclude="@(TestAssemblies)"/>
       <RuntimePackLibs Include="$(MicrosoftNetCoreAppRuntimePackDir)lib/**/*.dll" />
+      <TestTargetingPathLibs Include="$(TargetingPackPath)/*.dll" />
     </ItemGroup>
     <ItemGroup>
       <ExtraDlls Include="%(TestDlls.RelativeDir)*.dll" Exclude="@(TestDlls)">
@@ -310,6 +316,10 @@
     <Copy
         SourceFiles="@(RuntimePackLibs)"
         DestinationFolder="$(BuildDir)" />
+
+    <Copy
+        SourceFiles="@(TestTargetingPathLibs)"
+        DestinationFolder="$(BuildDir)" />
     <Copy
         SourceFiles="%(TestDlls.Identity)"
         DestinationFolder="$(BuildDir)/testdir-%(TestDlls.Filename)" />