fxspec update

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -8,7 +8,7 @@
     <DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
     <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
-    <OtherFlags>$(OtherFlags) --sig:all.fsi /warnon:3218 /warnon:1182 /warnon:3390 --times</OtherFlags>
+    <OtherFlags>$(OtherFlags) /warnon:3218 /warnon:1182 /warnon:3390 --times</OtherFlags>
     <Tailcalls>true</Tailcalls>
     <!-- .tail annotations always emitted for this binary, even in debug mode -->
     <NGenBinary>true</NGenBinary>

src/fsharp/ScriptClosure.fs

@@ -404,8 +404,8 @@ module ScriptPreprocessClosure =
 
         result
 
-    let InferTargetFrameworkForScript (_fileName, defaultToDotNetFramework: bool) =
-        TargetFrameworkForScripts (if defaultToDotNetFramework then PrimaryAssembly.Mscorlib else PrimaryAssembly.System_Runtime)
+    let InferTargetFrameworkForScript (_fileName, useDotNetFramework: bool) =
+        TargetFrameworkForScripts (if useDotNetFramework then PrimaryAssembly.Mscorlib else PrimaryAssembly.System_Runtime)
 
     /// Given source text, find the full load closure. Used from service.fs, when editing a script file
     let GetFullClosureOfScriptText
@@ -413,7 +413,7 @@ module ScriptPreprocessClosure =
             filename, sourceText: ISourceText, codeContext, 
             useSimpleResolution, useFsiAuxLib, useSdkRefs,
             lexResourceManager: Lexhelp.LexResourceManager, 
-            applyCommandLineArgs, defaultToDotNetFramework,
+            applyCommandLineArgs, useDotNetFramework,
             tryGetMetadataSnapshot, reduceMemoryUsage, dependencyProvider) =
 
         // Resolve the basic references such as FSharp.Core.dll first, before processing any #I directives in the script
@@ -422,7 +422,7 @@ module ScriptPreprocessClosure =
         // first, then #I and other directives are processed.
         //
         // We first infer the explicit framework from the root script.
-        let inferredTargetFramework = InferTargetFrameworkForScript (filename, defaultToDotNetFramework)
+        let inferredTargetFramework = InferTargetFrameworkForScript (filename, useDotNetFramework)
 
         let useDotNetFramework = inferredTargetFramework.UseDotNetFramework
 
@@ -470,14 +470,14 @@ type LoadClosure with
                      (ctok, legacyReferenceResolver, defaultFSharpBinariesDir, 
                       filename: string, sourceText: ISourceText, implicitDefines, useSimpleResolution: bool, 
                       useFsiAuxLib, useSdkRefs, lexResourceManager: Lexhelp.LexResourceManager, 
-                      applyCompilerOptions, defaultToDotNetFramework, tryGetMetadataSnapshot,
+                      applyCompilerOptions, useDotNetFramework, tryGetMetadataSnapshot,
                       reduceMemoryUsage, dependencyProvider) = 
 
         use unwindBuildPhase = PushThreadBuildPhaseUntilUnwind BuildPhase.Parse
         ScriptPreprocessClosure.GetFullClosureOfScriptText
             (ctok, legacyReferenceResolver, defaultFSharpBinariesDir, filename, sourceText, 
              implicitDefines, useSimpleResolution, useFsiAuxLib, useSdkRefs, lexResourceManager, 
-             applyCompilerOptions, defaultToDotNetFramework, tryGetMetadataSnapshot, reduceMemoryUsage, dependencyProvider)
+             applyCompilerOptions, useDotNetFramework, tryGetMetadataSnapshot, reduceMemoryUsage, dependencyProvider)
 
     /// Analyze a set of script files and find the closure of their references.
     static member ComputeClosureOfScriptFiles

src/fsharp/ScriptClosure.fsi

@@ -79,7 +79,7 @@ type LoadClosure =
         useSdkRefs: bool * 
         lexResourceManager: Lexhelp.LexResourceManager * 
         applyCompilerOptions: (TcConfigBuilder -> unit) * 
-        defaultToDotNetFramework: bool * 
+        useDotNetFramework: bool * 
         tryGetMetadataSnapshot: ILReaderTryGetMetadataSnapshot *
         reduceMemoryUsage: ReduceMemoryFlag *
         dependencyProvider: DependencyProvider

src/fsharp/service/FSharpCheckerResults.fs

@@ -2156,7 +2156,7 @@ type FsiInteractiveChecker(legacyReferenceResolver,
             
             let backgroundDiagnostics = [| |]
             let reduceMemoryUsage = ReduceMemoryFlag.Yes
-            let defaultToDotNetFramework = (tcConfig.primaryAssembly = PrimaryAssembly.Mscorlib)
+            let useDotNetFramework = (tcConfig.primaryAssembly = PrimaryAssembly.Mscorlib)
 
             let applyCompilerOptions tcConfigB  = 
                 let fsiCompilerOptions = CompilerOptions.GetCoreFsiCompilerOptions tcConfigB 
@@ -2167,7 +2167,7 @@ type FsiInteractiveChecker(legacyReferenceResolver,
                     filename, sourceText, CodeContext.Editing,
                     tcConfig.useSimpleResolution, tcConfig.useFsiAuxLib,
                     tcConfig.useSdkRefs, new Lexhelp.LexResourceManager(),
-                    applyCompilerOptions, defaultToDotNetFramework,
+                    applyCompilerOptions, useDotNetFramework,
                     tryGetMetadataSnapshot=(fun _ -> None),
                     reduceMemoryUsage=reduceMemoryUsage,
                     dependencyProvider=tcImports.DependencyProvider)

src/fsharp/service/service.fs

@@ -862,7 +862,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC
         loadedTimeStamp, otherFlags,
         useFsiAuxLib: bool option,
         useSdkRefs: bool option,
-        defaultToDotNetFramework: bool option,
+        useDotNetFramework: bool option,
         extraProjectInfo: obj option,
         optionsStamp: int64 option,
         userOpName) = 
@@ -880,7 +880,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC
             // Do we assume .NET Framework references for scripts? In the absence of either explicit argument
             // or an explicit #targetfx declaration, then for compilation and analysis the default
             // depends on the toolchain the tooling is are running on.
-            let defaultToDotNetFramework = defaultArg defaultToDotNetFramework (not FSharpEnvironment.isRunningOnCoreClr)
+            let useDotNetFramework = defaultArg useDotNetFramework (not FSharpEnvironment.isRunningOnCoreClr)
             let extraFlags =
                 if previewEnabled then
                     [| "--langversion:preview" |]
@@ -902,7 +902,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC
                 LoadClosure.ComputeClosureOfScriptText(ctok, legacyReferenceResolver, 
                     FSharpCheckerResultsSettings.defaultFSharpBinariesDir, filename, sourceText, 
                     CodeContext.Editing, useSimpleResolution, useFsiAuxLib, useSdkRefs, new Lexhelp.LexResourceManager(), 
-                    applyCompilerOptions, defaultToDotNetFramework, 
+                    applyCompilerOptions, useDotNetFramework, 
                     tryGetMetadataSnapshot, reduceMemoryUsage, dependencyProviderForScripts)
 
             let otherFlags = 
@@ -1303,9 +1303,9 @@ type FSharpChecker(legacyReferenceResolver,
         backgroundCompiler.GetSemanticClassificationForFile(filename, options, userOpName)
 
     /// For a given script file, get the ProjectOptions implied by the #load closure
-    member __.GetProjectOptionsFromScript(filename, source, ?previewEnabled, ?loadedTimeStamp, ?otherFlags, ?useFsiAuxLib, ?useSdkRefs, ?defaultToDotNetFramework, ?extraProjectInfo: obj, ?optionsStamp: int64, ?userOpName: string) = 
+    member __.GetProjectOptionsFromScript(filename, source, ?previewEnabled, ?loadedTimeStamp, ?otherFlags, ?useFsiAuxLib, ?useSdkRefs, ?useDotNetFramework, ?extraProjectInfo: obj, ?optionsStamp: int64, ?userOpName: string) = 
         let userOpName = defaultArg userOpName "Unknown"
-        backgroundCompiler.GetProjectOptionsFromScript(filename, source, previewEnabled, loadedTimeStamp, otherFlags, useFsiAuxLib, useSdkRefs, defaultToDotNetFramework, extraProjectInfo, optionsStamp, userOpName)
+        backgroundCompiler.GetProjectOptionsFromScript(filename, source, previewEnabled, loadedTimeStamp, otherFlags, useFsiAuxLib, useSdkRefs, useDotNetFramework, extraProjectInfo, optionsStamp, userOpName)
 
     member __.GetProjectOptionsFromCommandLineArgs(projectFileName, argv, ?loadedTimeStamp, ?extraProjectInfo: obj) = 
         let loadedTimeStamp = defaultArg loadedTimeStamp DateTime.MaxValue // Not 'now', we don't want to force reloading

src/fsharp/service/service.fsi

@@ -222,13 +222,13 @@ type public FSharpChecker =
     /// <param name="otherFlags">Other flags for compilation.</param>
     /// <param name="useFsiAuxLib">Add a default reference to the FSharp.Compiler.Interactive.Settings library.</param>
     /// <param name="useSdkRefs">Use the implicit references from the .NET SDK.</param>
-    /// <param name="defaultToDotNetFramework">Indicates scripts without explicit target framework declarations should be assumed to be .NET Framework scripts.</param>
+    /// <param name="useDotNetFramework">Indicates scripts without explicit target framework declarations should be assumed to be .NET Framework scripts.</param>
     /// <param name="extraProjectInfo">An extra data item added to the returned FSharpProjectOptions.</param>
     /// <param name="optionsStamp">An optional unique stamp for the options.</param>
     /// <param name="userOpName">An optional string used for tracing compiler operations associated with this request.</param>
     member GetProjectOptionsFromScript:
         filename: string * source: ISourceText * ?previewEnabled:bool * ?loadedTimeStamp: DateTime *
-        ?otherFlags: string[] * ?useFsiAuxLib: bool * ?useSdkRefs: bool * ?defaultToDotNetFramework: bool *
+        ?otherFlags: string[] * ?useFsiAuxLib: bool * ?useSdkRefs: bool * ?useDotNetFramework: bool *
         ?extraProjectInfo: obj * ?optionsStamp: int64 * ?userOpName: string
             -> Async<FSharpProjectOptions * FSharpErrorInfo list>
 

tests/service/ScriptOptionsTests.fs

@@ -22,36 +22,36 @@ let pi = Math.PI
 [<TestCase(true, false, [| "--targetprofile:mscorlib" |])>]
 [<TestCase(false, true, [| "--targetprofile:netcore" |])>]
 [<Test>]
-let ``can generate options for different frameworks regardless of execution environment``(defaultToDotNetFramework, useSdk, flags) =
+let ``can generate options for different frameworks regardless of execution environment``(useDotNetFramework, useSdk, flags) =
     let path = Path.GetTempPath()
     let file = Path.GetTempFileName()
     let tempFile = Path.Combine(path, file)
     let (_, errors) =
-        checker.GetProjectOptionsFromScript(tempFile, SourceText.ofString scriptSource, defaultToDotNetFramework = defaultToDotNetFramework, useSdkRefs = useSdk, otherFlags = flags)
+        checker.GetProjectOptionsFromScript(tempFile, SourceText.ofString scriptSource, useDotNetFramework = useDotNetFramework, useSdkRefs = useSdk, otherFlags = flags)
         |> Async.RunSynchronously
     match errors with
     | [] -> ()
-    | errors -> failwithf "Error while parsing script with defaultToDotNetFramework:%b, useSdkRefs:%b, and otherFlags:%A:\n%A" defaultToDotNetFramework useSdk flags errors
+    | errors -> failwithf "Error while parsing script with useDotNetFramework:%b, useSdkRefs:%b, and otherFlags:%A:\n%A" useDotNetFramework useSdk flags errors
 
 [<TestCase(true, false, [| "--targetprofile:mscorlib" |])>]
 [<TestCase(false, true, [| "--targetprofile:netcore" |])>]
 [<Test>]
-let ``all default assembly references are system assemblies``(defaultToDotNetFramework, useSdk, flags) =
+let ``all default assembly references are system assemblies``(useDotNetFramework, useSdk, flags) =
     let path = Path.GetTempPath()
     let file = Path.GetTempFileName()
     let tempFile = Path.Combine(path, file)
     let (options, errors) =
-        checker.GetProjectOptionsFromScript(tempFile, SourceText.ofString scriptSource, defaultToDotNetFramework = defaultToDotNetFramework, useSdkRefs = useSdk, otherFlags = flags)
+        checker.GetProjectOptionsFromScript(tempFile, SourceText.ofString scriptSource, useDotNetFramework = useDotNetFramework, useSdkRefs = useSdk, otherFlags = flags)
         |> Async.RunSynchronously
     match errors with
     | [] -> ()
-    | errors -> failwithf "Error while parsing script with assumeDotNetFramework:%b, useSdkRefs:%b, and otherFlags:%A:\n%A" defaultToDotNetFramework useSdk flags errors
+    | errors -> failwithf "Error while parsing script with assumeDotNetFramework:%b, useSdkRefs:%b, and otherFlags:%A:\n%A" useDotNetFramework useSdk flags errors
     for r in options.OtherOptions do 
         if r.StartsWith("-r:") then 
             let ref = Path.GetFullPath(r.[3..])
             let baseName = Path.GetFileNameWithoutExtension(ref)
-            if not (FSharp.Compiler.FxResolver(Some defaultToDotNetFramework).GetSystemAssemblies().Contains(baseName)) then
+            if not (FSharp.Compiler.FxResolver(Some useDotNetFramework).GetSystemAssemblies().Contains(baseName)) then
                 printfn "Failing, printing options from GetProjectOptionsFromScript..."
                 for opt in options.OtherOptions do
                     printfn "option: %s" opt
-                failwithf "expected FSharp.Compiler.DotNetFrameworkDependencies.systemAssemblies to contain '%s' because '%s' is a default reference for a script, (assumeNetFx, useSdk, flags) = %A" baseName ref (defaultToDotNetFramework, useSdk, flags) 
+                failwithf "expected FSharp.Compiler.DotNetFrameworkDependencies.systemAssemblies to contain '%s' because '%s' is a default reference for a script, (assumeNetFx, useSdk, flags) = %A" baseName ref (useDotNetFramework, useSdk, flags) 

vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs

@@ -103,7 +103,7 @@ type private FSharpProjectOptionsReactor (workspace: Workspace, settings: Editor
                     checkerProvider.Checker.GetProjectOptionsFromScript(document.FilePath,
                         sourceText.ToFSharpSourceText(),
                         SessionsProperties.fsiPreview,
-                        defaultToDotNetFramework=not SessionsProperties.fsiUseNetCore,
+                        useDotNetFramework=not SessionsProperties.fsiUseNetCore,
                         userOpName=userOpName)
 
                 let projectOptions =

vsintegration/src/FSharp.VS.FSI/Properties.resx

@@ -118,33 +118,24 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-
+  <data name="FSharpInteractive64Bit" xml:space="preserve">
+    <value>64-bit for .NET Framework</value>
+  </data>
+  <data name="FSharpInteractive64BitDescr" xml:space="preserve">
+    <value>If set to true, then run F# Interactive as a 64-bit process when using .NET Framework scripting on a 64-bit machine, otherwise, use a 32-bit process. If .NET Core scripting is enabled, F# Interactive is always a 64-bit process.</value>
+  </data>
   <data name="FSharpInteractiveOptions" xml:space="preserve">
     <value>F# Interactive options</value>
   </data>
   <data name="FSharpInteractiveOptionsDescr" xml:space="preserve">
     <value>Additional command line arguments passed to the F# Interactive executable by Visual Studio. (optimization and debug flags are ignored if script debugging is enabled)</value>
   </data>
-
-  <!-- section Startup --> 
+  <data name="FSharpInteractiveMisc" xml:space="preserve">
+    <value>Misc</value>
+  </data>
   <data name="FSharpInteractiveStartup" xml:space="preserve">
     <value>Startup</value>
   </data>
-  <data name="FSharpInteractiveUseNetCore" xml:space="preserve">
-    <value>Use .NET Core Scripting</value>
-  </data>
-  <data name="FSharpInteractiveUseNetCoreDescr" xml:space="preserve">
-    <value>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</value>
-  </data>
-  <data name="FSharpInteractiveExe" xml:space="preserve">
-    <value>F# Interactive executable</value>
-  </data>
-  <data name="FSharpInteractiveExeDescr" xml:space="preserve">
-    <value>Select F# Interactive executable to use for script execution</value>
-  </data>
-
-
-  <!-- section .NET Framework --> 
   <data name="FSharpInteractiveDotNetFramework" xml:space="preserve">
     <value>.NET Framework Options</value>
   </data>
@@ -154,33 +145,29 @@
   <data name="FSharpInteractiveShadowCopyDescr" xml:space="preserve">
     <value>Prevents referenced assemblies from being locked by the F# Interactive process (.NET Framework only).</value>
   </data>
-  <data name="FSharpInteractive64Bit" xml:space="preserve">
-    <value>64-bit for .NET Framework</value>
-  </data>
-  <data name="FSharpInteractive64BitDescr" xml:space="preserve">
-    <value>If set to true, then run F# Interactive as a 64-bit process when using .NET Framework scripting on a 64-bit machine, otherwise, use a 32-bit process. If .NET Core scripting is enabled, F# Interactive is always a 64-bit process.</value>
-  </data>
-
-  <!-- section Debugging --> 
-  <data name="FSharpInteractiveDebugging" xml:space="preserve">
-    <value>Debugging</value>
-  </data>
   <data name="FSharpInteractiveDebugMode" xml:space="preserve">
     <value>Enable script debugging</value>
   </data>
   <data name="FSharpInteractiveDebugModeDescr" xml:space="preserve">
     <value>Enable debugging of F# scripts (.NET Framework only, may impact script performance, requires reset of F# Interactive)</value>
   </data>
-
-  <!-- section Preview --> 
+  <data name="FSharpInteractiveDebugging" xml:space="preserve">
+    <value>Debugging</value>
+  </data>
   <data name="FSharpInteractivePreview" xml:space="preserve">
     <value>FSI Preview</value>
   </data>
+  <data name="FSharpInteractivePreviewModeDescr" xml:space="preserve">
+    <value>Enable preview of in-development language features in F# Interactive script execution</value>
+  </data>
   <data name="FSharpInteractivePreviewMode" xml:space="preserve">
     <value>Enable preview language features</value>
   </data>
-  <data name="FSharpInteractivePreviewModeDescr" xml:space="preserve">
-    <value>Enable preview of in-development language features in F# Interactive script execution</value>
+  <data name="FSharpInteractiveUseNetCore" xml:space="preserve">
+    <value>Use .NET Core Scripting</value>
+  </data>
+  <data name="FSharpInteractiveUseNetCoreDescr" xml:space="preserve">
+    <value>Enable .NET Core script editing and execution for all F# scripts and the F# Interactive window</value>
   </data>
 
 </root>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/fsiLanguageService.fs

@@ -31,41 +31,36 @@ module internal ContentType =
 type FsiPropertyPage() = 
     inherit DialogPage()
 
-    [<ResourceCategory(SRProperties.FSharpInteractiveStartup)>]
-    [<ResourceDisplayName(SRProperties.FSharpInteractiveUseNetCore)>]
-    [<ResourceDescription(SRProperties.FSharpInteractiveUseNetCoreDescr)>]
-    member this.FsiUseNetCore with get() = SessionsProperties.fsiUseNetCore and set (x:bool) = SessionsProperties.fsiUseNetCore <- x
-
-    [<ResourceCategory(SRProperties.FSharpInteractiveStartup)>]
-    [<ResourceDisplayName(SRProperties.FSharpInteractiveExe)>]
-    [<ResourceDescription(SRProperties.FSharpInteractiveExeDescr)>]
-    member this.FsiExe with get() = SessionsProperties.fsiExe and set (x:string) = SessionsProperties.fsiExe <- x
+    [<ResourceCategory(SRProperties.FSharpInteractiveMisc)>]
+    [<ResourceDisplayName(SRProperties.FSharpInteractive64Bit)>]
+    [<ResourceDescription(SRProperties.FSharpInteractive64BitDescr)>]
+    member this.FsiPreferAnyCPUVersion with get() = SessionsProperties.useAnyCpuVersion and set (x:bool) = SessionsProperties.useAnyCpuVersion <- x
 
-    [<ResourceCategory(SRProperties.FSharpInteractiveStartup)>]
+    [<ResourceCategory(SRProperties.FSharpInteractiveMisc)>]
     [<ResourceDisplayName(SRProperties.FSharpInteractiveOptions)>]
     [<ResourceDescription(SRProperties.FSharpInteractiveOptionsDescr)>]
     member this.FsiCommandLineArgs with get() = SessionsProperties.fsiArgs and set (x:string) = SessionsProperties.fsiArgs <- x
 
-    [<ResourceCategory(SRProperties.FSharpInteractiveDotNetFramework)>]
-    [<ResourceDisplayName(SRProperties.FSharpInteractiveDebugMode)>]
-    [<ResourceDescription(SRProperties.FSharpInteractiveDebugModeDescr)>]
-    member this.FsiDebugMode with get() = SessionsProperties.fsiDebugMode and set (x:bool) = SessionsProperties.fsiDebugMode <- x
-
-    [<ResourceCategory(SRProperties.FSharpInteractiveDotNetFramework)>]
-    [<ResourceDisplayName(SRProperties.FSharpInteractive64Bit)>]
-    [<ResourceDescription(SRProperties.FSharpInteractive64BitDescr)>]
-    member this.FsiPreferAnyCPUVersion with get() = SessionsProperties.useAnyCpuVersion and set (x:bool) = SessionsProperties.useAnyCpuVersion <- x
-
-    [<ResourceCategory(SRProperties.FSharpInteractiveDotNetFramework)>]
+    [<ResourceCategory(SRProperties.FSharpInteractiveMisc)>]
     [<ResourceDisplayName(SRProperties.FSharpInteractiveShadowCopy)>]
     [<ResourceDescription(SRProperties.FSharpInteractiveShadowCopyDescr)>]
     member this.FsiShadowCopy with get() = SessionsProperties.fsiShadowCopy and set (x:bool) = SessionsProperties.fsiShadowCopy <- x
 
+    [<ResourceCategory(SRProperties.FSharpInteractiveDebugging)>]
+    [<ResourceDisplayName(SRProperties.FSharpInteractiveDebugMode)>]
+    [<ResourceDescription(SRProperties.FSharpInteractiveDebugModeDescr)>]
+    member this.FsiDebugMode with get() = SessionsProperties.fsiDebugMode and set (x:bool) = SessionsProperties.fsiDebugMode <- x
+
     [<ResourceCategory(SRProperties.FSharpInteractivePreview)>]
     [<ResourceDisplayName(SRProperties.FSharpInteractivePreviewMode)>]
     [<ResourceDescription(SRProperties.FSharpInteractivePreviewModeDescr)>]
     member this.FsiPreview with get() = SessionsProperties.fsiPreview and set (x:bool) = SessionsProperties.fsiPreview <- x
 
+    [<ResourceCategory(SRProperties.FSharpInteractivePreview)>]
+    [<ResourceDisplayName(SRProperties.FSharpInteractiveUseNetCore)>]
+    [<ResourceDescription(SRProperties.FSharpInteractiveUseNetCoreDescr)>]
+    member this.FsiUseNetCore with get() = SessionsProperties.fsiUseNetCore and set (x:bool) = SessionsProperties.fsiUseNetCore <- x
+
 // CompletionSet
 type internal FsiCompletionSet(imageList,source:Source) =
     inherit CompletionSet(imageList, source)

vsintegration/src/FSharp.VS.FSI/sessions.fs

@@ -66,7 +66,6 @@ module SessionsProperties =
     let mutable useAnyCpuVersion = true // 64-bit by default
     let mutable fsiUseNetCore = false
     let mutable fsiArgs = "--optimize"
-    let mutable fsiExe : string = null
     let mutable fsiShadowCopy = true
     let mutable fsiDebugMode = false
     let mutable fsiPreview = false
@@ -132,15 +131,7 @@ let catchAll trigger x =
 let determineFsiPath () =    
     if SessionsProperties.fsiUseNetCore then 
         let exe = @"c:\Program Files\dotnet\dotnet.exe"
-        let arg = 
-            if String.IsNullOrWhiteSpace SessionsProperties.fsiExe then
-                "fsi"
-            else
-                if File.Exists SessionsProperties.fsiExe then
-                        SessionsProperties.fsiExe
-                else
-                    raise (SessionError (VFSIstrings.SR.couldNotFindFsiExe SessionsProperties.fsiExe))
-
+        let arg = "fsi"
         if not (File.Exists exe) then
             raise (SessionError (VFSIstrings.SR.couldNotFindFsiExe exe))
         exe, arg, false, false
@@ -161,13 +152,6 @@ let determineFsiPath () =
             Path.Combine(thisAssemblyDirectory,fsiExeName() )
 
         let fsiExe =
-            if not (String.IsNullOrWhiteSpace SessionsProperties.fsiExe) then
-                if File.Exists SessionsProperties.fsiExe then
-                    SessionsProperties.fsiExe
-                else
-                    raise (SessionError (VFSIstrings.SR.couldNotFindFsiExe SessionsProperties.fsiExe))
-            else
-
             // Choose VS extension path, if it exists (for developers)
             let fsiRelativePath1 = determineFsiRelativePath1()
             if  File.Exists fsiRelativePath1 then fsiRelativePath1 else
@@ -265,6 +249,8 @@ let fsiStartInfo channelName =
     procInfo.RedirectStandardOutput <- true
     procInfo.StandardOutputEncoding <- Encoding.UTF8
     procInfo.StandardErrorEncoding <- Encoding.UTF8
+    
+    // TODO - use the path of the currently open document if available
     let tmpPath = Path.GetTempPath()
     if Directory.Exists(tmpPath) then
         procInfo.WorkingDirectory <- tmpPath

vsintegration/src/FSharp.VS.FSI/xlf/Properties.cs.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.de.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.es.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.fr.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.it.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.ja.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.ko.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.pl.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.pt-BR.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.ru.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.tr.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.zh-Hans.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/xlf/Properties.zh-Hant.xlf

@@ -17,14 +17,9 @@
         <target state="new">.NET Framework Options</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveExe">
-        <source>F# Interactive executable</source>
-        <target state="new">F# Interactive executable</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveExeDescr">
-        <source>Select F# Interactive executable to use for script execution</source>
-        <target state="new">Select F# Interactive executable to use for script execution</target>
+      <trans-unit id="FSharpInteractiveMisc">
+        <source>Misc</source>
+        <target state="new">Misc</target>
         <note />
       </trans-unit>
       <trans-unit id="FSharpInteractiveOptions">
@@ -82,16 +77,6 @@
         <target state="new">Startup</target>
         <note />
       </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCore">
-        <source>Use .NET Core Scripting</source>
-        <target state="new">Use .NET Core Scripting</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="FSharpInteractiveUseNetCoreDescr">
-        <source>Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</source>
-        <target state="new">Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given</target>
-        <note />
-      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file