Refactor props in crossgen.target

Microsoft.DotNet.Cli.sln

@@ -51,6 +51,7 @@ 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
@@ -89,11 +90,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B1
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "crossgen", "crossgen", "{19AC02B7-6D2C-4C2B-A410-9D4A59CE0E47}"
-	ProjectSection(SolutionItems) = preProject
-		build\crossgen\Crossgen.targets = build\crossgen\Crossgen.targets
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC1BC2-867E-47C0-BAD0-ADE897F07F78}"
 	ProjectSection(SolutionItems) = preProject
 		build\prepare\CentosCoreclrAndCoreFxDependencies.props = build\prepare\CentosCoreclrAndCoreFxDependencies.props

build/Compile.targets

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="compile/LzmaArchive.targets" />
-  <Import Project="crossgen/Crossgen.targets" />
 
   <ItemGroup>
     <PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
@@ -16,8 +15,7 @@
                                            BuildProjectsForNuGetPackages;
                                            GetNuGetPackagesArchive;" />
 
-  <Target Name="CompileCLI"
-          DependsOnTargets="InitCrossgenProps;">
+  <Target Name="CompileCLI">
     <ItemGroup>
       <SharedFramework Remove="*" />
       <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />

build/ToolInfo.props

@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <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>
+  </PropertyGroup>
+</Project>

build/crossgen/Crossgen.targets

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="InitCrossgenProps"
-          DependsOnTargets="Init">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-  </Target>
-</Project>

dir.props

@@ -20,6 +20,7 @@
   <Import Project="build/OutputDirectories.props" />
   <Import Project="build/BuildDefaults.props" />
   <Import Project="build/BuildOutputs.props" />
+  <Import Project="build/ToolInfo.props" />
   <Import Project="build/Stage0.props" />
   <Import Project="build/VersionBadge.props" />
   <Import Project="build/Microsoft.DotNet.Cli.BundledRuntimes.props" />