Add option to crack using msbuild project graph (#102)

Author: TheAngryByrd

build.fsx

@@ -90,6 +90,18 @@ let DoNothing = ignore
 
 Target.create "Clean" (fun _ -> Shell.cleanDirs [ buildDir; nugetDir ])
 
+Target.create "ReplaceFsLibLogNamespaces"
+<| fun _ ->
+    let replacements =
+        [ "FsLibLog\\n", "Ionide.ProjInfo.Logging\n"
+          "FsLibLog\\.", "Ionide.ProjInfo.Logging" ]
+
+    replacements
+    |> List.iter
+        (fun (``match``, replace) ->
+            (!! "paket-files/TheAngryByrd/FsLibLog/**/FsLibLog*.fs")
+            |> Shell.regexReplaceInFilesWithEncoding ``match`` replace System.Text.Encoding.UTF8)
+
 Target.create "Build" (fun _ -> DotNet.build id "")
 
 Target.create
@@ -160,6 +172,7 @@ Target.create "Default" DoNothing
 Target.create "Release" DoNothing
 
 "Clean"
+==> "ReplaceFsLibLogNamespaces"
 ==> "Build"
 ==> "Test"
 ==> "Default"

paket.dependencies

@@ -20,6 +20,8 @@ nuget Microsoft.Build.Locator
 nuget Newtonsoft.Json
 nuget Fsharp.Control.Reactive
 
+github TheAngryByrd/FsLibLog src/FsLibLog/FsLibLog.fs
+
 // [ FAKE GROUP ]
 group Build
   source https://api.nuget.org/v3/index.json

paket.lock

@@ -562,7 +562,9 @@ NUGET
       System.Runtime.Handles (>= 4.3)
     System.Windows.Extensions (5.0)
       System.Drawing.Common (>= 5.0)
-
+GITHUB
+  remote: TheAngryByrd/FsLibLog
+    src/FsLibLog/FsLibLog.fs (1b8121d4e8a1d1e9914abfcf9a5a1ebbc10fe3f3)
 GROUP Build
 STORAGE: NONE
 RESTRICTION: == netstandard2.0

src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs

@@ -36,7 +36,7 @@ type ProjectResponse =
 /// Public API for any operations related to workspace and projects.
 /// Internally keeps all the information related to project files in current workspace.
 /// It's responsible for refreshing and caching - should be used only as source of information and public API
-type ProjectController(toolsPath: ToolsPath) as x =
+type ProjectController(toolsPath: ToolsPath, workspaceLoaderFactory: ToolsPath -> IWorkspaceLoader) as x =
     let fileCheckOptions = ConcurrentDictionary<string, FSharpProjectOptions>()
     let projects = ConcurrentDictionary<string, Project>()
     let mutable isWorkspaceReady = false
@@ -165,7 +165,7 @@ type ProjectController(toolsPath: ToolsPath) as x =
                 | delay when delay > TimeSpan.Zero -> do! Async.Sleep(Environment.workspaceLoadDelay().TotalMilliseconds |> int)
                 | _ -> ()
 
-                let loader = WorkspaceLoader.Create(toolsPath)
+                let loader = workspaceLoaderFactory toolsPath
 
                 let bindNewOnloaded (n: WorkspaceProjectState) : ProjectSystemState option =
                     match n with
@@ -177,7 +177,8 @@ type ProjectController(toolsPath: ToolsPath) as x =
                         | Ok optsDPW ->
                             let view = ProjectViewer.render optsDPW
                             Some(ProjectSystemState.Loaded(fcsOpts, optsDPW, view.Items, isFromCache))
-                        | Error _ -> None //TODO not ignore the error
+                        | Error e -> Some(ProjectSystemState.Failed(e.ProjFile, e))
+
                     | WorkspaceProjectState.Failed (path, e) ->
                         let error = e
                         Some(ProjectSystemState.Failed(path, error))

src/Ionide.ProjInfo.ProjectSystem/Workspace.fs

@@ -36,7 +36,7 @@ let private bindResults isFromCache res =
 
             Result.Ok(res, optsDPW, items, isFromCache))
 
-let private getProjectOptions (loader: WorkspaceLoader) (onEvent: ProjectSystemState -> unit) (generateBinlog: bool) (projectFileNames: string list) =
+let private getProjectOptions (loader: IWorkspaceLoader) (onEvent: ProjectSystemState -> unit) (generateBinlog: bool) (projectFileNames: string list) =
     let existing, notExisting = projectFileNames |> List.partition (File.Exists)
 
     for e in notExisting do
@@ -62,7 +62,7 @@ let private getProjectOptions (loader: WorkspaceLoader) (onEvent: ProjectSystemS
     use notif = loader.Notifications.Subscribe handler
     loader.LoadProjects(existing, [], generateBinlog) |> ignore // TODO: Maybe we should move away from event driven approach???
 
-let internal loadInBackground onLoaded (loader: WorkspaceLoader) (projects: Project list) (generateBinlog: bool) =
+let internal loadInBackground onLoaded (loader: IWorkspaceLoader) (projects: Project list) (generateBinlog: bool) =
     let (resProjects, otherProjects) = projects |> List.partition (fun n -> n.Response.IsSome)
 
     for project in resProjects do

src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj

@@ -1,19 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net5.0; netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
-
   <ItemGroup>
+    <Compile Include="..\..\paket-files\TheAngryByrd\FsLibLog\src\FsLibLog\FsLibLog.fs">
+      <Paket>True</Paket>
+      <Link>paket-files/FsLibLog.fs</Link>
+    </Compile>
     <Compile Include="Types.fs" />
     <Compile Include="Utils.fs" />
     <Compile Include="VisualTree.fs" />
     <Compile Include="InspectSln.fs" />
     <Compile Include="Library.fs" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Ionide.ProjInfo.Sln\Ionide.ProjInfo.Sln.csproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>