diff options
| author | Matt Mitchell <mmitche@microsoft.com> | 2015-03-26 09:07:26 -0700 |
|---|---|---|
| committer | Matt Mitchell <mmitche@microsoft.com> | 2015-03-31 10:51:10 -0700 |
| commit | a7f62d7de9fe72c6b4a3ed8173eb22c358de82cc (patch) | |
| tree | 0fd44f7b267796652151c6419b52f1139dc7d0f7 /dir.props | |
| parent | 82440897d45e16d706e80dc96918d362339d0d95 (diff) | |
| download | coreclr-a7f62d7de9fe72c6b4a3ed8173eb22c358de82cc.tar.gz coreclr-a7f62d7de9fe72c6b4a3ed8173eb22c358de82cc.tar.bz2 coreclr-a7f62d7de9fe72c6b4a3ed8173eb22c358de82cc.zip | |
Change paths and os names to match corefx
* binaries is now bin, intermediates is now obj
* modifying unixmscorlib build to instead be linuxmscorlib + osxmscorlib.
* Change OS=Unix to OS=Linux/OS=OSX and modified properties to mimic corefx's TargetsUnix.
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -24,7 +24,7 @@ <PackagesDir Condition="'$(__PackagesDir)'==''">$(ProjectDir)\packages\</PackagesDir> <RootBinDir>$(__RootBinDir)\</RootBinDir> - <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)\binaries\</RootBinDir> + <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)\bin\</RootBinDir> <BinDir>$(__BinDir)\</BinDir> <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)\Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir> @@ -55,7 +55,15 @@ <NuSpecs Condition="'$(Configuration)'=='Debug'" Include="$(PackagesBinDir)\Microsoft.DotNet.CoreCLR.Debug.Development.nuspec" /> </ItemGroup> + <!-- Setup common target properties that we use to conditionally include sources --> + <PropertyGroup> + <TargetsWindows Condition="'$(BuildOS)' == 'Windows_NT'">true</TargetsWindows> + <TargetsLinux Condition="'$(BuildOS)' == 'Linux'">true</TargetsLinux> + <TargetsOSX Condition="'$(BuildOS)' == 'OSX'">true</TargetsOSX> + <TargetsUnix Condition="'$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true'">true</TargetsUnix> + </PropertyGroup> + <!-- Common NuGet properties --> <PropertyGroup> <NuGetToolPath>$(ToolsDir)NuGet.exe</NuGetToolPath> |