From 5be3a701213b9d2919deb96b7e9529b49f3da54e Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Wed, 22 Feb 2017 00:00:36 -0800
Subject: [PATCH 1/2] RootProject property

---
 Microsoft.DotNet.Cli.sln | 1 +
 build/Compile.targets    | 2 +-
 build/InputFiles.props   | 5 +++++
 dir.props                | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 build/InputFiles.props

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index e749dc055..a92236f81 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -43,6 +43,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\InitRepo.props = build\InitRepo.props
 		build\InitRepo.targets = build\InitRepo.targets
 		build\InputDirectories.props = build\InputDirectories.props
+		build\InputFiles.props = build\InputFiles.props
 		build\OutputDirectories.props = build\OutputDirectories.props
 		build\Package.targets = build\Package.targets
 		build\Prepare.targets = build\Prepare.targets
diff --git a/build/Compile.targets b/build/Compile.targets
index 6084cb1e7..ef6b9c35f 100644
--- a/build/Compile.targets
+++ b/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)"
diff --git a/build/InputFiles.props b/build/InputFiles.props
new file mode 100644
index 000000000..aa7a87ea2
--- /dev/null
+++ b/build/InputFiles.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <RootProject>$(SrcDirectory)/redist/redist.csproj</RootProject>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/dir.props b/dir.props
index 82eb03eb2..df23b1b60 100644
--- a/dir.props
+++ b/dir.props
@@ -17,6 +17,7 @@
 
   <Import Project="build/FileExtensions.props" />
   <Import Project="build/InputDirectories.props" />
+  <Import Project="build/InputFiles.props" />
   <Import Project="build/OutputDirectories.props" />
   <Import Project="build/BuildDefaults.props" />
   <Import Project="build/BuildOutputs.props" />

From 1c9f2e9b83b5c1a58e77a50c95b556441563fa2c Mon Sep 17 00:00:00 2001
From: Unknown <piotrp@microsoft.com>
Date: Wed, 22 Feb 2017 15:33:55 -0800
Subject: [PATCH 2/2] ProjectsToPublish

---
 Microsoft.DotNet.Cli.sln                            | 2 +-
 build/{InputFiles.props => ProjectsToPublish.props} | 0
 dir.props                                           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename build/{InputFiles.props => ProjectsToPublish.props} (100%)

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index a92236f81..f174ad207 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -43,7 +43,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\InitRepo.props = build\InitRepo.props
 		build\InitRepo.targets = build\InitRepo.targets
 		build\InputDirectories.props = build\InputDirectories.props
-		build\InputFiles.props = build\InputFiles.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
diff --git a/build/InputFiles.props b/build/ProjectsToPublish.props
similarity index 100%
rename from build/InputFiles.props
rename to build/ProjectsToPublish.props
diff --git a/dir.props b/dir.props
index df23b1b60..25be13d42 100644
--- a/dir.props
+++ b/dir.props
@@ -17,7 +17,7 @@
 
   <Import Project="build/FileExtensions.props" />
   <Import Project="build/InputDirectories.props" />
-  <Import Project="build/InputFiles.props" />
+  <Import Project="build/ProjectsToPublish.props" />
   <Import Project="build/OutputDirectories.props" />
   <Import Project="build/BuildDefaults.props" />
   <Import Project="build/BuildOutputs.props" />