Skip to content

Commit

Permalink
add paket
Browse files Browse the repository at this point in the history
  • Loading branch information
Rodrigo Vidal committed Sep 25, 2014
1 parent dd0a0f9 commit 698baa4
Show file tree
Hide file tree
Showing 20 changed files with 836 additions and 265 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ temp/
test/
tools/
*.nupkg
.paket/paket.exe
6 changes: 0 additions & 6 deletions .nuget/NuGet.Config

This file was deleted.

Binary file removed .nuget/NuGet.exe
Binary file not shown.
133 changes: 0 additions & 133 deletions .nuget/NuGet.targets

This file was deleted.

4 changes: 0 additions & 4 deletions .nuget/packages.config

This file was deleted.

Binary file added .paket/paket.bootstrapper.exe
Binary file not shown.
65 changes: 65 additions & 0 deletions .paket/paket.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>

<!-- Enable the restore command to run before builds -->
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>

<!-- Download Paket.exe if it does not already exist -->
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
</PropertyGroup>

<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
<!-- Windows specific commands -->
<PaketToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".paket"))</PaketToolsPath>
</PropertyGroup>

<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
<!-- We need to launch paket.exe with the mono command if we're not on windows -->
<PaketToolsPath>$(SolutionDir).paket</PaketToolsPath>
</PropertyGroup>

<PropertyGroup>
<!-- Paket command -->
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)\paket.exe</PaketExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)\paket.bootstrapper.exe</PaketBootStrapperExePath>

<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketExePath)</PaketCommand>

<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>

<!-- Commands -->
<RestoreCommand>$(PaketCommand) install</RestoreCommand>
<DownloadPaketCommand>$(PaketBootStrapperCommand) </DownloadPaketCommand>

<!-- We need to ensure packages are restored prior to assembly resolve -->
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
RestorePackages;
$(BuildDependsOn);
</BuildDependsOn>
</PropertyGroup>

<Target Name="CheckPrerequisites">
<!-- Raise an error if we're unable to locate paket.exe -->
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
<!--
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download paket.exe once.
This effectively acts as a lock that makes sure that the download operation will only happen once and all
parallel builds will have to wait for it to complete.
-->
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
</Target>

<Target Name="DownloadPaket">
<Exec Command="$(DownloadPaketCommand)" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
</Target>

<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(RestoreCommand)"
WorkingDirectory="$(SolutionDir)" />
</Target>

</Project>
12 changes: 2 additions & 10 deletions FSharp.Control.Reactive.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Reactive", "src\FSharp.Control.Reactive.fsproj", "{ED23F688-C0D0-4102-93D5-0D832633F66D}"
EndProject
Expand All @@ -11,17 +10,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{8961
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
LICENSE.txt = LICENSE.txt
paket.dependencies = paket.dependencies
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{838F0FBD-455C-4753-B184-CACC5BDBB2C0}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
.nuget\packages.config = .nuget\packages.config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{E14EBCFE-FE32-46B2-876D-66D38AB53B1E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{5D1A5D8E-0DA2-47C6-B604-F059B740ABD4}"
Expand All @@ -33,7 +26,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A10EE113-56C8-45E7-8970-B03F17AC3F8E}"
ProjectSection(SolutionItems) = preProject
docs\tools\generate.fsx = docs\tools\generate.fsx
docs\tools\packages.config = docs\tools\packages.config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{AB2D0E6D-7335-44A6-9A7B-55C58C858279}"
Expand Down
13 changes: 13 additions & 0 deletions FSharp.Control.Reactive.v2.ncrunchsolution
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<SolutionConfiguration>
<FileVersion>1</FileVersion>
<AutoEnableOnStartup>True</AutoEnableOnStartup>
<AllowParallelTestExecution>false</AllowParallelTestExecution>
<AllowTestsToRunInParallelWithThemselves>true</AllowTestsToRunInParallelWithThemselves>
<FrameworkUtilisationTypeForNUnit>UseDynamicAnalysis</FrameworkUtilisationTypeForNUnit>
<FrameworkUtilisationTypeForGallio>UseStaticAnalysis</FrameworkUtilisationTypeForGallio>
<FrameworkUtilisationTypeForMSpec>UseStaticAnalysis</FrameworkUtilisationTypeForMSpec>
<FrameworkUtilisationTypeForMSTest>UseStaticAnalysis</FrameworkUtilisationTypeForMSTest>
<EngineModes>Run all tests automatically:BFRydWU=;Run all tests manually:BUZhbHNl;Run impacted tests automatically, others manually (experimental!):CklzSW1wYWN0ZWQ=;Run pinned tests automatically, others manually:CElzUGlubmVk</EngineModes>
<MetricsExclusionList>
</MetricsExclusionList>
</SolutionConfiguration>
14 changes: 9 additions & 5 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
@echo off
cls
if not exist packages\FAKE\tools\Fake.exe (
.nuget\nuget.exe install FAKE -OutputDirectory packages -ExcludeVersion

.paket\paket.bootstrapper.exe
if errorlevel 1 (
exit /b %errorlevel%
)
if not exist packages\SourceLink.Fake\tools\SourceLink.fsx (
.nuget\nuget.exe install SourceLink.Fake -OutputDirectory packages -ExcludeVersion

.paket\paket.exe install -v
if errorlevel 1 (
exit /b %errorlevel%
)
packages\FAKE\tools\FAKE.exe build.fsx %*

packages\FAKE\tools\FAKE.exe build.fsx %*
17 changes: 11 additions & 6 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#!/bin/bash
if [ ! -f packages/FAKE/tools/Fake.exe ]; then
mono .nuget/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion
mono .paket/paket.bootstrapper.exe
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
if [ ! -f packages/SourceLink.Fake/tools/SourceLink.fsx ]; then
mono .nuget/NuGet.exe install SourceLink.Fake -OutputDirectory packages -ExcludeVersion

mono .paket/paket.exe install -v
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
mono packages/FAKE/tools/FAKE.exe build.fsx $@

mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
7 changes: 0 additions & 7 deletions docs/tools/packages.config

This file was deleted.

17 changes: 17 additions & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
source http://nuget.org/api/v2

nuget FAKE
nuget SourceLink.Fake
nuget Nuget.CommandLine
nuget NUnit ~> 2.6.3
nuget Rx-Core ~> 2.2.2
nuget Rx-Experimental ~> 2.2.2
nuget Rx-Interfaces ~> 2.2.2
nuget Rx-Linq ~> 2.2.2
nuget Rx-Main ~> 2.2.2
nuget Rx-PlatformServices ~> 2.2.2
nuget Rx-Providers ~> 2.2.2
nuget NUnit.Runners ~> 2.6.3
nuget FSharp.Formatting ~> 2.4.25
nuget FSharp.Compiler.Service ~> 0.0.36
nuget Rx-Testing ~> 2.2.2
39 changes: 39 additions & 0 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
NUGET
remote: http://nuget.org/api/v2
specs:
FAKE (3.5.4)
FSharp.Compiler.Service (0.0.62)
FSharp.Formatting (2.4.25)
Microsoft.AspNet.Razor (2.0.30506.0)
RazorEngine (3.3.0)
FSharp.Compiler.Service (>= 0.0.59)
Microsoft.AspNet.Razor (2.0.30506.0)
NuGet.CommandLine (2.8.2)
NUnit (2.6.3)
NUnit.Runners (2.6.3)
RazorEngine (3.3.0)
Microsoft.AspNet.Razor (>= 2.0.30506.0)
Rx-Core (2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Experimental (2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Core (>= 2.2.5)
Rx-Linq (>= 2.2.5)
Rx-Providers (>= 2.2.5)
Rx-Interfaces (2.2.5)
Rx-Linq (2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Core (>= 2.2.5)
Rx-Main (2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Core (>= 2.2.5)
Rx-Linq (>= 2.2.5)
Rx-PlatformServices (>= 2.2.5)
Rx-PlatformServices (2.2.5)
Rx-Interfaces (>= 2.2.5)
Rx-Core (>= 2.2.5)
Rx-Providers (2.2.5)
Rx-Main (>= 2.2.5)
Rx-Testing (2.2.5)
Rx-Main (>= 2.2.5)
SourceLink.Fake (0.3.4)
Loading

0 comments on commit 698baa4

Please sign in to comment.