Skip to content

Commit 9415c7d

Browse files
nojafnojaf
authored
Merge pull request #968 from nojaf/update-sdk
Update SDK to 10.0.100
2 parents 3592796 + 5c32af0 commit 9415c7d

File tree

16 files changed

+109
-130
lines changed

16 files changed

+109
-130
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "6.3.16",
6+
"version": "7.0.3",
77
"commands": [
88
"fantomas"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"fsharp-analyzers": {
1213
"version": "0.32.1",
1314
"commands": [
1415
"fsharp-analyzers"
15-
]
16+
],
17+
"rollForward": false
1618
},
1719
"dotnet-repl": {
1820
"version": "0.1.216",
1921
"commands": [
2022
"dotnet-repl"
21-
]
23+
],
24+
"rollForward": false
2225
}
2326
}
2427
}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.400",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

‎src/FSharp.Formatting.ApiDocs/GenerateHtml.fs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
118118
thead [] [
119119
tr [] [
120120
td [ Class "fsdocs-member-list-header" ] [ !!tableHeader ]
121-
td [ Class "fsdocs-member-list-header" ] [ !! "Description"; fsdocsDetailsToggle [] ]
121+
td [ Class "fsdocs-member-list-header" ] [ !!"Description"; fsdocsDetailsToggle [] ]
122122
]
123123
]
124124
tbody [] [
@@ -131,23 +131,23 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
131131
p [] [ a [ Id m.Name ] [ a [ Href("#" + m.Name) ] [ embed m.UsageHtml ] ] ]
132132
] [
133133
div [ Class "member-tooltip" ] [
134-
!! "Full Usage: "
134+
!!"Full Usage: "
135135
embed m.UsageHtml
136136
br []
137137
br []
138138
if not m.Parameters.IsEmpty then
139-
!! "Parameters: "
139+
!!"Parameters: "
140140

141141
ul [] [
142142
for p in m.Parameters do
143143
span [] [
144144
b [] [ !!p.ParameterNameText ]
145-
!! ":"
145+
!!":"
146146
embed p.ParameterType
147147
match p.ParameterDocs with
148148
| None -> ()
149149
| Some d ->
150-
!! " - "
150+
!!" - "
151151
embed d
152152
]
153153

@@ -174,7 +174,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
174174
//!! "Signature: "
175175
//encode(m.SignatureTooltip)
176176
if not m.Modifiers.IsEmpty then
177-
!! "Modifiers: "
177+
!!"Modifiers: "
178178
encode (m.FormatModifiers)
179179
br []
180180

@@ -183,7 +183,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
183183
match m.FormatTypeArguments with
184184
| None -> ()
185185
| Some v ->
186-
!! "Type parameters: "
186+
!!"Type parameters: "
187187
encode (v)
188188
]
189189
]
@@ -207,7 +207,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
207207

208208
match m.ExtendedType with
209209
| Some(_, extendedTypeHtml) ->
210-
p [] [ !! "Extended Type: "; embed extendedTypeHtml ]
210+
p [] [ !!"Extended Type: "; embed extendedTypeHtml ]
211211
| _ -> ()
212212

213213
if not m.Parameters.IsEmpty then
@@ -217,7 +217,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
217217
span [ Class "fsdocs-param-name" ] [
218218
!!parameter.ParameterNameText
219219
]
220-
!! ":"
220+
!!":"
221221
embed parameter.ParameterType
222222
]
223223

@@ -263,12 +263,12 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
263263
]
264264

265265
for e in m.Comment.Notes do
266-
h5 [ Class "fsdocs-note-header" ] [ !! "Note" ]
266+
h5 [ Class "fsdocs-note-header" ] [ !!"Note" ]
267267

268268
p [ Class "fsdocs-note" ] [ embed e ]
269269

270270
for e in m.Comment.Examples do
271-
h5 [ Class "fsdocs-example-header" ] [ !! "Example" ]
271+
h5 [ Class "fsdocs-example-header" ] [ !!"Example" ]
272272

273273
p [
274274
yield Class "fsdocs-example"
@@ -314,7 +314,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
314314
elif hasTypes then "Type"
315315
else "Modules")
316316
]
317-
td [] [ !! "Description" ]
317+
td [] [ !!"Description" ]
318318
]
319319
]
320320
tbody [] [
@@ -375,7 +375,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
375375
h2 [] [ !!(usageName + (if entity.IsTypeDefinition then " Type" else " Module")) ]
376376
dl [ Class "fsdocs-metadata" ] [
377377
dt [] [
378-
!! "Namespace: "
378+
!!"Namespace: "
379379
a [ Href(info.Namespace.Url(root, collectionName, qualify, model.FileExtensions.InUrl)) ] [
380380
!!info.Namespace.Name
381381
]
@@ -386,19 +386,19 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
386386
| None -> ()
387387
| Some parentModule ->
388388
dt [] [
389-
!! "Parent Module: "
389+
!!"Parent Module: "
390390
a [ Href(parentModule.Url(root, collectionName, qualify, model.FileExtensions.InUrl)) ] [
391391
!!parentModule.Name
392392
]
393393
]
394394

395395
match entity.AbbreviatedType with
396-
| Some(_, abbreviatedTypHtml) -> dt [] [ !! "Abbreviation For: "; embed abbreviatedTypHtml ]
396+
| Some(_, abbreviatedTypHtml) -> dt [] [ !!"Abbreviation For: "; embed abbreviatedTypHtml ]
397397

398398
| None -> ()
399399

400400
match entity.BaseType with
401-
| Some(_, baseTypeHtml) -> dt [] [ !! "Base Type: "; embed baseTypeHtml ]
401+
| Some(_, baseTypeHtml) -> dt [] [ !!"Base Type: "; embed baseTypeHtml ]
402402
| None -> ()
403403

404404
match entity.AllInterfaces with
@@ -408,7 +408,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
408408
!!("All Interfaces: ")
409409
for (i, (_, ityHtml)) in Seq.indexed l do
410410
if i <> 0 then
411-
!! ", "
411+
!!", "
412412

413413
embed ityHtml
414414
]
@@ -444,20 +444,20 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
444444
| Some r -> p [ Class "fsdocs-remarks" ] [ embed r ]
445445
| None -> ()
446446
for note in entity.Comment.Notes do
447-
h5 [ Class "fsdocs-note-header" ] [ !! "Note" ]
447+
h5 [ Class "fsdocs-note-header" ] [ !!"Note" ]
448448

449449
p [ Class "fsdocs-note" ] [ embed note ]
450450

451451
for example in entity.Comment.Examples do
452-
h5 [ Class "fsdocs-example-header" ] [ !! "Example" ]
452+
h5 [ Class "fsdocs-example-header" ] [ !!"Example" ]
453453

454454
p [ Class "fsdocs-example" ] [ embed example ]
455455

456456
]
457457

458458
if (byCategory.Length > 1) then
459459
// If there is more than 1 category in the type, generate TOC
460-
h3 [] [ !! "Table of contents" ]
460+
h3 [] [ !!"Table of contents" ]
461461

462462
ul [] [
463463
for (index, _, name) in byCategory do
@@ -528,7 +528,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
528528
]
529529

530530
if (allByCategory.Length > 1) then
531-
h3 [] [ !! "Contents" ]
531+
h3 [] [ !!"Contents" ]
532532

533533
ul [] [
534534
for category in allByCategory do
@@ -576,13 +576,13 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
576576
//
577577
// For non-FSharp.Core we only show one link "API Reference" in the nav menu
578578
if otherDocs && model.Collection.CollectionName <> "FSharp.Core" then
579-
li [ Class "nav-header" ] [ !! "API Reference" ]
579+
li [ Class "nav-header" ] [ !!"API Reference" ]
580580

581581
li [ Class "nav-item" ] [
582582
a [
583583
Class "nav-link"
584584
Href(model.IndexFileUrl(root, collectionName, qualify, model.FileExtensions.InUrl))
585-
] [ !! "All Namespaces" ]
585+
] [ !!"All Namespaces" ]
586586
]
587587
else
588588

@@ -591,7 +591,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
591591
let someExist = categorise.Length > 0
592592

593593
if someExist then
594-
li [ Class "nav-header" ] [ !! "Namespaces" ]
594+
li [ Class "nav-header" ] [ !!"Namespaces" ]
595595

596596
for allByCategory, ns in categorise do
597597

@@ -713,13 +713,13 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
713713

714714
(let content =
715715
div [] [
716-
h1 [] [ !! "API Reference" ]
717-
h2 [] [ !! "Available Namespaces:" ]
716+
h1 [] [ !!"API Reference" ]
717+
h2 [] [ !!"Available Namespaces:" ]
718718
table [ Class "table outer-list fsdocs-member-list" ] [
719719
thead [] [
720720
tr [] [
721-
td [ Class "fsdocs-member-list-header" ] [ !! "Namespace" ]
722-
td [ Class "fsdocs-member-list-header" ] [ !! "Description" ]
721+
td [ Class "fsdocs-member-list-header" ] [ !!"Namespace" ]
722+
td [ Class "fsdocs-member-list-header" ] [ !!"Description" ]
723723
]
724724
]
725725
tbody [] (tableOfNamespacesAux ())

0 commit comments

Comments
 (0)