diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
index 23d09f3f035aeca0bdff64ec6cf264a78a711ae2..54e879d33e3bf69178b2efe5e5cd451e2a953468 100644
--- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
+++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -8,7 +8,7 @@
$(DefineConstants);COMPILER_SERVICE_AS_DLL$(DefineConstants);COMPILER$(DefineConstants);ENABLE_MONO_SUPPORT
- $(OtherFlags) --sig:all.fsi /warnon:3218 /warnon:1182 /warnon:3390 --times
+ $(OtherFlags) /warnon:3218 /warnon:1182 /warnon:3390 --timestruetrue
diff --git a/src/fsharp/ScriptClosure.fs b/src/fsharp/ScriptClosure.fs
index 94653618e11144aa50157a2e1e3daa3f2f732659..027200678ccd8d06a725c45f4f98cbfdf26ba19f 100644
--- a/src/fsharp/ScriptClosure.fs
+++ b/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
diff --git a/src/fsharp/ScriptClosure.fsi b/src/fsharp/ScriptClosure.fsi
index 017fbe05fc2f6dc8a2e39fb9fdc9655d571cb387..10b0a08c81b752d2a18f763596979517bd2ba299 100644
--- a/src/fsharp/ScriptClosure.fsi
+++ b/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
diff --git a/src/fsharp/service/FSharpCheckerResults.fs b/src/fsharp/service/FSharpCheckerResults.fs
index 8e20fed4c18aede9d71f7f7a85bf9f7fa1f5d6e3..b0cbcf56053ea8c726910dbd6474e6aae62b4a41 100644
--- a/src/fsharp/service/FSharpCheckerResults.fs
+++ b/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)
diff --git a/src/fsharp/service/service.fs b/src/fsharp/service/service.fs
index 6d4313c8858eecad16119427f801c7ed5e61dd74..270232dba551e810095ec03488c316ceda63dae9 100644
--- a/src/fsharp/service/service.fs
+++ b/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
diff --git a/src/fsharp/service/service.fsi b/src/fsharp/service/service.fsi
index ee67967edd03c838f7b440a14bdab5535480b9b6..2ac0230c5b96f5c14e0a13f342b4db67ee2bb8da 100755
--- a/src/fsharp/service/service.fsi
+++ b/src/fsharp/service/service.fsi
@@ -222,13 +222,13 @@ type public FSharpChecker =
/// Other flags for compilation.
/// Add a default reference to the FSharp.Compiler.Interactive.Settings library.
/// Use the implicit references from the .NET SDK.
- /// Indicates scripts without explicit target framework declarations should be assumed to be .NET Framework scripts.
+ /// Indicates scripts without explicit target framework declarations should be assumed to be .NET Framework scripts.
/// An extra data item added to the returned FSharpProjectOptions.
/// An optional unique stamp for the options.
/// An optional string used for tracing compiler operations associated with this request.
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
diff --git a/tests/service/ScriptOptionsTests.fs b/tests/service/ScriptOptionsTests.fs
index 62b1639ba87947ed0d28cb4494ee9a9ff3362dec..3d3585d5301f5a1ec908c07cac94a69c6c2b92b2 100644
--- a/tests/service/ScriptOptionsTests.fs
+++ b/tests/service/ScriptOptionsTests.fs
@@ -22,36 +22,36 @@ let pi = Math.PI
[]
[]
[]
-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
[]
[]
[]
-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)
diff --git a/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs b/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs
index 935ce802bcc9357f594cebcbb2c146ceae7958be..487db49fa58cbd51ab23ba413c77672d389c2af9 100644
--- a/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs
+++ b/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 =
diff --git a/vsintegration/src/FSharp.VS.FSI/Properties.resx b/vsintegration/src/FSharp.VS.FSI/Properties.resx
index 47b5af639288799c8cd9ea784e1b02b469c9bbb3..4d9e4441edcfd5e9c7599b8a3c265aafc398bde5 100644
--- a/vsintegration/src/FSharp.VS.FSI/Properties.resx
+++ b/vsintegration/src/FSharp.VS.FSI/Properties.resx
@@ -118,33 +118,24 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
+ 64-bit for .NET Framework
+
+
+ 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.
+
F# Interactive optionsAdditional command line arguments passed to the F# Interactive executable by Visual Studio. (optimization and debug flags are ignored if script debugging is enabled)
-
-
+
+ Misc
+
Startup
-
- Use .NET Core Scripting
-
-
- Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given
-
-
- F# Interactive executable
-
-
- Select F# Interactive executable to use for script execution
-
-
-
-
.NET Framework Options
@@ -154,33 +145,29 @@
Prevents referenced assemblies from being locked by the F# Interactive process (.NET Framework only).
-
- 64-bit for .NET Framework
-
-
- 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.
-
-
-
-
- Debugging
-
Enable script debuggingEnable debugging of F# scripts (.NET Framework only, may impact script performance, requires reset of F# Interactive)
-
-
+
+ Debugging
+
FSI Preview
+
+ Enable preview of in-development language features in F# Interactive script execution
+
Enable preview language features
-
- Enable preview of in-development language features in F# Interactive script execution
+
+ Use .NET Core Scripting
+
+
+ Enable .NET Core script editing and execution for all F# scripts and the F# Interactive window
\ No newline at end of file
diff --git a/vsintegration/src/FSharp.VS.FSI/fsiLanguageService.fs b/vsintegration/src/FSharp.VS.FSI/fsiLanguageService.fs
index 46e59122f68c097e8f07d820a34c8f41aa3c958d..160b7a204fa8d4cb056a7da2883d847a1fdbde15 100644
--- a/vsintegration/src/FSharp.VS.FSI/fsiLanguageService.fs
+++ b/vsintegration/src/FSharp.VS.FSI/fsiLanguageService.fs
@@ -31,41 +31,36 @@ module internal ContentType =
type FsiPropertyPage() =
inherit DialogPage()
- []
- []
- []
- member this.FsiUseNetCore with get() = SessionsProperties.fsiUseNetCore and set (x:bool) = SessionsProperties.fsiUseNetCore <- x
-
- []
- []
- []
- member this.FsiExe with get() = SessionsProperties.fsiExe and set (x:string) = SessionsProperties.fsiExe <- x
+ []
+ []
+ []
+ member this.FsiPreferAnyCPUVersion with get() = SessionsProperties.useAnyCpuVersion and set (x:bool) = SessionsProperties.useAnyCpuVersion <- x
- []
+ []
[]
[]
member this.FsiCommandLineArgs with get() = SessionsProperties.fsiArgs and set (x:string) = SessionsProperties.fsiArgs <- x
- []
- []
- []
- member this.FsiDebugMode with get() = SessionsProperties.fsiDebugMode and set (x:bool) = SessionsProperties.fsiDebugMode <- x
-
- []
- []
- []
- member this.FsiPreferAnyCPUVersion with get() = SessionsProperties.useAnyCpuVersion and set (x:bool) = SessionsProperties.useAnyCpuVersion <- x
-
- []
+ []
[]
[]
member this.FsiShadowCopy with get() = SessionsProperties.fsiShadowCopy and set (x:bool) = SessionsProperties.fsiShadowCopy <- x
+ []
+ []
+ []
+ member this.FsiDebugMode with get() = SessionsProperties.fsiDebugMode and set (x:bool) = SessionsProperties.fsiDebugMode <- x
+
[]
[]
[]
member this.FsiPreview with get() = SessionsProperties.fsiPreview and set (x:bool) = SessionsProperties.fsiPreview <- x
+ []
+ []
+ []
+ 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)
diff --git a/vsintegration/src/FSharp.VS.FSI/sessions.fs b/vsintegration/src/FSharp.VS.FSI/sessions.fs
index d61a5d684849085355ff34626c9d060805a4c4a5..c5fc42b793fe75b3dd77142d3cde533d1bd8e16a 100644
--- a/vsintegration/src/FSharp.VS.FSI/sessions.fs
+++ b/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
diff --git a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.cs.xlf b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.cs.xlf
index 55a4524d53a4352aedbf5704044c427872dd0ed3..22f18dc8f5110e43c5181027b504edbcd8eb661a 100644
--- a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.cs.xlf
+++ b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.cs.xlf
@@ -17,14 +17,9 @@
.NET Framework Options
-
- F# Interactive executable
- F# Interactive executable
-
-
-
- Select F# Interactive executable to use for script execution
- Select F# Interactive executable to use for script execution
+
+ Misc
+ Misc
@@ -82,16 +77,6 @@
Startup
-
- Use .NET Core Scripting
- Use .NET Core Scripting
-
-
-
- Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given
- Use F# Interactive for .NET Core for script execution. When editing assume scripts target .NET Core if no explicit #targetfx "netfx" is given
-
-
\ No newline at end of file
diff --git a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.de.xlf b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.de.xlf
index 5e7ef0f709ab7dc0090239f8810f433746908a7a..d52311b31f5a09431e103090bf06e3e69cc2cbb0 100644
--- a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.de.xlf
+++ b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.de.xlf
@@ -17,14 +17,9 @@