diff options
| author | Roman Artemev <rartemev@microsoft.com> | 2017-05-23 15:34:53 -0700 |
|---|---|---|
| committer | Roman Artemev <rartemev@microsoft.com> | 2017-05-29 12:24:52 -0700 |
| commit | df8dca2f2f3a5dd22b9db727e581a3c13fbe403a (patch) | |
| tree | 3dcb2361d85e015ad21f133fe5ff85184a160594 /tests/src/dir.targets | |
| parent | ee454e11d0c73820dde10ab710f9d6eccd4471f1 (diff) | |
| download | coreclr-df8dca2f2f3a5dd22b9db727e581a3c13fbe403a.tar.gz coreclr-df8dca2f2f3a5dd22b9db727e581a3c13fbe403a.tar.bz2 coreclr-df8dca2f2f3a5dd22b9db727e581a3c13fbe403a.zip | |
Make linux test build worked
Diffstat (limited to 'tests/src/dir.targets')
| -rw-r--r-- | tests/src/dir.targets | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 4e6c618021..63630e8fa7 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -103,7 +103,6 @@ <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)'" /> @@ -147,12 +146,13 @@ Condition="'@(NativeProjectReferenceNormalized)' != ''" BeforeTargets="Build" > <ItemGroup> - <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\"/> + <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))" Condition="'$(RunningOnUnix)' == 'true'" /> + <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\" Condition="'$(RunningOnUnix)' != 'true'" /> </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)' != ''" /> + <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != '' And '$(RunningOnUnix)' != 'true'" /> </Target> |