From 89ff57f51b7015f73480263fca5082ee4607c46f Mon Sep 17 00:00:00 2001
From: jonsequitur <jonsequeira@gmail.com>
Date: Wed, 25 Jan 2017 16:28:35 -0800
Subject: [PATCH] only build desktop-and-portable TestPackage on Windows

---
 build/Microsoft.DotNet.Cli.Test.targets | 10 ++--------
 build/test/TestPackageProjects.targets  |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets
index cdd2c2ca3..1d0944290 100644
--- a/build/Microsoft.DotNet.Cli.Test.targets
+++ b/build/Microsoft.DotNet.Cli.Test.targets
@@ -100,15 +100,9 @@
                    Source="$(TestPackagesDir)"
                    ConfigFile="$(RepoRoot)\NuGet.Config"
                    ProjectPath="%(TestPackageProject.ProjectPath)" />
-
-    <DotNetBuild Framework="$(Framework)"
-                 Runtime="%(TestPackageProject.Runtime)"
-                 ProjectPath="%(TestPackageProject.ProjectPath)"
-                 ToolPath="$(Stage0Directory)" />
-    
+ 
     <!-- https://github.com/NuGet/Home/issues/4063 -->
-    <DotNetPack NoBuild="True"
-                Output="$(TestPackagesDir)"
+    <DotNetPack Output="$(TestPackagesDir)"
                 ProjectPath="%(TestPackageProject.ProjectPath)"
                 ToolPath="$(Stage0Directory)"
                 VersionSuffix="%(TestPackageProject.VersionSuffix)"
diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets
index 4f1903640..9d0fa652f 100644
--- a/build/test/TestPackageProjects.targets
+++ b/build/test/TestPackageProjects.targets
@@ -121,7 +121,7 @@
         <Clean>True</Clean>
         <Frameworks>netcoreapp1.0</Frameworks>
       </BaseTestPackageProject>
-      <BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-desktop-and-portable">
+      <BaseTestPackageProject Condition=" '$(IsDesktopAvailable)' == 'True' " Include="TestAssets/TestPackages/dotnet-desktop-and-portable">
         <Name>dotnet-desktop-and-portable</Name>
         <ProjectName>dotnet-desktop-and-portable.csproj</ProjectName>
         <IsTool>True</IsTool>