Skip to content

Commit 1de5dde

Browse files
dsymedsyme
committed
Merge pull request #330 from sideeffffect/master
Test on Mono 4.0
2 parents cb670cd + 327fce4 commit 1de5dde

35 files changed

Lines changed: 845 additions & 349 deletions

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,9 @@ build.AndDeploy.bat
3737
*.sln.ide
3838
__setup__.fsx
3939
lib/FAKE/tools/
40-
packages/
40+
packages/
41+
.paket/paket.exe
42+
*.userprefs
43+
.fake/*
44+
docs/output/*
45+

‎.paket/paket.bootstrapper.exe‎

30 KB
Binary file not shown.

‎.travis.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
language: objective-c
1+
language: csharp
22

3-
env:
4-
matrix:
5-
- MONO_VERSION="3.4.0"
6-
7-
install:
8-
- wget "http://download.mono-project.com/archive/3.4.0/macos-10-x86/MonoFramework-MDK-${MONO_VERSION}.macos10.xamarin.x86.pkg"
9-
- sudo installer -pkg "MonoFramework-MDK-${MONO_VERSION}.macos10.xamarin.x86.pkg" -target /
3+
sudo: false # use the new container-based Travis infrastructure
104

115
script:
12-
- chmod u+x ./build.sh
13-
- ./build.sh
6+
- ./build.sh CI
7+

‎0_Install_FAKE.cmd‎

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

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

Lines changed: 143 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>ad500a06-96ed-408c-9472-262cdc2a119b</ProjectGuid>
7+
<ProjectGuid>{AD500A06-96ED-408C-9472-262CDC2A119B}</ProjectGuid>
98
<OutputType>Library</OutputType>
109
<RootNamespace>FSharpx.Extras.Tests</RootNamespace>
1110
<AssemblyName>FSharpx.Extras.Tests</AssemblyName>
@@ -14,7 +13,6 @@
1413
<Name>FSharpx.Extras.Tests</Name>
1514
<TargetFrameworkProfile />
1615
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17-
<RestorePackages>true</RestorePackages>
1816
</PropertyGroup>
1917
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2018
<DebugSymbols>true</DebugSymbols>
@@ -49,30 +47,7 @@
4947
</PropertyGroup>
5048
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
5149
<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>
6850
<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>
7651
<Reference Include="System" />
7752
<Reference Include="System.Core" />
7853
<Reference Include="System.Numerics" Condition="'$(TargetFrameworkVersion)' != 'v3.5'" />
@@ -82,18 +57,155 @@
8257
<Compile Include="AwaitHelpers.fs" />
8358
<Compile Include="AwaitObservableTests.fs" />
8459
<Compile Include="OptionTests.fs" />
85-
<None Include="packages.config" />
60+
<None Include="paket.references" />
8661
<None Include="app.config" />
8762
</ItemGroup>
63+
<PropertyGroup>
64+
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
65+
</PropertyGroup>
8866
<ItemGroup>
8967
<ProjectReference Include="..\src\FSharpx.Extras\FSharpx.Extras.fsproj">
9068
<Name>FSharpx.Extras</Name>
9169
<Project>{1e95a279-c2a9-498b-bc72-6e7a0d6854ce}</Project>
9270
<Private>False</Private>
9371
</ProjectReference>
9472
</ItemGroup>
95-
<PropertyGroup>
96-
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
97-
</PropertyGroup>
98-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
73+
<Choose>
74+
<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' Or $(TargetFrameworkVersion) == 'v4.6.1')">
75+
<ItemGroup>
76+
<Reference Include="FSharp.Control.AsyncSeq">
77+
<HintPath>..\packages\FSharp.Control.AsyncSeq\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
78+
<Private>True</Private>
79+
<Paket>True</Paket>
80+
</Reference>
81+
</ItemGroup>
82+
</When>
83+
</Choose>
84+
<Choose>
85+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5')">
86+
<ItemGroup>
87+
<Reference Include="FSharp.Core">
88+
<HintPath>..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath>
89+
<Private>True</Private>
90+
<Paket>True</Paket>
91+
</Reference>
92+
</ItemGroup>
93+
</When>
94+
<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' Or $(TargetFrameworkVersion) == 'v4.6.1')">
95+
<ItemGroup>
96+
<Reference Include="FSharp.Core">
97+
<HintPath>..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
98+
<Private>True</Private>
99+
<Paket>True</Paket>
100+
</Reference>
101+
</ItemGroup>
102+
</When>
103+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
104+
<ItemGroup>
105+
<Reference Include="FSharp.Core">
106+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
107+
<Private>True</Private>
108+
<Paket>True</Paket>
109+
</Reference>
110+
</ItemGroup>
111+
</When>
112+
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
113+
<ItemGroup>
114+
<Reference Include="FSharp.Core">
115+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath>
116+
<Private>True</Private>
117+
<Paket>True</Paket>
118+
</Reference>
119+
</ItemGroup>
120+
</When>
121+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
122+
<ItemGroup>
123+
<Reference Include="FSharp.Core">
124+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
125+
<Private>True</Private>
126+
<Paket>True</Paket>
127+
</Reference>
128+
</ItemGroup>
129+
</When>
130+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
131+
<ItemGroup>
132+
<Reference Include="FSharp.Core">
133+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
134+
<Private>True</Private>
135+
<Paket>True</Paket>
136+
</Reference>
137+
</ItemGroup>
138+
</When>
139+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
140+
<ItemGroup>
141+
<Reference Include="FSharp.Core">
142+
<HintPath>..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
143+
<Private>True</Private>
144+
<Paket>True</Paket>
145+
</Reference>
146+
</ItemGroup>
147+
</When>
148+
</Choose>
149+
<Choose>
150+
<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' Or $(TargetFrameworkVersion) == 'v4.6.1')">
151+
<ItemGroup>
152+
<Reference Include="FSharpx.Async">
153+
<HintPath>..\packages\FSharpx.Async\lib\net40\FSharpx.Async.dll</HintPath>
154+
<Private>True</Private>
155+
<Paket>True</Paket>
156+
</Reference>
157+
</ItemGroup>
158+
</When>
159+
</Choose>
160+
<Choose>
161+
<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' Or $(TargetFrameworkVersion) == 'v4.6.1')">
162+
<ItemGroup>
163+
<Reference Include="FSharpx.Collections">
164+
<HintPath>..\packages\FSharpx.Collections\lib\net40\FSharpx.Collections.dll</HintPath>
165+
<Private>True</Private>
166+
<Paket>True</Paket>
167+
</Reference>
168+
</ItemGroup>
169+
</When>
170+
<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')">
171+
<ItemGroup>
172+
<Reference Include="FSharpx.Collections">
173+
<HintPath>..\packages\FSharpx.Collections\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
174+
<Private>True</Private>
175+
<Paket>True</Paket>
176+
</Reference>
177+
</ItemGroup>
178+
</When>
179+
<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')">
180+
<ItemGroup>
181+
<Reference Include="FSharpx.Collections">
182+
<HintPath>..\packages\FSharpx.Collections\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
183+
<Private>True</Private>
184+
<Paket>True</Paket>
185+
</Reference>
186+
</ItemGroup>
187+
</When>
188+
</Choose>
189+
<Choose>
190+
<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' Or $(TargetFrameworkVersion) == 'v4.6.1')">
191+
<ItemGroup>
192+
<Reference Include="FsUnit.NUnit">
193+
<HintPath>..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
194+
<Private>True</Private>
195+
<Paket>True</Paket>
196+
</Reference>
197+
</ItemGroup>
198+
</When>
199+
</Choose>
200+
<Choose>
201+
<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' Or $(TargetFrameworkVersion) == 'v4.6.1')">
202+
<ItemGroup>
203+
<Reference Include="nunit.framework">
204+
<HintPath>..\packages\NUnit\lib\nunit.framework.dll</HintPath>
205+
<Private>True</Private>
206+
<Paket>True</Paket>
207+
</Reference>
208+
</ItemGroup>
209+
</When>
210+
</Choose>
99211
</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.

0 commit comments

Comments
 (0)