diff options
| author | Russ Keldorph <russ.keldorph@microsoft.com> | 2017-05-22 11:24:09 -0700 |
|---|---|---|
| committer | Russ Keldorph <russ.keldorph@microsoft.com> | 2017-05-22 13:30:31 -0700 |
| commit | a16a8a852077b0c471cf12ef75dc5e8a41333533 (patch) | |
| tree | dac36f93f17ea00ec6f704fd04c5251ef83210d0 /tests/src/dir.targets | |
| parent | c41d51e46069b3b21b8a0361688e2557586f353c (diff) | |
| download | coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.tar.gz coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.tar.bz2 coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.zip | |
Revert "Fixed tests build on Linux"
Diffstat (limited to 'tests/src/dir.targets')
| -rw-r--r-- | tests/src/dir.targets | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 5b9082d282..4e6c618021 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- Default priority building values. --> <PropertyGroup> @@ -104,8 +103,10 @@ <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.csproj' OR '$(Language)' == 'C#' OR '$(ProjectLanguage)'==''">CSharp</ProjectLanguage> </PropertyGroup> + <!-- TODO (#1122): import this from the ToolsDir once it becomes available --> <Import Project="$(ProjectDir)src\IL.targets" Condition="'$(ProjectLanguage)' == 'IL' And '$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)'" /> + <Import Project="CLRTest.Execute.targets" /> <Target Name="CreateExecuteScript" AfterTargets="Build" @@ -146,13 +147,12 @@ Condition="'@(NativeProjectReferenceNormalized)' != ''" BeforeTargets="Build" > <ItemGroup> - <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))" Condition="'$(BuildOS)' != 'Windows_NT'" /> - <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\" Condition="'$(BuildOS)' == 'Windows_NT'" /> + <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\"/> </ItemGroup> <Message Text= "Full native project references are :%(NativeProjectReferenceNormalized.Identity)" /> <Message Text= "Native binaries will be copied from :%(NativeProjectOutputFoldersToCopy.Identity)" /> - <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != '' And '$(BuildOS)' == 'Windows_NT'" /> + <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != ''" /> </Target> |