summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorJose Perez Rodriguez <joperezr@microsoft.com>2015-10-02 09:52:22 -0700
committerJose Perez Rodriguez <joperezr@microsoft.com>2015-10-13 12:58:42 -0700
commitcd49a9fada15fefeef6969d1f38fe6575c78533a (patch)
treeb21914ced9d910ca88710bb5546848841e7730b2 /dir.props
parentfec8f02328c50dc3143aca629305f8c8a77a635f (diff)
downloadcoreclr-cd49a9fada15fefeef6969d1f38fe6575c78533a.tar.gz
coreclr-cd49a9fada15fefeef6969d1f38fe6575c78533a.tar.bz2
coreclr-cd49a9fada15fefeef6969d1f38fe6575c78533a.zip
Using DotNetCore version of BclRewriter in mscorlib build
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props5
1 files changed, 4 insertions, 1 deletions
diff --git a/dir.props b/dir.props
index 8ea2a29fca..e98b0e00e0 100644
--- a/dir.props
+++ b/dir.props
@@ -9,7 +9,7 @@
<!-- Build Tools Versions -->
<PropertyGroup>
- <BuildToolsVersion>1.0.25-prerelease-00079</BuildToolsVersion>
+ <BuildToolsVersion>1.0.25-prerelease-00105</BuildToolsVersion>
<BuildToolsCoreCLRVersion>1.0.3-prerelease</BuildToolsCoreCLRVersion>
<DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-beta5-12101</DnxVersion>
<DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-12101</DnxVersion>
@@ -51,6 +51,8 @@
<BinDir>$(__BinDir)\</BinDir>
<BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
+ <IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(__IntermediatesDir)\</IntermediateOutputRootPath>
+
<!-- We don't append back slash because this path is used by nuget.exe as output directory and it
fails to write packages to it if the path contains the forward slash.
-->
@@ -58,6 +60,7 @@
<PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget</PackagesBinDir>
<ToolsDir Condition="'$(ToolsDir)'==''">$(PackagesDir)Microsoft.DotNet.BuildTools.$(BuildToolsVersion)/lib/</ToolsDir>
+ <BuildToolsSemaphore Condition="'$(BuildToolsSemaphore)' == ''">$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll</BuildToolsSemaphore>
<!-- Directory for the CoreCLR tools (BCLRewriter, etc.) -->
<CoreCLRToolsDir>$(PackagesDir)Microsoft.DotNet.BuildTools.CoreCLR.$(BuildToolsCoreCLRVersion)/</CoreCLRToolsDir>