Merge

Microsoft.DotNet.Cli.sln

@@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\Branding.props = build\Branding.props
 		build\BranchInfo.props = build\BranchInfo.props
 		build\BuildDefaults.props = build\BuildDefaults.props
+		build\BuildOutputs.props = build\BuildOutputs.props
 		build\BundledSdks.proj = build\BundledSdks.proj
 		build\BundledRuntimes.props = build\BundledRuntimes.props
 		build\BundledSdks.props = build\BundledSdks.props

build/BuildOutputs.props

@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
+    <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibExtension)</DotnetHostFxrBaseName>
+    <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibExtension)</HostPolicyBaseName>
+  </PropertyGroup>
+</Project>

build/Compile.targets

@@ -3,11 +3,6 @@
   <Import Project="compile/LzmaArchive.targets" />
   <Import Project="crossgen/Crossgen.targets" />
 
-  <PropertyGroup>
-    <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
-    <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
-  </PropertyGroup>
-
   <ItemGroup>
     <PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
     <BundledTools Include="MSBuild;NuGet.CommandLine.XPlat;dotnet" />
@@ -23,28 +18,6 @@
 
   <Target Name="CompileCLI"
           DependsOnTargets="InitCrossgenProps;">
-      <PropertyGroup>
-        <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
-        <DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
-        <DynamicLibPrefix Condition=" '$(OSName)' != 'win' ">lib</DynamicLibPrefix>
-
-        <DynamicLibSuffix Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibSuffix>
-        <DynamicLibSuffix Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibSuffix>
-        <DynamicLibSuffix Condition=" '$(DynamicLibSuffix)' == '' ">.so</DynamicLibSuffix>
-
-        <DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
-        <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
-        <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
-
-        <StageDirectory>$(Stage2Directory)</StageDirectory>
-        <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
-        <SdkOutputDirectory>$(StageDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
-        <BinaryToCorehostifyOutDir>$(SdkOutputDirectory)/$(BinaryToCorehostifyRelDir)</BinaryToCorehostifyOutDir>
-        <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
-
-        <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
-      </PropertyGroup>
-
       <ItemGroup>
         <SharedFramework Remove="*" />
         <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />

build/InputDirectories.props

@@ -1,5 +1,8 @@
 <Project>
   <PropertyGroup>
+    <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
     <DotnetCliBuildDirectory>$(RepoRoot)/build_projects/dotnet-cli-build</DotnetCliBuildDirectory>
+    <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
+    <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
   </PropertyGroup>
 </Project>

build/OutputDirectories.props

@@ -10,8 +10,13 @@
       <DotnetStage2>$(Stage2Directory)/dotnet$(ExeExtension)</DotnetStage2>
       <OutputDirectory>$(Stage2Directory)/</OutputDirectory>
       <Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>
+      <StageDirectory>$(Stage2Directory)</StageDirectory>
+      <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
+      <SdkOutputDirectory>$(StageDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
+      <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
       <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
       <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
       <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
+      <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
   </PropertyGroup>
 </Project>

dir.props

@@ -12,13 +12,15 @@
   <Import Project="build/CoreSetupInfo.props" />
 
   <Import Project="build/DependencyVersions.props" />
+  <Import Project="build/Version.props" />
+  <Import Project="build/Branding.props" />
+
   <Import Project="build/FileExtensions.props" />
   <Import Project="build/InputDirectories.props" />
   <Import Project="build/OutputDirectories.props" />
   <Import Project="build/BuildDefaults.props" />
+  <Import Project="build/BuildOutputs.props" />
   <Import Project="build/Stage0.props" />
-  <Import Project="build/Version.props" />
-  <Import Project="build/Branding.props" />
   <Import Project="build/VersionBadge.props" />
   <Import Project="build/BundledRuntimes.props" />