diff options
Diffstat (limited to 'tests/src/dir.targets')
| -rw-r--r-- | tests/src/dir.targets | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 31d9304880..64b56667f3 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -1,8 +1,23 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <!-- Default priority building values. --> + <PropertyGroup> + <CLRTestKind Condition="'$(CLRTestKind)' == '' and '$(OutputType)' == 'Library'">SharedLibrary</CLRTestKind> + <CLRTestKind Condition="'$(CLRTestKind)' == ''">BuildAndRun</CLRTestKind> + <CLRTestPriority Condition="'$(CLRTestPriority)' == ''">0</CLRTestPriority> + </PropertyGroup> + <!-- All CLRTests need to be of a certain "kind". These kinds are enumerated below. By default all tests are BuildAndRun. This means that the build system will Build them and construct a run-batch-script for them. --> <Choose> + <When Condition=" '$(CLRTestKind)'=='SharedLibrary'"> + <PropertyGroup> + <_CLRTestCompilesSource>true</_CLRTestCompilesSource> + <_CLRTestNeedsToRun>false</_CLRTestNeedsToRun> + <GenerateRunScript>false</GenerateRunScript> + <_CLRTestBuildsExecutable>false</_CLRTestBuildsExecutable> + </PropertyGroup> + </When> <When Condition=" '$(CLRTestKind)'=='BuildAndRun' "> <PropertyGroup> <GenerateRunScript>true</GenerateRunScript> @@ -28,14 +43,6 @@ <_CLRTestCompilesSource>false</_CLRTestCompilesSource> </PropertyGroup> </When> - <When Condition=" '$(CLRTestKind)'=='SharedLibrary' Or '$(OutputType)' == 'Library' "> - <PropertyGroup> - <_CLRTestCompilesSource>true</_CLRTestCompilesSource> - <_CLRTestNeedsToRun>false</_CLRTestNeedsToRun> - <GenerateRunScript>false</GenerateRunScript> - <_CLRTestBuildsExecutable>false</_CLRTestBuildsExecutable> - </PropertyGroup> - </When> </Choose> <PropertyGroup> @@ -80,11 +87,6 @@ <MSBuild Projects="@(ProjectReference)" /> <MakeDir Condition="'$(CLRTestKind)' == 'RunOnly'" ContinueOnError="false" Directories="$(OutputPath)" /> </Target> - - <Target Name="CopyJsonProjectFiles" AfterTargets="Build"> - <!-- Post build copy project json files so we can generate assembly lists for the projects --> - <Copy SourceFiles="$(ProjectLockJson)" DestinationFolder="$(OutputPath)" Condition="Exists('$(ProjectLockJson)')" /> - </Target> <!-- We will use an imported build here in the instance that we have source that we need to build, and we are the correct priority...OR if we are being asked to build for a test with a higher priority. --> |