summaryrefslogtreecommitdiff
path: root/tests/dir.props
diff options
context:
space:
mode:
authorwtgodbe <wigodbe@microsoft.com>2017-05-02 16:33:41 -0700
committerwtgodbe <wigodbe@microsoft.com>2017-05-16 16:37:21 -0700
commit798387ee90d7536d5a620af8482100ba76f6061a (patch)
treec11eea885b05e7424f103cd671d227ff173a3083 /tests/dir.props
parent36e988ee6593351f1e962118a99154df5eae0254 (diff)
downloadcoreclr-798387ee90d7536d5a620af8482100ba76f6061a.tar.gz
coreclr-798387ee90d7536d5a620af8482100ba76f6061a.tar.bz2
coreclr-798387ee90d7536d5a620af8482100ba76f6061a.zip
Update Coreclr to 2.0.0 buildtools
Diffstat (limited to 'tests/dir.props')
-rw-r--r--tests/dir.props7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/dir.props b/tests/dir.props
index 3a9b043b09..d5533ee252 100644
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -36,7 +36,7 @@
<!-- Common properties -->
<PropertyGroup>
<RootBinDir>$(__RootBinDir)\</RootBinDir>
- <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
+ <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)..\bin\</RootBinDir>
</PropertyGroup>
<!-- Default Test platform to deploy the netstandard compiled tests to -->
@@ -91,7 +91,7 @@
<!-- list of directories to perform batch restore -->
<ItemGroup>
- <DnuRestoreDir Include="&quot;$(MSBuildProjectDirectory)\src&quot;" />
+ <DnuRestoreDir Include="&quot;$(MSBuildProjectDirectory)\**\*.csproj&quot;" />
</ItemGroup>
<PropertyGroup Condition="'$(BuildAllProjects)'=='true'">
@@ -104,9 +104,8 @@
<DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand>
<DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource>
- <DnuRestoreDirs>@(DnuRestoreDir -> '%(Identity)', ' ')</DnuRestoreDirs>
- <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand>
+ <DnuRestoreCommand>"$(DotnetToolCommand)"</DnuRestoreCommand>
<DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
<DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand>
</PropertyGroup>