Skip to content

simplify use of if-defs #1614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsyme merged 1 commit into from
Oct 14, 2016
Merged

simplify use of if-defs #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/FSharpSource.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
<DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE;</DefineConstants>
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
<DefineConstants>$(DefineConstants);FX_MSBUILDRESOLVER_RUNTIMELIKE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_RESX_RESOURCE_READER</DefineConstants>
<DefineConstants>$(DefineConstants);FX_RESIDENT_COMPILER</DefineConstants>
Expand Down
11 changes: 7 additions & 4 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2811,7 +2811,9 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
#endif
try
match tcConfig.resolutionEnvironment with
#if FX_MSBUILDRESOLVER_RUNTIMELIKE
#if TODO_REWORK_ASSEMBLY_LOAD
// "RuntimeLike" assembly resolution for F# Interactive is not yet properly figured out on .NET Core
#else
| ReferenceResolver.RuntimeLike ->
[System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()]
#endif
Expand Down Expand Up @@ -4854,10 +4856,11 @@ module private ScriptPreprocessClosure =
tcConfigB.resolutionEnvironment <-
match codeContext with
| CodeContext.Editing -> ReferenceResolver.DesignTimeLike
#if FX_MSBUILDRESOLVER_RUNTIMELIKE
| CodeContext.Compilation | CodeContext.Evaluation -> ReferenceResolver.RuntimeLike
#else
#if TODO_REWORK_ASSEMBLY_LOAD
// "RuntimeLike" assembly resolution for F# Interactive is not yet properly figured out on .NET Core
| CodeContext.Compilation | CodeContext.Evaluation -> ReferenceResolver.CompileTimeLike
#else
| CodeContext.Compilation | CodeContext.Evaluation -> ReferenceResolver.RuntimeLike
#endif
tcConfigB.framework <- false
// Indicates that there are some references not in BasicReferencesForScriptLoadClosure which should
Expand Down
7 changes: 4 additions & 3 deletions src/fsharp/fsi/fsi.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2217,10 +2217,11 @@ type internal FsiEvaluationSession (argv:string[], inReader:TextReader, outWrite
Directory.GetCurrentDirectory(),isInteractive=true,
isInvalidationSupported=false)
let tcConfigP = TcConfigProvider.BasedOnMutableBuilder(tcConfigB)
#if FX_MSBUILDRESOLVER_RUNTIMELIKE
do tcConfigB.resolutionEnvironment <- ReferenceResolver.RuntimeLike // See Bug 3608
#else
#if TODO_REWORK_ASSEMBLY_LOAD
// "RuntimeLike" assembly resolution for F# Interactive is not yet properly figured out on .NET Core
do tcConfigB.resolutionEnvironment <- ReferenceResolver.DesignTimeLike
#else
do tcConfigB.resolutionEnvironment <- ReferenceResolver.RuntimeLike // See Bug 3608
#endif
do tcConfigB.useFsiAuxLib <- true

Expand Down