Skip to content

Include the "TargetingPack" folder in the mobile apps. #61432

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
merged 1 commit into from
Nov 11, 2021
Merged

Include the "TargetingPack" folder in the mobile apps. #61432

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
10 changes: 10 additions & 0 deletions src/tests/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -233,6 +234,10 @@
SourceFiles="@(RuntimePackLibs)"
DestinationFolder="$(BuildDir)" />

<Copy
SourceFiles="@(TestTargetingPathLibs)"
DestinationFolder="$(BuildDir)" />

<AndroidAppBuilderTask
RuntimeIdentifier="$(RuntimeIdentifier)"
ProjectName="$(Category)"
Expand Down Expand Up @@ -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)">
Expand All @@ -310,6 +316,10 @@
<Copy
SourceFiles="@(RuntimePackLibs)"
DestinationFolder="$(BuildDir)" />

<Copy
SourceFiles="@(TestTargetingPathLibs)"
DestinationFolder="$(BuildDir)" />
<Copy
SourceFiles="%(TestDlls.Identity)"
DestinationFolder="$(BuildDir)/testdir-%(TestDlls.Filename)" />
Expand Down