Merge

Microsoft.DotNet.Cli.sln

@@ -45,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\InitRepo.targets = build\InitRepo.targets
 		build\InputDirectories.props = build\InputDirectories.props
 		build\InstallerInfo.props = build\InstallerInfo.props
+		build\ProjectsToPublish.props = build\ProjectsToPublish.props
 		build\OutputDirectories.props = build\OutputDirectories.props
 		build\Package.targets = build\Package.targets
 		build\Prepare.targets = build\Prepare.targets

build/Compile.targets

@@ -49,7 +49,7 @@
     <!-- Publish DotNet -->
     <DotNetPublish ToolPath="$(Stage0Directory)"
                    Configuration="$(Configuration)"
-                   ProjectPath="$(SrcDirectory)/redist/redist.csproj" />
+                   ProjectPath="$(RootProject)" />
 
     <!-- Publish Roslyn -->
     <DotNetPublish ToolPath="$(Stage0Directory)"

build/ProjectsToPublish.props

@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <RootProject>$(SrcDirectory)/redist/redist.csproj</RootProject>
+  </PropertyGroup>
+</Project>

dir.props

@@ -26,6 +26,7 @@
 
   <Import Project="build/FileExtensions.props" />
   <Import Project="build/InputDirectories.props" />
+  <Import Project="build/ProjectsToPublish.props" />
   <Import Project="build/OutputDirectories.props" />
   <Import Project="build/BuildDefaults.props" />
   <Import Project="build/BuildOutputs.props" />