-
-
+
+
@@ -18,7 +18,7 @@
-
+
diff --git a/global.json b/global.json
index 5ce849551..4e550c173 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,6 @@
{
"sdk": {
- "version": "8.0.100"
+ "version": "8.0.400",
+ "rollForward": "latestMinor"
}
}
diff --git a/src/FSharp.Formatting.ApiDocs/GenerateModel.fs b/src/FSharp.Formatting.ApiDocs/GenerateModel.fs
index 218f64d41..7c509fac7 100644
--- a/src/FSharp.Formatting.ApiDocs/GenerateModel.fs
+++ b/src/FSharp.Formatting.ApiDocs/GenerateModel.fs
@@ -2912,15 +2912,8 @@ type ApiDocInput =
}
static member FromFile
- (
- assemblyPath: string,
- ?mdcomments,
- ?substitutions,
- ?sourceRepo,
- ?sourceFolder,
- ?publicOnly,
- ?warn
- ) =
+ (assemblyPath: string, ?mdcomments, ?substitutions, ?sourceRepo, ?sourceFolder, ?publicOnly, ?warn)
+ =
{ Path = assemblyPath
XmlFile = None
SourceFolder = sourceFolder
diff --git a/src/FSharp.Formatting.CodeFormat/CodeFormat.fs b/src/FSharp.Formatting.CodeFormat/CodeFormat.fs
index 5037d8a07..176156270 100644
--- a/src/FSharp.Formatting.CodeFormat/CodeFormat.fs
+++ b/src/FSharp.Formatting.CodeFormat/CodeFormat.fs
@@ -40,17 +40,7 @@ type CodeFormat =
/// Formats the .fsx snippets as HTML. The parameters specify prefix for HTML tags, whether lines should
/// be added to outputs and whether errors should be printed.
static member FormatHtml
- (
- snippets,
- prefix,
- ?openTag,
- ?closeTag,
- ?lineNumbers,
- ?openLinesTag,
- ?closeLinesTag,
- ?addErrors,
- ?tokenKindToCss
- ) =
+ (snippets, prefix, ?openTag, ?closeTag, ?lineNumbers, ?openLinesTag, ?closeLinesTag, ?addErrors, ?tokenKindToCss) =
let openTag = defaultArg openTag ""
let closeTag = defaultArg closeTag "
"
diff --git a/src/FSharp.Formatting.CodeFormat/Pervasive.fs b/src/FSharp.Formatting.CodeFormat/Pervasive.fs
index 524cd2bae..14c649f77 100644
--- a/src/FSharp.Formatting.CodeFormat/Pervasive.fs
+++ b/src/FSharp.Formatting.CodeFormat/Pervasive.fs
@@ -134,12 +134,8 @@ type CheckResults =
type FSharpChecker with
member this.ParseAndCheckDocument
- (
- filePath: string,
- sourceText: string,
- options: FSharpProjectOptions,
- allowStaleResults: bool
- ) : Async<(FSharpParseFileResults * ParsedInput * FSharpCheckFileResults) option> =
+ (filePath: string, sourceText: string, options: FSharpProjectOptions, allowStaleResults: bool)
+ : Async<(FSharpParseFileResults * ParsedInput * FSharpCheckFileResults) option> =
let parseAndCheckFile =
async {
let! parseResults, checkFileAnswer =
diff --git a/src/FSharp.Formatting.Literate/Literate.fs b/src/FSharp.Formatting.Literate/Literate.fs
index 3723adc47..fd363a18e 100644
--- a/src/FSharp.Formatting.Literate/Literate.fs
+++ b/src/FSharp.Formatting.Literate/Literate.fs
@@ -234,15 +234,8 @@ type Literate private () =
///
///
static member ParsePynbString
- (
- content,
- ?path,
- ?definedSymbols,
- ?references,
- ?parseOptions,
- ?rootInputFolder,
- ?onError
- ) =
+ (content, ?path, ?definedSymbols, ?references, ?parseOptions, ?rootInputFolder, ?onError)
+ =
let onError = defaultArg onError ignore
let ctx = parsingContext None None definedSymbols onError
@@ -361,15 +354,7 @@ type Literate private () =
/// Format the literate document as Latex without using a template
static member ToLatex
- (
- doc: LiterateDocument,
- ?prefix,
- ?lineNumbers,
- ?generateAnchors,
- ?substitutions,
- ?crefResolver,
- ?mdlinkResolver
- ) =
+ (doc: LiterateDocument, ?prefix, ?lineNumbers, ?generateAnchors, ?substitutions, ?crefResolver, ?mdlinkResolver) =
let crefResolver = defaultArg crefResolver (fun _ -> None)
let mdlinkResolver = defaultArg mdlinkResolver (fun _ -> None)
diff --git a/src/FSharp.Formatting.Markdown/Markdown.fs b/src/FSharp.Formatting.Markdown/Markdown.fs
index c4574efed..6cb5e6249 100644
--- a/src/FSharp.Formatting.Markdown/Markdown.fs
+++ b/src/FSharp.Formatting.Markdown/Markdown.fs
@@ -102,14 +102,8 @@ type Markdown internal () =
/// Transform Markdown text into HTML format. The result
/// will be written to the provided TextWriter.
static member WriteHtml
- (
- markdownText: string,
- writer: TextWriter,
- ?newline,
- ?substitutions,
- ?crefResolver,
- ?mdlinkResolver
- ) =
+ (markdownText: string, writer: TextWriter, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver)
+ =
let doc = Markdown.Parse(markdownText, ?newline = newline)
Markdown.WriteHtml(
@@ -154,15 +148,7 @@ type Markdown internal () =
/// Transform the provided MarkdownDocument into LaTeX
/// format and write the result to a given writer.
static member WriteLatex
- (
- doc: MarkdownDocument,
- writer,
- ?newline,
- ?substitutions,
- ?crefResolver,
- ?mdlinkResolver,
- ?lineNumbers
- ) =
+ (doc: MarkdownDocument, writer, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver, ?lineNumbers) =
let newline = defaultArg newline Environment.NewLine
let substitutions = defaultArg substitutions []
let crefResolver = defaultArg crefResolver (fun _ -> None)
@@ -182,14 +168,8 @@ type Markdown internal () =
/// Transform Markdown document into LaTeX format. The result
/// will be written to the provided TextWriter.
static member WriteLatex
- (
- markdownText,
- writer: TextWriter,
- ?newline,
- ?substitutions,
- ?crefResolver,
- ?mdlinkResolver
- ) =
+ (markdownText, writer: TextWriter, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver)
+ =
let doc = Markdown.Parse(markdownText, ?newline = newline)
Markdown.WriteLatex(
@@ -204,14 +184,8 @@ type Markdown internal () =
/// Transform the provided MarkdownDocument into LaTeX
/// format and return the result as a string.
static member ToLatex
- (
- doc: MarkdownDocument,
- ?newline,
- ?substitutions,
- ?crefResolver,
- ?mdlinkResolver,
- ?lineNumbers
- ) =
+ (doc: MarkdownDocument, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver, ?lineNumbers)
+ =
let sb = new System.Text.StringBuilder()
use wr = new StringWriter(sb)
@@ -229,14 +203,8 @@ type Markdown internal () =
/// Transform Markdown text into LaTeX format. The result will be returned as a string.
static member ToLatex
- (
- markdownText: string,
- ?newline,
- ?substitutions,
- ?crefResolver,
- ?mdlinkResolver,
- ?lineNumbers
- ) =
+ (markdownText: string, ?newline, ?substitutions, ?crefResolver, ?mdlinkResolver, ?lineNumbers)
+ =
let doc = Markdown.Parse(markdownText, ?newline = newline)
Markdown.ToLatex(
diff --git a/src/FSharp.Formatting/FSharp.Formatting.fsproj b/src/FSharp.Formatting/FSharp.Formatting.fsproj
index 1f0f340ed..5287e7a13 100644
--- a/src/FSharp.Formatting/FSharp.Formatting.fsproj
+++ b/src/FSharp.Formatting/FSharp.Formatting.fsproj
@@ -32,7 +32,7 @@