Skip to content

Commit a972839

Browse files
baronfelbaronfel
authored
FCS updat-a-palooza (#121)
* bump to fcs41 and do more build stuff * changelog
1 parent 6a6bdf3 commit a972839

File tree

14 files changed

+117
-84
lines changed

14 files changed

+117
-84
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
"commands": [
2020
"octonav"
2121
]
22+
},
23+
"fantomas-tool": {
24+
"version": "4.6.0-alpha-006",
25+
"commands": [
26+
"fantomas"
27+
]
2228
}
2329
}
2430
}

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
# Changelog
88

9+
## [0.55.0] - 2021-11-05
10+
11+
### Changed
12+
13+
- Updated to FCS 41
14+
915
## [0.54.2] - 2021-11-01
1016

1117
### Fixed

‎paket.dependencies‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ storage: none
66
framework: net5.0
77

88
nuget FSharp.Core
9-
nuget FSharp.Compiler.Service ~> 39.0
9+
nuget FSharp.Compiler.Service ~> 41.0
1010
nuget Argu
1111

12-
# copy_local: true doesn't expose sourcelink as a package dependency
13-
nuget Microsoft.SourceLink.GitHub copy_local: true
12+
# copy_local: true because this is a build-time dependency only
13+
nuget Dotnet.ReproducibleBuilds copy_local: true
1414

1515
nuget Expecto
1616
nuget Expecto.Diff

‎paket.lock‎

Lines changed: 63 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,26 @@ NUGET
66
FSharp.Core (>= 4.3.2)
77
System.Configuration.ConfigurationManager (>= 4.4)
88
DiffPlex (1.7)
9-
Expecto (9.0.2)
9+
DotNet.ReproducibleBuilds (0.1.66) - copy_local: true
10+
Microsoft.SourceLink.AzureRepos.Git (>= 1.0)
11+
Microsoft.SourceLink.Bitbucket.Git (>= 1.0)
12+
Microsoft.SourceLink.GitHub (>= 1.0)
13+
Microsoft.SourceLink.GitLab (>= 1.0)
14+
Expecto (9.0.4)
1015
FSharp.Core (>= 4.6)
11-
Mono.Cecil (>= 0.11.2)
12-
Expecto.Diff (9.0.2)
13-
DiffPlex (>= 1.6.1)
14-
Expecto (>= 9.0.2)
16+
Mono.Cecil (>= 0.11.3)
17+
Expecto.Diff (9.0.4)
18+
DiffPlex (>= 1.6.3)
19+
Expecto (>= 9.0.4)
1520
FSharp.Core (>= 4.6)
1621
Expecto.TestResults (8.13.2)
1722
Expecto (>= 8.13.2)
1823
FSharp.Core (>= 4.6)
19-
FSharp.Compiler.Service (39.0)
20-
FSharp.Core (5.0.1)
21-
Microsoft.Build.Framework (>= 16.6)
22-
Microsoft.Build.Tasks.Core (>= 16.6)
23-
Microsoft.Build.Utilities.Core (>= 16.6)
24+
FSharp.Compiler.Service (41.0.1)
25+
FSharp.Core (6.0.1)
26+
Microsoft.Build.Framework (>= 16.11)
27+
Microsoft.Build.Tasks.Core (>= 16.11)
28+
Microsoft.Build.Utilities.Core (>= 16.11)
2429
System.Buffers (>= 4.5.1)
2530
System.Collections.Immutable (>= 5.0)
2631
System.Diagnostics.Process (>= 4.3)
@@ -29,11 +34,12 @@ NUGET
2934
System.Linq.Queryable (>= 4.3)
3035
System.Memory (>= 4.5.4)
3136
System.Net.Requests (>= 4.3)
32-
System.Net.Security (>= 4.3)
37+
System.Net.Security (>= 4.3.1)
3338
System.Reflection.Emit (>= 4.3)
3439
System.Reflection.Metadata (>= 5.0)
3540
System.Reflection.TypeExtensions (>= 4.3)
3641
System.Runtime (>= 4.3)
42+
System.Runtime.CompilerServices.Unsafe (>= 5.0)
3743
System.Runtime.InteropServices (>= 4.3)
3844
System.Runtime.Loader (>= 4.3)
3945
System.Security.Claims (>= 4.3)
@@ -45,12 +51,12 @@ NUGET
4551
FSharp.Control.Reactive (5.0.2)
4652
FSharp.Core (>= 4.7.2)
4753
System.Reactive (>= 5.0)
48-
FSharp.Core (5.0.1)
54+
FSharp.Core (6.0.1)
4955
MedallionShell (1.5.1)
5056
NETStandard.Library (>= 1.6)
5157
System.Diagnostics.Process (>= 4.1)
52-
Microsoft.Build (16.10) - copy_local: false
53-
Microsoft.Build.Framework (>= 16.10)
58+
Microsoft.Build (16.11) - copy_local: false
59+
Microsoft.Build.Framework (>= 16.11)
5460
Microsoft.NET.StringTools (>= 1.0)
5561
Microsoft.Win32.Registry (>= 4.3)
5662
System.Collections.Immutable (>= 5.0)
@@ -60,11 +66,11 @@ NUGET
6066
System.Text.Encoding.CodePages (>= 4.0.1)
6167
System.Text.Json (>= 4.7)
6268
System.Threading.Tasks.Dataflow (>= 4.9)
63-
Microsoft.Build.Framework (16.10) - copy_local: false
69+
Microsoft.Build.Framework (16.11) - copy_local: false
6470
System.Security.Permissions (>= 4.7)
65-
Microsoft.Build.Tasks.Core (16.10) - copy_local: false
66-
Microsoft.Build.Framework (>= 16.10)
67-
Microsoft.Build.Utilities.Core (>= 16.10)
71+
Microsoft.Build.Tasks.Core (16.11) - copy_local: false
72+
Microsoft.Build.Framework (>= 16.11)
73+
Microsoft.Build.Utilities.Core (>= 16.11)
6874
Microsoft.NET.StringTools (>= 1.0)
6975
Microsoft.Win32.Registry (>= 4.3)
7076
System.CodeDom (>= 4.4)
@@ -76,8 +82,8 @@ NUGET
7682
System.Security.Permissions (>= 4.7)
7783
System.Threading.Tasks.Dataflow (>= 4.9)
7884
Microsoft.Build.Tasks.Git (1.0) - copy_local: true
79-
Microsoft.Build.Utilities.Core (16.10) - copy_local: false
80-
Microsoft.Build.Framework (>= 16.10)
85+
Microsoft.Build.Utilities.Core (16.11) - copy_local: false
86+
Microsoft.Build.Framework (>= 16.11)
8187
Microsoft.NET.StringTools (>= 1.0)
8288
Microsoft.Win32.Registry (>= 4.3)
8389
System.Collections.Immutable (>= 5.0)
@@ -87,12 +93,21 @@ NUGET
8793
Microsoft.NET.StringTools (1.0) - copy_local: false
8894
System.Memory (>= 4.5.4)
8995
System.Runtime.CompilerServices.Unsafe (>= 5.0)
90-
Microsoft.NETCore.Platforms (5.0.2) - copy_local: false
96+
Microsoft.NETCore.Platforms (5.0.4) - copy_local: false
9197
Microsoft.NETCore.Targets (5.0)
98+
Microsoft.SourceLink.AzureRepos.Git (1.0) - copy_local: true
99+
Microsoft.Build.Tasks.Git (>= 1.0)
100+
Microsoft.SourceLink.Common (>= 1.0)
101+
Microsoft.SourceLink.Bitbucket.Git (1.0) - copy_local: true
102+
Microsoft.Build.Tasks.Git (>= 1.0)
103+
Microsoft.SourceLink.Common (>= 1.0)
92104
Microsoft.SourceLink.Common (1.0) - copy_local: true
93105
Microsoft.SourceLink.GitHub (1.0) - copy_local: true
94106
Microsoft.Build.Tasks.Git (>= 1.0)
95107
Microsoft.SourceLink.Common (>= 1.0)
108+
Microsoft.SourceLink.GitLab (1.0) - copy_local: true
109+
Microsoft.Build.Tasks.Git (>= 1.0)
110+
Microsoft.SourceLink.Common (>= 1.0)
96111
Microsoft.Win32.Primitives (4.3)
97112
Microsoft.NETCore.Platforms (>= 1.1)
98113
Microsoft.NETCore.Targets (>= 1.1)
@@ -399,7 +414,7 @@ NUGET
399414
System.Runtime (4.3.1)
400415
Microsoft.NETCore.Platforms (>= 1.1.1)
401416
Microsoft.NETCore.Targets (>= 1.1.3)
402-
System.Runtime.CompilerServices.Unsafe (5.0) - copy_local: false
417+
System.Runtime.CompilerServices.Unsafe (5.0)
403418
System.Runtime.Extensions (4.3.1)
404419
Microsoft.NETCore.Platforms (>= 1.1.1)
405420
Microsoft.NETCore.Targets (>= 1.1.3)
@@ -566,7 +581,7 @@ NUGET
566581
System.Drawing.Common (>= 5.0)
567582
GITHUB
568583
remote: TheAngryByrd/FsLibLog
569-
src/FsLibLog/FsLibLog.fs (d8e3e2b35aaa1bc32db41896834c0dd9d8d0e24d)
584+
src/FsLibLog/FsLibLog.fs (e9272a8f7783f6863f5e7b2e1ccdd92004993c6a)
570585
GROUP Build
571586
STORAGE: NONE
572587
RESTRICTION: == netstandard2.0
@@ -691,13 +706,13 @@ NUGET
691706
FSharp.Control.Reactive (5.0.2)
692707
FSharp.Core (>= 4.7.2)
693708
System.Reactive (>= 5.0)
694-
FSharp.Core (5.0.2)
695-
Microsoft.Build (16.10)
696-
Microsoft.Build.Framework (16.10)
709+
FSharp.Core (6.0.1)
710+
Microsoft.Build (16.11)
711+
Microsoft.Build.Framework (16.11)
697712
System.Security.Permissions (>= 4.7)
698-
Microsoft.Build.Tasks.Core (16.10)
699-
Microsoft.Build.Framework (>= 16.10)
700-
Microsoft.Build.Utilities.Core (>= 16.10)
713+
Microsoft.Build.Tasks.Core (16.11)
714+
Microsoft.Build.Framework (>= 16.11)
715+
Microsoft.Build.Utilities.Core (>= 16.11)
701716
Microsoft.NET.StringTools (>= 1.0)
702717
Microsoft.Win32.Registry (>= 4.3)
703718
System.CodeDom (>= 4.4)
@@ -708,8 +723,8 @@ NUGET
708723
System.Security.Cryptography.Xml (>= 4.7)
709724
System.Security.Permissions (>= 4.7)
710725
System.Threading.Tasks.Dataflow (>= 4.9)
711-
Microsoft.Build.Utilities.Core (16.10)
712-
Microsoft.Build.Framework (>= 16.10)
726+
Microsoft.Build.Utilities.Core (16.11)
727+
Microsoft.Build.Framework (>= 16.11)
713728
Microsoft.NET.StringTools (>= 1.0)
714729
Microsoft.Win32.Registry (>= 4.3)
715730
System.Collections.Immutable (>= 5.0)
@@ -719,35 +734,35 @@ NUGET
719734
Microsoft.NET.StringTools (1.0)
720735
System.Memory (>= 4.5.4)
721736
System.Runtime.CompilerServices.Unsafe (>= 5.0)
722-
Microsoft.NETCore.Platforms (5.0.2)
737+
Microsoft.NETCore.Platforms (5.0.4)
723738
Microsoft.NETCore.Targets (5.0)
724739
Microsoft.Win32.Registry (5.0)
725740
System.Buffers (>= 4.5.1)
726741
System.Memory (>= 4.5.4)
727742
System.Security.AccessControl (>= 5.0)
728743
System.Security.Principal.Windows (>= 5.0)
729744
Mono.Posix.NETStandard (1.0)
730-
MSBuild.StructuredLogger (2.1.507)
731-
Microsoft.Build (>= 16.4)
732-
Microsoft.Build.Framework (>= 16.4)
733-
Microsoft.Build.Tasks.Core (>= 16.4)
734-
Microsoft.Build.Utilities.Core (>= 16.4)
745+
MSBuild.StructuredLogger (2.1.545)
746+
Microsoft.Build (>= 16.10)
747+
Microsoft.Build.Framework (>= 16.10)
748+
Microsoft.Build.Tasks.Core (>= 16.10)
749+
Microsoft.Build.Utilities.Core (>= 16.10)
735750
Newtonsoft.Json (13.0.1)
736-
NuGet.Common (5.10)
737-
NuGet.Frameworks (>= 5.10)
738-
NuGet.Configuration (5.10)
739-
NuGet.Common (>= 5.10)
751+
NuGet.Common (5.11)
752+
NuGet.Frameworks (>= 5.11)
753+
NuGet.Configuration (5.11)
754+
NuGet.Common (>= 5.11)
740755
System.Security.Cryptography.ProtectedData (>= 4.4)
741-
NuGet.Frameworks (5.10)
742-
NuGet.Packaging (5.10)
756+
NuGet.Frameworks (5.11)
757+
NuGet.Packaging (5.11)
743758
Newtonsoft.Json (>= 9.0.1)
744-
NuGet.Configuration (>= 5.10)
745-
NuGet.Versioning (>= 5.10)
759+
NuGet.Configuration (>= 5.11)
760+
NuGet.Versioning (>= 5.11)
746761
System.Security.Cryptography.Cng (>= 5.0)
747762
System.Security.Cryptography.Pkcs (>= 5.0)
748-
NuGet.Protocol (5.10)
749-
NuGet.Packaging (>= 5.10)
750-
NuGet.Versioning (5.10)
763+
NuGet.Protocol (5.11)
764+
NuGet.Packaging (>= 5.11)
765+
NuGet.Versioning (5.11)
751766
Octokit (0.50)
752767
System.Buffers (4.5.1)
753768
System.CodeDom (5.0)

‎src/Ionide.ProjInfo.FCS/Library.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace Ionide.ProjInfo
22

33
open Ionide.ProjInfo.Types
4-
open FSharp.Compiler.SourceCodeServices
4+
open FSharp.Compiler.CodeAnalysis
55

66
module FCS =
77
let rec mapToFSharpProjectOptions (projectOptions: ProjectOptions) (allKnownProjects: ProjectOptions seq) : FSharpProjectOptions =
@@ -15,15 +15,15 @@ module FCS =
1515
|> Array.choose
1616
(fun d ->
1717
if d.ProjectFileName.EndsWith ".fsproj" then
18-
let findProjOpt = allKnownProjects |> Seq.tryFind (fun n -> n.ProjectFileName = d.ProjectFileName)
19-
20-
findProjOpt |> Option.map (fun p -> p.TargetPath, (mapToFSharpProjectOptions p allKnownProjects))
18+
allKnownProjects
19+
|> Seq.tryFind (fun n -> n.ProjectFileName = d.ProjectFileName)
20+
|> Option.map (fun p -> FSharpReferencedProject.CreateFSharp(d.ProjectFileName, mapToFSharpProjectOptions p allKnownProjects))
2121
else
22+
// TODO: map other project types to references here
2223
None)
2324
IsIncompleteTypeCheckEnvironment = false
2425
UseScriptResolutionRules = false
2526
LoadTime = projectOptions.LoadTime
2627
UnresolvedReferences = None // it's always None
2728
OriginalLoadReferences = [] // it's always empty list
28-
Stamp = None
29-
ExtraProjectInfo = None }
29+
Stamp = None }

‎src/Ionide.ProjInfo.FCS/paket.references‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
FSharp.Core
22
FSharp.Compiler.Service
3-
Microsoft.SourceLink.GitHub
3+
Dotnet.ReproducibleBuilds

‎src/Ionide.ProjInfo.ProjectSystem/Project.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
open System
44
open System.IO
5-
open FSharp.Compiler.SourceCodeServices
5+
open FSharp.Compiler.CodeAnalysis
66
open Newtonsoft.Json
77
open Ionide.ProjInfo
88

‎src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace Ionide.ProjInfo.ProjectSystem
33
open System
44
open System.IO
55
open System.Collections.Concurrent
6-
open FSharp.Compiler.SourceCodeServices
6+
open FSharp.Compiler.CodeAnalysis
77
open Ionide.ProjInfo.Types
88
open Ionide.ProjInfo
99
open Workspace

‎src/Ionide.ProjInfo.ProjectSystem/Workspace.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type internal GetProjectOptionsErrors = Types.GetProjectOptionsErrors
99
[<RequireQualifiedAccess>]
1010
type internal ProjectSystemState =
1111
| Loading of string
12-
| Loaded of FSharp.Compiler.SourceCodeServices.FSharpProjectOptions * Types.ProjectOptions * ProjectViewerItem list * fromDpiCache: bool
12+
| Loaded of FSharp.Compiler.CodeAnalysis.FSharpProjectOptions * Types.ProjectOptions * ProjectViewerItem list * fromDpiCache: bool
1313
| LoadedOther of Types.ProjectOptions * ProjectViewerItem list * fromDpiCache: bool
1414
| Failed of string * GetProjectOptionsErrors
1515

‎src/Ionide.ProjInfo.ProjectSystem/paket.references‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FSharp.Core
22
FSharp.Compiler.Service
33
Newtonsoft.Json
4-
Microsoft.SourceLink.GitHub
4+
Dotnet.ReproducibleBuilds
55
Fsharp.Control.Reactive

0 commit comments

Comments
 (0)