Skip to content

Commit 94bae52

Browse files
sideeffffectsideeffffect
committed
Migrate to Paket
1 parent b740b7b commit 94bae52

28 files changed

Lines changed: 735 additions & 209 deletions

‎.paket/paket.bootstrapper.exe‎

30 KB
Binary file not shown.

‎0_Install_FAKE.cmd‎

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

‎FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj‎

Lines changed: 139 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Name>FSharpx.Extras.Tests</Name>
1515
<TargetFrameworkProfile />
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17-
<RestorePackages>true</RestorePackages>
1817
</PropertyGroup>
1918
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2019
<DebugSymbols>true</DebugSymbols>
@@ -49,30 +48,7 @@
4948
</PropertyGroup>
5049
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
5150
<ItemGroup>
52-
<Reference Include="FSharp.Control.AsyncSeq">
53-
<HintPath>..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
54-
<Private>True</Private>
55-
</Reference>
56-
<Reference Include="FSharpx.Async">
57-
<HintPath>..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
58-
<Private>True</Private>
59-
</Reference>
60-
<Reference Include="FSharpx.Collections">
61-
<HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
62-
<Private>True</Private>
63-
</Reference>
64-
<Reference Include="FsUnit.NUnit">
65-
<HintPath>..\packages\FsUnit.1.2.1.0\Lib\Net40\FsUnit.NUnit.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
6851
<Reference Include="mscorlib" />
69-
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
70-
<Private>True</Private>
71-
</Reference>
72-
<Reference Include="nunit.framework">
73-
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
74-
<Private>True</Private>
75-
</Reference>
7652
<Reference Include="System" />
7753
<Reference Include="System.Core" />
7854
<Reference Include="System.Numerics" Condition="'$(TargetFrameworkVersion)' != 'v3.5'" />
@@ -82,7 +58,7 @@
8258
<Compile Include="AwaitHelpers.fs" />
8359
<Compile Include="AwaitObservableTests.fs" />
8460
<Compile Include="OptionTests.fs" />
85-
<None Include="packages.config" />
61+
<None Include="paket.references" />
8662
<None Include="app.config" />
8763
</ItemGroup>
8864
<ItemGroup>
@@ -92,8 +68,145 @@
9268
<Private>False</Private>
9369
</ProjectReference>
9470
</ItemGroup>
71+
<Choose>
72+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
73+
<ItemGroup>
74+
<Reference Include="FSharp.Control.AsyncSeq">
75+
<HintPath>..\packages\FSharp.Control.AsyncSeq\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
76+
<Private>True</Private>
77+
<Paket>True</Paket>
78+
</Reference>
79+
</ItemGroup>
80+
</When>
81+
</Choose>
82+
<Choose>
83+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5')">
84+
<ItemGroup>
85+
<Reference Include="FSharp.Core">
86+
<HintPath>..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath>
87+
<Private>True</Private>
88+
<Paket>True</Paket>
89+
</Reference>
90+
</ItemGroup>
91+
</When>
92+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
93+
<ItemGroup>
94+
<Reference Include="FSharp.Core">
95+
<HintPath>..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
96+
<Private>True</Private>
97+
<Paket>True</Paket>
98+
</Reference>
99+
</ItemGroup>
100+
</When>
101+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
102+
<ItemGroup>
103+
<Reference Include="FSharp.Core">
104+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
105+
<Private>True</Private>
106+
<Paket>True</Paket>
107+
</Reference>
108+
</ItemGroup>
109+
</When>
110+
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
111+
<ItemGroup>
112+
<Reference Include="FSharp.Core">
113+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath>
114+
<Private>True</Private>
115+
<Paket>True</Paket>
116+
</Reference>
117+
</ItemGroup>
118+
</When>
119+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
120+
<ItemGroup>
121+
<Reference Include="FSharp.Core">
122+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
123+
<Private>True</Private>
124+
<Paket>True</Paket>
125+
</Reference>
126+
</ItemGroup>
127+
</When>
128+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
129+
<ItemGroup>
130+
<Reference Include="FSharp.Core">
131+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
132+
<Private>True</Private>
133+
<Paket>True</Paket>
134+
</Reference>
135+
</ItemGroup>
136+
</When>
137+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
138+
<ItemGroup>
139+
<Reference Include="FSharp.Core">
140+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
141+
<Private>True</Private>
142+
<Paket>True</Paket>
143+
</Reference>
144+
</ItemGroup>
145+
</When>
146+
</Choose>
147+
<Choose>
148+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
149+
<ItemGroup>
150+
<Reference Include="FSharpx.Async">
151+
<HintPath>..\packages\FSharpx.Async\lib\net40\FSharpx.Async.dll</HintPath>
152+
<Private>True</Private>
153+
<Paket>True</Paket>
154+
</Reference>
155+
</ItemGroup>
156+
</When>
157+
</Choose>
158+
<Choose>
159+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
160+
<ItemGroup>
161+
<Reference Include="FSharpx.Collections">
162+
<HintPath>..\packages\FSharpx.Collections\lib\net40\FSharpx.Collections.dll</HintPath>
163+
<Private>True</Private>
164+
<Paket>True</Paket>
165+
</Reference>
166+
</ItemGroup>
167+
</When>
168+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47')">
169+
<ItemGroup>
170+
<Reference Include="FSharpx.Collections">
171+
<HintPath>..\packages\FSharpx.Collections\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
172+
<Private>True</Private>
173+
<Paket>True</Paket>
174+
</Reference>
175+
</ItemGroup>
176+
</When>
177+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
178+
<ItemGroup>
179+
<Reference Include="FSharpx.Collections">
180+
<HintPath>..\packages\FSharpx.Collections\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
181+
<Private>True</Private>
182+
<Paket>True</Paket>
183+
</Reference>
184+
</ItemGroup>
185+
</When>
186+
</Choose>
187+
<Choose>
188+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
189+
<ItemGroup>
190+
<Reference Include="FsUnit.NUnit">
191+
<HintPath>..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
192+
<Private>True</Private>
193+
<Paket>True</Paket>
194+
</Reference>
195+
</ItemGroup>
196+
</When>
197+
</Choose>
198+
<Choose>
199+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
200+
<ItemGroup>
201+
<Reference Include="nunit.framework">
202+
<HintPath>..\packages\NUnit\lib\nunit.framework.dll</HintPath>
203+
<Private>True</Private>
204+
<Paket>True</Paket>
205+
</Reference>
206+
</ItemGroup>
207+
</When>
208+
</Choose>
95209
<PropertyGroup>
96210
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
97211
</PropertyGroup>
98-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
99212
</Project>

‎FSharpx.Extras.Tests/app.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
8-
</dependentAssembly>
9-
</assemblyBinding>
10-
</runtime>
4+
5+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8+
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
9+
</dependentAssembly>
10+
</assemblyBinding></runtime>
1111
</configuration>

‎FSharpx.Extras.Tests/packages.config‎

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

‎FSharpx.Extras.Tests/paket.references‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FSharp.Control.AsyncSeq
2+
FSharpx.Async
3+
FSharpx.Collections
4+
FsUnit
5+
NUnit

‎FSharpx.Extras.nuspec‎

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

‎FSharpx.Extras.sln‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
33
VisualStudioVersion = 12.0.31101.0
44
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{50709973-279A-4DF0-AF26-8C7535C7C9AE}"
6+
ProjectSection(SolutionItems) = preProject
7+
paket.dependencies = paket.dependencies
8+
EndProjectSection
9+
EndProject
510
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{722621A6-FA45-4129-8B8D-94880DCD7971}"
611
ProjectSection(SolutionItems) = preProject
712
build.fsx = build.fsx
@@ -39,14 +44,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{EFB3
3944
docs\content\WebProxy.fsx = docs\content\WebProxy.fsx
4045
EndProjectSection
4146
EndProject
42-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{04FE33E9-D53A-4703-B86B-C84B64958D19}"
43-
ProjectSection(SolutionItems) = preProject
44-
.nuget\NuGet.Config = .nuget\NuGet.Config
45-
.nuget\NuGet.exe = .nuget\NuGet.exe
46-
.nuget\NuGet.targets = .nuget\NuGet.targets
47-
.nuget\packages.config = .nuget\packages.config
48-
EndProjectSection
49-
EndProject
5047
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Extras.Tests", "FSharpx.Extras.Tests\FSharpx.Extras.Tests.fsproj", "{AD500A06-96ED-408C-9472-262CDC2A119B}"
5148
EndProject
5249
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Text.StructuredFormat", "src\FSharpx.Text.StructuredFormat\FSharpx.Text.StructuredFormat.fsproj", "{65E077ED-F51A-42D7-8004-E90D60AF8B8F}"

‎build.cmd‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
@echo off
22
cls
3-
if not exist packages\FAKE\tools\Fake.exe (
4-
.nuget\nuget.exe install FAKE -OutputDirectory packages -ExcludeVersion
3+
4+
.paket\paket.bootstrapper.exe
5+
if errorlevel 1 (
6+
exit /b %errorlevel%
7+
)
8+
9+
.paket\paket.exe restore
10+
if errorlevel 1 (
11+
exit /b %errorlevel%
12+
)
13+
14+
IF NOT EXIST build.fsx (
15+
.paket\paket.exe update
16+
packages\FAKE\tools\FAKE.exe init.fsx
517
)
618
packages\FAKE\tools\FAKE.exe build.fsx %*

‎build.fsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,14 @@ Target "NuGet" (fun _ ->
164164
"FSharpx.Extras.nuspec")
165165

166166

167+
Target "PaketPack" (fun _ ->
168+
Paket.Pack (fun p ->
169+
{ p with
170+
OutputPath = "bin"
171+
Version = release.AssemblyVersion
172+
ReleaseNotes = toLines release.Notes
173+
})
174+
)
167175

168176
// --------------------------------------------------------------------------------------
169177
// Generate the documentation
@@ -205,6 +213,7 @@ Target "CI" DoNothing
205213
"Build"
206214
==> "PrepareNuGet"
207215
==> "NuGet"
216+
==> "PaketPack"
208217

209218
"Test"
210219
==> "Release"
@@ -220,6 +229,7 @@ Target "CI" DoNothing
220229
"Test"
221230
==> "GenerateDocs"
222231
==> "NuGet"
232+
==> "PaketPack"
223233
==> "CI"
224234

225235
let target = getBuildParamOrDefault "target" "Test"

0 commit comments

Comments
 (0)