Merge pull request #236 from forki/master

shiftkey · shiftkey · commit d7634c1dc417 · 2013-11-22T21:06:04.000-08:00
Use FAKE 2.2 for build
diff --git a/build.cmd b/build.cmd
@@ -1,17 +1,6 @@
 @echo off
 
-SET MinimalFAKEVersion=639
-SET FAKEVersion=1
-cls
-
-if exist tools\FAKE.Core\tools\PatchVersion.txt ( 
-    FOR /F "tokens=*" %%i in (tools\FAKE.Core\tools\PatchVersion.txt) DO (SET FAKEVersion=%%i)    
-)
-
-if %MinimalFAKEVersion% lss %FAKEVersion% goto Build
-if %MinimalFAKEVersion%==%FAKEVersion% goto Build
-
-"tools\nuget\nuget.exe" "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-Prerelease"
+"tools\nuget\nuget.exe" "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "2.2.0"
 
 :Build
 cls
diff --git a/script/cibuild.ps1 b/script/cibuild.ps1
@@ -76,7 +76,7 @@ if (Test-Path tools\FAKE.Core\tools\Fake.exe) {
 else {
     Write-Output "Installing FAKE..."
     Write-Output ""
-    .\tools\nuget\nuget.exe "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-Prerelease"
+    .\tools\nuget\nuget.exe "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-Version" "2.2.0"
 }
 
 Write-Output "Building Octokit..."

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ if (Test-Path tools\FAKE.Core\tools\Fake.exe) {`
`76`	`76`	`else {`
`77`	`77`	`Write-Output "Installing FAKE..."`
`78`	`78`	`Write-Output ""`
`79`		`- .\tools\nuget\nuget.exe "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-Prerelease"`
	`79`	`+ .\tools\nuget\nuget.exe "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-Version" "2.2.0"`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`Write-Output "Building Octokit..."`