Skip to content

F
fsharp

dotNET Platform / fsharp
12 个月 前同步成功

通知 0
Star 1
Fork 0
F
fsharp

体验新版 GitCode，发现更多精彩内容 >>

提交 2834db36 编写于 作者: D Don Syme
浏览文件
操作

fxspec update

上级 a2a3dacc
隐藏空白更改
内联 并排
Showing with 104 addition and 331 deletion
src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
浏览文件 @ 2834db36
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants> <DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants> <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</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> <Tailcalls>true</Tailcalls>
<!-- .tail annotations always emitted for this binary, even in debug mode --> <!-- .tail annotations always emitted for this binary, even in debug mode -->
<NGenBinary>true</NGenBinary> <NGenBinary>true</NGenBinary>
......
src/fsharp/ScriptClosure.fs
浏览文件 @ 2834db36
...@@ -404,8 +404,8 @@ module ScriptPreprocessClosure = ...@@ -404,8 +404,8 @@ module ScriptPreprocessClosure =
result result
let InferTargetFrameworkForScript (_fileName, defaultToDotNetFramework: bool) = let InferTargetFrameworkForScript (_fileName, useDotNetFramework: bool) =
TargetFrameworkForScripts (if defaultToDotNetFramework then PrimaryAssembly.Mscorlib else PrimaryAssembly.System_Runtime) 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 /// Given source text, find the full load closure. Used from service.fs, when editing a script file
let GetFullClosureOfScriptText let GetFullClosureOfScriptText
...@@ -413,7 +413,7 @@ module ScriptPreprocessClosure = ...@@ -413,7 +413,7 @@ module ScriptPreprocessClosure =
filename, sourceText: ISourceText, codeContext, filename, sourceText: ISourceText, codeContext,
useSimpleResolution, useFsiAuxLib, useSdkRefs, useSimpleResolution, useFsiAuxLib, useSdkRefs,
lexResourceManager: Lexhelp.LexResourceManager, lexResourceManager: Lexhelp.LexResourceManager,
applyCommandLineArgs, defaultToDotNetFramework, applyCommandLineArgs, useDotNetFramework,
tryGetMetadataSnapshot, reduceMemoryUsage, dependencyProvider) = tryGetMetadataSnapshot, reduceMemoryUsage, dependencyProvider) =
// Resolve the basic references such as FSharp.Core.dll first, before processing any #I directives in the script // Resolve the basic references such as FSharp.Core.dll first, before processing any #I directives in the script
...@@ -422,7 +422,7 @@ module ScriptPreprocessClosure = ...@@ -422,7 +422,7 @@ module ScriptPreprocessClosure =
// first, then #I and other directives are processed. // first, then #I and other directives are processed.
// //
// We first infer the explicit framework from the root script. // We first infer the explicit framework from the root script.
let inferredTargetFramework = InferTargetFrameworkForScript (filename, defaultToDotNetFramework) let inferredTargetFramework = InferTargetFrameworkForScript (filename, useDotNetFramework)
let useDotNetFramework = inferredTargetFramework.UseDotNetFramework let useDotNetFramework = inferredTargetFramework.UseDotNetFramework
...@@ -470,14 +470,14 @@ type LoadClosure with ...@@ -470,14 +470,14 @@ type LoadClosure with
(ctok, legacyReferenceResolver, defaultFSharpBinariesDir, (ctok, legacyReferenceResolver, defaultFSharpBinariesDir,
filename: string, sourceText: ISourceText, implicitDefines, useSimpleResolution: bool, filename: string, sourceText: ISourceText, implicitDefines, useSimpleResolution: bool,
useFsiAuxLib, useSdkRefs, lexResourceManager: Lexhelp.LexResourceManager, useFsiAuxLib, useSdkRefs, lexResourceManager: Lexhelp.LexResourceManager,
applyCompilerOptions, defaultToDotNetFramework, tryGetMetadataSnapshot, applyCompilerOptions, useDotNetFramework, tryGetMetadataSnapshot,
reduceMemoryUsage, dependencyProvider) = reduceMemoryUsage, dependencyProvider) =
use unwindBuildPhase = PushThreadBuildPhaseUntilUnwind BuildPhase.Parse use unwindBuildPhase = PushThreadBuildPhaseUntilUnwind BuildPhase.Parse
ScriptPreprocessClosure.GetFullClosureOfScriptText ScriptPreprocessClosure.GetFullClosureOfScriptText
(ctok, legacyReferenceResolver, defaultFSharpBinariesDir, filename, sourceText, (ctok, legacyReferenceResolver, defaultFSharpBinariesDir, filename, sourceText,
implicitDefines, useSimpleResolution, useFsiAuxLib, useSdkRefs, lexResourceManager, 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. /// Analyze a set of script files and find the closure of their references.
static member ComputeClosureOfScriptFiles static member ComputeClosureOfScriptFiles
......
src/fsharp/ScriptClosure.fsi
浏览文件 @ 2834db36
...@@ -79,7 +79,7 @@ type LoadClosure = ...@@ -79,7 +79,7 @@ type LoadClosure =
useSdkRefs: bool * useSdkRefs: bool *
lexResourceManager: Lexhelp.LexResourceManager * lexResourceManager: Lexhelp.LexResourceManager *
applyCompilerOptions: (TcConfigBuilder -> unit) * applyCompilerOptions: (TcConfigBuilder -> unit) *
defaultToDotNetFramework: bool * useDotNetFramework: bool *
tryGetMetadataSnapshot: ILReaderTryGetMetadataSnapshot * tryGetMetadataSnapshot: ILReaderTryGetMetadataSnapshot *
reduceMemoryUsage: ReduceMemoryFlag * reduceMemoryUsage: ReduceMemoryFlag *
dependencyProvider: DependencyProvider dependencyProvider: DependencyProvider
......
src/fsharp/service/FSharpCheckerResults.fs
浏览文件 @ 2834db36
...@@ -2156,7 +2156,7 @@ type FsiInteractiveChecker(legacyReferenceResolver, ...@@ -2156,7 +2156,7 @@ type FsiInteractiveChecker(legacyReferenceResolver,
let backgroundDiagnostics = [| |] let backgroundDiagnostics = [| |]
let reduceMemoryUsage = ReduceMemoryFlag.Yes let reduceMemoryUsage = ReduceMemoryFlag.Yes
let defaultToDotNetFramework = (tcConfig.primaryAssembly = PrimaryAssembly.Mscorlib) let useDotNetFramework = (tcConfig.primaryAssembly = PrimaryAssembly.Mscorlib)
let applyCompilerOptions tcConfigB = let applyCompilerOptions tcConfigB =
let fsiCompilerOptions = CompilerOptions.GetCoreFsiCompilerOptions tcConfigB let fsiCompilerOptions = CompilerOptions.GetCoreFsiCompilerOptions tcConfigB
...@@ -2167,7 +2167,7 @@ type FsiInteractiveChecker(legacyReferenceResolver, ...@@ -2167,7 +2167,7 @@ type FsiInteractiveChecker(legacyReferenceResolver,
filename, sourceText, CodeContext.Editing, filename, sourceText, CodeContext.Editing,
tcConfig.useSimpleResolution, tcConfig.useFsiAuxLib, tcConfig.useSimpleResolution, tcConfig.useFsiAuxLib,
tcConfig.useSdkRefs, new Lexhelp.LexResourceManager(), tcConfig.useSdkRefs, new Lexhelp.LexResourceManager(),
applyCompilerOptions, defaultToDotNetFramework, applyCompilerOptions, useDotNetFramework,
tryGetMetadataSnapshot=(fun _ -> None), tryGetMetadataSnapshot=(fun _ -> None),
reduceMemoryUsage=reduceMemoryUsage, reduceMemoryUsage=reduceMemoryUsage,
dependencyProvider=tcImports.DependencyProvider) dependencyProvider=tcImports.DependencyProvider)
......
src/fsharp/service/service.fs
浏览文件 @ 2834db36
...@@ -862,7 +862,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC ...@@ -862,7 +862,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC
loadedTimeStamp, otherFlags, loadedTimeStamp, otherFlags,
useFsiAuxLib: bool option, useFsiAuxLib: bool option,
useSdkRefs: bool option, useSdkRefs: bool option,
defaultToDotNetFramework: bool option, useDotNetFramework: bool option,
extraProjectInfo: obj option, extraProjectInfo: obj option,
optionsStamp: int64 option, optionsStamp: int64 option,
userOpName) = userOpName) =
...@@ -880,7 +880,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC ...@@ -880,7 +880,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC
// Do we assume .NET Framework references for scripts? In the absence of either explicit argument // 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 // or an explicit #targetfx declaration, then for compilation and analysis the default
// depends on the toolchain the tooling is are running on. // 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 = let extraFlags =
if previewEnabled then if previewEnabled then
[| "--langversion:preview" |] [| "--langversion:preview" |]
...@@ -902,7 +902,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC ...@@ -902,7 +902,7 @@ type BackgroundCompiler(legacyReferenceResolver, projectCacheSize, keepAssemblyC
LoadClosure.ComputeClosureOfScriptText(ctok, legacyReferenceResolver, LoadClosure.ComputeClosureOfScriptText(ctok, legacyReferenceResolver,
FSharpCheckerResultsSettings.defaultFSharpBinariesDir, filename, sourceText, FSharpCheckerResultsSettings.defaultFSharpBinariesDir, filename, sourceText,
CodeContext.Editing, useSimpleResolution, useFsiAuxLib, useSdkRefs, new Lexhelp.LexResourceManager(), CodeContext.Editing, useSimpleResolution, useFsiAuxLib, useSdkRefs, new Lexhelp.LexResourceManager(),
applyCompilerOptions, defaultToDotNetFramework, applyCompilerOptions, useDotNetFramework,
tryGetMetadataSnapshot, reduceMemoryUsage, dependencyProviderForScripts) tryGetMetadataSnapshot, reduceMemoryUsage, dependencyProviderForScripts)
let otherFlags = let otherFlags =
...@@ -1303,9 +1303,9 @@ type FSharpChecker(legacyReferenceResolver, ...@@ -1303,9 +1303,9 @@ type FSharpChecker(legacyReferenceResolver,
backgroundCompiler.GetSemanticClassificationForFile(filename, options, userOpName) backgroundCompiler.GetSemanticClassificationForFile(filename, options, userOpName)
/// For a given script file, get the ProjectOptions implied by the #load closure /// 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" 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) = member __.GetProjectOptionsFromCommandLineArgs(projectFileName, argv, ?loadedTimeStamp, ?extraProjectInfo: obj) =
let loadedTimeStamp = defaultArg loadedTimeStamp DateTime.MaxValue // Not 'now', we don't want to force reloading let loadedTimeStamp = defaultArg loadedTimeStamp DateTime.MaxValue // Not 'now', we don't want to force reloading
......
src/fsharp/service/service.fsi
浏览文件 @ 2834db36
...@@ -222,13 +222,13 @@ type public FSharpChecker = ...@@ -222,13 +222,13 @@ type public FSharpChecker =
/// <param name="otherFlags">Other flags for compilation.</param> /// <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="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="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="extraProjectInfo">An extra data item added to the returned FSharpProjectOptions.</param>
/// <param name="optionsStamp">An optional unique stamp for the options.</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> /// <param name="userOpName">An optional string used for tracing compiler operations associated with this request.</param>
member GetProjectOptionsFromScript: member GetProjectOptionsFromScript:
filename: string * source: ISourceText * ?previewEnabled:bool * ?loadedTimeStamp: DateTime * 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 ?extraProjectInfo: obj * ?optionsStamp: int64 * ?userOpName: string
-> Async<FSharpProjectOptions * FSharpErrorInfo list> -> Async<FSharpProjectOptions * FSharpErrorInfo list>
......
tests/service/ScriptOptionsTests.fs
浏览文件 @ 2834db36
...@@ -22,36 +22,36 @@ let pi = Math.PI ...@@ -22,36 +22,36 @@ let pi = Math.PI
[<TestCase(true, false, [| "--targetprofile:mscorlib" |])>] [<TestCase(true, false, [| "--targetprofile:mscorlib" |])>]
[<TestCase(false, true, [| "--targetprofile:netcore" |])>] [<TestCase(false, true, [| "--targetprofile:netcore" |])>]
[<Test>] [<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 path = Path.GetTempPath()
let file = Path.GetTempFileName() let file = Path.GetTempFileName()
let tempFile = Path.Combine(path, file) let tempFile = Path.Combine(path, file)
let (_, errors) = 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 |> Async.RunSynchronously
match errors with 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(true, false, [| "--targetprofile:mscorlib" |])>]
[<TestCase(false, true, [| "--targetprofile:netcore" |])>] [<TestCase(false, true, [| "--targetprofile:netcore" |])>]
[<Test>] [<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 path = Path.GetTempPath()
let file = Path.GetTempFileName() let file = Path.GetTempFileName()
let tempFile = Path.Combine(path, file) let tempFile = Path.Combine(path, file)
let (options, errors) = 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 |> Async.RunSynchronously
match errors with 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 for r in options.OtherOptions do
if r.StartsWith("-r:") then if r.StartsWith("-r:") then
let ref = Path.GetFullPath(r.[3..]) let ref = Path.GetFullPath(r.[3..])
let baseName = Path.GetFileNameWithoutExtension(ref) 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..." printfn "Failing, printing options from GetProjectOptionsFromScript..."
for opt in options.OtherOptions do for opt in options.OtherOptions do
printfn "option: %s" opt 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
浏览文件 @ 2834db36
...@@ -103,7 +103,7 @@ type private FSharpProjectOptionsReactor (workspace: Workspace, settings: Editor ...@@ -103,7 +103,7 @@ type private FSharpProjectOptionsReactor (workspace: Workspace, settings: Editor
checkerProvider.Checker.GetProjectOptionsFromScript(document.FilePath, checkerProvider.Checker.GetProjectOptionsFromScript(document.FilePath,
sourceText.ToFSharpSourceText(), sourceText.ToFSharpSourceText(),
SessionsProperties.fsiPreview, SessionsProperties.fsiPreview,
defaultToDotNetFramework=not SessionsProperties.fsiUseNetCore, useDotNetFramework=not SessionsProperties.fsiUseNetCore,
userOpName=userOpName) userOpName=userOpName)
let projectOptions = let projectOptions =
......
vsintegration/src/FSharp.VS.FSI/Properties.resx
浏览文件 @ 2834db36
...@@ -118,33 +118,24 @@ ...@@ -118,33 +118,24 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </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"> <data name="FSharpInteractiveOptions" xml:space="preserve">
<value>F# Interactive options</value> <value>F# Interactive options</value>
</data> </data>
<data name="FSharpInteractiveOptionsDescr" xml:space="preserve"> <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> <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> </data>
<data name="FSharpInteractiveMisc" xml:space="preserve">
<!-- section Startup --> <value>Misc</value>
</data>
<data name="FSharpInteractiveStartup" xml:space="preserve"> <data name="FSharpInteractiveStartup" xml:space="preserve">
<value>Startup</value> <value>Startup</value>
</data> </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"> <data name="FSharpInteractiveDotNetFramework" xml:space="preserve">
<value>.NET Framework Options</value> <value>.NET Framework Options</value>
</data> </data>
...@@ -154,33 +145,29 @@ ...@@ -154,33 +145,29 @@
<data name="FSharpInteractiveShadowCopyDescr" xml:space="preserve"> <data name="FSharpInteractiveShadowCopyDescr" xml:space="preserve">
<value>Prevents referenced assemblies from being locked by the F# Interactive process (.NET Framework only).</value> <value>Prevents referenced assemblies from being locked by the F# Interactive process (.NET Framework only).</value>
</data> </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"> <data name="FSharpInteractiveDebugMode" xml:space="preserve">
<value>Enable script debugging</value> <value>Enable script debugging</value>
</data> </data>
<data name="FSharpInteractiveDebugModeDescr" xml:space="preserve"> <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> <value>Enable debugging of F# scripts (.NET Framework only, may impact script performance, requires reset of F# Interactive)</value>
</data> </data>
<data name="FSharpInteractiveDebugging" xml:space="preserve">
<!-- section Preview --> <value>Debugging</value>
</data>
<data name="FSharpInteractivePreview" xml:space="preserve"> <data name="FSharpInteractivePreview" xml:space="preserve">
<value>FSI Preview</value> <value>FSI Preview</value>
</data> </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"> <data name="FSharpInteractivePreviewMode" xml:space="preserve">
<value>Enable preview language features</value> <value>Enable preview language features</value>
</data> </data>
<data name="FSharpInteractivePreviewModeDescr" xml:space="preserve"> <data name="FSharpInteractiveUseNetCore" xml:space="preserve">
<value>Enable preview of in-development language features in F# Interactive script execution</value> <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> </data>
</root> </root>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/fsiLanguageService.fs
浏览文件 @ 2834db36
...@@ -31,41 +31,36 @@ module internal ContentType = ...@@ -31,41 +31,36 @@ module internal ContentType =
type FsiPropertyPage() = type FsiPropertyPage() =
inherit DialogPage() inherit DialogPage()
[<ResourceCategory(SRProperties.FSharpInteractiveStartup)>] [<ResourceCategory(SRProperties.FSharpInteractiveMisc)>]
[<ResourceDisplayName(SRProperties.FSharpInteractiveUseNetCore)>] [<ResourceDisplayName(SRProperties.FSharpInteractive64Bit)>]
[<ResourceDescription(SRProperties.FSharpInteractiveUseNetCoreDescr)>] [<ResourceDescription(SRProperties.FSharpInteractive64BitDescr)>]
member this.FsiUseNetCore with get() = SessionsProperties.fsiUseNetCore and set (x:bool) = SessionsProperties.fsiUseNetCore <- x member this.FsiPreferAnyCPUVersion with get() = SessionsProperties.useAnyCpuVersion and set (x:bool) = SessionsProperties.useAnyCpuVersion <- 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.FSharpInteractiveStartup)>] [<ResourceCategory(SRProperties.FSharpInteractiveMisc)>]
[<ResourceDisplayName(SRProperties.FSharpInteractiveOptions)>] [<ResourceDisplayName(SRProperties.FSharpInteractiveOptions)>]
[<ResourceDescription(SRProperties.FSharpInteractiveOptionsDescr)>] [<ResourceDescription(SRProperties.FSharpInteractiveOptionsDescr)>]
member this.FsiCommandLineArgs with get() = SessionsProperties.fsiArgs and set (x:string) = SessionsProperties.fsiArgs <- x member this.FsiCommandLineArgs with get() = SessionsProperties.fsiArgs and set (x:string) = SessionsProperties.fsiArgs <- x
[<ResourceCategory(SRProperties.FSharpInteractiveDotNetFramework)>] [<ResourceCategory(SRProperties.FSharpInteractiveMisc)>]
[<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)>]
[<ResourceDisplayName(SRProperties.FSharpInteractiveShadowCopy)>] [<ResourceDisplayName(SRProperties.FSharpInteractiveShadowCopy)>]
[<ResourceDescription(SRProperties.FSharpInteractiveShadowCopyDescr)>] [<ResourceDescription(SRProperties.FSharpInteractiveShadowCopyDescr)>]
member this.FsiShadowCopy with get() = SessionsProperties.fsiShadowCopy and set (x:bool) = SessionsProperties.fsiShadowCopy <- x 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)>] [<ResourceCategory(SRProperties.FSharpInteractivePreview)>]
[<ResourceDisplayName(SRProperties.FSharpInteractivePreviewMode)>] [<ResourceDisplayName(SRProperties.FSharpInteractivePreviewMode)>]
[<ResourceDescription(SRProperties.FSharpInteractivePreviewModeDescr)>] [<ResourceDescription(SRProperties.FSharpInteractivePreviewModeDescr)>]
member this.FsiPreview with get() = SessionsProperties.fsiPreview and set (x:bool) = SessionsProperties.fsiPreview <- x 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 // CompletionSet
type internal FsiCompletionSet(imageList,source:Source) = type internal FsiCompletionSet(imageList,source:Source) =
inherit CompletionSet(imageList, source) inherit CompletionSet(imageList, source)
......
vsintegration/src/FSharp.VS.FSI/sessions.fs
浏览文件 @ 2834db36
...@@ -66,7 +66,6 @@ module SessionsProperties = ...@@ -66,7 +66,6 @@ module SessionsProperties =
let mutable useAnyCpuVersion = true // 64-bit by default let mutable useAnyCpuVersion = true // 64-bit by default
let mutable fsiUseNetCore = false let mutable fsiUseNetCore = false
let mutable fsiArgs = "--optimize" let mutable fsiArgs = "--optimize"
let mutable fsiExe : string = null
let mutable fsiShadowCopy = true let mutable fsiShadowCopy = true
let mutable fsiDebugMode = false let mutable fsiDebugMode = false
let mutable fsiPreview = false let mutable fsiPreview = false
...@@ -132,15 +131,7 @@ let catchAll trigger x = ...@@ -132,15 +131,7 @@ let catchAll trigger x =
let determineFsiPath () = let determineFsiPath () =
if SessionsProperties.fsiUseNetCore then if SessionsProperties.fsiUseNetCore then
let exe = @"c:\Program Files\dotnet\dotnet.exe" let exe = @"c:\Program Files\dotnet\dotnet.exe"
let arg = let arg = "fsi"
if String.IsNullOrWhiteSpace SessionsProperties.fsiExe then
"fsi"
else
if File.Exists SessionsProperties.fsiExe then
SessionsProperties.fsiExe
else
raise (SessionError (VFSIstrings.SR.couldNotFindFsiExe SessionsProperties.fsiExe))
if not (File.Exists exe) then if not (File.Exists exe) then
raise (SessionError (VFSIstrings.SR.couldNotFindFsiExe exe)) raise (SessionError (VFSIstrings.SR.couldNotFindFsiExe exe))
exe, arg, false, false exe, arg, false, false
...@@ -161,13 +152,6 @@ let determineFsiPath () = ...@@ -161,13 +152,6 @@ let determineFsiPath () =
Path.Combine(thisAssemblyDirectory,fsiExeName() ) Path.Combine(thisAssemblyDirectory,fsiExeName() )
let fsiExe = 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) // Choose VS extension path, if it exists (for developers)
let fsiRelativePath1 = determineFsiRelativePath1() let fsiRelativePath1 = determineFsiRelativePath1()
if File.Exists fsiRelativePath1 then fsiRelativePath1 else if File.Exists fsiRelativePath1 then fsiRelativePath1 else
...@@ -265,6 +249,8 @@ let fsiStartInfo channelName = ...@@ -265,6 +249,8 @@ let fsiStartInfo channelName =
procInfo.RedirectStandardOutput <- true procInfo.RedirectStandardOutput <- true
procInfo.StandardOutputEncoding <- Encoding.UTF8 procInfo.StandardOutputEncoding <- Encoding.UTF8
procInfo.StandardErrorEncoding <- Encoding.UTF8 procInfo.StandardErrorEncoding <- Encoding.UTF8
// TODO - use the path of the currently open document if available
let tmpPath = Path.GetTempPath() let tmpPath = Path.GetTempPath()
if Directory.Exists(tmpPath) then if Directory.Exists(tmpPath) then
procInfo.WorkingDirectory <- tmpPath procInfo.WorkingDirectory <- tmpPath
......
vsintegration/src/FSharp.VS.FSI/xlf/Properties.cs.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.de.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.es.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.fr.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.it.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.ja.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.ko.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.pl.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.pt-BR.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.ru.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.tr.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.zh-Hans.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
vsintegration/src/FSharp.VS.FSI/xlf/Properties.zh-Hant.xlf
浏览文件 @ 2834db36
...@@ -17,14 +17,9 @@ ...@@ -17,14 +17,9 @@
<target state="new">.NET Framework Options</target> <target state="new">.NET Framework Options</target>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveExe"> <trans-unit id="FSharpInteractiveMisc">
<source>F# Interactive executable</source> <source>Misc</source>
<target state="new">F# Interactive executable</target> <target state="new">Misc</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>
<note /> <note />
</trans-unit> </trans-unit>
<trans-unit id="FSharpInteractiveOptions"> <trans-unit id="FSharpInteractiveOptions">
...@@ -82,16 +77,6 @@ ...@@ -82,16 +77,6 @@
<target state="new">Startup</target> <target state="new">Startup</target>
<note /> <note />
</trans-unit> </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> </body>
</file> </file>
</xliff> </xliff>
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或