Permalink
Browse files

Fixed the build.

- Use old version of nuget for windows
- Use newer version of nuget for non windows.
  • Loading branch information...
1 parent c338c99 commit 0e5e7da7866ea8ade81ffde3fb509a1e0ef958db @davidfowl davidfowl committed Oct 9, 2012
Showing with 4 additions and 2 deletions.
  1. BIN .nuget/NuGet.exe
  2. +4 −2 .nuget/NuGet.targets
  3. BIN .nuget/nuget.mono.exe
View
Binary file not shown.
View
@@ -10,7 +10,7 @@
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
<!-- Download NuGet.exe if it does not already exist -->
- <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+ <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageSources)' == '' ">
@@ -26,18 +26,20 @@
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
<PackagesDir>$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
+ <NuGetExeFile>nuget.exe</NuGetExeFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
<PackagesConfig>packages.config</PackagesConfig>
<PackagesDir>$(SolutionDir)packages</PackagesDir>
+ <NuGetExeFile>nuget.mono.exe</NuGetExeFile>
</PropertyGroup>
<PropertyGroup>
<!-- NuGet command -->
- <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+ <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\$(NuGetExeFile)</NuGetExePath>
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
View
Binary file not shown.

0 comments on commit 0e5e7da

Please sign in to comment.