diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props index f3e0bc12d36..534ba96c04f 100644 --- a/FSharp.Profiles.props +++ b/FSharp.Profiles.props @@ -39,7 +39,6 @@ $(DefineConstants);FX_NO_WINFORMS $(DefineConstants);FX_NO_INDENTED_TEXT_WRITER $(DefineConstants);FX_REDUCED_EXCEPTIONS - $(DefineConstants);FX_REDUCED_CONSOLE $(DefineConstants);FX_RESHAPED_REFEMIT $(DefineConstants);FX_RESHAPED_GLOBALIZATION $(DefineConstants);FX_RESHAPED_REFLECTION diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index b5341a5d64b..59c39c77b85 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -586,12 +586,9 @@ let internal directoryName (s:string) = /// Process the command line options type internal FsiCommandLineOptions(fsi: FsiEvaluationSessionHostConfig, argv: string[], tcConfigB, fsiConsoleOutput: FsiConsoleOutput) = let mutable enableConsoleKeyProcessing = -#if FX_REDUCED_CONSOLE - false -#else // Mono on Win32 doesn't implement correct console processing not (runningOnMono && System.Environment.OSVersion.Platform = System.PlatformID.Win32NT) -#endif + let mutable gui = not runningOnMono // override via "--gui", on by default except when on Mono #if DEBUG let mutable showILCode = false // show modul il code @@ -1346,10 +1343,8 @@ module internal NativeMethods = type ControlEventHandler = delegate of int -> bool -#if !FX_REDUCED_CONSOLE [] extern bool SetConsoleCtrlHandler(ControlEventHandler _callback,bool _add) -#endif // One strange case: when a TAE happens a strange thing // occurs the next read from stdin always returns @@ -2398,7 +2393,6 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i let timeReporter = FsiTimeReporter(outWriter) -#if !FX_REDUCED_CONSOLE //---------------------------------------------------------------------------- // Console coloring //---------------------------------------------------------------------------- @@ -2406,7 +2400,6 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i // Testing shows "console coloring" is broken on some Mono configurations (e.g. Mono 2.4 Suse LiveCD). // To support fsi usage, the console coloring is switched off by default on Mono. do if runningOnMono then enableConsoleColoring <- false -#endif //---------------------------------------------------------------------------- diff --git a/src/fsharp/fsi/fsimain.fs b/src/fsharp/fsi/fsimain.fs index 8bb27f1c63e..56ab81077cb 100644 --- a/src/fsharp/fsi/fsimain.fs +++ b/src/fsharp/fsi/fsimain.fs @@ -156,16 +156,12 @@ let evaluateSession(argv: string[]) = Console.ReadKey() |> ignore #endif -#if !FX_REDUCED_CONSOLE // When VFSI is running, set the input/output encoding to UTF8. // Otherwise, unicode gets lost during redirection. // It is required only under Net4.5 or above (with unicode console feature). if argv |> Array.exists (fun x -> x.Contains "fsi-server") then Console.InputEncoding <- System.Text.Encoding.UTF8 Console.OutputEncoding <- System.Text.Encoding.UTF8 -#else - ignore argv -#endif try // Create the console reader