Skip to content

Commit

Permalink
Paket,Console,Tests: upgrade Ionide.ProjInfo to 0.58.0
Browse files Browse the repository at this point in the history 
Upgrade Ionide.ProjInfo package version to 0.58.0.

Fixes fsprojects#336.
  • Loading branch information
@webwarrior-ws
webwarrior-ws committed Dec 28, 2023
1 parent 58dd6b6 commit 75d7e17
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 29 deletions.
8 changes: 4 additions & 4 deletions paket.dependencies
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ nuget BenchmarkDotNet
nuget BenchmarkDotNet.Diagnostics.Windows
nuget FParsec
nuget FSharp.Compiler.Service ~> 41.0.1
nuget Ionide.ProjInfo.ProjectSystem == 0.53.0
nuget Ionide.ProjInfo.FCS == 0.53.0
nuget Ionide.ProjInfo == 0.53.0
nuget Ionide.ProjInfo.Sln == 0.53.0
nuget Ionide.ProjInfo.ProjectSystem == 0.58.0
nuget Ionide.ProjInfo.FCS == 0.58.0
nuget Ionide.ProjInfo == 0.58.0
nuget Ionide.ProjInfo.Sln == 0.58.0
nuget FSharp.Core ~> 6.0
nuget nunit ~> 3.0
nuget System.Reactive ~> 5
Expand Down
44 changes: 21 additions & 23 deletions paket.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,34 +55,31 @@ NUGET
System.Threading.Tasks.Parallel (>= 4.3)
System.Threading.Thread (>= 4.3)
System.Threading.ThreadPool (>= 4.3)
FSharp.Control.Reactive (5.0.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
FSharp.Control.Reactive (5.0.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
FSharp.Core (>= 4.7.2)
System.Reactive (>= 5.0 < 6.0)
FSharp.Core (6.0.7)
Gee.External.Capstone (2.3)
Iced (1.20)
Ionide.ProjInfo (0.53)
FSharp.Core (>= 5.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Ionide.ProjInfo.Sln (>= 0.53) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Microsoft.Build (>= 16.10) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Microsoft.Build.Framework (>= 16.10) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Microsoft.Build.Locator (>= 1.4.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Microsoft.SourceLink.GitHub (>= 1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Ionide.ProjInfo.FCS (0.53)
FSharp.Compiler.Service (>= 40.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
FSharp.Core (>= 5.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Ionide.ProjInfo (>= 0.53) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Microsoft.SourceLink.GitHub (>= 1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Ionide.ProjInfo.ProjectSystem (0.53)
FSharp.Compiler.Service (>= 40.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
FSharp.Control.Reactive (>= 5.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
FSharp.Core (>= 5.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Ionide.ProjInfo (>= 0.53) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Ionide.ProjInfo.FCS (>= 0.53) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Ionide.ProjInfo.Sln (>= 0.53) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Microsoft.SourceLink.GitHub (>= 1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0))
Ionide.ProjInfo.Sln (0.53)
Ionide.ProjInfo (0.58)
FSharp.Core (>= 6.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Ionide.ProjInfo.Sln (>= 0.58) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Microsoft.Build (>= 17.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Microsoft.Build.Framework (>= 17.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
SemanticVersioning (>= 2.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Ionide.ProjInfo.FCS (0.58)
FSharp.Compiler.Service (>= 41.0.3 < 42.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
FSharp.Core (>= 6.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Ionide.ProjInfo (>= 0.58) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Ionide.ProjInfo.ProjectSystem (0.58)
FSharp.Compiler.Service (>= 41.0.3 < 42.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
FSharp.Control.Reactive (>= 5.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
FSharp.Core (>= 6.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Ionide.ProjInfo (>= 0.58) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Ionide.ProjInfo.FCS (>= 0.58) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Ionide.ProjInfo.Sln (>= 0.58) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
Ionide.ProjInfo.Sln (0.58)
Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
Microsoft.Build (16.11) - copy_local: false
Expand Down Expand Up @@ -252,6 +249,7 @@ NUGET
runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
SemanticVersioning (2.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
System.Buffers (4.5.1)
System.CodeDom (8.0) - copy_local: false
System.Collections (4.3)
Expand Down
3 changes: 2 additions & 1 deletion src/FSharpLint.Console/Program.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

open Argu
open System
open System.IO
open FSharpLint.Framework
open FSharpLint.Application
open System.Reflection
Expand Down Expand Up @@ -141,7 +142,7 @@ let private start (arguments:ParseResults<ToolArgs>) (toolsPath:Ionide.ProjInfo.

/// Must be called only once per process.
/// We're calling it globally so we can call main multiple times from our tests.
let toolsPath = Ionide.ProjInfo.Init.init()
let toolsPath = Ionide.ProjInfo.Init.init (DirectoryInfo <| Directory.GetCurrentDirectory()) None

[<EntryPoint>]
let main argv =
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharpLint.FunctionalTest/TestApi.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module TestApi =
parseResults.ParseTree

/// Must be called once per process.
let toolsPath = Ionide.ProjInfo.Init.init()
let toolsPath = Ionide.ProjInfo.Init.init (DirectoryInfo <| Directory.GetCurrentDirectory()) None

[<Category("Performance")>]
[<Test>]
Expand Down

0 comments on commit 75d7e17

Please sign in to comment.