Starting to dogfood

yannisgu · Sep 2, 2014 · 1859c3c · 1859c3c
1 parent a8f4dab
commit 1859c3c
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -175,3 +175,4 @@ TestResults.xml
 
 # Nuget outputs
 nuget/*.nupkg
+release.cmd
diff --git a/.nuget/packages.config b/.nuget/packages.config
diff --git a/build.cmd b/build.cmd
@@ -1,7 +1,10 @@
 @echo off
 cls
 
+.nuget\nuget.exe install Paket -OutputDirectory packages -Prerelease -ExcludeVersion
 .nuget\nuget.exe install FAKE -OutputDirectory packages -ExcludeVersion
 .nuget\nuget.exe install SourceLink.Fake -OutputDirectory packages -ExcludeVersion
+.nuget\nuget.exe install FSharp.Formatting -OutputDirectory packages
 
-packages\FAKE\tools\FAKE.exe build.fsx %*
+packages\Paket\tools\Paket.exe install
+packages\FAKE\tools\FAKE.exe build.fsx %*
diff --git a/build.fsx b/build.fsx
@@ -100,8 +100,6 @@ Target "AssemblyInfo" (fun _ ->
 // --------------------------------------------------------------------------------------
 // Clean build results & restore NuGet packages
 
-Target "RestorePackages" RestorePackages
-
 Target "Clean" (fun _ ->
     CleanDirs ["bin"; "temp"]
 )
@@ -204,7 +202,6 @@ Target "BuildPackage" DoNothing
 Target "All" DoNothing
 
 "Clean"
-  ==> "RestorePackages"
   ==> "AssemblyInfo"
   ==> "Build"
   ==> "RunTests"

diff --git a/build.sh b/build.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
+mono .nuget/NuGet.exe install Paket -OutputDirectory packages -Prerelease -ExcludeVersion
 mono .nuget/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion
 mono .nuget/NuGet.exe install SourceLink.Fake -OutputDirectory packages -ExcludeVersion
+mono .nuget/NuGet.exe install FSHarp.Formatting -OutputDirectory packages
 
-mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
+mono packages/Paket/tools/Paket.exe install
+mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
diff --git a/packages.fsx b/packages.fsx
@@ -4,5 +4,4 @@ nuget "FSharp.Compiler.Service" "~> 0.0.59"
 nuget "Newtonsoft.Json" "~> 6.0"
 nuget "UnionArgParser" "~> 0.7"
 nuget "NUnit.Runners" "~> 2.6.3"
-nuget "NUnit" "~> 2.6.3"
-nuget "FSharp.Formatting" "~> 2.4"
+nuget "NUnit" "~> 2.6.3"
diff --git a/packages.lock b/packages.lock
@@ -2,10 +2,7 @@ NUGET
   remote: http://nuget.org/api/v2
   specs:
     FSharp.Compiler.Service (0.0.59)
-    FSharp.Formatting (2.4.9)
-    Microsoft.AspNet.Razor (3.2.2)
     NUnit (2.6.3)
     NUnit.Runners (2.6.3)
     Newtonsoft.Json (6.0.4)
-    RazorEngine (3.4.1)
     UnionArgParser (0.8.0)
diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -82,7 +82,6 @@
     <Compile Include="Process.fs" />
     <Compile Include="Program.fs" />
     <None Include="packages" />
-    <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FSharp.Compiler.Service">

diff --git a/src/Paket/packages.config b/src/Paket/packages.config
diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj
@@ -78,7 +78,6 @@
     </None>
     <Compile Include="ProjectFileSpecs.fs" />
     <None Include="packages" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />

diff --git a/tests/Paket.Tests/packages.config b/tests/Paket.Tests/packages.config
Original file line number	Diff line number	Diff line change
Expand Up		@@ -175,3 +175,4 @@ TestResults.xml

		# Nuget outputs
		nuget/*.nupkg
		release.cmd