Merge pull request #5782 from dotnet/dev/jgoshi/refactorCrossgenTarget

Refactor props in crossgen.target

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
@@ -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,15 +15,14 @@
                                            BuildProjectsForNuGetPackages;
                                            GetNuGetPackagesArchive;" />
 
-  <Target Name="CompileCLI"
-          DependsOnTargets="InitCrossgenProps;">
+  <Target Name="CompileCLI">
       <ItemGroup>
         <SharedFramework Remove="*" />
         <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
 
         <RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
         <RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
-        
+
         <RuntimeAssetsToRemoveFromDeps Remove="*" />
         <RuntimeAssetsToRemoveFromDeps Include="redist" />
         <RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
@@ -47,7 +45,7 @@
     </ItemGroup>
     <Copy SourceFiles="@(HackFilesToCopy)"
           DestinationFiles="@(HackFilesToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
-    
+
     <!-- Publish DotNet -->
     <DotNetPublish ToolPath="$(Stage0Directory)"
                    Configuration="$(Configuration)"
@@ -99,7 +97,7 @@
                                       $(SdkOutputDirectory)/System.Collections.NonGeneric.dll;
                                       $(SdkOutputDirectory)/System.Private.DataContractSerialization.dll" />
       </ItemGroup>
-    
+
       <!-- Move these "1.0" assemblies that TestPlatform lays down out of the way so crossgen doesn't pick them up.
            We need https://github.com/dotnet/cli/issues/5464 fixed, so test platform is in a separate directory -->
       <Move SourceFiles="@(NETCore10Assemblies)"

build/CrossgenInfo.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

@@ -34,4 +34,6 @@
 
     <CliTargetFramework>netcoreapp2.0</CliTargetFramework>
   </PropertyGroup>
+
+  <Import Project="build/CrossgenInfo.props" />
 </Project>