preserve original encoding

Author: majocha

src/Compiler/Driver/fsc.fs

@@ -268,15 +268,23 @@ let AdjustForScriptCompile (tcConfigB: TcConfigBuilder, commandLineSourceFiles,
 
     List.rev allSources
 
-let SetProcessThreadLocals tcConfigB =
+let SetProcessThreadLocals tcConfigB (disposables: DisposablesTracker) =
     match tcConfigB.preferredUiLang with
     | Some s -> Thread.CurrentThread.CurrentUICulture <- CultureInfo(s)
     | None -> ()
 
     if tcConfigB.utf8output then
+        let originalEncoding = Console.OutputEncoding
         Console.OutputEncoding <- Encoding.UTF8
 
-let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv) =
+        disposables.Register(
+            { new IDisposable with
+                member _.Dispose() =
+                    Console.OutputEncoding <- originalEncoding
+            }
+        )
+
+let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv, disposables) =
     let mutable inputFilesRef = []
 
     let collect name =
@@ -297,7 +305,7 @@ let ProcessCommandLineFlags (tcConfigB: TcConfigBuilder, lcidFromCodePage, argv)
     | Some _ -> ()
     | None -> tcConfigB.lcid <- lcidFromCodePage
 
-    SetProcessThreadLocals tcConfigB
+    SetProcessThreadLocals tcConfigB disposables
 
     (* step - get dll references *)
     let dllFiles, sourceFiles =
@@ -535,7 +543,7 @@ let main1
         // The ParseCompilerOptions function calls imperative function to process "real" args
         // Rather than start processing, just collect names, then process them.
         try
-            let files = ProcessCommandLineFlags(tcConfigB, lcidFromCodePage, argv)
+            let files = ProcessCommandLineFlags(tcConfigB, lcidFromCodePage, argv, disposables)
             let files = CheckAndReportSourceFileDuplicates(ResizeArray.ofList files)
             AdjustForScriptCompile(tcConfigB, files, lexResourceManager, dependencyProvider)
         with e ->

src/fsi/fsimain.fs

@@ -359,6 +359,19 @@ let MainMain argv =
     ignore argv
     let argv = System.Environment.GetCommandLineArgs()
 
+    let originalInputEncoding = Console.InputEncoding
+    let originalOutputEncoding = Console.OutputEncoding
+
+    use __ =
+        { new IDisposable with
+            member _.Dispose() =
+                try
+                    Console.InputEncoding <- originalInputEncoding
+                    Console.OutputEncoding <- originalOutputEncoding
+                with _ ->
+                    ()
+        }
+
     let timesFlag = argv |> Array.exists (fun x -> x = "/times" || x = "--times")
 
     if timesFlag then