FCS updat-a-palooza (#121)

* bump to fcs41 and do more build stuff * changelog
ionide · Nov 5, 2021 · a972839 · a972839
1 parent 6a6bdf3
commit a972839
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 84 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -19,6 +19,12 @@
       "commands": [
         "octonav"
       ]
+    },
+    "fantomas-tool": {
+      "version": "4.6.0-alpha-006",
+      "commands": [
+        "fantomas"
+      ]
     }
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # Changelog
 
+## [0.55.0] - 2021-11-05
+
+### Changed
+
+- Updated to FCS 41
+
 ## [0.54.2] - 2021-11-01
 
 ### Fixed

diff --git a/paket.dependencies b/paket.dependencies
@@ -6,11 +6,11 @@ storage: none
 framework: net5.0
 
 nuget FSharp.Core
-nuget FSharp.Compiler.Service ~> 39.0
+nuget FSharp.Compiler.Service ~> 41.0
 nuget Argu
 
-# copy_local: true doesn't expose sourcelink as a package dependency
-nuget Microsoft.SourceLink.GitHub copy_local: true
+# copy_local: true because this is a build-time dependency only
+nuget Dotnet.ReproducibleBuilds copy_local: true
 
 nuget Expecto
 nuget Expecto.Diff

diff --git a/paket.lock b/paket.lock
@@ -6,21 +6,26 @@ NUGET
       FSharp.Core (>= 4.3.2)
       System.Configuration.ConfigurationManager (>= 4.4)
     DiffPlex (1.7)
-    Expecto (9.0.2)
+    DotNet.ReproducibleBuilds (0.1.66) - copy_local: true
+      Microsoft.SourceLink.AzureRepos.Git (>= 1.0)
+      Microsoft.SourceLink.Bitbucket.Git (>= 1.0)
+      Microsoft.SourceLink.GitHub (>= 1.0)
+      Microsoft.SourceLink.GitLab (>= 1.0)
+    Expecto (9.0.4)
       FSharp.Core (>= 4.6)
-      Mono.Cecil (>= 0.11.2)
-    Expecto.Diff (9.0.2)
-      DiffPlex (>= 1.6.1)
-      Expecto (>= 9.0.2)
+      Mono.Cecil (>= 0.11.3)
+    Expecto.Diff (9.0.4)
+      DiffPlex (>= 1.6.3)
+      Expecto (>= 9.0.4)
       FSharp.Core (>= 4.6)
     Expecto.TestResults (8.13.2)
       Expecto (>= 8.13.2)
       FSharp.Core (>= 4.6)
-    FSharp.Compiler.Service (39.0)
-      FSharp.Core (5.0.1)
-      Microsoft.Build.Framework (>= 16.6)
-      Microsoft.Build.Tasks.Core (>= 16.6)
-      Microsoft.Build.Utilities.Core (>= 16.6)
+    FSharp.Compiler.Service (41.0.1)
+      FSharp.Core (6.0.1)
+      Microsoft.Build.Framework (>= 16.11)
+      Microsoft.Build.Tasks.Core (>= 16.11)
+      Microsoft.Build.Utilities.Core (>= 16.11)
       System.Buffers (>= 4.5.1)
       System.Collections.Immutable (>= 5.0)
       System.Diagnostics.Process (>= 4.3)
@@ -29,11 +34,12 @@ NUGET
       System.Linq.Queryable (>= 4.3)
       System.Memory (>= 4.5.4)
       System.Net.Requests (>= 4.3)
-      System.Net.Security (>= 4.3)
+      System.Net.Security (>= 4.3.1)
       System.Reflection.Emit (>= 4.3)
       System.Reflection.Metadata (>= 5.0)
       System.Reflection.TypeExtensions (>= 4.3)
       System.Runtime (>= 4.3)
+      System.Runtime.CompilerServices.Unsafe (>= 5.0)
       System.Runtime.InteropServices (>= 4.3)
       System.Runtime.Loader (>= 4.3)
       System.Security.Claims (>= 4.3)
@@ -45,12 +51,12 @@ NUGET
     FSharp.Control.Reactive (5.0.2)
       FSharp.Core (>= 4.7.2)
       System.Reactive (>= 5.0)
-    FSharp.Core (5.0.1)
+    FSharp.Core (6.0.1)
     MedallionShell (1.5.1)
       NETStandard.Library (>= 1.6)
       System.Diagnostics.Process (>= 4.1)
-    Microsoft.Build (16.10) - copy_local: false
-      Microsoft.Build.Framework (>= 16.10)
+    Microsoft.Build (16.11) - copy_local: false
+      Microsoft.Build.Framework (>= 16.11)
       Microsoft.NET.StringTools (>= 1.0)
       Microsoft.Win32.Registry (>= 4.3)
       System.Collections.Immutable (>= 5.0)
@@ -60,11 +66,11 @@ NUGET
       System.Text.Encoding.CodePages (>= 4.0.1)
       System.Text.Json (>= 4.7)
       System.Threading.Tasks.Dataflow (>= 4.9)
-    Microsoft.Build.Framework (16.10) - copy_local: false
+    Microsoft.Build.Framework (16.11) - copy_local: false
       System.Security.Permissions (>= 4.7)
-    Microsoft.Build.Tasks.Core (16.10) - copy_local: false
-      Microsoft.Build.Framework (>= 16.10)
-      Microsoft.Build.Utilities.Core (>= 16.10)
+    Microsoft.Build.Tasks.Core (16.11) - copy_local: false
+      Microsoft.Build.Framework (>= 16.11)
+      Microsoft.Build.Utilities.Core (>= 16.11)
       Microsoft.NET.StringTools (>= 1.0)
       Microsoft.Win32.Registry (>= 4.3)
       System.CodeDom (>= 4.4)
@@ -76,8 +82,8 @@ NUGET
       System.Security.Permissions (>= 4.7)
       System.Threading.Tasks.Dataflow (>= 4.9)
     Microsoft.Build.Tasks.Git (1.0) - copy_local: true
-    Microsoft.Build.Utilities.Core (16.10) - copy_local: false
-      Microsoft.Build.Framework (>= 16.10)
+    Microsoft.Build.Utilities.Core (16.11) - copy_local: false
+      Microsoft.Build.Framework (>= 16.11)
       Microsoft.NET.StringTools (>= 1.0)
       Microsoft.Win32.Registry (>= 4.3)
       System.Collections.Immutable (>= 5.0)
@@ -87,12 +93,21 @@ NUGET
     Microsoft.NET.StringTools (1.0) - copy_local: false
       System.Memory (>= 4.5.4)
       System.Runtime.CompilerServices.Unsafe (>= 5.0)
-    Microsoft.NETCore.Platforms (5.0.2) - copy_local: false
+    Microsoft.NETCore.Platforms (5.0.4) - copy_local: false
     Microsoft.NETCore.Targets (5.0)
+    Microsoft.SourceLink.AzureRepos.Git (1.0) - copy_local: true
+      Microsoft.Build.Tasks.Git (>= 1.0)
+      Microsoft.SourceLink.Common (>= 1.0)
+    Microsoft.SourceLink.Bitbucket.Git (1.0) - copy_local: true
+      Microsoft.Build.Tasks.Git (>= 1.0)
+      Microsoft.SourceLink.Common (>= 1.0)
     Microsoft.SourceLink.Common (1.0) - copy_local: true
     Microsoft.SourceLink.GitHub (1.0) - copy_local: true
       Microsoft.Build.Tasks.Git (>= 1.0)
       Microsoft.SourceLink.Common (>= 1.0)
+    Microsoft.SourceLink.GitLab (1.0) - copy_local: true
+      Microsoft.Build.Tasks.Git (>= 1.0)
+      Microsoft.SourceLink.Common (>= 1.0)
     Microsoft.Win32.Primitives (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
@@ -399,7 +414,7 @@ NUGET
     System.Runtime (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
-    System.Runtime.CompilerServices.Unsafe (5.0) - copy_local: false
+    System.Runtime.CompilerServices.Unsafe (5.0)
     System.Runtime.Extensions (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
@@ -566,7 +581,7 @@ NUGET
       System.Drawing.Common (>= 5.0)
 GITHUB
   remote: TheAngryByrd/FsLibLog
-    src/FsLibLog/FsLibLog.fs (d8e3e2b35aaa1bc32db41896834c0dd9d8d0e24d)
+    src/FsLibLog/FsLibLog.fs (e9272a8f7783f6863f5e7b2e1ccdd92004993c6a)
 GROUP Build
 STORAGE: NONE
 RESTRICTION: == netstandard2.0
@@ -691,13 +706,13 @@ NUGET
     FSharp.Control.Reactive (5.0.2)
       FSharp.Core (>= 4.7.2)
       System.Reactive (>= 5.0)
-    FSharp.Core (5.0.2)
-    Microsoft.Build (16.10)
-    Microsoft.Build.Framework (16.10)
+    FSharp.Core (6.0.1)
+    Microsoft.Build (16.11)
+    Microsoft.Build.Framework (16.11)
       System.Security.Permissions (>= 4.7)
-    Microsoft.Build.Tasks.Core (16.10)
-      Microsoft.Build.Framework (>= 16.10)
-      Microsoft.Build.Utilities.Core (>= 16.10)
+    Microsoft.Build.Tasks.Core (16.11)
+      Microsoft.Build.Framework (>= 16.11)
+      Microsoft.Build.Utilities.Core (>= 16.11)
       Microsoft.NET.StringTools (>= 1.0)
       Microsoft.Win32.Registry (>= 4.3)
       System.CodeDom (>= 4.4)
@@ -708,8 +723,8 @@ NUGET
       System.Security.Cryptography.Xml (>= 4.7)
       System.Security.Permissions (>= 4.7)
       System.Threading.Tasks.Dataflow (>= 4.9)
-    Microsoft.Build.Utilities.Core (16.10)
-      Microsoft.Build.Framework (>= 16.10)
+    Microsoft.Build.Utilities.Core (16.11)
+      Microsoft.Build.Framework (>= 16.11)
       Microsoft.NET.StringTools (>= 1.0)
       Microsoft.Win32.Registry (>= 4.3)
       System.Collections.Immutable (>= 5.0)
@@ -719,35 +734,35 @@ NUGET
     Microsoft.NET.StringTools (1.0)
       System.Memory (>= 4.5.4)
       System.Runtime.CompilerServices.Unsafe (>= 5.0)
-    Microsoft.NETCore.Platforms (5.0.2)
+    Microsoft.NETCore.Platforms (5.0.4)
     Microsoft.NETCore.Targets (5.0)
     Microsoft.Win32.Registry (5.0)
       System.Buffers (>= 4.5.1)
       System.Memory (>= 4.5.4)
       System.Security.AccessControl (>= 5.0)
       System.Security.Principal.Windows (>= 5.0)
     Mono.Posix.NETStandard (1.0)
-    MSBuild.StructuredLogger (2.1.507)
-      Microsoft.Build (>= 16.4)
-      Microsoft.Build.Framework (>= 16.4)
-      Microsoft.Build.Tasks.Core (>= 16.4)
-      Microsoft.Build.Utilities.Core (>= 16.4)
+    MSBuild.StructuredLogger (2.1.545)
+      Microsoft.Build (>= 16.10)
+      Microsoft.Build.Framework (>= 16.10)
+      Microsoft.Build.Tasks.Core (>= 16.10)
+      Microsoft.Build.Utilities.Core (>= 16.10)
     Newtonsoft.Json (13.0.1)
-    NuGet.Common (5.10)
-      NuGet.Frameworks (>= 5.10)
-    NuGet.Configuration (5.10)
-      NuGet.Common (>= 5.10)
+    NuGet.Common (5.11)
+      NuGet.Frameworks (>= 5.11)
+    NuGet.Configuration (5.11)
+      NuGet.Common (>= 5.11)
       System.Security.Cryptography.ProtectedData (>= 4.4)
-    NuGet.Frameworks (5.10)
-    NuGet.Packaging (5.10)
+    NuGet.Frameworks (5.11)
+    NuGet.Packaging (5.11)
       Newtonsoft.Json (>= 9.0.1)
-      NuGet.Configuration (>= 5.10)
-      NuGet.Versioning (>= 5.10)
+      NuGet.Configuration (>= 5.11)
+      NuGet.Versioning (>= 5.11)
       System.Security.Cryptography.Cng (>= 5.0)
       System.Security.Cryptography.Pkcs (>= 5.0)
-    NuGet.Protocol (5.10)
-      NuGet.Packaging (>= 5.10)
-    NuGet.Versioning (5.10)
+    NuGet.Protocol (5.11)
+      NuGet.Packaging (>= 5.11)
+    NuGet.Versioning (5.11)
     Octokit (0.50)
     System.Buffers (4.5.1)
     System.CodeDom (5.0)

diff --git a/src/Ionide.ProjInfo.FCS/Library.fs b/src/Ionide.ProjInfo.FCS/Library.fs
@@ -1,7 +1,7 @@
 namespace Ionide.ProjInfo
 
 open Ionide.ProjInfo.Types
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 
 module FCS =
     let rec mapToFSharpProjectOptions (projectOptions: ProjectOptions) (allKnownProjects: ProjectOptions seq) : FSharpProjectOptions =
@@ -15,15 +15,15 @@ module FCS =
               |> Array.choose
                   (fun d ->
                       if d.ProjectFileName.EndsWith ".fsproj" then
-                          let findProjOpt = allKnownProjects |> Seq.tryFind (fun n -> n.ProjectFileName = d.ProjectFileName)
-
-                          findProjOpt |> Option.map (fun p -> p.TargetPath, (mapToFSharpProjectOptions p allKnownProjects))
+                          allKnownProjects 
+                          |> Seq.tryFind (fun n -> n.ProjectFileName = d.ProjectFileName)
+                          |> Option.map (fun p -> FSharpReferencedProject.CreateFSharp(d.ProjectFileName, mapToFSharpProjectOptions p allKnownProjects))
                       else
+                          // TODO: map other project types to references here
                           None)
           IsIncompleteTypeCheckEnvironment = false
           UseScriptResolutionRules = false
           LoadTime = projectOptions.LoadTime
           UnresolvedReferences = None // it's always None
           OriginalLoadReferences = [] // it's always empty list
-          Stamp = None
-          ExtraProjectInfo = None }
+          Stamp = None }
diff --git a/src/Ionide.ProjInfo.FCS/paket.references b/src/Ionide.ProjInfo.FCS/paket.references
@@ -1,3 +1,3 @@
 FSharp.Core
 FSharp.Compiler.Service
-Microsoft.SourceLink.GitHub
+Dotnet.ReproducibleBuilds
diff --git a/src/Ionide.ProjInfo.ProjectSystem/Project.fs b/src/Ionide.ProjInfo.ProjectSystem/Project.fs
@@ -2,7 +2,7 @@
 
 open System
 open System.IO
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open Newtonsoft.Json
 open Ionide.ProjInfo
 

diff --git a/src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs b/src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs
@@ -3,7 +3,7 @@ namespace Ionide.ProjInfo.ProjectSystem
 open System
 open System.IO
 open System.Collections.Concurrent
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open Ionide.ProjInfo.Types
 open Ionide.ProjInfo
 open Workspace

diff --git a/src/Ionide.ProjInfo.ProjectSystem/Workspace.fs b/src/Ionide.ProjInfo.ProjectSystem/Workspace.fs
@@ -9,7 +9,7 @@ type internal GetProjectOptionsErrors = Types.GetProjectOptionsErrors
 [<RequireQualifiedAccess>]
 type internal ProjectSystemState =
     | Loading of string
-    | Loaded of FSharp.Compiler.SourceCodeServices.FSharpProjectOptions * Types.ProjectOptions * ProjectViewerItem list * fromDpiCache: bool
+    | Loaded of FSharp.Compiler.CodeAnalysis.FSharpProjectOptions * Types.ProjectOptions * ProjectViewerItem list * fromDpiCache: bool
     | LoadedOther of Types.ProjectOptions * ProjectViewerItem list * fromDpiCache: bool
     | Failed of string * GetProjectOptionsErrors
 

diff --git a/src/Ionide.ProjInfo.ProjectSystem/paket.references b/src/Ionide.ProjInfo.ProjectSystem/paket.references
@@ -1,5 +1,5 @@
 FSharp.Core
 FSharp.Compiler.Service
 Newtonsoft.Json
-Microsoft.SourceLink.GitHub
+Dotnet.ReproducibleBuilds
 Fsharp.Control.Reactive
diff --git a/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj b/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj
@@ -7,7 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.Github" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="DotNet.ReproducibleBuilds" Version="0.1.66">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Ionide.ProjInfo.Tool/paket.references b/src/Ionide.ProjInfo.Tool/paket.references
@@ -1,4 +1,5 @@
 FSharp.Core
 Argu
 Microsoft.Build copy_local: true
-Microsoft.Build.Framework copy_local: true
+Microsoft.Build.Framework copy_local: true
+Dotnet.ReproducibleBuilds
diff --git a/src/Ionide.ProjInfo/paket.references b/src/Ionide.ProjInfo/paket.references
@@ -1,6 +1,6 @@
 Microsoft.Build copy_local: false
 Microsoft.Build.Framework copy_local: false
 FSharp.Core
-Microsoft.SourceLink.GitHub
+Dotnet.ReproducibleBuilds
 SemanticVersioning
 File: FsLibLog.fs