#1419 #1420 FCS and Roslyn updates for .NET 9

dotnet-websharper · Feb 5, 2025 · 96304b4 · 96304b4
1 parent 554dc8a
commit 96304b4
Show file tree

Hide file tree

Showing 5 changed files with 175 additions and 116 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -7,7 +7,7 @@ strategy: min
 storage: none
 
 nuget Mono.Cecil ~> 0.11.0
-nuget Microsoft.CodeAnalysis.CSharp ~> 4.11.0
+nuget Microsoft.CodeAnalysis.CSharp ~> 4.12.0
 nuget System.CodeDom 4.4.0
 nuget System.Runtime.Loader 4.3.0
 nuget System.Configuration.ConfigurationManager 4.7.0
@@ -45,7 +45,7 @@ group fcs
     nuget System.Runtime.Caching ~> 6.0.0
     nuget System.Configuration.ConfigurationManager ~> 6.0.0
     nuget NLog ~> 4.7.10
-    nuget FSharp.Compiler.Service ~> 43.8.400
+    nuget FSharp.Compiler.Service ~> 43.9.100
 
 group test
     source https://api.nuget.org/v3/index.json

diff --git a/paket.lock b/paket.lock
@@ -42,7 +42,7 @@ NUGET
       System.Security.Permissions (>= 4.7)
       System.Text.Encoding.CodePages (>= 4.0.1)
     Microsoft.CodeAnalysis.Analyzers (3.3.4)
-    Microsoft.CodeAnalysis.Common (4.11)
+    Microsoft.CodeAnalysis.Common (4.12)
       Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
       System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (< net7.0)) (== netstandard2.0)
       System.Collections.Immutable (>= 8.0)
@@ -52,9 +52,9 @@ NUGET
       System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (< net7.0)) (== netstandard2.0)
       System.Text.Encoding.CodePages (>= 7.0) - restriction: || (&& (== net8.0) (< net7.0)) (== netstandard2.0)
       System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (< net7.0)) (== netstandard2.0)
-    Microsoft.CodeAnalysis.CSharp (4.11)
+    Microsoft.CodeAnalysis.CSharp (4.12)
       Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
-      Microsoft.CodeAnalysis.Common (4.11)
+      Microsoft.CodeAnalysis.Common (4.12)
       System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (< net7.0)) (== netstandard2.0)
       System.Collections.Immutable (>= 8.0)
       System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (< net7.0)) (== netstandard2.0)
@@ -583,16 +583,16 @@ STORAGE: NONE
 RESTRICTION: || (== net8.0) (== netstandard2.0)
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    FSharp.Compiler.Service (43.8.403)
-      FSharp.Core (8.0.403)
+    FSharp.Compiler.Service (43.9.101)
+      FSharp.Core (9.0.101)
       System.Buffers (>= 4.5.1)
       System.Collections.Immutable (>= 8.0)
       System.Diagnostics.DiagnosticSource (>= 8.0)
       System.Memory (>= 4.5.5)
       System.Reflection.Emit (>= 4.7)
       System.Reflection.Metadata (>= 8.0)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    FSharp.Core (8.0.403)
+    FSharp.Core (9.0.101)
     NLog (4.7.15)
     System.Buffers (4.6)
     System.Collections.Immutable (9.0.1)

diff --git a/src/compiler/WebSharper.Compiler.CSharp/RoslynHelpers.g.fs b/src/compiler/WebSharper.Compiler.CSharp/RoslynHelpers.g.fs
@@ -1506,6 +1506,10 @@ and LiteralExpressionData(node: LiteralExpressionSyntax) =
     member this.Token = node.Token |> LiteralExpressionToken.FromToken
     static member FromNode(n: LiteralExpressionSyntax) = LiteralExpressionData(n)
 
+and FieldExpressionData(node: FieldExpressionSyntax) =
+    member this.Node = node
+    static member FromNode(n: FieldExpressionSyntax) = FieldExpressionData(n)
+
 and MakeRefExpressionData(node: MakeRefExpressionSyntax) =
     member this.Node = node
     member this.Expression = node.Expression |> ExpressionData.FromNode
@@ -1847,6 +1851,7 @@ and [<RequireQualifiedAccess>] ExpressionData =
     | AssignmentExpression                      of AssignmentExpressionData
     | ConditionalExpression                     of ConditionalExpressionData
     | LiteralExpression                         of LiteralExpressionData
+    | FieldExpression                           of FieldExpressionData
     | MakeRefExpression                         of MakeRefExpressionData
     | RefTypeExpression                         of RefTypeExpressionData
     | RefValueExpression                        of RefValueExpressionData
@@ -1895,6 +1900,7 @@ with
         | :? AssignmentExpressionSyntax as d -> AssignmentExpression (AssignmentExpressionData.FromNode(d))
         | :? ConditionalExpressionSyntax as d -> ConditionalExpression (ConditionalExpressionData.FromNode(d))
         | :? LiteralExpressionSyntax as d -> LiteralExpression (LiteralExpressionData.FromNode(d))
+        | :? FieldExpressionSyntax as d -> FieldExpression (FieldExpressionData.FromNode(d))
         | :? MakeRefExpressionSyntax as d -> MakeRefExpression (MakeRefExpressionData.FromNode(d))
         | :? RefTypeExpressionSyntax as d -> RefTypeExpression (RefTypeExpressionData.FromNode(d))
         | :? RefValueExpressionSyntax as d -> RefValueExpression (RefValueExpressionData.FromNode(d))
@@ -1943,6 +1949,7 @@ with
         | AssignmentExpression d -> d.Node :> ExpressionSyntax
         | ConditionalExpression d -> d.Node :> ExpressionSyntax
         | LiteralExpression d -> d.Node :> ExpressionSyntax
+        | FieldExpression d -> d.Node :> ExpressionSyntax
         | MakeRefExpression d -> d.Node :> ExpressionSyntax
         | RefTypeExpression d -> d.Node :> ExpressionSyntax
         | RefValueExpression d -> d.Node :> ExpressionSyntax