diff options
| author | Roman Artemev <rartemev@microsoft.com> | 2017-03-08 15:37:31 -0800 |
|---|---|---|
| committer | Roman Artemev <rartemev@microsoft.com> | 2017-05-19 15:58:24 -0700 |
| commit | aad6903366ed6d70f218b92bfc762feb29a73773 (patch) | |
| tree | 1370d2167bc6818b89a3a5b9669a23e3967751a0 /tests/src/dir.targets | |
| parent | 7c41871f582fedc751ee6cabd95df3fbad36d847 (diff) | |
| download | coreclr-aad6903366ed6d70f218b92bfc762feb29a73773.tar.gz coreclr-aad6903366ed6d70f218b92bfc762feb29a73773.tar.bz2 coreclr-aad6903366ed6d70f218b92bfc762feb29a73773.zip | |
Test build fixes for 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 4e6c618021..5b9082d282 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -1,3 +1,4 @@ +<?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> @@ -103,10 +104,8 @@ <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" @@ -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="'$(BuildOS)' != 'Windows_NT'" /> + <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\" Condition="'$(BuildOS)' == 'Windows_NT'" /> </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 '$(BuildOS)' == 'Windows_NT'" /> </Target> |