Skip to content

Commit

Permalink
Remove the directory src/coreclr/tests/src (#42139)
Browse files Browse the repository at this point in the history
Move CLRTest.*.targets under src/tests/Common;

Consolidate Directory.Build.props in src/tests, src/tests/Common and src/coreclr/tests/src - src/tests is now the "master" version, src/tests/Common just points to it and src/coreclr/tests/src no longer exists;

Move Directory.Build.targets from src/coreclr/tests/src to src/tests/Directory.Build.targets that was previously just importing the src/coreclr/tests/src version;

Move the few remaining scripts under src/coreclr/tests/src to src/tests/Common (dirs.proj, nobuild.targets, runonly.targets, xunitconsolerunner.depproj).

Thanks

Tomas
  • Loading branch information
trylek committed Sep 14, 2020
1 parent 9f72b3a commit 736b304
Show file tree
Hide file tree
Showing 18 changed files with 552 additions and 421 deletions.
2 changes: 1 addition & 1 deletion src/coreclr/tests/helixpublishwitharcade.proj
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
</Target>

<Target Name="PrepareCorrelationPayloadDirectory">
<MSBuild Projects="src\xunitconsolerunner.depproj" Targets="Restore" />
<MSBuild Projects="$(RepoRoot)src\tests\Common\xunitconsolerunner.depproj" Targets="Restore" />

<ItemGroup>
<_XUnitConsoleRunnerFiles Include="$(NuGetPackageRoot)$(MicrosoftDotNetXUnitConsoleRunnerPackage)\$(MicrosoftDotNetXUnitConsoleRunnerVersion)\**\xunit.console.*" />
Expand Down
162 changes: 0 additions & 162 deletions src/coreclr/tests/src/Directory.Build.props

This file was deleted.

Loading

0 comments on commit 736b304

Please sign in to comment.