diff options
author | Davis Goodin <dagood@microsoft.com> | 2016-05-04 17:50:19 -0500 |
---|---|---|
committer | Davis Goodin <dagood@microsoft.com> | 2016-05-04 17:50:19 -0500 |
commit | eeece8acff8f0d724c82552ddc064d07400114c8 (patch) | |
tree | a01f67453d527fc6bfd74ca81cefe1df57c36579 /tests | |
parent | f005f1e72012913fb779ab16e68cef6a75b9b3c3 (diff) | |
download | coreclr-eeece8acff8f0d724c82552ddc064d07400114c8.tar.gz coreclr-eeece8acff8f0d724c82552ddc064d07400114c8.tar.bz2 coreclr-eeece8acff8f0d724c82552ddc064d07400114c8.zip |
Remove CORE_ROOT workaround. .NET CLI no longer uses the value.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/dir.props | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/dir.props b/tests/dir.props index c6d248d88d..088d510e88 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -100,10 +100,7 @@ <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource> <DnuRestoreDirs>@(DnuRestoreDir -> '%(Identity)', ' ')</DnuRestoreDirs> - - <!-- If CORE_ROOT is set on Windows, the dotnet CLI tool tries to use it. This results in DLL resolution errors. Unset CORE_ROOT during restore. --> - <DnuRestoreCommand Condition="'$(OsEnvironment)'!='Unix'">(set CORE_ROOT=) &</DnuRestoreCommand> - + <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand> |