Skip to content

Commit b740b7b

Browse files
committed
Test on Mono 4.0
this also fixes the README badges
1 parent cb670cd commit b740b7b

5 files changed

Lines changed: 43 additions & 17 deletions

File tree

.gitignore

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

.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+

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
[![Issue Stats](http://issuestats.com/github/fsprojects/fsharpx/badge/issue)](http://issuestats.com/github/fsprojects/fsharpx)
22
[![Issue Stats](http://issuestats.com/github/fsprojects/fsharpx/badge/pr)](http://issuestats.com/github/fsprojects/fsharpx)
33

4+
45
# FSharpx.Extras [![NuGet Status](http://img.shields.io/nuget/v/FSharpx.Extras.svg?style=flat)](https://www.nuget.org/packages/FSharpx.Extras)
56

6-
**FSharpx.Extras** is a collection of libraries and tools for use with F#.
7+
**FSharpx.Extras** is a collection of libraries and tools for use with F#.
78

89
See [the home page](http://fsprojects.github.io/FSharpx.Extras/) for details. The home page can be [edited, forked or cloned](https://github.com/fsprojects/fsharpx/tree/gh-pages)
910
Please contribute to this project. Don't ask for permission, just fork the repository and send pull requests.
1011

1112
Please also join the [F# Open Source Group](http://fsharp.github.com)
1213

14+
1315
# Build Status
1416

15-
Head (branch ``master``), Windows Server 2012 (Appveyor) [![Build status](https://ci.appveyor.com/api/projects/status/n9202rbh688hnln6/branch/master)](https://ci.appveyor.com/project/fsgit/fsharp-data-dbpedia)
17+
Mono | .NET
18+
---- | ----
19+
[![Mono CI Build Status](https://img.shields.io/travis/fsprojects/FSharpx.Extras/master.svg)](https://travis-ci.org/fsprojects/FSharpx.Extras) | [![.NET CI Build Status](https://img.shields.io/appveyor/ci/fsgit/FSharpx/master.svg)](https://ci.appveyor.com/project/fsgit/FSharpx)
1620

17-
Head (branch ``master``), OSX (Travis) [![Build status](https://api.travis-ci.org/fsprojects/FSharpx.Extras.svg?branch=master)](https://travis-ci.org/fsprojects/FSharpx.Extras)
1821

1922
# Maintainer(s)
2023

@@ -23,3 +26,4 @@ Head (branch ``master``), OSX (Travis) [![Build status](https://api.travis-ci.o
2326
- [@panesofglass](https://github.com/panesofglass)
2427

2528
The default maintainer account for projects under "fsprojects" is [@fsprojectsgit](https://github.com/fsprojectsgit) - F# Community Project Incubation Space (repo management)
29+

build.fsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,13 @@ let normalizeFrameworkVersion fxVersion =
7171
let buildLibParams fxVersion =
7272
["TargetFrameworkVersion", fxVersion
7373
"DefineConstants", "NET" + normalizeFrameworkVersion fxVersion
74-
"TargetFSharpCoreVersion", "4.3.0.0" ]
74+
"TargetFSharpCoreVersion", "4.3.0.0"
75+
"DefineConstants", "FX_NO_WINDOWSFORMS"
76+
]
7577

7678
// tools
7779
let nunitVersion = GetPackageVersion packagesDir "NUnit.Runners"
78-
let nunitPath = packagesDir @@ sprintf "NUnit.Runners.%s/Tools" nunitVersion
80+
let nunitPath = packagesDir @@ sprintf "NUnit.Runners.%s/tools" nunitVersion
7981

8082

8183
// targets
@@ -154,7 +156,6 @@ Target "NuGet" (fun _ ->
154156
OutputPath = nugetDir package
155157
AccessKey = getBuildParamOrDefault "nugetkey" ""
156158
Publish = hasBuildParam "nugetkey"
157-
ToolPath = nugetPath
158159
Dependencies =
159160
[ yield ("FSharpx.Async", NormalizeVersion (Fake.NuGetHelper.GetPackageVersion "packages" "FSharpx.Async"));
160161
yield ("FSharpx.Collections", NormalizeVersion (Fake.NuGetHelper.GetPackageVersion "packages" "FSharpx.Collections"));
@@ -193,6 +194,8 @@ FinalTarget "CloseTestRunner" (fun _ ->
193194

194195
Target "Release" DoNothing
195196

197+
Target "CI" DoNothing
198+
196199
// Build order
197200
"Clean"
198201
==> "AssemblyInfo"
@@ -214,6 +217,10 @@ Target "Release" DoNothing
214217
"NuGet"
215218
==> "Release"
216219

220+
"Test"
221+
==> "GenerateDocs"
222+
==> "NuGet"
223+
==> "CI"
217224

218225
let target = getBuildParamOrDefault "target" "Test"
219226

docs/output/README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
This file is in the `docs/output` directory.
2+
3+
This directory will contain the final artifacts for both narrative and API documentation.
4+
This folder will be automatically created by the documenation generation process.
5+
6+
**It is strongly recommended that nothing be put into this directory.**
7+
8+
It is **strongly advised** that the **contents of this directory not be committed** to source control
9+
(with the sole exception being this `README.md` file).
10+
11+
---
12+
13+
NOTE:
14+
15+
This file is a placeholder, used to preserve directory structure in Git.
16+
17+
This file does not need to be edited.
18+

0 commit comments

Comments
 (0)