Skip to content

Commit a97fb56

Browse files
author
Mitchell Hwang
committed
Condition trimming related changes on EnableAggressiveTrimming
1 parent a9259ec commit a97fb56

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

eng/testing/tests.mobile.targets

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<JSEngine Condition="'$(TargetOS)' == 'Browser' and '$(JSEngine)' == ''">V8</JSEngine>
88
<JSEngineArgs Condition="'$(JSEngine)' == 'V8'">$(JSEngineArgs) --engine-arg=--stack-trace-limit=1000</JSEngineArgs>
99

10-
<PublishingTestsRun>true</PublishingTestsRun>
10+
<PublishingTestsRun Condition="'$(EnableAggressiveTrimming)' == 'true'">true</PublishingTestsRun>
1111
</PropertyGroup>
1212

1313
<PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
@@ -213,7 +213,8 @@
213213
<_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" />
214214
<_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" />
215215

216-
<ResolvedFileToPublish Include="@(_runnerFilesToPublish)" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
216+
<ResolvedFileToPublish Include="@(_runnerFilesToPublish)" Condition="'$(EnableAggressiveTrimming)' == 'true'" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
217+
<ResolvedFileToPublish Include="@(_runnerFilesToPublish)" Condition="'$(EnableAggressiveTrimming)' != 'true' and !$([System.String]::Copy('%(Filename)').StartsWith('xunit.'))" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
217218
</ItemGroup>
218219
</Target>
219220

@@ -222,5 +223,5 @@
222223
AfterTargets="Build"
223224
DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
224225

225-
<Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
226+
<Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'" />
226227
</Project>

eng/testing/xunit/xunit.console.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Target>
5858

5959
<!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. -->
60-
<Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true'">
60+
<Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true' or '$(EnableAggressiveTrimming)' != 'true'">
6161
<ItemGroup>
6262
<!-- Copy test runner to output directory -->
6363
<None Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\*"

0 commit comments

Comments
 (0)