Upgrade Ionide.ProjInfo to 0.74.1

Author: Smaug123

Directory.Packages.props

@@ -13,8 +13,7 @@
     <PackageVersion Include="Microsoft.Build.Framework" Version="" PrivateAssets="all" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="" PrivateAssets="all" />
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="" PrivateAssets="all" />
-    <PackageVersion Include="Ionide.ProjInfo" Version="0.62.0" />
-    <PackageVersion Include="Ionide.ProjInfo.Sln" Version="0.62.0" />
+    <PackageVersion Include="Ionide.ProjInfo" Version="0.74.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Suave" Version="2.6.2" />
     <PackageVersion Include="System.Memory" Version="4.5.5" />

src/fsdocs-tool/ProjectCracker.fs

@@ -12,6 +12,7 @@ open FSharp.Formatting.Templating
 
 open Ionide.ProjInfo
 open Ionide.ProjInfo.Types
+open Microsoft.Build.Evaluation
 
 [<AutoOpen>]
 module Utils =
@@ -295,8 +296,16 @@ module Crack =
             let cwd = System.Environment.CurrentDirectory |> System.IO.DirectoryInfo
             let dotnetExe = getDotnetHostPath () |> Option.map System.IO.FileInfo
             let _toolsPath = Init.init cwd dotnetExe
-            ProjectLoader.getProjectInfo projectFile extraMsbuildProperties BinaryLogGeneration.Off customProperties
-        //file |> Inspect.getProjectInfos loggedMessages.Enqueue msbuildExec [gp] []
+
+            let projectCollection = new ProjectCollection(dict extraMsbuildProperties)
+
+            match ProjectLoader.loadProject projectFile BinaryLogGeneration.Off projectCollection with
+            | Ok loadedProject ->
+                match ProjectLoader.getLoadedProjectInfo projectFile customProperties loadedProject with
+                | Ok(ProjectLoader.LoadedProjectInfo.StandardProjectInfo projOptions) -> Ok projOptions
+                | Ok _ -> Error $"project '%s{projectFile}' is not a standard project"
+                | Error e -> Error e
+            | Error e -> Error e
 
         let msgs = (loggedMessages.ToArray() |> Array.toList)
 
@@ -428,7 +437,7 @@ module Crack =
 
     let getProjectsFromSlnFile (slnPath: string) =
         match InspectSln.tryParseSln slnPath with
-        | Ok(_, slnData) -> InspectSln.loadingBuildOrder slnData
+        | Ok slnData -> InspectSln.loadingBuildOrder slnData
 
         //this.LoadProjects(projs, crosstargetingStrategy, useBinaryLogger, numberOfThreads)
         | Error e -> raise (exn ("cannot load the sln", e))
@@ -442,7 +451,10 @@ module Crack =
         let collectionName, projectFiles =
             match projects, ignoreProjects with
             | [], false ->
-                match Directory.GetFiles(slnDir, "*.sln") with
+                let slnFiles =
+                    [| yield! Directory.GetFiles(slnDir, "*.sln"); yield! Directory.GetFiles(slnDir, "*.slnx") |]
+
+                match slnFiles with
                 | [| sln |] ->
                     printfn "getting projects from solution file %s" sln
 

src/fsdocs-tool/fsdocs-tool.fsproj

@@ -51,7 +51,7 @@
     <PackageReference Include="FSharp.Core" />
     <PackageReference Include="CommandLineParser" />
     <PackageReference Include="Ionide.ProjInfo" />
-    <PackageReference Include="Ionide.ProjInfo.Sln" />
+    <PackageReference Include="Microsoft.Build" IncludeAssets="compile" ExcludeAssets="runtime" PrivateAssets="all" />
     <PackageReference Include="Suave" />
   </ItemGroup>
 </Project>