From 46e2c96e00154252f69d7bd38115b031f090c973 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpparsons@gmail.com>
Date: Wed, 25 Mar 2015 21:44:47 -0700
Subject: [PATCH 1/3] Fix NuGet restore

The targets files bootstrap NuGet.exe by downloading it on demand using
inline C# code via CodeTaskFactory.  This is not supported on xbuild
hence a build on a fresh enlistment will fail.

This change fixes that by using curl to bootstrap NuGet.exe in a
non-windows environment.
---
 dir.props   |  1 +
 dir.targets | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/dir.props b/dir.props
index 9b28539294d..8063df42442 100644
--- a/dir.props
+++ b/dir.props
@@ -15,6 +15,7 @@
 
   <!-- Common nuget properties -->
   <PropertyGroup>
+    <NuGetDir>$(PackagesDir)</NuGetDir>
     <NuGetToolPath>$(PackagesDir)NuGet.exe</NuGetToolPath>
     <NuGetConfigFile>$(SourceDir).nuget$([System.IO.Path]::DirectorySeparatorChar)NuGet.Config</NuGetConfigFile>
     <NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine>
diff --git a/dir.targets b/dir.targets
index 713df4de08e..ff86b0a1c3a 100644
--- a/dir.targets
+++ b/dir.targets
@@ -44,13 +44,13 @@
   <Target Name="_RestoreBuildToolsWrapper" DependsOnTargets="_RestoreBuildTools" />
 
   <Target Name="_RestoreBuildTools"
+          Condition="'$(OS)' == 'Windows_NT'"
           Inputs="$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)dir.props"
           Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath)">
 
-    <!-- Download latest nuget.exe -->
     <DownloadFile FileName="$(NuGetToolPath)"
                   Address="http://nuget.org/nuget.exe" 
-                  Condition="!Exists('$(NuGetToolPath)')" />
+                  Condition="'$(OS)' == 'Windows_NT' AND !Exists('$(NuGetToolPath)')" />
 
     <!-- Restore build tools -->
     <!-- 
@@ -61,4 +61,24 @@
            Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
   </Target>
 
-</Project>
\ No newline at end of file
+  <Target Name="_RestoreBuildTools"
+          Condition="'$(OS)' != 'Windows_NT'"
+          Inputs="$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)dir.props"
+          Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath)">
+
+    <MakeDir Directories="$(NuGetDir)" Condition="!Exists('$(NuGetDir)')" />
+
+    <Exec Command="curl -s -o $(NuGetToolPath) https://api.nuget.org/downloads/nuget.exe" Condition="!Exists('$(NuGetToolPath)')" />
+
+    <Exec Command="chmod +x $(NuGetToolPath)" />
+
+    <!-- Restore build tools -->
+    <!-- 
+    <Exec Command="$(NugetRestoreCommand) &quot;$(SourceDir).nuget/packages.config&quot;" StandardOutputImportance="Low" />
+    -->    
+    <Exec Command="mono $(NugetRestoreCommand) &quot;$(SourceDir).nuget/packages.config&quot;" />
+    <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'"
+           Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
+  </Target>
+
+</Project>

From dd7a420270ca5d5cdb515d2df3d5d39719c52c2c Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpparsons@gmail.com>
Date: Wed, 25 Mar 2015 21:49:31 -0700
Subject: [PATCH 2/3] Removed unnecessary OS check

---
 dir.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dir.targets b/dir.targets
index ff86b0a1c3a..d270dced1ff 100644
--- a/dir.targets
+++ b/dir.targets
@@ -50,7 +50,7 @@
 
     <DownloadFile FileName="$(NuGetToolPath)"
                   Address="http://nuget.org/nuget.exe" 
-                  Condition="'$(OS)' == 'Windows_NT' AND !Exists('$(NuGetToolPath)')" />
+                  Condition="!Exists('$(NuGetToolPath)')" />
 
     <!-- Restore build tools -->
     <!-- 

From 98f0dee833204f432e6be2ff692cbd201e54a7d0 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpparsons@gmail.com>
Date: Thu, 26 Mar 2015 07:19:00 -0700
Subject: [PATCH 3/3] Update based on feedback

---
 dir.props   |  1 +
 dir.targets | 25 +++----------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/dir.props b/dir.props
index 8063df42442..4755b9bdd6e 100644
--- a/dir.props
+++ b/dir.props
@@ -24,6 +24,7 @@
     <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand>
     <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\/'.ToCharArray()))"</NugetRestoreCommand>
     <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand>
+    <NugetRestoreCommand Condition="'$(OS)' != 'Windows_NT'">mono $(NuGetRestoreCommand)</NugetRestoreCommand>
   </PropertyGroup>
   
   <!-- Set default Configuration and Platform -->
diff --git a/dir.targets b/dir.targets
index d270dced1ff..9e888718577 100644
--- a/dir.targets
+++ b/dir.targets
@@ -44,39 +44,20 @@
   <Target Name="_RestoreBuildToolsWrapper" DependsOnTargets="_RestoreBuildTools" />
 
   <Target Name="_RestoreBuildTools"
-          Condition="'$(OS)' == 'Windows_NT'"
           Inputs="$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)dir.props"
           Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath)">
 
     <DownloadFile FileName="$(NuGetToolPath)"
                   Address="http://nuget.org/nuget.exe" 
-                  Condition="!Exists('$(NuGetToolPath)')" />
+                  Condition="!Exists('$(NuGetToolPath)') AND '$(OS)' == 'Windows_NT'" />
 
-    <!-- Restore build tools -->
-    <!-- 
-    <Exec Command="$(NugetRestoreCommand) &quot;$(SourceDir).nuget/packages.config&quot;" StandardOutputImportance="Low" />
-    -->    
-    <Exec Command="$(NugetRestoreCommand) &quot;$(SourceDir).nuget/packages.config&quot;" />
-    <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'"
-           Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
-  </Target>
-
-  <Target Name="_RestoreBuildTools"
-          Condition="'$(OS)' != 'Windows_NT'"
-          Inputs="$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)dir.props"
-          Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath)">
-
-    <MakeDir Directories="$(NuGetDir)" Condition="!Exists('$(NuGetDir)')" />
-
-    <Exec Command="curl -s -o $(NuGetToolPath) https://api.nuget.org/downloads/nuget.exe" Condition="!Exists('$(NuGetToolPath)')" />
-
-    <Exec Command="chmod +x $(NuGetToolPath)" />
+    <Exec Command="curl -sSL --create-dirs -s -o $(NuGetToolPath) https://api.nuget.org/downloads/nuget.exe" Condition="!Exists('$(NuGetToolPath)') AND '$(OS)' != 'Windows_NT'" />
 
     <!-- Restore build tools -->
     <!-- 
     <Exec Command="$(NugetRestoreCommand) &quot;$(SourceDir).nuget/packages.config&quot;" StandardOutputImportance="Low" />
     -->    
-    <Exec Command="mono $(NugetRestoreCommand) &quot;$(SourceDir).nuget/packages.config&quot;" />
+    <Exec Command="$(NugetRestoreCommand) &quot;$(SourceDir).nuget/packages.config&quot;" />
     <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'"
            Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
   </Target>