Add GetAllTfms for Nongraph path

Author: TheAngryByrd

src/Ionide.ProjInfo/ProjectLoader2.fs

@@ -54,11 +54,22 @@ module Map =
     let union loses wins =
         Map.fold (fun acc key value -> Map.add key value acc) loses wins
 
-    let inline ofDict (dic) =
-        dic
+    let inline ofDict dictionary =
+        dictionary
         |> Seq.map (|KeyValue|)
         |> Map.ofSeq
 
+
+    let inline copyToDict (map: Map<_, _>) =
+        // Have to use a mutable dictionary here because the F# Map doesn't have an Add method
+        let dictionary = Dictionary<_, _>()
+
+        for KeyValue(k, v) in map do
+            dictionary.Add(k, v)
+
+        dictionary :> IDictionary<_, _>
+
+
 module BuildErrorEventArgs =
 
     let messages (e: BuildErrorEventArgs seq) =
@@ -244,35 +255,32 @@ module ProjectPropertyInstance =
 
 module ProjectLoading =
 
-    let selectFirstTfm (projectPath: string) =
+    let getAllTfms (projectPath: string) =
         let pi = ProjectInstance(projectPath)
 
-        match
+        pi.Properties
+        |> (ProjectPropertyInstance.tryFind "TargetFramework"
+            >> Option.map Array.singleton)
+        |> Option.orElseWith (fun () ->
             pi.Properties
-            |> ProjectPropertyInstance.tryFind "TargetFramework"
-        with
-        | Some v -> Some v
-        | None ->
-            match
-                pi.Properties
-                |> ProjectPropertyInstance.tryFind "TargetFrameworks"
-            with
-            | None -> None
-            | Some tfms ->
-                match tfms.Split(';') with
-                | [||] -> None
-                | tfms -> Array.tryHead tfms
-
-    let defaultProjectInstanceFactory tfmSelector (projectPath: string) (xml: Dictionary<string, string>) (collection: ProjectCollection) =
-
-        let tfm = tfmSelector projectPath
-
-        let props = Map.union (Map.ofDict xml) (Map.ofDict collection.GlobalProperties)
-        // |> Map.mapAddSome "TargetFramework" tfm
+            |> ProjectPropertyInstance.tryFind "TargetFrameworks"
+            |> Option.bind (fun tfms ->
+                tfms.Split(
+                    ';',
+                    StringSplitOptions.TrimEntries
+                    ||| StringSplitOptions.RemoveEmptyEntries
+                )
+                |> Option.ofObj
+            )
+        )
 
-        let pi = ProjectInstance(projectPath, props, toolsVersion = null, projectCollection = collection)
+    let selectFirstTfm (projectPath: string) =
+        getAllTfms projectPath
+        |> Option.bind Array.tryHead
 
-        pi
+    let defaultProjectInstanceFactory (projectPath: string) (xml: Dictionary<string, string>) (collection: ProjectCollection) =
+        let props = Map.union (Map.ofDict xml) (Map.ofDict collection.GlobalProperties)
+        ProjectInstance(projectPath, props, toolsVersion = null, projectCollection = collection)
 
 
 type ProjectLoader2 =
@@ -293,6 +301,30 @@ type ProjectLoader2 =
         entryProjectFiles
         |> Seq.map (fun file -> ProjectLoader2.EvaluateAsProject(file, ?globalProperties = globalProperties, ?projectCollection = projectCollection))
 
+    static member EvaluateAsProjectsAllTfms(entryProjectFiles: string seq, ?globalProperties: IDictionary<string, string>, ?projectCollection: ProjectCollection) =
+        let globalProperties =
+            globalProperties
+            |> Option.map Map.ofDict
+            |> Option.defaultValue Map.empty
+
+        entryProjectFiles
+        |> Seq.collect (fun path ->
+            ProjectLoading.getAllTfms path
+            |> Option.toArray
+            |> Array.collect (
+                Array.map (fun tfm ->
+                    ProjectLoader2.EvaluateAsProject(
+                        path,
+                        globalProperties =
+                            (globalProperties
+                             |> Map.add "TargetFramework" tfm
+                             |> Map.copyToDict),
+                        ?projectCollection = projectCollection
+                    )
+                )
+            )
+        )
+
     static member EvaluateAsGraph(entryProjectFile: string, ?globalProperties: IDictionary<string, string>, ?projectCollection: ProjectCollection, ?projectInstanceFactory, ?ct: CancellationToken) =
         let globalProperties = defaultArg globalProperties null
         ProjectLoader2.EvaluateAsGraph([ ProjectGraphEntryPoint(entryProjectFile, globalProperties = globalProperties) ], ?projectCollection = projectCollection, ?projectInstanceFactory = projectInstanceFactory, ?ct = ct)
@@ -301,23 +333,14 @@ type ProjectLoader2 =
         let pc = defaultArg projectCollection ProjectCollection.GlobalProjectCollection
         let ct = defaultArg ct CancellationToken.None
 
-        let projectInstanceFactory =
-            defaultArg projectInstanceFactory (ProjectLoading.defaultProjectInstanceFactory ProjectLoading.selectFirstTfm)
+        let projectInstanceFactory = defaultArg projectInstanceFactory ProjectLoading.defaultProjectInstanceFactory
 
         ProjectGraph(entryProjectFile, pc, projectInstanceFactory, ct)
 
 
     static member EvaluateAsGraphAllTfms(entryProjectFile: ProjectGraphEntryPoint seq, ?projectCollection: ProjectCollection, ?projectInstanceFactory) =
-
-        let pc = defaultArg projectCollection ProjectCollection.GlobalProjectCollection
-
-        let projectInstanceFactory =
-            defaultArg projectInstanceFactory (ProjectLoading.defaultProjectInstanceFactory ProjectLoading.selectFirstTfm)
-
         let graph =
-            ProjectLoader2.EvaluateAsGraph(entryProjectFile, projectCollection = pc, projectInstanceFactory = projectInstanceFactory)
-
-        let targets = graph.ProjectNodes
+            ProjectLoader2.EvaluateAsGraph(entryProjectFile, ?projectCollection = projectCollection, ?projectInstanceFactory = projectInstanceFactory)
 
         let inline tryGetTfmFromProps (node: ProjectGraphNode) =
             match node.ProjectInstance.GlobalProperties.TryGetValue "TargetFramework" with
@@ -326,7 +349,7 @@ type ProjectLoader2 =
 
         // Then we only care about those with a TargetFramework
         let projects =
-            targets
+            graph.ProjectNodes
             |> Seq.choose (fun node ->
                 tryGetTfmFromProps node
                 |> Option.orElseWith (fun () ->
@@ -336,7 +359,7 @@ type ProjectLoader2 =
                 |> Option.map (fun _ -> ProjectGraphEntryPoint(node.ProjectInstance.FullPath, globalProperties = node.ProjectInstance.GlobalProperties))
             )
 
-        ProjectLoader2.EvaluateAsGraph(projects, projectCollection = pc, projectInstanceFactory = projectInstanceFactory)
+        ProjectLoader2.EvaluateAsGraph(projects, ?projectCollection = projectCollection, ?projectInstanceFactory = projectInstanceFactory)
 
     static member Execution(session: BuildManagerSession, graph: ProjectGraph, ?targetsToBuild: string array, ?flags: BuildRequestDataFlags, ?ct: CancellationToken) =
         task {

test/Ionide.ProjInfo.Tests/TestAssets.fs

@@ -345,14 +345,27 @@ let ``loader2-solution-with-2-projects`` = {
     EntryPoints = [ "loader2-solution-with-2-projects.sln" ]
     Expects =
         fun projectsAfterBuild ->
-            Expect.equal (Seq.length projectsAfterBuild) 2 "projects count"
+            Expect.equal (Seq.length projectsAfterBuild) 3 "projects count"
 
-            let classlibf1 =
+            let classlibf1s =
                 projectsAfterBuild
-                |> Seq.find (fun x -> x.ProjectFileName.EndsWith("classlibf1.fsproj"))
+                |> 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"
 
-            Expect.equal classlibf1.SourceFiles.Length 3 "classlibf1 source files"
-            Expect.equal classlibf1.TargetFramework "net8.0" "classlibf1 target framework"
 
             let classlibf2 =
                 projectsAfterBuild

test/Ionide.ProjInfo.Tests/Tests.fs

@@ -1558,16 +1558,15 @@ let buildManagerSessionTests toolsPath =
             ``loader2-solution-with-2-projects``
             (fun env ->
                 task {
-
-                    let path =
+                    let entrypoints =
                         env.Entrypoints
-                        |> Seq.map ProjectGraphEntryPoint
+                         |> Seq.map ProjectGraphEntryPoint
 
                     let loggers = env.Binlog.Loggers
 
                     // Evaluation
                     use pc = projectCollection ()
-                    let graph = ProjectLoader2.EvaluateAsGraphAllTfms(path, pc)
+                    let graph = ProjectLoader2.EvaluateAsGraphAllTfms(entrypoints, pc)
 
                     // Execution
                     let bp = BuildParameters(Loggers = loggers)
@@ -1615,7 +1614,7 @@ let buildManagerSessionTests toolsPath =
 
                     // Evaluation
                     use pc = projectCollection ()
-                    let graph = ProjectLoader2.EvaluateAsProjects(entrypoints, projectCollection = pc)
+                    let graph = ProjectLoader2.EvaluateAsProjectsAllTfms(entrypoints, projectCollection = pc)
 
                     // Execution
                     let bp = BuildParameters(Loggers = loggers)
@@ -1634,22 +1633,6 @@ let buildManagerSessionTests toolsPath =
                             | _ -> None
                         )
 
-                    // Parse
-                    // let projectsAfterBuild =
-                    //     match result with
-                    //     | Ok result ->
-                    //         ProjectLoader2.Parse result
-                    //         |> Seq.choose (
-                    //             function
-                    //             | Ok(LoadedProjectInfo.StandardProjectInfo x) -> Some x
-                    //             | _ -> None
-                    //         )
-                    //     | Result.Error(GraphBuildErrors.BuildErr(result, errorLogs)) ->
-                    //         let results: Dictionary<ProjectGraphNode, Result<BuildResult, BuildErrors>> =
-                    //             GraphBuildResult.resultsByNode (result, errorLogs)
-
-                    //         failwith "Build failed"
-
                     env.Data.Expects projectsAfterBuild
                 }
             )
@@ -2740,6 +2723,7 @@ let traversalProjectTest toolsPath loaderType workspaceFactory =
         $"can crack traversal projects - {loaderType}"
         (fun () ->
             let logger = Log.create "Test 'can crack traversal projects'"
+
             let fs = FileUtils(logger)
             let projPath = pathForProject ``traversal project``
             // // need to build the projects first so that there's something to latch on to

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>