projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d3cb8b6)
Remove CORE_ROOT workaround. .NET CLI no longer uses the value.
authorDavis Goodin <dagood@microsoft.com>
Wed, 4 May 2016 22:50:19 +0000 (17:50 -0500)
committerDavis Goodin <dagood@microsoft.com>
Wed, 4 May 2016 22:50:19 +0000 (17:50 -0500)
Commit migrated from https://github.com/dotnet/coreclr/commit/eeece8acff8f0d724c82552ddc064d07400114c8

src/coreclr/dir.props patch | blob | history
src/coreclr/tests/dir.props patch | blob | history

diff --git a/src/coreclr/dir.props b/src/coreclr/dir.props
index 2a980a0..0e3d728 100644 (file)
--- a/src/coreclr/dir.props
+++ b/src/coreclr/dir.props
@@ -108,9 +108,6 @@
     <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'!='Unix'">$(DotnetCliPath)dotnet.exe</DotnetToolCommand>  
     <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand>  
 
-    <!-- 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=) &amp;</DnuRestoreCommand>
-    
     <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand> 
     <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
     <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand>
diff --git a/src/coreclr/tests/dir.props b/src/coreclr/tests/dir.props
index c6d248d..088d510 100644 (file)
--- a/src/coreclr/tests/dir.props
+++ b/src/coreclr/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=) &amp;</DnuRestoreCommand>
-    
+
     <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand>
     <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
     <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand>
Domain: Dotnet / Core;