Use common .tools dir for global tools (dotnet#36597)

* Use common .tools dir for global tools
almaleksia · Apr 9, 2019 · b181583 · b181583
1 parent 02d4a83
commit b181583
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,9 @@ syntax: glob
 ### VisualStudio ###
 
 # Tool Runtime Dir
-/[Tt]ools/
 .dotnet/
 .packages/
+.tools/
 
 # User-specific files
 *.suo

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -353,7 +353,8 @@
     <NetStandardRefPath>$(RefRootPath)netstandard/</NetStandardRefPath>
     <NetStandard21RefPath>$(RefRootPath)netstandard2.1/</NetStandard21RefPath>
     <NetFxRefPath>$(RefRootPath)netfx/</NetFxRefPath>
-    <GlobalToolsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tools'))</GlobalToolsDir>
+    <!-- Keep in sync with property in eng\Tools.props. -->
+    <GlobalToolsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.tools', 'globaltools'))</GlobalToolsDir>
     <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
     <ILAsmToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsToolsetDir)', 'ilasm'))</ILAsmToolPath>
     <ILLinkDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsToolsetDir)', 'ILLink'))</ILLinkDir>

diff --git a/eng/Tools.props b/eng/Tools.props
@@ -90,7 +90,8 @@
   <Target Name="InitGlobalTools" Condition="'@(RepoTool)' != ''" AfterTargets="Restore">
 
     <PropertyGroup>
-      <GlobalToolsDir>$(ArtifactsDir)tools</GlobalToolsDir>
+      <!-- Keep in sync with property in RepoRoot\Directory.Build.props. -->
+      <GlobalToolsDir>$([MSBuild]::NormalizePath('$(RepoRoot)', '.tools', 'globaltools'))</GlobalToolsDir>
     </PropertyGroup>
 
     <!-- List all global tools and save the output. -->