Merge pull request #5828 from dotnet/dev/jgoshi/removeGlobalProps

First pass at cleaning up the global properties files

Microsoft.DotNet.Cli.sln

@@ -28,7 +28,6 @@ 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\BundledRuntimes.props = build\BundledRuntimes.props
 		build\BundledSdks.proj = build\BundledSdks.proj
 		build\BundledSdks.props = build\BundledSdks.props
@@ -36,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\BundledTemplates.props = build\BundledTemplates.props
 		build\BundledTools.props = build\BundledTools.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

build/BuildOutputs.props

@@ -1,8 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <DotnetHostBaseName>dotnet$(ExeExtension)</DotnetHostBaseName>
-    <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibExtension)</DotnetHostFxrBaseName>
-    <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibExtension)</HostPolicyBaseName>
-    <FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
-  </PropertyGroup>
-</Project>

build/BundledRuntimes.props

@@ -33,7 +33,9 @@
 
       <AdditionalCombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(ArchiveExtension)</AdditionalCombinedFrameworkHostCompressedFileName>
     </PropertyGroup>
+
     <PropertyGroup>
+      <CoreSetupChannel>master</CoreSetupChannel>
       <CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
       <CoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(CoreSetupChannel)</CoreSetupBlobRootUrlWithChannel>
       <SharedFrameworkArchiveBlobRootUrl>$(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion)</SharedFrameworkArchiveBlobRootUrl>

build/Compile.targets

@@ -2,6 +2,15 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="compile/LzmaArchive.targets" />
 
+  <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>
+    <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
+    <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
+    <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
     <MSBuildImportsContent Include="$(MSBuildImportsDir)/**/*" /> 

build/CoreSetupInfo.props

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

build/CrossgenInfo.props

@@ -1,7 +0,0 @@
-<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/InputDirectories.props

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

build/OutputDirectories.props

@@ -1,10 +1,6 @@
 <Project>
   <PropertyGroup>
       <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
-      <ToolsOutputDirectory>$(BaseOutputDirectory)/tools</ToolsOutputDirectory>
-      <Stage1Directory>$(BaseOutputDirectory)/stage1</Stage1Directory>
-      <Stage1SymbolsDirectory>$(BaseOutputDirectory)/stage1symbols</Stage1SymbolsDirectory>
-      <DotnetStage1>$(Stage1Directory)/dotnet$(ExeExtension)</DotnetStage1>
       <Stage2Directory>$(BaseOutputDirectory)/stage2</Stage2Directory>
       <Stage2SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</Stage2SymbolsDirectory>
       <Stage2SdkDirectory>$(Stage2Directory)/sdk/$(SdkVersion)</Stage2SdkDirectory>
@@ -15,18 +11,9 @@
       <StageDirectory>$(Stage2Directory)</StageDirectory>
       <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
       <SdkOutputDirectory>$(Stage2SdkDirectory)</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>
-      <DotnetUnderTest>$(Stage2Directory)</DotnetUnderTest>
       <TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
-      <TestPackagesBuildDir>$(TestOutputDir)/packagesBuild/</TestPackagesBuildDir>
-      <TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
-      <TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
-      <TestResultXmlDir>$(TestOutputDir)/results/</TestResultXmlDir>
-      <NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>
-      <NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder>
   </PropertyGroup>
 </Project>

build/Prepare.targets

@@ -48,7 +48,7 @@
 
     <CallTarget Targets="CleanSrcLockFiles" />
 
-    <DotNetRestore ToolPath="$(DotNetPath)"
+    <DotNetRestore ToolPath="$(Stage0Directory)"
                    ProjectPath="&quot;%(RestoreSrcPackagesInput.FullPath)&quot;" />
 
   </Target>
@@ -73,7 +73,7 @@
 
     <CallTarget Targets="CleanToolsLockFiles" />
 
-    <DotNetRestore ToolPath="$(DotNetPath)"
+    <DotNetRestore ToolPath="$(Stage0Directory)"
                    ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;" />
 
   </Target>

build/Stage0.props

@@ -5,7 +5,6 @@
       <DotnetStage0>$(Stage0Directory)/dotnet$(ExeExtension)</DotnetStage0>
       <IsDesktopAvailable>False</IsDesktopAvailable>
       <IsDesktopAvailable Condition=" '$(OSName)' == 'win' ">True</IsDesktopAvailable>
-      <DotNetPath>$(Stage0Directory)</DotNetPath>
       <CoreCLRRid>$(Rid)</CoreCLRRid>
       <CoreCLRRid Condition=" '$(OSName)' == 'win' ">win7-$(Architecture)</CoreCLRRid>
       <CoreCLRRid Condition=" '$(OSName)' == 'osx' ">osx.10.10-x64</CoreCLRRid>

build/Test.targets

@@ -7,6 +7,9 @@
     <PathListSeparator Condition=" '$(OSName)' == 'win' ">%3b</PathListSeparator>
     <ExecPath>$(Stage2Directory)$(PathListSeparator)$(PATH)</ExecPath>
     <ExecPath Condition=" '$(OSName)' == 'win' ">$(Stage2Directory)</ExecPath>
+    <TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
+    <TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
+    <TestResultXmlDir>$(TestOutputDir)/results/</TestResultXmlDir>
   </PropertyGroup>
 
   <ItemGroup>

build/compile/LzmaArchive.targets

@@ -3,7 +3,6 @@
 
     <PropertyGroup>
       <UploadNuGetPackagesArchiveToAzure>false</UploadNuGetPackagesArchiveToAzure>
-      <ArchiverDll>$(ToolsOutputDirectory)/Archiver.dll</ArchiverDll>
       <NuGetConfigContent>
         &lt;configuration&gt;
         &lt;packageSources&gt;
@@ -11,7 +10,13 @@
         &lt;/packageSources&gt;
         &lt;/configuration&gt;
       </NuGetConfigContent>
+
+      <NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>
+      <NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder>
       <LZMANuGetConfigFilePath>$(NuGetPackagesArchiveProject)/Nuget.config</LZMANuGetConfigFilePath>
+      <ToolsOutputDirectory>$(BaseOutputDirectory)/tools</ToolsOutputDirectory>
+      <ArchiverDll>$(ToolsOutputDirectory)/Archiver.dll</ArchiverDll>
+      <FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
     </PropertyGroup>
 
     <Target Name="GetNuGetPackagesArchive"

build/test/TestPackageProjects.targets

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TestPackagesBuildDir>$(TestOutputDir)/packagesBuild/</TestPackagesBuildDir>
+  </PropertyGroup>
+
   <Target Name="SetupTestPackageProjectData"
           DependsOnTargets="SetupTestPackageProjectFrameworks">
     <ItemGroup>

dir.props

@@ -16,9 +16,8 @@
   <Import Project="build/InitRepo.props" />
   <Import Condition=" Exists('$(GitCommitInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(GitCommitInfoProps)" />
   <Import Condition=" Exists('$(HostInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(HostInfoProps)" />
-  
+
   <Import Project="build/BranchInfo.props" />
-  <Import Project="build/CoreSetupInfo.props" />
 
   <Import Project="build/BundledTools.props" />
   <Import Project="build/DependencyVersions.props" />
@@ -30,12 +29,10 @@
   <Import Project="build/ProjectsToPublish.props" />
   <Import Project="build/OutputDirectories.props" />
   <Import Project="build/BuildDefaults.props" />
-  <Import Project="build/BuildOutputs.props" />
   <Import Project="build/Stage0.props" />
   <Import Project="build/VersionBadge.props" />
   <Import Project="build/BundledRuntimes.props" />
 
   <Import Project="build/AzureInfo.props" />
-  <Import Project="build/CrossgenInfo.props" />
   <Import Project="build/InstallerInfo.props" />
 </Project>