all together now

Author: AlgorithmsAreCool

src/Graph.fs

@@ -31,14 +31,14 @@ type Builder<'node> = {
 }
 let rec private buildNode (builder) (depth) (id) =
     if Debug then
-        printfn "Building (%d) %A" depth id
+        cprintf Color.Yellow "Building (%d) %A" depth id
 
     let nodeBuilder = buildNode builder (depth + 1)
     { Id = id; Edges = List.map (nodeBuilder) (builder.GetEdges id) }
 
 let rec private visitNode (visitor : VisitorState<'node, 'state>) (node : Node<'node>)  =
     if Debug then
-        printfn "Visiting (%d) %A" visitor.Traveled id
+        cprintf Color.Yellow "Visiting (%d) %A" visitor.Traveled node.Id
 
     match Set.contains node.Id visitor.Visited with
     | true -> visitor

src/Program.fs

@@ -7,38 +7,43 @@ open BulkAdd.Projects
 open System
 open System.IO
 open BulkAdd.Graph
+open BulkAdd.Paths
 
 
 type StartInfo = System.Diagnostics.ProcessStartInfo
 type Process = System.Diagnostics.Process
 
-let addProject slnPath (projects: #seq<string>) =
-    for projPath in projects do
 
-        printfn"-----------------------"
-        printfn"Adding %s to %s" projPath slnPath
+let addProjectToSln slnPath (ProjectRef projectLocation) =
 
-        let command = sprintf "sln \"%s\" add \"%s\"" slnPath projPath
-        if Debug then
-            printfn "dotnet %s" command
-        if Global.WhatIfMode then
-            printfn "Not Executing in WhatIf mode"
-        else
-            try
+    let projectPath =
+        match projectLocation with
+        | Abs (AbsPath abs) -> abs
+        | Rel (RelPath rel) -> rel
 
-                    let startInfo = StartInfo()
-                    startInfo.FileName <- "dotnet"
-                    startInfo.Arguments <- command
+    printfn"-----------------------"
+    printfn"Adding %A to %s" projectPath slnPath
 
-                    let proc = Process.Start(startInfo)
-                    proc.WaitForExit()
+    let command = sprintf "sln \"%s\" add \"%s\"" slnPath projectPath
+    if Debug then
+        printfn "dotnet %s" command
+    if Global.WhatIfMode then
+        printfn "WhatIf mode, No Action Taken"
+    else
+        try
+            let startInfo = StartInfo()
+            startInfo.FileName <- "dotnet"
+            startInfo.Arguments <- command
 
-                    match proc.ExitCode with
-                    | 0 -> cprintf Color.Green "OK"
-                    | code -> cprintf Color.Yellow "Unusual Return :("
-            with
-            | _ -> ()
-        printfn"-----------------------"
+            let proc = Process.Start(startInfo)
+            proc.WaitForExit()
+
+            match proc.ExitCode with
+            | 0 -> cprintf Color.Green "OK"
+            | code -> cprintf Color.Yellow "Unusual Return :("
+        with
+        | _ -> ()
+    //printfn"-----------------------"
 
 
 [<EntryPoint>]
@@ -61,15 +66,9 @@ let main argv =
 
     let inspector = {
         State = ()
-        Inspector = fun (proj, ()) -> printfn"%A" proj
+        Inspector = fun (projectRef, ()) -> addProjectToSln argData.SolutionFile projectRef
     }
 
     Graph.Visit(originNode, inspector)
 
-    // |> Path.GetFullPath
-    // |> AbsPath
-    // |> ProjectRef
-    // |> Graph.
-    // |> addProject argData.SolutionFile
-
     0

src/Projects.fs

@@ -30,17 +30,3 @@ let GetProjectDependencies(ProjectRef  location) =
     | Rel relPath -> relPath |> Paths.toAbs pwd |> getProjectDependencies
     | Abs absPath -> absPath |> getProjectDependencies
 
-// let getPro(ProjectRef project) =
-//     //try
-
-//         let projectXml = getXml project
-
-//         let getAttrib name (node:XElement) = name |> XName.Get |> node.Attribute |> Option.ofObj
-
-//         projectXml.Descendants (XName.Get "ProjectReference")
-//         |> Seq.choose (getAttrib "Include")
-//         |> Seq.map (fun attr -> attr.Value |> Paths.toAbs projectFile |> ProjectRef)
-//         //|> Seq.map (fun attr -> attr.Value |> ProjectRef)
-//         |> Seq.toList
-//     // with
-//     // | ex -> Error ex.Message