Skip to content

Commit 71c5ec6

Browse files
nojafnojaf
authored
Merge pull request #945 from nojaf/fcs-9-100
Update FCS and tools
2 parents c84184e + bffe22e commit 71c5ec6

File tree

13 files changed

+35
-107
lines changed

13 files changed

+35
-107
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "6.3.0-alpha-003",
6+
"version": "6.3.16",
77
"commands": [
88
"fantomas"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"dotnet-repl": {
18-
"version": "0.1.208",
18+
"version": "0.1.216",
1919
"commands": [
2020
"dotnet-repl"
2121
]

‎Directory.Packages.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<!-- locking the version of F# Core as FCS does this anyway and in practise all will be using the same version -->
9-
<PackageVersion Include="FSharp.Core" Version="[8.0.301]" />
10-
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.8.301]" />
9+
<PackageVersion Include="FSharp.Core" Version="[9.0.100]" />
10+
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.9.100]" />
1111
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
1212
<PackageVersion Include="Microsoft.Build" Version="" PrivateAssets="all" />
1313
<PackageVersion Include="Microsoft.Build.Framework" Version="" PrivateAssets="all" />
@@ -18,7 +18,7 @@
1818
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1919
<PackageVersion Include="Suave" Version="2.6.2" />
2020
<PackageVersion Include="System.Memory" Version="4.5.5" />
21-
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
21+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
2222
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
2323
<PackageVersion Include="NUnit" Version="3.14.0" />
2424
<PackageVersion Include="FsUnit" Version="5.6.0" />

‎RELEASE_NOTES.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 21.0.0-beta-004 - 2024-11-20
4+
5+
### Changed
6+
* Update FCS to 43.9.100. [#945](https://github.com/fsprojects/FSharp.Formatting/pull/945)
7+
38
## 21.0.0-beta-003 - 2024-08-06
49

510
### Changed

‎global.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100"
3+
"version": "8.0.400",
4+
"rollForward": "latestMinor"
45
}
56
}

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2912,15 +2912,8 @@ type ApiDocInput =
29122912
}
29132913

29142914
static member FromFile
2915-
(
2916-
assemblyPath: string,
2917-
?mdcomments,
2918-
?substitutions,
2919-
?sourceRepo,
2920-
?sourceFolder,
2921-
?publicOnly,
2922-
?warn
2923-
) =
2915+
(assemblyPath: string, ?mdcomments, ?substitutions, ?sourceRepo, ?sourceFolder, ?publicOnly, ?warn)
2916+
=
29242917
{ Path = assemblyPath
29252918
XmlFile = None
29262919
SourceFolder = sourceFolder

‎src/FSharp.Formatting.CodeFormat/CodeFormat.fs‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,7 @@ type CodeFormat =
4040
/// Formats the .fsx snippets as HTML. The parameters specify prefix for HTML tags, whether lines should
4141
/// be added to outputs and whether errors should be printed.
4242
static member FormatHtml
43-
(
44-
snippets,
45-
prefix,
46-
?openTag,
47-
?closeTag,
48-
?lineNumbers,
49-
?openLinesTag,
50-
?closeLinesTag,
51-
?addErrors,
52-
?tokenKindToCss
53-
) =
43+
(snippets, prefix, ?openTag, ?closeTag, ?lineNumbers, ?openLinesTag, ?closeLinesTag, ?addErrors, ?tokenKindToCss) =
5444
let openTag = defaultArg openTag "<pre class=\"fssnip\">"
5545

5646
let closeTag = defaultArg closeTag "</pre>"

‎src/FSharp.Formatting.CodeFormat/Pervasive.fs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,8 @@ type CheckResults =
134134
type FSharpChecker with
135135

136136
member this.ParseAndCheckDocument
137-
(
138-
filePath: string,
139-
sourceText: string,
140-
options: FSharpProjectOptions,
141-
allowStaleResults: bool
142-
) : Async<(FSharpParseFileResults * ParsedInput * FSharpCheckFileResults) option> =
137+
(filePath: string, sourceText: string, options: FSharpProjectOptions, allowStaleResults: bool)
138+
: Async<(FSharpParseFileResults * ParsedInput * FSharpCheckFileResults) option> =
143139
let parseAndCheckFile =
144140
async {
145141
let! parseResults, checkFileAnswer =

‎src/FSharp.Formatting.Literate/Literate.fs‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,8 @@ type Literate private () =
234234
/// <param name="rootInputFolder"></param>
235235
/// <param name="onError"></param>
236236
static member ParsePynbString
237-
(
238-
content,
239-
?path,
240-
?definedSymbols,
241-
?references,
242-
?parseOptions,
243-
?rootInputFolder,
244-
?onError
245-
) =
237+
(content, ?path, ?definedSymbols, ?references, ?parseOptions, ?rootInputFolder, ?onError)
238+
=
246239
let onError = defaultArg onError ignore
247240
let ctx = parsingContext None None definedSymbols onError
248241

@@ -361,15 +354,7 @@ type Literate private () =
361354

362355
/// Format the literate document as Latex without using a template
363356
static member ToLatex
364-
(
365-
doc: LiterateDocument,
366-
?prefix,
367-
?lineNumbers,
368-
?generateAnchors,
369-
?substitutions,
370-
?crefResolver,
371-
?mdlinkResolver
372-
) =
357+
(doc: LiterateDocument, ?prefix, ?lineNumbers, ?generateAnchors, ?substitutions, ?crefResolver, ?mdlinkResolver) =
373358
let crefResolver = defaultArg crefResolver (fun _ -> None)
374359
let mdlinkResolver = defaultArg mdlinkResolver (fun _ -> None)
375360

‎src/FSharp.Formatting.Markdown/Markdown.fs‎

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,8 @@ type Markdown internal () =
102102
/// Transform Markdown text into HTML format. The result
103103
/// will be written to the provided TextWriter.
104104
static member WriteHtml
105-
(
106-
markdownText: string,
107-
writer: TextWriter,
108-
?newline,
109-
?substitutions,
110-
?crefResolver,
111-
?mdlinkResolver
112-
) =
105+
(markdownText: string, writer: TextWriter, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver)
106+
=
113107
let doc = Markdown.Parse(markdownText, ?newline = newline)
114108

115109
Markdown.WriteHtml(
@@ -154,15 +148,7 @@ type Markdown internal () =
154148
/// Transform the provided MarkdownDocument into LaTeX
155149
/// format and write the result to a given writer.
156150
static member WriteLatex
157-
(
158-
doc: MarkdownDocument,
159-
writer,
160-
?newline,
161-
?substitutions,
162-
?crefResolver,
163-
?mdlinkResolver,
164-
?lineNumbers
165-
) =
151+
(doc: MarkdownDocument, writer, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver, ?lineNumbers) =
166152
let newline = defaultArg newline Environment.NewLine
167153
let substitutions = defaultArg substitutions []
168154
let crefResolver = defaultArg crefResolver (fun _ -> None)
@@ -182,14 +168,8 @@ type Markdown internal () =
182168
/// Transform Markdown document into LaTeX format. The result
183169
/// will be written to the provided TextWriter.
184170
static member WriteLatex
185-
(
186-
markdownText,
187-
writer: TextWriter,
188-
?newline,
189-
?substitutions,
190-
?crefResolver,
191-
?mdlinkResolver
192-
) =
171+
(markdownText, writer: TextWriter, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver)
172+
=
193173
let doc = Markdown.Parse(markdownText, ?newline = newline)
194174

195175
Markdown.WriteLatex(
@@ -204,14 +184,8 @@ type Markdown internal () =
204184
/// Transform the provided MarkdownDocument into LaTeX
205185
/// format and return the result as a string.
206186
static member ToLatex
207-
(
208-
doc: MarkdownDocument,
209-
?newline,
210-
?substitutions,
211-
?crefResolver,
212-
?mdlinkResolver,
213-
?lineNumbers
214-
) =
187+
(doc: MarkdownDocument, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver, ?lineNumbers)
188+
=
215189
let sb = new System.Text.StringBuilder()
216190
use wr = new StringWriter(sb)
217191

@@ -229,14 +203,8 @@ type Markdown internal () =
229203

230204
/// Transform Markdown text into LaTeX format. The result will be returned as a string.
231205
static member ToLatex
232-
(
233-
markdownText: string,
234-
?newline,
235-
?substitutions,
236-
?crefResolver,
237-
?mdlinkResolver,
238-
?lineNumbers
239-
) =
206+
(markdownText: string, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver, ?lineNumbers)
207+
=
240208
let doc = Markdown.Parse(markdownText, ?newline = newline)
241209

242210
Markdown.ToLatex(

‎src/FSharp.Formatting/FSharp.Formatting.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="FSharp.Core" />
35+
<PackageReference Update="FSharp.Core" />
3636
<PackageReference Include="FSharp.Compiler.Service" />
3737
</ItemGroup>
3838

0 commit comments

Comments
 (0)