Skip to content

Commit 37b7b4e

Browse files
committed
Add Merged marker for smoke tests
1 parent cbcca7d commit 37b7b4e

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/tests/Directory.Build.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,9 @@
423423
<MarkerFile Include="$(IntermediateOutputPath)\$(MSBuildProjectName).MergedTestAssembly" Condition="'$(IsMergedTestRunnerAssembly)' == 'true' and '$(BuildAllTestsAsStandalone)' != 'true'">
424424
<Type>MergedTestAssembly</Type>
425425
</MarkerFile>
426+
<MarkerFile Include="$(IntermediateOutputPath)\$(MSBuildProjectName).MergedTestAssembly" Condition="'$(TestBuildMode)' == 'nativeaot' and '$(TargetsAndroid)' == 'true' and '$(BuildAllTestsAsStandalone)' == 'true' and '$(CLRTestKind)' == 'BuildAndRun'">
427+
<Type>MergedTestAssembly</Type>
428+
</MarkerFile>
426429
<MarkerFile Include="$(IntermediateOutputPath)\$(AssemblyName).NoMonoAot" Condition="'$(MonoAotIncompatible)' == 'true'">
427430
<Type>NoMonoAot</Type>
428431
</MarkerFile>

0 commit comments

Comments
 (0)