diff --git a/fsxc/Fsxc.fs b/fsxc/Fsxc.fs index 80699cc..81ede61 100644 --- a/fsxc/Fsxc.fs +++ b/fsxc/Fsxc.fs @@ -479,7 +479,7 @@ module Program = let preprocessScriptContents (origScript: FileInfo) (contents: List) - : List * List * FileInfo = + : List * List = #if LEGACY_FRAMEWORK // from "Microsoft.Build", "16.11.0" to .../packages/Microsoft.Build.16.11.0/lib/net472/Microsoft.Build.dll @@ -705,8 +705,7 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() } ) } |> List.ofSeq, - extraExtensions, - autogeneratedFile + extraExtensions #if LEGACY_FRAMEWORK let getSourceFiles(flags: seq) : seq = @@ -843,17 +842,8 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() } let binFolder = GetBinFolderForAScript script - let compilerInputs, extraExtensions, autoGenFile = + let compilerInputs, extraExtensions = preprocessScriptContents script contents - - Console.WriteLine( - "_________________START AUTOGEN FILE_________________" - ) - - for line in File.ReadAllLines(autoGenFile.FullName) do - Console.WriteLine line - - Console.WriteLine("_________________END AUTOGEN FILE_________________") #if !LEGACY_FRAMEWORK let projectFile = generateProjectFile script contents extraExtensions #else // dummy for to just prevent "unused" warning, meh @@ -921,8 +911,6 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() } | _ -> "fsharpc" #endif - Console.WriteLine(">>>>>>>>>>>>>>>COMPFLAGS: " + fscompilerflags) - let proc = Process.Execute( { diff --git a/scripts/runTests.fsx b/scripts/runTests.fsx index a1dff96..5727523 100755 --- a/scripts/runTests.fsx +++ b/scripts/runTests.fsx @@ -347,12 +347,11 @@ let dotnetFsiCmd = Process.Execute(dotnetFsiCmd, Echo.All) |> UnwrapDefault #endif -(* let processTest = Path.Combine(TestDir.FullName, "testProcess.fsx") |> FileInfo Process.Execute(CreateCommand(processTest, String.Empty), Echo.All) |> UnwrapDefault -*) + (* this is actually only really useful for when process spits both stdout & stderr let processConcurrencyTest = Path.Combine(TestDir.FullName, "testProcessConcurrency.fsx") |> FileInfo