restore

Author: majocha

vsintegration/tests/Salsa/salsa.fs

@@ -186,23 +186,27 @@ module internal Salsa =
 
         /// Compute the Flags and Sources 
         let GetFlagsAndSources(project:Project, host:HostCompile) : BuildFlags = 
-            use _ = host.CaptureSourcesAndFlagsWithoutBuildingForABit()
-            project.IsBuildEnabled <- true
-            // Always invoke CoreCompile directly (host object registered there)
-            let loggers = seq { yield (new Microsoft.Build.Logging.ConsoleLogger(LoggerVerbosity.Minimal) :> ILogger) }
-            let _ = project.Build("CoreCompile", loggers) |> ignore
-            let capturedFlags, capturedSources = host.Results
-            let raw =
-                if isNull capturedFlags || isNull capturedSources then
-                    // Fallback if the host wasn't invoked (e.g. up-to-date skip or custom targets)
-                    GetFlagsAndSourcesFallback project
+            let result =
+                use xx = host.CaptureSourcesAndFlagsWithoutBuildingForABit()
+                project.IsBuildEnabled <- true
+                    
+                let loggers = seq { yield (new Microsoft.Build.Logging.ConsoleLogger(LoggerVerbosity.Detailed) :> ILogger) }
+                            
+                let r = project.Build("Compile", loggers)
+                if not(r) then
+                    printfn "MSBuild result: %A" r
+                    printfn "%s" project.FullPath
+                    System.Diagnostics.Debug.Assert(false, "things are about to fail, as MSBuild failed; it would behoove you to turn on MSBuild tracing")
+                let capturedFlags, capturedSources = host.Results
+                {flags = capturedFlags |> Array.toList 
+                 sources = capturedSources |> Array.toList }
+            let Canonicalize (fileName:string) = 
+                if System.IO.Path.IsPathRooted(fileName) then
+                    System.IO.Path.GetFullPath(fileName)
                 else
-                    { flags = capturedFlags |> Array.toList; sources = capturedSources |> Array.toList }
-            // Canonicalize source paths
-            let canonicalize (fileName:string) =
-                if Path.IsPathRooted(fileName) then Path.GetFullPath(fileName)
-                else Path.GetFullPath(Path.Combine(Path.GetDirectoryName(project.FullPath), fileName))
-            { flags = raw.flags; sources = raw.sources |> List.map canonicalize }
+                    System.IO.Path.GetFullPath(System.IO.Path.Combine(System.IO.Path.GetDirectoryName(project.FullPath),fileName))
+            { flags = result.flags 
+              sources = result.sources |> List.map Canonicalize }
 
         let CrackProject(projectFileName, configuration, platform) =