From 58d167f3e516163c0aeca2b92592d6f336dc27f3 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Thu, 16 Feb 2017 12:21:15 -0800
Subject: [PATCH 1/2] Refactor properties out of Compile.targets

---
 Microsoft.DotNet.Cli.sln      |  1 +
 build/BuildOutputs.props      |  7 +++++++
 build/Compile.targets         | 27 ---------------------------
 build/InputDirectories.props  |  3 +++
 build/OutputDirectories.props |  5 +++++
 dir.props                     |  6 ++++--
 6 files changed, 20 insertions(+), 29 deletions(-)
 create mode 100644 build/BuildOutputs.props

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index ad1c9b9a5..b7f28f54a 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/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\Microsoft.DotNet.Cli.BundledRuntimes.props = build\Microsoft.DotNet.Cli.BundledRuntimes.props
 		build\BundledSdks.props = build\BundledSdks.props
diff --git a/build/BuildOutputs.props b/build/BuildOutputs.props
new file mode 100644
index 000000000..987769037
--- /dev/null
+++ b/build/BuildOutputs.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
+    <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
+    <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
+  </PropertyGroup>
+</Project>
diff --git a/build/Compile.targets b/build/Compile.targets
index b32af2e07..6b6027af4 100644
--- a/build/Compile.targets
+++ b/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)/**/*" />
diff --git a/build/InputDirectories.props b/build/InputDirectories.props
index bbb344d0a..9bfeadb3a 100644
--- a/build/InputDirectories.props
+++ b/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>
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index e43b33a84..9be5c2c97 100644
--- a/build/OutputDirectories.props
+++ b/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>
diff --git a/dir.props b/dir.props
index 8425f4625..c7b1bab48 100644
--- a/dir.props
+++ b/dir.props
@@ -12,13 +12,15 @@
   <Import Project="build/CoreSetupInfo.props" />
 
   <Import Project="build/Microsoft.DotNet.Cli.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/Microsoft.DotNet.Cli.BundledRuntimes.props" />
   

From 23a3879f468f781dfa76102588550c0b31327d29 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Thu, 16 Feb 2017 16:42:49 -0800
Subject: [PATCH 2/2] Fix build break

---
 build/BuildOutputs.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/BuildOutputs.props b/build/BuildOutputs.props
index 987769037..d332ec429 100644
--- a/build/BuildOutputs.props
+++ b/build/BuildOutputs.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
-    <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
-    <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
+    <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibExtension)</DotnetHostFxrBaseName>
+    <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibExtension)</HostPolicyBaseName>
   </PropertyGroup>
 </Project>