Skip to content

Commit f3e48c5

Browse files
committed
Updated FCS to .NET/F# 9.0
1 parent ae39fa1 commit f3e48c5

File tree

10 files changed

+5080
-2580
lines changed

10 files changed

+5080
-2580
lines changed

lib/fcs/FSharp.Compiler.Service.deps.json

Lines changed: 147 additions & 83 deletions
Large diffs are not rendered by default.
528 KB
Binary file not shown.

lib/fcs/FSharp.Compiler.Service.xml

Lines changed: 3648 additions & 2268 deletions
Large diffs are not rendered by default.

lib/fcs/FSharp.Core.dll

-931 KB
Binary file not shown.

lib/fcs/FSharp.Core.xml

Lines changed: 1273 additions & 220 deletions
Large diffs are not rendered by default.
-2.5 KB
Binary file not shown.

lib/fcs/FSharp.DependencyManager.Nuget.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Fable.Cli/Main.fs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,16 +1192,17 @@ let private compilationCycle (state: State) (changes: ISet<string>) =
11921192

11931193
Log.always ("Generating assembly...")
11941194

1195-
let! (diagnostics, exitCode), ms =
1195+
let! (diagnostics, result), ms =
11961196
Performance.measureAsync <| fun _ -> fableCompiler.CompileToFile(dllPath)
11971197

11981198
Log.always ($"Assembly generated in {ms}ms")
11991199

1200-
if exitCode <> 0 then
1200+
match result with
1201+
| Some ex ->
12011202
getFSharpDiagnostics diagnostics |> logErrors cliArgs.RootDir
1202-
1203-
return exitCode
1204-
else
1203+
Log.error (ex.Message)
1204+
return 1
1205+
| None ->
12051206
Log.always ($"Saving precompiled info...")
12061207
let! fableProj = fableCompiler.GetFableProject()
12071208

src/Fable.Transforms/Rust/Replacements.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ let emitFormat (com: ICompiler) r t (args: Expr list) macro =
342342
| [ StringTempl(fmt, args); Value(NewArray(ArrayValues restArgs, _, _), _) ] ->
343343
(emitRawString fmt) :: args @ restArgs
344344
| (StringTempl(fmt, args)) :: restArgs -> (emitRawString fmt) :: args @ restArgs
345+
| [ ExprTypeAs(String, str); Value(NewArray(ArrayValues restArgs, _, _), _) ] ->
346+
(emitRawString "{0}") :: str :: restArgs
345347
| _ -> (emitRawString "{0}") :: args
346348

347349
let unboxedArgs = args |> FSharp2Fable.Util.unboxBoxedArgs

src/fcs-fable/src/Compiler/Service/FSharpSource.fsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type internal FSharpSource =
2828
abstract TimeStamp: DateTime
2929

3030
/// Gets the internal text container. Text may be on-disk, in a stream, or a source text.
31-
abstract internal GetTextContainer: unit -> Async<TextContainer>
31+
abstract GetTextContainer: unit -> Async<TextContainer>
3232

3333
#if !FABLE_COMPILER
3434
/// Creates a FSharpSource from disk. Only used internally.

0 commit comments

Comments
 (0)