Skip to content

Commit 2ff3e4e

Browse files
authored
Merge pull request #101 from quintusm/documentation-update-2024-05
Update the documentation generation using fsdocs. This request does not yet update the live documentation
2 parents 9d44388 + 16527d7 commit 2ff3e4e

22 files changed

+109
-244
lines changed

Directory.Build.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RepositoryUrl>https://github.com/fsprojects/ExcelProvider</RepositoryUrl>
4+
<FsDocsLicenseLink>https://github.com/fsprojects/ExcelProvider/blob/master/LICENSE.txt</FsDocsLicenseLink>
5+
<FsDocsReleaseNotesLink>https://github.com/fsprojects/ExcelProvider/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
6+
<PackageProjectUrl>https://fsprojects.github.io/ExcelProvider/</PackageProjectUrl>
7+
<FsDocsLogoSource>images/logo.png</FsDocsLogoSource>
8+
</PropertyGroup>
9+
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/content/cells.fsx renamed to docs/cells.fsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
(**
2+
---
3+
title: Accessing Cells
4+
category: Documentation
5+
categoryindex: 2
6+
index: 4
7+
---
8+
*)
9+
10+
111
(*** hide ***)
2-
#I "../../bin/ExcelProvider"
12+
#r "../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.dll"
313

414
(**
515
Accessing Cells
@@ -11,7 +21,7 @@ To access a particular cell you need to access the relevant row and use the fiel
1121
Example
1222
-------
1323
14-
![alt text](img/MultSheets.png "Excel sample file with multiple sheets")
24+
![alt text](images/MultSheets.png "Excel sample file with multiple sheets")
1525
1626
This example demonstrates referencing the first column (with name `Fourth`) on row 4:
1727
@@ -36,4 +46,4 @@ let testByHeader = rows.[2].GetValue "Fourth"
3646
(*** include-value: testByIndex ***)
3747
(*** include-value: testByHeader ***)
3848

39-
(** Accessing cell values by index or string header sacrifices type safety; the result signature is `obj`. *)
49+
(** Accessing cell values by index or string header sacrifices type safety; the result signature is `obj`. *)

docs/content/getting-started.fsx renamed to docs/getting-started.fsx

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
(**
2+
---
3+
title: Getting Started
4+
category: Documentation
5+
categoryindex: 2
6+
index: 1
7+
---
8+
*)
9+
10+
11+
112
(*** hide ***)
2-
#I "../../bin/ExcelProvider"
13+
#r "../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.dll"
314

415
(**
516
Getting Started
@@ -11,8 +22,8 @@ If you are using F# scripts then just add the dll using the `#r` option.
1122
1223
If you then open `FSharp.Interop.Excel` you will have access to the Type Provider functionality.
1324
14-
You can then create a type for an individual workbook. The simplest option is to specify just the name of the workbook.
15-
You will then be given typed access to the data held in the first sheet.
25+
You can then create a type for an individual workbook. The simplest option is to specify just the name of the workbook.
26+
You will then be given typed access to the data held in the first sheet.
1627
The first row of the sheet will be treated as field names and the subsequent rows will be treated as values for these fields.
1728
1829
Parameters
@@ -26,10 +37,11 @@ When creating the type you can specify the following parameters:
2637
* `HasHeaders` Whether the range contains the names of the columns as its first line.
2738
* `ForceString` Specifies forcing data to be processed as strings. Defaults to `false`.
2839
29-
All but the first are optional.
40+
All but the first are optional.
3041
3142
The parameters can be specified by position or by using the name - for example the following are equivalent:
3243
*)
44+
open FSharp.Interop.Excel
3345

3446
type MultipleSheets1 = ExcelFile<"MultipleSheets.xlsx", "B">
3547
type MultipleSheets2 = ExcelFile<"MultipleSheets.xlsx", SheetName="B">
@@ -41,12 +53,11 @@ Example
4153
4254
This example shows the use of the type provider in an F# script on a sheet containing three rows of data:
4355
44-
![alt text](img/DataTypes.png "Excel sample file with different types")
56+
![alt text](images/DataTypes.png "Excel sample file with different types")
4557
4658
*)
4759

4860
// reference the type provider dll
49-
#r "ExcelProvider.dll"
5061
open FSharp.Interop.Excel
5162

5263
// Let the type provider do it's work
@@ -55,4 +66,4 @@ let file = new DataTypesTest()
5566
let row = file.Data |> Seq.head
5667
let test = row.Float
5768
(** And the variable `test` has the following value: *)
58-
(*** include-value: test ***)
69+
(*** include-value: test ***)

docs/content/headers.fsx renamed to docs/headers.fsx

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
(**
2+
---
3+
title: Without Headers
4+
category: Documentation
5+
categoryindex: 2
6+
index: 6
7+
---
8+
*)
9+
10+
11+
112
(*** hide ***)
2-
#I "../../bin/ExcelProvider"
13+
#r "../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.dll"
314

415
(**
516
Without Headers
@@ -17,12 +28,12 @@ Example
1728
1829
This example shows the use of the type provider in an F# script on a sheet containing no headers:
1930
20-
![alt text](img/DataTypesNoHeader.png "Excel sample file with different types and no headers")
31+
![alt text](images/DataTypesNoHeader.png "Excel sample file with different types and no headers")
2132
2233
*)
2334

2435
// reference the type provider dll
25-
#r "ExcelProvider.dll"
36+
#r "ExcelProvider.Runtime.dll"
2637
open FSharp.Interop.Excel
2738

2839
// Let the type provider do it's work
@@ -31,4 +42,4 @@ let file = new DataTypesTest()
3142
let row = file.Data |> Seq.head
3243
let test = row.Column2
3344
(** And the variable `test` has the following value: *)
34-
(*** include-value: test ***)
45+
(*** include-value: test ***)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/content/index.fsx renamed to docs/index.fsx

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(*** hide ***)
2-
#I "../../bin"
2+
#r "../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.dll"
33

44
(**
55
ExcelProvider
@@ -23,15 +23,13 @@ Example
2323
2424
This example demonstrates the use of the type provider:
2525
26-
![alt text](img/DataTypes.png "Excel sample file with different types")
26+
![alt text](images/DataTypes.png "Excel sample file with different types")
2727
2828
*)
29-
3029
// reference the type provider dll
31-
#r "ExcelProvider.dll"
30+
#r "ExcelProvider.Runtime.dll"
3231
open FSharp.Interop.Excel
3332

34-
3533
// Let the type provider do it's work
3634
type DataTypesTest = ExcelFile<"DataTypes.xlsx">
3735
let file = new DataTypesTest()
@@ -41,7 +39,7 @@ let row = file.Data |> Seq.head
4139
4240
Now we have strongly typed access to the Excel rows:
4341
44-
![alt text](img/TypedExcel.png "Typed Excel sample file")
42+
![alt text](images/TypedExcel.png "Typed Excel sample file")
4543
4644
*)
4745

@@ -58,27 +56,27 @@ row.Boolean
5856
Documentation
5957
-----------------------
6058
61-
For more information see the Documentation pages:
59+
For more information see the Documentation pages:
6260
6361
* [Getting Started](getting-started.html) contains an overview of the library.
6462
* [Accessing Sheets](sheets.html) shows how to access different sheets in a workbook.
6563
* [Accessing Rows](rows.html) shows how to access individual rows in a worksheet.
6664
* [Accessing Cells](cells.html) shows how to access individual cells within a row of a worksheet.
6765
* [Accessing Ranges](ranges.html) shows how to access multiple ranges of data within a worksheet.
6866
* [Without Headers](headers.html) shows how to process sheets which do not include headers.
69-
67+
7068
7169
Contributing and copyright
7270
--------------------------
7371
74-
The project is hosted on [GitHub][gh] where you can [report issues][issues], fork
75-
the project and submit pull requests. If you're adding new public API, please also
72+
The project is hosted on [GitHub][gh] where you can [report issues][issues], fork
73+
the project and submit pull requests. If you're adding new public API, please also
7674
consider adding [samples][content] that can be turned into a documentation. You might
7775
also want to read [library design notes][readme] to understand how it works.
7876
79-
The library is available under Public Domain license, which allows modification and
80-
redistribution for both commercial and non-commercial purposes. For more information see the
81-
[License file][license] in the GitHub repository.
77+
The library is available under Public Domain license, which allows modification and
78+
redistribution for both commercial and non-commercial purposes. For more information see the
79+
[License file][license] in the GitHub repository.
8280
8381
[content]: https://github.com/fsprojects/ExcelProvider/tree/master/docs/content
8482
[gh]: https://github.com/fsprojects/ExcelProvider

docs/content/ranges.fsx renamed to docs/ranges.fsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
(**
2+
---
3+
title: Accessing Ranges
4+
category: Documentation
5+
categoryindex: 2
6+
index: 5
7+
---
8+
*)
9+
10+
111
(*** hide ***)
2-
#I "../../bin/ExcelProvider"
12+
#r "../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.dll"
313

414
(**
515
Accessing Ranges
@@ -13,7 +23,7 @@ You can either specify this as the second parameter or the named `Range` paramet
1323
Example
1424
-------
1525
16-
![alt text](img/Excel.png "Excel sample file with multiple ranges")
26+
![alt text](images/Excel.png "Excel sample file with multiple ranges")
1727
1828
This example demonstrates referencing multiple ranges:
1929
@@ -32,4 +42,4 @@ let test1 = rows.[0].First
3242
let test2 = rows.[0].Fourth
3343
(** And the variables `test1` and `test2` have the following values: *)
3444
(*** include-value: test1 ***)
35-
(*** include-value: test2 ***)
45+
(*** include-value: test2 ***)
Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
(**
2+
---
3+
title: Accessing Rows
4+
category: Documentation
5+
categoryindex: 2
6+
index: 3
7+
---
8+
*)
9+
10+
111
(*** hide ***)
2-
#I "../../bin/ExcelProvider"
12+
#r "../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.dll"
313

414
(**
515
Accessing Rows
@@ -10,14 +20,14 @@ Rows are returned as a sequence from the `Data` element of the ExcelFile type.
1020
Example
1121
-------
1222
13-
![alt text](img/MultSheets.png "Excel sample file with multiple sheets")
23+
![alt text](images/MultSheets.png "Excel sample file with multiple sheets")
1424
1525
This example demonstrates loading the second row (with index 1) into the variable test:
1626
1727
*)
1828

1929
// reference the type provider dll
20-
#r "ExcelProvider.dll"
30+
#r "ExcelProvider.Runtime.dll"
2131
open FSharp.Interop.Excel
2232

2333
// Let the type provider do it's work
@@ -26,4 +36,4 @@ let file = new MultipleSheetsSecond()
2636
let rows = file.Data |> Seq.toArray
2737
let test = rows.[1]
2838
(** And the variable `test` has the following value: *)
29-
(*** include-value: test ***)
39+
(*** include-value: test ***)

docs/content/sheets.fsx renamed to docs/sheets.fsx

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
(**
2+
---
3+
title: Accessing Sheets
4+
category: Documentation
5+
categoryindex: 2
6+
index: 2
7+
---
8+
*)
9+
10+
111
(*** hide ***)
2-
#I "../../bin/ExcelProvider"
12+
#r "../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.dll"
13+
314

415
(**
516
Accessing Sheets
@@ -12,14 +23,14 @@ If you do not include a second parameter then the first sheet in the workbook is
1223
Example
1324
-------
1425
15-
![alt text](img/MultSheets.png "Excel sample file with multiple sheets")
26+
![alt text](images/MultSheets.png "Excel sample file with multiple sheets")
1627
1728
This example demonstrates referencing the second sheet (with name `B`):
1829
1930
*)
2031

2132
// reference the type provider dll
22-
#r "ExcelProvider.dll"
33+
#r "ExcelProvider.Runtime.dll"
2334
open FSharp.Interop.Excel
2435

2536
// Let the type provider do it's work
@@ -28,4 +39,4 @@ let file = new MultipleSheetsSecond()
2839
let rows = file.Data |> Seq.toArray
2940
let test = rows.[0].Fourth
3041
(** And the variable `test` has the following value: *)
31-
(*** include-value: test ***)
42+
(*** include-value: test ***)

0 commit comments

Comments
 (0)