Walk Projects non graph

Author: TheAngryByrd

src/Ionide.ProjInfo/ProjectLoader2.fs

@@ -8,6 +8,7 @@ open Microsoft.Build.Graph
 open System.Collections.Generic
 open Microsoft.Build.Evaluation
 open Microsoft.Build.Framework
+open ProjectLoader
 
 /// <summary>
 /// An awaitable wrapper around a task whose result is disposable. The wrapper is not disposable, so this prevents usage errors like "use _lock = myAsync()" when the appropriate usage should be "use! _lock = myAsync())".
@@ -186,11 +187,21 @@ type BuildManagerSession(?bm: BuildManager) =
 
     /// <summary>Submits a graph build request to the current build and starts it asynchronously.</summary>
     /// <param name="buildRequest">GraphBuildRequestData encapsulates all of the data needed to submit a graph build request.</param>
+    /// <param name="buildParameters">All of the settings which must be specified to start a build</param>
     /// <param name="ct">CancellationToken to cancel build submissions.</param>
     /// <returns>The BuildResult</returns>
     member x.BuildAsync(buildRequest: BuildRequestData, ?buildParameters: BuildParameters, ?ct: CancellationToken) =
         let ct = defaultArg ct CancellationToken.None
-        let buildParameters = defaultArg buildParameters (BuildParameters(Loggers = [ ProjectLoader.ErrorLogger() ]))
+
+        let buildParameters =
+            defaultArg
+                buildParameters
+                (BuildParameters(
+                    Loggers = [
+                        msBuildToLogProvider ()
+                        ProjectLoader.ErrorLogger()
+                    ]
+                ))
 
         lockAndStartBuild ct buildParameters
         <| fun () ->
@@ -216,6 +227,7 @@ type BuildManagerSession(?bm: BuildManager) =
 
     /// <summary>Submits a graph build request to the current build and starts it asynchronously.</summary>
     /// <param name="graphBuildRequest">GraphBuildRequestData encapsulates all of the data needed to submit a graph build request.</param>
+    /// <param name="buildParameters">All of the settings which must be specified to start a build</param>
     /// <param name="ct">CancellationToken to cancel build submissions.</param>
     /// <returns>the GraphBuildResult</returns>
     member x.BuildAsync(graphBuildRequest: GraphBuildRequestData, ?buildParameters: BuildParameters, ?ct: CancellationToken) =
@@ -254,25 +266,48 @@ module ProjectPropertyInstance =
         |> Option.map (fun v -> v.EvaluatedValue)
 
 
+type ProjectPath = string
+type TargetFramework = string
+type TargetFrameworks = string array
+
+module TargetFrameworks =
+
+    let parse (tfms: string) =
+        tfms
+        |> Option.ofObj
+        |> Option.bind (fun tfms ->
+            tfms.Split(
+                ';',
+                StringSplitOptions.TrimEntries
+                ||| StringSplitOptions.RemoveEmptyEntries
+            )
+            |> Option.ofObj
+        )
+
+
+type ProjectMap<'a> = Map<ProjectPath, Map<TargetFramework, 'a>>
+
+module ProjectMap =
+
+    let map (f: ProjectPath -> TargetFramework -> 'a -> 'a0) (m: ProjectMap<'a>) =
+        m
+        |> Map.map (fun k -> Map.map (f k))
+
+type ProjectProjectMap = ProjectMap<Project>
+type ProjectGraphMap = ProjectMap<ProjectGraphNode>
+
 module ProjectLoading =
 
-    let getAllTfms (projectPath: string) =
-        let pi = ProjectInstance(projectPath)
+    let getAllTfms (projectPath: ProjectPath) =
+        let pi = ProjectInstance projectPath
 
         pi.Properties
         |> (ProjectPropertyInstance.tryFind "TargetFramework"
             >> Option.map Array.singleton)
         |> Option.orElseWith (fun () ->
             pi.Properties
             |> ProjectPropertyInstance.tryFind "TargetFrameworks"
-            |> Option.bind (fun tfms ->
-                tfms.Split(
-                    ';',
-                    StringSplitOptions.TrimEntries
-                    ||| StringSplitOptions.RemoveEmptyEntries
-                )
-                |> Option.ofObj
-            )
+            |> Option.bind TargetFrameworks.parse
         )
 
     let selectFirstTfm (projectPath: string) =
@@ -386,17 +421,49 @@ type ProjectLoader2 =
             return! session.BuildAsync(request, ?buildParameters = buildParameters, ?ct = ct)
         }
 
-    static member Execution(session: BuildManagerSession, projectInstances: (ProjectInstance * BuildParameters option) seq, ?targetsToBuild: string array, ?flags: BuildRequestDataFlags, ?ct: CancellationToken) =
-        projectInstances
-        |> Seq.map (fun (p, bp) -> ProjectLoader2.Execution(session, p, ?buildParameters = bp, ?targetsToBuild = targetsToBuild, ?flags = flags, ?ct = ct))
-        |> Task.WhenAll
-
-    static member Execution(session: BuildManagerSession, projects: (Project * BuildParameters option) seq, ?targetsToBuild: string array, ?flags: BuildRequestDataFlags, ?ct: CancellationToken) =
-        let instances =
-            projects
-            |> Seq.map (fun (p, bp) -> p.CreateProjectInstance(), bp)
-
-        ProjectLoader2.Execution(session, instances, ?targetsToBuild = targetsToBuild, ?flags = flags, ?ct = ct)
+    static member ExecutionWalkReferences<'e when BuildResultFailure<'e>>
+        (session: BuildManagerSession, projects: Project  seq, buildParameters: Project -> BuildParameters option, ?targetsToBuild: string array, ?flags: BuildRequestDataFlags, ?ct: CancellationToken)
+        =
+        task {
+            let projectsToVisit = Queue<Project> projects
+
+            let visited = Dictionary<Project, Result<BuildResult, 'e>>()
+
+            while projectsToVisit.Count > 0 do
+                let p = projectsToVisit.Dequeue()
+
+                match visited.TryGetValue p with
+                | true, _ -> ()
+                | _ ->
+
+                    let projectInstance = p.CreateProjectInstance()
+                    let bp = buildParameters p
+
+                    let! result = ProjectLoader2.Execution(session, projectInstance, ?buildParameters = bp, ?targetsToBuild = targetsToBuild, ?flags = flags, ?ct = ct)
+                    visited.Add(p, result)
+
+                    match result with
+                    | Ok result ->
+                        let references =
+                            result.ProjectStateAfterBuild.Items
+                            |> Seq.choose (fun item ->
+                                if
+                                    item.ItemType = "_MSBuildProjectReferenceExistent"
+                                    && item.HasMetadata "FullPath"
+                                then
+                                    Some(item.GetMetadataValue "FullPath")
+                                else
+                                    None
+                            )
+                        ProjectLoader2.EvaluateAsProjectsAllTfms(references, projectCollection = p.ProjectCollection)
+                        |> Seq.iter projectsToVisit.Enqueue
+                    | _ -> ()
+                    |> ignore
+
+            return
+                visited.Values
+                |> Seq.toArray
+        }
 
     static member GetProjectInstance(buildResult: BuildResult) = buildResult.ProjectStateAfterBuild
 

test/Ionide.ProjInfo.Tests/Program.fs

@@ -20,7 +20,7 @@ let main argv =
 
     let args = [
         CLIArguments.Printer (TestPrinters.summaryPrinter defaultConfig.printer)
-        CLIArguments.Verbosity LogLevel.Verbose
+        CLIArguments.Verbosity LogLevel.Info
     ]
 
     Tests.runTestsWithCLIArgs

test/Ionide.ProjInfo.Tests/TestAssets.fs

@@ -366,6 +366,49 @@ let ``loader2-solution-with-2-projects`` = {
 
             Expect.equal classlibf1ns21.SourceFiles.Length 3 "classlibf1 source files"
 
+            let classlibf2 =
+                projectsAfterBuild
+                |> Seq.find (fun x -> x.ProjectFileName.EndsWith("classlibf2.fsproj"))
+
+            Expect.equal classlibf2.SourceFiles.Length 3 "classlibf2 source files"
+            Expect.equal classlibf2.TargetFramework "netstandard2.0" "classlibf1 target framework"
+}
+
+
+let ``loader2-no-solution-with-2-projects`` = {
+    ProjDir = "loader2-no-solution-with-2-projects"
+    EntryPoints = [
+        "src"
+        / "classlibf1"
+        / "classlibf1.fsproj"
+    ]
+    Expects =
+        fun projectsAfterBuild ->
+            let projectPaths =
+                projectsAfterBuild
+                |> Seq.map (_.ProjectFileName)
+                |> String.concat "\n"
+
+            Expect.equal (Seq.length projectsAfterBuild) 3 $"Should be three projects but got {Seq.length projectsAfterBuild} : {projectPaths}"
+
+            let classlibf1s =
+                projectsAfterBuild
+                |> Seq.filter (fun x -> x.ProjectFileName.EndsWith("classlibf1.fsproj"))
+
+            Expect.hasLength classlibf1s 2 ""
+
+            let classlibf1net80 =
+                classlibf1s
+                |> Seq.find (fun x -> x.TargetFramework = "net8.0")
+
+            Expect.equal classlibf1net80.SourceFiles.Length 3 "classlibf1 source files"
+
+
+            let classlibf1ns21 =
+                classlibf1s
+                |> Seq.find (fun x -> x.TargetFramework = "netstandard2.1")
+
+            Expect.equal classlibf1ns21.SourceFiles.Length 3 "classlibf1 source files"
 
             let classlibf2 =
                 projectsAfterBuild

test/Ionide.ProjInfo.Tests/Tests.fs

@@ -144,7 +144,7 @@ let TestRunInvariantDir =
     / "invariant"
 
 let checkExitCodeZero (cmd: Command) =
-    Expect.equal 0 cmd.Result.ExitCode "command finished with exit code non-zero."
+    Expect.equal 0 cmd.Result.ExitCode $"command {cmd.Result.StandardOutput} finished with exit code non-zero."
 
 let findByPath path parsed =
     parsed
@@ -1631,7 +1631,7 @@ let buildManagerSessionTests toolsPath =
         testCaseTask
         |> testWithEnv
             "loader2-solution-with-2-projects - Graph"
-            ``loader2-solution-with-2-projects``
+            ``loader2-no-solution-with-2-projects``
             (fun env ->
                 task {
                     let entrypoints =
@@ -1672,44 +1672,49 @@ let buildManagerSessionTests toolsPath =
         testCaseTask
         |> testWithEnv
             "loader2-solution-with-2-projects"
-            ``loader2-solution-with-2-projects``
+            ``loader2-no-solution-with-2-projects``
             (fun env ->
                 task {
 
                     let path = env.Entrypoints
 
                     let entrypoints =
                         path
-                        |> Seq.collect (
-                            InspectSln.tryParseSln
-                            >> getResult
-                            >> InspectSln.loadingBuildOrder
+                        |> Seq.collect (fun p ->
+                            if p.EndsWith(".sln") then
+                                p
+                                |> InspectSln.tryParseSln
+                                |> getResult
+                                |> InspectSln.loadingBuildOrder
+                            else
+                                [ p ]
                         )
 
 
                     // Evaluation
                     use pc = projectCollection ()
 
-                    let graph =
+
+                    let allprojects =
                         ProjectLoader2.EvaluateAsProjectsAllTfms(entrypoints, projectCollection = pc)
-                        |> Seq.map (fun p ->
-                            let fi = FileInfo p.FullPath
-                            let projectName = Path.GetFileNameWithoutExtension fi.Name
+                        |> Seq.toList
 
-                            let tfm =
-                                match p.GlobalProperties.TryGetValue("TargetFramework") with
-                                | true, tfm -> tfm
-                                | _ -> ""
+                    let createBuildParametersFromProject (p: Project) =
+                        let fi = FileInfo p.FullPath
+                        let projectName = Path.GetFileNameWithoutExtension fi.Name
 
-                            let normalized = normalizeFileName $"{projectName}-{tfm}"
+                        let tfm =
+                            match p.GlobalProperties.TryGetValue("TargetFramework") with
+                            | true, tfm -> tfm.Replace('.', '_')
+                            | _ -> ""
 
-                            p, Some(BuildParameters(Loggers = env.Binlog.Loggers normalized))
-                        )
+                        let normalized = $"{projectName}-{tfm}"
 
+                        Some(BuildParameters(Loggers = env.Binlog.Loggers normalized))
                     // Execution
                     let bm = new BuildManagerSession()
 
-                    let! (results: Result<BuildResult, BuildErrors> array) = ProjectLoader2.Execution(bm, graph)
+                    let! (results: Result<BuildResult, BuildErrors> array) = ProjectLoader2.ExecutionWalkReferences(bm, allprojects, createBuildParametersFromProject)
 
                     let projectsAfterBuild =
                         results
@@ -1801,25 +1806,25 @@ let buildManagerSessionTests toolsPath =
                     // Evaluation
                     use pc = projectCollection ()
 
-                    let projs =
-                        ProjectLoader2.EvaluateAsProjectsAllTfms(entryPoints, projectCollection = pc)
-                        |> Seq.map (fun p ->
-                            let fi = FileInfo p.FullPath
-                            let projectName = Path.GetFileNameWithoutExtension fi.Name
+                    let createBuildParametersFromProject (p: Project) =
+                        let fi = FileInfo p.FullPath
+                        let projectName = Path.GetFileNameWithoutExtension fi.Name
 
-                            let tfm =
-                                match p.GlobalProperties.TryGetValue("TargetFramework") with
-                                | true, tfm -> tfm.Replace('.', '_')
-                                | _ -> ""
+                        let tfm =
+                            match p.GlobalProperties.TryGetValue("TargetFramework") with
+                            | true, tfm -> tfm.Replace('.', '_')
+                            | _ -> ""
 
-                            let normalized = normalizeFileName $"{projectName}-{tfm}"
-                            p, Some(BuildParameters(Loggers = loggers normalized))
-                        )
+                        let normalized = $"{projectName}-{tfm}"
+
+                        Some(BuildParameters(Loggers = env.Binlog.Loggers normalized))
+
+                    let projs = ProjectLoader2.EvaluateAsProjectsAllTfms(entryPoints, projectCollection = pc)
 
                     // Execution
                     let bm = new BuildManagerSession()
 
-                    let! (results: Result<_, BuildErrors> array) = ProjectLoader2.Execution(bm, projs)
+                    let! (results: Result<_, BuildErrors> array) = ProjectLoader2.ExecutionWalkReferences(bm, projs, createBuildParametersFromProject)
 
                     let result =
                         results

test/examples/loader2-no-solution-with-2-projects/src/classlibf1/Library.fs

@@ -0,0 +1,5 @@
+namespace classlibf1
+
+module Say =
+    let hello name =
+        printfn "Hello %s" name

test/examples/loader2-no-solution-with-2-projects/src/classlibf1/classlibf1.fsproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Library.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\classlibf2\classlibf2.fsproj" />
+  </ItemGroup>
+
+</Project>

test/examples/loader2-no-solution-with-2-projects/src/classlibf2/Library.fs

@@ -0,0 +1,5 @@
+namespace classlibf2
+
+module Say =
+    let hello name =
+        printfn "Hello %s" name

test/examples/loader2-no-solution-with-2-projects/src/classlibf2/classlibf2.fsproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Library.fs" />
+  </ItemGroup>
+
+</Project>

test/examples/loader2-solution-with-2-projects/src/classlibf1/classlibf1.fsproj

@@ -9,4 +9,8 @@
     <Compile Include="Library.fs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\classlibf2\classlibf2.fsproj" />
+  </ItemGroup>
+
 </Project>