From 02e47f1d0050579d1d88afa0fb86f3c4f6ab0883 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 22 Feb 2017 10:10:54 -0800
Subject: [PATCH] Address PR comments

---
 Microsoft.DotNet.Cli.sln                     | 2 +-
 build/{ToolInfo.props => CrossgenInfo.props} | 3 ---
 dir.props                                    | 6 +++++-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename build/{ToolInfo.props => CrossgenInfo.props} (74%)

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index d0801b181..e749dc055 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\BundledTemplates.props = build\BundledTemplates.props
 		build\Compile.targets = build\Compile.targets
 		build\CoreSetupInfo.props = build\CoreSetupInfo.props
+		build\CrossgenInfo.props = build\CrossgenInfo.props
 		build\DependencyVersions.props = build\DependencyVersions.props
 		build\FileExtensions.props = build\FileExtensions.props
 		build\GitCommitInfo.targets = build\GitCommitInfo.targets
@@ -51,7 +52,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\Stage0.props = build\Stage0.props
 		build\tasks = build\tasks
 		build\Test.targets = build\Test.targets
-		build\ToolInfo.props = build\ToolInfo.props
 		build\Version.props = build\Version.props
 		build\VersionBadge.props = build\VersionBadge.props
 	EndProjectSection
diff --git a/build/ToolInfo.props b/build/CrossgenInfo.props
similarity index 74%
rename from build/ToolInfo.props
rename to build/CrossgenInfo.props
index 12c94a6c2..6e980d55e 100644
--- a/build/ToolInfo.props
+++ b/build/CrossgenInfo.props
@@ -1,8 +1,5 @@
 <Project>
   <PropertyGroup>
-    <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
-    <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
-
     <RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
     <CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
     <LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
diff --git a/dir.props b/dir.props
index 71a4076ac..82eb03eb2 100644
--- a/dir.props
+++ b/dir.props
@@ -21,15 +21,19 @@
   <Import Project="build/BuildDefaults.props" />
   <Import Project="build/BuildOutputs.props" />
   <Import Project="build/Stage0.props" />
-  <Import Project="build/ToolInfo.props" />
   <Import Project="build/VersionBadge.props" />
   <Import Project="build/BundledRuntimes.props" />
   
   <PropertyGroup>
+    <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
+    <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
+
     <CLIBuildDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll</CLIBuildDll>
 
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
 
     <CliTargetFramework>netcoreapp2.0</CliTargetFramework>
   </PropertyGroup>
+
+  <Import Project="build/CrossgenInfo.props" />
 </Project>