Skip to content

Commit e5acb8d

Browse files
nojafnojaf
authored
Merge pull request #4 from dawedawe/pr/nojaf/1122
Update to Ionide.ProjInfo nightly and latest FCS beta
2 parents 019e04b + 18474ba commit e5acb8d

2 files changed

Lines changed: 33 additions & 32 deletions

File tree

‎paket.dependencies‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ lowest_matching: true
1212

1313
nuget Fantomas.Client >= 0.9
1414
nuget FSharp.Compiler.Service ~> 43.7.400 prerelease
15-
nuget Ionide.ProjInfo >= 0.61.3
16-
nuget Ionide.ProjInfo.FCS >= 0.61.3
17-
nuget Ionide.ProjInfo.ProjectSystem >= 0.61.3
18-
nuget Ionide.ProjInfo.Sln >= 0.61.3
15+
nuget Ionide.ProjInfo >= 0.62.0-nightly001
16+
nuget Ionide.ProjInfo.FCS >= 0.62.0-nightly001
17+
nuget Ionide.ProjInfo.ProjectSystem >= 0.62.0-nightly001
18+
nuget Ionide.ProjInfo.Sln >= 0.62.0-nightly001
1919
nuget Microsoft.Build >= 17.2 copy_local:false
2020
nuget Microsoft.Build.Framework >= 17.4 copy_local:false
2121
nuget Microsoft.Build.Utilities.Core >= 17.4 copy_local:false

‎paket.lock‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -98,25 +98,25 @@ NUGET
9898
FSharp.Core (>= 6.0)
9999
Newtonsoft.Json (>= 13.0.1)
100100
StreamJsonRpc (>= 2.10.44)
101-
Ionide.ProjInfo (0.61.3)
102-
FSharp.Core (>= 6.0.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
103-
Ionide.ProjInfo.Sln (>= 0.61.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
101+
Ionide.ProjInfo (0.62.0-nightly001)
102+
FSharp.Core (>= 7.0.400-beta.23322.4 < 7.1.0-prerelease) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
103+
Ionide.ProjInfo.Sln (>= 0.62.0-nightly001) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
104104
Microsoft.Build (>= 17.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
105-
Microsoft.Build.Framework (>= 17.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
105+
Microsoft.Build.Framework (>= 17.6.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
106106
SemanticVersioning (>= 2.0.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
107-
Ionide.ProjInfo.FCS (0.61.3)
108-
FSharp.Compiler.Service (>= 41.0.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
109-
FSharp.Core (>= 6.0.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
110-
Ionide.ProjInfo (>= 0.61.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
111-
Ionide.ProjInfo.ProjectSystem (0.61.3)
112-
FSharp.Compiler.Service (>= 41.0.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
107+
Ionide.ProjInfo.FCS (0.62.0-nightly001)
108+
FSharp.Compiler.Service (>= 43.7.400-preview.23322.4 < 43.8.0-prerelease) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
109+
FSharp.Core (>= 7.0.400-beta.23322.4 < 7.1.0-prerelease) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
110+
Ionide.ProjInfo (>= 0.62.0-nightly001) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
111+
Ionide.ProjInfo.ProjectSystem (0.62.0-nightly001)
112+
FSharp.Compiler.Service (>= 43.7.400-preview.23322.4 < 43.8.0-prerelease) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
113113
FSharp.Control.Reactive (>= 5.0.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
114-
FSharp.Core (>= 6.0.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
115-
Ionide.ProjInfo (>= 0.61.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
116-
Ionide.ProjInfo.FCS (>= 0.61.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
117-
Ionide.ProjInfo.Sln (>= 0.61.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
114+
FSharp.Core (>= 7.0.400-beta.23322.4 < 7.1.0-prerelease) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
115+
Ionide.ProjInfo (>= 0.62.0-nightly001) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
116+
Ionide.ProjInfo.FCS (>= 0.62.0-nightly001) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
117+
Ionide.ProjInfo.Sln (>= 0.62.0-nightly001) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
118118
Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
119-
Ionide.ProjInfo.Sln (0.61.3)
119+
Ionide.ProjInfo.Sln (0.62.0-nightly001)
120120
McMaster.NETCore.Plugins (1.4) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.1) (>= net5.0))
121121
Microsoft.DotNet.PlatformAbstractions (>= 3.1.6) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp2.1)) (&& (== netstandard2.1) (>= netcoreapp2.1))
122122
Microsoft.Extensions.DependencyModel (>= 5.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp2.1)) (&& (== netstandard2.1) (>= netcoreapp2.1))
@@ -142,9 +142,10 @@ NUGET
142142
System.Text.Encoding.CodePages (>= 4.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
143143
System.Text.Json (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0))
144144
System.Threading.Tasks.Dataflow (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0))
145-
Microsoft.Build.Framework (17.4) - copy_local: false
145+
Microsoft.Build.Framework (17.6.3) - copy_local: false
146146
Microsoft.Win32.Registry (>= 5.0) - restriction: || (== net6.0) (== netstandard2.0) (== netstandard2.1)
147-
System.Security.Permissions (>= 6.0)
147+
System.Security.Permissions (>= 7.0)
148+
System.Security.Principal.Windows (>= 5.0) - restriction: || (== net6.0) (== netstandard2.0) (== netstandard2.1)
148149
Microsoft.Build.Locator (1.5.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.1) (>= net5.0))
149150
Microsoft.Build.Tasks.Core (17.4) - copy_local: false
150151
Microsoft.Build.Framework (>= 17.4)
@@ -270,7 +271,7 @@ NUGET
270271
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.0) (== netstandard2.1)
271272
System.Security.AccessControl (>= 5.0)
272273
System.Security.Principal.Windows (>= 5.0)
273-
Microsoft.Win32.SystemEvents (6.0.1) - copy_local: false, restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
274+
Microsoft.Win32.SystemEvents (7.0) - copy_local: false, restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
274275
Mono.Cecil (0.11.4)
275276
Nerdbank.Streams (2.8.61)
276277
Microsoft.Bcl.AsyncInterfaces (>= 5.0)
@@ -326,8 +327,8 @@ NUGET
326327
System.Diagnostics.DiagnosticSource (7.0.2)
327328
System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0) (== netstandard2.1)
328329
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0) (== netstandard2.1)
329-
System.Drawing.Common (6.0) - copy_local: false, restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
330-
Microsoft.Win32.SystemEvents (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
330+
System.Drawing.Common (7.0) - copy_local: false, restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
331+
Microsoft.Win32.SystemEvents (>= 7.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
331332
System.Formats.Asn1 (6.0) - copy_local: false
332333
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< net6.0)) (== netstandard2.0) (== netstandard2.1)
333334
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< net6.0)) (== netstandard2.0) (== netstandard2.1)
@@ -366,9 +367,9 @@ NUGET
366367
System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (< net6.0)) (== netstandard2.0) (== netstandard2.1)
367368
System.Security.AccessControl (>= 6.0)
368369
System.Security.Cryptography.Pkcs (>= 6.0.1)
369-
System.Security.Permissions (6.0) - copy_local: false
370-
System.Security.AccessControl (>= 6.0)
371-
System.Windows.Extensions (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
370+
System.Security.Permissions (7.0) - copy_local: false
371+
System.Security.AccessControl (>= 6.0) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0) (== netstandard2.1)
372+
System.Windows.Extensions (>= 7.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
372373
System.Security.Principal.Windows (5.0) - copy_local: false
373374
System.Text.Encoding.CodePages (6.0) - copy_local: false
374375
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
@@ -381,23 +382,23 @@ NUGET
381382
System.Threading.Tasks.Dataflow (6.0) - copy_local: false
382383
System.Threading.Tasks.Extensions (4.5.4)
383384
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netstandard1.0)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= wp8)) (== netstandard2.0) (== netstandard2.1)
384-
System.Windows.Extensions (6.0) - copy_local: false, restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
385-
System.Drawing.Common (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
385+
System.Windows.Extensions (7.0) - copy_local: false, restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
386+
System.Drawing.Common (>= 7.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.1) (>= net6.0))
386387
YoloDev.Expecto.TestSdk (0.13.3)
387388
Expecto (>= 9.0 < 10.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
388389
FSharp.Core (>= 4.6.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
389390
System.Collections.Immutable (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1))
390391
remote: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json
391-
FSharp.Compiler.Service (43.7.400-preview.23319.6)
392-
FSharp.Core (7.0.400-beta.23319.6)
392+
FSharp.Compiler.Service (43.7.400-preview.23322.4)
393+
FSharp.Core (7.0.400-beta.23322.4)
393394
System.Buffers (>= 4.5.1)
394395
System.Collections.Immutable (>= 7.0)
395396
System.Diagnostics.DiagnosticSource (>= 7.0.2)
396397
System.Memory (>= 4.5.5)
397398
System.Reflection.Emit (>= 4.7)
398399
System.Reflection.Metadata (>= 7.0)
399400
System.Runtime.CompilerServices.Unsafe (>= 6.0)
400-
FSharp.Core (7.0.400-beta.23319.6)
401+
FSharp.Core (7.0.400-beta.23322.4)
401402

402403
GROUP Build
403404
STORAGE: NONE

0 commit comments

Comments
 (0)