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/dir.props | |
| parent | ee454e11d0c73820dde10ab710f9d6eccd4471f1 (diff) | |
| download | coreclr-df8dca2f2f3a5dd22b9db727e581a3c13fbe403a.tar.gz coreclr-df8dca2f2f3a5dd22b9db727e581a3c13fbe403a.tar.bz2 coreclr-df8dca2f2f3a5dd22b9db727e581a3c13fbe403a.zip | |
Make linux test build worked
Diffstat (limited to 'tests/dir.props')
| -rw-r--r-- | tests/dir.props | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/tests/dir.props b/tests/dir.props index e98b3036eb..f44d73a19d 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -4,6 +4,7 @@ $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix. --> <PropertyGroup> + <OsEnvironment Condition="'$(OsEnvironment)'=='' and '$(OS)'=='OSX'">Unix</OsEnvironment> <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment> </PropertyGroup> @@ -18,7 +19,12 @@ as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.6 version of the tasks. --> <PropertyGroup> - <BuildToolsTargets45>true</BuildToolsTargets45> + <RunningOnCore>false</RunningOnCore> + <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'Core'">true</RunningOnCore> + <BuildToolsTargetsDesktop>false</BuildToolsTargetsDesktop> + <BuildToolsTargetsDesktop Condition="'$(RunningOnCore)' != 'true'">true</BuildToolsTargetsDesktop> + <BuildToolsTargets45>$(BuildToolsTargetsDesktop)</BuildToolsTargets45> + <RunningOnUnix Condition="('$(RunningOnUnix)' == '') And ('$(MSBuildRuntimeType)' == 'Core')">true</RunningOnUnix> </PropertyGroup> <!-- Common repo directories --> @@ -28,8 +34,15 @@ <SourceDir>$(ProjectDir)src\</SourceDir> <PackagesDir>$(ProjectDir)..\packages\</PackagesDir> <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir> - <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath> - <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net46/</BuildToolsTaskDir> + <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli\</DotnetCliPath> + <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net46\</BuildToolsTaskDir> + <OverrideToolHost Condition="'$(OS)' != 'Windows_NT'">$(DotnetCliPath)dotnet</OverrideToolHost> + <CSharpCoreTargetsPath Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(ToolsDir)\Microsoft.CSharp.Core.targets</CSharpCoreTargetsPath> + <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip + the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). --> + <_TargetFrameworkDirectories Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories> + <_FullFrameworkReferenceAssemblyPaths Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths> + <ExcludeSigningImport>true</ExcludeSigningImport> <SkipImportILTargets>true</SkipImportILTargets> </PropertyGroup> @@ -37,6 +50,11 @@ <PropertyGroup> <RootBinDir>$(__RootBinDir)\</RootBinDir> <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)..\bin\</RootBinDir> + + <BinDir>$(__BinDir)\</BinDir> + <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir> + + <CoreCLRBinDir>$(RootBinDir)Product\$(__BuildOS).$(__BuildArch).$(__BuildType)\</CoreCLRBinDir> </PropertyGroup> <!-- Default Test platform to deploy the netstandard compiled tests to --> |