Merge pull request #5693 from dotnet/dev/jgoshi/refactorBuildProj

Remove more properties from build.proj

Microsoft.DotNet.Cli.sln

@@ -26,17 +26,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 	ProjectSection(SolutionItems) = preProject
 		build\Microsoft.DotNet.Cli.Branding.props = build\Microsoft.DotNet.Cli.Branding.props
 		build\Microsoft.DotNet.Cli.BranchInfo.props = build\Microsoft.DotNet.Cli.BranchInfo.props
+		build\Microsoft.DotNet.Cli.BuildDefaults.props = build\Microsoft.DotNet.Cli.BuildDefaults.props
 		build\Microsoft.DotNet.Cli.BundledSdks.proj = build\Microsoft.DotNet.Cli.BundledSdks.proj
 		build\Microsoft.DotNet.Cli.BundledSdks.props = build\Microsoft.DotNet.Cli.BundledSdks.props
 		build\Microsoft.DotNet.Cli.BundledTemplates.proj = build\Microsoft.DotNet.Cli.BundledTemplates.proj
 		build\Microsoft.DotNet.Cli.BundledTemplates.props = build\Microsoft.DotNet.Cli.BundledTemplates.props
 		build\Microsoft.DotNet.Cli.Compile.targets = build\Microsoft.DotNet.Cli.Compile.targets
+		build\Microsoft.DotNet.Cli.CoreSetupInfo.props = build\Microsoft.DotNet.Cli.CoreSetupInfo.props
 		build\Microsoft.DotNet.Cli.DependencyVersions.props = build\Microsoft.DotNet.Cli.DependencyVersions.props
 		build\Microsoft.DotNet.Cli.FileExtensions.props = build\Microsoft.DotNet.Cli.FileExtensions.props
 		build\Microsoft.DotNet.Cli.GitCommitInfo.targets = build\Microsoft.DotNet.Cli.GitCommitInfo.targets
 		build\Microsoft.DotNet.Cli.HostInfo.targets = build\Microsoft.DotNet.Cli.HostInfo.targets
 		build\Microsoft.DotNet.Cli.InitRepo.props = build\Microsoft.DotNet.Cli.InitRepo.props
 		build\Microsoft.DotNet.Cli.InitRepo.targets = build\Microsoft.DotNet.Cli.InitRepo.targets
+		build\Microsoft.DotNet.Cli.InputDirectories.props = build\Microsoft.DotNet.Cli.InputDirectories.props
 		build\Microsoft.DotNet.Cli.Monikers.props = build\Microsoft.DotNet.Cli.Monikers.props
 		build\Microsoft.DotNet.Cli.OutputDirectories.props = build\Microsoft.DotNet.Cli.OutputDirectories.props
 		build\Microsoft.DotNet.Cli.Package.targets = build\Microsoft.DotNet.Cli.Package.targets

build.proj

@@ -2,33 +2,6 @@
 <Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
-  <PropertyGroup>
-    <!--
-      $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
-    -->
-    <PlatformScriptHost Condition=" '$(OS)' == 'Windows_NT' ">powershell -NoProfile -NoLogo -Command </PlatformScriptHost>
-    <PlatformScriptHost Condition=" '$(OS)' != 'Windows_NT' "></PlatformScriptHost>
-
-    <PlatformScriptExtension Condition=" '$(OS)' == 'Windows_NT' ">.ps1</PlatformScriptExtension>
-    <PlatformScriptExtension Condition=" '$(OS)' != 'Windows_NT' ">.sh</PlatformScriptExtension>
-
-    <CLITargets Condition=" '$(CLITargets)' == '' ">Prepare;Compile;Test;Package;Publish</CLITargets>
-
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-
-    <CoreSetupChannel>master</CoreSetupChannel>
-    <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
-    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
-    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
-    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-
-    <ExeExtension>.exe</ExeExtension>
-    <ExeExtension Condition=" '$(OS)' != 'Windows_NT' "></ExeExtension>
-
-    <DotnetCliBuildDirectory>$(RepoRoot)/build_projects/dotnet-cli-build</DotnetCliBuildDirectory>
-    <PackagesDir>$(RepoRoot)/.nuget</PackagesDir>
-  </PropertyGroup>
-
   <ItemGroup>
     <DotnetCliBuildFrameworkInputs Include="build_projects/**/*.cs" Exclude="build_projects/**/obj/**/*.cs" />
     <DotnetCliBuildFrameworkInputs Include="build_projects/**/*.csproj" />

build/Microsoft.DotNet.Cli.Branding.props

@@ -9,7 +9,8 @@
     <AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
     <AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>
 
-    <SharedFrameworkNugetName>Microsoft.NETCore.App</SharedFrameworkNugetName>
+    <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
+    <SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
 
     <ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' Or '$(Rid)' == 'fedora.23-x64' Or '$(Rid)' == 'opensuse.13.2-x64' ">$(Rid)</ProductMonikerRid>
     <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>

build/Microsoft.DotNet.Cli.BuildDefaults.props

@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <CLITargets Condition=" '$(CLITargets)' == '' ">Prepare;Compile;Test;Package;Publish</CLITargets>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+  </PropertyGroup>
+</Project>

build/Microsoft.DotNet.Cli.CoreSetupInfo.props

@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <CoreSetupChannel>master</CoreSetupChannel>
+  </PropertyGroup>
+</Project>

build/Microsoft.DotNet.Cli.DependencyVersions.props

@@ -9,6 +9,9 @@
     <CLI_NuGet_Version>4.0.0-rc3-2193</CLI_NuGet_Version>
     <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
+    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
+    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
+    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
     <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta1-20170131-110</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta1-20170209-117</TemplateEngineTemplate2_0Version>

build/Microsoft.DotNet.Cli.FileExtensions.props

@@ -19,5 +19,11 @@
       <DynamicLibExtension Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibExtension>
       <DynamicLibExtension Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibExtension>
 
+      <ExeExtension>.exe</ExeExtension>
+      <ExeExtension Condition=" '$(OS)' != 'Windows_NT' "></ExeExtension>
+
+      <PlatformScriptExtension Condition=" '$(OS)' == 'Windows_NT' ">.ps1</PlatformScriptExtension>
+      <PlatformScriptExtension Condition=" '$(OS)' != 'Windows_NT' ">.sh</PlatformScriptExtension>
+
     </PropertyGroup>
 </Project>

build/Microsoft.DotNet.Cli.InputDirectories.props

@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <DotnetCliBuildDirectory>$(RepoRoot)/build_projects/dotnet-cli-build</DotnetCliBuildDirectory>
+  </PropertyGroup>
+</Project>

dir.props

@@ -9,10 +9,13 @@
   <Import Condition=" Exists('$(HostInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(HostInfoProps)" />
   
   <Import Project="build/Microsoft.DotNet.Cli.BranchInfo.props" />
+  <Import Project="build/Microsoft.DotNet.Cli.CoreSetupInfo.props" />
 
   <Import Project="build/Microsoft.DotNet.Cli.DependencyVersions.props" />
   <Import Project="build/Microsoft.DotNet.Cli.FileExtensions.props" />
+  <Import Project="build/Microsoft.DotNet.Cli.InputDirectories.props" />
   <Import Project="build/Microsoft.DotNet.Cli.OutputDirectories.props" />
+  <Import Project="build/Microsoft.DotNet.Cli.BuildDefaults.props" />
   <Import Project="build/Microsoft.DotNet.Cli.Stage0.props" />
   <Import Project="build/Microsoft.DotNet.Cli.Version.props" />
   <Import Project="build/Microsoft.DotNet.Cli.Branding.props" />