Remove IVT to fsi from FSharp.Compiler.Private (#6957)

* Remove IVT to fsi from FSharp.Compiler.Private

* Save the out stream

* Remove IVT to fsianycpu

Author: cartermp

src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj

@@ -40,8 +40,6 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="fsc" />
-    <InternalsVisibleTo Include="fsi" />
-    <InternalsVisibleTo Include="fsiAnyCpu" />
     <InternalsVisibleTo Include="FSharp.LanguageService" />
     <InternalsVisibleTo Include="FSharp.LanguageService.Base" />
     <InternalsVisibleTo Include="FSharp.ProjectSystem.Base" />

src/fsharp/fsc.fs

@@ -2176,7 +2176,13 @@ let typecheckAndCompile
         defaultCopyFSharpCore, exiter: Exiter, errorLoggerProvider, tcImportsCapture, dynamicAssemblyCreator) =
 
     use d = new DisposablesTracker()
-    use e = new SaveAndRestoreConsoleEncoding()
+    let savedOut = System.Console.Out
+    use __ =
+        { new IDisposable with
+            member __.Dispose() = 
+                try 
+                    System.Console.SetOut(savedOut)
+                with _ -> ()}
 
     main0(ctok, argv, legacyReferenceResolver, bannerAlreadyPrinted, reduceMemoryUsage, defaultCopyFSharpCore, exiter, errorLoggerProvider, d)
     |> main1

src/fsharp/fsi/console.fs

@@ -5,7 +5,6 @@ namespace FSharp.Compiler.Interactive
 open System
 open System.Text
 open System.Collections.Generic
-open Internal.Utilities
 
 /// System.Console.ReadKey appears to return an ANSI character (not the expected the unicode character).
 /// When this fix flag is true, this byte is converted to a char using the System.Console.InputEncoding.

src/fsharp/fsi/fsimain.fs

@@ -22,10 +22,8 @@ open System.Windows.Forms
 #endif
 
 open FSharp.Compiler
-open FSharp.Compiler.AbstractIL 
-open FSharp.Compiler.Lib
+open FSharp.Compiler.AbstractIL
 open FSharp.Compiler.Interactive.Shell
-open FSharp.Compiler.Interactive
 open FSharp.Compiler.Interactive.Shell.Settings
 
 #nowarn "55"
@@ -316,7 +314,13 @@ let evaluateSession(argv: string[]) =
 let MainMain argv = 
     ignore argv
     let argv = System.Environment.GetCommandLineArgs()
-    use e = new SaveAndRestoreConsoleEncoding()
+    let savedOut = Console.Out
+    use __ =
+        { new IDisposable with
+            member __.Dispose() =
+                try 
+                    Console.SetOut(savedOut)
+                with _ -> ()}
 
 #if !FX_NO_APP_DOMAINS
     let timesFlag = argv |> Array.exists  (fun x -> x = "/times" || x = "--times")

src/fsharp/lib.fs

@@ -23,15 +23,6 @@ let GetEnvInteger e dflt = match System.Environment.GetEnvironmentVariable(e) wi
 
 let dispose (x:System.IDisposable) = match x with null -> () | x -> x.Dispose()
 
-type SaveAndRestoreConsoleEncoding () =
-    let savedOut = System.Console.Out
-
-    interface System.IDisposable with
-        member this.Dispose() = 
-            try 
-                System.Console.SetOut(savedOut)
-            with _ -> ()
-
 //-------------------------------------------------------------------------
 // Library: bits
 //------------------------------------------------------------------------