Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FSharp.Compiler.Service to 43.7.200 #796

Merged
merged 7 commits into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 18.0.0

* Update FCS to 43.7.200
* Target `net6.0` for `fsdocs-tool` [#799](https://github.com/fsprojects/FSharp.Formatting/issues/799)

## 17.4.1

* Update ipynb output metadata [#809](https://github.com/fsprojects/FSharp.Formatting/issues/809)
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ index: 5
(*** condition: prepare ***)
#nowarn "211"
#I "../src/FSharp.Formatting/bin/Release/netstandard2.1"
#r "FSharp.Compiler.Service"
#r "FSharp.Formatting.Common.dll"
#r "FSharp.Formatting.Markdown.dll"
#r "FSharp.Formatting.CodeFormat.dll"
Expand Down
13 changes: 7 additions & 6 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ framework: auto-detect
storage: none

nuget FSharp.Core >= 4.7 lowest_matching:true
nuget FSharp.Compiler.Service 42.7.101
nuget FSharp.Compiler.Service 43.7.200
nuget CommandLineParser ~> 2.8
nuget Microsoft.Build.Framework
nuget Microsoft.Build.Tasks.Core
nuget Microsoft.Build.Utilities.Core
nuget Ionide.ProjInfo 0.61.0
nuget Ionide.ProjInfo.Sln 0.61.0
nuget Microsoft.Build copy_local: false
nuget Microsoft.Build.Framework copy_local: false
nuget Microsoft.Build.Utilities.Core copy_local: false
nuget Microsoft.Build.Tasks.Core copy_local: false
nuget Ionide.ProjInfo 0.61.2
nuget Ionide.ProjInfo.Sln 0.61.2
nuget Newtonsoft.Json
nuget Suave
nuget System.Memory
Expand Down
181 changes: 89 additions & 92 deletions paket.lock

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/FSharp.Formatting.Common/YaafFSharpScripting.fs
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ type internal OptimizationType =
| NoCrossOptimize
| NoTailCalls

/// See https://msdn.microsoft.com/en-us/library/dd233172.aspx
/// See https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/fsharp-interactive-options
type internal FsiOptions =
{
Checked: bool option
Expand Down Expand Up @@ -525,6 +525,7 @@ type internal FsiOptions =
WarnLevel: int option
WarnAsError: bool option
WarnAsErrorList: (bool * int list) list
MultiEmit: bool option
ScriptArgs: string list
}

Expand Down Expand Up @@ -554,6 +555,7 @@ type internal FsiOptions =
WarnLevel = None
WarnAsError = None
WarnAsErrorList = []
MultiEmit = None
ScriptArgs = [] }

static member Default =
Expand Down Expand Up @@ -656,6 +658,7 @@ type internal FsiOptions =
WarnAsErrorList = (false, parseList (warnOpts.Substring 2)) :: parsed.WarnAsErrorList },
state
| _ -> failwithf "invalid --warnaserror argument: %s" arg
| _, FsiBoolArg "--multiemit" enabled -> { parsed with MultiEmit = Some enabled }, state
| _, unknown -> { parsed with ScriptArgs = unknown :: parsed.ScriptArgs }, (true, None))
(FsiOptions.Empty, (false, None))
|> fst
Expand Down Expand Up @@ -747,6 +750,7 @@ type internal FsiOptions =
yield! maybeArgMap x.WarnLevel (fun i -> sprintf "--warn:%d" i)

yield! getFsiBoolArg "--warnaserror" x.WarnAsError
yield! getFsiBoolArg "--multiemit" x.MultiEmit

yield!
x.WarnAsErrorList
Expand Down
2 changes: 1 addition & 1 deletion src/fsdocs-tool/fsdocs-tool.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AssemblyName>fsdocs</AssemblyName>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<PackageId>fsdocs-tool</PackageId>
<RollForward>LatestMajor</RollForward>
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Literate.Tests/EvalTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ let test = [1;2;3]
(*** include-value:test ***)"""

// Create evaluator & register simple formatter for lists
let fsiEvaluator = FSharp.Formatting.Literate.Evaluation.FsiEvaluator()
let fsiEvaluator = FSharp.Formatting.Literate.Evaluation.FsiEvaluator(options = [| "--multiemit-" |])

fsiEvaluator.RegisterTransformation(fun (o, ty, _executionCount) ->
if ty.IsGenericType && ty.GetGenericTypeDefinition() = typedefof<list<_>> then
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Literate.Tests/Setup.fs
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ type TempFile() =
member x.Dispose() = File.Delete(file)

let getFsiEvaluator () =
FSharp.Formatting.Literate.Evaluation.FsiEvaluator()
FSharp.Formatting.Literate.Evaluation.FsiEvaluator(options = [| "--multiemit-" |])