Skip to content

Commit 7726ed4

Browse files
rneatherwayrneatherway
committed
Convert repo to use Paket for dependencies
1 parent 8b20704 commit 7726ed4

22 files changed

+158
-309
lines changed

‎.gitignore‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,8 @@ lib/NUnit*
2222
lib/FsUnit
2323

2424
FSharp.AutoComplete/test/unit/build
25-
FSharp.AutoComplete/packages
25+
packages
26+
.paket/paket.exe
2627

27-
# Vim
28-
29-
vim/packages
30-
31-
# Emacs
32-
*.elc
33-
emacs/deps
34-
emacs/tmp
35-
36-
# Sublime Text
37-
*.sublime-workspace
38-
39-
sublimetext/FSharp/fsac/fsac/*.*
40-
sublimetext/plugin_dev.json
4128

4229
.DS_Store

‎.paket/paket.bootstrapper.exe‎

27 KB
Binary file not shown.

‎.paket/paket.targets‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- Enable the restore command to run before builds -->
5+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
6+
<!-- Download Paket.exe if it does not already exist -->
7+
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
8+
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
9+
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
10+
</PropertyGroup>
11+
<PropertyGroup>
12+
<!-- Paket command -->
13+
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
14+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
15+
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
16+
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketExePath)</PaketCommand>
17+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
18+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
19+
<!-- Commands -->
20+
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
21+
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
22+
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
23+
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
24+
<!-- We need to ensure packages are restored prior to assembly resolve -->
25+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
26+
</PropertyGroup>
27+
<Target Name="CheckPrerequisites">
28+
<!-- Raise an error if we're unable to locate paket.exe -->
29+
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
30+
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
31+
</Target>
32+
<Target Name="DownloadPaket">
33+
<Exec Command="$(DownloadPaketCommand)" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
34+
</Target>
35+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
36+
<Exec Command="$(RestoreCommand)" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" />
37+
</Target>
38+
</Project>

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ before_install:
1111
- sudo apt-get update -qq
1212

1313
install:
14-
- sudo apt-get install -yq emacs24 emacs24-el emacs24-common-non-dfsg
1514
- sudo apt-get install -yq mono-complete nuget
1615
- sudo apt-get install -yq fsharp
1716

1817
script:
19-
- FSharp.AutoComplete/fake Test
18+
- ./build.sh Test
2019

FSharp.AutoComplete/FSharp.AutoComplete.sln renamed to FSharp.AutoComplete.sln

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
44
VisualStudioVersion = 12.0.30501.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.CompilerBinding", "..\FSharp.CompilerBinding\FSharp.CompilerBinding.fsproj", "{88F6940F-D300-474C-B2A7-E2ECD5B04B57}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{1BE8AF57-B314-4C92-82A9-64CD9B7A4990}"
7+
ProjectSection(SolutionItems) = preProject
8+
paket.dependencies = paket.dependencies
9+
EndProjectSection
710
EndProject
8-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.AutoComplete", "FSharp.AutoComplete.fsproj", "{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}"
11+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.CompilerBinding", "FSharp.CompilerBinding\FSharp.CompilerBinding.fsproj", "{88F6940F-D300-474C-B2A7-E2ECD5B04B57}"
12+
EndProject
13+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.AutoComplete", "FSharp.AutoComplete\FSharp.AutoComplete.fsproj", "{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}"
914
EndProject
1015
Global
1116
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎FSharp.AutoComplete/.nuget/NuGet.targets‎

Lines changed: 0 additions & 136 deletions
This file was deleted.

‎FSharp.AutoComplete/FSharp.AutoComplete.fsproj‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
<RootNamespace>FSharp.AutoComplete</RootNamespace>
1111
<AssemblyName>fsautocomplete</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
13+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1414
<Name>FSharp.InteractiveAutocomplete</Name>
1515
<UsePartialTypes>False</UsePartialTypes>
16-
<RestorePackages>true</RestorePackages>
1716
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
1817
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
1918
<TargetFrameworkProfile />
@@ -57,13 +56,12 @@
5756
</PropertyGroup>
5857
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
5958
-->
60-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
6159
<ItemGroup>
6260
<Compile Include="Debug.fs" />
6361
<Compile Include="Options.fs" />
6462
<Compile Include="TipFormatter.fs" />
6563
<Compile Include="Program.fs" />
66-
<None Include="packages.config" />
64+
<None Include="paket.references" />
6765
<None Include="build.fsx" />
6866
</ItemGroup>
6967
<ItemGroup>
@@ -72,26 +70,39 @@
7270
<Reference Include="System.Xml" />
7371
<Reference Include="System.Numerics" />
7472
<Reference Include="NDesk.Options">
75-
<HintPath>..\lib\ndesk-options\NDesk.Options.dll</HintPath>
73+
<HintPath>..\packages\NDesk.Options\lib\NDesk.Options.dll</HintPath>
74+
<Private>True</Private>
7675
</Reference>
7776
<Reference Include="Newtonsoft.Json">
78-
<HintPath>..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
77+
<HintPath>..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
78+
<Private>True</Private>
7979
</Reference>
8080
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
81+
<HintPath>..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
82+
<Private>True</Private>
83+
</Reference>
84+
<Reference Include="FsUnit.NUnit">
85+
<HintPath>..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
86+
<Private>True</Private>
87+
</Reference>
88+
<Reference Include="FSharp.Compiler.Service">
89+
<HintPath>..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
90+
<Private>True</Private>
91+
</Reference>
92+
<Reference Include="nunit.framework">
93+
<HintPath>..\packages\NUnit\lib\nunit.framework.dll</HintPath>
8194
<Private>True</Private>
8295
</Reference>
8396
<ProjectReference Include="..\FSharp.CompilerBinding\FSharp.CompilerBinding.fsproj">
8497
<Project>{88F6940F-D300-474C-B2A7-E2ECD5B04B57}</Project>
8598
<Name>FSharp.CompilerBinding</Name>
8699
</ProjectReference>
87-
<Reference Include="FSharp.Compiler.Service">
88-
<HintPath>$(SolutionDir)\packages\FSharp.Compiler.Service.0.0.85\lib\net45\FSharp.Compiler.Service.dll</HintPath>
89-
</Reference>
90100
</ItemGroup>
91101
<!-- To modify your build process, add your task inside one of the
92102
targets below and uncomment it. Other similar extension points
93103
exist, see Microsoft.Common.targets. <Target
94104
Name="BeforeBuild"> </Target> <Target Name="AfterBuild">
95105
</Target>
96106
-->
97-
</Project>
107+
<Import Project="..\.paket\paket.targets" />
108+
</Project>

‎FSharp.AutoComplete/FSharp.AutoComplete.fsproj.paket.references‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FSharp.Compiler.Service
2+
FSUnit
3+
NUnit
4+
NUnit.Runners
5+
NDesk.Options
6+
Newtonsoft.Json

‎FSharp.AutoComplete/Options.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace FSharp.InteractiveAutocomplete
66
open System
77

88
module Version =
9-
let string = "FSharp.AutoComplete 0.13.3"
9+
let string = "FSharp.AutoComplete 0.14.0"
1010

1111
module Options =
1212

‎FSharp.AutoComplete/README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,3 @@ The structured data returned is able to be richer. Note for example that the out
5858

5959
For further insight into the communication protocol, have a look over the integration tests, which have examples of all the features. Each folder contains one or more `*Runner.fsx` files which specify a sequence of commands to send, and `*.txt` or `*.json` files, which contain the output.
6060

61-
### Scripts and projects
62-
63-
Currently, intellisense can be offered for any number of scripts and one project at any one time. Intellisense requests are honoured for any script (`.fsx`) file and any `.fs` file for which a project containing it has most recently been loaded using the `project` command. It is an aim to lift this limitation.
64-

0 commit comments

Comments
 (0)