diff options
| author | Rahul Kumar <rahku@microsoft.com> | 2016-02-01 13:51:15 -0800 |
|---|---|---|
| committer | Rahul Kumar <rahku@microsoft.com> | 2016-02-01 14:26:16 -0800 |
| commit | bda7cf21b9be3bd99830fb4700740846420f5d3f (patch) | |
| tree | 94514f862b024d23e11ea64ce7653db7fb821d52 /tests/dir.props | |
| parent | 332bbcdc6226f7d8d63e49fa53d30e1a53839f7f (diff) | |
| download | coreclr-bda7cf21b9be3bd99830fb4700740846420f5d3f.tar.gz coreclr-bda7cf21b9be3bd99830fb4700740846420f5d3f.tar.bz2 coreclr-bda7cf21b9be3bd99830fb4700740846420f5d3f.zip | |
Update buildtools version for test builds
Diffstat (limited to 'tests/dir.props')
| -rw-r--r-- | tests/dir.props | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/tests/dir.props b/tests/dir.props index a47b3d2aa5..3d497ce9ec 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -9,24 +9,27 @@ <!-- Build Tools Versions --> <PropertyGroup> - <BuildToolsVersion>1.0.25-prerelease-00121</BuildToolsVersion> - <BuildToolsCoreCLRVersion>1.0.3-prerelease</BuildToolsCoreCLRVersion> - <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-rc2-16128</DnxVersion> - <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-rc2-16128</DnxVersion> - <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName> - <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName> <RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion> <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName> - <BuildToolsCoreCLRPackageName>Microsoft.DotNet.BuildTools.CoreCLR</BuildToolsCoreCLRPackageName> - <BuildToolsCoreCLRLocation>$(ToolsDir)$(BuildToolsCoreCLRPackageName).$(BuildToolsCoreCLRVersion)</BuildToolsCoreCLRLocation> </PropertyGroup> + <!-- + Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer + as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. + --> + <PropertyGroup> + <BuildToolsTargets45>true</BuildToolsTargets45> + </PropertyGroup> + + <!-- Common repo directories --> <PropertyGroup> <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir> <SourceDir>$(ProjectDir)src\</SourceDir> - <PackagesDir>$(ProjectDir)packages\</PackagesDir> - <ToolsDir>$(PackagesDir)Microsoft.DotNet.BuildTools.$(BuildToolsVersion)\lib\</ToolsDir> + <PackagesDir>$(ProjectDir)..\packages\</PackagesDir> + <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir> + <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/bin/</DotnetCliPath> + <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net45/</BuildToolsTaskDir> </PropertyGroup> <!-- Common nuget properties --> @@ -56,14 +59,13 @@ </PropertyGroup> <PropertyGroup> - <DnxPackageDir Condition="'$(DnxPackageDir)'==''">$(PackagesDir)/$(DnxPackageName)/</DnxPackageDir> - <DnuToolPath Condition="'$(DnuToolPath)'=='' and '$(OsEnvironment)'!='Unix'">$(DnxPackageDir)\bin\dnu.cmd</DnuToolPath> - <DnuToolPath Condition="'$(DnuToolPath)'=='' and '$(OsEnvironment)'=='Unix'">$(DnxPackageDir)/bin/dnu</DnuToolPath> + <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'!='Unix'">$(DotnetCliPath)dotnet.exe</DotnetToolCommand> + <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand> <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource> <DnuRestoreDirs>@(DnuRestoreDir -> '%(Identity)', ' ')</DnuRestoreDirs> - <DnuRestoreCommand>"$(DnuToolPath)"</DnuRestoreCommand> + <DnuRestoreCommand>"$(DotnetToolCommand)"</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand> <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand> |