From 7993b438a0cfc6250b83ff9d23215e402304244a Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Sat, 27 Aug 2016 21:10:23 -0700
Subject: [PATCH] Reset ToolsVersion to 14

---
 build.proj                                            | 2 +-
 build/Microsoft.DotNet.Cli.Package.targets            | 5 +++--
 build/package/Microsoft.DotNet.Cli.Installer.DEB.proj | 6 +++---
 build/test/RunTest.proj                               | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.proj b/build.proj
index 8f4bf2e19..4aa253178 100644
--- a/build.proj
+++ b/build.proj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="build/Microsoft.DotNet.Cli.Monikers.props" />
 
   <PropertyGroup>
diff --git a/build/Microsoft.DotNet.Cli.Package.targets b/build/Microsoft.DotNet.Cli.Package.targets
index 93e182727..150d0520f 100644
--- a/build/Microsoft.DotNet.Cli.Package.targets
+++ b/build/Microsoft.DotNet.Cli.Package.targets
@@ -32,8 +32,9 @@
                   SharedFrameworkBrandName=$(SharedFrameworkBrandName);
                   SharedFrameworkName=$(SharedFrameworkName);
                   SharedFrameworkVersion=$(SharedFrameworkVersion);
-                  ToolPath=$(Stage2Directory);">
-      <Output TaskParameter="GeneratedInstallers"
+                  ToolPath=$(Stage2Directory);"
+      Targets="GenerateDebs">
+      <Output TaskParameter="TargetOutputs"
               ItemName="GeneratedInstallers" />
     </MSBuild>
   </Target>
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
index f154bc018..76fda7254 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
-         DefaultTarget="GenerateDebs">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
     <CLIBuildDll Condition=" '!Exists($(CLIBuildDll))' ">$([MSBuild]::Unescape($(CLIBuildDll)))</CLIBuildDll>
@@ -17,7 +16,8 @@
           DependsOnTargets="TestDebuild;
                             BuildSdkDeb;
                             TestSdkDeb;"
-          Condition=" '$(OSName)' == 'ubuntu' " />
+          Condition=" '$(OSName)' == 'ubuntu' " 
+          Outputs="@(GeneratedInstallers)"/>
 
   <Target Name="BuildSdkDeb"
       Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)'  == 'true' "
diff --git a/build/test/RunTest.proj b/build/test/RunTest.proj
index ff9a68698..b3faca530 100644
--- a/build/test/RunTest.proj
+++ b/build/test/RunTest.proj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTarget="RunTest" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTarget="RunTest" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- workaround for https://github.com/Microsoft/msbuild/issues/885 -->
   <PropertyGroup>